@zoreal/oauth2-js 0.1.21 → 0.1.22

package/dist/index.cjs

@@ -61,7 +61,7 @@ function unsafeClaims(idToken) {
 
 // src/wire.ts
 var WIRE_VERSION = 1;
-var SDK_VERSION = "0.1.21";
+var SDK_VERSION = "0.1.22";
 var SDK_NAME = "@zoreal/oauth2-js";
 var DEFAULT_ISSUER = "https://id.zoreal.com";
 var POLL_INTERVAL_MS = 2e3;
@@ -863,6 +863,30 @@ function markReturnDone(requestId) {
 function isReturnDone(requestId) {
   return storage()?.getItem(DONE + requestId) !== null && storage()?.getItem(DONE + requestId) !== void 0;
 }
+function visibleOrDone(requestId, signal) {
+  if (typeof document === "undefined" || document.visibilityState !== "hidden") {
+    return Promise.resolve(!isReturnDone(requestId));
+  }
+  return new Promise((resolve) => {
+    const finish = (value) => {
+      document.removeEventListener("visibilitychange", onVisible);
+      window.removeEventListener("storage", onStorage);
+      signal?.removeEventListener("abort", onAbort);
+      resolve(value);
+    };
+    const onVisible = () => {
+      if (document.visibilityState !== "hidden") finish(!isReturnDone(requestId));
+    };
+    const onStorage = () => {
+      if (isReturnDone(requestId)) finish(false);
+    };
+    const onAbort = () => finish(false);
+    document.addEventListener("visibilitychange", onVisible);
+    window.addEventListener("storage", onStorage);
+    signal?.addEventListener("abort", onAbort, { once: true });
+    if (isReturnDone(requestId)) finish(false);
+  });
+}
 function returnToUrl() {
   if (typeof window === "undefined") return void 0;
   const { href } = window.location;
@@ -2174,7 +2198,7 @@ function startLogin(options) {
           controller.signal,
           { tolerateUnknownUntil: Date.now() + 15e3 }
         );
-        if (isReturnDone(requestId)) {
+        if (!await visibleOrDone(requestId, controller.signal)) {
           throw new DOMException("aborted", "AbortError");
         }
       } else {