feat: desktop messaging + pairing + cross-client master-pub attribution (v2.2.0-alpha5)
Two coordinated changes:
1. Desktop client gets a functional Messages section and working pairing
flow, putting it at feature parity with mobile for the v2.2.0 line.
2. Server + both clients teach each other to use the sender's master
Ed25519 (not just their X25519) to address conversations, so a peer
writing from a different linked device still rolls into the same chat.
This is the "new API logic" the desktop scaffold was waiting on.
Server (node/api_relay.go, cmd/node/main.go):
* /relay/inbox items now carry `sender_ed25519_pub` alongside the
per-device `sender_pub`. Empty string for pre-v2.2.0 senders.
* WS `inbox` push summary also includes `sender_ed25519_pub`, so the
client can skip the refetch when the envelope plainly isn't for
the chat they're watching.
* Both existing tests pass.
Mobile client:
* lib/types.ts Envelope grew `sender_ed25519_pub`; fetchInbox normalises
it (default '') for older nodes.
* hooks/useGlobalInbox matches contacts by (master Ed25519 OR legacy
X25519) so an incoming message from a peer's desktop reuses the
existing chat instead of creating a duplicate placeholder.
* hooks/useMessages now takes an optional `contactMasterEd25519` and
exposes a matchesChat() predicate; WS inbox handler uses it too to
avoid spurious refetches.
* chats/[id].tsx passes `contact.address` (master) along with x25519.
Desktop client — all new:
* src/lib/crypto.ts — tweetnacl hex/base64 helpers, generateKeyFile,
encryptMessage/decryptMessage, signBase64, shortAddr. Same signatures
as the mobile lib; uses Chromium's window.crypto, no expo-crypto dep.
* src/lib/tx.ts — buildTransferTx / buildLinkDeviceTx / buildUnlinkDeviceTx
+ submitTx + humanizeTxError, canonical-bytes identical to mobile.
* src/lib/relay.ts — fetchInbox, sendEnvelope, resolveRecipientKeys
(multi-device fan-out with legacy identity.x25519 fallback).
* src/lib/store.ts — zustand state gets messages{}, unread{},
activeChat.
* src/lib/storage.ts — per-chat cache via localStorage (500-msg cap).
* src/hooks/useInboxPoll — 4s polling loop, addresses conversations
by master Ed25519, bumps unread unless chat is active.
* src/sections/messages/* — ChatList (sorted tiles, unread badges),
Conversation (auto-scroll messages + composer + fan-out send,
Enter-to-send / Shift+Enter for newline), EmptyConversation.
* src/auth/Pair.tsx — 6-digit code + device key screen, polls inbox
for a handshake envelope, assembles the KeyFile on arrival.
* Welcome.tsx: Pair button now actually routes to <Pair>; imports
generateKeyFile from lib/crypto (was inlined).
docs/ROADMAP.md delta: alpha5 row flipped to done inline. Alpha6
(feed + wallet) and rc1 (contacts + devices UI + profile) still
pending.
This commit is contained in:
@@ -24,10 +24,26 @@ import { tryParsePostRef } from '@/lib/forwardPost';
|
||||
const FALLBACK_POLL_INTERVAL = 30_000; // HTTP poll when WS is down
|
||||
const WS_GRACE_BEFORE_POLLING = 15_000; // don't start polling immediately on disconnect
|
||||
|
||||
export function useMessages(contactX25519: string) {
|
||||
/**
|
||||
* useMessages — mounts per-chat inbox consumption. Accepts:
|
||||
* - contactX25519: the legacy/primary X25519 for the contact.
|
||||
* - contactMasterEd25519 (optional, v2.2.0+): the contact's master
|
||||
* identity so we can attribute envelopes from any of their
|
||||
* linked devices to this conversation.
|
||||
*
|
||||
* Matching rule: an envelope belongs to this chat when
|
||||
* env.sender_ed25519_pub === contactMasterEd25519 (v2.2.0 path)
|
||||
* OR env.sender_pub === contactX25519 (legacy path)
|
||||
*/
|
||||
export function useMessages(contactX25519: string, contactMasterEd25519?: string) {
|
||||
const keyFile = useStore(s => s.keyFile);
|
||||
const appendMsg = useStore(s => s.appendMessage);
|
||||
|
||||
const matchesChat = useCallback((env: { sender_pub: string; sender_ed25519_pub: string }): boolean => {
|
||||
if (contactMasterEd25519 && env.sender_ed25519_pub === contactMasterEd25519) return true;
|
||||
return env.sender_pub === contactX25519;
|
||||
}, [contactX25519, contactMasterEd25519]);
|
||||
|
||||
// Подгружаем кэш сообщений из AsyncStorage при открытии чата.
|
||||
// Релей держит envelope'ы всего 7 дней, поэтому без чтения кэша
|
||||
// история старше недели пропадает при каждом рестарте приложения.
|
||||
@@ -48,8 +64,8 @@ export function useMessages(contactX25519: string) {
|
||||
try {
|
||||
const envelopes = await fetchInbox(keyFile.x25519_pub);
|
||||
for (const env of envelopes) {
|
||||
// Only process messages from this contact
|
||||
if (env.sender_pub !== contactX25519) continue;
|
||||
// Only process messages that belong to this chat (see matchesChat).
|
||||
if (!matchesChat(env)) continue;
|
||||
|
||||
const text = decryptMessage(
|
||||
env.ciphertext,
|
||||
@@ -130,10 +146,17 @@ export function useMessages(contactX25519: string) {
|
||||
// the handler so we only render messages in THIS chat.
|
||||
const offInbox = ws.subscribe('inbox:' + keyFile.x25519_pub, (frame) => {
|
||||
if (frame.event !== 'inbox') return;
|
||||
const d = frame.data as { sender_pub?: string } | undefined;
|
||||
// Optimisation: if the envelope is from a different peer, skip the
|
||||
// whole refetch — we'd just drop it in the sender filter below anyway.
|
||||
if (d?.sender_pub && d.sender_pub !== contactX25519) return;
|
||||
const d = frame.data as {
|
||||
sender_pub?: string; sender_ed25519_pub?: string;
|
||||
} | undefined;
|
||||
// Optimisation: if the envelope definitely isn't for this chat,
|
||||
// skip the whole refetch. Multi-device aware — the peer may be
|
||||
// writing from any of their linked devices (different X25519
|
||||
// pubs), so we check against their master Ed25519 too.
|
||||
if (d && !matchesChat({
|
||||
sender_pub: d.sender_pub ?? '',
|
||||
sender_ed25519_pub: d.sender_ed25519_pub ?? '',
|
||||
})) return;
|
||||
pullAndDecrypt();
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user