@worldcoin/idkit-core 4.0.14 → 4.0.15

package/dist/index.cjs

@@ -1976,37 +1976,32 @@ function createNativeRequest(wasmPayload, config, signalHashes = {}, legacySigna
 var NativeIDKitRequest = class {
   constructor(wasmPayload, config, signalHashes = {}, legacySignalHash, version = 2) {
     this.connectorURI = "";
-    this.resolved = false;
-    this.cancelled = false;
-    this.settled = false;
-    this.resolvedResult = null;
+    // Non-null once the request is done (success, error, cancel, or timeout).
+    this.completionResult = null;
+    this.resolveFn = null;
     this.messageHandler = null;
     this.miniKitHandler = null;
-    this.rejectFn = null;
     this.requestId = crypto.randomUUID?.() ?? `native-${Date.now()}-${++_requestCounter}`;
-    this.resultPromise = new Promise((resolve, reject) => {
-      this.rejectFn = reject;
+    this.resultPromise = new Promise((resolve) => {
+      this.resolveFn = resolve;
       const handleIncomingPayload = (responsePayload) => {
-        if (this.cancelled || this.resolved || this.settled) return;
+        if (this.completionResult) return;
         if (responsePayload?.status === "error") {
-          this.cleanup();
-          reject(
-            new NativeVerifyError(
-              responsePayload.error_code ?? "generic_error" /* GenericError */
-            )
-          );
+          this.complete({
+            success: false,
+            error: responsePayload.error_code ?? "generic_error" /* GenericError */
+          });
           return;
         }
-        this.resolved = true;
-        const result = nativeResultToIDKitResult(
-          responsePayload,
-          config,
-          signalHashes,
-          legacySignalHash
-        );
-        this.resolvedResult = result;
-        this.cleanup();
-        resolve(result);
+        this.complete({
+          success: true,
+          result: nativeResultToIDKitResult(
+            responsePayload,
+            config,
+            signalHashes,
+            legacySignalHash
+          )
+        });
       };
       const handler = (event) => {
         const data = event.data;
@@ -2032,38 +2027,39 @@ var NativeIDKitRequest = class {
         version,
         payload: wasmPayload
       };
-      const w = window;
-      if (w.webkit?.messageHandlers?.minikit) {
-        w.webkit.messageHandlers.minikit.postMessage(sendPayload);
-      } else if (w.Android) {
-        w.Android.postMessage(JSON.stringify(sendPayload));
-      } else {
-        this.cleanup();
-        reject(new Error("No WebView bridge available"));
-      }
-    });
-    this.resultPromise.catch(() => {
-    }).finally(() => {
-      this.settled = true;
-      this.cleanup();
-      if (_activeNativeRequest === this) {
-        _activeNativeRequest = null;
+      try {
+        const w = window;
+        if (w.webkit?.messageHandlers?.minikit) {
+          w.webkit.messageHandlers.minikit.postMessage(sendPayload);
+        } else if (w.Android) {
+          w.Android.postMessage(JSON.stringify(sendPayload));
+        } else {
+          this.complete({
+            success: false,
+            error: "generic_error" /* GenericError */
+          });
+        }
+      } catch {
+        this.complete({
+          success: false,
+          error: "generic_error" /* GenericError */
+        });
       }
     });
   }
-  /**
-   * Cancel this request. Removes the message listener so it cannot consume
-   * a response meant for a later request, and rejects the pending promise.
-   */
-  cancel() {
-    if (this.resolved || this.cancelled) return;
-    this.cancelled = true;
+  // Single entry point for finishing the request. Idempotent — first caller wins.
+  complete(result) {
+    if (this.completionResult) return;
+    this.completionResult = result;
     this.cleanup();
-    this.rejectFn?.(new NativeVerifyError("cancelled" /* Cancelled */));
+    this.resolveFn?.(result);
     if (_activeNativeRequest === this) {
       _activeNativeRequest = null;
     }
   }
+  cancel() {
+    this.complete({ success: false, error: "cancelled" /* Cancelled */ });
+  }
   cleanup() {
     if (this.messageHandler) {
       window.removeEventListener("message", this.messageHandler);
@@ -2079,67 +2075,48 @@ var NativeIDKitRequest = class {
     }
   }
   isPending() {
-    return !this.settled && !this.cancelled;
+    return this.completionResult === null;
   }
   async pollOnce() {
-    if (this.resolved && this.resolvedResult) {
-      return { type: "confirmed", result: this.resolvedResult };
+    if (!this.completionResult) {
+      return { type: "awaiting_confirmation" };
+    }
+    if (this.completionResult.success) {
+      return { type: "confirmed", result: this.completionResult.result };
     }
-    return { type: "awaiting_confirmation" };
+    return { type: "failed", error: this.completionResult.error };
   }
   async pollUntilCompletion(options) {
     const timeout = options?.timeout ?? 3e5;
-    let timeoutId;
-    let abortHandler = null;
-    let waiterTerminationCode = null;
+    const timeoutId = setTimeout(() => {
+      this.complete({ success: false, error: "timeout" /* Timeout */ });
+    }, timeout);
+    const abortHandler = options?.signal ? () => {
+      this.complete({ success: false, error: "cancelled" /* Cancelled */ });
+    } : null;
+    if (abortHandler) {
+      if (options.signal.aborted) {
+        abortHandler();
+      } else {
+        options.signal.addEventListener("abort", abortHandler, {
+          once: true
+        });
+      }
+    }
     try {
-      const result = await Promise.race([
-        this.resultPromise,
-        new Promise((_, reject) => {
-          if (options?.signal) {
-            abortHandler = () => {
-              waiterTerminationCode = "cancelled" /* Cancelled */;
-              reject(new NativeVerifyError("cancelled" /* Cancelled */));
-            };
-            if (options.signal.aborted) {
-              abortHandler();
-              return;
-            }
-            options.signal.addEventListener("abort", abortHandler, {
-              once: true
-            });
-          }
-          timeoutId = setTimeout(() => {
-            waiterTerminationCode = "timeout" /* Timeout */;
-            reject(new NativeVerifyError("timeout" /* Timeout */));
-          }, timeout);
-        })
-      ]);
-      return { success: true, result };
+      return await this.resultPromise;
     } catch (error) {
-      if (error instanceof NativeVerifyError) {
-        if (waiterTerminationCode === error.code && this.isPending()) {
-          this.cancel();
-        }
-        return { success: false, error: error.code };
-      }
-      return { success: false, error: "generic_error" /* GenericError */ };
+      console.error("Unexpected rejection in native resultPromise", error);
+      this.complete({ success: false, error: "generic_error" /* GenericError */ });
+      return this.completionResult;
     } finally {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
+      clearTimeout(timeoutId);
       if (options?.signal && abortHandler) {
         options.signal.removeEventListener("abort", abortHandler);
       }
     }
   }
 };
-var NativeVerifyError = class extends Error {
-  constructor(code) {
-    super(code);
-    this.code = code;
-  }
-};
 function nativeResultToIDKitResult(payload, config, signalHashes, legacySignalHash) {
   const p = payload;
   const rpNonce = config.rp_context?.nonce ?? "";

package/dist/index.js

@@ -1973,37 +1973,32 @@ function createNativeRequest(wasmPayload, config, signalHashes = {}, legacySigna
 var NativeIDKitRequest = class {
   constructor(wasmPayload, config, signalHashes = {}, legacySignalHash, version = 2) {
     this.connectorURI = "";
-    this.resolved = false;
-    this.cancelled = false;
-    this.settled = false;
-    this.resolvedResult = null;
+    // Non-null once the request is done (success, error, cancel, or timeout).
+    this.completionResult = null;
+    this.resolveFn = null;
     this.messageHandler = null;
     this.miniKitHandler = null;
-    this.rejectFn = null;
     this.requestId = crypto.randomUUID?.() ?? `native-${Date.now()}-${++_requestCounter}`;
-    this.resultPromise = new Promise((resolve, reject) => {
-      this.rejectFn = reject;
+    this.resultPromise = new Promise((resolve) => {
+      this.resolveFn = resolve;
       const handleIncomingPayload = (responsePayload) => {
-        if (this.cancelled || this.resolved || this.settled) return;
+        if (this.completionResult) return;
         if (responsePayload?.status === "error") {
-          this.cleanup();
-          reject(
-            new NativeVerifyError(
-              responsePayload.error_code ?? "generic_error" /* GenericError */
-            )
-          );
+          this.complete({
+            success: false,
+            error: responsePayload.error_code ?? "generic_error" /* GenericError */
+          });
           return;
         }
-        this.resolved = true;
-        const result = nativeResultToIDKitResult(
-          responsePayload,
-          config,
-          signalHashes,
-          legacySignalHash
-        );
-        this.resolvedResult = result;
-        this.cleanup();
-        resolve(result);
+        this.complete({
+          success: true,
+          result: nativeResultToIDKitResult(
+            responsePayload,
+            config,
+            signalHashes,
+            legacySignalHash
+          )
+        });
       };
       const handler = (event) => {
         const data = event.data;
@@ -2029,38 +2024,39 @@ var NativeIDKitRequest = class {
         version,
         payload: wasmPayload
       };
-      const w = window;
-      if (w.webkit?.messageHandlers?.minikit) {
-        w.webkit.messageHandlers.minikit.postMessage(sendPayload);
-      } else if (w.Android) {
-        w.Android.postMessage(JSON.stringify(sendPayload));
-      } else {
-        this.cleanup();
-        reject(new Error("No WebView bridge available"));
-      }
-    });
-    this.resultPromise.catch(() => {
-    }).finally(() => {
-      this.settled = true;
-      this.cleanup();
-      if (_activeNativeRequest === this) {
-        _activeNativeRequest = null;
+      try {
+        const w = window;
+        if (w.webkit?.messageHandlers?.minikit) {
+          w.webkit.messageHandlers.minikit.postMessage(sendPayload);
+        } else if (w.Android) {
+          w.Android.postMessage(JSON.stringify(sendPayload));
+        } else {
+          this.complete({
+            success: false,
+            error: "generic_error" /* GenericError */
+          });
+        }
+      } catch {
+        this.complete({
+          success: false,
+          error: "generic_error" /* GenericError */
+        });
       }
     });
   }
-  /**
-   * Cancel this request. Removes the message listener so it cannot consume
-   * a response meant for a later request, and rejects the pending promise.
-   */
-  cancel() {
-    if (this.resolved || this.cancelled) return;
-    this.cancelled = true;
+  // Single entry point for finishing the request. Idempotent — first caller wins.
+  complete(result) {
+    if (this.completionResult) return;
+    this.completionResult = result;
     this.cleanup();
-    this.rejectFn?.(new NativeVerifyError("cancelled" /* Cancelled */));
+    this.resolveFn?.(result);
     if (_activeNativeRequest === this) {
       _activeNativeRequest = null;
     }
   }
+  cancel() {
+    this.complete({ success: false, error: "cancelled" /* Cancelled */ });
+  }
   cleanup() {
     if (this.messageHandler) {
       window.removeEventListener("message", this.messageHandler);
@@ -2076,67 +2072,48 @@ var NativeIDKitRequest = class {
     }
   }
   isPending() {
-    return !this.settled && !this.cancelled;
+    return this.completionResult === null;
   }
   async pollOnce() {
-    if (this.resolved && this.resolvedResult) {
-      return { type: "confirmed", result: this.resolvedResult };
+    if (!this.completionResult) {
+      return { type: "awaiting_confirmation" };
+    }
+    if (this.completionResult.success) {
+      return { type: "confirmed", result: this.completionResult.result };
     }
-    return { type: "awaiting_confirmation" };
+    return { type: "failed", error: this.completionResult.error };
   }
   async pollUntilCompletion(options) {
     const timeout = options?.timeout ?? 3e5;
-    let timeoutId;
-    let abortHandler = null;
-    let waiterTerminationCode = null;
+    const timeoutId = setTimeout(() => {
+      this.complete({ success: false, error: "timeout" /* Timeout */ });
+    }, timeout);
+    const abortHandler = options?.signal ? () => {
+      this.complete({ success: false, error: "cancelled" /* Cancelled */ });
+    } : null;
+    if (abortHandler) {
+      if (options.signal.aborted) {
+        abortHandler();
+      } else {
+        options.signal.addEventListener("abort", abortHandler, {
+          once: true
+        });
+      }
+    }
     try {
-      const result = await Promise.race([
-        this.resultPromise,
-        new Promise((_, reject) => {
-          if (options?.signal) {
-            abortHandler = () => {
-              waiterTerminationCode = "cancelled" /* Cancelled */;
-              reject(new NativeVerifyError("cancelled" /* Cancelled */));
-            };
-            if (options.signal.aborted) {
-              abortHandler();
-              return;
-            }
-            options.signal.addEventListener("abort", abortHandler, {
-              once: true
-            });
-          }
-          timeoutId = setTimeout(() => {
-            waiterTerminationCode = "timeout" /* Timeout */;
-            reject(new NativeVerifyError("timeout" /* Timeout */));
-          }, timeout);
-        })
-      ]);
-      return { success: true, result };
+      return await this.resultPromise;
     } catch (error) {
-      if (error instanceof NativeVerifyError) {
-        if (waiterTerminationCode === error.code && this.isPending()) {
-          this.cancel();
-        }
-        return { success: false, error: error.code };
-      }
-      return { success: false, error: "generic_error" /* GenericError */ };
+      console.error("Unexpected rejection in native resultPromise", error);
+      this.complete({ success: false, error: "generic_error" /* GenericError */ });
+      return this.completionResult;
     } finally {
-      if (timeoutId) {
-        clearTimeout(timeoutId);
-      }
+      clearTimeout(timeoutId);
       if (options?.signal && abortHandler) {
         options.signal.removeEventListener("abort", abortHandler);
       }
     }
   }
 };
-var NativeVerifyError = class extends Error {
-  constructor(code) {
-    super(code);
-    this.code = code;
-  }
-};
 function nativeResultToIDKitResult(payload, config, signalHashes, legacySignalHash) {
   const p = payload;
   const rpNonce = config.rp_context?.nonce ?? "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worldcoin/idkit-core",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "description": "Core IDKit SDK for World ID - Pure TypeScript, no dependencies",
   "type": "module",
   "main": "./dist/index.cjs",