@metamask/connect-multichain 0.15.0 → 1.0.0

package/dist/browser/iife/connect-multichain.js

@@ -9518,6 +9518,19 @@ var MetaMaskSDK = (() => {
   });
 
   // ../../node_modules/@metamask/utils/dist/promise.mjs
+  function createDeferredPromise({ suppressUnhandledRejection = false } = {}) {
+    let resolve;
+    let reject;
+    const promise = new Promise((innerResolve, innerReject) => {
+      resolve = innerResolve;
+      reject = innerReject;
+    });
+    if (suppressUnhandledRejection) {
+      promise.catch((_error) => {
+      });
+    }
+    return { promise, resolve, reject };
+  }
   var init_promise = __esm({
     "../../node_modules/@metamask/utils/dist/promise.mjs"() {
       "use strict";
@@ -16066,7 +16079,7 @@ var MetaMaskSDK = (() => {
   });
 
   // src/domain/multichain/api/constants.ts
-  var infuraRpcUrls, RPC_HANDLED_METHODS, SDK_HANDLED_METHODS;
+  var infuraRpcUrls, RPC_HANDLED_METHODS, SDK_HANDLED_METHODS, EIP1193_PASSTHROUGH_METHODS;
   var init_constants = __esm({
     "src/domain/multichain/api/constants.ts"() {
       "use strict";
@@ -16231,6 +16244,11 @@ var MetaMaskSDK = (() => {
         "eth_uninstallFilter"
       ]);
       SDK_HANDLED_METHODS = /* @__PURE__ */ new Set(["eth_accounts", "eth_chainId"]);
+      EIP1193_PASSTHROUGH_METHODS = /* @__PURE__ */ new Set([
+        "wallet_addEthereumChain",
+        "wallet_switchEthereumChain",
+        "eth_accounts"
+      ]);
     }
   });
 
@@ -17016,7 +17034,7 @@ var MetaMaskSDK = (() => {
       return detectionPromise;
     });
   }
-  var import_bowser, PlatformType, detectionPromise;
+  var import_bowser, PlatformType, NATIVE_METAMASK_EIP6963_RDNS, detectionPromise;
   var init_platform = __esm({
     "src/domain/platform/index.ts"() {
       "use strict";
@@ -17029,6 +17047,10 @@ var MetaMaskSDK = (() => {
         PlatformType2["ReactNative"] = "react-native";
         return PlatformType2;
       })(PlatformType || {});
+      NATIVE_METAMASK_EIP6963_RDNS = /* @__PURE__ */ new Set([
+        "io.metamask",
+        "io.metamask.mobile"
+      ]);
       detectionPromise = (() => __async(null, null, function* () {
         const pt = getPlatformType();
         if (pt === "nodejs" /* NonBrowser */ || pt === "react-native" /* ReactNative */) {
@@ -17036,23 +17058,30 @@ var MetaMaskSDK = (() => {
         }
         return new Promise((resolve) => {
           const providers = [];
+          const targetWindow = window;
           const handler = (event) => {
             var _a4, _b;
             if ((_b = (_a4 = event == null ? void 0 : event.detail) == null ? void 0 : _a4.info) == null ? void 0 : _b.rdns) {
               providers.push(event.detail);
             }
           };
-          window.addEventListener("eip6963:announceProvider", handler);
-          window.dispatchEvent(new Event("eip6963:requestProvider"));
+          targetWindow.addEventListener("eip6963:announceProvider", handler);
+          targetWindow.dispatchEvent(new Event("eip6963:requestProvider"));
           setTimeout(() => {
-            window.removeEventListener("eip6963:announceProvider", handler);
-            const hasMetaMask = providers.some(
-              (provider) => {
-                var _a4, _b;
-                return (_b = (_a4 = provider == null ? void 0 : provider.info) == null ? void 0 : _a4.rdns) == null ? void 0 : _b.startsWith("io.metamask");
+            try {
+              if (typeof (targetWindow == null ? void 0 : targetWindow.removeEventListener) === "function") {
+                targetWindow.removeEventListener("eip6963:announceProvider", handler);
               }
-            );
-            resolve(hasMetaMask);
+              const hasMetaMask = providers.some(
+                (provider) => {
+                  var _a4;
+                  return typeof ((_a4 = provider == null ? void 0 : provider.info) == null ? void 0 : _a4.rdns) === "string" && NATIVE_METAMASK_EIP6963_RDNS.has(provider.info.rdns);
+                }
+              );
+              resolve(hasMetaMask);
+            } catch (e) {
+              resolve(false);
+            }
           }, 300);
         });
       }))();
@@ -17297,12 +17326,14 @@ var MetaMaskSDK = (() => {
 
   // src/domain/utils/index.ts
   function getVersion() {
-    return "0.0.0";
+    return packageVersion;
   }
+  var packageVersion;
   var init_utils3 = __esm({
     "src/domain/utils/index.ts"() {
       "use strict";
       init_analytics();
+      packageVersion = false ? "unknown" : "1.0.0";
     }
   });
 
@@ -25748,12 +25779,13 @@ var MetaMaskSDK = (() => {
   __export(mwp_exports, {
     MWPTransport: () => MWPTransport
   });
-  var DEFAULT_REQUEST_TIMEOUT3, CONNECTION_GRACE_PERIOD, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_RESUME_TIMEOUT, SESSION_STORE_KEY, ACCOUNTS_STORE_KEY, CHAIN_STORE_KEY, PENDING_SESSION_REQUEST_KEY, CACHED_METHOD_LIST, CACHED_RESET_METHOD_LIST, logger, MWPTransport;
+  var DEFAULT_REQUEST_TIMEOUT3, CONNECTION_GRACE_PERIOD, DEFAULT_CONNECTION_TIMEOUT, DEFAULT_RESUME_TIMEOUT, SESSION_STORE_KEY, ACCOUNTS_STORE_KEY, CHAIN_STORE_KEY, PENDING_SESSION_REQUEST_KEY, CACHED_METHOD_LIST, CACHED_RESET_METHOD_LIST, logger, _MWPTransport_instances, onResumeHandler_fn, resumeSession_fn, startSession_fn, MWPTransport;
   var init_mwp = __esm({
     "src/multichain/transports/mwp/index.ts"() {
       "use strict";
       init_dist3();
       init_dist4();
+      init_dist2();
       init_domain();
       init_utils4();
       init_constants3();
@@ -25784,6 +25816,7 @@ var MetaMaskSDK = (() => {
           this.dappClient = dappClient;
           this.kvstore = kvstore;
           this.options = options;
+          __privateAdd(this, _MWPTransport_instances);
           this.__pendingRequests = /* @__PURE__ */ new Map();
           this.notificationCallbacks = /* @__PURE__ */ new Set();
           this.dappClient.on("message", this.handleMessage.bind(this));
@@ -25863,6 +25896,23 @@ var MetaMaskSDK = (() => {
           const message = errorPayload instanceof Error ? errorPayload.message : JSON.stringify(errorPayload);
           return rpcErrors.internal({ message });
         }
+        getResponseError(messagePayload) {
+          if ("error" in messagePayload && messagePayload.error) {
+            return messagePayload.error;
+          }
+          const { result } = messagePayload;
+          if (typeof result === "object" && result !== null && "error" in result && result.error && this.isErrorPayload(result.error)) {
+            return result.error;
+          }
+          return void 0;
+        }
+        isErrorPayload(errorPayload) {
+          if (errorPayload instanceof Error) {
+            return true;
+          }
+          const errorData = errorPayload;
+          return typeof (errorData == null ? void 0 : errorData.code) === "number" && typeof (errorData == null ? void 0 : errorData.message) === "string";
+        }
         handleMessage(message) {
           if (typeof message === "object" && message !== null) {
             if ("data" in message) {
@@ -25871,9 +25921,10 @@ var MetaMaskSDK = (() => {
                 const request2 = this.pendingRequests.get(messagePayload.id);
                 if (request2) {
                   clearTimeout(request2.timeout);
-                  if ("error" in messagePayload && messagePayload.error) {
+                  const responseError = this.getResponseError(messagePayload);
+                  if (responseError) {
                     this.pendingRequests.delete(messagePayload.id);
-                    request2.reject(this.parseWalletError(messagePayload.error));
+                    request2.reject(this.parseWalletError(responseError));
                     return;
                   }
                   const requestWithName = __spreadProps(__spreadValues({}, messagePayload), {
@@ -25916,73 +25967,6 @@ var MetaMaskSDK = (() => {
             }
           }
         }
-        onResumeSuccess(resumeResolve, resumeReject, options) {
-          return __async(this, null, function* () {
-            var _a4, _b, _c, _d, _e, _f, _g;
-            try {
-              yield this.waitForWalletSessionIfNotCached();
-              const sessionRequest = yield this.request({
-                method: "wallet_getSession"
-              });
-              if (sessionRequest.error) {
-                return resumeReject(new Error(sessionRequest.error.message));
-              }
-              let walletSession = sessionRequest.result;
-              if (walletSession && options) {
-                const currentScopes = Object.keys(
-                  (_a4 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a4 : {}
-                );
-                const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
-                const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
-                const hasSameScopesAndAccounts = isSameScopesAndAccounts(
-                  currentScopes,
-                  proposedScopes,
-                  walletSession,
-                  proposedCaipAccountIds
-                );
-                if (options.forceRequest || !hasSameScopesAndAccounts) {
-                  const optionalScopes = addValidAccounts(
-                    getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
-                    getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
-                  );
-                  const sessionRequest2 = {
-                    optionalScopes
-                  };
-                  const response = yield this.request({
-                    method: "wallet_createSession",
-                    params: sessionRequest2
-                  });
-                  if (response.error) {
-                    return resumeReject(new Error(response.error.message));
-                  }
-                  walletSession = response.result;
-                }
-              } else if (!walletSession) {
-                const optionalScopes = addValidAccounts(
-                  getOptionalScopes((_f = options == null ? void 0 : options.scopes) != null ? _f : []),
-                  getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
-                );
-                const sessionRequest2 = { optionalScopes };
-                const response = yield this.request({
-                  method: "wallet_createSession",
-                  params: sessionRequest2
-                });
-                if (response.error) {
-                  return resumeReject(new Error(response.error.message));
-                }
-                walletSession = response.result;
-              }
-              yield this.removeStoredPendingSessionRequest();
-              this.notifyCallbacks({
-                method: "wallet_sessionChanged",
-                params: walletSession
-              });
-              return resumeResolve();
-            } catch (err3) {
-              return resumeReject(err3);
-            }
-          });
-        }
         init() {
           return __async(this, null, function* () {
           });
@@ -26023,7 +26007,6 @@ var MetaMaskSDK = (() => {
         }
         connect(options) {
           return __async(this, null, function* () {
-            const { dappClient } = this;
             const session = yield this.getActiveSession();
             if (session) {
               logger("active session found", {
@@ -26032,116 +26015,11 @@ var MetaMaskSDK = (() => {
                 expiresAt: session.expiresAt
               });
             }
-            const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
-            let timeout;
-            let initialConnectionMessageHandler;
-            const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
-              let connection;
-              if (session) {
-                connection = new Promise((resumeResolve, resumeReject) => {
-                  var _a4;
-                  if (this.dappClient.state === "CONNECTED") {
-                    this.onResumeSuccess(resumeResolve, resumeReject, options);
-                  } else {
-                    this.dappClient.once("connected", () => __async(this, null, function* () {
-                      this.onResumeSuccess(resumeResolve, resumeReject, options);
-                    }));
-                    dappClient.resume((_a4 = session == null ? void 0 : session.id) != null ? _a4 : "");
-                  }
-                });
-              } else {
-                connection = new Promise(
-                  (resolveConnection, rejectConnection) => {
-                    var _a4, _b;
-                    const optionalScopes = addValidAccounts(
-                      getOptionalScopes((_a4 = options == null ? void 0 : options.scopes) != null ? _a4 : []),
-                      getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
-                    );
-                    const sessionRequest = {
-                      optionalScopes,
-                      sessionProperties: options == null ? void 0 : options.sessionProperties
-                    };
-                    const request2 = {
-                      jsonrpc: "2.0",
-                      id: String(getUniqueRequestId()),
-                      method: "wallet_createSession",
-                      params: sessionRequest
-                    };
-                    initialConnectionMessageHandler = (message) => __async(this, null, function* () {
-                      if (typeof message !== "object" || message === null) {
-                        return;
-                      }
-                      if (!("data" in message)) {
-                        return;
-                      }
-                      const messagePayload = message.data;
-                      const isMatchingId = messagePayload.id === request2.id;
-                      const isMatchingMethod = messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged";
-                      if (!isMatchingId && !isMatchingMethod) {
-                        return;
-                      }
-                      if (messagePayload.error) {
-                        return rejectConnection(
-                          this.parseWalletError(messagePayload.error)
-                        );
-                      }
-                      yield this.storeWalletSession(
-                        request2,
-                        messagePayload
-                      );
-                      yield this.removeStoredPendingSessionRequest();
-                      this.notifyCallbacks(messagePayload);
-                      return resolveConnection();
-                    });
-                    this.dappClient.on("message", initialConnectionMessageHandler);
-                    const platformType = getPlatformType();
-                    const isQRCodeFlow = [
-                      "web-desktop" /* DesktopWeb */,
-                      "nodejs" /* NonBrowser */
-                    ].includes(platformType);
-                    const initialPayload = {
-                      name: MULTICHAIN_PROVIDER_STREAM_NAME,
-                      data: request2
-                    };
-                    dappClient.connect({
-                      mode: "trusted",
-                      initialPayload: isQRCodeFlow ? void 0 : initialPayload
-                    }).then(() => __async(this, null, function* () {
-                      if (isQRCodeFlow) {
-                        return dappClient.sendRequest(initialPayload);
-                      }
-                      return void 0;
-                    })).catch((error) => {
-                      if (initialConnectionMessageHandler) {
-                        this.dappClient.off(
-                          "message",
-                          initialConnectionMessageHandler
-                        );
-                      }
-                      rejectConnection(error);
-                    });
-                  }
-                );
-              }
-              timeout = setTimeout(
-                () => {
-                  reject(new TransportTimeoutError());
-                },
-                storedSessionRequestBeforeConnectionAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
-              );
-              connection.then(resolve).catch(reject);
-            }));
-            return connectionPromise.catch((error) => __async(this, null, function* () {
+            const connection = session ? __privateMethod(this, _MWPTransport_instances, resumeSession_fn).call(this, session, options) : __privateMethod(this, _MWPTransport_instances, startSession_fn).call(this, options);
+            return connection.catch((error) => __async(this, null, function* () {
               yield this.dappClient.disconnect();
               throw error;
             })).finally(() => {
-              if (timeout) {
-                clearTimeout(timeout);
-              }
-              if (initialConnectionMessageHandler) {
-                this.dappClient.off("message", initialConnectionMessageHandler);
-                initialConnectionMessageHandler = void 0;
-              }
               this.removeStoredPendingSessionRequest();
             });
           });
@@ -26400,6 +26278,188 @@ var MetaMaskSDK = (() => {
           });
         }
       };
+      _MWPTransport_instances = new WeakSet();
+      onResumeHandler_fn = function(options) {
+        return __async(this, null, function* () {
+          var _a4, _b, _c, _d, _e, _f, _g;
+          yield this.waitForWalletSessionIfNotCached();
+          const sessionResponse = yield this.request({ method: "wallet_getSession" });
+          if (sessionResponse.error) {
+            throw new Error(sessionResponse.error.message);
+          }
+          let walletSession = sessionResponse.result;
+          if (walletSession && options) {
+            const currentScopes = Object.keys(
+              (_a4 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a4 : {}
+            );
+            const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
+            const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
+            const hasSameScopesAndAccounts = isSameScopesAndAccounts(
+              currentScopes,
+              proposedScopes,
+              walletSession,
+              proposedCaipAccountIds
+            );
+            if (options.forceRequest || !hasSameScopesAndAccounts) {
+              const optionalScopes = addValidAccounts(
+                getOptionalScopes((_d = options == null ? void 0 : options.scopes) != null ? _d : []),
+                getValidAccounts((_e = options == null ? void 0 : options.caipAccountIds) != null ? _e : [])
+              );
+              const sessionRequest = {
+                optionalScopes
+              };
+              const response = yield this.request({
+                method: "wallet_createSession",
+                params: sessionRequest
+              });
+              if (response.error) {
+                throw new Error(response.error.message);
+              }
+              walletSession = response.result;
+            }
+          } else if (!walletSession) {
+            const optionalScopes = addValidAccounts(
+              getOptionalScopes((_f = options == null ? void 0 : options.scopes) != null ? _f : []),
+              getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
+            );
+            const sessionRequest = {
+              optionalScopes
+            };
+            const response = yield this.request({
+              method: "wallet_createSession",
+              params: sessionRequest
+            });
+            if (response.error) {
+              throw new Error(response.error.message);
+            }
+            walletSession = response.result;
+          }
+          yield this.removeStoredPendingSessionRequest();
+          this.notifyCallbacks({
+            method: "wallet_sessionChanged",
+            params: walletSession
+          });
+        });
+      };
+      resumeSession_fn = function(session, options) {
+        return __async(this, null, function* () {
+          var _a4;
+          const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+          const resumeDeferred = createDeferredPromise();
+          const runOnResumeHandler = () => __async(this, null, function* () {
+            try {
+              resumeDeferred.resolve(yield __privateMethod(this, _MWPTransport_instances, onResumeHandler_fn).call(this, options));
+            } catch (err3) {
+              resumeDeferred.reject(err3);
+            }
+          });
+          if (this.dappClient.state === "CONNECTED") {
+            runOnResumeHandler();
+          } else {
+            this.dappClient.once("connected", runOnResumeHandler);
+            this.dappClient.resume((_a4 = session.id) != null ? _a4 : "").catch((err3) => resumeDeferred.reject(err3));
+          }
+          const timeoutDeferred = createDeferredPromise();
+          const timeout = setTimeout(
+            () => timeoutDeferred.reject(new TransportTimeoutError()),
+            isContinuingPriorAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+          );
+          const cleanup = () => this.dappClient.off("connected", runOnResumeHandler);
+          return Promise.race([
+            resumeDeferred.promise,
+            timeoutDeferred.promise
+          ]).finally(() => {
+            clearTimeout(timeout);
+            cleanup();
+          });
+        });
+      };
+      startSession_fn = function(options) {
+        return __async(this, null, function* () {
+          var _a4, _b;
+          const { dappClient } = this;
+          const isContinuingPriorAttempt = (yield this.getStoredPendingSessionRequest()) !== null;
+          const connDeferred = createDeferredPromise();
+          const optionalScopes = addValidAccounts(
+            getOptionalScopes((_a4 = options == null ? void 0 : options.scopes) != null ? _a4 : []),
+            getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
+          );
+          const sessionRequest = {
+            optionalScopes,
+            sessionProperties: options == null ? void 0 : options.sessionProperties
+          };
+          const request2 = {
+            jsonrpc: "2.0",
+            id: String(getUniqueRequestId()),
+            method: "wallet_createSession",
+            params: sessionRequest
+          };
+          let handler;
+          const removeHandler = () => {
+            if (handler) {
+              this.dappClient.off("message", handler);
+              handler = void 0;
+            }
+          };
+          handler = (message) => __async(this, null, function* () {
+            if (typeof message !== "object" || message === null) {
+              return;
+            }
+            if (!("data" in message)) {
+              return;
+            }
+            const messagePayload = message.data;
+            const isMatchingId = messagePayload.id === request2.id;
+            const isMatchingMethod = messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged";
+            if (!isMatchingId && !isMatchingMethod) {
+              return;
+            }
+            const responseError = this.getResponseError(messagePayload);
+            if (responseError) {
+              connDeferred.reject(this.parseWalletError(responseError));
+              return;
+            }
+            yield this.storeWalletSession(
+              request2,
+              messagePayload
+            );
+            yield this.removeStoredPendingSessionRequest();
+            this.notifyCallbacks(messagePayload);
+            connDeferred.resolve();
+          });
+          this.dappClient.on("message", handler);
+          const platformType = getPlatformType();
+          const isQRCodeFlow = [
+            "web-desktop" /* DesktopWeb */,
+            "nodejs" /* NonBrowser */
+          ].includes(platformType);
+          const initialPayload = {
+            name: MULTICHAIN_PROVIDER_STREAM_NAME,
+            data: request2
+          };
+          dappClient.connect({
+            mode: "trusted",
+            initialPayload: isQRCodeFlow ? void 0 : initialPayload
+          }).then(() => __async(this, null, function* () {
+            if (isQRCodeFlow) {
+              return dappClient.sendRequest(initialPayload);
+            }
+            return void 0;
+          })).catch((error) => connDeferred.reject(error));
+          const timeoutDeferred = createDeferredPromise();
+          const timeout = setTimeout(
+            () => timeoutDeferred.reject(new TransportTimeoutError()),
+            isContinuingPriorAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+          );
+          return Promise.race([
+            connDeferred.promise,
+            timeoutDeferred.promise
+          ]).finally(() => {
+            clearTimeout(timeout);
+            removeHandler();
+          });
+        });
+      };
     }
   });
 
@@ -37700,9 +37760,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         mount() {
           var _a4;
           const { options } = this;
-          const modal = document.createElement(
-            "mm-install-modal"
-          );
+          const modal = document.createElement("mm-install-modal");
           modal.showInstallModal = options.showInstallModal;
           modal.addEventListener("close", (ev) => {
             const { detail } = ev;
@@ -37886,6 +37944,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   // src/index.browser.ts
   var index_browser_exports = {};
   __export(index_browser_exports, {
+    EIP1193_PASSTHROUGH_METHODS: () => EIP1193_PASSTHROUGH_METHODS,
     EventEmitter: () => EventEmitter2,
     Modal: () => Modal,
     MultichainCore: () => MultichainCore,
@@ -37913,7 +37972,8 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     isEnabled: () => isEnabled,
     isMetamaskExtensionInstalled: () => isMetamaskExtensionInstalled,
     isRejectionError: () => isRejectionError,
-    isSecure: () => isSecure
+    isSecure: () => isSecure,
+    packageVersion: () => packageVersion
   });
 
   // src/polyfills/buffer-shim.ts
@@ -38531,6 +38591,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
 
   // src/multichain/index.ts
   init_dist3();
+  init_dist2();
 
   // src/config/index.ts
   var MWP_RELAY_URL = "wss://mm-sdk-relay.api.cx.metamask.io/connection/websocket";
@@ -38683,6 +38744,9 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     invokeMethod(options) {
       return __async(this, null, function* () {
         const { method } = options.request;
+        if (EIP1193_PASSTHROUGH_METHODS.has(method)) {
+          return this.handleWithEip1193Passthrough(options);
+        }
         if (RPC_HANDLED_METHODS.has(method)) {
           return this.handleWithRpcNode(options);
         }
@@ -38692,6 +38756,29 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         return this.handleWithWallet(options);
       });
     }
+    /**
+     * Forwards EIP-1193 / legacy provider methods (e.g. `wallet_addEthereumChain`,
+     * `wallet_switchEthereumChain`, `eth_accounts`) directly to the underlying
+     * transport's `sendEip1193Message`, bypassing the multichain
+     * `wallet_invokeMethod` envelope. These methods are wallet-side concerns the
+     * Multichain API does not model, so we forward the raw `{ method, params }`
+     * payload and return the wallet's full JSON-RPC response envelope unchanged.
+     *
+     * Analytics tracking is intentionally skipped here: ecosystem clients
+     * (e.g. `connect-evm`) emit their own `wallet_action_*` events around these
+     * passthrough calls, and adding router-level tracking would double-count.
+     *
+     * @param options
+     */
+    handleWithEip1193Passthrough(options) {
+      return __async(this, null, function* () {
+        const response = yield this.transport.sendEip1193Message({
+          method: options.request.method,
+          params: options.request.params
+        });
+        return response.result;
+      });
+    }
     /**
      * Forwards the request directly to the wallet via the transport.
      *
@@ -38723,14 +38810,6 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
             }), 10);
           }
           const response = yield request2;
-          if (response.error) {
-            const { error } = response;
-            throw new RPCInvokeMethodErr(
-              `RPC Request failed with code ${error.code}: ${error.message}`,
-              error.code,
-              error.message
-            );
-          }
           return response.result;
         }));
       });
@@ -38843,7 +38922,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   init_dist3();
   init_utils4();
   var DEFAULT_REQUEST_TIMEOUT2 = 60 * 1e3;
-  var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
+  var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, parseWalletError_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
   var DefaultTransport = class {
     constructor() {
       __privateAdd(this, _DefaultTransport_instances);
@@ -38979,7 +39058,11 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     }
     request(_0) {
       return __async(this, arguments, function* (request2, options = __privateGet(this, _defaultRequestOptions)) {
-        return __privateGet(this, _transport).request(request2, options);
+        const response = yield __privateGet(this, _transport).request(request2, options);
+        if (response.error) {
+          throw __privateMethod(this, _DefaultTransport_instances, parseWalletError_fn).call(this, response.error);
+        }
+        return response;
       });
     }
     onNotification(callback) {
@@ -39023,6 +39106,16 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       }
     }
   };
+  parseWalletError_fn = function(errorPayload) {
+    const errorData = errorPayload;
+    const error = new Error(
+      typeof errorData.message === "string" ? errorData.message : "Request failed"
+    );
+    if (typeof errorData.code === "number") {
+      error.code = errorData.code;
+    }
+    return error;
+  };
   isMetamaskProviderEvent_fn = function(event) {
     var _a4, _b;
     return ((_b = (_a4 = event == null ? void 0 : event.data) == null ? void 0 : _a4.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
@@ -39045,13 +39138,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         __privateGet(this, _pendingRequests).delete(responseId);
         const response = responseData;
         if ("error" in response && response.error) {
-          const error = new Error(
-            response.error.message || "Request failed"
-          );
-          if (typeof response.error.code === "number") {
-            error.code = response.error.code;
-          }
-          pendingRequest.reject(error);
+          pendingRequest.reject(__privateMethod(this, _DefaultTransport_instances, parseWalletError_fn).call(this, response.error));
         } else {
           pendingRequest.resolve(response);
         }
@@ -39089,22 +39176,21 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   // src/multichain/transports/multichainApiClientWrapper/index.ts
   init_dist4();
   init_utils4();
-  var _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+  var _notificationCallbacks2, _getTransport, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
   var MultichainApiClientWrapperTransport = class {
-    constructor(metamaskConnectMultichain) {
+    constructor(metamaskConnectMultichain, getTransport) {
       this.metamaskConnectMultichain = metamaskConnectMultichain;
       __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
       __privateAdd(this, _notificationCallbacks2, /* @__PURE__ */ new Set());
+      __privateAdd(this, _getTransport);
+      __privateSet(this, _getTransport, getTransport);
     }
     isTransportDefined() {
-      try {
-        return Boolean(this.metamaskConnectMultichain.transport);
-      } catch (_error) {
-        return false;
-      }
+      return __privateGet(this, _getTransport).call(this) !== void 0;
     }
     isTransportConnected() {
-      return this.isTransportDefined() && this.metamaskConnectMultichain.transport.isConnected();
+      var _a4, _b;
+      return (_b = (_a4 = __privateGet(this, _getTransport).call(this)) == null ? void 0 : _a4.isConnected()) != null ? _b : false;
     }
     clearNotificationCallbacks() {
       __privateGet(this, _notificationCallbacks2).clear();
@@ -39120,10 +39206,11 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       this.notificationListener = void 0;
     }
     setupTransportNotificationListener() {
-      if (!this.isTransportDefined() || this.notificationListener) {
+      const transport = __privateGet(this, _getTransport).call(this);
+      if (!transport || this.notificationListener) {
         return;
       }
-      this.notificationListener = this.metamaskConnectMultichain.transport.onNotification(
+      this.notificationListener = transport.onNotification(
         this.notifyCallbacks.bind(this)
       );
     }
@@ -39173,6 +39260,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     }
   };
   _notificationCallbacks2 = new WeakMap();
+  _getTransport = new WeakMap();
   _MultichainApiClientWrapperTransport_instances = new WeakSet();
   walletCreateSession_fn = function(request2) {
     return __async(this, null, function* () {
@@ -39196,14 +39284,19 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         accounts,
         createSessionParams.sessionProperties
       );
-      return this.metamaskConnectMultichain.transport.request({
+      const transport = __privateGet(this, _getTransport).call(this);
+      if (!transport) {
+        throw new Error("Transport not initialized after connect");
+      }
+      return transport.request({
         method: "wallet_getSession"
       });
     });
   };
   walletGetSession_fn = function(request2) {
     return __async(this, null, function* () {
-      if (!this.isTransportConnected()) {
+      const transport = __privateGet(this, _getTransport).call(this);
+      if (!(transport == null ? void 0 : transport.isConnected())) {
         return {
           jsonrpc: "2.0",
           id: request2.id,
@@ -39212,7 +39305,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
           }
         };
       }
-      return this.metamaskConnectMultichain.transport.request({
+      return transport.request({
         method: "wallet_getSession"
       });
     });
@@ -39290,7 +39383,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       analytics.enable();
     });
   }
-  var _a3, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _transportType, _listener, _anonId, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, buildConnectionMetadata_fn, init_fn2, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
+  var _a3, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _transportType, _listener, _anonId, _MetaMaskConnectMultichain_instances, transportOrThrow_fn, _sdkInfo, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, buildConnectionMetadata_fn, init_fn2, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, headlessConnect_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn, getCaipSession_fn, openConnectDeeplinkIfNeeded_fn;
   var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
     constructor(options) {
       var _a4, _b, _c, _d;
@@ -39303,9 +39396,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         }),
         analytics: normalizeAnalyticsOptions(options.analytics),
         versions: __spreadValues({
-          // typeof guard needed: Metro (React Native) bundles TS source directly,
-          // bypassing the tsup build that substitutes __PACKAGE_VERSION__.
-          "connect-multichain": false ? "unknown" : "0.15.0"
+          "connect-multichain": getVersion()
         }, (_d = options.versions) != null ? _d : {})
       });
       super(allOptions);
@@ -39321,7 +39412,8 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       __privateAdd(this, _anonId);
       __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a3 = this.options.dapp.url) != null ? _a3 : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
       __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(
-        this
+        this,
+        () => __privateGet(this, _transport2)
       ));
       __privateSet(this, _provider, getMultichainClient({
         transport: __privateGet(this, _providerTransportWrapper)
@@ -39340,12 +39432,6 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     get provider() {
       return __privateGet(this, _provider);
     }
-    get transport() {
-      if (!__privateGet(this, _transport2)) {
-        throw new Error("Transport not initialized, establish connection first");
-      }
-      return __privateGet(this, _transport2);
-    }
     get dappClient() {
       if (!__privateGet(this, _dappClient)) {
         throw new Error("DappClient not initialized, establish connection first");
@@ -39359,6 +39445,9 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     get storage() {
       return this.options.storage;
     }
+    get version() {
+      return getVersion();
+    }
     // Creates a singleton instance of MetaMaskConnectMultichain.
     // If the singleton already exists, it merges the incoming options with the
     // existing singleton options for the following keys: `api.supportedNetworks`,
@@ -39373,6 +39462,11 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         const existing = globalObject[SINGLETON_KEY];
         if (existing) {
           const instance2 = yield existing;
+          if (instance2.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 ${instance2.version} singleton was already initialized. Using the existing ${instance2.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.`
+            );
+          }
           instance2.mergeOptions(options);
           if (instance2 instanceof _MetaMaskConnectMultichain) {
             yield __privateMethod(_a4 = instance2, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(_a4);
@@ -39396,12 +39490,12 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
           }
           yield __privateMethod(_a5 = instance2, _MetaMaskConnectMultichain_instances, init_fn2).call(_a5);
           return instance2;
-        }))();
-        globalObject[SINGLETON_KEY] = instancePromise;
-        instancePromise.catch((error) => {
+        }))().catch((error) => {
           globalObject[SINGLETON_KEY] = void 0;
           console.error("Error initializing MetaMaskConnectMultichain", error);
+          throw error;
         });
+        globalObject[SINGLETON_KEY] = instancePromise;
         return instancePromise;
       });
     }
@@ -39461,9 +39555,9 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
             forceRequest
           }).then(() => __async(this, null, function* () {
             if (__privateGet(this, _transportType) === "mwp" /* MWP */) {
-              return this.storage.setTransport("mwp" /* MWP */);
+              return this.storage.setTransportType("mwp" /* MWP */);
             }
-            return this.storage.setTransport("browser" /* Browser */);
+            return this.storage.setTransportType("browser" /* Browser */);
           })), scopes, transportType);
         }
         if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
@@ -39492,11 +39586,6 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
       });
     }
-    emit(event, args) {
-      var _a4, _b;
-      (_b = (_a4 = this.options.transport) == null ? void 0 : _a4.onNotification) == null ? void 0 : _b.call(_a4, { method: event, params: args });
-      super.emit(event, args);
-    }
     disconnect() {
       return __async(this, arguments, function* (scopes = []) {
         var _a4, _b, _c;
@@ -39506,7 +39595,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         );
         yield (_a4 = __privateGet(this, _transport2)) == null ? void 0 : _a4.disconnect(scopes);
         if (remainingScopes.length === 0) {
-          yield this.storage.removeTransport();
+          yield this.storage.removeTransportType();
           if (__privateGet(this, _transportType) !== "browser" /* Browser */) {
             yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
             (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
@@ -39524,7 +39613,8 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
     invokeMethod(request2) {
       return __async(this, null, function* () {
         var _a4;
-        const { transport, options } = this;
+        const transport = __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this);
+        const { options } = this;
         const rpcClient = new RpcClient(options, __privateGet(this, _sdkInfo));
         const requestRouter = new RequestRouter(
           transport,
@@ -39543,7 +39633,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       const shouldOpenDeeplink = secure && !showInstallModal;
       if (shouldOpenDeeplink) {
         setTimeout(() => __async(this, null, function* () {
-          const session = yield this.transport.getActiveSession();
+          const session = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).getActiveSession();
           if (!session) {
             throw new Error("No active session found");
           }
@@ -39567,10 +39657,13 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
           this.emit("wallet_sessionChanged", emptySession);
           return;
         }
-        const response = yield this.transport.request({
+        const response = yield __privateGet(this, _transport2).request({
           method: "wallet_getSession"
         });
-        this.emit("wallet_sessionChanged", (_b = response.result) != null ? _b : emptySession);
+        this.emit(
+          "wallet_sessionChanged",
+          (_b = response.result) != null ? _b : emptySession
+        );
       });
     }
   };
@@ -39582,8 +39675,14 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   _transportType = new WeakMap();
   _listener = new WeakMap();
   _anonId = new WeakMap();
-  _sdkInfo = new WeakMap();
   _MetaMaskConnectMultichain_instances = new WeakSet();
+  transportOrThrow_fn = function() {
+    if (!__privateGet(this, _transport2)) {
+      throw new Error("Transport not initialized, establish connection first");
+    }
+    return __privateGet(this, _transport2);
+  };
+  _sdkInfo = new WeakMap();
   setupAnalytics_fn = function() {
     return __async(this, null, function* () {
       yield setupAnalyticsGlobals(this.options, this.storage, (anonId) => {
@@ -39609,7 +39708,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   };
   getStoredTransport_fn = function() {
     return __async(this, null, function* () {
-      const transportType = yield this.storage.getTransport();
+      const transportType = yield this.storage.getTransportType();
       const hasExtensionInstalled = yield hasExtension();
       if (transportType) {
         if (transportType === "browser" /* Browser */) {
@@ -39637,7 +39736,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
           ));
           return apiTransport;
         }
-        yield this.storage.removeTransport();
+        yield this.storage.removeTransportType();
       }
       return void 0;
     });
@@ -39647,15 +39746,15 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       var _a4;
       const transport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getStoredTransport_fn).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 (__privateGet(this, _transportType) === "mwp" /* MWP */) {
-          yield this.storage.setTransport("mwp" /* MWP */);
+          yield this.storage.setTransportType("mwp" /* MWP */);
         } else {
-          yield this.storage.setTransport("browser" /* Browser */);
+          yield this.storage.setTransportType("browser" /* Browser */);
         }
       } else {
         this.status = "loaded";
@@ -39664,7 +39763,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         if (hasExtensionInstalled && preferExtension) {
           yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this, { persist: false });
           try {
-            yield this.transport.init();
+            yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).init();
           } catch (error) {
             console.error("Passive init failed:", error);
           }
@@ -39688,7 +39787,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
         yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
       } catch (error) {
-        yield this.storage.removeTransport();
+        yield this.storage.removeTransportType();
         this.status = "pending";
         logger2("MetaMaskSDK error during initialization", error);
       }
@@ -39734,17 +39833,17 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       __privateSet(this, _transport2, apiTransport);
       __privateSet(this, _transportType, "mwp" /* MWP */);
       __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
-      __privateSet(this, _listener, this.transport.onNotification(
+      __privateSet(this, _listener, apiTransport.onNotification(
         __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
       ));
-      yield this.storage.setTransport("mwp" /* MWP */);
+      yield this.storage.setTransportType("mwp" /* MWP */);
     });
   };
   onBeforeUnload_fn = function() {
     return __async(this, null, function* () {
       var _a4;
       if ((_a4 = this.options.ui.factory.modal) == null ? void 0 : _a4.isMounted) {
-        yield this.storage.removeTransport();
+        yield this.storage.removeTransportType();
       }
     });
   };
@@ -39761,70 +39860,65 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   };
   renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
     return __async(this, null, function* () {
-      return new Promise((resolve, reject) => {
-        this.options.ui.factory.renderInstallModal(
-          desktopPreferred,
-          () => __async(this, null, 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: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
-                  });
-                }
-              );
-              (() => __async(this, null, function* () {
-                var _a4;
-                try {
-                  yield this.transport.connect({
-                    scopes,
-                    caipAccountIds,
-                    sessionProperties
-                  });
-                  yield this.options.ui.factory.unload();
-                  (_a4 = this.options.ui.factory.modal) == null ? void 0 : _a4.unmount();
-                  this.status = "connected";
-                  yield this.storage.setTransport("mwp" /* MWP */);
-                } catch (error) {
-                  const { ProtocolError, ErrorCode: ErrorCode4 } = yield Promise.resolve().then(() => __toESM(require_dist()));
-                  if (error instanceof ProtocolError) {
-                    if (error.code !== ErrorCode4.REQUEST_EXPIRED) {
-                      this.status = "disconnected";
-                      yield this.options.ui.factory.unload(error);
-                      reject(error);
-                    }
-                  } else {
-                    this.status = "disconnected";
-                    const normalizedError = error instanceof Error ? error : new Error(String(error));
-                    yield this.options.ui.factory.unload(normalizedError);
-                    reject(normalizedError);
-                  }
-                }
-              }))().catch(() => {
-              });
+      const completion = createDeferredPromise();
+      const createConnectionRequest = () => __async(this, null, function* () {
+        if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
+          yield this.dappClient.disconnect();
+        }
+        const sessionRequestDeferred = createDeferredPromise();
+        this.dappClient.on(
+          "session_request",
+          (sessionRequest) => {
+            sessionRequestDeferred.resolve({
+              sessionRequest,
+              metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
             });
-          }),
-          (error) => __async(this, null, function* () {
-            if (error) {
-              yield this.storage.removeTransport();
-              reject(error);
-            } else {
-              yield this.storage.setTransport("mwp" /* MWP */);
-              resolve();
+          }
+        );
+        __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({ scopes, caipAccountIds, sessionProperties }).then(() => __async(this, null, function* () {
+          var _a4;
+          yield this.options.ui.factory.unload();
+          (_a4 = this.options.ui.factory.modal) == null ? void 0 : _a4.unmount();
+          this.status = "connected";
+          yield this.storage.setTransportType("mwp" /* MWP */);
+        })).catch((error) => __async(this, null, function* () {
+          const { ProtocolError, ErrorCode: ErrorCode4 } = yield Promise.resolve().then(() => __toESM(require_dist()));
+          if (error instanceof ProtocolError) {
+            if (error.code !== ErrorCode4.REQUEST_EXPIRED) {
+              this.status = "disconnected";
+              yield this.options.ui.factory.unload(error);
+              completion.reject(error);
             }
-          }),
-          (uri) => {
-            this.emit("display_uri", uri);
+          } else {
+            this.status = "disconnected";
+            const normalizedError = error instanceof Error ? error : new Error(String(error));
+            yield this.options.ui.factory.unload(normalizedError);
+            completion.reject(normalizedError);
           }
-        ).catch((error) => {
-          reject(error instanceof Error ? error : new Error(String(error)));
-        });
+        }));
+        return sessionRequestDeferred.promise;
+      });
+      this.options.ui.factory.renderInstallModal(
+        desktopPreferred,
+        createConnectionRequest,
+        (error) => __async(this, null, function* () {
+          if (error) {
+            yield this.storage.removeTransportType();
+            completion.reject(error);
+          } else {
+            yield this.storage.setTransportType("mwp" /* MWP */);
+            completion.resolve();
+          }
+        }),
+        (uri) => {
+          this.emit("display_uri", uri);
+        }
+      ).catch((error) => {
+        completion.reject(
+          error instanceof Error ? error : new Error(String(error))
+        );
       });
+      return completion.promise;
     });
   };
   showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
@@ -39840,39 +39934,37 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
   };
   headlessConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
     return __async(this, null, function* () {
-      return new Promise((resolve, reject) => {
-        if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
-          this.dappClient.disconnect().catch(() => {
-          });
+      if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
+        yield this.dappClient.disconnect().catch(() => void 0);
+      }
+      const onSessionRequest = (sessionRequest) => {
+        const connectionRequest = {
+          sessionRequest,
+          metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
+        };
+        const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+        this.emit("display_uri", deeplink);
+      };
+      this.dappClient.on("session_request", onSessionRequest);
+      try {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({
+          scopes,
+          caipAccountIds,
+          sessionProperties
+        });
+        this.status = "connected";
+        yield this.storage.setTransportType("mwp" /* MWP */);
+      } catch (error) {
+        const { ProtocolError } = yield Promise.resolve().then(() => __toESM(require_dist()));
+        this.status = "disconnected";
+        yield this.storage.removeTransportType();
+        if (error instanceof ProtocolError || error instanceof Error) {
+          throw error;
         }
-        this.dappClient.on(
-          "session_request",
-          (sessionRequest) => {
-            const connectionRequest = {
-              sessionRequest,
-              metadata: __privateMethod(this, _MetaMaskConnectMultichain_instances, buildConnectionMetadata_fn).call(this)
-            };
-            const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
-            this.emit("display_uri", deeplink);
-          }
-        );
-        this.transport.connect({ scopes, caipAccountIds, sessionProperties }).then(() => __async(this, null, function* () {
-          this.status = "connected";
-          yield this.storage.setTransport("mwp" /* MWP */);
-          resolve();
-        })).catch((error) => __async(this, null, function* () {
-          const { ProtocolError } = yield Promise.resolve().then(() => __toESM(require_dist()));
-          if (error instanceof ProtocolError) {
-            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)));
-          }
-        }));
-      });
+        throw new Error(String(error));
+      } finally {
+        this.dappClient.off("session_request", onSessionRequest);
+      }
     });
   };
   setupDefaultTransport_fn = function() {
@@ -39881,7 +39973,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         return __privateGet(this, _transport2);
       }
       if (options == null ? void 0 : options.persist) {
-        yield this.storage.setTransport("browser" /* Browser */);
+        yield this.storage.setTransportType("browser" /* Browser */);
       }
       const transport = new DefaultTransport();
       __privateSet(this, _listener, transport.onNotification(
@@ -39914,7 +40006,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         };
         this.dappClient.on("message", dappClientMessageHandler);
         let timeout;
-        if (this.transport.isConnected()) {
+        if (__privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).isConnected()) {
           timeout = setTimeout(() => {
             this.openSimpleDeeplinkIfNeeded();
           }, 250);
@@ -39942,8 +40034,8 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
             }
           );
         }
-        return this.transport.connect({ scopes, caipAccountIds, sessionProperties }).then(resolve).catch((error) => __async(this, null, function* () {
-          yield this.storage.removeTransport();
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, transportOrThrow_fn).call(this).connect({ scopes, caipAccountIds, sessionProperties }).then(resolve).catch((error) => __async(this, null, function* () {
+          yield this.storage.removeTransportType();
           this.dappClient.off("message", dappClientMessageHandler);
           reject(error instanceof Error ? error : new Error(String(error)));
         })).finally(() => {
@@ -40009,7 +40101,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       };
       if ((_a4 = __privateGet(this, _transport2)) == null ? void 0 : _a4.isConnected()) {
         try {
-          const response = yield this.transport.request({
+          const response = yield __privateGet(this, _transport2).request({
             method: "wallet_getSession"
           });
           if (response.result) {
@@ -40103,14 +40195,14 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       super();
       this.adapter = adapter;
     }
-    getTransport() {
+    getTransportType() {
       return __async(this, null, function* () {
         try {
-          const transport = yield this.adapter.get("multichain-transport");
-          if (!transport) {
+          const transportType = yield this.adapter.get("multichain-transport");
+          if (!transportType) {
             return null;
           }
-          return getTransportType(transport);
+          return getTransportType(transportType);
         } catch (err3) {
           throw new StorageGetErr(
             this.adapter.platform,
@@ -40120,10 +40212,10 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         }
       });
     }
-    setTransport(transport) {
+    setTransportType(transportType) {
       return __async(this, null, function* () {
         try {
-          yield this.adapter.set("multichain-transport", transport);
+          yield this.adapter.set("multichain-transport", transportType);
         } catch (err3) {
           throw new StorageSetErr(
             this.adapter.platform,
@@ -40133,7 +40225,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
         }
       });
     }
-    removeTransport() {
+    removeTransportType() {
       return __async(this, null, function* () {
         try {
           yield this.adapter.delete("multichain-transport");
@@ -40616,7 +40708,11 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
             (_a5 = this.displayUriCallback) == null ? void 0 : _a5.call(this, newLink);
             return newLink;
           }),
-          onClose: this.onCloseModal.bind(this),
+          onClose: (shouldTerminate) => {
+            this.onCloseModal(shouldTerminate).catch((error) => {
+              console.error("Failed to close modal:", error);
+            });
+          },
           startDesktopOnboarding: this.onStartDesktopOnboarding.bind(this),
           createConnectionRequest,
           onDisplayUri: this.displayUriCallback
@@ -40654,7 +40750,7 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
       }
       try {
         const { defineCustomElements: defineCustomElements2 } = yield Promise.resolve().then(() => (init_loader2(), loader_exports));
-        yield defineCustomElements2();
+        defineCustomElements2();
       } catch (error) {
         console.error("Failed to load customElements:", error);
       }