@bwalletx/connect 0.5.3 → 0.5.4

package/dist/element.cjs

@@ -36,13 +36,16 @@ var import_sdk = require("@bsv/sdk");
 var RDNS_EXTENSION = "com.bwalletx.extension";
 var RDNS_MOBILE = "space.bwallet.mobile";
 var BWALLETX_RDNS = [RDNS_EXTENSION, RDNS_MOBILE];
-function discoverBwalletX(ms = 1200) {
+var DEFAULT_DISCOVER_MS = 300;
+function discoverBwalletX(ms = DEFAULT_DISCOVER_MS) {
   if (typeof window === "undefined") return Promise.resolve(null);
   return new Promise((resolve) => {
     let done = false;
+    let timer;
     const finish = (r) => {
       if (done) return;
       done = true;
+      if (timer !== void 0) clearTimeout(timer);
       window.removeEventListener("brc100:announceWallet", onAnnounce);
       resolve(r);
     };
@@ -53,13 +56,21 @@ function discoverBwalletX(ms = 1200) {
         finish({ wallet: d.wallet, method: rdns === RDNS_EXTENSION ? "extension" : "in-app", rdns });
       }
     };
+    const cwiNow = () => {
+      const cwi = window.CWI;
+      if (cwi) finish({ wallet: cwi, method: "in-app", rdns: null });
+      return !!cwi;
+    };
     window.addEventListener("brc100:announceWallet", onAnnounce);
     window.dispatchEvent(new Event("brc100:requestWallet"));
-    setTimeout(() => {
-      const cwi = window.CWI;
-      if (cwi) return finish({ wallet: cwi, method: "in-app", rdns: null });
-      if (!isFramed()) return finish(null);
-      void probeXdm(ms).then((w) => finish(w ? { wallet: w, method: "in-app", rdns: null } : null));
+    if (done || cwiNow()) return;
+    if (isFramed()) {
+      void probeXdm(Math.max(ms, 1200)).then((w) => finish(w ? { wallet: w, method: "in-app", rdns: null } : null));
+      return;
+    }
+    timer = setTimeout(() => {
+      timer = void 0;
+      if (!cwiNow()) finish(null);
     }, ms);
   });
 }
@@ -115,6 +126,21 @@ async function probeXdm(ms = 1200, allowed = BWALLETX_PARENT_ORIGINS) {
     return null;
   }
 }
+var warmedAt = 0;
+function prewarmBwalletX() {
+  if (typeof window === "undefined" || Date.now() - warmedAt < 2e4) return;
+  warmedAt = Date.now();
+  void discoverBwalletX(0).then((f) => {
+    if (f && f.method === "extension") void f.wallet.isAuthenticated({}).catch(() => {
+    });
+  });
+}
+function bindPrewarm(el) {
+  const on = () => prewarmBwalletX();
+  const evs = ["pointerenter", "focus", "touchstart"];
+  for (const e of evs) el.addEventListener(e, on, { passive: true });
+  return () => evs.forEach((e) => el.removeEventListener(e, on));
+}
 
 // src/pair.ts
 var import_sdk3 = require("@bsv/sdk");
@@ -155,10 +181,22 @@ function pairUrl(link) {
   const q = new URLSearchParams({ v: link.v, r: link.r, c: link.c, k: link.k, o: link.o, e: String(link.e) });
   return `https://${PAIR_HOST}/pair?${q}`;
 }
-var relaySocketUrl = (relay, channel, role, expiry) => {
+var newClaim = () => b64url(crypto.getRandomValues(new Uint8Array(16)));
+var WALLET_CLAIM_INFO = "bwallet-pair-wallet-claim-v1";
+var hex = (b) => Array.from(b, (x) => x.toString(16).padStart(2, "0")).join("");
+async function walletClaimFor(channel, sitePub) {
+  const d = await crypto.subtle.digest("SHA-256", enc.encode(`${WALLET_CLAIM_INFO}|${channel}|${sitePub}`));
+  return b64url(new Uint8Array(d));
+}
+async function claimDigest(claim) {
+  return hex(new Uint8Array(await crypto.subtle.digest("SHA-256", enc.encode(claim))));
+}
+var relaySocketUrl = (relay, channel, role, expiry, claim, walletClaimHash) => {
   const local = /^(localhost|127\.0\.0\.1)(:\d+)?$/.test(relay);
   const q = new URLSearchParams({ role });
   if (expiry) q.set("e", String(expiry));
+  if (claim) q.set("claim", claim);
+  if (walletClaimHash && role === "site") q.set("wc", walletClaimHash);
   return `${local ? "ws" : "wss"}://${relay}/v1/c/${channel}?${q}`;
 };
 async function deriveSession(mine, theirs, channel) {
@@ -256,6 +294,7 @@ function parseStored(raw) {
     if (typeof p.s !== "string" || !/^[0-9a-f]{64}$/i.test(p.s)) return null;
     if (typeof p.k !== "string" || !/^0[23][0-9a-f]{64}$/i.test(p.k)) return null;
     if (!n(p.sent) || !n(p.lastSeen) || !n(p.pairedAt)) return null;
+    if (p.sc !== void 0 && (typeof p.sc !== "string" || !/^[A-Za-z0-9_-]{22,64}$/.test(p.sc))) return null;
     return p;
   } catch {
     return null;
@@ -313,7 +352,12 @@ var Link = class {
     await this.opening;
   }
   reopen() {
-    const ws = this.socket(relaySocketUrl(this.p.r, this.p.c, "site", Math.floor(Date.now() / 1e3) + QR_LIFETIME_S - 10));
+    if (!this.p.sc) {
+      this.p = { ...this.p, sc: newClaim() };
+      this.persist();
+    }
+    const e = Math.floor(Date.now() / 1e3) + QR_LIFETIME_S - 10;
+    const ws = this.socket(relaySocketUrl(this.p.r, this.p.c, "site", e, this.p.sc));
     return new Promise((resolve, reject) => {
       ws.onopen = () => {
         this.ws = ws;
@@ -407,11 +451,13 @@ function pairBwalletX(opts) {
   const siteKey = import_sdk3.PrivateKey.fromRandom();
   const channel = newChannel();
   const expiry = Math.floor(Date.now() / 1e3) + QR_LIFETIME_S;
-  return new Promise((resolve, reject) => {
+  const siteClaim = newClaim();
+  const sitePub = siteKey.toPublicKey().toString();
+  return walletClaimFor(channel, sitePub).then(claimDigest).then((wc) => new Promise((resolve, reject) => {
     if (opts.signal?.aborted) return reject(new Error("cancelled"));
     let ws;
     try {
-      ws = socket(relaySocketUrl(relay, channel, "site", expiry));
+      ws = socket(relaySocketUrl(relay, channel, "site", expiry, siteClaim, wc));
     } catch (e) {
       return reject(e);
     }
@@ -450,7 +496,7 @@ function pairBwalletX(opts) {
       if (msg.t === "ready") {
         settled = true;
         clearTimeout(timer);
-        const p = { v: 1, c: channel, r: relay, s: siteKey.toHex(), k: walletKey, ...sealer.counters, pairedAt: Date.now() };
+        const p = { v: 1, c: channel, r: relay, s: siteKey.toHex(), k: walletKey, ...sealer.counters, pairedAt: Date.now(), sc: siteClaim };
         await Promise.resolve(storage.setItem(key, JSON.stringify(p))).catch(() => {
         });
         const link = new Link(p, sealer, storage, key, socket, opts.callTimeoutMs ?? 12e4);
@@ -460,8 +506,8 @@ function pairBwalletX(opts) {
         fail(new Error("Pairing was declined in bWalletX"));
       }
     });
-    opts.onLink(pairUrl({ v: PAIR_VERSION, r: relay, c: channel, k: siteKey.toPublicKey().toString(), o: origin, e: expiry }));
-  });
+    opts.onLink(pairUrl({ v: PAIR_VERSION, r: relay, c: channel, k: sitePub, o: origin, e: expiry }));
+  }));
 }
 async function restorePairing(opts = {}) {
   const storage = opts.storage === void 0 ? defaultStorage() : opts.storage ?? memoryStorage();
@@ -477,16 +523,33 @@ async function restorePairing(opts = {}) {
 // src/signin.ts
 var LOGIN_PROTOCOL = [2, "bwallet sign in"];
 async function connectBwalletX(opts = {}) {
-  if (opts.wallet) return { wallet: opts.wallet, method: "wallet" };
-  const found = await discoverBwalletX(opts.discoverMs);
-  if (found) return { wallet: found.wallet, method: found.method };
+  const status = (s) => {
+    try {
+      opts.onStatus?.(s);
+    } catch {
+    }
+  };
+  if (opts.wallet) {
+    status("opening");
+    return { wallet: opts.wallet, method: "wallet" };
+  }
+  status("finding");
+  const found = await discoverBwalletX(opts.discoverMs ?? DEFAULT_DISCOVER_MS);
+  if (found) {
+    status("opening");
+    return { wallet: found.wallet, method: found.method };
+  }
   if (opts.reusePairing !== false) {
     const restored = await restorePairing(opts.pairing ?? {});
-    if (restored) return { wallet: restored, method: "pairing" };
+    if (restored) {
+      status("opening");
+      return { wallet: restored, method: "pairing" };
+    }
   }
   if (!opts.pairing) {
     throw Object.assign(new Error("bWalletX was not found in this browser"), { code: "NOT_FOUND" });
   }
+  status("pairing");
   return { wallet: await pairBwalletX(opts.pairing), method: "pairing" };
 }
 async function signInWithBwalletX(opts) {
@@ -494,6 +557,10 @@ async function signInWithBwalletX(opts) {
   if (method !== "pairing") await wallet.waitForAuthentication({}).catch(() => {
   });
   const { publicKey: identityKey } = await atStage("identity", () => wallet.getPublicKey({ identityKey: true }));
+  try {
+    opts.onStatus?.("signing");
+  } catch {
+  }
   const c = await atStage("challenge", () => opts.challenge(identityKey));
   const { signature } = await atStage(
     "signature",
@@ -851,6 +918,7 @@ function createClass() {
       const nf = this.#notFound ? `<p class="nf" part="not-found" role="status">bWalletX wasn't found in this browser. <a href="${esc(getUrl)}" target="_blank" rel="noopener">Get ${brand}</a> or <a href="${esc(webUrl)}" target="_blank" rel="noopener">use the web wallet</a>.</p>` : "";
       this.#root.innerHTML = `<style>${SIGNIN_CSS}</style><button type="button" part="button" aria-label="${esc(aria)}" title="${esc(subtitle ? `${text} (${subtitle})` : text)}"${disabled ? " disabled" : ""}${loading ? ' aria-busy="true"' : ""}><span class="mark" part="mark">${mark}</span>${label}</button>${loading ? '<span class="sr" role="status">Connecting to bWalletX\u2026</span>' : ""}${nf}`;
       this.button.addEventListener("click", () => void this.#click());
+      bindPrewarm(this.button);
     }
     #emit(type, detail, cancelable = false) {
       return this.dispatchEvent(new CustomEvent(type, { detail, bubbles: true, composed: true, cancelable }));
@@ -877,7 +945,7 @@ function createClass() {
       this.#notFound = false;
       this.#setBusy(true);
       try {
-        const ms = Number(this.#attr("discover-ms")) || 1200;
+        const ms = Number(this.#attr("discover-ms")) || DEFAULT_DISCOVER_MS;
         const found = await discoverBwalletX(ms);
         if (!found) {
           this.#notFound = true;