Skip to content

Commit 591bbbf

Browse files
tlongwell-blocknpub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67dTyler Longwell
authored
fix(mobile): stop media fetch stampede — stable cache keys, bounded decode, 429 cooldown (#2219)
Signed-off-by: Tyler Longwell <[email protected]> Co-authored-by: npub1qyvc0c5kl4gqv2fd97fsk46tu378sqgy35vc83rvgfwne90sel7s0ed67d <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@sprout-oss.stage.blox.sqprod.co> Co-authored-by: Tyler Longwell <[email protected]>
1 parent 97b8b22 commit 591bbbf

9 files changed

Lines changed: 540 additions & 49 deletions

File tree

‎mobile/lib/features/channels/compose_bar/attachments.dart‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,14 @@ class _AttachmentStrip extends StatelessWidget {
9696
),
9797
),
9898
)
99-
: Consumer(
100-
builder: (context, ref, _) => Image.network(
101-
previewUrl,
102-
headers: mediaGetHeadersFor(ref, previewUrl),
103-
fit: BoxFit.cover,
104-
errorBuilder: (_, _, _) => ColoredBox(
105-
color: context.colors.surface,
106-
child: Icon(
107-
LucideIcons.image,
108-
color: context.colors.onSurfaceVariant,
109-
),
99+
: MediaImage(
100+
url: previewUrl,
101+
fit: BoxFit.cover,
102+
errorBuilder: (_, _, _) => ColoredBox(
103+
color: context.colors.surface,
104+
child: Icon(
105+
LucideIcons.image,
106+
color: context.colors.onSurfaceVariant,
110107
),
111108
),
112109
),

‎mobile/lib/features/channels/media_viewer_page.dart‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,9 @@ class _MediaImageViewerPageState extends State<MediaImageViewerPage>
274274
enabled: !_disableHeroOnDismiss,
275275
child: Hero(
276276
tag: widget.heroTag,
277-
child: Image.network(
278-
widget.imageUrl,
279-
headers: mediaGetHeadersForContext(
280-
context,
281-
widget.imageUrl,
282-
),
277+
child: MediaImage(
278+
url: widget.imageUrl,
279+
boundDecodeToLayout: false,
283280
fit: BoxFit.contain,
284281
semanticLabel: widget.semanticLabel,
285282
errorBuilder: (_, _, _) => const _MediaLoadFailure(
@@ -457,9 +454,8 @@ class _VideoLoadingPoster extends StatelessWidget {
457454
fit: StackFit.expand,
458455
children: [
459456
if (posterUrl != null)
460-
Image.network(
461-
posterUrl!,
462-
headers: mediaGetHeadersForContext(context, posterUrl!),
457+
MediaImage(
458+
url: posterUrl!,
463459
fit: BoxFit.cover,
464460
errorBuilder: (_, _, _) => _videoPlaceholder(context),
465461
)

‎mobile/lib/features/channels/message_content.dart‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,8 @@ class _MessageImagePreview extends HookConsumerWidget {
254254
constraints: layout.constraints,
255255
child: Hero(
256256
tag: heroTag,
257-
child: Image.network(
258-
url,
259-
headers: mediaGetHeadersFor(ref, url),
257+
child: MediaImage(
258+
url: url,
260259
fit: layout.fit,
261260
semanticLabel: semanticLabel,
262261
errorBuilder: (_, _, _) => _MediaPreviewFallback(
@@ -297,9 +296,8 @@ class _MessageVideoPreview extends StatelessWidget {
297296
fit: StackFit.expand,
298297
children: [
299298
if (posterUrl != null)
300-
Image.network(
301-
posterUrl,
302-
headers: mediaGetHeadersForContext(context, posterUrl),
299+
MediaImage(
300+
url: posterUrl,
303301
fit: BoxFit.cover,
304302
errorBuilder: (_, _, _) => const _MediaPreviewFallback(
305303
icon: LucideIcons.video,

‎mobile/lib/features/custom_emoji/custom_emoji_render.dart‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:gpt_markdown/gpt_markdown.dart';
33
import 'package:gpt_markdown/custom_widgets/markdown_config.dart';
4-
import 'package:hooks_riverpod/hooks_riverpod.dart';
54

65
import '../../shared/relay/relay.dart';
76

@@ -32,17 +31,15 @@ class CustomEmojiImage extends StatelessWidget {
3231
@override
3332
Widget build(BuildContext context) {
3433
final fallbackStyle = DefaultTextStyle.of(context).style;
35-
return Consumer(
36-
builder: (context, ref, _) => Image.network(
37-
url,
38-
headers: mediaGetHeadersFor(ref, url),
39-
width: size,
40-
height: size,
41-
fit: BoxFit.contain,
42-
filterQuality: FilterQuality.medium,
43-
semanticLabel: ':$shortcode:',
44-
errorBuilder: (_, _, _) => Text(':$shortcode:', style: fallbackStyle),
45-
),
34+
return MediaImage(
35+
url: url,
36+
width: size,
37+
height: size,
38+
decodeWidth: size,
39+
fit: BoxFit.contain,
40+
filterQuality: FilterQuality.medium,
41+
semanticLabel: ':$shortcode:',
42+
errorBuilder: (_, _, _) => Text(':$shortcode:', style: fallbackStyle),
4643
);
4744
}
4845
}

‎mobile/lib/shared/relay/media_auth.dart‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,30 @@ import 'relay_provider.dart';
99
const _mediaGetAuthKind = 24242;
1010
const _mediaGetAuthLifetimeSeconds = 600;
1111

12+
/// Re-sign this long before the cached auth event expires, so an in-flight
13+
/// request signed just before the boundary still lands well within validity.
14+
const _mediaGetAuthRefreshMarginSeconds = 60;
15+
1216
/// Builds BUD-01 Blossom `t=get` auth headers for relay-host media URLs.
1317
///
1418
/// Returns an empty map for non-relay URLs or when no signing key is available,
1519
/// so callers can safely use this on arbitrary profile/custom-emoji URLs without
1620
/// leaking Buzz credentials to third-party hosts.
17-
@immutable
21+
///
22+
/// The signed header is memoized until [_mediaGetAuthRefreshMarginSeconds]
23+
/// before expiry: repeated calls return the byte-identical map instead of
24+
/// producing a fresh Schnorr signature per widget build. The service itself is
25+
/// rebuilt (dropping the memo) whenever the relay config — base URL or signing
26+
/// identity — changes, via [mediaGetAuthServiceProvider].
1827
class MediaGetAuthService {
1928
final String _baseUrl;
2029
final String? _nsec;
2130
final DateTime Function() _now;
2231

23-
const MediaGetAuthService({
32+
Map<String, String>? _cachedHeaders;
33+
DateTime? _refreshAt;
34+
35+
MediaGetAuthService({
2436
required String baseUrl,
2537
required String? nsec,
2638
DateTime Function()? now,
@@ -36,12 +48,29 @@ class MediaGetAuthService {
3648
if (uri == null || relayUri == null) return const {};
3749
if (!_isRelayMediaUrl(uri, relayUri)) return const {};
3850

51+
final cached = _cachedHeaders;
52+
final refreshAt = _refreshAt;
53+
if (cached != null && refreshAt != null && _now().isBefore(refreshAt)) {
54+
return cached;
55+
}
56+
3957
try {
58+
final signedAt = _now();
4059
final authEvent = _buildGetAuthEvent(nsec);
4160
final encoded = base64Url
4261
.encode(utf8.encode(authEvent.toJson()))
4362
.replaceAll('=', '');
44-
return {'Authorization': 'Nostr $encoded'};
63+
final headers = Map<String, String>.unmodifiable({
64+
'Authorization': 'Nostr $encoded',
65+
});
66+
_cachedHeaders = headers;
67+
_refreshAt = signedAt.add(
68+
const Duration(
69+
seconds:
70+
_mediaGetAuthLifetimeSeconds - _mediaGetAuthRefreshMarginSeconds,
71+
),
72+
);
73+
return headers;
4574
} catch (_) {
4675
// Read auth is best-effort: while the relay rollout flag is off, an
4776
// unsigned fetch still works. Once the flag is on, this request will 403

0 commit comments

Comments
 (0)