fix(admin): harden the boot DM — await a connected relay + guard teardown/rejection (#48, review CS-3) #49

Merged
padreug merged 2 commits from fix/boot-dm-await-connect into dev 2026-06-27 11:19:51 +00:00
2 changed files with 42 additions and 21 deletions

View file

@ -110,9 +110,13 @@ class AdminInterface {
this.config().then((config) => { this.config().then((config) => {
if (config.admin?.notifyAdminsOnBoot) { if (config.admin?.notifyAdminsOnBoot) {
this.notifyAdminsOfNewConnection(connectionString); // .catch so a boot-DM failure can't surface as an unhandled
// rejection (process-terminating under Node defaults). #48 / CS-3.
this.notifyAdminsOfNewConnection(connectionString).catch((e) =>
console.log('notifyAdminsOfNewConnection failed:', e?.message ?? e),
);
} }
}); }).catch((e) => console.log('config() failed during admin init:', e?.message ?? e));
} }
public async config(): Promise<IConfig> { public async config(): Promise<IConfig> {
@ -127,13 +131,26 @@ class AdminInterface {
const sk = secretKeyBytes(this.adminNsec); const sk = secretKeyBytes(this.adminNsec);
const pool = new RelayPool(['wss://blastr.f7z.xyz', 'wss://nostr.mutinywallet.com'], {}); const pool = new RelayPool(['wss://blastr.f7z.xyz', 'wss://nostr.mutinywallet.com'], {});
pool.start(); pool.start();
// Give the connections a moment to come up before publishing. // Wait until at least one relay is actually connected (capped), rather
await new Promise((r) => setTimeout(r, 2500)); // than a fixed sleep — these external public relays can be slow to come
// up, and a too-short fixed wait made the DM publish fail on boot. Still
for (const npub of this.npubs || []) { // best-effort: if none connect in time we fall through and dmUser logs
await dmUser(sk, npub, `nsecBunker has started; use ${connectionString} to connect to it and unlock your key(s)`, pool); // the publish failure without affecting the daemon. (#48)
const deadline = Date.now() + 8000;
while (pool.connectedCount() === 0 && Date.now() < deadline) {
await new Promise((r) => setTimeout(r, 100));
}
// try/finally so a throw mid-loop can't leak the pool's reconnect loops +
// sockets for the process lifetime (#48 / review CS-3). dmUser itself is
// now fully guarded, but keep the finally as belt-and-suspenders.
try {
for (const npub of this.npubs || []) {
await dmUser(sk, npub, `nsecBunker has started; use ${connectionString} to connect to it and unlock your key(s)`, pool);
}
} finally {
pool.stop();
} }
pool.stop();
} }
/** /**

View file

@ -12,22 +12,26 @@ export async function dmUser(
content: string, content: string,
pool: RelayPool, pool: RelayPool,
): Promise<void> { ): Promise<void> {
const recipientHex = recipient.startsWith("npub1") // Guard the whole thing: nip19.decode throws on a malformed npub (passes the
? (nip19.decode(recipient).data as string) // startsWith check but fails the bech32 checksum), and that previously threw
: recipient; // *before* the publish try, escaping the caller. Best-effort — never throw.
const ciphertext = nip04.encrypt(sk, recipientHex, content); // (review CS-3)
const event = finalizeEvent(
{
kind: 4,
created_at: Math.floor(Date.now() / 1000),
tags: [["p", recipientHex]],
content: ciphertext,
},
sk,
);
try { try {
const recipientHex = recipient.startsWith("npub1")
? (nip19.decode(recipient).data as string)
: recipient;
const ciphertext = nip04.encrypt(sk, recipientHex, content);
const event = finalizeEvent(
{
kind: 4,
created_at: Math.floor(Date.now() / 1000),
tags: [["p", recipientHex]],
content: ciphertext,
},
sk,
);
await pool.publish(event); await pool.publish(event);
} catch (e) { } catch (e) {
console.log(e); console.log('dmUser failed for', recipient, '-', (e as any)?.message ?? e);
} }
} }