@zoreal/oauth2-js 0.1.18 → 0.1.19

package/dist/index.d.cts

@@ -310,7 +310,7 @@ declare function mountPairingModal(state: PairingState, options: PairingModalOpt
  *                                  auth-code mode leaves it to the RP backend.
  */
 declare const WIRE_VERSION = 1;
-declare const SDK_VERSION = "0.1.18";
+declare const SDK_VERSION = "0.1.19";
 declare const SDK_NAME = "@zoreal/oauth2-js";
 declare const DEFAULT_ISSUER = "https://id.zoreal.com";
 /** Pending TTL is short. Poll gently; over-polling cancels the request. */
@@ -413,11 +413,6 @@ interface StartPairingParams {
     display?: PairDisplay;
 }
 declare function startPairing(issuer: string, params: StartPairingParams, signal?: AbortSignal): Promise<PairStartResponse>;
-/**
- * Polls until the request resolves. Returns the authorization code.
- * Throws FlowAbandonedError for the human outcomes (denied, expired,
- * enrolment abandoned) and OAuthFlowError for protocol ones.
- */
 declare function pollUntilApproved(issuer: string, requestId: string, onState?: (state: PairingState) => void, signal?: AbortSignal, options?: {
     /**
      * Same-device navigation only. The page starts polling while the

package/dist/index.d.ts

@@ -310,7 +310,7 @@ declare function mountPairingModal(state: PairingState, options: PairingModalOpt
  *                                  auth-code mode leaves it to the RP backend.
  */
 declare const WIRE_VERSION = 1;
-declare const SDK_VERSION = "0.1.18";
+declare const SDK_VERSION = "0.1.19";
 declare const SDK_NAME = "@zoreal/oauth2-js";
 declare const DEFAULT_ISSUER = "https://id.zoreal.com";
 /** Pending TTL is short. Poll gently; over-polling cancels the request. */
@@ -413,11 +413,6 @@ interface StartPairingParams {
     display?: PairDisplay;
 }
 declare function startPairing(issuer: string, params: StartPairingParams, signal?: AbortSignal): Promise<PairStartResponse>;
-/**
- * Polls until the request resolves. Returns the authorization code.
- * Throws FlowAbandonedError for the human outcomes (denied, expired,
- * enrolment abandoned) and OAuthFlowError for protocol ones.
- */
 declare function pollUntilApproved(issuer: string, requestId: string, onState?: (state: PairingState) => void, signal?: AbortSignal, options?: {
     /**
      * Same-device navigation only. The page starts polling while the

package/dist/index.js

@@ -14,7 +14,7 @@ function unsafeClaims(idToken) {
 
 // src/wire.ts
 var WIRE_VERSION = 1;
-var SDK_VERSION = "0.1.18";
+var SDK_VERSION = "0.1.19";
 var SDK_NAME = "@zoreal/oauth2-js";
 var DEFAULT_ISSUER = "https://id.zoreal.com";
 var POLL_INTERVAL_MS = 2e3;
@@ -92,11 +92,30 @@ var sleep = (ms, signal) => new Promise((resolve, reject) => {
   }, ms);
   signal?.addEventListener("abort", onAbort, { once: true });
 });
+var SETTLE_MS = 1500;
+var NETWORK_FAILURES_TOLERATED = 4;
 async function pollUntilApproved(issuer, requestId, onState, signal, options = {}) {
+  const settlingUntil = options.tolerateUnknownUntil ?? 0;
+  let networkFailures = 0;
+  let last = { status: "pending" };
+  if (settlingUntil > Date.now()) await sleep(SETTLE_MS, signal);
   for (; ; ) {
-    const response = await fetch(`${issuer}/pair/${encodeURIComponent(requestId)}/status`, {
-      signal
-    });
+    let response;
+    try {
+      response = await fetch(`${issuer}/pair/${encodeURIComponent(requestId)}/status`, {
+        signal
+      });
+      networkFailures = 0;
+    } catch (e) {
+      if (e instanceof DOMException && e.name === "AbortError") throw e;
+      networkFailures += 1;
+      if (settlingUntil > Date.now() || networkFailures <= NETWORK_FAILURES_TOLERATED) {
+        onState?.(last);
+        await sleep(POLL_INTERVAL_MS, signal);
+        continue;
+      }
+      throw e;
+    }
     const body = await parseJson(response);
     if (response.status === 404 && (options.tolerateUnknownUntil ?? 0) > Date.now()) {
       onState?.({ status: "pending" });
@@ -109,11 +128,12 @@ async function pollUntilApproved(issuer, requestId, onState, signal, options = {
         body.error_description ?? `Pairing status failed (${response.status})`
       );
     }
-    onState?.({
+    last = {
       status: body.status,
       expiresIn: body.expires_in,
       enrolmentDeadline: body.enrolment_deadline
-    });
+    };
+    onState?.(last);
     switch (body.status) {
       case "approved":
         if (!body.code) {