@bwalletx/connect 0.5.0 → 0.5.4

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(src_exports, {
   AccessError: () => AccessError,
   BRC29_PROTOCOL: () => BRC29_PROTOCOL,
   BWALLETX_RDNS: () => BWALLETX_RDNS,
+  DEFAULT_DISCOVER_MS: () => DEFAULT_DISCOVER_MS,
   GET_URL: () => GET_URL,
   LOGIN_PROTOCOL: () => LOGIN_PROTOCOL,
   LOGO_URL: () => LOGO_URL,
@@ -45,15 +46,18 @@ __export(src_exports, {
   RDNS_MOBILE: () => RDNS_MOBILE,
   SIGNIN_CSS: () => SIGNIN_CSS,
   SIGNIN_TAG: () => SIGNIN_TAG,
+  WALLET_THEME_META: () => WALLET_THEME_META,
   WEB_WALLET_URL: () => WEB_WALLET_URL,
   accessErrorMessage: () => accessErrorMessage,
   amountInSats: () => amountInSats,
+  bindPrewarm: () => bindPrewarm,
   brc100Option: () => brc100Option,
   buildAuthorizeUrl: () => buildAuthorizeUrl,
   buyToken: () => buyToken,
   canonicalJson: () => canonicalJson,
   clearPairing: () => clearPairing,
   connectBwalletX: () => connectBwalletX,
+  declareWalletTheme: () => declareWalletTheme,
   defineBwalletxSignin: () => defineBwalletxSignin,
   discoverBwalletX: () => discoverBwalletX,
   discoverWallets: () => discoverWallets,
@@ -62,12 +66,14 @@ __export(src_exports, {
   inOrder: () => inOrder,
   isIdentityKeyHex: () => isIdentityKeyHex,
   isPaymail: () => isPaymail,
+  isTouchDevice: () => isTouchDevice,
   markSvg: () => markSvg,
   pairBwalletX: () => pairBwalletX,
   pairingModal: () => pairingModal,
   pairingOption: () => pairingOption,
   pay: () => pay,
   pickWallet: () => pickWallet,
+  prewarmBwalletX: () => prewarmBwalletX,
   protocolMediaUrl: () => protocolMediaUrl,
   proveHoldings: () => proveHoldings,
   qrSvg: () => qrSvg,
@@ -84,16 +90,20 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/discover.ts
+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);
     };
@@ -104,20 +114,97 @@ 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;
-      finish(cwi ? { wallet: cwi, 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);
   });
 }
-async function findBwalletX(ms = 1200) {
+async function findBwalletX(ms = DEFAULT_DISCOVER_MS) {
   return (await discoverBwalletX(ms))?.wallet ?? null;
 }
+var isFramed = () => {
+  try {
+    return window.parent !== window;
+  } catch {
+    return true;
+  }
+};
+var BWALLETX_PARENT_ORIGINS = [
+  "https://web.bwalletx.com",
+  "https://desktop.bwalletx.com",
+  "https://bwalletx.com",
+  "https://www.bwallet.space",
+  "https://bwallet.space",
+  "capacitor://localhost",
+  // iOS app shell
+  "https://localhost",
+  // Android app shell
+  "tauri://localhost",
+  // bWalletX Desktop (macOS)
+  "https://tauri.localhost",
+  // bWalletX Desktop (Windows)
+  "chrome-extension://bombmmcjghjdlbmcclnhjodgcelnehgl"
+  // bWalletX for Chrome (fixed id)
+];
+var parentOrigin = () => {
+  try {
+    const anc = window.location.ancestorOrigins;
+    if (anc && anc.length > 0) return anc[0] ?? null;
+    if (!document.referrer) return null;
+    const u = new URL(document.referrer);
+    return `${u.protocol}//${u.host}`;
+  } catch {
+    return null;
+  }
+};
+async function probeXdm(ms = 1200, allowed = BWALLETX_PARENT_ORIGINS) {
+  const origin = parentOrigin();
+  if (!origin || !allowed.includes(origin)) return null;
+  try {
+    const w = new import_sdk.WalletClient(new import_sdk.XDM(origin));
+    const ok = await Promise.race([
+      w.isAuthenticated({}).then(
+        () => true,
+        () => false
+      ),
+      new Promise((r) => setTimeout(() => r(false), ms))
+    ]);
+    return ok ? w : null;
+  } catch {
+    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(el2) {
+  const on = () => prewarmBwalletX();
+  const evs = ["pointerenter", "focus", "touchstart"];
+  for (const e of evs) el2.addEventListener(e, on, { passive: true });
+  return () => evs.forEach((e) => el2.removeEventListener(e, on));
+}
 
 // src/pair.ts
-var import_sdk2 = require("@bsv/sdk");
+var import_sdk3 = require("@bsv/sdk");
 
 // src/in-order.ts
 function inOrder(handle, onError) {
@@ -129,7 +216,7 @@ function inOrder(handle, onError) {
 }
 
 // src/protocol.ts
-var import_sdk = require("@bsv/sdk");
+var import_sdk2 = require("@bsv/sdk");
 var PAIR_VERSION = "1";
 var PAIR_INFO = "bwallet-pair-v1";
 var PAIR_HOST = "www.bwallet.space";
@@ -155,14 +242,26 @@ 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) {
-  const point = mine.deriveSharedSecret(import_sdk.PublicKey.fromString(theirs));
+  const point = mine.deriveSharedSecret(import_sdk2.PublicKey.fromString(theirs));
   const ikm = new Uint8Array(point.encode(true));
   const base = await crypto.subtle.importKey("raw", ikm, "HKDF", false, ["deriveBits"]);
   const bits = new Uint8Array(
@@ -256,6 +355,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 +413,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;
@@ -404,14 +509,16 @@ function pairBwalletX(opts) {
   const relay = opts.relay ?? DEFAULT_RELAY;
   const origin = opts.origin ?? (typeof location !== "undefined" ? location.origin : "");
   if (!origin) return Promise.reject(new Error("pairBwalletX needs options.origin outside a browser"));
-  const siteKey = import_sdk2.PrivateKey.fromRandom();
+  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 +557,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,15 +567,15 @@ 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();
   const key = opts.storageKey ?? DEFAULT_KEY;
   const p = parseStored(await Promise.resolve(storage.getItem(key)).catch(() => null));
   if (!p) return null;
-  const { key: aes } = await deriveSession(import_sdk2.PrivateKey.fromHex(p.s), p.k, p.c);
+  const { key: aes } = await deriveSession(import_sdk3.PrivateKey.fromHex(p.s), p.k, p.c);
   const sealer = new Sealer(aes, "site");
   sealer.restore({ sent: p.sent, lastSeen: p.lastSeen });
   return new Link(p, sealer, storage, key, opts.socket ?? defaultSocket(), opts.callTimeoutMs ?? 12e4).wallet();
@@ -482,32 +589,65 @@ async function clearPairing(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) {
   const { wallet, method } = await connectBwalletX(opts);
   if (method !== "pairing") await wallet.waitForAuthentication({}).catch(() => {
   });
-  const { publicKey: identityKey } = await wallet.getPublicKey({ identityKey: true });
-  const c = await opts.challenge(identityKey);
-  const { signature } = await wallet.createSignature({
-    protocolID: c.protocolID ?? LOGIN_PROTOCOL,
-    keyID: c.keyID,
-    counterparty: "anyone",
-    data: Array.from(new TextEncoder().encode(c.message))
-  });
+  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",
+    () => wallet.createSignature({
+      protocolID: c.protocolID ?? LOGIN_PROTOCOL,
+      keyID: c.keyID,
+      counterparty: "anyone",
+      data: Array.from(new TextEncoder().encode(c.message))
+    })
+  );
   return { identityKey, signature: Array.from(signature), nonce: c.nonce, method, wallet };
 }
+async function atStage(stage, run) {
+  try {
+    return await run();
+  } catch (e) {
+    const err = e instanceof Error ? e : new Error(String(e));
+    if (!err.stage) Object.assign(err, { stage });
+    throw err;
+  }
+}
 
 // src/button.ts
 var CSS = `
@@ -554,7 +694,7 @@ function renderButton(el2, opts = {}) {
 }
 
 // src/access-client.ts
-var import_sdk3 = require("@bsv/sdk");
+var import_sdk4 = require("@bsv/sdk");
 
 // src/access.ts
 var ACCESS_VERSION = 1;
@@ -740,7 +880,7 @@ async function proveHoldings(wallet, challenge, tokenId, basket = "bsv21") {
     const counterparty = ci.counterparty ?? "self";
     for (const protocolID of ci.protocolID ? [ci.protocolID] : [ONESAT, LEGACY_ONESAT]) {
       const { publicKey } = await wallet.getPublicKey({ protocolID, keyID: ci.keyID, counterparty });
-      const h = import_sdk3.Utils.toHex(import_sdk3.Hash.hash160(import_sdk3.PublicKey.fromString(publicKey).encode(true)));
+      const h = import_sdk4.Utils.toHex(import_sdk4.Hash.hash160(import_sdk4.PublicKey.fromString(publicKey).encode(true)));
       if (want && h !== want) continue;
       const existing = byKey.get(publicKey);
       if (existing) {
@@ -936,6 +1076,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 }));
@@ -962,7 +1103,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;
@@ -1011,7 +1152,7 @@ function defineBwalletxSignin(tag = SIGNIN_TAG) {
 }
 
 // src/pay.ts
-var import_sdk4 = require("@bsv/sdk");
+var import_sdk5 = require("@bsv/sdk");
 var BRC29_PROTOCOL = [2, "3241645161d8"];
 var PaymentError = class extends Error {
   constructor(code, message, maybeSent = false, cause) {
@@ -1031,13 +1172,13 @@ var isPaymail = (s) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(s);
 function randomB64(n) {
   const b = new Uint8Array(n);
   globalThis.crypto.getRandomValues(b);
-  return import_sdk4.Utils.toBase64(Array.from(b));
+  return import_sdk5.Utils.toBase64(Array.from(b));
 }
 function opReturn(text) {
-  const d = import_sdk4.Utils.toArray(text, "utf8");
+  const d = import_sdk5.Utils.toArray(text, "utf8");
   const len = d.length;
   const push = len < 76 ? [len] : len <= 255 ? [76, len] : [77, len & 255, len >> 8];
-  return import_sdk4.Utils.toHex([0, 106, ...push, ...d]);
+  return import_sdk5.Utils.toHex([0, 106, ...push, ...d]);
 }
 var clip = (s, n) => s.length > n ? s.slice(0, n - 1) + "\u2026" : s;
 var describe = (s) => clip(s.length < 5 ? `${s} payment`.trim() : s, 50);
@@ -1090,11 +1231,11 @@ async function resolvePaymailP2P(paymail, sats, f = fetch) {
   return {
     outputs: body.outputs.map((o) => ({ script: o.script, satoshis: o.satoshis })),
     reference: body.reference,
-    submit: receive ? async (hex) => {
+    submit: receive ? async (hex2) => {
       await f(fill(receive), {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ hex, reference: body.reference, metadata: {} })
+        body: JSON.stringify({ hex: hex2, reference: body.reference, metadata: {} })
       });
     } : void 0
   };
@@ -1133,7 +1274,7 @@ async function pay(source, req, o = {}) {
     } catch (e) {
       throw new PaymentError("WALLET_ERROR", `The wallet could not derive the payment key: ${e.message}`, false, e);
     }
-    outputs = [{ script: new import_sdk4.P2PKH().lock(import_sdk4.PublicKey.fromString(pk).toHash()).toHex(), satoshis: sats, description: "payment" }];
+    outputs = [{ script: new import_sdk5.P2PKH().lock(import_sdk5.PublicKey.fromString(pk).toHash()).toHex(), satoshis: sats, description: "payment" }];
     remittance = { senderIdentityKey: me, derivationPrefix, derivationSuffix, outputIndex: 0 };
   } else if (isPaymail(to)) {
     const r2 = await (o.resolvePaymail ?? ((p, s) => resolvePaymailP2P(p, s, o.fetch ?? fetch)))(to, sats);
@@ -1141,7 +1282,7 @@ async function pay(source, req, o = {}) {
     submit = r2.submit;
   } else {
     try {
-      outputs = [{ script: new import_sdk4.P2PKH().lock(to).toHex(), satoshis: sats, description: "payment" }];
+      outputs = [{ script: new import_sdk5.P2PKH().lock(to).toHex(), satoshis: sats, description: "payment" }];
     } catch {
       throw new PaymentError("BAD_REQUEST", `Not a paymail, address or identity key: ${to}`);
     }
@@ -1151,7 +1292,7 @@ async function pay(source, req, o = {}) {
   if (!r.txid) throw new PaymentError("WALLET_ERROR", "The wallet did not return a txid", true);
   const tx = r.tx ? Array.from(r.tx) : void 0;
   if (submit && tx) {
-    await submit(import_sdk4.Transaction.fromAtomicBEEF(tx).toHex()).catch(() => {
+    await submit(import_sdk5.Transaction.fromAtomicBEEF(tx).toHex()).catch(() => {
     });
   }
   return { txid: r.txid, tx, sats, outputs, remittance };
@@ -1172,7 +1313,7 @@ async function buyToken(source, req) {
 }
 
 // src/wallets.ts
-var import_sdk5 = require("@bsv/sdk");
+var import_sdk6 = require("@bsv/sdk");
 async function brc100Connected(wallet, o) {
   await wallet.waitForAuthentication({}).catch(() => {
   });
@@ -1231,7 +1372,7 @@ function handcashAdapter(o) {
 var NAMES = { [RDNS_EXTENSION]: "bWalletX", "space.bwallet.mobile": "bWalletX" };
 async function probe(substrate, ms) {
   try {
-    const w = new import_sdk5.WalletClient(substrate);
+    const w = new import_sdk6.WalletClient(substrate);
     const ok = await Promise.race([w.isAuthenticated({}).then(() => true), new Promise((r) => setTimeout(() => r(false), ms))]);
     return ok ? w : null;
   } catch {
@@ -1240,7 +1381,7 @@ async function probe(substrate, ms) {
 }
 async function discoverWallets(o = {}) {
   const out = [];
-  const ms = o.ms ?? 1200;
+  const ms = o.ms ?? 300;
   if (typeof window !== "undefined") {
     const seen = /* @__PURE__ */ new Map();
     const onAnnounce = (e) => {
@@ -1254,7 +1395,7 @@ async function discoverWallets(o = {}) {
     window.addEventListener("brc100:announceWallet", onAnnounce);
     window.dispatchEvent(new Event("brc100:requestWallet"));
     const local = o.probeLocal ? Promise.all([probe("json-api", ms), probe("Cicada", ms)]) : Promise.resolve([null, null]);
-    await new Promise((r) => setTimeout(r, ms));
+    await new Promise((r) => setTimeout(r, seen.size > 0 || window.CWI ? Math.min(ms, 50) : ms));
     window.removeEventListener("brc100:announceWallet", onAnnounce);
     out.push(...seen.values());
     const cwi = window.CWI;
@@ -1284,6 +1425,9 @@ var CSS2 = `
 .bwx-row{display:flex;gap:8px;margin-top:14px}
 .bwx-btn{flex:1;border:1px solid #3a3220;background:#15130e;color:#f4f1e8;border-radius:10px;padding:10px 12px;font:inherit;cursor:pointer}
 .bwx-btn:hover{border-color:#e8c766}
+a.bwx-btn{display:block;text-align:center;text-decoration:none;box-sizing:border-box}
+.bwx-primary{background:linear-gradient(180deg,#fcd34d,#f59e0b);color:#000;border:0;font-weight:700;min-height:48px;padding:13px 12px}
+.bwx-stack{display:flex;flex-direction:column;gap:8px}
 .bwx-list{display:flex;flex-direction:column;gap:8px}
 .bwx-opt{display:flex;align-items:center;gap:10px;text-align:left}
 .bwx-opt img{width:24px;height:24px;border-radius:6px}
@@ -1314,6 +1458,18 @@ function qrSvg(text) {
   q.make();
   return q.createSvgTag({ cellSize: 4, margin: 2, scalable: true });
 }
+function isTouchDevice(env = globalThis) {
+  const nav = env.navigator;
+  if (!nav) return false;
+  const ua = nav.userAgent ?? "";
+  if (/Android|iPhone|iPad|iPod|Mobile|Silk|Kindle/i.test(ua)) return true;
+  if (/Macintosh/.test(ua) && (nav.maxTouchPoints ?? 0) > 1) return true;
+  try {
+    return !!env.matchMedia?.("(pointer: coarse)").matches && !env.matchMedia?.("(hover: hover)").matches;
+  } catch {
+    return false;
+  }
+}
 function pairingModal(o = {}) {
   const ac = new AbortController();
   let ui = null;
@@ -1330,20 +1486,37 @@ function pairingModal(o = {}) {
       if (typeof document === "undefined") return;
       close();
       ui = mount();
+      const app = o.mode === "app" || (o.mode ?? "auto") === "auto" && isTouchDevice();
       const h = el("h2", "", o.title ?? "Connect bWalletX");
+      const cancel = el("button", "bwx-btn", "Cancel");
+      cancel.onclick = () => {
+        o.onCancel?.();
+        ac.abort();
+      };
+      codeEl = el("div", "bwx-code", "");
+      codeEl.setAttribute("aria-live", "polite");
+      if (app) {
+        const p2 = el("p", "", "Open bWalletX, approve, then come back to this page.");
+        const stack = el("div", "bwx-stack");
+        const open = el("a", "bwx-btn bwx-primary", "Open bWalletX");
+        open.href = link;
+        open.rel = "noopener";
+        const web = el("button", "bwx-btn", "Use web.bwalletx.com instead");
+        web.onclick = () => {
+          void navigator.clipboard?.writeText(link).catch(() => void 0);
+          window.open(WEB_WALLET_URL, "_blank", "noopener");
+          p2.textContent = "Link copied. In web.bwalletx.com tap Connect and paste it, then come back here.";
+        };
+        stack.append(open, web, cancel);
+        ui.box.append(h, p2, codeEl, stack);
+        return;
+      }
       const p = el("p", "", "Scan with bWalletX on your phone, or paste the link into web.bwalletx.com.");
       const qr = el("div", "bwx-qr");
       qr.innerHTML = qrSvg(link);
-      codeEl = el("div", "bwx-code", "");
-      codeEl.setAttribute("aria-live", "polite");
       const row = el("div", "bwx-row");
       const copy = el("button", "bwx-btn", "Copy link");
       copy.onclick = () => void navigator.clipboard?.writeText(link).then(() => copy.textContent = "Copied");
-      const cancel = el("button", "bwx-btn", "Cancel");
-      cancel.onclick = () => {
-        o.onCancel?.();
-        ac.abort();
-      };
       row.append(copy, cancel);
       ui.box.append(h, p, qr, codeEl, row);
     },
@@ -1387,6 +1560,25 @@ function pickWallet(options, o = {}) {
     ui.box.lastChild.append(cancel);
   });
 }
+
+// src/theme.ts
+var WALLET_THEME_META = "bwalletx-theme";
+var ID = /^[a-z0-9-]{1,32}$/;
+function declareWalletTheme(theme) {
+  if (typeof document === "undefined") return;
+  const id = (theme ?? "").trim().toLowerCase();
+  let meta = document.head.querySelector(`meta[name="${WALLET_THEME_META}"]`);
+  if (!id || !ID.test(id)) {
+    meta?.remove();
+    return;
+  }
+  if (!meta) {
+    meta = document.createElement("meta");
+    meta.name = WALLET_THEME_META;
+    document.head.appendChild(meta);
+  }
+  if (meta.content !== id) meta.content = id;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ACCESS_ERROR_STATUS,
@@ -1395,6 +1587,7 @@ function pickWallet(options, o = {}) {
   AccessError,
   BRC29_PROTOCOL,
   BWALLETX_RDNS,
+  DEFAULT_DISCOVER_MS,
   GET_URL,
   LOGIN_PROTOCOL,
   LOGO_URL,
@@ -1404,15 +1597,18 @@ function pickWallet(options, o = {}) {
   RDNS_MOBILE,
   SIGNIN_CSS,
   SIGNIN_TAG,
+  WALLET_THEME_META,
   WEB_WALLET_URL,
   accessErrorMessage,
   amountInSats,
+  bindPrewarm,
   brc100Option,
   buildAuthorizeUrl,
   buyToken,
   canonicalJson,
   clearPairing,
   connectBwalletX,
+  declareWalletTheme,
   defineBwalletxSignin,
   discoverBwalletX,
   discoverWallets,
@@ -1421,12 +1617,14 @@ function pickWallet(options, o = {}) {
   inOrder,
   isIdentityKeyHex,
   isPaymail,
+  isTouchDevice,
   markSvg,
   pairBwalletX,
   pairingModal,
   pairingOption,
   pay,
   pickWallet,
+  prewarmBwalletX,
   protocolMediaUrl,
   proveHoldings,
   qrSvg,