@metamask/connect-multichain 0.15.0 → 1.1.0

package/dist/src/multichain/index.js

@@ -18,7 +18,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _MetaMaskConnectMultichain_instances, _MetaMaskConnectMultichain_provider, _MetaMaskConnectMultichain_providerTransportWrapper, _MetaMaskConnectMultichain_transport, _MetaMaskConnectMultichain_dappClient, _MetaMaskConnectMultichain_beforeUnloadListener, _MetaMaskConnectMultichain_transportType, _MetaMaskConnectMultichain_listener, _MetaMaskConnectMultichain_anonId, _MetaMaskConnectMultichain_sdkInfo, _MetaMaskConnectMultichain_setupAnalytics, _MetaMaskConnectMultichain_onTransportNotification, _MetaMaskConnectMultichain_getStoredTransport, _MetaMaskConnectMultichain_setupTransport, _MetaMaskConnectMultichain_buildConnectionMetadata, _MetaMaskConnectMultichain_init, _MetaMaskConnectMultichain_createDappClient, _MetaMaskConnectMultichain_setupMWP, _MetaMaskConnectMultichain_onBeforeUnload, _MetaMaskConnectMultichain_createBeforeUnloadListener, _MetaMaskConnectMultichain_renderInstallModalAsync, _MetaMaskConnectMultichain_showInstallModal, _MetaMaskConnectMultichain_headlessConnect, _MetaMaskConnectMultichain_setupDefaultTransport, _MetaMaskConnectMultichain_deeplinkConnect, _MetaMaskConnectMultichain_handleConnection, _MetaMaskConnectMultichain_getCaipSession, _MetaMaskConnectMultichain_openConnectDeeplinkIfNeeded;
+var _MetaMaskConnectMultichain_instances, _MetaMaskConnectMultichain_provider, _MetaMaskConnectMultichain_providerTransportWrapper, _MetaMaskConnectMultichain_transport, _MetaMaskConnectMultichain_dappClient, _MetaMaskConnectMultichain_beforeUnloadListener, _MetaMaskConnectMultichain_transportType, _MetaMaskConnectMultichain_listener, _MetaMaskConnectMultichain_anonId, _MetaMaskConnectMultichain_transportOrThrow, _MetaMaskConnectMultichain_sdkInfo, _MetaMaskConnectMultichain_setupAnalytics, _MetaMaskConnectMultichain_onTransportNotification, _MetaMaskConnectMultichain_getStoredTransport, _MetaMaskConnectMultichain_setupTransport, _MetaMaskConnectMultichain_buildConnectionMetadata, _MetaMaskConnectMultichain_init, _MetaMaskConnectMultichain_createDappClient, _MetaMaskConnectMultichain_setupMWP, _MetaMaskConnectMultichain_onBeforeUnload, _MetaMaskConnectMultichain_createBeforeUnloadListener, _MetaMaskConnectMultichain_renderInstallModalAsync, _MetaMaskConnectMultichain_showInstallModal, _MetaMaskConnectMultichain_headlessConnect, _MetaMaskConnectMultichain_setupDefaultTransport, _MetaMaskConnectMultichain_deeplinkConnect, _MetaMaskConnectMultichain_handleConnection, _MetaMaskConnectMultichain_getCaipSession, _MetaMaskConnectMultichain_openConnectDeeplinkIfNeeded;
 /* eslint-disable @typescript-eslint/no-misused-promises */
 /* eslint-disable @typescript-eslint/naming-convention */
 /* eslint-disable no-restricted-globals */
@@ -26,6 +26,7 @@ var _MetaMaskConnectMultichain_instances, _MetaMaskConnectMultichain_provider, _
 /* eslint-disable no-async-promise-executor -- Async promise executor needed for complex flow */
 import { analytics } from '@metamask/analytics';
 import { getMultichainClient, } from '@metamask/multichain-api-client';
+import { createDeferredPromise } from '@metamask/utils';
 import { METAMASK_CONNECT_BASE_URL, METAMASK_DEEPLINK_BASE, MWP_RELAY_URL, } from '../config';
 import { getVersion, TransportType, } from '../domain';
 import { extractErrorDiagnostics, getBaseAnalyticsProperties, isRejectionError, } from './utils/analytics';
@@ -117,12 +118,6 @@ export class MetaMaskConnectMultichain extends MultichainCore {
     get provider() {
         return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_provider, "f");
     }
-    get transport() {
-        if (!__classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f")) {
-            throw new Error('Transport not initialized, establish connection first');
-        }
-        return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f");
-    }
     get dappClient() {
         if (!__classPrivateFieldGet(this, _MetaMaskConnectMultichain_dappClient, "f")) {
             throw new Error('DappClient not initialized, establish connection first');
@@ -136,15 +131,13 @@ export class MetaMaskConnectMultichain extends MultichainCore {
     get storage() {
         return this.options.storage;
     }
+    get version() {
+        return getVersion();
+    }
     constructor(options) {
         var _a, _b, _c, _d, _e;
         const withDappMetadata = setupDappMetadata(options);
-        const allOptions = Object.assign(Object.assign({}, withDappMetadata), { ui: Object.assign(Object.assign({}, withDappMetadata.ui), { preferExtension: (_a = withDappMetadata.ui.preferExtension) !== null && _a !== void 0 ? _a : true, showInstallModal: (_b = withDappMetadata.ui.showInstallModal) !== null && _b !== void 0 ? _b : false, headless: (_c = withDappMetadata.ui.headless) !== null && _c !== void 0 ? _c : false }), analytics: normalizeAnalyticsOptions(options.analytics), versions: Object.assign({ 
-                // typeof guard needed: Metro (React Native) bundles TS source directly,
-                // bypassing the tsup build that substitutes __PACKAGE_VERSION__.
-                'connect-multichain': typeof __PACKAGE_VERSION__ === 'undefined'
-                    ? 'unknown'
-                    : __PACKAGE_VERSION__ }, ((_d = options.versions) !== null && _d !== void 0 ? _d : {})) });
+        const allOptions = Object.assign(Object.assign({}, withDappMetadata), { ui: Object.assign(Object.assign({}, withDappMetadata.ui), { preferExtension: (_a = withDappMetadata.ui.preferExtension) !== null && _a !== void 0 ? _a : true, showInstallModal: (_b = withDappMetadata.ui.showInstallModal) !== null && _b !== void 0 ? _b : false, headless: (_c = withDappMetadata.ui.headless) !== null && _c !== void 0 ? _c : false }), analytics: normalizeAnalyticsOptions(options.analytics), versions: Object.assign({ 'connect-multichain': getVersion() }, ((_d = options.versions) !== null && _d !== void 0 ? _d : {})) });
         super(allOptions);
         _MetaMaskConnectMultichain_instances.add(this);
         _MetaMaskConnectMultichain_provider.set(this, void 0);
@@ -157,7 +150,7 @@ export class MetaMaskConnectMultichain extends MultichainCore {
         _MetaMaskConnectMultichain_listener.set(this, void 0);
         _MetaMaskConnectMultichain_anonId.set(this, void 0);
         _MetaMaskConnectMultichain_sdkInfo.set(this, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_e = this.options.dapp.url) !== null && _e !== void 0 ? _e : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
-        __classPrivateFieldSet(this, _MetaMaskConnectMultichain_providerTransportWrapper, new MultichainApiClientWrapperTransport(this), "f");
+        __classPrivateFieldSet(this, _MetaMaskConnectMultichain_providerTransportWrapper, new MultichainApiClientWrapperTransport(this, () => __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f")), "f");
         __classPrivateFieldSet(this, _MetaMaskConnectMultichain_provider, getMultichainClient({
             transport: __classPrivateFieldGet(this, _MetaMaskConnectMultichain_providerTransportWrapper, "f"),
         }), "f");
@@ -175,6 +168,12 @@ export class MetaMaskConnectMultichain extends MultichainCore {
             const existing = globalObject[SINGLETON_KEY];
             if (existing) {
                 const instance = yield existing;
+                if (instance.version !== getVersion()) {
+                    console.warn(`MetaMask Connect does not support using multiple versions of @metamask/connect-multichain. ` +
+                        `Attempted to create a new instance with version ${getVersion()}, but an existing ${instance.version} singleton was already initialized. ` +
+                        `Using the existing ${instance.version} singleton. This is NOT supported and may lead to unexpected behavior. ` +
+                        `Please ensure there is only one version of @metamask/connect-multichain package resolved in your application.`);
+                }
                 instance.mergeOptions(options);
                 if (instance instanceof MetaMaskConnectMultichain) {
                     yield __classPrivateFieldGet(instance, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_setupAnalytics).call(instance);
@@ -195,12 +194,12 @@ export class MetaMaskConnectMultichain extends MultichainCore {
                 }
                 yield __classPrivateFieldGet(instance, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_init).call(instance);
                 return instance;
-            }))();
-            globalObject[SINGLETON_KEY] = instancePromise;
-            instancePromise.catch((error) => {
+            }))().catch((error) => {
                 globalObject[SINGLETON_KEY] = undefined;
                 console.error('Error initializing MetaMaskConnectMultichain', error);
+                throw error;
             });
+            globalObject[SINGLETON_KEY] = instancePromise;
             return instancePromise;
         });
     }
@@ -254,9 +253,9 @@ export class MetaMaskConnectMultichain extends MultichainCore {
                 })
                     .then(() => __awaiter(this, void 0, void 0, function* () {
                     if (__classPrivateFieldGet(this, _MetaMaskConnectMultichain_transportType, "f") === TransportType.MWP) {
-                        return this.storage.setTransport(TransportType.MWP);
+                        return this.storage.setTransportType(TransportType.MWP);
                     }
-                    return this.storage.setTransport(TransportType.Browser);
+                    return this.storage.setTransportType(TransportType.Browser);
                 })), scopes, transportType);
             }
             // In MetaMask Mobile In App Browser, window.ethereum is available directly
@@ -294,11 +293,6 @@ export class MetaMaskConnectMultichain extends MultichainCore {
             return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_handleConnection).call(this, __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_showInstallModal).call(this, shouldShowInstallModal, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
         });
     }
-    emit(event, args) {
-        var _a, _b;
-        (_b = (_a = this.options.transport) === null || _a === void 0 ? void 0 : _a.onNotification) === null || _b === void 0 ? void 0 : _b.call(_a, { method: event, params: args });
-        super.emit(event, args);
-    }
     disconnect() {
         return __awaiter(this, arguments, void 0, function* (scopes = []) {
             var _a, _b, _c;
@@ -308,7 +302,7 @@ export class MetaMaskConnectMultichain extends MultichainCore {
                 : Object.keys(sessionData.sessionScopes).filter((scope) => !scopes.includes(scope));
             yield ((_a = __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f")) === null || _a === void 0 ? void 0 : _a.disconnect(scopes));
             if (remainingScopes.length === 0) {
-                yield this.storage.removeTransport();
+                yield this.storage.removeTransportType();
                 // We want to leave the DefaultTransport instance connected so that we can
                 // still listen for wallet_sessionChanged events.
                 if (__classPrivateFieldGet(this, _MetaMaskConnectMultichain_transportType, "f") !== TransportType.Browser) {
@@ -328,7 +322,8 @@ export class MetaMaskConnectMultichain extends MultichainCore {
     invokeMethod(request) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            const { transport, options } = this;
+            const transport = __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this);
+            const { options } = this;
             const rpcClient = new RpcClient(options, __classPrivateFieldGet(this, _MetaMaskConnectMultichain_sdkInfo, "f"));
             const requestRouter = new RequestRouter(transport, rpcClient, options, (_a = __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transportType, "f")) !== null && _a !== void 0 ? _a : TransportType.UNKNOWN);
             // TODO: need read only method support for solana
@@ -343,7 +338,7 @@ export class MetaMaskConnectMultichain extends MultichainCore {
         const shouldOpenDeeplink = secure && !showInstallModal;
         if (shouldOpenDeeplink) {
             setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                const session = yield this.transport.getActiveSession();
+                const session = yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this).getActiveSession();
                 if (!session) {
                     throw new Error('No active session found');
                 }
@@ -371,7 +366,7 @@ export class MetaMaskConnectMultichain extends MultichainCore {
                 return;
             }
             // Otherwise, we need to fetch the current CAIP session from the wallet
-            const response = yield this.transport.request({
+            const response = yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f").request({
                 method: 'wallet_getSession',
             });
             // And then simulate a sessionChanged event with the current CAIP session data
@@ -379,7 +374,12 @@ export class MetaMaskConnectMultichain extends MultichainCore {
         });
     }
 }
-_MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_providerTransportWrapper = new WeakMap(), _MetaMaskConnectMultichain_transport = new WeakMap(), _MetaMaskConnectMultichain_dappClient = new WeakMap(), _MetaMaskConnectMultichain_beforeUnloadListener = new WeakMap(), _MetaMaskConnectMultichain_transportType = new WeakMap(), _MetaMaskConnectMultichain_listener = new WeakMap(), _MetaMaskConnectMultichain_anonId = new WeakMap(), _MetaMaskConnectMultichain_sdkInfo = new WeakMap(), _MetaMaskConnectMultichain_instances = new WeakSet(), _MetaMaskConnectMultichain_setupAnalytics = function _MetaMaskConnectMultichain_setupAnalytics() {
+_MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_providerTransportWrapper = new WeakMap(), _MetaMaskConnectMultichain_transport = new WeakMap(), _MetaMaskConnectMultichain_dappClient = new WeakMap(), _MetaMaskConnectMultichain_beforeUnloadListener = new WeakMap(), _MetaMaskConnectMultichain_transportType = new WeakMap(), _MetaMaskConnectMultichain_listener = new WeakMap(), _MetaMaskConnectMultichain_anonId = new WeakMap(), _MetaMaskConnectMultichain_sdkInfo = new WeakMap(), _MetaMaskConnectMultichain_instances = new WeakSet(), _MetaMaskConnectMultichain_transportOrThrow = function _MetaMaskConnectMultichain_transportOrThrow() {
+    if (!__classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f")) {
+        throw new Error('Transport not initialized, establish connection first');
+    }
+    return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f");
+}, _MetaMaskConnectMultichain_setupAnalytics = function _MetaMaskConnectMultichain_setupAnalytics() {
     return __awaiter(this, void 0, void 0, function* () {
         yield setupAnalyticsGlobals(this.options, this.storage, (anonId) => {
             __classPrivateFieldSet(this, _MetaMaskConnectMultichain_anonId, anonId, "f");
@@ -406,7 +406,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
     });
 }, _MetaMaskConnectMultichain_getStoredTransport = function _MetaMaskConnectMultichain_getStoredTransport() {
     return __awaiter(this, void 0, void 0, function* () {
-        const transportType = yield this.storage.getTransport();
+        const transportType = yield this.storage.getTransportType();
         const hasExtensionInstalled = yield hasExtension();
         if (transportType) {
             if (transportType === TransportType.Browser) {
@@ -431,7 +431,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
                 __classPrivateFieldSet(this, _MetaMaskConnectMultichain_listener, apiTransport.onNotification(__classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_onTransportNotification).bind(this)), "f");
                 return apiTransport;
             }
-            yield this.storage.removeTransport();
+            yield this.storage.removeTransportType();
         }
         return undefined;
     });
@@ -440,16 +440,16 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
         var _a;
         const transport = yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_getStoredTransport).call(this);
         if (transport) {
-            if (!this.transport.isConnected()) {
+            if (!transport.isConnected()) {
                 this.status = 'connecting';
-                yield this.transport.connect();
+                yield transport.connect();
             }
             this.status = 'connected';
             if (__classPrivateFieldGet(this, _MetaMaskConnectMultichain_transportType, "f") === TransportType.MWP) {
-                yield this.storage.setTransport(TransportType.MWP);
+                yield this.storage.setTransportType(TransportType.MWP);
             }
             else {
-                yield this.storage.setTransport(TransportType.Browser);
+                yield this.storage.setTransportType(TransportType.Browser);
             }
         }
         else {
@@ -463,7 +463,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
                 // and that wallet_sessionChanged (faked) is emitted. But because we are not
                 // calling transport.connect(), we need to initialize DefaultTransport manually.
                 try {
-                    yield this.transport.init();
+                    yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this).init();
                 }
                 catch (error) {
                     console.error('Passive init failed:', error);
@@ -487,7 +487,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
             yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_setupTransport).call(this);
         }
         catch (error) {
-            yield this.storage.removeTransport();
+            yield this.storage.removeTransportType();
             this.status = 'pending';
             logger('MetaMaskSDK error during initialization', error);
         }
@@ -532,15 +532,15 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
         __classPrivateFieldSet(this, _MetaMaskConnectMultichain_transport, apiTransport, "f");
         __classPrivateFieldSet(this, _MetaMaskConnectMultichain_transportType, TransportType.MWP, "f");
         __classPrivateFieldGet(this, _MetaMaskConnectMultichain_providerTransportWrapper, "f").setupTransportNotificationListener();
-        __classPrivateFieldSet(this, _MetaMaskConnectMultichain_listener, this.transport.onNotification(__classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_onTransportNotification).bind(this)), "f");
-        yield this.storage.setTransport(TransportType.MWP);
+        __classPrivateFieldSet(this, _MetaMaskConnectMultichain_listener, apiTransport.onNotification(__classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_onTransportNotification).bind(this)), "f");
+        yield this.storage.setTransportType(TransportType.MWP);
     });
 }, _MetaMaskConnectMultichain_onBeforeUnload = function _MetaMaskConnectMultichain_onBeforeUnload() {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         // Fixes glitch with "connecting" state when modal is still visible and we close screen or refresh
         if ((_a = this.options.ui.factory.modal) === null || _a === void 0 ? void 0 : _a.isMounted) {
-            yield this.storage.removeTransport();
+            yield this.storage.removeTransportType();
         }
     });
 }, _MetaMaskConnectMultichain_createBeforeUnloadListener = function _MetaMaskConnectMultichain_createBeforeUnloadListener() {
@@ -557,73 +557,70 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
     };
 }, _MetaMaskConnectMultichain_renderInstallModalAsync = function _MetaMaskConnectMultichain_renderInstallModalAsync(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            // Use Connection Modal
-            this.options.ui.factory
-                .renderInstallModal(desktopPreferred, () => __awaiter(this, void 0, void 0, function* () {
-                if (this.dappClient.state === 'CONNECTED' ||
-                    this.dappClient.state === 'CONNECTING') {
-                    yield this.dappClient.disconnect();
-                }
-                return new Promise((_resolve) => {
-                    this.dappClient.on('session_request', (sessionRequest) => {
-                        _resolve({
-                            sessionRequest,
-                            metadata: __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_buildConnectionMetadata).call(this),
-                        });
-                    });
-                    (() => __awaiter(this, void 0, void 0, function* () {
-                        var _a;
-                        try {
-                            yield this.transport.connect({
-                                scopes,
-                                caipAccountIds,
-                                sessionProperties,
-                            });
-                            yield this.options.ui.factory.unload();
-                            (_a = this.options.ui.factory.modal) === null || _a === void 0 ? void 0 : _a.unmount();
-                            this.status = 'connected';
-                            yield this.storage.setTransport(TransportType.MWP);
-                        }
-                        catch (error) {
-                            const { ProtocolError, ErrorCode } = yield import('@metamask/mobile-wallet-protocol-core');
-                            if (error instanceof ProtocolError) {
-                                if (error.code !== ErrorCode.REQUEST_EXPIRED) {
-                                    this.status = 'disconnected';
-                                    // Close the modal on error
-                                    yield this.options.ui.factory.unload(error);
-                                    reject(error);
-                                }
-                                // If request is expires, the QRCode will automatically be regenerated we can ignore this case
-                            }
-                            else {
-                                this.status = 'disconnected';
-                                const normalizedError = error instanceof Error ? error : new Error(String(error));
-                                // Close the modal on error
-                                yield this.options.ui.factory.unload(normalizedError);
-                                reject(normalizedError);
-                            }
-                        }
-                    }))().catch(() => {
-                        // Error already handled in the async function
-                    });
+        const completion = createDeferredPromise();
+        const createConnectionRequest = () => __awaiter(this, void 0, void 0, function* () {
+            if (this.dappClient.state === 'CONNECTED' ||
+                this.dappClient.state === 'CONNECTING') {
+                yield this.dappClient.disconnect();
+            }
+            // The session_request event carries the pending request needed to build
+            // the deeplink / QR code. We resolve this deferred when it fires.
+            const sessionRequestDeferred = createDeferredPromise();
+            this.dappClient.on('session_request', (sessionRequest) => {
+                sessionRequestDeferred.resolve({
+                    sessionRequest,
+                    metadata: __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_buildConnectionMetadata).call(this),
                 });
-            }), (error) => __awaiter(this, void 0, void 0, function* () {
-                if (error) {
-                    yield this.storage.removeTransport();
-                    reject(error);
+            });
+            // Start the connection flow in the background — it will eventually emit
+            // session_request (resolving sessionRequestDeferred) and then either
+            // succeed (handled by the successCallback below) or fail (rejecting
+            // the outer completion deferred).
+            __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this)
+                .connect({ scopes, caipAccountIds, sessionProperties })
+                .then(() => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                yield this.options.ui.factory.unload();
+                (_a = this.options.ui.factory.modal) === null || _a === void 0 ? void 0 : _a.unmount();
+                this.status = 'connected';
+                yield this.storage.setTransportType(TransportType.MWP);
+            }))
+                .catch((error) => __awaiter(this, void 0, void 0, function* () {
+                const { ProtocolError, ErrorCode } = yield import('@metamask/mobile-wallet-protocol-core');
+                if (error instanceof ProtocolError) {
+                    if (error.code !== ErrorCode.REQUEST_EXPIRED) {
+                        this.status = 'disconnected';
+                        yield this.options.ui.factory.unload(error);
+                        completion.reject(error);
+                    }
+                    // If the request is expired the QR code is automatically regenerated — ignore this case
                 }
                 else {
-                    yield this.storage.setTransport(TransportType.MWP);
-                    resolve();
+                    this.status = 'disconnected';
+                    const normalizedError = error instanceof Error ? error : new Error(String(error));
+                    yield this.options.ui.factory.unload(normalizedError);
+                    completion.reject(normalizedError);
                 }
-            }), (uri) => {
-                this.emit('display_uri', uri);
-            })
-                .catch((error) => {
-                reject(error instanceof Error ? error : new Error(String(error)));
-            });
+            }));
+            return sessionRequestDeferred.promise;
+        });
+        this.options.ui.factory
+            .renderInstallModal(desktopPreferred, createConnectionRequest, (error) => __awaiter(this, void 0, void 0, function* () {
+            if (error) {
+                yield this.storage.removeTransportType();
+                completion.reject(error);
+            }
+            else {
+                yield this.storage.setTransportType(TransportType.MWP);
+                completion.resolve();
+            }
+        }), (uri) => {
+            this.emit('display_uri', uri);
+        })
+            .catch((error) => {
+            completion.reject(error instanceof Error ? error : new Error(String(error)));
         });
+        return completion.promise;
     });
 }, _MetaMaskConnectMultichain_showInstallModal = function _MetaMaskConnectMultichain_showInstallModal(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -640,47 +637,45 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
     });
 }, _MetaMaskConnectMultichain_headlessConnect = function _MetaMaskConnectMultichain_headlessConnect(scopes, caipAccountIds, sessionProperties) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            if (this.dappClient.state === 'CONNECTED' ||
-                this.dappClient.state === 'CONNECTING') {
-                this.dappClient.disconnect().catch(() => {
-                    // Ignore disconnect errors
-                });
-            }
-            // Listen for session_request to generate and emit the QR code link
-            this.dappClient.on('session_request', (sessionRequest) => {
-                const connectionRequest = {
-                    sessionRequest,
-                    metadata: __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_buildConnectionMetadata).call(this),
-                };
-                // Generate and emit the QR code link
-                const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
-                this.emit('display_uri', deeplink);
+        if (this.dappClient.state === 'CONNECTED' ||
+            this.dappClient.state === 'CONNECTING') {
+            yield this.dappClient.disconnect().catch(() => undefined);
+        }
+        // Listen for session_request to generate and emit the QR code link.
+        // Captured as a named ref so the listener can be removed when the
+        // connection settles — otherwise each #headlessConnect() call would leak
+        // a listener that re-emits `display_uri` for every future session_request.
+        const onSessionRequest = (sessionRequest) => {
+            const connectionRequest = {
+                sessionRequest,
+                metadata: __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_buildConnectionMetadata).call(this),
+            };
+            const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+            this.emit('display_uri', deeplink);
+        };
+        this.dappClient.on('session_request', onSessionRequest);
+        try {
+            yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this).connect({
+                scopes,
+                caipAccountIds,
+                sessionProperties,
             });
-            // Start the connection
-            this.transport
-                .connect({ scopes, caipAccountIds, sessionProperties })
-                .then(() => __awaiter(this, void 0, void 0, function* () {
-                this.status = 'connected';
-                yield this.storage.setTransport(TransportType.MWP);
-                resolve();
-            }))
-                .catch((error) => __awaiter(this, void 0, void 0, function* () {
-                const { ProtocolError } = yield import('@metamask/mobile-wallet-protocol-core');
-                if (error instanceof ProtocolError) {
-                    // In headless mode, we don't auto-regenerate QR codes
-                    // since there's no modal to display them
-                    this.status = 'disconnected';
-                    yield this.storage.removeTransport();
-                    reject(error);
-                }
-                else {
-                    this.status = 'disconnected';
-                    yield this.storage.removeTransport();
-                    reject(error instanceof Error ? error : new Error(String(error)));
-                }
-            }));
-        });
+            this.status = 'connected';
+            yield this.storage.setTransportType(TransportType.MWP);
+        }
+        catch (error) {
+            const { ProtocolError } = yield import('@metamask/mobile-wallet-protocol-core');
+            this.status = 'disconnected';
+            yield this.storage.removeTransportType();
+            // In headless mode, we don't auto-regenerate QR codes since there's no modal to display them
+            if (error instanceof ProtocolError || error instanceof Error) {
+                throw error;
+            }
+            throw new Error(String(error));
+        }
+        finally {
+            this.dappClient.off('session_request', onSessionRequest);
+        }
     });
 }, _MetaMaskConnectMultichain_setupDefaultTransport = function _MetaMaskConnectMultichain_setupDefaultTransport() {
     return __awaiter(this, arguments, void 0, function* (options = { persist: true }) {
@@ -688,7 +683,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
             return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f");
         }
         if (options === null || options === void 0 ? void 0 : options.persist) {
-            yield this.storage.setTransport(TransportType.Browser);
+            yield this.storage.setTransportType(TransportType.Browser);
         }
         const transport = new DefaultTransport();
         __classPrivateFieldSet(this, _MetaMaskConnectMultichain_listener, transport.onNotification(__classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_onTransportNotification).bind(this)), "f");
@@ -724,7 +719,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
             };
             this.dappClient.on('message', dappClientMessageHandler);
             let timeout;
-            if (this.transport.isConnected()) {
+            if (__classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this).isConnected()) {
                 timeout = setTimeout(() => {
                     this.openSimpleDeeplinkIfNeeded();
                 }, 250);
@@ -748,11 +743,11 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
                     }
                 });
             }
-            return this.transport
+            return __classPrivateFieldGet(this, _MetaMaskConnectMultichain_instances, "m", _MetaMaskConnectMultichain_transportOrThrow).call(this)
                 .connect({ scopes, caipAccountIds, sessionProperties })
                 .then(resolve)
                 .catch((error) => __awaiter(this, void 0, void 0, function* () {
-                yield this.storage.removeTransport();
+                yield this.storage.removeTransportType();
                 this.dappClient.off('message', dappClientMessageHandler);
                 reject(error instanceof Error ? error : new Error(String(error)));
             }))
@@ -809,7 +804,7 @@ _MetaMaskConnectMultichain_provider = new WeakMap(), _MetaMaskConnectMultichain_
         };
         if ((_a = __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f")) === null || _a === void 0 ? void 0 : _a.isConnected()) {
             try {
-                const response = yield this.transport.request({
+                const response = yield __classPrivateFieldGet(this, _MetaMaskConnectMultichain_transport, "f").request({
                     method: 'wallet_getSession',
                 });
                 if (response.result) {