@benji-money/connect-sdk 1.1.4-beta.4 → 1.1.4-beta.5

package/dist/connect-sdk.umd.global.js

@@ -110,7 +110,7 @@ var ConnectSDK = (() => {
   // src/utils/config.ts
   var buildContext = () => ({
     namespace: "benji-connect-sdk" ? "benji-connect-sdk" : "benji-connect-sdk",
-    version: "1.1.4-beta.4" ? String("1.1.4-beta.4") : "0.0.0"
+    version: "1.1.4-beta.5" ? String("1.1.4-beta.5") : "0.0.0"
   });
   function isBenjiConnectEnvironment(environment) {
     return environment === "local" /* LOCAL */ || environment === "development" /* DEVELOPMENT */ || environment === "sandbox" /* SANDBOX */ || environment === "production" /* PRODUCTION */;
@@ -711,10 +711,11 @@ var ConnectSDK = (() => {
     "request_code_exchange",
     "request_code_with_login",
     "request_code_with_phone",
-    "request_loyalty_verification",
-    "request_phone_verification"
+    "request_phone_verification",
+    "request_loyalty_verification"
   ]);
   var CONNECT_MESSAGE_TYPES = new Set(Object.values(BenjiConnectEventType));
+  var LOGIN_PARTNER_POPUP_NAME = "benji_partner_auth";
   function isAuthMessageType(data2) {
     if (!data2 || typeof data2 !== "object") return false;
     const type = data2.type;
@@ -723,9 +724,18 @@ var ConnectSDK = (() => {
   function shouldRelayMessage(mode, data2) {
     return mode === 5 /* LOGIN */ && isAuthMessageType(data2);
   }
+  function isMessageWindow(source) {
+    if (!source || typeof source !== "object") return false;
+    try {
+      return typeof source.closed === "boolean";
+    } catch {
+      return false;
+    }
+  }
   function sourceOpenerIsHost(source) {
     try {
-      return source instanceof Window && source.opener === window;
+      if (!isMessageWindow(source)) return false;
+      return source.opener === window;
     } catch {
       return false;
     }
@@ -740,7 +750,53 @@ var ConnectSDK = (() => {
     if (sourceOpenerIsHost(event.source)) {
       return true;
     }
-    return event.source instanceof Window && event.origin === connectOrigin && event.source !== iframeWindow;
+    return isMessageWindow(event.source) && event.origin === connectOrigin && event.source !== iframeWindow;
+  }
+  function canDeliverAuthToConnectIframe(iframe) {
+    var _a;
+    const iframeWindow = (_a = iframe == null ? void 0 : iframe.contentWindow) != null ? _a : null;
+    if (!iframeWindow) return false;
+    try {
+      const href = iframeWindow.location.href;
+      return Boolean(href) && href !== "about:blank" && href !== "";
+    } catch {
+      return true;
+    }
+  }
+  function authMessageType(data2) {
+    if (!data2 || typeof data2 !== "object") return void 0;
+    const type = data2.type;
+    return typeof type === "string" ? type : void 0;
+  }
+  function resolveLoginPartnerWindow(loginPopup, lastVerifiedPopupSource) {
+    var _a;
+    const candidates = [];
+    if (lastVerifiedPopupSource && !lastVerifiedPopupSource.closed) {
+      candidates.push(lastVerifiedPopupSource);
+    }
+    if (loginPopup && !loginPopup.closed && loginPopup !== lastVerifiedPopupSource) {
+      candidates.push(loginPopup);
+    }
+    if (candidates.length === 0) {
+      try {
+        const named = window.open("", LOGIN_PARTNER_POPUP_NAME);
+        if (named && !named.closed) {
+          console.debug("[Benji Connect SDK] LOGIN named_reacquire", { success: true });
+          candidates.push(named);
+        } else {
+          console.debug("[Benji Connect SDK] LOGIN named_reacquire", { success: false });
+        }
+      } catch {
+        console.debug("[Benji Connect SDK] LOGIN named_reacquire", { success: false });
+      }
+    }
+    return (_a = candidates[0]) != null ? _a : null;
+  }
+  function describeLoginPartnerWindowTarget(target, loginPopup, lastVerifiedPopupSource) {
+    if (!target) return "none";
+    if (target === lastVerifiedPopupSource) return "lastVerified";
+    if (target === loginPopup) return "loginPopup";
+    return "named";
   }
   function isConnectMessageType(data2) {
     if (!data2 || typeof data2 !== "object") return false;
@@ -861,6 +917,7 @@ var ConnectSDK = (() => {
   };
 
   // src/router/message.ts
+  var IFRAME_DELIVERABILITY_POLL_MS = 100;
   var _MessageRouter = class _MessageRouter {
     static configureMessageRouter(config) {
       this.onSuccess = config.onSuccess;
@@ -876,8 +933,10 @@ var ConnectSDK = (() => {
       this.loginPopup = context.loginPopup;
       this.mode = context.mode;
       this.connectOrigin = new URL(Endpoints.benji_connect_auth_url).origin;
-      if (this.isIframeReady) {
+      if (this.canDeliverToConnectIframe()) {
         this.flushPendingPopupAuth();
+      } else {
+        this.startIframeDeliverabilityPoll();
       }
     }
     static resetIframeReady() {
@@ -885,6 +944,9 @@ var ConnectSDK = (() => {
     }
     static setMode(mode) {
       this.mode = mode;
+      if (mode !== 5 /* LOGIN */) {
+        this.stopIframeDeliverabilityPoll();
+      }
     }
     static addEventListeners() {
       if (this.configuredListeners) return;
@@ -897,6 +959,7 @@ var ConnectSDK = (() => {
       window.removeEventListener("error", this.errorEventHandler);
       window.removeEventListener("unhandledrejection", this.errorEventHandler);
       window.removeEventListener("message", this.messageEventHandler);
+      this.stopIframeDeliverabilityPoll();
       this.configuredListeners = false;
       this.iframe = null;
       this.loginPopup = null;
@@ -904,6 +967,7 @@ var ConnectSDK = (() => {
       this.connectOrigin = "";
       this.isIframeReady = false;
       this.pendingPopupAuth = [];
+      this.lastVerifiedPopupSource = null;
     }
     static handleErrorMessage(event) {
       switch (event.type) {
@@ -923,29 +987,89 @@ var ConnectSDK = (() => {
         }
       }
     }
-    // Forward popup/tab auth payloads into Connect. Queue until the iframe has loaded;
-    // otherwise fast SSO (Safari or already-authenticated) can arrive before contentWindow is usable.
+    static canDeliverToConnectIframe() {
+      return canDeliverAuthToConnectIframe(this.iframe);
+    }
+    static startIframeDeliverabilityPoll() {
+      if (this.iframeDeliverabilityPoll !== null || this.mode !== 5 /* LOGIN */ || this.pendingPopupAuth.length === 0) {
+        return;
+      }
+      this.iframeDeliverabilityPoll = window.setInterval(() => {
+        if (this.mode !== 5 /* LOGIN */ || this.pendingPopupAuth.length === 0) {
+          this.stopIframeDeliverabilityPoll();
+          return;
+        }
+        if (this.canDeliverToConnectIframe()) {
+          this.flushPendingPopupAuth();
+        }
+      }, IFRAME_DELIVERABILITY_POLL_MS);
+    }
+    static stopIframeDeliverabilityPoll() {
+      if (this.iframeDeliverabilityPoll === null) return;
+      window.clearInterval(this.iframeDeliverabilityPoll);
+      this.iframeDeliverabilityPoll = null;
+    }
+    // Forward popup/tab auth payloads into Connect. Queue until deliverable.
     static relayToIframe(event) {
       var _a;
+      const type = authMessageType(event.data);
+      const deliverable = this.canDeliverToConnectIframe();
       const iframeWindow = (_a = this.iframe) == null ? void 0 : _a.contentWindow;
-      if (!this.isIframeReady || !iframeWindow) {
+      if (!iframeWindow || !deliverable) {
         this.pendingPopupAuth.push(event);
+        this.startIframeDeliverabilityPoll();
+        console.debug("[Benji Connect SDK] LOGIN relayToIframe queued", {
+          type,
+          queued: true,
+          pendingCount: this.pendingPopupAuth.length,
+          isIframeReady: this.isIframeReady,
+          deliverable
+        });
         return;
       }
+      if (this.pendingPopupAuth.length > 0) {
+        this.flushPendingPopupAuth();
+      }
       iframeWindow.postMessage(event.data, this.connectOrigin);
+      console.debug("[Benji Connect SDK] LOGIN relayToIframe posted", {
+        type,
+        queued: false,
+        pendingCount: this.pendingPopupAuth.length,
+        isIframeReady: this.isIframeReady,
+        deliverable
+      });
     }
     static markIframeReady(iframe) {
       if (this.iframe !== iframe) return;
       this.isIframeReady = true;
+      console.debug("[Benji Connect SDK] LOGIN iframe_load");
       this.flushPendingPopupAuth();
     }
     static flushPendingPopupAuth() {
       var _a, _b;
-      if (!this.isIframeReady || !this.pendingPopupAuth.length) return;
-      const expectedOrigin = this.connectOrigin || new URL(Endpoints.benji_connect_auth_url).origin;
       const iframeWindow = (_b = (_a = this.iframe) == null ? void 0 : _a.contentWindow) != null ? _b : null;
-      const queued = this.pendingPopupAuth;
-      this.pendingPopupAuth = [];
+      if (!this.pendingPopupAuth.length) {
+        this.stopIframeDeliverabilityPoll();
+        return;
+      }
+      if (!iframeWindow) {
+        this.startIframeDeliverabilityPoll();
+        return;
+      }
+      if (!this.canDeliverToConnectIframe()) {
+        this.startIframeDeliverabilityPoll();
+        console.debug("[Benji Connect SDK] LOGIN flushPendingPopupAuth skipped", {
+          pendingCount: this.pendingPopupAuth.length,
+          isIframeReady: this.isIframeReady,
+          deliverable: false
+        });
+        return;
+      }
+      const expectedOrigin = this.connectOrigin || new URL(Endpoints.benji_connect_auth_url).origin;
+      const queued = [...this.pendingPopupAuth];
+      let flushedCount = 0;
+      let skippedNotOriginated = 0;
+      const remaining = [];
       for (const event of queued) {
         if (!isPopupOriginatedAuth(
           event,
@@ -953,18 +1077,58 @@ var ConnectSDK = (() => {
           iframeWindow,
           expectedOrigin
         )) {
+          skippedNotOriginated += 1;
           continue;
         }
-        this.relayToIframe(event);
+        if (!this.canDeliverToConnectIframe()) {
+          remaining.push(event);
+          continue;
+        }
+        iframeWindow.postMessage(event.data, this.connectOrigin);
+        flushedCount += 1;
+      }
+      this.pendingPopupAuth = remaining;
+      if (this.pendingPopupAuth.length === 0) {
+        this.stopIframeDeliverabilityPoll();
+      } else {
+        this.startIframeDeliverabilityPoll();
       }
+      console.debug("[Benji Connect SDK] LOGIN flushPendingPopupAuth", {
+        pendingCount: queued.length,
+        flushedCount,
+        skippedNotOriginated,
+        remainingCount: this.pendingPopupAuth.length
+      });
     }
     static relayToPopup(payload) {
-      if (!this.loginPopup) {
-        console.warn("[Benji Connect SDK] Skipping login auth relay, no login popup");
+      var _a, _b, _c, _d, _e, _f, _g, _h;
+      const type = authMessageType(payload);
+      const target = resolveLoginPartnerWindow(
+        this.loginPopup,
+        this.lastVerifiedPopupSource
+      );
+      const targetLabel = describeLoginPartnerWindowTarget(
+        target,
+        this.loginPopup,
+        this.lastVerifiedPopupSource
+      );
+      if (!target) {
+        console.warn("[Benji Connect SDK] Skipping login auth relay, no live partner window", {
+          type,
+          target: targetLabel,
+          loginPopupClosed: (_b = (_a = this.loginPopup) == null ? void 0 : _a.closed) != null ? _b : true,
+          lastVerifiedClosed: (_d = (_c = this.lastVerifiedPopupSource) == null ? void 0 : _c.closed) != null ? _d : true
+        });
         return;
       }
+      console.debug("[Benji Connect SDK] LOGIN relayToPopup", {
+        type,
+        target: targetLabel,
+        loginPopupClosed: (_f = (_e = this.loginPopup) == null ? void 0 : _e.closed) != null ? _f : true,
+        lastVerifiedClosed: (_h = (_g = this.lastVerifiedPopupSource) == null ? void 0 : _g.closed) != null ? _h : true
+      });
       try {
-        this.loginPopup.postMessage(payload, "*");
+        target.postMessage(payload, "*");
       } catch (error) {
         console.error("[Benji Connect SDK] Failed to forward login auth message to popup", error);
       }
@@ -974,6 +1138,7 @@ var ConnectSDK = (() => {
       if (shouldRelayMessage(this.mode, event.data)) {
         const expectedOrigin2 = this.connectOrigin || new URL(Endpoints.benji_connect_auth_url).origin;
         const iframeWindow = (_a = this.iframe) == null ? void 0 : _a.contentWindow;
+        const type = authMessageType(event.data);
         if (iframeWindow && event.source === iframeWindow) {
           if (event.origin !== expectedOrigin2) {
             console.warn(
@@ -983,13 +1148,30 @@ var ConnectSDK = (() => {
             );
             return;
           }
+          console.debug("[Benji Connect SDK] LOGIN auth relay", {
+            type,
+            origin: event.origin,
+            direction: "iframe_to_popup"
+          });
           this.relayToPopup(event.data);
           return;
         }
         if (isPopupOriginatedAuth(event, this.loginPopup, iframeWindow != null ? iframeWindow : null, expectedOrigin2)) {
+          if (isMessageWindow(event.source)) {
+            this.lastVerifiedPopupSource = event.source;
+          }
+          console.debug("[Benji Connect SDK] LOGIN auth relay", {
+            type,
+            origin: event.origin,
+            direction: "popup_to_iframe"
+          });
           this.relayToIframe(event);
           return;
         }
+        console.warn("[Benji Connect SDK] LOGIN auth relay unclassified", {
+          type,
+          origin: event.origin
+        });
         return;
       }
       if (!isConnectMessageType(event.data)) return;
@@ -1066,6 +1248,8 @@ var ConnectSDK = (() => {
   _MessageRouter.connectOrigin = "";
   _MessageRouter.isIframeReady = false;
   _MessageRouter.pendingPopupAuth = [];
+  _MessageRouter.lastVerifiedPopupSource = null;
+  _MessageRouter.iframeDeliverabilityPoll = null;
   _MessageRouter.errorEventHandler = (event) => {
     return _MessageRouter.handleErrorMessage(event);
   };
@@ -1159,7 +1343,7 @@ var ConnectSDK = (() => {
       const popupUrl = preparedLink ? appendLoginPopupFlag(preparedLink) : "about:blank";
       this.loginPopup = window.open(
         popupUrl,
-        "benji_partner_auth",
+        LOGIN_PARTNER_POPUP_NAME,
         buildLoginPopupFeatures(position)
       );
       if (!this.loginPopup) {
@@ -1186,6 +1370,15 @@ var ConnectSDK = (() => {
         var _a, _b, _c;
         if (this.isClosing) return;
         if ((_a = this.loginPopup) == null ? void 0 : _a.closed) {
+          const live = resolveLoginPartnerWindow(
+            this.loginPopup,
+            MessageRouter.lastVerifiedPopupSource
+          );
+          if (live) {
+            console.debug("[Benji Connect SDK] LOGIN popup_closed_poll skipped, live partner window remains");
+            return;
+          }
+          console.debug("[Benji Connect SDK] LOGIN popup_closed_poll exit, no live partner window");
           (_c = (_b = this.sdkConfig).onExit) == null ? void 0 : _c.call(_b, {
             context: buildContext(),
             trigger: "POPUP_CLOSED" /* POPUP_CLOSED */