Private messages (NIP-17) arrived in the foreground with no signal: no unread count, no badge, no OS notification. Hook both into the single InboxService.ingest choke point. - UnreadService: per-peer "last read" in the keystore (timestamps+pubkey only, no message text), live count via a changes stream, active-peer suppression so the open chat never badges or notifies. - UnreadBadge: reusable, RTL-aware (Flutter Badge) — on the home hamburger, the drawer "Chat" item, and per-conversation in the messages list. - Mark-read on chat open (ChatScreen). - NotificationService over flutter_local_notifications: generic "New message from <name>" (no message text, for privacy), payload = pubkey, tap opens /chat/:pubkey. No-op on web/Windows; Android POST_NOTIFICATIONS. - i18n notifications.newMessageFrom (en/es/pt/ast). Background/push stays out of scope (foreground-only by design). Tests: UnreadService, NotificationService (mock plugin), InboxService hooks (new peer notifies/counts; duplicate, own, and open-chat do not), and a UnreadBadge widget test. dart analyze clean; commons_core green.
171 lines
5.9 KiB
Dart
171 lines
5.9 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:commons_core/commons_core.dart';
|
|
import 'package:connectivity_plus/connectivity_plus.dart';
|
|
import 'package:flutter/foundation.dart';
|
|
|
|
import '../i18n/strings.g.dart';
|
|
import 'message_store.dart';
|
|
import 'notification_service.dart';
|
|
import 'profile_cache.dart';
|
|
import 'social_service.dart';
|
|
import 'social_settings.dart';
|
|
import 'unread_service.dart';
|
|
|
|
/// App-wide inbox listener for private messages (NIP-17).
|
|
///
|
|
/// Without this, a message only arrived while its specific chat screen was
|
|
/// open — so a first message from a new peer was invisible (nothing in local
|
|
/// storage, so nothing in the inbox list, so you never opened the chat, so you
|
|
/// never subscribed). This keeps ONE long-lived subscription for the whole app
|
|
/// while online: it persists every incoming message to the [MessageStore] and
|
|
/// fires [changes] so the inbox list refreshes. Reconnects when the network
|
|
/// returns; degrades to nothing offline (local-first).
|
|
///
|
|
/// Foreground only — background/push delivery is a later concern.
|
|
class InboxService {
|
|
InboxService({
|
|
required SocialService social,
|
|
required SocialSettings settings,
|
|
required MessageStore store,
|
|
ProfileCache? profileCache,
|
|
UnreadService? unread,
|
|
NotificationService? notifications,
|
|
}) : _social = social,
|
|
_settings = settings,
|
|
_store = store,
|
|
_profileCache = profileCache,
|
|
_unread = unread,
|
|
_notifications = notifications;
|
|
|
|
final SocialService _social;
|
|
final SocialSettings _settings;
|
|
final MessageStore _store;
|
|
final ProfileCache? _profileCache;
|
|
final UnreadService? _unread;
|
|
final NotificationService? _notifications;
|
|
|
|
final _changes = StreamController<void>.broadcast();
|
|
SocialSession? _session;
|
|
StreamSubscription<PrivateMessage>? _inboxSub;
|
|
StreamSubscription<List<ConnectivityResult>>? _connSub;
|
|
bool _started = false;
|
|
bool _connecting = false;
|
|
|
|
/// Fires (with no payload) after a NEW message is persisted — the inbox list
|
|
/// listens to this to reload. Broadcast, so several screens can listen.
|
|
Stream<void> get changes => _changes.stream;
|
|
|
|
/// Begins listening. Idempotent. Connects now if online, and (re)connects
|
|
/// whenever the network returns. Safe to call once at app start.
|
|
Future<void> start() async {
|
|
if (_started) return;
|
|
_started = true;
|
|
try {
|
|
_connSub = Connectivity().onConnectivityChanged.listen((results) {
|
|
final offline =
|
|
results.isEmpty || results.every((r) => r == ConnectivityResult.none);
|
|
if (offline) {
|
|
_dropSession();
|
|
} else {
|
|
unawaited(_connect());
|
|
}
|
|
});
|
|
} catch (_) {
|
|
// Platform without connectivity support — just try once below.
|
|
}
|
|
await _connect();
|
|
}
|
|
|
|
/// Opens a session and subscribes to the inbox, if not already connected.
|
|
/// Guarded so overlapping connectivity events can't open two sessions.
|
|
Future<void> _connect() async {
|
|
if (_session != null || _connecting) return; // already (being) connected
|
|
_connecting = true;
|
|
try {
|
|
final relays = await _settings.relayUrls();
|
|
if (relays.isEmpty) return; // offline / unconfigured
|
|
final session = await _social.openSession(relays);
|
|
if (!_started) {
|
|
await session.close(); // stopped while connecting
|
|
return;
|
|
}
|
|
_session = session;
|
|
_inboxSub = session.messages.inbox().listen(
|
|
ingest,
|
|
onError: (_) => _dropSession(), // relay dropped — retry on next change
|
|
);
|
|
} catch (_) {
|
|
// No relay reachable — a later connectivity change retries.
|
|
} finally {
|
|
_connecting = false;
|
|
}
|
|
}
|
|
|
|
/// Persists one incoming [message] (deduped) and, when it's new, fires
|
|
/// [changes] and best-effort caches the sender's display name. Separated from
|
|
/// the transport so it can be unit-tested without a relay.
|
|
@visibleForTesting
|
|
Future<void> ingest(PrivateMessage message) async {
|
|
final stored = await _store.append(message.fromPubkey, message);
|
|
if (!stored) return; // a re-delivered duplicate
|
|
if (!_changes.isClosed) _changes.add(null);
|
|
|
|
final peer = message.fromPubkey;
|
|
// Defensive: never badge or notify for your own message. NIP-17 doesn't
|
|
// loop a sent gift wrap back to its author, so this shouldn't happen — the
|
|
// guard just keeps the seam honest.
|
|
if (peer != _social.publicKeyHex) {
|
|
await _unread?.onMessageReceived(peer, message);
|
|
await _maybeNotify(peer);
|
|
}
|
|
await _cacheName(peer);
|
|
}
|
|
|
|
/// Fires a text-free OS notification for a new message from [peer], unless its
|
|
/// chat is the one already on screen (then the message is visible anyway).
|
|
Future<void> _maybeNotify(String peer) async {
|
|
final notifications = _notifications;
|
|
if (notifications == null) return;
|
|
if (_unread?.activePeer == peer) return;
|
|
final name = await _profileCache?.name(peer) ?? shortPubkey(peer);
|
|
await notifications.showMessage(
|
|
peerPubkey: peer,
|
|
title: t.notifications.newMessageFrom(name: name),
|
|
);
|
|
}
|
|
|
|
Future<void> _cacheName(String peerPubkey) async {
|
|
final cache = _profileCache;
|
|
final session = _session;
|
|
if (cache == null || session == null) return;
|
|
if (await cache.name(peerPubkey) != null) return; // already known
|
|
try {
|
|
final profile = await session.profile.fetch(peerPubkey);
|
|
if (profile != null && profile.name.isNotEmpty) {
|
|
await cache.setName(peerPubkey, profile.name);
|
|
if (!_changes.isClosed) _changes.add(null); // re-render with the name
|
|
}
|
|
} catch (_) {
|
|
// best effort — the short key shows meanwhile
|
|
}
|
|
}
|
|
|
|
void _dropSession() {
|
|
unawaited(_inboxSub?.cancel());
|
|
_inboxSub = null;
|
|
unawaited(_session?.close());
|
|
_session = null;
|
|
}
|
|
|
|
Future<void> stop() async {
|
|
_started = false;
|
|
await _connSub?.cancel();
|
|
_connSub = null;
|
|
await _inboxSub?.cancel();
|
|
_inboxSub = null;
|
|
await _session?.close();
|
|
_session = null;
|
|
if (!_changes.isClosed) await _changes.close();
|
|
}
|
|
}
|