@authon/js 0.1.8 → 0.1.9

package/dist/index.js

@@ -606,24 +606,38 @@ var Authon = class {
         `width=${width},height=${height},left=${left},top=${top},toolbar=no,menubar=no`
       );
       let callbackReceived = false;
-      const pollTimer = setInterval(() => {
-        if (callbackReceived) return;
-        try {
-          if (!popup || popup.closed) {
-            clearInterval(pollTimer);
-            if (!callbackReceived) {
-              window.removeEventListener("message", handler);
-              this.modal?.hideLoading();
-            }
-          }
-        } catch {
-        }
-      }, 500);
+      let cleaned = false;
+      const cleanup = () => {
+        if (cleaned) return;
+        cleaned = true;
+        window.removeEventListener("message", handler);
+        window.removeEventListener("focus", focusHandler);
+        if (maxTimer) clearTimeout(maxTimer);
+      };
+      const focusHandler = () => {
+        if (callbackReceived || cleaned) return;
+        setTimeout(() => {
+          if (callbackReceived || cleaned) return;
+          cleanup();
+          this.modal?.hideLoading();
+        }, 1500);
+      };
+      window.addEventListener("focus", focusHandler);
+      const maxTimer = setTimeout(() => {
+        if (callbackReceived || cleaned) return;
+        cleanup();
+        this.modal?.hideLoading();
+      }, 18e4);
+      if (!popup) {
+        cleanup();
+        this.modal?.hideLoading();
+        this.emit("error", new Error("Popup was blocked by the browser"));
+        return;
+      }
       const handler = async (e) => {
         if (e.data?.type !== "authon-oauth-callback") return;
         callbackReceived = true;
-        window.removeEventListener("message", handler);
-        clearInterval(pollTimer);
+        cleanup();
         try {
           const tokens = await this.apiPost("/v1/auth/oauth/callback", {
             code: e.data.code,

package/dist/index.mjs

@@ -579,24 +579,38 @@ var Authon = class {
         `width=${width},height=${height},left=${left},top=${top},toolbar=no,menubar=no`
       );
       let callbackReceived = false;
-      const pollTimer = setInterval(() => {
-        if (callbackReceived) return;
-        try {
-          if (!popup || popup.closed) {
-            clearInterval(pollTimer);
-            if (!callbackReceived) {
-              window.removeEventListener("message", handler);
-              this.modal?.hideLoading();
-            }
-          }
-        } catch {
-        }
-      }, 500);
+      let cleaned = false;
+      const cleanup = () => {
+        if (cleaned) return;
+        cleaned = true;
+        window.removeEventListener("message", handler);
+        window.removeEventListener("focus", focusHandler);
+        if (maxTimer) clearTimeout(maxTimer);
+      };
+      const focusHandler = () => {
+        if (callbackReceived || cleaned) return;
+        setTimeout(() => {
+          if (callbackReceived || cleaned) return;
+          cleanup();
+          this.modal?.hideLoading();
+        }, 1500);
+      };
+      window.addEventListener("focus", focusHandler);
+      const maxTimer = setTimeout(() => {
+        if (callbackReceived || cleaned) return;
+        cleanup();
+        this.modal?.hideLoading();
+      }, 18e4);
+      if (!popup) {
+        cleanup();
+        this.modal?.hideLoading();
+        this.emit("error", new Error("Popup was blocked by the browser"));
+        return;
+      }
       const handler = async (e) => {
         if (e.data?.type !== "authon-oauth-callback") return;
         callbackReceived = true;
-        window.removeEventListener("message", handler);
-        clearInterval(pollTimer);
+        cleanup();
         try {
           const tokens = await this.apiPost("/v1/auth/oauth/callback", {
             code: e.data.code,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@authon/js",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Authon core SDK — ShadowDOM login modal for any app",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",