@bwalletx/connect 0.5.4 → 0.5.6

package/dist/index.js

@@ -1,53 +1,98 @@
+import {
+  BUTTON_TAG,
+  CONNECTED_KEY,
+  defineBwalletxButton,
+  dropLegacyConnectedKey,
+  getUrlFor,
+  handleLabel,
+  stateFor
+} from "./chunk-34DKBQNN.js";
 import {
   BRC29_PROTOCOL,
   PaymentError,
   WALLET_THEME_META,
   amountInSats,
-  brc100Option,
   buyToken,
   declareWalletTheme,
-  discoverWallets,
-  handcashAdapter,
   isIdentityKeyHex,
   isPaymail,
-  isTouchDevice,
-  pairingModal,
-  pairingOption,
   pay,
-  pickWallet,
-  qrSvg,
   resolvePaymailP2P,
+  runConnect,
   tip
-} from "./chunk-RIOHG5JH.js";
+} from "./chunk-IFGOAROM.js";
 import {
+  BAVATAR_URL,
   BWALLETX_RDNS,
+  BWALLETX_TYPE,
   DEFAULT_DISCOVER_MS,
+  DESKTOP_OPTION_ID,
   GET_URL,
+  IDENTITY_HINT_KEY,
   LOGIN_PROTOCOL,
+  MENU_CSS,
+  PAYMAIL_LOOKUP_URL,
+  PENDING_LABEL,
+  PENDING_LABEL_OTHER,
+  PENDING_NOTE,
   RDNS_EXTENSION,
   RDNS_MOBILE,
   SIGNIN_CSS,
   SIGNIN_TAG,
   WEB_WALLET_URL,
+  accountLabel,
+  attemptFor,
+  autoChoice,
+  avatarUrlFor,
   bindPrewarm,
+  brc100Option,
   buildAuthorizeUrl,
+  challengeWantsIdentityKey,
+  chooseWallet,
+  chooserOrder,
   clearPairing,
   connectBwalletX,
+  cwiIsAnnounced,
+  decideWallet,
   defineBwalletxSignin,
+  desktopOption,
   discoverBwalletX,
+  discoverWallets,
   findBwalletX,
+  handcashAdapter,
+  hasBwalletX,
   inOrder,
+  isFramed,
+  isPresentBwalletX,
+  isTouchDevice,
+  isUserRejection,
+  lookupPaymail,
   markSvg,
+  otherDetected,
+  outcomeOf,
   pairBwalletX,
+  pairingModal,
+  pairingOption,
+  pickWallet,
   prewarmBwalletX,
   proveHoldings,
+  qrSvg,
+  rememberIdentity,
+  rememberedIdentity,
+  reportAttempt,
   requestAccess,
   restorePairing,
+  shortKey,
+  signInAndVerify,
+  signInErrorText,
   signInWithBwalletX,
   signinText,
+  substrateOf,
   throwIfAccessError,
-  toAccessError
-} from "./chunk-EXRQJTXF.js";
+  toAccessError,
+  waitIfLocked,
+  walletTypeOf
+} from "./chunk-LS6AYEBO.js";
 import {
   ACCESS_ERROR_STATUS,
   ACCESS_PROTOCOL,
@@ -107,12 +152,23 @@ export {
   ACCESS_PROTOCOL,
   ACCESS_VERSION,
   AccessError,
+  BAVATAR_URL,
   BRC29_PROTOCOL,
+  BUTTON_TAG,
   BWALLETX_RDNS,
+  BWALLETX_TYPE,
+  CONNECTED_KEY,
   DEFAULT_DISCOVER_MS,
+  DESKTOP_OPTION_ID,
   GET_URL,
+  IDENTITY_HINT_KEY,
   LOGIN_PROTOCOL,
   LOGO_URL,
+  MENU_CSS,
+  PAYMAIL_LOOKUP_URL,
+  PENDING_LABEL,
+  PENDING_LABEL_OTHER,
+  PENDING_NOTE,
   PROTOCOL_MEDIA,
   PaymentError,
   RDNS_EXTENSION,
@@ -122,25 +178,46 @@ export {
   WALLET_THEME_META,
   WEB_WALLET_URL,
   accessErrorMessage,
+  accountLabel,
   amountInSats,
+  attemptFor,
+  autoChoice,
+  avatarUrlFor,
   bindPrewarm,
   brc100Option,
   buildAuthorizeUrl,
   buyToken,
   canonicalJson,
+  challengeWantsIdentityKey,
+  chooseWallet,
+  chooserOrder,
   clearPairing,
   connectBwalletX,
+  cwiIsAnnounced,
+  decideWallet,
   declareWalletTheme,
+  defineBwalletxButton,
   defineBwalletxSignin,
+  desktopOption,
   discoverBwalletX,
   discoverWallets,
+  dropLegacyConnectedKey,
   findBwalletX,
+  getUrlFor,
   handcashAdapter,
+  handleLabel,
+  hasBwalletX,
   inOrder,
+  isFramed,
   isIdentityKeyHex,
   isPaymail,
+  isPresentBwalletX,
   isTouchDevice,
+  isUserRejection,
+  lookupPaymail,
   markSvg,
+  otherDetected,
+  outcomeOf,
   pairBwalletX,
   pairingModal,
   pairingOption,
@@ -150,14 +227,25 @@ export {
   protocolMediaUrl,
   proveHoldings,
   qrSvg,
+  rememberIdentity,
+  rememberedIdentity,
   renderButton,
+  reportAttempt,
   requestAccess,
   resolvePaymailP2P,
   restorePairing,
+  runConnect,
+  shortKey,
+  signInAndVerify,
+  signInErrorText,
   signInWithBwalletX,
   signinText,
+  stateFor,
+  substrateOf,
   throwIfAccessError,
   tip,
-  toAccessError
+  toAccessError,
+  waitIfLocked,
+  walletTypeOf
 };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/button.ts"],"sourcesContent":["const CSS = `\n.bwx-signin{display:inline-flex;align-items:center;gap:12px;min-height:48px;padding:10px 22px 10px 10px;border:0;border-radius:12px;cursor:pointer;background:linear-gradient(180deg,#fcd34d,#f59e0b);color:#000;text-align:left;font:700 16px/1.2 system-ui,-apple-system,\"Segoe UI\",sans-serif;box-shadow:0 8px 24px rgba(245,158,11,.2)}\n.bwx-signin:hover{background:linear-gradient(180deg,#fde68a,#fbbf24)}\n.bwx-signin:focus-visible{outline:2px solid #ffd24d;outline-offset:3px}\n.bwx-signin:disabled{opacity:.6;cursor:wait}\n.bwx-signin .bwx-mark{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;border-radius:50%;background:#000;flex:none}\n.bwx-signin small{display:block;font-size:11px;font-weight:500;color:rgba(0,0,0,.6)}`;\n\nexport const LOGO_URL = 'https://bwalletx.com/logo.svg';\n\nexport interface ButtonOptions {\n  /** Second line under the label. Default \"also works with bWallet\". false hides it. */\n  subtitle?: string | false;\n  onClick?: (button: HTMLButtonElement) => void;\n}\n\n/** Put the gold \"Sign in with bWalletX\" button into `el` (replacing its contents). */\nexport function renderButton(el: HTMLElement | string, opts: ButtonOptions = {}): HTMLButtonElement {\n  const host = typeof el === 'string' ? document.querySelector<HTMLElement>(el) : el;\n  if (!host) throw new Error(`renderButton: no element ${String(el)}`);\n  if (!document.getElementById('bwx-signin-css')) {\n    const style = document.createElement('style');\n    style.id = 'bwx-signin-css';\n    style.textContent = CSS;\n    document.head.appendChild(style);\n  }\n  const b = document.createElement('button');\n  b.type = 'button';\n  b.className = 'bwx-signin';\n  const mark = document.createElement('span');\n  mark.className = 'bwx-mark';\n  const img = document.createElement('img');\n  img.src = LOGO_URL;\n  img.alt = '';\n  img.width = 15;\n  img.height = 20;\n  mark.appendChild(img);\n  const label = document.createElement('span');\n  label.className = 'bwx-label';\n  label.textContent = 'Sign in with bWalletX';\n  const sub = opts.subtitle === undefined ? 'also works with bWallet' : opts.subtitle;\n  if (sub) {\n    const small = document.createElement('small');\n    small.textContent = sub;\n    label.appendChild(small);\n  }\n  b.append(mark, label);\n  if (opts.onClick) b.addEventListener('click', () => opts.onClick!(b));\n  host.replaceChildren(b);\n  return b;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQL,IAAM,WAAW;AASjB,SAAS,aAAa,IAA0B,OAAsB,CAAC,GAAsB;AAClG,QAAM,OAAO,OAAO,OAAO,WAAW,SAAS,cAA2B,EAAE,IAAI;AAChF,MAAI,CAAC,KAAM,OAAM,IAAI,MAAM,4BAA4B,OAAO,EAAE,CAAC,EAAE;AACnE,MAAI,CAAC,SAAS,eAAe,gBAAgB,GAAG;AAC9C,UAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,UAAM,KAAK;AACX,UAAM,cAAc;AACpB,aAAS,KAAK,YAAY,KAAK;AAAA,EACjC;AACA,QAAM,IAAI,SAAS,cAAc,QAAQ;AACzC,IAAE,OAAO;AACT,IAAE,YAAY;AACd,QAAM,OAAO,SAAS,cAAc,MAAM;AAC1C,OAAK,YAAY;AACjB,QAAM,MAAM,SAAS,cAAc,KAAK;AACxC,MAAI,MAAM;AACV,MAAI,MAAM;AACV,MAAI,QAAQ;AACZ,MAAI,SAAS;AACb,OAAK,YAAY,GAAG;AACpB,QAAM,QAAQ,SAAS,cAAc,MAAM;AAC3C,QAAM,YAAY;AAClB,QAAM,cAAc;AACpB,QAAM,MAAM,KAAK,aAAa,SAAY,4BAA4B,KAAK;AAC3E,MAAI,KAAK;AACP,UAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,UAAM,cAAc;AACpB,UAAM,YAAY,KAAK;AAAA,EACzB;AACA,IAAE,OAAO,MAAM,KAAK;AACpB,MAAI,KAAK,QAAS,GAAE,iBAAiB,SAAS,MAAM,KAAK,QAAS,CAAC,CAAC;AACpE,OAAK,gBAAgB,CAAC;AACtB,SAAO;AACT;","names":[]}
+{"version":3,"sources":["../src/button.ts"],"sourcesContent":["const CSS = `\n.bwx-signin{display:inline-flex;align-items:center;gap:12px;min-height:48px;padding:10px 22px 10px 10px;border:0;border-radius:12px;cursor:pointer;background:linear-gradient(180deg,#fcd34d,#f59e0b);color:#000;text-align:left;font:700 16px/1.2 system-ui,-apple-system,\"Segoe UI\",sans-serif;box-shadow:0 8px 24px rgba(245,158,11,.2)}\n.bwx-signin:hover{background:linear-gradient(180deg,#fde68a,#fbbf24)}\n.bwx-signin:focus-visible{outline:2px solid #ffd24d;outline-offset:3px}\n.bwx-signin:disabled{opacity:.6;cursor:wait}\n.bwx-signin .bwx-mark{display:inline-flex;align-items:center;justify-content:center;width:32px;height:32px;border-radius:50%;background:#000;flex:none}\n.bwx-signin small{display:block;font-size:11px;font-weight:500;color:rgba(0,0,0,.6)}`;\n\nexport const LOGO_URL = 'https://bwalletx.com/logo.svg';\n\nexport interface ButtonOptions {\n  /** Second line under the label. Default \"also works with bWallet\". false hides it. */\n  subtitle?: string | false;\n  onClick?: (button: HTMLButtonElement) => void;\n}\n\n/** Put the gold \"Sign in with bWalletX\" button into `el` (replacing its contents). */\nexport function renderButton(el: HTMLElement | string, opts: ButtonOptions = {}): HTMLButtonElement {\n  const host = typeof el === 'string' ? document.querySelector<HTMLElement>(el) : el;\n  if (!host) throw new Error(`renderButton: no element ${String(el)}`);\n  if (!document.getElementById('bwx-signin-css')) {\n    const style = document.createElement('style');\n    style.id = 'bwx-signin-css';\n    style.textContent = CSS;\n    document.head.appendChild(style);\n  }\n  const b = document.createElement('button');\n  b.type = 'button';\n  b.className = 'bwx-signin';\n  const mark = document.createElement('span');\n  mark.className = 'bwx-mark';\n  const img = document.createElement('img');\n  img.src = LOGO_URL;\n  img.alt = '';\n  img.width = 15;\n  img.height = 20;\n  mark.appendChild(img);\n  const label = document.createElement('span');\n  label.className = 'bwx-label';\n  label.textContent = 'Sign in with bWalletX';\n  const sub = opts.subtitle === undefined ? 'also works with bWallet' : opts.subtitle;\n  if (sub) {\n    const small = document.createElement('small');\n    small.textContent = sub;\n    label.appendChild(small);\n  }\n  b.append(mark, label);\n  if (opts.onClick) b.addEventListener('click', () => opts.onClick!(b));\n  host.replaceChildren(b);\n  return b;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAM,MAAM;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAQL,IAAM,WAAW;AASjB,SAAS,aAAa,IAA0B,OAAsB,CAAC,GAAsB;AAClG,QAAM,OAAO,OAAO,OAAO,WAAW,SAAS,cAA2B,EAAE,IAAI;AAChF,MAAI,CAAC,KAAM,OAAM,IAAI,MAAM,4BAA4B,OAAO,EAAE,CAAC,EAAE;AACnE,MAAI,CAAC,SAAS,eAAe,gBAAgB,GAAG;AAC9C,UAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,UAAM,KAAK;AACX,UAAM,cAAc;AACpB,aAAS,KAAK,YAAY,KAAK;AAAA,EACjC;AACA,QAAM,IAAI,SAAS,cAAc,QAAQ;AACzC,IAAE,OAAO;AACT,IAAE,YAAY;AACd,QAAM,OAAO,SAAS,cAAc,MAAM;AAC1C,OAAK,YAAY;AACjB,QAAM,MAAM,SAAS,cAAc,KAAK;AACxC,MAAI,MAAM;AACV,MAAI,MAAM;AACV,MAAI,QAAQ;AACZ,MAAI,SAAS;AACb,OAAK,YAAY,GAAG;AACpB,QAAM,QAAQ,SAAS,cAAc,MAAM;AAC3C,QAAM,YAAY;AAClB,QAAM,cAAc;AACpB,QAAM,MAAM,KAAK,aAAa,SAAY,4BAA4B,KAAK;AAC3E,MAAI,KAAK;AACP,UAAM,QAAQ,SAAS,cAAc,OAAO;AAC5C,UAAM,cAAc;AACpB,UAAM,YAAY,KAAK;AAAA,EACzB;AACA,IAAE,OAAO,MAAM,KAAK;AACpB,MAAI,KAAK,QAAS,GAAE,iBAAiB,SAAS,MAAM,KAAK,QAAS,CAAC,CAAC;AACpE,OAAK,gBAAgB,CAAC;AACtB,SAAO;AACT;","names":[]}

package/dist/next.cjs

@@ -563,12 +563,14 @@ function randomNonce2() {
   return btoa(s).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 async function createChallenge(opts) {
-  if (!isIdentityKey(opts.identityKey)) throw new Error("identityKey must be a compressed public key (66 hex chars)");
+  const given = opts.identityKey !== void 0 && opts.identityKey !== null && opts.identityKey !== "";
+  if (given && !isIdentityKey(opts.identityKey)) throw new Error("identityKey must be a compressed public key (66 hex chars)");
+  const boundKey = given ? opts.identityKey.toLowerCase() : "";
   const origin = normalOrigin2(opts.origin);
   const nonce = randomNonce2();
   const expiresAt = Date.now() + CHALLENGE_LIFETIME_MS;
   const message = loginMessage(origin, nonce, expiresAt);
-  await storeOrDefault(opts.store).put(nonce, { identityKey: opts.identityKey.toLowerCase(), origin, message, expiresAt });
+  await storeOrDefault(opts.store).put(nonce, { identityKey: boundKey, origin, message, expiresAt });
   return { nonce, message, protocolID: LOGIN_PROTOCOL, keyID: nonce, expiresAt };
 }
 async function verifySignIn(opts) {
@@ -584,7 +586,7 @@ async function verifySignIn(opts) {
   if (c.origin !== origin) return null;
   if (!isIdentityKey(opts.identityKey)) return null;
   const identityKey = opts.identityKey.toLowerCase();
-  if (c.identityKey !== identityKey) return null;
+  if (c.identityKey && c.identityKey !== identityKey) return null;
   const sig = opts.signature;
   if (!Array.isArray(sig) || sig.length < 8 || sig.length > 80 || !sig.every((b) => Number.isInteger(b) && b >= 0 && b <= 255)) {
     return null;