fix(desktop): auto-link device on sign-in + publish key on accept
Two bugs reported by the user:
1. After accepting a contact request on the desktop, the requester's
"Send message" call errored with "no encryption key published" for
the newly-accepted contact. Root cause: desktop never ran the
device-registry bootstrap (mobile does it from _layout.tsx on
sign-in) — so the desktop's X25519 pub was never published via
LINK_DEVICE, and resolveRecipientKeys returned an empty list.
2. On the accepting device, the new chat didn't appear in Messages
after tapping Accept — accept wrote the contact to store + disk
but didn't switch sections, so the user was stuck in Contacts
watching nothing happen.
Fixes:
* hooks/useDeviceBootstrap — direct port of mobile's _layout.tsx
bootstrap effect. On every sign-in:
- fetchDevices(master) → if our X25519 is listed, mark local
registered flag.
- not listed + was registered before → REVOKED → wipe state +
bounce to Welcome.
- not listed + never registered → submit LINK_DEVICE. Tx may
bounce if balance is zero; next launch retries.
Mounted from App.tsx so it runs once per authenticated session.
* RequestsList.accept — after submitting ACCEPT_CONTACT, check if
OUR X25519 is in the on-chain registry. If not, submit LINK_DEVICE
immediately (balance is now covered by the contact fee the peer
paid us). This closes the window where the peer couldn't encrypt
to us because our key wasn't published yet.
Also: after a successful accept, setSection('messages') +
setActiveChat(requester_pub), matching mobile's
router.replace('/chats/<pub>') flow.
* Conversation.send — nicer error copy when
resolveRecipientKeys returns []. Was: "recipient has no
encryption key published". Now: actionable text asking the peer
to re-open their app so the LINK_DEVICE tx commits.
This commit is contained in:
@@ -9,10 +9,11 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useStore } from '@/lib/store';
|
||||
import {
|
||||
buildAcceptContactTx, buildBlockContactTx, submitTx, humanizeTxError,
|
||||
buildAcceptContactTx, buildBlockContactTx, buildLinkDeviceTx,
|
||||
submitTx, humanizeTxError,
|
||||
} from '@/lib/tx';
|
||||
import { upsertContact as persistContact } from '@/lib/storage';
|
||||
import { getIdentity, type ContactRequestRaw } from '@/lib/api';
|
||||
import { upsertContact as persistContact, markDeviceRegistered, isDeviceRegistered } from '@/lib/storage';
|
||||
import { getIdentity, fetchDevices, type ContactRequestRaw } from '@/lib/api';
|
||||
import { shortAddr } from '@/lib/crypto';
|
||||
|
||||
export function RequestsList({
|
||||
@@ -43,8 +44,10 @@ export function RequestsList({
|
||||
function RequestRow({
|
||||
req, onChanged,
|
||||
}: { req: ContactRequestRaw; onChanged: () => void }) {
|
||||
const keyFile = useStore(s => s.keyFile);
|
||||
const upsertContact = useStore(s => s.upsertContact);
|
||||
const keyFile = useStore(s => s.keyFile);
|
||||
const upsertContact = useStore(s => s.upsertContact);
|
||||
const setSection = useStore(s => s.setSection);
|
||||
const setActiveChat = useStore(s => s.setActiveChat);
|
||||
|
||||
const [busy, setBusy] = useState<'accept' | 'block' | null>(null);
|
||||
const [err, setErr] = useState<string | null>(null);
|
||||
@@ -65,6 +68,34 @@ function RequestRow({
|
||||
privKey: keyFile.priv_key,
|
||||
});
|
||||
await submitTx(tx);
|
||||
|
||||
// Make sure OUR device is published on-chain too. The
|
||||
// useDeviceBootstrap effect tries this on sign-in, but if the
|
||||
// user had zero balance then the tx bounced; now that the
|
||||
// incoming CONTACT_REQUEST has paid us the contact fee, we
|
||||
// have the µT needed. Without this, the peer couldn't encrypt
|
||||
// to us — they'd see "recipient has no encryption key" even
|
||||
// though we just accepted.
|
||||
try {
|
||||
const ownDevices = await fetchDevices(keyFile.pub_key);
|
||||
const alreadyLinked = ownDevices.some(d => d.x25519_pub_key === keyFile.x25519_pub);
|
||||
if (!alreadyLinked && !isDeviceRegistered()) {
|
||||
const platform = await window.dchain.app.platform().catch(() => 'unknown');
|
||||
const deviceName = platform === 'darwin' ? 'Mac'
|
||||
: platform === 'win32' ? 'Windows'
|
||||
: platform === 'linux' ? 'Linux'
|
||||
: 'Desktop';
|
||||
const linkTx = buildLinkDeviceTx({
|
||||
from: keyFile.pub_key,
|
||||
x25519Pub: keyFile.x25519_pub,
|
||||
deviceName,
|
||||
privKey: keyFile.priv_key,
|
||||
});
|
||||
await submitTx(linkTx);
|
||||
markDeviceRegistered();
|
||||
}
|
||||
} catch { /* best-effort — next sign-in retries */ }
|
||||
|
||||
const c = {
|
||||
address: req.requester_pub,
|
||||
x25519Pub: identity?.x25519_pub ?? '',
|
||||
@@ -74,6 +105,10 @@ function RequestRow({
|
||||
};
|
||||
upsertContact(c);
|
||||
persistContact(c);
|
||||
// Jump the user straight into the new chat — mirrors mobile's
|
||||
// router.replace(/chats/<pub>) after accept.
|
||||
setActiveChat(req.requester_pub);
|
||||
setSection('messages');
|
||||
} else {
|
||||
const tx = buildBlockContactTx({
|
||||
from: keyFile.pub_key,
|
||||
|
||||
Reference in New Issue
Block a user