Merge branch 'spike/block2-derisking'
This commit is contained in:
commit
bd6938c62d
18 changed files with 308 additions and 150 deletions
|
|
@ -9,6 +9,7 @@ import 'data/variety_repository.dart';
|
|||
import 'i18n/strings.g.dart';
|
||||
import 'services/auto_backup_service.dart';
|
||||
import 'services/coarse_location.dart';
|
||||
import 'services/message_store.dart';
|
||||
import 'services/offer_outbox.dart';
|
||||
import 'services/onboarding_store.dart';
|
||||
import 'services/social_service.dart';
|
||||
|
|
@ -38,6 +39,7 @@ class TaneApp extends StatelessWidget {
|
|||
this.socialSettings,
|
||||
this.location,
|
||||
this.outbox,
|
||||
this.messageStore,
|
||||
this.showIntro = false,
|
||||
this.autoBackup,
|
||||
super.key,
|
||||
|
|
@ -49,6 +51,7 @@ class TaneApp extends StatelessWidget {
|
|||
socialSettings,
|
||||
location,
|
||||
outbox,
|
||||
messageStore,
|
||||
);
|
||||
|
||||
final VarietyRepository repository;
|
||||
|
|
@ -65,6 +68,9 @@ class TaneApp extends StatelessWidget {
|
|||
|
||||
/// Optional offline outbox for the market's "share my seeds".
|
||||
final OfferOutbox? outbox;
|
||||
|
||||
/// Optional persistence for chat history.
|
||||
final MessageStore? messageStore;
|
||||
final bool showIntro;
|
||||
|
||||
/// Drives silent periodic backups off the app lifecycle. Null in widget tests
|
||||
|
|
@ -80,6 +86,7 @@ class TaneApp extends StatelessWidget {
|
|||
SocialSettings? socialSettings,
|
||||
CoarseLocationProvider? location,
|
||||
OfferOutbox? outbox,
|
||||
MessageStore? messageStore,
|
||||
) {
|
||||
return GoRouter(
|
||||
initialLocation: showIntro ? '/intro' : '/',
|
||||
|
|
@ -106,6 +113,7 @@ class TaneApp extends StatelessWidget {
|
|||
social: social,
|
||||
settings: socialSettings,
|
||||
peerPubkey: state.pathParameters['pubkey']!,
|
||||
messageStore: messageStore,
|
||||
),
|
||||
),
|
||||
GoRoute(
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import '../services/ocr/tesseract_label_extractor.dart';
|
|||
import '../services/onboarding_store.dart';
|
||||
import '../services/recovery_sheet_service.dart';
|
||||
import '../services/share_catalog_service.dart';
|
||||
import '../services/message_store.dart';
|
||||
import '../services/offer_outbox.dart';
|
||||
import '../services/social_service.dart';
|
||||
import '../services/social_settings.dart';
|
||||
|
|
@ -90,6 +91,7 @@ Future<void> configureDependencies() async {
|
|||
..registerSingleton<SocialService>(socialService)
|
||||
..registerSingleton<SocialSettings>(SocialSettings(secretStore))
|
||||
..registerSingleton<OfferOutbox>(OfferOutbox(secretStore))
|
||||
..registerSingleton<MessageStore>(MessageStore(secretStore))
|
||||
..registerSingleton<ExportImportService>(
|
||||
ExportImportService(
|
||||
repository: varietyRepository,
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@
|
|||
"none": "No one vouches for them yet",
|
||||
"count": "Vouched for by {n}",
|
||||
"vouch": "I know this person",
|
||||
"vouched": "You vouch for them"
|
||||
"vouched": "You vouch for them",
|
||||
"circle": "In your circle"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@
|
|||
"none": "Nadie los avala aún",
|
||||
"count": "Avalada por {n}",
|
||||
"vouch": "Conozco a esta persona",
|
||||
"vouched": "Avalas a esta persona"
|
||||
"vouched": "Avalas a esta persona",
|
||||
"circle": "En tu círculo"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -368,6 +368,7 @@
|
|||
"none": "Ainda ninguém os avaliza",
|
||||
"count": "Avalizada por {n}",
|
||||
"vouch": "Conheço esta pessoa",
|
||||
"vouched": "Avalizas esta pessoa"
|
||||
"vouched": "Avalizas esta pessoa",
|
||||
"circle": "No teu círculo"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
/// To regenerate, run: `dart run slang`
|
||||
///
|
||||
/// Locales: 3
|
||||
/// Strings: 989 (329 per locale)
|
||||
/// Strings: 992 (330 per locale)
|
||||
///
|
||||
/// Built on 2026-07-10 at 09:34 UTC
|
||||
/// Built on 2026-07-10 at 10:09 UTC
|
||||
|
||||
// coverage:ignore-file
|
||||
// ignore_for_file: type=lint, unused_import
|
||||
|
|
|
|||
|
|
@ -1185,6 +1185,9 @@ class Translations$trust$en {
|
|||
|
||||
/// en: 'You vouch for them'
|
||||
String get vouched => 'You vouch for them';
|
||||
|
||||
/// en: 'In your circle'
|
||||
String get circle => 'In your circle';
|
||||
}
|
||||
|
||||
// Path: intro.slides
|
||||
|
|
@ -1975,6 +1978,7 @@ extension on Translations {
|
|||
'trust.count' => ({required Object n}) => 'Vouched for by ${n}',
|
||||
'trust.vouch' => 'I know this person',
|
||||
'trust.vouched' => 'You vouch for them',
|
||||
'trust.circle' => 'In your circle',
|
||||
_ => null,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -659,6 +659,7 @@ class _Translations$trust$es extends Translations$trust$en {
|
|||
@override String count({required Object n}) => 'Avalada por ${n}';
|
||||
@override String get vouch => 'Conozco a esta persona';
|
||||
@override String get vouched => 'Avalas a esta persona';
|
||||
@override String get circle => 'En tu círculo';
|
||||
}
|
||||
|
||||
// Path: intro.slides
|
||||
|
|
@ -1333,6 +1334,7 @@ extension on TranslationsEs {
|
|||
'trust.count' => ({required Object n}) => 'Avalada por ${n}',
|
||||
'trust.vouch' => 'Conozco a esta persona',
|
||||
'trust.vouched' => 'Avalas a esta persona',
|
||||
'trust.circle' => 'En tu círculo',
|
||||
_ => null,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -655,6 +655,7 @@ class _Translations$trust$pt extends Translations$trust$en {
|
|||
@override String count({required Object n}) => 'Avalizada por ${n}';
|
||||
@override String get vouch => 'Conheço esta pessoa';
|
||||
@override String get vouched => 'Avalizas esta pessoa';
|
||||
@override String get circle => 'No teu círculo';
|
||||
}
|
||||
|
||||
// Path: intro.slides
|
||||
|
|
@ -1325,6 +1326,7 @@ extension on TranslationsPt {
|
|||
'trust.count' => ({required Object n}) => 'Avalizada por ${n}',
|
||||
'trust.vouch' => 'Conheço esta pessoa',
|
||||
'trust.vouched' => 'Avalizas esta pessoa',
|
||||
'trust.circle' => 'No teu círculo',
|
||||
_ => null,
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import 'di/injector.dart';
|
|||
import 'i18n/strings.g.dart';
|
||||
import 'services/auto_backup_service.dart';
|
||||
import 'services/coarse_location.dart';
|
||||
import 'services/message_store.dart';
|
||||
import 'services/offer_outbox.dart';
|
||||
import 'services/onboarding_store.dart';
|
||||
import 'services/social_service.dart';
|
||||
|
|
@ -27,6 +28,7 @@ Future<void> main() async {
|
|||
socialSettings: getIt<SocialSettings>(),
|
||||
location: const GeolocatorCoarseLocation(),
|
||||
outbox: getIt<OfferOutbox>(),
|
||||
messageStore: getIt<MessageStore>(),
|
||||
showIntro: !await onboarding.introSeen(),
|
||||
autoBackup: getIt.isRegistered<AutoBackupService>()
|
||||
? getIt<AutoBackupService>()
|
||||
|
|
|
|||
56
apps/app_seeds/lib/services/message_store.dart
Normal file
56
apps/app_seeds/lib/services/message_store.dart
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
import 'dart:convert';
|
||||
|
||||
import 'package:commons_core/commons_core.dart';
|
||||
|
||||
import '../security/secret_store.dart';
|
||||
|
||||
/// Persists a 1:1 chat history, keystore-backed (so no plaintext at rest). A
|
||||
/// capped, per-peer JSON list — recent history survives leaving the chat. Small
|
||||
/// and simple on purpose; the encrypted Drift DB is the eventual home if chats
|
||||
/// grow large.
|
||||
class MessageStore {
|
||||
MessageStore(this._store);
|
||||
|
||||
final SecretStore _store;
|
||||
static const _prefix = 'tane.social.chat.';
|
||||
|
||||
/// Keep only the most recent [_cap] messages per conversation, to bound the
|
||||
/// keystore entry size.
|
||||
static const _cap = 200;
|
||||
|
||||
String _key(String peerPubkey) => '$_prefix$peerPubkey';
|
||||
|
||||
/// Messages exchanged with [peerPubkey], oldest first.
|
||||
Future<List<PrivateMessage>> history(String peerPubkey) async {
|
||||
final raw = await _store.read(_key(peerPubkey));
|
||||
if (raw == null || raw.isEmpty) return const [];
|
||||
final list = jsonDecode(raw) as List;
|
||||
return [
|
||||
for (final m in list.cast<Map<String, dynamic>>())
|
||||
PrivateMessage(
|
||||
fromPubkey: m['from'] as String,
|
||||
text: m['text'] as String,
|
||||
at: DateTime.fromMillisecondsSinceEpoch(m['at'] as int),
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
/// Appends [message] to the conversation with [peerPubkey] (trimming to the
|
||||
/// cap).
|
||||
Future<void> append(String peerPubkey, PrivateMessage message) async {
|
||||
final next = [...await history(peerPubkey), message];
|
||||
final capped =
|
||||
next.length > _cap ? next.sublist(next.length - _cap) : next;
|
||||
await _store.write(
|
||||
_key(peerPubkey),
|
||||
jsonEncode([
|
||||
for (final m in capped)
|
||||
{
|
||||
'from': m.fromPubkey,
|
||||
'text': m.text,
|
||||
'at': m.at.millisecondsSinceEpoch,
|
||||
},
|
||||
]),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ import 'package:commons_core/commons_core.dart';
|
|||
import 'package:equatable/equatable.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../services/message_store.dart';
|
||||
import '../services/social_service.dart';
|
||||
import '../services/social_settings.dart';
|
||||
|
||||
|
|
@ -46,11 +47,14 @@ class MessagesCubit extends Cubit<ChatState> {
|
|||
this._transport, {
|
||||
required this.peerPubkey,
|
||||
required this.selfPubkey,
|
||||
MessageStore? store,
|
||||
Future<void> Function()? onDispose,
|
||||
}) : _onDispose = onDispose,
|
||||
}) : _store = store,
|
||||
_onDispose = onDispose,
|
||||
super(const ChatState());
|
||||
|
||||
final MessageTransport? _transport;
|
||||
final MessageStore? _store;
|
||||
final String peerPubkey;
|
||||
final String selfPubkey;
|
||||
final Future<void> Function()? _onDispose;
|
||||
|
|
@ -58,17 +62,26 @@ class MessagesCubit extends Cubit<ChatState> {
|
|||
|
||||
bool get isOnline => _transport != null;
|
||||
|
||||
/// Subscribes to incoming messages from [peerPubkey].
|
||||
void start() {
|
||||
/// Subscribes to incoming messages, then loads any saved history. Subscribing
|
||||
/// first (before the async history load) avoids dropping an event that arrives
|
||||
/// during the load.
|
||||
Future<void> start() async {
|
||||
final transport = _transport;
|
||||
if (transport == null) return;
|
||||
_sub = transport.inbox().listen(
|
||||
(message) {
|
||||
if (message.fromPubkey != peerPubkey) return; // another conversation
|
||||
emit(state.copyWith(messages: [...state.messages, message]));
|
||||
},
|
||||
onError: (Object e) => emit(state.copyWith(error: () => '$e')),
|
||||
);
|
||||
if (transport != null) {
|
||||
_sub = transport.inbox().listen(
|
||||
(message) async {
|
||||
if (message.fromPubkey != peerPubkey) return; // another conversation
|
||||
await _store?.append(peerPubkey, message);
|
||||
emit(state.copyWith(messages: [...state.messages, message]));
|
||||
},
|
||||
onError: (Object e) => emit(state.copyWith(error: () => '$e')),
|
||||
);
|
||||
}
|
||||
// History is older than anything that arrives now, so prepend it.
|
||||
final history = await _store?.history(peerPubkey);
|
||||
if (history != null && history.isNotEmpty) {
|
||||
emit(state.copyWith(messages: [...history, ...state.messages]));
|
||||
}
|
||||
}
|
||||
|
||||
/// Sends [text] to the peer and appends it optimistically.
|
||||
|
|
@ -79,16 +92,15 @@ class MessagesCubit extends Cubit<ChatState> {
|
|||
emit(state.copyWith(sending: true, error: () => null));
|
||||
try {
|
||||
await transport.send(toPubkey: peerPubkey, text: trimmed);
|
||||
final mine = PrivateMessage(
|
||||
fromPubkey: selfPubkey,
|
||||
text: trimmed,
|
||||
at: DateTime.now(),
|
||||
);
|
||||
await _store?.append(peerPubkey, mine);
|
||||
emit(state.copyWith(
|
||||
sending: false,
|
||||
messages: [
|
||||
...state.messages,
|
||||
PrivateMessage(
|
||||
fromPubkey: selfPubkey,
|
||||
text: trimmed,
|
||||
at: DateTime.now(),
|
||||
),
|
||||
],
|
||||
messages: [...state.messages, mine],
|
||||
));
|
||||
} catch (e) {
|
||||
emit(state.copyWith(sending: false, error: () => '$e'));
|
||||
|
|
|
|||
|
|
@ -14,30 +14,43 @@ class TrustState extends Equatable {
|
|||
const TrustState({
|
||||
this.certifierCount = 0,
|
||||
this.iVouch = false,
|
||||
this.knownToYou = false,
|
||||
this.loading = true,
|
||||
this.busy = false,
|
||||
});
|
||||
|
||||
/// How many people (network-wide) vouch for the peer.
|
||||
final int certifierCount;
|
||||
|
||||
/// Whether this user vouches for the peer.
|
||||
final bool iVouch;
|
||||
|
||||
/// Whether the peer is within the user's own circle of trust — you vouch for
|
||||
/// them, or someone you vouch for does (friend-of-a-friend). This is the
|
||||
/// meaningful signal; a raw network count invites spam.
|
||||
final bool knownToYou;
|
||||
|
||||
final bool loading;
|
||||
final bool busy;
|
||||
|
||||
TrustState copyWith({
|
||||
int? certifierCount,
|
||||
bool? iVouch,
|
||||
bool? knownToYou,
|
||||
bool? loading,
|
||||
bool? busy,
|
||||
}) =>
|
||||
TrustState(
|
||||
certifierCount: certifierCount ?? this.certifierCount,
|
||||
iVouch: iVouch ?? this.iVouch,
|
||||
knownToYou: knownToYou ?? this.knownToYou,
|
||||
loading: loading ?? this.loading,
|
||||
busy: busy ?? this.busy,
|
||||
);
|
||||
|
||||
@override
|
||||
List<Object?> get props => [certifierCount, iVouch, loading, busy];
|
||||
List<Object?> get props =>
|
||||
[certifierCount, iVouch, knownToYou, loading, busy];
|
||||
}
|
||||
|
||||
/// Reads and toggles this user's vouch for [peerPubkey] over a [TrustTransport].
|
||||
|
|
@ -57,7 +70,13 @@ class TrustCubit extends Cubit<TrustState> {
|
|||
|
||||
bool get isOnline => _transport != null;
|
||||
|
||||
/// Loads the current certifiers of the peer.
|
||||
/// Bootstrap "circle" rule: one vouch from your side, out to a friend-of-a-
|
||||
/// friend. Deliberately loose (the full member policy — threshold/distance —
|
||||
/// is still open, network-trust.md §2); this is just "people near you".
|
||||
static const _circleThreshold = 1;
|
||||
static const _circleDistance = 2;
|
||||
|
||||
/// Loads the peer's certifiers and whether they're within your circle.
|
||||
Future<void> load() async {
|
||||
final transport = _transport;
|
||||
if (transport == null) {
|
||||
|
|
@ -65,10 +84,20 @@ class TrustCubit extends Cubit<TrustState> {
|
|||
return;
|
||||
}
|
||||
emit(state.copyWith(loading: true));
|
||||
final certifiers = await transport.certifiersOf(peerPubkey);
|
||||
final wot = WebOfTrust.fromCertifications(
|
||||
await transport.allCertifications(),
|
||||
now: DateTime.now(),
|
||||
);
|
||||
final certifiers = wot.certifiersOf(peerPubkey);
|
||||
final circle = wot.members(
|
||||
seeds: {selfPubkey},
|
||||
threshold: _circleThreshold,
|
||||
maxDistance: _circleDistance,
|
||||
);
|
||||
emit(state.copyWith(
|
||||
certifierCount: certifiers.length,
|
||||
iVouch: certifiers.contains(selfPubkey),
|
||||
knownToYou: circle.contains(peerPubkey),
|
||||
loading: false,
|
||||
));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
|||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../i18n/strings.g.dart';
|
||||
import '../services/message_store.dart';
|
||||
import '../services/social_service.dart';
|
||||
import '../services/social_settings.dart';
|
||||
import '../state/messages_cubit.dart';
|
||||
|
|
@ -18,6 +19,7 @@ class ChatScreen extends StatefulWidget {
|
|||
required this.social,
|
||||
required this.settings,
|
||||
required this.peerPubkey,
|
||||
this.messageStore,
|
||||
super.key,
|
||||
});
|
||||
|
||||
|
|
@ -25,6 +27,9 @@ class ChatScreen extends StatefulWidget {
|
|||
final SocialSettings settings;
|
||||
final String peerPubkey;
|
||||
|
||||
/// Optional persistence for chat history (keystore-backed); null in tests.
|
||||
final MessageStore? messageStore;
|
||||
|
||||
@override
|
||||
State<ChatScreen> createState() => _ChatScreenState();
|
||||
}
|
||||
|
|
@ -59,9 +64,12 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||
return;
|
||||
}
|
||||
final self = widget.social.publicKeyHex;
|
||||
final messages = MessagesCubit(session?.messages,
|
||||
peerPubkey: widget.peerPubkey, selfPubkey: self)
|
||||
..start();
|
||||
final messages = MessagesCubit(
|
||||
session?.messages,
|
||||
peerPubkey: widget.peerPubkey,
|
||||
selfPubkey: self,
|
||||
store: widget.messageStore,
|
||||
)..start();
|
||||
final trust = TrustCubit(session?.trust,
|
||||
peerPubkey: widget.peerPubkey, selfPubkey: self);
|
||||
unawaited(trust.load());
|
||||
|
|
@ -173,20 +181,31 @@ class _TrustBanner extends StatelessWidget {
|
|||
builder: (context, state) {
|
||||
final cubit = context.read<TrustCubit>();
|
||||
if (!cubit.isOnline || state.loading) return const SizedBox.shrink();
|
||||
final known = state.knownToYou;
|
||||
return Container(
|
||||
width: double.infinity,
|
||||
color: seedPrimaryContainer.withValues(alpha: 0.5),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||
child: Row(
|
||||
children: [
|
||||
const Icon(Icons.verified_user_outlined, size: 18, color: seedGreen),
|
||||
Icon(
|
||||
known ? Icons.verified : Icons.verified_user_outlined,
|
||||
size: 18,
|
||||
color: seedGreen,
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
state.certifierCount == 0
|
||||
? t.trust.none
|
||||
: t.trust.count(n: state.certifierCount),
|
||||
style: const TextStyle(color: seedOnSurface, fontSize: 13),
|
||||
known
|
||||
? t.trust.circle
|
||||
: state.certifierCount == 0
|
||||
? t.trust.none
|
||||
: t.trust.count(n: state.certifierCount),
|
||||
style: TextStyle(
|
||||
color: known ? seedGreen : seedOnSurface,
|
||||
fontSize: 13,
|
||||
fontWeight: known ? FontWeight.w600 : FontWeight.w400,
|
||||
),
|
||||
),
|
||||
),
|
||||
TextButton(
|
||||
|
|
|
|||
46
apps/app_seeds/test/services/message_store_test.dart
Normal file
46
apps/app_seeds/test/services/message_store_test.dart
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
import 'package:commons_core/commons_core.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:tane/services/message_store.dart';
|
||||
|
||||
import '../support/test_support.dart';
|
||||
|
||||
void main() {
|
||||
late MessageStore store;
|
||||
setUp(() => store = MessageStore(InMemorySecretStore()));
|
||||
|
||||
PrivateMessage msg(String from, String text, int atMs) =>
|
||||
PrivateMessage(
|
||||
fromPubkey: from,
|
||||
text: text,
|
||||
at: DateTime.fromMillisecondsSinceEpoch(atMs));
|
||||
|
||||
test('history is empty for an unknown peer', () async {
|
||||
expect(await store.history('peer'), isEmpty);
|
||||
});
|
||||
|
||||
test('append then history round-trips, oldest first', () async {
|
||||
await store.append('peer', msg('peer', 'hi', 1000));
|
||||
await store.append('peer', msg('me', 'hello', 2000));
|
||||
final history = await store.history('peer');
|
||||
expect(history.map((m) => m.text), ['hi', 'hello']);
|
||||
expect(history.first.fromPubkey, 'peer');
|
||||
expect(history.last.at.millisecondsSinceEpoch, 2000);
|
||||
});
|
||||
|
||||
test('conversations are kept separate per peer', () async {
|
||||
await store.append('a', msg('a', 'toA', 1));
|
||||
await store.append('b', msg('b', 'toB', 1));
|
||||
expect((await store.history('a')).single.text, 'toA');
|
||||
expect((await store.history('b')).single.text, 'toB');
|
||||
});
|
||||
|
||||
test('history is capped to the most recent 200', () async {
|
||||
for (var i = 0; i < 210; i++) {
|
||||
await store.append('peer', msg('me', 'm$i', i));
|
||||
}
|
||||
final history = await store.history('peer');
|
||||
expect(history, hasLength(200));
|
||||
expect(history.first.text, 'm10'); // oldest 10 dropped
|
||||
expect(history.last.text, 'm209');
|
||||
});
|
||||
}
|
||||
|
|
@ -2,8 +2,11 @@ import 'dart:async';
|
|||
|
||||
import 'package:commons_core/commons_core.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:tane/services/message_store.dart';
|
||||
import 'package:tane/state/messages_cubit.dart';
|
||||
|
||||
import '../support/test_support.dart';
|
||||
|
||||
/// In-memory [MessageTransport]: records sends, lets a test push inbox messages.
|
||||
class FakeMessageTransport implements MessageTransport {
|
||||
final List<({String to, String text})> sent = [];
|
||||
|
|
@ -80,6 +83,33 @@ void main() {
|
|||
await cubit.close();
|
||||
});
|
||||
|
||||
test('loads saved history on start and persists across a new cubit',
|
||||
() async {
|
||||
final store = MessageStore(InMemorySecretStore());
|
||||
await store.append(
|
||||
peer, msg(peer, 'earlier')); // a message from a previous session
|
||||
|
||||
final transport = FakeMessageTransport();
|
||||
final cubit = MessagesCubit(transport,
|
||||
peerPubkey: peer, selfPubkey: me, store: store);
|
||||
await cubit.start();
|
||||
expect(cubit.state.messages.map((m) => m.text), ['earlier']);
|
||||
|
||||
await cubit.send('hi'); // persisted
|
||||
transport.receive(msg(peer, 'reply')); // persisted
|
||||
await pumpEventQueue();
|
||||
expect(cubit.state.messages.map((m) => m.text), ['earlier', 'hi', 'reply']);
|
||||
await cubit.close();
|
||||
|
||||
// A fresh cubit (even offline) sees the saved conversation.
|
||||
final reopened =
|
||||
MessagesCubit(null, peerPubkey: peer, selfPubkey: me, store: store);
|
||||
await reopened.start();
|
||||
expect(reopened.state.messages.map((m) => m.text),
|
||||
['earlier', 'hi', 'reply']);
|
||||
await reopened.close();
|
||||
});
|
||||
|
||||
test('offline (no transport) never throws', () async {
|
||||
final cubit = MessagesCubit(null, peerPubkey: peer, selfPubkey: me)..start();
|
||||
expect(cubit.isOnline, isFalse);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,11 @@ import 'package:tane/state/trust_cubit.dart';
|
|||
class FakeTrustTransport implements TrustTransport {
|
||||
FakeTrustTransport(this.selfId);
|
||||
final String selfId;
|
||||
final Map<String, Set<String>> _certs = {};
|
||||
final Map<String, Set<String>> _certs = {}; // subject -> issuers
|
||||
|
||||
/// Test helper: record an arbitrary issuer→subject vouch (to build a graph).
|
||||
void addCert(String issuer, String subject) =>
|
||||
(_certs[subject] ??= {}).add(issuer);
|
||||
|
||||
@override
|
||||
Future<Set<String>> certifiersOf(String subjectPubkey) async =>
|
||||
|
|
@ -18,14 +22,22 @@ class FakeTrustTransport implements TrustTransport {
|
|||
Duration validity = const Duration(days: 365),
|
||||
String note = '',
|
||||
}) async =>
|
||||
(_certs[subjectPubkey] ??= {}).add(selfId);
|
||||
addCert(selfId, subjectPubkey);
|
||||
|
||||
@override
|
||||
Future<void> revoke({required String subjectPubkey}) async =>
|
||||
_certs[subjectPubkey]?.remove(selfId);
|
||||
|
||||
@override
|
||||
Future<List<Certification>> allCertifications() async => const [];
|
||||
Future<List<Certification>> allCertifications() async => [
|
||||
for (final entry in _certs.entries)
|
||||
for (final issuer in entry.value)
|
||||
Certification(
|
||||
issuer: issuer,
|
||||
subject: entry.key,
|
||||
issuedAt: DateTime(2026),
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
Future<void> close() async {}
|
||||
|
|
@ -62,6 +74,23 @@ void main() {
|
|||
await cubit.close();
|
||||
});
|
||||
|
||||
test('a friend-of-a-friend is in your circle; a stranger is not', () async {
|
||||
final transport = FakeTrustTransport(me)
|
||||
..addCert(me, 'friend') // you vouch for a friend
|
||||
..addCert('friend', peer) // your friend vouches for the peer
|
||||
..addCert('stranger', 'other'); // unrelated to you
|
||||
|
||||
final inCircle = TrustCubit(transport, peerPubkey: peer, selfPubkey: me);
|
||||
await inCircle.load();
|
||||
expect(inCircle.state.knownToYou, isTrue);
|
||||
await inCircle.close();
|
||||
|
||||
final outside = TrustCubit(transport, peerPubkey: 'other', selfPubkey: me);
|
||||
await outside.load();
|
||||
expect(outside.state.knownToYou, isFalse);
|
||||
await outside.close();
|
||||
});
|
||||
|
||||
test('never vouches for self', () async {
|
||||
final cubit =
|
||||
TrustCubit(FakeTrustTransport(me), peerPubkey: me, selfPubkey: me);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
import 'dart:async';
|
||||
|
||||
import 'package:commons_core/commons_core.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||
|
|
@ -14,6 +11,12 @@ import 'package:tane/ui/market_screen.dart';
|
|||
|
||||
import '../support/test_support.dart';
|
||||
|
||||
// NOTE: discovery/offer-list rendering is covered by offers_cubit_test.dart
|
||||
// (plain `test` + pumpEventQueue). We deliberately do NOT drive discovery
|
||||
// through `testWidgets` here: the transient "searching" CircularProgressIndicator
|
||||
// never settles under pumpAndSettle and hangs the runner. These widget tests
|
||||
// only cover the offline/setup paths, which have no live stream.
|
||||
|
||||
/// A location provider returning a fixed coarse position.
|
||||
class FakeLocation implements CoarseLocationProvider {
|
||||
FakeLocation(this.lat, this.lon);
|
||||
|
|
@ -24,32 +27,7 @@ class FakeLocation implements CoarseLocationProvider {
|
|||
(lat: lat, lon: lon);
|
||||
}
|
||||
|
||||
/// In-memory offer transport: discover matches by geohash prefix.
|
||||
class FakeOfferTransport implements OfferTransport {
|
||||
final List<Offer> offers;
|
||||
FakeOfferTransport(this.offers);
|
||||
|
||||
@override
|
||||
Future<PublishResult> publish(Offer offer) async =>
|
||||
PublishResult(accepted: true, transportRef: offer.id);
|
||||
|
||||
@override
|
||||
Stream<Offer> discover(DiscoveryQuery query) {
|
||||
final c = StreamController<Offer>();
|
||||
for (final o in offers) {
|
||||
if (o.approxGeohash.startsWith(query.geohashPrefix)) c.add(o);
|
||||
}
|
||||
unawaited(c.close()); // finite: deliver buffered matches, then done
|
||||
return c.stream;
|
||||
}
|
||||
|
||||
@override
|
||||
Future<void> retract(String offerId) async {}
|
||||
@override
|
||||
Future<void> close() async {}
|
||||
}
|
||||
|
||||
Widget _wrapBody(OffersCubit cubit, {String? selfPubkey}) {
|
||||
Widget _wrapBody(OffersCubit cubit) {
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
return TranslationProvider(
|
||||
child: MaterialApp(
|
||||
|
|
@ -63,65 +41,31 @@ Widget _wrapBody(OffersCubit cubit, {String? selfPubkey}) {
|
|||
home: Scaffold(
|
||||
body: BlocProvider.value(
|
||||
value: cubit,
|
||||
child: MarketBody(onConfigure: () {}, selfPubkey: selfPubkey),
|
||||
child: MarketBody(onConfigure: () {}),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Offer _offer(String id, String summary, OfferType type) => Offer(
|
||||
id: id,
|
||||
authorPubkeyHex: 'ab' * 32,
|
||||
summary: summary,
|
||||
type: type,
|
||||
approxGeohash: 'sp3e9',
|
||||
);
|
||||
Widget _wrapMarket(SocialService social, SocialSettings settings,
|
||||
{CoarseLocationProvider? location}) {
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
return TranslationProvider(
|
||||
child: MaterialApp(
|
||||
locale: AppLocale.en.flutterLocale,
|
||||
supportedLocales: AppLocaleUtils.supportedLocales,
|
||||
localizationsDelegates: const [
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalWidgetsLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
],
|
||||
home: MarketScreen(social: social, settings: settings, location: location),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void main() {
|
||||
testWidgets('shows a "You" badge on my own listing', (tester) async {
|
||||
const me = 'aa';
|
||||
final cubit = OffersCubit(FakeOfferTransport([
|
||||
Offer(
|
||||
id: '1',
|
||||
authorPubkeyHex: me,
|
||||
summary: 'Mine',
|
||||
type: OfferType.gift,
|
||||
approxGeohash: 'sp3e9',
|
||||
),
|
||||
]));
|
||||
await tester.pumpWidget(_wrapBody(cubit, selfPubkey: me));
|
||||
await cubit.discover('sp3');
|
||||
// Pump a couple of frames (NOT pumpAndSettle — the brief "searching" spinner
|
||||
// never settles). The buffered offers deliver on a microtask.
|
||||
await tester.pump();
|
||||
await tester.pump();
|
||||
|
||||
expect(find.text('You'), findsOneWidget);
|
||||
// My own listing offers no "Message yourself" button.
|
||||
expect(find.text('Message'), findsNothing);
|
||||
await cubit.close();
|
||||
});
|
||||
|
||||
testWidgets('renders discovered offers with their type', (tester) async {
|
||||
final cubit = OffersCubit(FakeOfferTransport([
|
||||
_offer('1', 'Tomate rosa de Barbastro', OfferType.gift),
|
||||
_offer('2', 'Judía del ganxet', OfferType.exchange),
|
||||
]));
|
||||
addTearDown(cubit.close);
|
||||
|
||||
await tester.pumpWidget(_wrapBody(cubit));
|
||||
await cubit.discover('sp3');
|
||||
// Pump a couple of frames (NOT pumpAndSettle — the brief "searching" spinner
|
||||
// never settles). The buffered offers deliver on a microtask.
|
||||
await tester.pump();
|
||||
await tester.pump();
|
||||
|
||||
expect(find.text('Tomate rosa de Barbastro'), findsOneWidget);
|
||||
expect(find.text('Judía del ganxet'), findsOneWidget);
|
||||
expect(find.text('Near you'), findsWidgets);
|
||||
});
|
||||
|
||||
testWidgets('offline (no transport) shows the "set up sharing" prompt',
|
||||
(tester) async {
|
||||
final cubit = OffersCubit(null);
|
||||
|
|
@ -139,22 +83,8 @@ void main() {
|
|||
final social = await SocialService.fromRootSeedHex('00' * 32);
|
||||
final settings = SocialSettings(InMemorySecretStore());
|
||||
await settings.setRelayUrls(const []); // offline: don't hit the network
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
|
||||
await tester.pumpWidget(
|
||||
TranslationProvider(
|
||||
child: MaterialApp(
|
||||
locale: AppLocale.en.flutterLocale,
|
||||
supportedLocales: AppLocaleUtils.supportedLocales,
|
||||
localizationsDelegates: const [
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalWidgetsLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
],
|
||||
home: MarketScreen(social: social, settings: settings),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpWidget(_wrapMarket(social, settings));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Seeds near you'), findsOneWidget); // app bar title
|
||||
|
|
@ -166,25 +96,9 @@ void main() {
|
|||
final social = await SocialService.fromRootSeedHex('00' * 32);
|
||||
final settings = SocialSettings(InMemorySecretStore());
|
||||
await settings.setRelayUrls(const []); // offline: don't hit the network
|
||||
LocaleSettings.setLocaleSync(AppLocale.en);
|
||||
|
||||
await tester.pumpWidget(
|
||||
TranslationProvider(
|
||||
child: MaterialApp(
|
||||
locale: AppLocale.en.flutterLocale,
|
||||
supportedLocales: AppLocaleUtils.supportedLocales,
|
||||
localizationsDelegates: const [
|
||||
GlobalMaterialLocalizations.delegate,
|
||||
GlobalWidgetsLocalizations.delegate,
|
||||
GlobalCupertinoLocalizations.delegate,
|
||||
],
|
||||
home: MarketScreen(
|
||||
social: social,
|
||||
settings: settings,
|
||||
location: FakeLocation(41.39, 2.16), // Barcelona-ish
|
||||
),
|
||||
),
|
||||
),
|
||||
_wrapMarket(social, settings, location: FakeLocation(41.39, 2.16)),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue