From cb5826cec34bd6933f1d8d3f1d76629b15ba44a1 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 18 Nov 2026 21:42:23 -0700 Subject: Signer sign-in links name relays that are up. "I tried pasting from Coinos into Amber, and it just left Coinos in the spinning, waiting for signer state" (Adam, 2026-11-19, signing a PAFF account in through Amber). The nostrconnect:// link named relay.coinos.io and nos.lol, and nos.lol was refusing connections from the phone and the laptop. Amber publishes its approval to the link's relays, and the page waits on those same relays, so a dead one can leave the sign-in spinning until it times out. The link now names three relays: relay.coinos.io, then relay.primal.net (up, and it keeps NIP-46 traffic), then nos.lol or offchain.pub. Any relay this device has recently marked dead is left out and the next one takes its place; relay.coinos.io is always kept. New connect-relays-test passes, as do signer-resume, amber-dm-upgrade and features-smoke. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VMan6TV6sjEZSpqqBen9T5 --- src/nostr-login.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/nostr-login.js b/src/nostr-login.js index 562a5d4..e5490ec 100644 --- a/src/nostr-login.js +++ b/src/nostr-login.js @@ -36,7 +36,7 @@ import { hex, bech32 } from '@scure/base'; import { sha256 } from '@noble/hashes/sha256'; import { entropyToMnemonic } from '@scure/bip39'; import { wordlist } from '@scure/bip39/wordlists/english'; -import { getPublicKey, finalizeEvent, nip44 } from './nostr.js'; +import { getPublicKey, finalizeEvent, nip44, liveRelayList } from './nostr.js'; import { SimplePool } from 'nostr-tools/pool'; import { generateSecretKey } from 'nostr-tools/pure'; import { decode as nip19decode } from 'nostr-tools/nip19'; @@ -208,7 +208,24 @@ export function nostrConnectPending(timeoutMs = 180_000) { } catch {} return null; } -export async function nostrConnect({ relays = ['wss://relay.coinos.io', 'wss://nos.lol'], timeoutMs = 180_000, resume = null } = {}) { +// The relays a nostrconnect:// link names: the signer app publishes its +// approval there and we wait there, so a dead one is a login that spins +// until it times out. A PAFF account's Amber sign-in sat on "waiting for +// signer" while nos.lol (the link's second relay) refused connections, and +// relay.nsec.app was down the same night (Adam, 2026-11-19). So the link +// leads with relay.coinos.io and relay.primal.net (up, and both keep NIP-46 +// traffic), leaves out any relay this device has recently found dead, and +// names three: one relay's outage no longer strands the handshake. +const CONNECT_RELAYS = ['wss://relay.coinos.io', 'wss://relay.primal.net', 'wss://nos.lol', 'wss://offchain.pub']; +export function connectRelays(candidates = CONNECT_RELAYS, n = 3) { + let live = candidates; + try { live = liveRelayList(candidates); } catch {} + const picked = live.slice(0, n); + // our own relay always: its ops are ours to fix, and the poller reads it + if (!picked.includes(candidates[0])) picked.unshift(candidates[0]); + return picked.slice(0, n); +} +export async function nostrConnect({ relays = connectRelays(), timeoutMs = 180_000, resume = null } = {}) { const { BunkerSigner, createNostrConnectURI } = await loadNip46(); const local = resume ? hex.decode(resume.local) : generateSecretKey(); const secret = resume ? resume.secret : hex.encode(crypto.getRandomValues(new Uint8Array(16))); -- cgit v1.2.3