mirror of
https://github.com/block/buzz.git
synced 2026-11-01 06:51:17 +00:00
047533c56c
## Summary Communities joined via an invite link never connect: the app dials `ws://` on port 80 instead of `wss://` on 443 and sits on "Reconnecting…" indefinitely. `RelayConfig.baseUrl` is documented as an HTTP origin, but the two onboarding flows disagree on what they persist: - **Device pairing** validates and stores `https://` — `pairing_provider.dart:657` throws on anything else. - **Invite join** stores the relay URL straight off the invite link, and `deep_link.dart:165` always emits `ws://` or `wss://`. `wsUrl` only special-cased `https://`, so a `wss://` base fell through to the plaintext branch: ```dart final scheme = uri.scheme == 'https' ? 'wss' : 'ws'; // 'wss' is not 'https' ``` The claim request itself succeeds, because `_claimUrlFromRelay` (`invite_join_provider.dart:242`) maps `wss → https` explicitly. Only the socket path is missing that conversion — which is why the community appears, correctly named, and then never loads. The same `baseUrl` also feeds `/query` (`relay_session.dart:136`), media upload (`media_upload.dart:765`), Blossom auth (`media_auth.dart:128`) and `relayClientProvider` (`relay_provider.dart:113`), so those requests were malformed too. Where port 80 *does* answer, it is additionally a silent TLS downgrade after `validateInviteRelayUri` insisted on `wss://`. This folds the websocket schemes back to their HTTP equivalents in `baseUrl` itself, so every consumer is correct by construction rather than needing a second getter remembered at each call site, and communities **already persisted** with `wss://` are repaired on read without a migration. `community_icon_provider.dart:46` already performs this same conversion locally. One subtlety worth flagging for review: the normalization is derived in the getter rather than applied in the constructor, so the constructor stays `const`. The compile-time fallback at `relay_provider.dart:77` relies on const canonicalization for a stable identity across rebuilds, and Riverpod's `defaultUpdateShouldNotify` is `previous != next` (`element.dart:361`), which falls back to identity for this class. A `factory` constructor here yields a fresh instance per rebuild, which tears down and resubscribes every listener — `channels_provider_test.dart` catches it as an unexpected unsubscribe during reconnect. ### Related issue Fixes #2662. ### Testing `flutter test` — **705 passed, 1 skipped, 0 failed** `flutter analyze` — No issues found `dart format --set-exit-if-changed .` — 249 files, 0 changed Run against the Hermit-pinned SDK (Flutter 3.41.7 / Dart 3.11.5), matching CI. 10 new unit tests in `mobile/test/shared/relay/relay_config_test.dart` covering both onboarding schemes, `http`/`https` passthrough, non-default ports, and agreement between the invite and pairing paths for the same relay. Verified end-to-end against a self-hosted relay behind `tailscale serve`, which terminates TLS on 443 and leaves port 80 closed. Relay logs show the invite claim succeeding over HTTPS at the moment of joining, while no WebSocket connection ever arrives — no `WebSocket connection established`, no NIP-42 auth, no `kind:0` profile, no push registration — across the relay's entire history, even though the member row is present and correct. Port-80 refusals are not logged by `tailscaled`'s netstack, which is why the retries leave no trace server-side. Reproduced on both iOS and Android. --------- Signed-off-by: Krishna C <github@kumb.uk>
73 lines
2.3 KiB
Dart
73 lines
2.3 KiB
Dart
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
|
|
import '../../shared/relay/relay.dart';
|
|
import '../../shared/theme/theme_provider.dart';
|
|
|
|
const _recentSearchesPrefsKey = 'recent_searches_v1';
|
|
const _maxRecentSearches = 6;
|
|
|
|
/// Device-local history of explicitly submitted searches, newest first.
|
|
///
|
|
/// Queries are scoped by community and account so searches from one identity
|
|
/// cannot appear after switching to another.
|
|
class RecentSearchesNotifier extends Notifier<List<String>> {
|
|
late String _prefsKey;
|
|
|
|
@override
|
|
List<String> build() {
|
|
final config = ref.watch(relayConfigProvider);
|
|
final pubkey = ref.watch(myPubkeyProvider) ?? 'anon';
|
|
_prefsKey = '$_recentSearchesPrefsKey:${config.baseUrl}:$pubkey';
|
|
|
|
final prefs = ref.read(savedPrefsProvider);
|
|
final stored =
|
|
readMigratedPref<List<String>>(
|
|
prefs,
|
|
canonicalKey: _prefsKey,
|
|
legacyKey: '$_recentSearchesPrefsKey:${config.storedOrigin}:$pubkey',
|
|
read: prefs.getStringList,
|
|
write: prefs.setStringList,
|
|
) ??
|
|
const [];
|
|
return List.unmodifiable(
|
|
stored
|
|
.map((query) => query.trim())
|
|
.where((query) => query.isNotEmpty)
|
|
.take(_maxRecentSearches),
|
|
);
|
|
}
|
|
|
|
/// Records [query] as the most recent search after trimming whitespace.
|
|
///
|
|
/// Empty queries are ignored. Existing matches are deduplicated
|
|
/// case-insensitively, the newest spelling is retained, the history is capped
|
|
/// at six entries, and the result is persisted for the current community and
|
|
/// account.
|
|
void record(String query) {
|
|
final trimmed = query.trim();
|
|
if (trimmed.isEmpty) return;
|
|
|
|
final normalized = trimmed.toLowerCase();
|
|
final next = [
|
|
trimmed,
|
|
...state.where((item) => item.toLowerCase() != normalized),
|
|
].take(_maxRecentSearches).toList(growable: false);
|
|
_persist(next);
|
|
}
|
|
|
|
/// Clears the current community and account's history and persists it empty.
|
|
void clear() => _persist(const []);
|
|
|
|
void _persist(List<String> searches) {
|
|
state = List.unmodifiable(searches);
|
|
ref.read(savedPrefsProvider).setStringList(_prefsKey, searches);
|
|
}
|
|
}
|
|
|
|
/// Provides device-local recent searches scoped to the active community and
|
|
/// account.
|
|
final recentSearchesProvider =
|
|
NotifierProvider<RecentSearchesNotifier, List<String>>(
|
|
RecentSearchesNotifier.new,
|
|
);
|