@dynamic-labs-wallet/browser-wallet-client 1.0.41 → 1.0.43

package/index.cjs

@@ -715,11 +715,18 @@ class IframeManager {
    * sandbox host is rebuilt (needed by the recovery flow — the transport
    * survives the rebuild and would otherwise accumulate stale listeners).
    */ setupWaasSDKContainerBridge(transport, waasSDKContainer) {
-        // Forward outgoing host messages to the sandbox host
+        // Forward outgoing host messages to the sandbox host.
         const transportListener = (message)=>{
-            if (message.origin === 'host') {
-                waasSDKContainer.sendMessage(message);
+            if (message.origin !== 'host') return;
+            // Skip (don't throw) a send to a torn-down captured container: a stale
+            // bridge from a logged-out instance would otherwise throw "iframe not
+            // loaded" uncaught. Don't reroute to the current shared container — that
+            // would leak a stale session's message into another session's iframe.
+            if (!waasSDKContainer.isAlive()) {
+                this.logger.warn('(setupWaasSDKContainerBridge) captured container not alive — skipping host→iframe send');
+                return;
             }
+            waasSDKContainer.sendMessage(message);
         };
         transport.on(transportListener);
         // Forward incoming messages from the sandbox host to the transport
@@ -806,6 +813,8 @@ class IframeManager {
         // real dead-container case below falls through to the rebuild.
         if ((_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.isAlive()) {
             this.logger.info('(recoverIframe) Container still alive — request-channel timeout, skipping rebuild');
+            // Ensure we're tracked before re-pointing the bridge (idempotent).
+            IframeManager.sharedContainerUsers.add(this);
             if (this.waasSDKContainer !== IframeManager.sharedWaasSDKContainer) {
                 // A concurrent recovery already swapped in a fresh shared container. Our
                 // bridge still forwards to the old (now-dead) one, so re-point it before
@@ -824,10 +833,7 @@ class IframeManager {
         // retry that we want to flush after rebuild.
         this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
         this.cleanupBridge = null;
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
+        IframeManager.destroySharedContainer();
         IframeManager.iframeLoadPromise = null;
         this.waasSDKContainer = null;
         // Defer the rebuild + concurrency control to loadIframe(): the first
@@ -946,17 +952,16 @@ class IframeManager {
         }
     }
     /**
-   * Reset the shared provider and iframe load promise, and iframe instance count
+   * Reset the shared provider and iframe load promise, and drop this instance
+   * from the shared-container user set
    */ resetSharedWaasSDKContainer() {
         this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
         this.cleanupBridge = null;
         this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
         this.cleanupRecoverySubscription = null;
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
-        IframeManager.iframeInstanceCount = 0;
+        IframeManager.destroySharedContainer();
+        // Drop only this failed instance; siblings stay (they re-adopt on recovery).
+        IframeManager.sharedContainerUsers.delete(this);
         IframeManager.iframeLoadPromise = null;
         this.waasSDKContainer = null;
         this.iframeMessageHandler = null;
@@ -964,6 +969,25 @@ class IframeManager {
         // Double the timeout to give more time for slow networks, capped at the configured maximum.
         IframeManager.iframeLoadTimeout = Math.min(IframeManager.iframeLoadTimeout * 2, IframeManager.maxIframeLoadTimeout);
     }
+    /** Bind to the shared container and join the user set together, so the
+   *  destroy-when-empty invariant can't drift (see {@link sharedContainerUsers}). */ adoptSharedContainer() {
+        this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
+        IframeManager.sharedContainerUsers.add(this);
+    }
+    /** Destroy the (already dead/replaced) shared container. Deliberately leaves the
+   *  user set intact — live users re-point to the rebuilt container on recovery. */ static destroySharedContainer() {
+        var _IframeManager_sharedWaasSDKContainer;
+        (_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.destroy();
+        IframeManager.sharedWaasSDKContainer = null;
+    }
+    /** Release this instance; destroy the container only once no user remains, so a
+   *  logout can't tear it out from under a concurrent login's eager recovery. */ releaseSharedContainer() {
+        IframeManager.sharedContainerUsers.delete(this);
+        if (IframeManager.sharedWaasSDKContainer && IframeManager.sharedContainerUsers.size === 0) {
+            IframeManager.destroySharedContainer();
+            IframeManager.iframeLoadPromise = null;
+        }
+    }
     async loadIframe() {
         var _IframeManager_sharedWaasSDKContainer;
         // If the shared container is still alive, reuse it. The alive check (not
@@ -971,24 +995,19 @@ class IframeManager {
         // loadIframe again on a dead container: we fall through to the remount
         // branch below instead of adopting the corpse.
         if ((_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.isAlive()) {
-            this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
-            IframeManager.iframeInstanceCount++;
+            this.adoptSharedContainer();
             return Promise.resolve();
         }
         // If a load is in progress, wait for it, then assign
         if (IframeManager.iframeLoadPromise) {
             return IframeManager.iframeLoadPromise.then(()=>{
-                this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
-                IframeManager.iframeInstanceCount++;
+                this.adoptSharedContainer();
             });
         }
         // sharedWaasSDKContainer is dead (or never existed) and no load is in
         // flight. Destroy the stale corpse so createWaasSDKContainerLoadPromise
         // mounts a fresh one.
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
+        IframeManager.destroySharedContainer();
         const loadPromise = IframeManager.iframeLoadPromise = this.createWaasSDKContainerLoadPromise();
         // Clear iframeLoadPromise once the load settles so the "in flight" branch
         // above only fires while a load is actually pending. Otherwise it would
@@ -1061,8 +1080,7 @@ class IframeManager {
                         unsubscribeHandshake();
                         unsubscribeError();
                         IframeManager.sharedWaasSDKContainer = waasSDKContainer;
-                        this.waasSDKContainer = waasSDKContainer;
-                        IframeManager.iframeInstanceCount++;
+                        this.adoptSharedContainer();
                         IframeManager.iframeLoadAttempts = 0; // Reset retry counter on success
                         resolve();
                         this.logger.debug('Iframe loaded successfully...', this.getIframeContext());
@@ -1149,7 +1167,7 @@ class IframeManager {
                     }
                     clearTimeout(iframeTimeoutId);
                     this.iframe = iframe;
-                    IframeManager.iframeInstanceCount++;
+                    // display iframe is per-instance — intentionally not a sharedContainerUsers member
                     resolve(iframe);
                     var _this_sdkVersion;
                     this.logger.debug('Iframe loaded successfully...', {
@@ -1300,59 +1318,37 @@ class IframeManager {
         }
     }
     async cleanup() {
-        await this.initializeMessageTransport();
-        if (!this.iframeMessageHandler) {
-            throw new Error('Iframe message handler not initialized');
-        }
-        // The iframe-side cleanup handler clears localStorage + secureStorage
-        // (initWaasWalletHandler.ts), which is best-effort: if it doesn't ACK
-        // within the request channel's 5s timeout, the channel rejects with a
-        // (misleadingly named) NO_HANDLERS_REGISTERED error. Pre-#1063 that
-        // rejection was masked because recoverIframe rebuilt the iframe and
-        // the retry hit a fresh handler; post-#1063 we keep the (slow) alive
-        // iframe, the rejection surfaces, and — uncaught here — becomes an
-        // unhandled promise rejection / pageerror. RN-web's secureStorage is
-        // slow enough to trigger this routinely, breaking the
-        // `sign-message-new-wallet` re-login flow.
-        //
-        // Swallow the error: we're about to remove the iframe from the DOM
-        // (or another instance is, when iframeInstanceCount drops to 0),
-        // which obsoletes anything the cleanup handler would have cleared.
-        // Stale storage from a missed cleanup is cleared by the next iframe
-        // init's __resetInitializationState anyway.
-        try {
-            await this.iframeMessageHandler.cleanup();
-        } catch (error) {
-            this.logger.warn('(cleanup) iframeMessageHandler.cleanup() failed; proceeding with DOM teardown', {
-                error: error instanceof Error ? error.message : error
-            });
+        // Best-effort ACK (the iframe clears its storage), only if already
+        // initialized. Do NOT initialize here: that mounts a fresh container just to
+        // ACK and then tears it down, churning the shared container across
+        // logout→relogin and starving the next login's eager recovery. May reject on
+        // a 5s timeout — swallow it; stale storage is cleared by the next init anyway.
+        if (this.waasSDKContainer && this.iframeMessageHandler) {
+            try {
+                await this.iframeMessageHandler.cleanup();
+            } catch (error) {
+                this.logger.warn('(cleanup) iframeMessageHandler.cleanup() failed; proceeding with DOM teardown', {
+                    error: error instanceof Error ? error.message : error
+                });
+            }
         }
+        // Always detach bridge + recovery subscription, even if the container is gone:
+        // a dangling subscription's retry timer can fire recovery into a torn-down
+        // container next session ("iframe not loaded").
+        this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
+        this.cleanupBridge = null;
+        this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
+        this.cleanupRecoverySubscription = null;
         if (this.waasSDKContainer) {
-            IframeManager.iframeInstanceCount--;
-            // Always detach THIS instance's bridge + recovery subscription, even when
-            // other instances keep the shared container alive (multi-chain sessions
-            // share one static container). Leaving them attached lets a logged-out
-            // transport's retry timer fire recovery and flush a queued message into a
-            // torn-down container on the next session — the "iframe not loaded" pageerror.
-            this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
-            this.cleanupBridge = null;
-            this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
-            this.cleanupRecoverySubscription = null;
-            if (IframeManager.sharedWaasSDKContainer && IframeManager.iframeInstanceCount === 0) {
-                IframeManager.sharedWaasSDKContainer.destroy();
-                IframeManager.sharedWaasSDKContainer = null;
-                IframeManager.iframeLoadPromise = null;
-            }
+            this.releaseSharedContainer();
             this.waasSDKContainer = null;
-            // Drop the transport + handler so the next operation re-inits and rebuilds a
-            // fresh bridge instead of short-circuiting on initializeMessageTransport's
-            // "already initialized" guard with a now-detached bridge.
-            this.messageTransport = null;
-            this.iframeMessageHandler = null;
-            this.iframeRequestChannel = undefined;
-            // Re-arm the unauthorized guard so a future session can trigger logout again.
-            this.unauthorizedHandled = false;
         }
+        // Drop transport/handler so the next op re-inits a fresh bridge (not a
+        // detached one); re-arm the unauthorized guard for a future session.
+        this.messageTransport = null;
+        this.iframeMessageHandler = null;
+        this.iframeRequestChannel = undefined;
+        this.unauthorizedHandled = false;
     }
     constructor({ environmentId, baseApiUrl, baseMPCRelayApiUrl, chainName, sdkVersion, authMode = core.AuthMode.HEADER, authToken, debug, baseClientKeysharesRelayApiUrl, additionalTrustedOrigins, hostOrigin, iframeLoadTimeout, maxRetryAttempts, eagerlyRecoverKeyShares }, internalOptions){
         this.logger = logger;
@@ -1439,7 +1435,13 @@ IframeManager.minIframeLoadTimeout = 1000;
 IframeManager.maxIframeLoadTimeout = 60000;
 IframeManager.maxAllowedRetryAttempts = 10;
 IframeManager.sharedWaasSDKContainer = null;
-IframeManager.iframeInstanceCount = 0;
+/**
+   * Instances bound to the live shared container; it's destroyed only when this
+   * empties. A set (vs the old counter) can't drift negative — a logged-out
+   * instance's cleanup once decremented past zero and destroyed a container the
+   * next login still needed. Live users are carried across a rebuild (not
+   * cleared), so the fresh container isn't torn down before they re-point to it.
+   */ IframeManager.sharedContainerUsers = new Set();
 IframeManager.maxAdditionalTrustedOrigins = 32;
 IframeManager.maxTrustedOriginStringLength = 200;
 

package/index.esm.js

@@ -714,11 +714,18 @@ class IframeManager {
    * sandbox host is rebuilt (needed by the recovery flow — the transport
    * survives the rebuild and would otherwise accumulate stale listeners).
    */ setupWaasSDKContainerBridge(transport, waasSDKContainer) {
-        // Forward outgoing host messages to the sandbox host
+        // Forward outgoing host messages to the sandbox host.
         const transportListener = (message)=>{
-            if (message.origin === 'host') {
-                waasSDKContainer.sendMessage(message);
+            if (message.origin !== 'host') return;
+            // Skip (don't throw) a send to a torn-down captured container: a stale
+            // bridge from a logged-out instance would otherwise throw "iframe not
+            // loaded" uncaught. Don't reroute to the current shared container — that
+            // would leak a stale session's message into another session's iframe.
+            if (!waasSDKContainer.isAlive()) {
+                this.logger.warn('(setupWaasSDKContainerBridge) captured container not alive — skipping host→iframe send');
+                return;
             }
+            waasSDKContainer.sendMessage(message);
         };
         transport.on(transportListener);
         // Forward incoming messages from the sandbox host to the transport
@@ -805,6 +812,8 @@ class IframeManager {
         // real dead-container case below falls through to the rebuild.
         if ((_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.isAlive()) {
             this.logger.info('(recoverIframe) Container still alive — request-channel timeout, skipping rebuild');
+            // Ensure we're tracked before re-pointing the bridge (idempotent).
+            IframeManager.sharedContainerUsers.add(this);
             if (this.waasSDKContainer !== IframeManager.sharedWaasSDKContainer) {
                 // A concurrent recovery already swapped in a fresh shared container. Our
                 // bridge still forwards to the old (now-dead) one, so re-point it before
@@ -823,10 +832,7 @@ class IframeManager {
         // retry that we want to flush after rebuild.
         this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
         this.cleanupBridge = null;
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
+        IframeManager.destroySharedContainer();
         IframeManager.iframeLoadPromise = null;
         this.waasSDKContainer = null;
         // Defer the rebuild + concurrency control to loadIframe(): the first
@@ -945,17 +951,16 @@ class IframeManager {
         }
     }
     /**
-   * Reset the shared provider and iframe load promise, and iframe instance count
+   * Reset the shared provider and iframe load promise, and drop this instance
+   * from the shared-container user set
    */ resetSharedWaasSDKContainer() {
         this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
         this.cleanupBridge = null;
         this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
         this.cleanupRecoverySubscription = null;
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
-        IframeManager.iframeInstanceCount = 0;
+        IframeManager.destroySharedContainer();
+        // Drop only this failed instance; siblings stay (they re-adopt on recovery).
+        IframeManager.sharedContainerUsers.delete(this);
         IframeManager.iframeLoadPromise = null;
         this.waasSDKContainer = null;
         this.iframeMessageHandler = null;
@@ -963,6 +968,25 @@ class IframeManager {
         // Double the timeout to give more time for slow networks, capped at the configured maximum.
         IframeManager.iframeLoadTimeout = Math.min(IframeManager.iframeLoadTimeout * 2, IframeManager.maxIframeLoadTimeout);
     }
+    /** Bind to the shared container and join the user set together, so the
+   *  destroy-when-empty invariant can't drift (see {@link sharedContainerUsers}). */ adoptSharedContainer() {
+        this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
+        IframeManager.sharedContainerUsers.add(this);
+    }
+    /** Destroy the (already dead/replaced) shared container. Deliberately leaves the
+   *  user set intact — live users re-point to the rebuilt container on recovery. */ static destroySharedContainer() {
+        var _IframeManager_sharedWaasSDKContainer;
+        (_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.destroy();
+        IframeManager.sharedWaasSDKContainer = null;
+    }
+    /** Release this instance; destroy the container only once no user remains, so a
+   *  logout can't tear it out from under a concurrent login's eager recovery. */ releaseSharedContainer() {
+        IframeManager.sharedContainerUsers.delete(this);
+        if (IframeManager.sharedWaasSDKContainer && IframeManager.sharedContainerUsers.size === 0) {
+            IframeManager.destroySharedContainer();
+            IframeManager.iframeLoadPromise = null;
+        }
+    }
     async loadIframe() {
         var _IframeManager_sharedWaasSDKContainer;
         // If the shared container is still alive, reuse it. The alive check (not
@@ -970,24 +994,19 @@ class IframeManager {
         // loadIframe again on a dead container: we fall through to the remount
         // branch below instead of adopting the corpse.
         if ((_IframeManager_sharedWaasSDKContainer = IframeManager.sharedWaasSDKContainer) == null ? void 0 : _IframeManager_sharedWaasSDKContainer.isAlive()) {
-            this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
-            IframeManager.iframeInstanceCount++;
+            this.adoptSharedContainer();
             return Promise.resolve();
         }
         // If a load is in progress, wait for it, then assign
         if (IframeManager.iframeLoadPromise) {
             return IframeManager.iframeLoadPromise.then(()=>{
-                this.waasSDKContainer = IframeManager.sharedWaasSDKContainer;
-                IframeManager.iframeInstanceCount++;
+                this.adoptSharedContainer();
             });
         }
         // sharedWaasSDKContainer is dead (or never existed) and no load is in
         // flight. Destroy the stale corpse so createWaasSDKContainerLoadPromise
         // mounts a fresh one.
-        if (IframeManager.sharedWaasSDKContainer) {
-            IframeManager.sharedWaasSDKContainer.destroy();
-            IframeManager.sharedWaasSDKContainer = null;
-        }
+        IframeManager.destroySharedContainer();
         const loadPromise = IframeManager.iframeLoadPromise = this.createWaasSDKContainerLoadPromise();
         // Clear iframeLoadPromise once the load settles so the "in flight" branch
         // above only fires while a load is actually pending. Otherwise it would
@@ -1060,8 +1079,7 @@ class IframeManager {
                         unsubscribeHandshake();
                         unsubscribeError();
                         IframeManager.sharedWaasSDKContainer = waasSDKContainer;
-                        this.waasSDKContainer = waasSDKContainer;
-                        IframeManager.iframeInstanceCount++;
+                        this.adoptSharedContainer();
                         IframeManager.iframeLoadAttempts = 0; // Reset retry counter on success
                         resolve();
                         this.logger.debug('Iframe loaded successfully...', this.getIframeContext());
@@ -1148,7 +1166,7 @@ class IframeManager {
                     }
                     clearTimeout(iframeTimeoutId);
                     this.iframe = iframe;
-                    IframeManager.iframeInstanceCount++;
+                    // display iframe is per-instance — intentionally not a sharedContainerUsers member
                     resolve(iframe);
                     var _this_sdkVersion;
                     this.logger.debug('Iframe loaded successfully...', {
@@ -1299,59 +1317,37 @@ class IframeManager {
         }
     }
     async cleanup() {
-        await this.initializeMessageTransport();
-        if (!this.iframeMessageHandler) {
-            throw new Error('Iframe message handler not initialized');
-        }
-        // The iframe-side cleanup handler clears localStorage + secureStorage
-        // (initWaasWalletHandler.ts), which is best-effort: if it doesn't ACK
-        // within the request channel's 5s timeout, the channel rejects with a
-        // (misleadingly named) NO_HANDLERS_REGISTERED error. Pre-#1063 that
-        // rejection was masked because recoverIframe rebuilt the iframe and
-        // the retry hit a fresh handler; post-#1063 we keep the (slow) alive
-        // iframe, the rejection surfaces, and — uncaught here — becomes an
-        // unhandled promise rejection / pageerror. RN-web's secureStorage is
-        // slow enough to trigger this routinely, breaking the
-        // `sign-message-new-wallet` re-login flow.
-        //
-        // Swallow the error: we're about to remove the iframe from the DOM
-        // (or another instance is, when iframeInstanceCount drops to 0),
-        // which obsoletes anything the cleanup handler would have cleared.
-        // Stale storage from a missed cleanup is cleared by the next iframe
-        // init's __resetInitializationState anyway.
-        try {
-            await this.iframeMessageHandler.cleanup();
-        } catch (error) {
-            this.logger.warn('(cleanup) iframeMessageHandler.cleanup() failed; proceeding with DOM teardown', {
-                error: error instanceof Error ? error.message : error
-            });
+        // Best-effort ACK (the iframe clears its storage), only if already
+        // initialized. Do NOT initialize here: that mounts a fresh container just to
+        // ACK and then tears it down, churning the shared container across
+        // logout→relogin and starving the next login's eager recovery. May reject on
+        // a 5s timeout — swallow it; stale storage is cleared by the next init anyway.
+        if (this.waasSDKContainer && this.iframeMessageHandler) {
+            try {
+                await this.iframeMessageHandler.cleanup();
+            } catch (error) {
+                this.logger.warn('(cleanup) iframeMessageHandler.cleanup() failed; proceeding with DOM teardown', {
+                    error: error instanceof Error ? error.message : error
+                });
+            }
         }
+        // Always detach bridge + recovery subscription, even if the container is gone:
+        // a dangling subscription's retry timer can fire recovery into a torn-down
+        // container next session ("iframe not loaded").
+        this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
+        this.cleanupBridge = null;
+        this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
+        this.cleanupRecoverySubscription = null;
         if (this.waasSDKContainer) {
-            IframeManager.iframeInstanceCount--;
-            // Always detach THIS instance's bridge + recovery subscription, even when
-            // other instances keep the shared container alive (multi-chain sessions
-            // share one static container). Leaving them attached lets a logged-out
-            // transport's retry timer fire recovery and flush a queued message into a
-            // torn-down container on the next session — the "iframe not loaded" pageerror.
-            this.cleanupBridge == null ? void 0 : this.cleanupBridge.call(this);
-            this.cleanupBridge = null;
-            this.cleanupRecoverySubscription == null ? void 0 : this.cleanupRecoverySubscription.call(this);
-            this.cleanupRecoverySubscription = null;
-            if (IframeManager.sharedWaasSDKContainer && IframeManager.iframeInstanceCount === 0) {
-                IframeManager.sharedWaasSDKContainer.destroy();
-                IframeManager.sharedWaasSDKContainer = null;
-                IframeManager.iframeLoadPromise = null;
-            }
+            this.releaseSharedContainer();
             this.waasSDKContainer = null;
-            // Drop the transport + handler so the next operation re-inits and rebuilds a
-            // fresh bridge instead of short-circuiting on initializeMessageTransport's
-            // "already initialized" guard with a now-detached bridge.
-            this.messageTransport = null;
-            this.iframeMessageHandler = null;
-            this.iframeRequestChannel = undefined;
-            // Re-arm the unauthorized guard so a future session can trigger logout again.
-            this.unauthorizedHandled = false;
         }
+        // Drop transport/handler so the next op re-inits a fresh bridge (not a
+        // detached one); re-arm the unauthorized guard for a future session.
+        this.messageTransport = null;
+        this.iframeMessageHandler = null;
+        this.iframeRequestChannel = undefined;
+        this.unauthorizedHandled = false;
     }
     constructor({ environmentId, baseApiUrl, baseMPCRelayApiUrl, chainName, sdkVersion, authMode = AuthMode.HEADER, authToken, debug, baseClientKeysharesRelayApiUrl, additionalTrustedOrigins, hostOrigin, iframeLoadTimeout, maxRetryAttempts, eagerlyRecoverKeyShares }, internalOptions){
         this.logger = logger;
@@ -1438,7 +1434,13 @@ IframeManager.minIframeLoadTimeout = 1000;
 IframeManager.maxIframeLoadTimeout = 60000;
 IframeManager.maxAllowedRetryAttempts = 10;
 IframeManager.sharedWaasSDKContainer = null;
-IframeManager.iframeInstanceCount = 0;
+/**
+   * Instances bound to the live shared container; it's destroyed only when this
+   * empties. A set (vs the old counter) can't drift negative — a logged-out
+   * instance's cleanup once decremented past zero and destroyed a container the
+   * next login still needed. Live users are carried across a rebuild (not
+   * cleared), so the fresh container isn't torn down before they re-point to it.
+   */ IframeManager.sharedContainerUsers = new Set();
 IframeManager.maxAdditionalTrustedOrigins = 32;
 IframeManager.maxTrustedOriginStringLength = 200;
 

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@dynamic-labs-wallet/browser-wallet-client",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@dynamic-labs-wallet/core": "1.0.41",
+    "@dynamic-labs-wallet/core": "1.0.43",
     "@dynamic-labs/logger": "^4.81.0",
     "@dynamic-labs/message-transport": "^4.81.0"
   },

package/src/client/iframeManager/IframeManager.d.ts

@@ -53,7 +53,14 @@ export declare class IframeManager {
     private static readonly maxAllowedRetryAttempts;
     baseClientKeysharesRelayApiUrl: string | undefined;
     private static sharedWaasSDKContainer;
-    private static iframeInstanceCount;
+    /**
+     * Instances bound to the live shared container; it's destroyed only when this
+     * empties. A set (vs the old counter) can't drift negative — a logged-out
+     * instance's cleanup once decremented past zero and destroyed a container the
+     * next login still needed. Live users are carried across a rebuild (not
+     * cleared), so the fresh container isn't torn down before they re-point to it.
+     */
+    private static readonly sharedContainerUsers;
     sdkVersion: string | undefined;
     /**
      * When true, the iframe eagerly recovers all wallet key shares itself once
@@ -229,9 +236,19 @@ export declare class IframeManager {
      */
     private initAuthToken;
     /**
-     * Reset the shared provider and iframe load promise, and iframe instance count
+     * Reset the shared provider and iframe load promise, and drop this instance
+     * from the shared-container user set
      */
     private resetSharedWaasSDKContainer;
+    /** Bind to the shared container and join the user set together, so the
+     *  destroy-when-empty invariant can't drift (see {@link sharedContainerUsers}). */
+    private adoptSharedContainer;
+    /** Destroy the (already dead/replaced) shared container. Deliberately leaves the
+     *  user set intact — live users re-point to the rebuilt container on recovery. */
+    private static destroySharedContainer;
+    /** Release this instance; destroy the container only once no user remains, so a
+     *  logout can't tear it out from under a concurrent login's eager recovery. */
+    private releaseSharedContainer;
     private loadIframe;
     private createWaasSDKContainerLoadPromise;
     private getIframeContext;

package/src/client/iframeManager/IframeManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IframeManager.d.ts","sourceRoot":"","sources":["../../../src/client/iframeManager/IframeManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IframeManager.d.ts","sourceRoot":"","sources":["../../../src/client/iframeManager/IframeManager.ts"],"names":[],"mappings":"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"}