@openkey/sdk 0.12.1 → 0.12.2-beta.0

package/dist/index.mjs

@@ -829,6 +829,19 @@ var OpenKey = class {
    * remains preserved and OpenKey never rewrites their bytes.
    */
   async authorizeTinyCloud(request, opts) {
+    const reserved = request?.protocolVersion === 1 && typeof request.siwe === "string" && request.siwe !== "" && this.resolveMode(opts?.mode) === "popup" ? this.reservePopup("sign") : null;
+    try {
+      return await this.authorizeTinyCloudFlow(request, opts, reserved);
+    } finally {
+      if (reserved && !reserved.used) {
+        try {
+          reserved.window.close();
+        } catch {
+        }
+      }
+    }
+  }
+  async authorizeTinyCloudFlow(request, opts, reserved) {
     if (request.protocolVersion !== 1) {
       throw new Error(
         `authorizeTinyCloud only supports protocolVersion 1; got ${request.protocolVersion}`
@@ -876,7 +889,8 @@ var OpenKey = class {
         // verified unless the server actually origin-binds a manifest.
         presentation: request.presentation
       },
-      opts?.mode
+      opts?.mode,
+      reserved
     );
     if (typeof raw.signedMessage !== "string" || !raw.signedMessage) {
       throw new Error(
@@ -1316,14 +1330,14 @@ var OpenKey = class {
     if (typeof window !== "undefined" && window.ethereum) return true;
     return false;
   }
-  async openFlow(action, message, modeOverride) {
+  async openFlow(action, message, modeOverride, reserved) {
     const mode = this.resolveMode(modeOverride);
     const origin = encodeURIComponent(window.location.origin);
     const eoaFlag = action === "connect" && this.hasDetectedEoa() ? "&hasEoa=true" : "";
     const passkeysFlag = passkeysQueryFlag(this.passkeysSupported);
     if (mode === "popup") {
       const url2 = `${this.host}/widget/${action}?origin=${origin}${eoaFlag}${passkeysFlag}`;
-      return new Promise((resolve, reject) => this.openPopup(action, url2, message, resolve, reject));
+      return new Promise((resolve, reject) => this.openPopup(action, url2, message, resolve, reject, reserved ?? null));
     }
     if (mode === "redirect") {
       const url2 = `${this.host}/widget/${action}?origin=${origin}${eoaFlag}${passkeysFlag}`;
@@ -1554,14 +1568,40 @@ var OpenKey = class {
       }
     });
   }
-  openPopup(action, url, message, resolve, reject) {
+  /**
+   * Opens the popup window of a flow in the current tick, blank. `openPopup`
+   * navigates it to the widget later. `null` when the browser did not give a
+   * usable window: the flow then opens its own, as it always did.
+   */
+  reservePopup(action) {
     const left = window.screenX + (window.outerWidth - POPUP_WIDTH) / 2;
     const top = window.screenY + (window.outerHeight - POPUP_HEIGHT) / 2;
-    const popup = window.open(
-      url,
+    const win = window.open(
+      "about:blank",
       `openkey-${action}-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
       `width=${POPUP_WIDTH},height=${POPUP_HEIGHT},left=${left},top=${top},popup=true`
     );
+    return isUsablePopup(win) ? { window: win, used: false } : null;
+  }
+  openPopup(action, url, message, resolve, reject, reserved = null) {
+    const left = window.screenX + (window.outerWidth - POPUP_WIDTH) / 2;
+    const top = window.screenY + (window.outerHeight - POPUP_HEIGHT) / 2;
+    let popup;
+    if (reserved && !reserved.window.closed) {
+      try {
+        reserved.window.location.href = url;
+        reserved.used = true;
+        popup = reserved.window;
+      } catch {
+        popup = null;
+      }
+    } else {
+      popup = window.open(
+        url,
+        `openkey-${action}-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`,
+        `width=${POPUP_WIDTH},height=${POPUP_HEIGHT},left=${left},top=${top},popup=true`
+      );
+    }
     if (!isUsablePopup(popup)) {
       this.popup = null;
       const embedded = isEmbeddedAppWebView();