mirror of
https://github.com/block/buzz.git
synced 2026-11-13 21:01:53 +00:00
On iOS, Buzz's HTTP traffic now uses HTTP/2. Dart's `dart:io` client speaks only HTTP/1.1, so every feature's client opened its own connections to the relay, which sits behind Cloudflare and offers HTTP/2. On a slow link those extra handshakes, and the HTTP/1.1 head-of-line queueing, are a large share of cold-start time. ### What changes - iOS HTTP goes through two app-wide `NSURLSession`s via [cupertino_http](https://pub.dev/packages/cupertino_http) (`lib/shared/http/app_http_client.dart`): one for API traffic (relay queries, NIP-11, account, admission, pairing) and one for media (image/video/voice downloads and uploads). Requests to a host multiplex over one connection per session. Media has its own session so image bytes can't starve queries on a shared HTTP/2 connection: in prototype measurements with a single shared session, the channel-list batch query finished *later* than on HTTP/1.1. - Callers keep owning and closing their clients; on iOS `close()` leaves the shared session open. Both sessions are ephemeral with no URL cache and no cookies, so apart from the protocol (and native gzip, inflated off the Dart isolate) behavior matches `dart:io`. - Android, and tests, keep `http.Client()` unchanged, including `http.runWithClient` overrides. - Because closing a client no longer cancels a request on a shared session, the relay query client (both `/query` posts and bounded snapshot reads) and the dev push-lease fetch abort their request on timeout instead. - Non-`https` requests (`http://` media and community icons from other clients, local dev relays) stay on the handle's own `dart:io` client, because App Transport Security would block cleartext loads through URLSession. An HTTPS URL that redirects to `http://` is the one case that newly fails on iOS (URLSession follows the redirect and ATS blocks the downgrade); we accept that rather than follow redirects in Dart. - URLSession failures arrive as `NSErrorClientException`, not `SocketException`, so pairing and invite-join error messages now also recognize `NSURLErrorDomain` offline, TLS and timeout codes. - cupertino_http 3.0.1+ requires native_toolchain_c 0.19 and hooks 2.x, so `buzz_secp256k1` moves to those. Its build hook compiles unchanged. ### What gets better, and what doesn't get worse - **Better:** on a slow link, requests reuse one warm connection per session instead of paying TCP+TLS setup each time, so they complete where `main` times out (see the table). On Wi-Fi, small queries are slightly faster. - **Not worse:** request semantics, caching (none) and cookies (none) match `dart:io`; Android and tests are untouched; timed-out requests are aborted so they can't keep using bandwidth on the shared connection; offline errors keep their friendly messages. The accepted regression is HTTPS-to-HTTP redirects on iOS, above. WebSockets stay on `dart:io`. Android (Cronet) is a possible follow-up using the same seam. ### Validation Added tests: shared-session handles don't close the session; off iOS the transport honors `http.runWithClient`; NSURLError code classification; timed-out relay queries and bounded snapshot reads abort their request; cleartext requests stay off the shared session. Focused existing validation: full mobile suite (the only failures are 11 push/notification tests that fail identically on `main` on the same machine), `flutter analyze`, `buzz_secp256k1` package tests (27/27), and an iOS release build. On-device A/B on an iPhone 12 mini against the internal prod relay over WARP, comparing cold starts of `main` and this branch (profile builds with local-only request timing, 3 cold starts each): | | `main` | this branch | |---|---|---| | Wi-Fi: first query done (median) | 0.31s | 0.25s | | Wi-Fi: small-query latency (median) | 0.22s | 0.18s | | NLC Edge: requests completed in 90s | 0, 0, 0 (29–30 failed) | 12, 14, 16 (5–7 failed) | | NLC Edge: first request done | never | 6.3–7.0s | On Wi-Fi the two are about even. Under Edge, every HTTP/1.1 request on `main` hit its timeout while still opening a connection, and each retry started a fresh TCP+TLS handshake. The branch reuses one connection, so queries complete. Connection counts weren't measured on the device, since no proxy was in the path. Cold-cache demo on an iOS simulator (this branch, app caches and cached prefs wiped before launch): avatars, community icons, channel lists, public channel images, a DM image and custom emoji, video playback, reactions, and an image and video upload with progress all load. The DM image and clip are synthetic test media. https://github.com/user-attachments/assets/039d1a25-46f2-4e0e-b147-f96d0cfabd40 buzz-review-completed (agent review and device validation done; the human-test step is not applicable under Tom's standing exception for mobile changes) --------- Signed-off-by: Tom Brow <tomb@squareup.com> Co-authored-by: Tom Brow <tomb@squareup.com> Co-authored-by: studio <dc2fc481343672df31a689840c09299972e704dac592e0da6f18486646a7ee3e@buzz.block.builderlab.xyz> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
207 lines
6.4 KiB
Dart
207 lines
6.4 KiB
Dart
import 'dart:async';
|
|
import 'dart:io';
|
|
|
|
import 'package:http/http.dart' as http;
|
|
import 'package:http/io_client.dart';
|
|
import 'package:buzz/shared/http/app_http_client.dart';
|
|
|
|
/// The default transport. On iOS, the app-wide `NSURLSession` inflates gzip
|
|
/// natively, off the Dart isolate. `dart:io` would inflate on the calling
|
|
/// isolate, so leave its responses compressed for the response decoder.
|
|
///
|
|
/// A non-`dart:io` client supplied through `http.runWithClient`, such as a
|
|
/// `MockClient`, is used as is. An `IOClient` is replaced, not closed, since
|
|
/// it may be shared.
|
|
http.Client _defaultTransport() {
|
|
if (Platform.isIOS) return newAppHttpClient();
|
|
final client = http.Client();
|
|
if (client is! IOClient) return client;
|
|
return IOClient(HttpClient()..autoUncompress = false);
|
|
}
|
|
|
|
/// Owns the reusable HTTP transport used for relay `/query` requests.
|
|
///
|
|
/// Requests advertise gzip. A response body may therefore come back
|
|
/// compressed; decode it with `relayResponseText` or `decodeRelayQueryResponse`.
|
|
class RelayHttpQueryClient {
|
|
RelayHttpQueryClient({
|
|
http.Client? client,
|
|
http.Client Function()? clientFactory,
|
|
}) : _injectedClient = client,
|
|
_clientFactory = clientFactory ?? _defaultTransport;
|
|
|
|
final http.Client? _injectedClient;
|
|
final http.Client Function() _clientFactory;
|
|
_ClientGeneration? _currentGeneration;
|
|
final Set<_ClientGeneration> _generations = {};
|
|
|
|
Future<http.Response> post(
|
|
Uri url, {
|
|
required Map<String, String> headers,
|
|
required List<int> body,
|
|
required Duration timeout,
|
|
http.Client Function(http.Client, bool Function())? decorate,
|
|
}) async {
|
|
final generation = _injectedClient == null
|
|
? (_currentGeneration ??= _createGeneration())
|
|
: null;
|
|
generation?.acquire();
|
|
var active = true;
|
|
// Retiring a generation cannot stop a request on a shared session, so a
|
|
// timed-out request is aborted rather than left holding bandwidth.
|
|
final abort = Completer<void>();
|
|
try {
|
|
final request =
|
|
http.AbortableRequest('POST', url, abortTrigger: abort.future)
|
|
..followRedirects = false
|
|
..headers['Accept-Encoding'] = 'gzip'
|
|
..headers.addAll(headers)
|
|
..bodyBytes = body;
|
|
final transport = _injectedClient ?? generation!.client;
|
|
final client = decorate?.call(transport, () => active) ?? transport;
|
|
return await client
|
|
.send(request)
|
|
.then(http.Response.fromStream)
|
|
.timeout(timeout);
|
|
} on TimeoutException {
|
|
if (!abort.isCompleted) abort.complete();
|
|
if (identical(_currentGeneration, generation)) {
|
|
_currentGeneration = null;
|
|
}
|
|
generation?.retire();
|
|
rethrow;
|
|
} finally {
|
|
active = false;
|
|
generation?.release();
|
|
}
|
|
}
|
|
|
|
/// Sends a non-redirecting request, bounding bytes before buffering or parsing.
|
|
/// The deadline includes headers and the entire response body.
|
|
Future<http.Response> sendBounded(
|
|
http.Request request, {
|
|
required int maxBytes,
|
|
required Duration timeout,
|
|
http.Client Function(http.Client, bool Function())? decorate,
|
|
}) async {
|
|
// As in [post], a timed-out request on a shared session is aborted.
|
|
final abort = Completer<void>();
|
|
final sent =
|
|
http.AbortableRequest(
|
|
request.method,
|
|
request.url,
|
|
abortTrigger: abort.future,
|
|
)
|
|
..followRedirects = false
|
|
..headers.addAll(request.headers)
|
|
..bodyBytes = request.bodyBytes;
|
|
final generation = _injectedClient == null
|
|
? (_currentGeneration ??= _createGeneration())
|
|
: null;
|
|
generation?.acquire();
|
|
StreamIterator<List<int>>? iterator;
|
|
var finished = false;
|
|
Future<http.Response> receive() async {
|
|
final transport = _injectedClient ?? generation!.client;
|
|
final client = decorate?.call(transport, () => !finished) ?? transport;
|
|
final response = await client.send(sent);
|
|
if (finished) {
|
|
await response.stream.listen(null).cancel();
|
|
throw StateError('Relay request already timed out');
|
|
}
|
|
iterator = StreamIterator(response.stream);
|
|
if ((response.contentLength ?? 0) > maxBytes) {
|
|
throw const FormatException('Relay response exceeds byte limit');
|
|
}
|
|
final bytes = <int>[];
|
|
while (await iterator!.moveNext()) {
|
|
final chunk = iterator!.current;
|
|
if (bytes.length + chunk.length > maxBytes) {
|
|
throw const FormatException('Relay response exceeds byte limit');
|
|
}
|
|
bytes.addAll(chunk);
|
|
}
|
|
iterator = null; // An exhausted stream needs no cancellation.
|
|
return http.Response.bytes(
|
|
bytes,
|
|
response.statusCode,
|
|
headers: response.headers,
|
|
request: request,
|
|
);
|
|
}
|
|
|
|
try {
|
|
return await receive().timeout(timeout);
|
|
} on TimeoutException {
|
|
if (!abort.isCompleted) abort.complete();
|
|
if (identical(_currentGeneration, generation)) {
|
|
_currentGeneration = null;
|
|
}
|
|
generation?.retire();
|
|
rethrow;
|
|
} finally {
|
|
finished = true;
|
|
// Cancelling an iterator that never listened leaves the body
|
|
// downloading on a shared session, so abort on every exit.
|
|
if (!abort.isCompleted) abort.complete();
|
|
if (iterator != null) await iterator!.cancel();
|
|
generation?.release();
|
|
}
|
|
}
|
|
|
|
void close() {
|
|
for (final generation in _generations.toList()) {
|
|
generation.close();
|
|
}
|
|
_currentGeneration = null;
|
|
_injectedClient?.close();
|
|
}
|
|
|
|
_ClientGeneration _createGeneration() {
|
|
late final _ClientGeneration generation;
|
|
generation = _ClientGeneration(
|
|
_clientFactory(),
|
|
onClosed: () => _generations.remove(generation),
|
|
);
|
|
_generations.add(generation);
|
|
return generation;
|
|
}
|
|
}
|
|
|
|
class _ClientGeneration {
|
|
_ClientGeneration(this.client, {required this.onClosed});
|
|
|
|
final http.Client client;
|
|
final void Function() onClosed;
|
|
int _activeRequests = 0;
|
|
bool _retired = false;
|
|
bool _closed = false;
|
|
|
|
void acquire() {
|
|
assert(!_closed);
|
|
_activeRequests++;
|
|
}
|
|
|
|
void release() {
|
|
assert(_activeRequests > 0);
|
|
_activeRequests--;
|
|
_closeIfIdle();
|
|
}
|
|
|
|
void retire() {
|
|
_retired = true;
|
|
_closeIfIdle();
|
|
}
|
|
|
|
void close() {
|
|
if (_closed) return;
|
|
_closed = true;
|
|
client.close();
|
|
onClosed();
|
|
}
|
|
|
|
void _closeIfIdle() {
|
|
if (_retired && _activeRequests == 0) close();
|
|
}
|
|
}
|