Skip to content

Commit 3ab80dd

Browse files
browcodex
andcommitted
fix(mobile): retry transient age signal failures
Signed-off-by: Tom Brow <[email protected]> Co-authored-by: Codex <[email protected]> Ai-assisted: true
1 parent 4fbb4fd commit 3ab80dd

5 files changed

Lines changed: 167 additions & 25 deletions

File tree

‎mobile/android/app/src/main/kotlin/xyz/block/buzz/mobile/MainActivity.kt‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,17 @@ internal fun noAgeSignalPayload(): Map<String, Any?> {
3737
)
3838
}
3939

40+
internal fun replyWithAgeSignalError(
41+
result: MethodChannel.Result,
42+
error: Exception,
43+
) {
44+
result.error(
45+
"age_signal_unavailable",
46+
"The age signal request failed.",
47+
error.javaClass.simpleName,
48+
)
49+
}
50+
4051
internal object AndroidImageProcessor {
4152
fun decodeSrgbBitmap(bytes: ByteArray): Bitmap? {
4253
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -171,12 +182,12 @@ class MainActivity : FlutterFragmentActivity() {
171182
.addOnSuccessListener { ageSignalsResult ->
172183
replyWithAgeSignal(result, ageSignalsResult.ageUpper())
173184
}
174-
.addOnFailureListener {
175-
replyWithNoAgeSignal(result)
185+
.addOnFailureListener { error ->
186+
replyWithAgeSignalError(result, error)
176187
}
177188
}
178-
.addOnFailureListener {
179-
replyWithNoAgeSignal(result)
189+
.addOnFailureListener { error ->
190+
replyWithAgeSignalError(result, error)
180191
}
181192
}
182193

‎mobile/android/app/src/test/kotlin/xyz/block/buzz/mobile/AgeSignalPayloadTest.kt‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package xyz.block.buzz.mobile
22

3+
import io.flutter.plugin.common.MethodChannel
34
import kotlin.test.Test
45
import kotlin.test.assertEquals
6+
import kotlin.test.assertFalse
57

68
class AgeSignalPayloadTest {
79
@Test
@@ -32,4 +34,39 @@ class AgeSignalPayloadTest {
3234
noAgeSignalPayload(),
3335
)
3436
}
37+
38+
@Test
39+
fun `platform failures return a distinct retryable error`() {
40+
val result = RecordingResult()
41+
42+
replyWithAgeSignalError(result, IllegalStateException("transient"))
43+
44+
assertFalse(result.succeeded)
45+
assertEquals("age_signal_unavailable", result.errorCode)
46+
assertEquals("The age signal request failed.", result.errorMessage)
47+
assertEquals("IllegalStateException", result.errorDetails)
48+
}
49+
50+
private class RecordingResult : MethodChannel.Result {
51+
var succeeded = false
52+
var errorCode: String? = null
53+
var errorMessage: String? = null
54+
var errorDetails: Any? = null
55+
56+
override fun success(result: Any?) {
57+
succeeded = true
58+
}
59+
60+
override fun error(
61+
errorCode: String,
62+
errorMessage: String?,
63+
errorDetails: Any?,
64+
) {
65+
this.errorCode = errorCode
66+
this.errorMessage = errorMessage
67+
this.errorDetails = errorDetails
68+
}
69+
70+
override fun notImplemented() = Unit
71+
}
3572
}

‎mobile/ios/Runner/AppDelegate.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,13 @@ import os.log
271271
result(Self.noAgeSignalResponse)
272272
}
273273
} catch {
274-
result(Self.noAgeSignalResponse)
274+
result(
275+
FlutterError(
276+
code: "age_signal_unavailable",
277+
message: "The age signal request failed.",
278+
details: String(describing: type(of: error))
279+
)
280+
)
275281
}
276282
}
277283
}

‎mobile/lib/features/age_gate/age_signal_provider.dart‎

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
1+
import 'dart:async';
2+
13
import 'package:flutter/services.dart';
24
import 'package:hooks_riverpod/hooks_riverpod.dart';
35

46
const ageSignalChannel = MethodChannel('buzz/age_signal');
57

8+
/// Delay before the single retry of a failed native age-signal request.
9+
const ageSignalRetryDelay = Duration(seconds: 1);
10+
11+
/// Invokes the native age-signal request.
12+
typedef AgeSignalRequest = Future<Map<Object?, Object?>?> Function();
13+
14+
/// Waits before retrying a failed native age-signal request.
15+
typedef AgeSignalDelay = Future<void> Function(Duration duration);
16+
17+
Future<Map<Object?, Object?>?> _requestPlatformAgeSignal() =>
18+
ageSignalChannel.invokeMapMethod<Object?, Object?>('requestAgeSignal');
19+
20+
Future<void> _delayAgeSignalRetry(Duration duration) =>
21+
Future<void>.delayed(duration);
22+
623
bool shouldBlockForAgeSignal(Map<Object?, Object?> response) {
724
if (response.length != 2 ||
825
!response.containsKey('status') ||
@@ -32,32 +49,65 @@ bool shouldBlockForAgeSignal(Map<Object?, Object?> response) {
3249
}
3350

3451
class AgeSignalNotifier extends Notifier<bool> {
35-
bool _requested = false;
52+
/// Creates an age-signal notifier, optionally with test request hooks.
53+
AgeSignalNotifier({AgeSignalRequest? requestSignal, AgeSignalDelay? delay})
54+
: _requestSignal = requestSignal ?? _requestPlatformAgeSignal,
55+
_delay = delay ?? _delayAgeSignalRetry;
56+
57+
static const _maxAttempts = 2;
58+
59+
final AgeSignalRequest _requestSignal;
60+
final AgeSignalDelay _delay;
61+
bool _completed = false;
62+
Future<void>? _requestInFlight;
3663

3764
@override
3865
bool build() => false;
3966

4067
Future<void> request() async {
41-
if (_requested) {
68+
if (_completed) return;
69+
70+
final requestInFlight = _requestInFlight;
71+
if (requestInFlight != null) {
72+
await requestInFlight;
4273
return;
4374
}
44-
_requested = true;
4575

46-
final Map<Object?, Object?>? response;
76+
final request = _requestWithRetry();
77+
_requestInFlight = request;
4778
try {
48-
response = await ageSignalChannel.invokeMapMethod<Object?, Object?>(
49-
'requestAgeSignal',
50-
);
51-
} on PlatformException {
52-
state = false;
53-
return;
54-
} on MissingPluginException {
55-
state = false;
56-
return;
79+
await request;
80+
} finally {
81+
if (identical(_requestInFlight, request)) {
82+
_requestInFlight = null;
83+
}
5784
}
85+
}
86+
87+
Future<void> _requestWithRetry() async {
88+
for (var attempt = 0; attempt < _maxAttempts; attempt += 1) {
89+
final Map<Object?, Object?>? response;
90+
try {
91+
response = await _requestSignal();
92+
} on MissingPluginException {
93+
_completed = true;
94+
state = false;
95+
return;
96+
} on PlatformException {
97+
if (attempt + 1 < _maxAttempts) {
98+
await _delay(ageSignalRetryDelay);
99+
continue;
100+
}
101+
_completed = true;
102+
state = false;
103+
return;
104+
}
58105

59-
if (response != null) {
60-
state = shouldBlockForAgeSignal(response);
106+
_completed = true;
107+
if (response != null) {
108+
state = shouldBlockForAgeSignal(response);
109+
}
110+
return;
61111
}
62112
}
63113
}

‎mobile/test/features/age_gate/age_signal_provider_test.dart‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,54 @@ void main() {
5454
});
5555

5656
test('allows when the platform request throws', () async {
57-
TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
58-
.setMockMethodCallHandler(ageSignalChannel, (_) async {
57+
var requests = 0;
58+
var delays = 0;
59+
final provider = NotifierProvider<AgeSignalNotifier, bool>(
60+
() => AgeSignalNotifier(
61+
requestSignal: () async {
62+
requests += 1;
5963
throw PlatformException(code: 'unavailable');
60-
});
64+
},
65+
delay: (duration) async {
66+
expect(duration, ageSignalRetryDelay);
67+
delays += 1;
68+
},
69+
),
70+
);
6171
final container = ProviderContainer();
6272
addTearDown(container.dispose);
6373

64-
await container.read(ageSignalProvider.notifier).request();
74+
await container.read(provider.notifier).request();
75+
await container.read(provider.notifier).request();
76+
77+
expect(container.read(provider), isFalse);
78+
expect(requests, 2);
79+
expect(delays, 1);
80+
});
81+
82+
test('retries a transient platform failure and applies the signal', () async {
83+
var requests = 0;
84+
final provider = NotifierProvider<AgeSignalNotifier, bool>(
85+
() => AgeSignalNotifier(
86+
requestSignal: () async {
87+
requests += 1;
88+
if (requests == 1) {
89+
throw PlatformException(code: 'age_signal_unavailable');
90+
}
91+
return {'status': 'signal', 'ageUpper': 17};
92+
},
93+
delay: (duration) async {
94+
expect(duration, ageSignalRetryDelay);
95+
},
96+
),
97+
);
98+
final container = ProviderContainer();
99+
addTearDown(container.dispose);
100+
101+
await container.read(provider.notifier).request();
65102

66-
expect(container.read(ageSignalProvider), isFalse);
103+
expect(container.read(provider), isTrue);
104+
expect(requests, 2);
67105
});
68106

69107
test('rejects malformed and unexpected platform responses', () async {

0 commit comments

Comments
 (0)