@omnizapi/connect 1.0.1 → 1.0.3

package/dist/esm/index.mjs

@@ -65,12 +65,22 @@ var getConstants = ({
 // src/core/runtime.ts
 var runtimeKey = /* @__PURE__ */ Symbol.for("omnizapi.connect.runtime.v1");
 function getRuntime(host) {
+  var _a, _b, _c;
   const target = host;
   let runtime = target[runtimeKey];
   if (!runtime) {
-    runtime = { nativeLoginPending: false, failedFacebookScripts: /* @__PURE__ */ new WeakSet() };
+    runtime = {
+      nativeLoginPending: false,
+      failedFacebookScripts: /* @__PURE__ */ new WeakSet(),
+      erroredFacebookScripts: /* @__PURE__ */ new WeakSet(),
+      facebookAppIds: /* @__PURE__ */ new WeakMap(),
+      facebookInitObservers: /* @__PURE__ */ new WeakMap()
+    };
     Object.defineProperty(target, runtimeKey, { configurable: true, value: runtime });
   }
+  (_a = runtime.facebookAppIds) != null ? _a : runtime.facebookAppIds = /* @__PURE__ */ new WeakMap();
+  (_b = runtime.facebookInitObservers) != null ? _b : runtime.facebookInitObservers = /* @__PURE__ */ new WeakMap();
+  (_c = runtime.erroredFacebookScripts) != null ? _c : runtime.erroredFacebookScripts = /* @__PURE__ */ new WeakSet();
   return runtime;
 }
 
@@ -78,108 +88,238 @@ function getRuntime(host) {
 function isReadySdk(sdk) {
   return !!sdk && !("__buffer" in sdk) && typeof sdk.init === "function" && typeof sdk.login === "function";
 }
+function observeFacebookInit(runtime, fb) {
+  var _a;
+  try {
+    const descriptor = Object.getOwnPropertyDescriptor(fb, "init");
+    const existing = runtime.facebookInitObservers.get(fb);
+    if (existing) {
+      if ((descriptor == null ? void 0 : descriptor.value) !== existing.init) throw new Error("FB.init was replaced.");
+      return existing;
+    }
+    if (!descriptor || typeof descriptor.value !== "function" || !descriptor.writable && !descriptor.configurable) {
+      throw new Error("FB.init cannot be observed.");
+    }
+    const original = descriptor.value;
+    const observer = {
+      calls: 0,
+      init: function(...args) {
+        observer.calls++;
+        runtime.facebookAppIds.delete(fb);
+        return Reflect.apply(original, this, args);
+      }
+    };
+    Object.defineProperty(fb, "init", { ...descriptor, value: observer.init });
+    if (((_a = Object.getOwnPropertyDescriptor(fb, "init")) == null ? void 0 : _a.value) !== observer.init) throw new Error("FB.init was not replaced.");
+    runtime.facebookInitObservers.set(fb, observer);
+    return observer;
+  } catch (e) {
+    runtime.facebookAppIds.delete(fb);
+    throw new OmnizapiError(
+      "INVALID_CONFIGURATION",
+      "The Meta SDK initialization cannot be observed safely. Use the popup flow or reload a fresh page."
+    );
+  }
+}
+function initializeFacebookSdk(host, fb, appId) {
+  var _a;
+  if (host.FB !== fb || !fb || "__buffer" in fb || typeof fb.login !== "function") {
+    throw new OmnizapiError("INVALID_CONFIGURATION", "The Meta SDK is not ready or was replaced before initialization.");
+  }
+  if (typeof appId !== "string" || !/^[0-9]+$/.test(appId)) {
+    throw new OmnizapiError("INVALID_CONFIGURATION", "A numeric Meta appId is required for native login.");
+  }
+  const runtime = getRuntime(host);
+  if (runtime.facebookAppIds.get(fb) === null && (runtime.facebookLoadUncertain || runtime.facebookLoading || typeof host.fbAsyncInit === "function")) {
+    runtime.facebookAppIds.delete(fb);
+  }
+  const initializedAppId = runtime.facebookAppIds.get(fb);
+  if (initializedAppId === void 0 || initializedAppId !== null && !runtime.facebookInitObservers.has(fb)) {
+    runtime.facebookAppIds.delete(fb);
+    throw new OmnizapiError(
+      "INVALID_CONFIGURATION",
+      "The host Meta SDK configuration is unknown. Use the popup flow or a fresh page without a host-initialized SDK for native login."
+    );
+  }
+  const observer = observeFacebookInit(runtime, fb);
+  if (initializedAppId !== null) {
+    if (initializedAppId !== appId) {
+      throw new OmnizapiError(
+        "INVALID_CONFIGURATION",
+        "The Meta SDK is already initialized for another app. Use the popup flow or reload a fresh page before changing apps."
+      );
+    }
+    return;
+  }
+  const calls = observer.calls;
+  runtime.facebookAppIds.delete(fb);
+  try {
+    fb.init({ appId, version: "v25.0", autoLogAppEvents: true, xfbml: true });
+  } catch (e) {
+    throw new OmnizapiError("PROVIDER_ERROR", "The Meta SDK could not be initialized.");
+  }
+  if (observer.calls !== calls + 1 || host.FB !== fb || ((_a = Object.getOwnPropertyDescriptor(fb, "init")) == null ? void 0 : _a.value) !== observer.init) {
+    throw new OmnizapiError("INVALID_CONFIGURATION", "The Meta SDK changed during initialization. Use the popup flow or reload a fresh page.");
+  }
+  runtime.facebookAppIds.set(fb, appId);
+}
 function loadFacebookSdk(host, signal) {
   if (signal.aborted) {
     return Promise.reject(new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK load was cancelled."));
   }
-  if (isReadySdk(host.FB)) {
-    return Promise.resolve(host.FB);
-  }
   const runtime = getRuntime(host);
-  const existing = runtime.facebookLoading;
-  if (existing) return existing;
-  const loading = Promise.resolve().then(() => new Promise((resolve, reject) => {
-    let settled = false;
-    let script;
-    let ownedScript = false;
-    let previous;
-    let previousCallback;
-    const finish = (sdk, error) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      signal.removeEventListener("abort", onAbort);
-      script == null ? void 0 : script.removeEventListener("load", onLoad);
-      script == null ? void 0 : script.removeEventListener("error", onError);
-      try {
-        if (host.fbAsyncInit === onReady) {
-          if (previous) Object.defineProperty(host, "fbAsyncInit", previous);
-          else Reflect.deleteProperty(host, "fbAsyncInit");
-        }
-      } catch (e) {
-      }
-      if (error && script) {
-        if (!signal.aborted) runtime.failedFacebookScripts.add(script);
-        if (ownedScript) {
+  let loading = runtime.facebookLoadObserver;
+  if (!loading && isReadySdk(host.FB)) {
+    loading = { promise: Promise.resolve(host.FB), consumers: 0 };
+  }
+  if (!loading) {
+    const shared2 = {
+      consumers: 0,
+      // Register the observer and its consumers before setup can fail synchronously.
+      promise: Promise.resolve().then(() => new Promise((resolve, reject) => {
+        var _a;
+        let settled = false;
+        let script;
+        let ownedScript = false;
+        let freshSdk = false;
+        let bootstrap;
+        let previous;
+        let previousCallback;
+        const finish = (sdk, error, definitiveFailure = false) => {
+          if (settled) return;
+          settled = true;
+          clearTimeout(timer);
+          script == null ? void 0 : script.removeEventListener("load", onLoad);
+          script == null ? void 0 : script.removeEventListener("error", onError);
+          try {
+            if (host.fbAsyncInit === onReady) {
+              if (previous) Object.defineProperty(host, "fbAsyncInit", previous);
+              else Reflect.deleteProperty(host, "fbAsyncInit");
+            }
+          } catch (e) {
+          }
+          if (error && script) {
+            runtime.failedFacebookScripts.add(script);
+            if (definitiveFailure) runtime.erroredFacebookScripts.add(script);
+            else if (!ownedScript) runtime.facebookLoadUncertain = true;
+            if (ownedScript) {
+              try {
+                script.remove();
+              } catch (e) {
+              }
+            }
+          }
+          if (runtime.facebookLoadObserver === shared2) delete runtime.facebookLoadObserver;
+          if (sdk) resolve(sdk);
+          else reject(error);
+        };
+        const onLoad = () => {
+          var _a2;
+          if (settled) return;
+          const sdk = host.FB;
+          if (!sdk) return;
+          if ("__buffer" in sdk) bootstrap = sdk;
+          if (((_a2 = bootstrap == null ? void 0 : bootstrap.__buffer) == null ? void 0 : _a2.opts) != null || host.fbAsyncInit !== onReady || (script == null ? void 0 : script.onload) || runtime.facebookLoading || runtime.facebookLoadUncertain) {
+            freshSdk = false;
+            if (runtime.facebookAppIds.get(sdk) === null) runtime.facebookAppIds.delete(sdk);
+            if (bootstrap && runtime.facebookAppIds.get(bootstrap) === null) runtime.facebookAppIds.delete(bootstrap);
+          }
+          const ready = isReadySdk(sdk);
+          if (freshSdk && runtime.facebookAppIds.get(sdk) == null) {
+            if (!ready) runtime.facebookAppIds.set(sdk, null);
+            else if (!runtime.facebookInitObservers.has(sdk)) {
+              try {
+                observeFacebookInit(runtime, sdk);
+                runtime.facebookAppIds.set(sdk, null);
+              } catch (e) {
+              }
+            }
+          }
+          if (ready) finish(sdk);
+        };
+        const onError = () => finish(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK could not be loaded."), true);
+        const onReady = () => {
+          if (settled) return;
           try {
-            script.remove();
+            previousCallback == null ? void 0 : previousCallback.call(host);
           } catch (e) {
           }
+          onLoad();
+        };
+        const timer = setTimeout(() => finish(void 0, new OmnizapiError(
+          "SDK_LOAD_FAILED",
+          "The Meta SDK load timed out."
+        )), 30 * 1e3);
+        shared2.cancelIfUnused = () => {
+          if (ownedScript && shared2.consumers === 0) {
+            finish(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK load was cancelled."));
+          }
+        };
+        try {
+          previous = Object.getOwnPropertyDescriptor(host, "fbAsyncInit");
+          previousCallback = typeof host.fbAsyncInit === "function" ? host.fbAsyncInit : void 0;
+          const document = host.document;
+          const byId = document.getElementById("facebook-jssdk");
+          script = Array.from(document.scripts).find((candidate) => {
+            try {
+              const url = new URL(candidate.src);
+              if (url.origin !== "https://connect.facebook.net" || !/^\/[^/]+\/sdk\.js$/.test(url.pathname)) return false;
+              if (!runtime.failedFacebookScripts.has(candidate)) return true;
+              if (!runtime.erroredFacebookScripts.has(candidate)) runtime.facebookLoadUncertain = true;
+              return false;
+            } catch (e) {
+              return false;
+            }
+          });
+          if (!script) {
+            script = document.createElement("script");
+            ownedScript = true;
+            const initialSdk = host.FB;
+            if (initialSdk && "__buffer" in initialSdk) bootstrap = initialSdk;
+            freshSdk = !runtime.facebookLoadUncertain && !runtime.facebookLoading && !previousCallback && (!initialSdk || !!bootstrap && runtime.facebookAppIds.get(initialSdk) === null && ((_a = bootstrap.__buffer) == null ? void 0 : _a.opts) == null);
+            if (!byId) script.id = "facebook-jssdk";
+            script.src = "https://connect.facebook.net/en_US/sdk.js";
+            script.crossOrigin = "anonymous";
+            script.async = true;
+            script.defer = true;
+          }
+          shared2.cancelIfUnused();
+          if (settled) return;
+          Object.defineProperty(host, "fbAsyncInit", previous && !previous.configurable ? { value: onReady } : { configurable: true, enumerable: true, writable: true, value: onReady });
+          script.addEventListener("load", onLoad);
+          script.addEventListener("error", onError);
+          onLoad();
+          if (!settled && ownedScript) document.head.appendChild(script);
+        } catch (e) {
+          finish(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK could not be loaded."));
         }
-      }
-      if (runtime.facebookLoading === loading) delete runtime.facebookLoading;
-      if (sdk) resolve(sdk);
-      else reject(error);
-    };
-    const onLoad = () => {
-      if (settled) return;
-      const sdk = host.FB;
-      if (isReadySdk(sdk)) finish(sdk);
+      }))
     };
-    const onError = () => finish(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK could not be loaded."));
-    const onAbort = () => finish(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK load was cancelled."));
-    const onReady = () => {
+    runtime.facebookLoadObserver = loading = shared2;
+  }
+  const shared = loading;
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    shared.consumers++;
+    const complete = (sdk, error) => {
+      var _a;
       if (settled) return;
-      try {
-        previousCallback == null ? void 0 : previousCallback.call(host);
-      } catch (e) {
-      }
-      onLoad();
+      settled = true;
+      signal.removeEventListener("abort", onAbort);
+      shared.consumers--;
+      if (sdk) resolve(sdk);
+      else reject(error);
+      (_a = shared.cancelIfUnused) == null ? void 0 : _a.call(shared);
     };
-    const timer = setTimeout(() => finish(void 0, new OmnizapiError(
-      "SDK_LOAD_FAILED",
-      "The Meta SDK load timed out."
-    )), 30 * 1e3);
-    try {
-      signal.addEventListener("abort", onAbort, { once: true });
-      if (signal.aborted) {
-        onAbort();
-        return;
-      }
-      previous = Object.getOwnPropertyDescriptor(host, "fbAsyncInit");
-      previousCallback = typeof host.fbAsyncInit === "function" ? host.fbAsyncInit : void 0;
-      Object.defineProperty(host, "fbAsyncInit", previous && !previous.configurable ? { value: onReady } : { configurable: true, enumerable: true, writable: true, value: onReady });
-      const document = host.document;
-      const byId = document.getElementById("facebook-jssdk");
-      const existingScript = (byId == null ? void 0 : byId.tagName.toLowerCase()) === "script" ? byId : void 0;
-      script = (existingScript && !runtime.failedFacebookScripts.has(existingScript) ? existingScript : void 0) || Array.from(document.scripts).find((candidate) => {
-        if (runtime.failedFacebookScripts.has(candidate)) return false;
-        try {
-          const url = new URL(candidate.src);
-          return url.origin === "https://connect.facebook.net" && /^\/[^/]+\/sdk\.js$/.test(url.pathname);
-        } catch (e) {
-          return false;
-        }
-      });
-      if (!script) {
-        script = document.createElement("script");
-        ownedScript = true;
-        if (!byId) script.id = "facebook-jssdk";
-        script.src = "https://connect.facebook.net/en_US/sdk.js";
-        script.crossOrigin = "anonymous";
-        script.async = true;
-        script.defer = true;
-      }
-      script.addEventListener("load", onLoad);
-      script.addEventListener("error", onError);
-      onLoad();
-      if (!settled && ownedScript) document.head.appendChild(script);
-    } catch (e) {
-      onError();
-    }
-  }));
-  runtime.facebookLoading = loading;
-  return loading;
+    const onAbort = () => complete(void 0, new OmnizapiError("SDK_LOAD_FAILED", "The Meta SDK load was cancelled."));
+    void shared.promise.then(
+      (sdk) => signal.aborted ? onAbort() : complete(sdk),
+      // A shared observer may belong to another module copy's OmnizapiError class.
+      (error) => complete(void 0, new OmnizapiError("SDK_LOAD_FAILED", error.message))
+    );
+    signal.addEventListener("abort", onAbort, { once: true });
+    if (signal.aborted) onAbort();
+  });
 }
 
 // src/core/open-popup.ts
@@ -260,8 +400,8 @@ function requestJson(url, init, signal) {
       else resolve(value);
     };
     const onAbort = () => complete(void 0, new OmnizapiError(
-      "NETWORK_ERROR",
-      "The API request was cancelled."
+      "ABORTED",
+      "The API request was aborted."
     ));
     const timer = setTimeout(() => complete(void 0, new OmnizapiError(
       "TIMEOUT",
@@ -318,10 +458,14 @@ var OmnizapiClientImpl = class {
       frontUrl: props.frontUrl
     });
   }
-  async getListMessengerPages(channelId, code) {
+  async getListMessengerPages(channelId, code, signal) {
     if (!stringOrNull(channelId) || !stringOrNull(code)) {
       throw new OmnizapiError("INVALID_OPTIONS", "A channelId and authorization code are required.");
     }
+    if (signal !== void 0 && (!isRecord(signal) || typeof signal.aborted !== "boolean" || typeof signal.addEventListener !== "function" || typeof signal.removeEventListener !== "function")) {
+      throw new OmnizapiError("INVALID_OPTIONS", "The abort signal is invalid.");
+    }
+    if (signal == null ? void 0 : signal.aborted) throw new OmnizapiError("ABORTED", "The API request was aborted.");
     return requestJson(
       new URL(`${this.constants.api}/v1/channels/${encodeChannelId(channelId)}/list-messenger-pages`),
       {
@@ -331,7 +475,8 @@ var OmnizapiClientImpl = class {
           code
         }),
         headers: { "Content-Type": "application/json", Authorization: this.publicKey }
-      }
+      },
+      signal
     );
   }
   async connect(options) {
@@ -348,10 +493,11 @@ var OmnizapiClientImpl = class {
       if (!isRecord(options)) {
         throw new OmnizapiError("INVALID_OPTIONS", "Connection options are required.");
       }
-      const { channelId, direct, getQRCode, timeoutMs = TOTAL_TIMEOUT_MS } = options;
-      if (typeof channelId !== "string" || direct !== void 0 && typeof direct !== "boolean" || getQRCode !== void 0 && typeof getQRCode !== "function" || typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > 2147483647) {
-        throw new OmnizapiError("INVALID_OPTIONS", "Invalid channelId, direct, getQRCode or timeoutMs option.");
+      const { channelId, direct, getQRCode, timeoutMs = TOTAL_TIMEOUT_MS, signal } = options;
+      if (typeof channelId !== "string" || direct !== void 0 && typeof direct !== "boolean" || getQRCode !== void 0 && typeof getQRCode !== "function" || typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > 2147483647 || signal !== void 0 && (!isRecord(signal) || typeof signal.aborted !== "boolean" || typeof signal.addEventListener !== "function" || typeof signal.removeEventListener !== "function")) {
+        throw new OmnizapiError("INVALID_OPTIONS", "Invalid channelId, direct, getQRCode, timeoutMs or signal option.");
       }
+      if (signal == null ? void 0 : signal.aborted) throw new OmnizapiError("ABORTED", "The connection was aborted.");
       if (!channelId.trim()) return failure(channelId, null, "invalid_channel");
       const encodedChannelId = encodeChannelId(channelId);
       if (typeof host.open !== "function" || typeof host.addEventListener !== "function" || typeof host.removeEventListener !== "function" || typeof host.location.origin !== "string" || typeof host.location.href !== "string" || typeof ((_a = host.crypto) == null ? void 0 : _a.getRandomValues) !== "function" || typeof AbortController !== "function" || typeof fetch !== "function") {
@@ -369,6 +515,7 @@ var OmnizapiClientImpl = class {
         let channelType = null;
         let redirectUri = null;
         let popup = null;
+        let popupError;
         let timeout;
         let popupTimer;
         let messageListener;
@@ -386,6 +533,10 @@ var OmnizapiClientImpl = class {
           settled = true;
           clearTimeout(timeout);
           clearInterval(popupTimer);
+          try {
+            signal == null ? void 0 : signal.removeEventListener("abort", onAbort);
+          } catch (e) {
+          }
           if (messageListener) {
             try {
               host.removeEventListener("message", messageListener);
@@ -418,13 +569,43 @@ var OmnizapiClientImpl = class {
           if (outcome instanceof OmnizapiError) reject(outcome);
           else resolve(outcome);
         };
+        const onAbort = () => finish(new OmnizapiError("ABORTED", "The connection was aborted."));
         const isLive = () => {
+          if (!settled && (signal == null ? void 0 : signal.aborted)) onAbort();
           if (!settled && Date.now() >= deadline) {
             finish(new OmnizapiError("TIMEOUT", "The connection timed out."));
           }
           return !settled;
         };
         const fail = (reason) => finish(failure(channelId, channelType, reason));
+        const reservePopup = () => {
+          try {
+            const opened = openPopup("about:blank", "_blank", 600, 740);
+            if (!opened || opened === host) throw new Error("Popup unavailable");
+            if (!isLive()) {
+              opened.close();
+              return;
+            }
+            popup = opened;
+          } catch (e) {
+            throw new OmnizapiError("POPUP_BLOCKED", "The connection popup could not be opened.");
+          }
+        };
+        const watchPopup = () => {
+          if (popupTimer) return;
+          popupTimer = setInterval(() => {
+            if (!isLive()) return;
+            try {
+              if (popup == null ? void 0 : popup.closed) fail("popup_closed");
+            } catch (e) {
+              finish(new OmnizapiError("PROVIDER_ERROR", "The connection popup could not be monitored."));
+            }
+          }, 500);
+        };
+        const unwatchPopup = () => {
+          clearInterval(popupTimer);
+          popupTimer = void 0;
+        };
         const succeed = (data) => {
           if (!isLive() || !channelType) return;
           finish({
@@ -443,6 +624,8 @@ var OmnizapiClientImpl = class {
         };
         try {
           runtime.activeConnection = owner;
+          signal == null ? void 0 : signal.addEventListener("abort", onAbort, { once: true });
+          if (!isLive()) return;
           const bytes = host.crypto.getRandomValues(new Uint8Array(16));
           const attemptId = Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
           for (const [name, value] of [
@@ -458,6 +641,14 @@ var OmnizapiClientImpl = class {
             "TIMEOUT",
             "The connection timed out."
           )), timeoutMs);
+          if (!direct) {
+            try {
+              reservePopup();
+            } catch (error) {
+              popupError = error instanceof OmnizapiError ? error : new OmnizapiError("POPUP_BLOCKED", "The connection popup could not be opened.");
+            }
+          }
+          if (!isLive()) return;
           const run = async () => {
             var _a2, _b, _c;
             const info = await requestJson(
@@ -475,7 +666,13 @@ var OmnizapiClientImpl = class {
             }
             const middleware = info.middleware;
             channelType = isChannelType(middleware) ? middleware : null;
-            if (currentOrigin !== frontOrigin && !allowOrigins.some((origin) => currentOrigin === origin.replace(/\/$/, ""))) {
+            if (currentOrigin !== frontOrigin && !allowOrigins.some((origin) => {
+              try {
+                return currentOrigin === new URL(origin).origin;
+              } catch (e) {
+                return false;
+              }
+            })) {
               fail("origin_not_allowed");
               return;
             }
@@ -488,21 +685,30 @@ var OmnizapiClientImpl = class {
             if (channelType.startsWith("META_") && !appId || channelType === "META_WHATSAPP" && !configId) {
               throw new OmnizapiError("INVALID_RESPONSE", "The channel provider configuration is invalid.");
             }
-            if (channelType === "META_WHATSAPP" && (direct || Boolean(info.appCustom) || currentOrigin === frontOrigin)) {
+            const nativeWhatsApp = channelType === "META_WHATSAPP" && direct === true;
+            let nativeReady = false;
+            let fb;
+            if (nativeWhatsApp) {
+              unwatchPopup();
               if (runtime.nativeLoginPending) {
                 throw new OmnizapiError(
                   "CONNECTION_IN_PROGRESS",
                   "A previous Meta login is incomplete. Reload this window before retrying a native login."
                 );
               }
-              const fb = await loadFacebookSdk(host, controller.signal);
+              fb = await loadFacebookSdk(host, controller.signal);
               if (!isLive()) return;
               try {
-                fb.init({ appId, version: "v25.0", autoLogAppEvents: true, xfbml: true });
-              } catch (e) {
-                throw new OmnizapiError("PROVIDER_ERROR", "The Meta SDK could not be initialized.");
+                initializeFacebookSdk(host, fb, appId);
+                nativeReady = true;
+              } catch (error) {
+                if (!(error instanceof OmnizapiError && error.code === "INVALID_CONFIGURATION")) throw error;
               }
               if (!isLive()) return;
+            }
+            if (nativeReady && fb) {
+              popup == null ? void 0 : popup.close();
+              popup = null;
               let code = null;
               let wabaId = null;
               let phoneId = null;
@@ -575,6 +781,8 @@ var OmnizapiClientImpl = class {
                   }
                 });
               } catch (e) {
+                releaseNativeLogin();
+                nativeLoginStarted = false;
                 throw new OmnizapiError("PROVIDER_ERROR", "The Meta login could not be started.");
               }
               return;
@@ -601,6 +809,7 @@ var OmnizapiClientImpl = class {
             } else {
               url = new URL(`${this.constants.front}/connect/${channelType === "BOT_TELEGRAM" ? "telegram" : "whatsapp-web"}`);
               url.searchParams.set("channelId", channelId);
+              url.searchParams.set("pk", this.publicKey);
             }
             if (channelType !== "META_MESSENGER" && channelType !== "META_INSTAGRAM") {
               url.searchParams.set("attemptId", attemptId);
@@ -621,23 +830,18 @@ var OmnizapiClientImpl = class {
             };
             host.addEventListener("message", messageListener);
             if (!isLive()) return;
+            if (popupError) throw popupError;
+            if (!popup) reservePopup();
+            if (popup == null ? void 0 : popup.closed) {
+              fail("popup_closed");
+              return;
+            }
+            watchPopup();
             try {
-              const opened = openPopup(url.href, "_blank", 600, 740);
-              if (!opened || opened === host) {
-                throw new OmnizapiError("POPUP_BLOCKED", "The connection popup was blocked.");
-              }
-              popup = opened;
+              popup == null ? void 0 : popup.location.replace(url.href);
             } catch (e) {
-              throw new OmnizapiError("POPUP_BLOCKED", "The connection popup could not be opened.");
+              throw new OmnizapiError("PROVIDER_ERROR", "The connection popup could not be navigated.");
             }
-            popupTimer = setInterval(() => {
-              if (!isLive()) return;
-              try {
-                if (popup == null ? void 0 : popup.closed) fail("popup_closed");
-              } catch (e) {
-                finish(new OmnizapiError("PROVIDER_ERROR", "The connection popup could not be monitored."));
-              }
-            }, 500);
           };
           void run().catch((error) => {
             if (!isLive()) return;
@@ -646,8 +850,8 @@ var OmnizapiClientImpl = class {
               "The connection could not be completed."
             ));
           });
-        } catch (e) {
-          finish(new OmnizapiError("INVALID_CONFIGURATION", "The connection could not be initialized."));
+        } catch (error) {
+          finish(error instanceof OmnizapiError ? error : new OmnizapiError("INVALID_CONFIGURATION", "The connection could not be initialized."));
         }
       });
     } catch (error) {