@metamask/connect-multichain 0.3.1 → 0.4.0

package/dist/node/cjs/connect-multichain.js

@@ -256,8 +256,8 @@ var init_logger = __esm({
       import_debug.default.enable(namespace);
     };
     isEnabled = (namespace, storage) => __async(null, null, function* () {
-      var _a;
-      if ("process" in globalThis && ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.DEBUG)) {
+      var _a2;
+      if ("process" in globalThis && ((_a2 = process == null ? void 0 : process.env) == null ? void 0 : _a2.DEBUG)) {
         const { DEBUG } = process.env;
         return isNamespaceEnabled(DEBUG, namespace);
       }
@@ -426,35 +426,35 @@ var init_multichain = __esm({
 
 // src/domain/platform/index.ts
 function isNotBrowser() {
-  var _a;
+  var _a2;
   if (typeof window === "undefined") {
     return true;
   }
   if (!(window == null ? void 0 : window.navigator)) {
     return true;
   }
-  if (typeof global !== "undefined" && ((_a = global == null ? void 0 : global.navigator) == null ? void 0 : _a.product) === "ReactNative") {
+  if (typeof global !== "undefined" && ((_a2 = global == null ? void 0 : global.navigator) == null ? void 0 : _a2.product) === "ReactNative") {
     return true;
   }
   return (navigator == null ? void 0 : navigator.product) === "ReactNative";
 }
 function isReactNative() {
-  var _a;
+  var _a2;
   const hasWindowNavigator = typeof window !== "undefined" && window.navigator !== void 0;
   const nav = hasWindowNavigator ? window.navigator : void 0;
   if (!nav) {
     return false;
   }
-  return hasWindowNavigator && ((_a = window.navigator) == null ? void 0 : _a.product) === "ReactNative";
+  return hasWindowNavigator && ((_a2 = window.navigator) == null ? void 0 : _a2.product) === "ReactNative";
 }
 function isMetaMaskMobileWebView() {
   return typeof window !== "undefined" && // @ts-expect-error ReactNativeWebView should be defined
   Boolean(window.ReactNativeWebView) && Boolean(window.navigator.userAgent.endsWith("MetaMaskMobile"));
 }
 function isMobile() {
-  var _a, _b;
+  var _a2, _b;
   const browser = import_bowser.default.parse(window.navigator.userAgent);
-  return ((_a = browser == null ? void 0 : browser.platform) == null ? void 0 : _a.type) === "mobile" || ((_b = browser == null ? void 0 : browser.platform) == null ? void 0 : _b.type) === "tablet";
+  return ((_a2 = browser == null ? void 0 : browser.platform) == null ? void 0 : _a2.type) === "mobile" || ((_b = browser == null ? void 0 : browser.platform) == null ? void 0 : _b.type) === "tablet";
 }
 function getPlatformType() {
   if (isReactNative()) {
@@ -472,11 +472,11 @@ function getPlatformType() {
   return "web-desktop" /* DesktopWeb */;
 }
 function isMetamaskExtensionInstalled() {
-  var _a;
+  var _a2;
   if (typeof window === "undefined") {
     return false;
   }
-  return Boolean((_a = window.ethereum) == null ? void 0 : _a.isMetaMask);
+  return Boolean((_a2 = window.ethereum) == null ? void 0 : _a2.isMetaMask);
 }
 function isSecure() {
   const platformType = getPlatformType();
@@ -508,8 +508,8 @@ var init_platform = __esm({
       return new Promise((resolve) => {
         const providers = [];
         const handler = (event) => {
-          var _a, _b;
-          if ((_b = (_a = event == null ? void 0 : event.detail) == null ? void 0 : _a.info) == null ? void 0 : _b.rdns) {
+          var _a2, _b;
+          if ((_b = (_a2 = event == null ? void 0 : event.detail) == null ? void 0 : _a2.info) == null ? void 0 : _b.rdns) {
             providers.push(event.detail);
           }
         };
@@ -519,8 +519,8 @@ var init_platform = __esm({
           window.removeEventListener("eip6963:announceProvider", handler);
           const hasMetaMask = providers.some(
             (provider) => {
-              var _a, _b;
-              return (_b = (_a = provider == null ? void 0 : provider.info) == null ? void 0 : _a.rdns) == null ? void 0 : _b.startsWith("io.metamask");
+              var _a2, _b;
+              return (_b = (_a2 = provider == null ? void 0 : provider.info) == null ? void 0 : _a2.rdns) == null ? void 0 : _b.startsWith("io.metamask");
             }
           );
           resolve(hasMetaMask);
@@ -619,8 +619,8 @@ function compressString(str) {
   return base64Encode(binaryString);
 }
 function getDappId(dapp) {
-  var _a;
-  return (_a = dapp.url) != null ? _a : dapp.name;
+  var _a2;
+  return (_a2 = dapp.url) != null ? _a2 : dapp.name;
 }
 function openDeeplink(options, deeplink, universalLink) {
   const { mobile } = options;
@@ -650,10 +650,10 @@ function getOptionalScopes(scopes) {
   );
 }
 function setupDappMetadata(options) {
-  var _a, _b;
+  var _a2, _b;
   const platform = getPlatformType();
   const isBrowser = platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */ || platform === "in-app-browser" /* MetaMaskMobileWebview */;
-  if (!((_a = options.dapp) == null ? void 0 : _a.name)) {
+  if (!((_a2 = options.dapp) == null ? void 0 : _a2.name)) {
     throw new Error("You must provide dapp name");
   }
   if (isBrowser) {
@@ -724,17 +724,17 @@ function getValidAccounts(caipAccountIds) {
   );
 }
 function addValidAccounts(optionalScopes, validAccounts) {
-  var _a;
+  var _a2;
   if (!optionalScopes || !(validAccounts == null ? void 0 : validAccounts.length)) {
     return optionalScopes;
   }
   const result = Object.fromEntries(
     Object.entries(optionalScopes).map(([scope, scopeData]) => {
-      var _a2, _b, _c;
+      var _a3, _b, _c;
       return [
         scope,
         {
-          methods: [...(_a2 = scopeData == null ? void 0 : scopeData.methods) != null ? _a2 : []],
+          methods: [...(_a3 = scopeData == null ? void 0 : scopeData.methods) != null ? _a3 : []],
           notifications: [...(_b = scopeData == null ? void 0 : scopeData.notifications) != null ? _b : []],
           accounts: [...(_c = scopeData == null ? void 0 : scopeData.accounts) != null ? _c : []]
         }
@@ -748,7 +748,7 @@ function addValidAccounts(optionalScopes, validAccounts) {
     if (!accountsByChain.has(chainKey)) {
       accountsByChain.set(chainKey, []);
     }
-    (_a = accountsByChain.get(chainKey)) == null ? void 0 : _a.push(accountId);
+    (_a2 = accountsByChain.get(chainKey)) == null ? void 0 : _a2.push(accountId);
   }
   for (const [scopeKey, scopeData] of Object.entries(result)) {
     if (!(scopeData == null ? void 0 : scopeData.accounts)) {
@@ -780,7 +780,7 @@ var init_utils = __esm({
     import_utils = require("@metamask/utils");
     init_domain();
     extractFavicon = () => {
-      var _a;
+      var _a2;
       if (typeof document === "undefined") {
         return void 0;
       }
@@ -788,7 +788,7 @@ var init_utils = __esm({
       const nodeList = document.getElementsByTagName("link");
       for (let i = 0; i < nodeList.length; i++) {
         if (nodeList[i].getAttribute("rel") === "icon" || nodeList[i].getAttribute("rel") === "shortcut icon") {
-          favicon = (_a = nodeList[i].getAttribute("href")) != null ? _a : void 0;
+          favicon = (_a2 = nodeList[i].getAttribute("href")) != null ? _a2 : void 0;
         }
       }
       return favicon;
@@ -798,25 +798,25 @@ var init_utils = __esm({
 
 // src/multichain/utils/analytics.ts
 function isRejectionError(error) {
-  var _a, _b;
+  var _a2, _b;
   if (typeof error !== "object" || error === null) {
     return false;
   }
   const errorObj = error;
   const errorCode = errorObj.code;
-  const errorMessage = (_b = (_a = errorObj.message) == null ? void 0 : _a.toLowerCase()) != null ? _b : "";
+  const errorMessage = (_b = (_a2 = errorObj.message) == null ? void 0 : _a2.toLowerCase()) != null ? _b : "";
   return errorCode === 4001 || // User rejected request (common EIP-1193 code)
   errorCode === 4100 || // Unauthorized (common rejection code)
   errorMessage.includes("reject") || errorMessage.includes("denied") || errorMessage.includes("cancel") || errorMessage.includes("user");
 }
 function getBaseAnalyticsProperties(options, storage) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a2, _b;
     const version = getVersion();
     const dappId = getDappId(options.dapp);
     const platform = getPlatformType();
     const anonId = yield storage.getAnonId();
-    const integrationType = (_b = (_a = options.analytics) == null ? void 0 : _a.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
+    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
     return {
       mmconnect_version: version,
       dapp_id: dappId,
@@ -828,11 +828,11 @@ function getBaseAnalyticsProperties(options, storage) {
 }
 function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a2, _b;
     const version = getVersion();
     const dappId = getDappId(options.dapp);
     const anonId = yield storage.getAnonId();
-    const integrationType = (_b = (_a = options.analytics) == null ? void 0 : _a.integrationType) != null ? _b : "unknown";
+    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "unknown";
     return {
       mmconnect_version: version,
       dapp_id: dappId,
@@ -877,30 +877,6 @@ var init_domain = __esm({
   }
 });
 
-// src/ui/qr.ts
-function preloadQR() {
-  return __async(this, null, function* () {
-    if (encodeQRImpl) {
-      return;
-    }
-    const mod = yield import("@paulmillr/qr");
-    encodeQRImpl = mod.default;
-  });
-}
-function encodeQRSync(input) {
-  if (!encodeQRImpl) {
-    throw new Error("QR module not preloaded. Call preloadQR() first.");
-  }
-  return encodeQRImpl(input, "ascii");
-}
-var encodeQRImpl;
-var init_qr = __esm({
-  "src/ui/qr.ts"() {
-    "use strict";
-    encodeQRImpl = null;
-  }
-});
-
 // src/ui/modals/base/utils.ts
 function formatRemainingTime(milliseconds) {
   if (milliseconds <= 0) return "EXPIRED";
@@ -1019,12 +995,12 @@ var init_AbstractInstallModal = __esm({
 });
 
 // src/ui/modals/node/install.ts
-var logger4, InstallModal;
+var import_qr, logger4, InstallModal;
 var init_install = __esm({
   "src/ui/modals/node/install.ts"() {
     "use strict";
     init_domain();
-    init_qr();
+    import_qr = __toESM(require("@paulmillr/qr"));
     init_AbstractInstallModal();
     init_utils3();
     logger4 = createLogger("metamask-sdk:ui");
@@ -1032,7 +1008,7 @@ var init_install = __esm({
       displayQRWithCountdown(qrCodeLink, expiresInMs) {
         const isExpired = expiresInMs <= 0;
         const formattedTime = formatRemainingTime(expiresInMs);
-        const qrCode = encodeQRSync(qrCodeLink);
+        const qrCode = (0, import_qr.default)(qrCodeLink, "ascii");
         console.clear();
         console.log(qrCode);
         if (isExpired) {
@@ -1140,8 +1116,8 @@ var init_node2 = __esm({
       }
       get(key) {
         return __async(this, null, function* () {
-          var _a;
-          return (_a = this.storage.get(key)) != null ? _a : null;
+          var _a2;
+          return (_a2 = this.storage.get(key)) != null ? _a2 : null;
         });
       }
       set(key, value) {
@@ -1244,8 +1220,8 @@ var RpcClient = class {
     });
   }
   getRpcEndpoint(scope) {
-    var _a, _b, _c;
-    const supportedNetworks = (_c = (_b = (_a = this.config) == null ? void 0 : _a.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
+    var _a2, _b, _c;
+    const supportedNetworks = (_c = (_b = (_a2 = this.config) == null ? void 0 : _a2.api) == null ? void 0 : _b.supportedNetworks) != null ? _c : {};
     const rpcEndpoint = supportedNetworks[scope];
     if (!rpcEndpoint) {
       throw new MissingRpcEndpointErr(`No RPC endpoint found for scope ${scope}`);
@@ -1349,13 +1325,18 @@ var RequestRouter = class {
         const secure = isSecure();
         const shouldOpenDeeplink = secure && !showInstallModal;
         if (shouldOpenDeeplink) {
-          setTimeout(() => {
+          setTimeout(() => __async(this, null, function* () {
+            const session = yield this.transport.getActiveSession();
+            if (!session) {
+              throw new Error("No active session found");
+            }
+            const url = `${METAMASK_DEEPLINK_BASE}/mwp?id=${encodeURIComponent(session.id)}`;
             if (mobile == null ? void 0 : mobile.preferredOpenLink) {
-              mobile.preferredOpenLink(METAMASK_DEEPLINK_BASE, "_self");
+              mobile.preferredOpenLink(url, "_self");
             } else {
-              openDeeplink(this.config, METAMASK_DEEPLINK_BASE, METAMASK_CONNECT_BASE_URL);
+              openDeeplink(this.config, url, METAMASK_CONNECT_BASE_URL);
             }
-          }, 10);
+          }), 10);
         }
         const response = yield request;
         if (response.error) {
@@ -1395,24 +1376,17 @@ var RequestRouter = class {
 _RequestRouter_instances = new WeakSet();
 withAnalyticsTracking_fn = function(options, execute) {
   return __async(this, null, function* () {
-    var _a, _b, _c;
-    if ((_a = this.config.analytics) == null ? void 0 : _a.enabled) {
-      yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRequested_fn).call(this, options);
-    }
+    yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRequested_fn).call(this, options);
     try {
       const result = yield execute();
-      if ((_b = this.config.analytics) == null ? void 0 : _b.enabled) {
-        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionSucceeded_fn).call(this, options);
-      }
+      yield __privateMethod(this, _RequestRouter_instances, trackWalletActionSucceeded_fn).call(this, options);
       return result;
     } catch (error) {
-      if ((_c = this.config.analytics) == null ? void 0 : _c.enabled) {
-        const isRejection = isRejectionError(error);
-        if (isRejection) {
-          yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRejected_fn).call(this, options);
-        } else {
-          yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options);
-        }
+      const isRejection = isRejectionError(error);
+      if (isRejection) {
+        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionRejected_fn).call(this, options);
+      } else {
+        yield __privateMethod(this, _RequestRouter_instances, trackWalletActionFailed_fn).call(this, options);
       }
       throw new RPCInvokeMethodErr(error.message);
     }
@@ -1472,11 +1446,11 @@ var DefaultTransport = class {
         id: requestId
       }, payload);
       return new Promise((resolve, reject) => {
-        var _a;
+        var _a2;
         const timeout = setTimeout(() => {
           __privateGet(this, _pendingRequests).delete(requestId);
           reject(new Error("Request timeout"));
-        }, (_a = options == null ? void 0 : options.timeout) != null ? _a : __privateGet(this, _defaultRequestOptions).timeout);
+        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : __privateGet(this, _defaultRequestOptions).timeout);
         __privateGet(this, _pendingRequests).set(requestId, {
           resolve: (response) => {
             resolve(response);
@@ -1500,7 +1474,7 @@ var DefaultTransport = class {
   }
   connect(options) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a2, _b, _c, _d, _e, _f, _g;
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
       yield __privateGet(this, _transport).connect();
       const sessionRequest = yield this.request(
@@ -1513,7 +1487,7 @@ var DefaultTransport = class {
       let walletSession = sessionRequest.result;
       if (walletSession && options && !options.forceRequest) {
         const currentScopes = Object.keys(
-          (_a = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a : {}
+          (_a2 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a2 : {}
         );
         const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
         const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
@@ -1602,6 +1576,9 @@ var DefaultTransport = class {
       __privateGet(this, _notificationCallbacks).delete(callback);
     };
   }
+  getActiveSession() {
+    throw new Error("getActiveSession is purposely not implemented for the DefaultTransport");
+  }
 };
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
@@ -1624,16 +1601,16 @@ notifyCallbacks_fn = function(data) {
   }
 };
 isMetamaskProviderEvent_fn = function(event) {
-  var _a, _b;
-  return ((_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
+  var _a2, _b;
+  return ((_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.name) === "metamask-provider" && // eslint-disable-next-line no-restricted-globals
   event.origin === location.origin;
 };
 handleResponse_fn = function(event) {
-  var _a, _b;
+  var _a2, _b;
   if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
     return;
   }
-  const responseData = (_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.data;
+  const responseData = (_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.data;
   if (typeof responseData === "object" && responseData !== null && "method" in responseData) {
     return;
   }
@@ -1655,11 +1632,11 @@ handleResponse_fn = function(event) {
   }
 };
 handleNotification_fn = function(event) {
-  var _a, _b;
+  var _a2, _b;
   if (!__privateMethod(this, _DefaultTransport_instances, isMetamaskProviderEvent_fn).call(this, event)) {
     return;
   }
-  const responseData = (_b = (_a = event == null ? void 0 : event.data) == null ? void 0 : _a.data) == null ? void 0 : _b.data;
+  const responseData = (_b = (_a2 = event == null ? void 0 : event.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.data;
   if (typeof responseData === "object" && responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged") {
     __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, responseData);
   }
@@ -1785,7 +1762,7 @@ var MWPTransport = class {
   }
   onResumeSuccess(resumeResolve, resumeReject, options) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a2, _b, _c, _d, _e, _f, _g;
       try {
         const sessionRequest = yield this.request({
           method: "wallet_getSession"
@@ -1796,7 +1773,7 @@ var MWPTransport = class {
         let walletSession = sessionRequest.result;
         if (walletSession && options) {
           const currentScopes = Object.keys(
-            (_a = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a : {}
+            (_a2 = walletSession == null ? void 0 : walletSession.sessionScopes) != null ? _a2 : {}
           );
           const proposedScopes = (_b = options == null ? void 0 : options.scopes) != null ? _b : [];
           const proposedCaipAccountIds = (_c = options == null ? void 0 : options.caipAccountIds) != null ? _c : [];
@@ -1861,10 +1838,10 @@ var MWPTransport = class {
         return cachedWalletSession;
       }
       return new Promise((resolve, reject) => {
-        var _a;
+        var _a2;
         const timeout = setTimeout(() => {
           this.rejectRequest(request.id, new import_multichain_api_client2.TransportTimeoutError());
-        }, (_a = options == null ? void 0 : options.timeout) != null ? _a : this.options.requestTimeout);
+        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : this.options.requestTimeout);
         this.pendingRequests.set(request.id, {
           request,
           method: request.method,
@@ -1884,38 +1861,33 @@ var MWPTransport = class {
   }
   connect(options) {
     return __async(this, null, function* () {
-      const { dappClient, kvstore } = this;
-      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
-      let session;
-      try {
-        const [activeSession] = yield sessionStore.list();
-        if (activeSession) {
-          logger("active session found", activeSession);
-          session = activeSession;
-        }
-      } catch (e) {
+      const { dappClient } = this;
+      const session = yield this.getActiveSession();
+      if (session) {
+        logger("active session found", session);
       }
       let timeout;
+      let initialConnectionMessageHandler;
       const connectionPromise = new Promise((resolve, reject) => {
         let connection;
         if (session) {
           connection = new Promise((resumeResolve, resumeReject) => {
-            var _a;
+            var _a2;
             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((_a = session == null ? void 0 : session.id) != null ? _a : "");
+              dappClient.resume((_a2 = session == null ? void 0 : session.id) != null ? _a2 : "");
             }
           });
         } else {
           connection = new Promise(
             (resolveConnection, rejectConnection) => {
-              var _a, _b;
+              var _a2, _b;
               const optionalScopes = addValidAccounts(
-                getOptionalScopes((_a = options == null ? void 0 : options.scopes) != null ? _a : []),
+                getOptionalScopes((_a2 = options == null ? void 0 : options.scopes) != null ? _a2 : []),
                 getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
               );
               const sessionRequest = {
@@ -1927,12 +1899,18 @@ var MWPTransport = class {
                 method: "wallet_createSession",
                 params: sessionRequest
               };
-              this.dappClient.on("message", (message) => __async(this, null, function* () {
+              initialConnectionMessageHandler = (message) => __async(this, null, function* () {
                 if (typeof message === "object" && message !== null) {
                   if ("data" in message) {
                     const messagePayload = message.data;
                     if (messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged") {
                       if (messagePayload.error) {
+                        if (initialConnectionMessageHandler) {
+                          this.dappClient.off(
+                            "message",
+                            initialConnectionMessageHandler
+                          );
+                        }
                         return rejectConnection(messagePayload.error);
                       }
                       yield this.storeWalletSession(
@@ -1944,14 +1922,23 @@ var MWPTransport = class {
                     }
                   }
                 }
-              }));
+              });
+              this.dappClient.on("message", initialConnectionMessageHandler);
               dappClient.connect({
                 mode: "trusted",
                 initialPayload: {
                   name: MULTICHAIN_PROVIDER_STREAM_NAME,
                   data: request
                 }
-              }).catch(rejectConnection);
+              }).catch((error) => {
+                if (initialConnectionMessageHandler) {
+                  this.dappClient.off(
+                    "message",
+                    initialConnectionMessageHandler
+                  );
+                }
+                rejectConnection(error);
+              });
             }
           );
         }
@@ -1960,10 +1947,16 @@ var MWPTransport = class {
         }, this.options.connectionTimeout);
         connection.then(resolve).catch(reject);
       });
-      return connectionPromise.finally(() => {
+      return connectionPromise.catch((error) => {
+        throw error;
+      }).finally(() => {
         if (timeout) {
           clearTimeout(timeout);
         }
+        if (initialConnectionMessageHandler) {
+          this.dappClient.off("message", initialConnectionMessageHandler);
+          initialConnectionMessageHandler = void 0;
+        }
       });
     });
   }
@@ -2026,7 +2019,7 @@ var MWPTransport = class {
   }
   getCachedResponse(request) {
     return __async(this, null, function* () {
-      var _a;
+      var _a2;
       if (request.method === "wallet_getSession") {
         const walletGetSession = yield this.kvstore.get(SESSION_STORE_KEY);
         if (walletGetSession) {
@@ -2034,7 +2027,7 @@ var MWPTransport = class {
           return {
             id: request.id,
             jsonrpc: "2.0",
-            result: (_a = walletSession.params) != null ? _a : walletSession.result,
+            result: (_a2 = walletSession.params) != null ? _a2 : walletSession.result,
             // "what?... why walletSession.params?.."
             method: request.method
           };
@@ -2098,10 +2091,10 @@ var MWPTransport = class {
         yield this.attemptResumeSession();
       }
       return new Promise((resolve, reject) => {
-        var _a;
+        var _a2;
         const timeout = setTimeout(() => {
           this.rejectRequest(request.id, new import_multichain_api_client2.TransportTimeoutError());
-        }, (_a = options == null ? void 0 : options.timeout) != null ? _a : this.options.requestTimeout);
+        }, (_a2 = options == null ? void 0 : options.timeout) != null ? _a2 : this.options.requestTimeout);
         this.pendingRequests.set(request.id, {
           request,
           method: request.method,
@@ -2125,6 +2118,19 @@ var MWPTransport = class {
       this.notificationCallbacks.delete(callback);
     };
   }
+  getActiveSession() {
+    return __async(this, null, function* () {
+      const { kvstore } = this;
+      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
+      try {
+        const [activeSession] = yield sessionStore.list();
+        return activeSession;
+      } catch (error) {
+        logger("error getting active session", error);
+        return void 0;
+      }
+    });
+  }
 };
 
 // src/multichain/transports/mwp/KeyManager.ts
@@ -2157,73 +2163,74 @@ var keymanager = new KeyManager();
 // src/multichain/index.ts
 init_utils();
 var logger2 = createLogger("metamask-sdk:core");
-var MultichainSDK = class _MultichainSDK extends MultichainCore {
+var _a, _provider, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MultichainSDK_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, createDappClient_fn, setupMWP_fn, onBeforeUnload_fn, createBeforeUnloadListener_fn, renderInstallModalAsync_fn, showInstallModal_fn, setupDefaultTransport_fn, deeplinkConnect_fn, handleConnection_fn;
+var _MultichainSDK = class _MultichainSDK extends MultichainCore {
   constructor(options) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a2, _b, _c, _d, _e, _f;
     const withDappMetadata = setupDappMetadata(options);
-    const integrationType = ((_a = options.analytics) == null ? void 0 : _a.enabled) ? options.analytics.integrationType : "direct";
+    const integrationType = (_b = (_a2 = options.analytics) == null ? void 0 : _a2.integrationType) != null ? _b : "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
       ui: __spreadProps(__spreadValues({}, withDappMetadata.ui), {
-        preferExtension: (_b = withDappMetadata.ui.preferExtension) != null ? _b : true,
-        showInstallModal: (_c = withDappMetadata.ui.showInstallModal) != null ? _c : false,
-        headless: (_d = withDappMetadata.ui.headless) != null ? _d : false
+        preferExtension: (_c = withDappMetadata.ui.preferExtension) != null ? _c : true,
+        showInstallModal: (_d = withDappMetadata.ui.showInstallModal) != null ? _d : false,
+        headless: (_e = withDappMetadata.ui.headless) != null ? _e : false
       }),
-      analytics: __spreadProps(__spreadValues({}, (_e = options.analytics) != null ? _e : {}), {
-        enabled: (_g = (_f = options.analytics) == null ? void 0 : _f.enabled) != null ? _g : true,
+      analytics: __spreadProps(__spreadValues({}, (_f = options.analytics) != null ? _f : {}), {
         integrationType
       })
     });
     super(allOptions);
-    this.__provider = void 0;
-    this.__transport = void 0;
-    this.__dappClient = void 0;
-    this.__state = "pending";
+    __privateAdd(this, _MultichainSDK_instances);
+    __privateAdd(this, _provider);
+    __privateAdd(this, _transport2);
+    __privateAdd(this, _dappClient);
+    __privateAdd(this, _beforeUnloadListener);
+    this._state = "pending";
+    __privateAdd(this, _listener);
+    __privateAdd(this, _sdkInfo, `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a = this.options.dapp.url) != null ? _a : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`);
   }
   get state() {
-    return this.__state;
+    return this._state;
   }
   set state(value) {
-    var _a, _b;
-    this.__state = value;
-    (_b = (_a = this.options.transport) == null ? void 0 : _a.onNotification) == null ? void 0 : _b.call(_a, {
+    var _a2, _b;
+    this._state = value;
+    (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, {
       method: "stateChanged",
       params: value
     });
   }
   get provider() {
-    if (!this.__provider && this.__transport) {
-      this.__provider = (0, import_multichain_api_client3.getMultichainClient)({ transport: this.__transport });
-      return this.__provider;
+    if (!__privateGet(this, _provider) && __privateGet(this, _transport2)) {
+      __privateSet(this, _provider, (0, import_multichain_api_client3.getMultichainClient)({ transport: __privateGet(this, _transport2) }));
+      return __privateGet(this, _provider);
     }
-    if (!this.__provider) {
+    if (!__privateGet(this, _provider)) {
       throw new Error("Provider not initialized, establish connection first");
     }
-    return this.__provider;
+    return __privateGet(this, _provider);
   }
   get transport() {
-    if (!this.__transport) {
+    if (!__privateGet(this, _transport2)) {
       throw new Error("Transport not initialized, establish connection first");
     }
-    return this.__transport;
+    return __privateGet(this, _transport2);
   }
   get dappClient() {
-    if (!this.__dappClient) {
+    if (!__privateGet(this, _dappClient)) {
       throw new Error("DappClient not initialized, establish connection first");
     }
-    return this.__dappClient;
+    return __privateGet(this, _dappClient);
   }
   get storage() {
     return this.options.storage;
   }
   get transportType() {
-    return this.__transport instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
-  }
-  get sdkInfo() {
-    var _a;
-    return `Sdk/Javascript SdkVersion/${getVersion()} Platform/${getPlatformType()} dApp/${(_a = this.options.dapp.url) != null ? _a : this.options.dapp.name} dAppTitle/${this.options.dapp.name}`;
+    return __privateGet(this, _transport2) instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
   }
   static create(options) {
     return __async(this, null, function* () {
+      var _a2;
       const instance = new _MultichainSDK(options);
       const isEnabled2 = yield isEnabled(
         "metamask-sdk:core",
@@ -2232,353 +2239,16 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       if (isEnabled2) {
         enableDebug("metamask-sdk:core");
       }
-      yield instance.init();
+      yield __privateMethod(_a2 = instance, _MultichainSDK_instances, init_fn).call(_a2);
       return instance;
     });
   }
-  setupAnalytics() {
-    return __async(this, null, function* () {
-      var _a, _b;
-      if (!((_a = this.options.analytics) == null ? void 0 : _a.enabled)) {
-        return;
-      }
-      const platform = getPlatformType();
-      const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
-      const isReactNative2 = platform === "react-native" /* ReactNative */;
-      if (!isBrowser && !isReactNative2) {
-        return;
-      }
-      const version = getVersion();
-      const dappId = getDappId(this.options.dapp);
-      const anonId = yield this.storage.getAnonId();
-      const { integrationType } = (_b = this.options.analytics) != null ? _b : {
-        integrationType: ""
-      };
-      import_analytics4.analytics.setGlobalProperty("mmconnect_version", version);
-      import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
-      import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
-      import_analytics4.analytics.setGlobalProperty("platform", platform);
-      import_analytics4.analytics.setGlobalProperty("integration_type", integrationType);
-      import_analytics4.analytics.enable();
-    });
-  }
-  onTransportNotification(payload) {
-    return __async(this, null, function* () {
-      var _a;
-      if (typeof payload === "object" && payload !== null && "method" in payload) {
-        this.emit(payload.method, (_a = payload.params) != null ? _a : payload.result);
-      }
-    });
-  }
-  getStoredTransport() {
-    return __async(this, null, function* () {
-      const transportType = yield this.storage.getTransport();
-      const hasExtensionInstalled = yield hasExtension();
-      if (transportType) {
-        if (transportType === "browser" /* Browser */) {
-          if (hasExtensionInstalled) {
-            const apiTransport = new DefaultTransport();
-            this.__transport = apiTransport;
-            this.listener = apiTransport.onNotification(
-              this.onTransportNotification.bind(this)
-            );
-            return apiTransport;
-          }
-        } else if (transportType === "mwp" /* MWP */) {
-          const { adapter: kvstore } = this.options.storage;
-          const dappClient = yield this.createDappClient();
-          const apiTransport = new MWPTransport(dappClient, kvstore);
-          this.__dappClient = dappClient;
-          this.__transport = apiTransport;
-          this.listener = apiTransport.onNotification(
-            this.onTransportNotification.bind(this)
-          );
-          return apiTransport;
-        }
-        yield this.storage.removeTransport();
-      }
-      return void 0;
-    });
-  }
-  setupTransport() {
-    return __async(this, null, function* () {
-      const transport = yield this.getStoredTransport();
-      if (transport) {
-        if (!this.transport.isConnected()) {
-          this.state = "connecting";
-          yield this.transport.connect();
-        }
-        this.state = "connected";
-        if (this.transport instanceof MWPTransport) {
-          yield this.storage.setTransport("mwp" /* MWP */);
-        } else {
-          yield this.storage.setTransport("browser" /* Browser */);
-        }
-      } else {
-        this.state = "loaded";
-      }
-    });
-  }
-  init() {
-    return __async(this, null, function* () {
-      var _a, _b;
-      try {
-        if (typeof window !== "undefined" && ((_a = window.mmsdk) == null ? void 0 : _a.isInitialized)) {
-          logger2("MetaMaskSDK: init already initialized");
-        } else {
-          yield this.setupAnalytics();
-          yield this.setupTransport();
-          if ((_b = this.options.analytics) == null ? void 0 : _b.enabled) {
-            try {
-              const baseProps = yield getBaseAnalyticsProperties(
-                this.options,
-                this.storage
-              );
-              import_analytics4.analytics.track("mmconnect_initialized", baseProps);
-            } catch (error) {
-              logger2("Error tracking initialized event", error);
-            }
-          }
-          if (typeof window !== "undefined") {
-            window.mmsdk = this;
-          }
-        }
-      } catch (error) {
-        yield this.storage.removeTransport();
-        this.state = "pending";
-        logger2("MetaMaskSDK error during initialization", error);
-      }
-    });
-  }
-  createDappClient() {
-    return __async(this, null, function* () {
-      const { adapter: kvstore } = this.options.storage;
-      const sessionstore = new import_mobile_wallet_protocol_core2.SessionStore(kvstore);
-      const websocket = (
-        // eslint-disable-next-line no-negated-condition
-        typeof window !== "undefined" ? WebSocket : (yield import("ws")).WebSocket
-      );
-      const transport = yield import_mobile_wallet_protocol_core2.WebSocketTransport.create({
-        url: MWP_RELAY_URL,
-        kvstore,
-        websocket
-      });
-      const dappClient = new import_mobile_wallet_protocol_dapp_client.DappClient({ transport, sessionstore, keymanager });
-      return dappClient;
-    });
-  }
-  setupMWP() {
-    return __async(this, null, function* () {
-      if (this.__transport instanceof MWPTransport) {
-        return;
-      }
-      const { adapter: kvstore } = this.options.storage;
-      const dappClient = yield this.createDappClient();
-      this.__dappClient = dappClient;
-      const apiTransport = new MWPTransport(dappClient, kvstore);
-      this.__transport = apiTransport;
-      this.listener = this.transport.onNotification(
-        this.onTransportNotification.bind(this)
-      );
-      yield this.storage.setTransport("mwp" /* MWP */);
-    });
-  }
-  onBeforeUnload() {
-    return __async(this, null, function* () {
-      var _a;
-      if ((_a = this.options.ui.factory.modal) == null ? void 0 : _a.isMounted) {
-        yield this.storage.removeTransport();
-      }
-    });
-  }
-  createBeforeUnloadListener() {
-    if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
-      window.addEventListener("beforeunload", this.onBeforeUnload.bind(this));
-    }
-    return () => {
-      if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined") {
-        window.removeEventListener(
-          "beforeunload",
-          this.onBeforeUnload.bind(this)
-        );
-      }
-    };
-  }
-  showInstallModal(desktopPreferred, scopes, caipAccountIds) {
-    return __async(this, null, function* () {
-      var _a;
-      (_a = this.__beforeUnloadListener) != null ? _a : this.__beforeUnloadListener = this.createBeforeUnloadListener();
-      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((resolveConnectionRequest) => {
-              this.dappClient.on(
-                "session_request",
-                (sessionRequest) => {
-                  resolveConnectionRequest({
-                    sessionRequest,
-                    metadata: {
-                      dapp: this.options.dapp,
-                      sdk: {
-                        version: getVersion(),
-                        platform: getPlatformType()
-                      }
-                    }
-                  });
-                }
-              );
-              this.transport.connect({ scopes, caipAccountIds }).then(() => {
-                var _a2;
-                this.options.ui.factory.unload();
-                (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
-                this.state = "connected";
-                return this.storage.setTransport("mwp" /* MWP */);
-              }).catch((error) => {
-                if (error instanceof import_mobile_wallet_protocol_core2.ProtocolError) {
-                  if (error.code !== import_mobile_wallet_protocol_core2.ErrorCode.REQUEST_EXPIRED) {
-                    this.state = "disconnected";
-                    reject(error);
-                  }
-                } else {
-                  this.state = "disconnected";
-                  reject(error);
-                }
-              });
-            });
-          }),
-          (error) => __async(this, null, function* () {
-            if (!error) {
-              yield this.storage.setTransport("mwp" /* MWP */);
-              resolve();
-            } else {
-              yield this.storage.removeTransport();
-              reject(error);
-            }
-          })
-        );
-      });
-    });
-  }
-  setupDefaultTransport() {
-    return __async(this, null, function* () {
-      this.state = "connecting";
-      yield this.storage.setTransport("browser" /* Browser */);
-      const transport = new DefaultTransport();
-      this.listener = transport.onNotification(
-        this.onTransportNotification.bind(this)
-      );
-      this.__transport = transport;
-      return transport;
-    });
-  }
-  deeplinkConnect(scopes, caipAccountIds) {
-    return __async(this, null, function* () {
-      return new Promise((resolve, reject) => __async(this, null, function* () {
-        this.dappClient.on("message", (payload) => {
-          var _a, _b, _c;
-          const data = payload.data;
-          if (typeof data === "object" && data !== null) {
-            if ("method" in data && data.method === "wallet_createSession") {
-              if (data.error) {
-                this.state = "loaded";
-                return reject(data.error);
-              }
-              const session = (_a = data.params) != null ? _a : data.result;
-              if (session) {
-                (_c = (_b = this.options.transport) == null ? void 0 : _b.onNotification) == null ? void 0 : _c.call(_b, payload.data);
-                this.emit("wallet_sessionChanged", session);
-              }
-            }
-          }
-        });
-        let timeout;
-        if (!this.transport.isConnected()) {
-          this.dappClient.once(
-            "session_request",
-            (sessionRequest) => {
-              var _a;
-              const connectionRequest = {
-                sessionRequest,
-                metadata: {
-                  dapp: this.options.dapp,
-                  sdk: { version: getVersion(), platform: getPlatformType() }
-                }
-              };
-              const deeplink = this.options.ui.factory.createDeeplink(connectionRequest);
-              const universalLink = this.options.ui.factory.createUniversalLink(connectionRequest);
-              if ((_a = this.options.mobile) == null ? void 0 : _a.preferredOpenLink) {
-                this.options.mobile.preferredOpenLink(deeplink, "_self");
-              } else {
-                openDeeplink(this.options, deeplink, universalLink);
-              }
-            }
-          );
-        }
-        this.transport.connect({ scopes, caipAccountIds }).then(resolve).catch((error) => {
-          this.storage.removeTransport();
-          reject(error);
-        }).finally(() => {
-          if (timeout) {
-            clearTimeout(timeout);
-          }
-        });
-      }));
-    });
-  }
-  handleConnection(promise, scopes, transportType) {
-    return __async(this, null, function* () {
-      this.state = "connecting";
-      return promise.then(() => __async(this, null, function* () {
-        var _a;
-        this.state = "connected";
-        if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
-          try {
-            const baseProps = yield getBaseAnalyticsProperties(
-              this.options,
-              this.storage
-            );
-            import_analytics4.analytics.track("mmconnect_connection_established", __spreadProps(__spreadValues({}, baseProps), {
-              transport_type: transportType,
-              user_permissioned_chains: scopes
-            }));
-          } catch (error) {
-            logger2("Error tracking connection_established event", error);
-          }
-        }
-      })).catch((error) => __async(this, null, function* () {
-        var _a;
-        this.state = "disconnected";
-        if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
-          try {
-            const baseProps = yield getBaseAnalyticsProperties(
-              this.options,
-              this.storage
-            );
-            const isRejection = isRejectionError(error);
-            if (isRejection) {
-              import_analytics4.analytics.track("mmconnect_connection_rejected", __spreadProps(__spreadValues({}, baseProps), {
-                transport_type: transportType
-              }));
-            } else {
-              import_analytics4.analytics.track("mmconnect_connection_failed", __spreadProps(__spreadValues({}, baseProps), {
-                transport_type: transportType
-              }));
-            }
-          } catch (e) {
-            logger2("Error tracking connection failed/rejected event", error);
-          }
-        }
-        return Promise.reject(error);
-      }));
-    });
-  }
   connect(scopes, caipAccountIds, forceRequest) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a2;
+      if (this.state !== "connected") {
+        yield this.disconnect();
+      }
       const { ui } = this.options;
       const platformType = getPlatformType();
       const isWeb = platformType === "in-app-browser" /* MetaMaskMobileWebview */ || platformType === "web-desktop" /* DesktopWeb */;
@@ -2591,96 +2261,72 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
       } else {
         transportType = "mwp" /* MWP */;
       }
-      if ((_a = this.options.analytics) == null ? void 0 : _a.enabled) {
-        try {
-          const baseProps = yield getBaseAnalyticsProperties(
-            this.options,
-            this.storage
-          );
-          const dappConfiguredChains = Object.keys(
-            this.options.api.supportedNetworks
-          );
-          import_analytics4.analytics.track("mmconnect_connection_initiated", __spreadProps(__spreadValues({}, baseProps), {
-            transport_type: transportType,
-            dapp_configured_chains: dappConfiguredChains,
-            dapp_requested_chains: scopes
-          }));
-        } catch (error) {
-          logger2("Error tracking connection_initiated event", error);
-        }
-      }
-      if (((_b = this.__transport) == null ? void 0 : _b.isConnected()) && !secure) {
-        return this.handleConnection(
-          this.__transport.connect({ scopes, caipAccountIds, forceRequest }).then(() => {
-            if (this.__transport instanceof MWPTransport) {
-              return this.storage.setTransport("mwp" /* MWP */);
-            } else {
-              return this.storage.setTransport("browser" /* Browser */);
-            }
-          }),
-          scopes,
-          transportType
+      try {
+        const baseProps = yield getBaseAnalyticsProperties(
+          this.options,
+          this.storage
         );
+        const dappConfiguredChains = Object.keys(
+          this.options.api.supportedNetworks
+        );
+        import_analytics4.analytics.track("mmconnect_connection_initiated", __spreadProps(__spreadValues({}, baseProps), {
+          transport_type: transportType,
+          dapp_configured_chains: dappConfiguredChains,
+          dapp_requested_chains: scopes
+        }));
+      } catch (error) {
+        logger2("Error tracking connection_initiated event", error);
+      }
+      if (((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected()) && !secure) {
+        return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({ scopes, caipAccountIds, forceRequest }).then(() => __async(this, null, function* () {
+          if (__privateGet(this, _transport2) instanceof MWPTransport) {
+            return this.storage.setTransport("mwp" /* MWP */);
+          }
+          return this.storage.setTransport("browser" /* Browser */);
+        })), scopes, transportType);
       }
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
-        const defaultTransport = yield this.setupDefaultTransport();
-        return this.handleConnection(
-          defaultTransport.connect({ scopes, caipAccountIds, forceRequest }),
-          scopes,
-          transportType
-        );
+        const defaultTransport = yield __privateMethod(this, _MultichainSDK_instances, setupDefaultTransport_fn).call(this);
+        return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, defaultTransport.connect({ scopes, caipAccountIds, forceRequest }), scopes, transportType);
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
-        const defaultTransport = yield this.setupDefaultTransport();
-        return this.handleConnection(
-          defaultTransport.connect({ scopes, caipAccountIds, forceRequest }),
-          scopes,
-          transportType
-        );
+        const defaultTransport = yield __privateMethod(this, _MultichainSDK_instances, setupDefaultTransport_fn).call(this);
+        return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, defaultTransport.connect({ scopes, caipAccountIds, forceRequest }), scopes, transportType);
       }
-      yield this.setupMWP();
+      yield __privateMethod(this, _MultichainSDK_instances, setupMWP_fn).call(this);
       const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
       if (secure && !shouldShowInstallModal) {
-        return this.handleConnection(
-          this.deeplinkConnect(scopes, caipAccountIds),
-          scopes,
-          transportType
-        );
+        return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, __privateMethod(this, _MultichainSDK_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds), scopes, transportType);
       }
-      return this.handleConnection(
-        this.showInstallModal(shouldShowInstallModal, scopes, caipAccountIds),
-        scopes,
-        transportType
-      );
+      return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, __privateMethod(this, _MultichainSDK_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds), scopes, transportType);
     });
   }
   emit(event, args) {
-    var _a, _b;
-    (_b = (_a = this.options.transport) == null ? void 0 : _a.onNotification) == null ? void 0 : _b.call(_a, { method: event, params: args });
+    var _a2, _b;
+    (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, { method: event, params: args });
     super.emit(event, args);
   }
   disconnect() {
     return __async(this, null, function* () {
-      var _a, _b, _c;
-      (_a = this.listener) == null ? void 0 : _a.call(this);
-      (_b = this.__beforeUnloadListener) == null ? void 0 : _b.call(this);
-      yield (_c = this.__transport) == null ? void 0 : _c.disconnect();
+      var _a2, _b, _c;
+      yield (_a2 = __privateGet(this, _listener)) == null ? void 0 : _a2.call(this);
+      (_b = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _b.call(this);
+      yield (_c = __privateGet(this, _transport2)) == null ? void 0 : _c.disconnect();
       yield this.storage.removeTransport();
-      this.emit("wallet_sessionChanged", void 0);
       this.emit("stateChanged", "disconnected");
-      this.listener = void 0;
-      this.__beforeUnloadListener = void 0;
-      this.__transport = void 0;
-      this.__provider = void 0;
-      this.__dappClient = void 0;
+      __privateSet(this, _listener, void 0);
+      __privateSet(this, _beforeUnloadListener, void 0);
+      __privateSet(this, _transport2, void 0);
+      __privateSet(this, _provider, void 0);
+      __privateSet(this, _dappClient, void 0);
     });
   }
   invokeMethod(request) {
     return __async(this, null, function* () {
-      var _a;
-      const { sdkInfo, transport, options } = this;
-      (_a = this.__provider) != null ? _a : this.__provider = (0, import_multichain_api_client3.getMultichainClient)({ transport });
-      const rpcClient = new RpcClient(options, sdkInfo);
+      var _a2;
+      const { transport, options } = this;
+      (_a2 = __privateGet(this, _provider)) != null ? _a2 : __privateSet(this, _provider, (0, import_multichain_api_client3.getMultichainClient)({ transport }));
+      const rpcClient = new RpcClient(options, __privateGet(this, _sdkInfo));
       const requestRouter = new RequestRouter(transport, rpcClient, options);
       return requestRouter.invokeMethod(request);
     });
@@ -2692,20 +2338,381 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
     const secure = isSecure();
     const shouldOpenDeeplink = secure && !showInstallModal;
     if (shouldOpenDeeplink) {
-      setTimeout(() => {
+      setTimeout(() => __async(this, null, function* () {
+        const session = yield this.transport.getActiveSession();
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const url = `${METAMASK_DEEPLINK_BASE}/mwp?id=${encodeURIComponent(session.id)}`;
         if (mobile == null ? void 0 : mobile.preferredOpenLink) {
-          mobile.preferredOpenLink(METAMASK_DEEPLINK_BASE, "_self");
+          mobile.preferredOpenLink(url, "_self");
         } else {
-          openDeeplink(
+          openDeeplink(this.options, url, METAMASK_CONNECT_BASE_URL);
+        }
+      }), 10);
+    }
+  }
+};
+_provider = new WeakMap();
+_transport2 = new WeakMap();
+_dappClient = new WeakMap();
+_beforeUnloadListener = new WeakMap();
+_listener = new WeakMap();
+_sdkInfo = new WeakMap();
+_MultichainSDK_instances = new WeakSet();
+setupAnalytics_fn = function() {
+  return __async(this, null, function* () {
+    var _a2;
+    const platform = getPlatformType();
+    const isBrowser = platform === "in-app-browser" /* MetaMaskMobileWebview */ || platform === "web-desktop" /* DesktopWeb */ || platform === "web-mobile" /* MobileWeb */;
+    const isReactNative2 = platform === "react-native" /* ReactNative */;
+    if (!isBrowser && !isReactNative2) {
+      return;
+    }
+    const version = getVersion();
+    const dappId = getDappId(this.options.dapp);
+    const anonId = yield this.storage.getAnonId();
+    const { integrationType } = (_a2 = this.options.analytics) != null ? _a2 : {
+      integrationType: ""
+    };
+    import_analytics4.analytics.setGlobalProperty("mmconnect_version", version);
+    import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
+    import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
+    import_analytics4.analytics.setGlobalProperty("platform", platform);
+    import_analytics4.analytics.setGlobalProperty("integration_type", integrationType);
+    import_analytics4.analytics.enable();
+  });
+};
+onTransportNotification_fn = function(payload) {
+  return __async(this, null, function* () {
+    var _a2;
+    if (typeof payload === "object" && payload !== null && "method" in payload) {
+      this.emit(payload.method, (_a2 = payload.params) != null ? _a2 : payload.result);
+    }
+  });
+};
+getStoredTransport_fn = function() {
+  return __async(this, null, function* () {
+    const transportType = yield this.storage.getTransport();
+    const hasExtensionInstalled = yield hasExtension();
+    if (transportType) {
+      if (transportType === "browser" /* Browser */) {
+        if (hasExtensionInstalled) {
+          const apiTransport = new DefaultTransport();
+          __privateSet(this, _transport2, apiTransport);
+          __privateSet(this, _listener, apiTransport.onNotification(
+            __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+          ));
+          return apiTransport;
+        }
+      } else if (transportType === "mwp" /* MWP */) {
+        const { adapter: kvstore } = this.options.storage;
+        const dappClient = yield __privateMethod(this, _MultichainSDK_instances, createDappClient_fn).call(this);
+        const apiTransport = new MWPTransport(dappClient, kvstore);
+        __privateSet(this, _dappClient, dappClient);
+        __privateSet(this, _transport2, apiTransport);
+        __privateSet(this, _listener, apiTransport.onNotification(
+          __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+        ));
+        return apiTransport;
+      }
+      yield this.storage.removeTransport();
+    }
+    return void 0;
+  });
+};
+setupTransport_fn = function() {
+  return __async(this, null, function* () {
+    const transport = yield __privateMethod(this, _MultichainSDK_instances, getStoredTransport_fn).call(this);
+    if (transport) {
+      if (!this.transport.isConnected()) {
+        this.state = "connecting";
+        yield this.transport.connect();
+      }
+      this.state = "connected";
+      if (this.transport instanceof MWPTransport) {
+        yield this.storage.setTransport("mwp" /* MWP */);
+      } else {
+        yield this.storage.setTransport("browser" /* Browser */);
+      }
+    } else {
+      this.state = "loaded";
+    }
+  });
+};
+init_fn = function() {
+  return __async(this, null, function* () {
+    var _a2;
+    try {
+      if (typeof window !== "undefined" && ((_a2 = window.mmsdk) == null ? void 0 : _a2.isInitialized)) {
+        logger2("MetaMaskSDK: init already initialized");
+      } else {
+        yield __privateMethod(this, _MultichainSDK_instances, setupAnalytics_fn).call(this);
+        yield __privateMethod(this, _MultichainSDK_instances, setupTransport_fn).call(this);
+        try {
+          const baseProps = yield getBaseAnalyticsProperties(
             this.options,
-            METAMASK_DEEPLINK_BASE,
-            METAMASK_CONNECT_BASE_URL
+            this.storage
           );
+          import_analytics4.analytics.track("mmconnect_initialized", baseProps);
+        } catch (error) {
+          logger2("Error tracking initialized event", error);
+        }
+        if (typeof window !== "undefined") {
+          window.mmsdk = this;
         }
-      }, 10);
+      }
+    } catch (error) {
+      yield this.storage.removeTransport();
+      this.state = "pending";
+      logger2("MetaMaskSDK error during initialization", error);
     }
-  }
+  });
+};
+createDappClient_fn = function() {
+  return __async(this, null, function* () {
+    const { adapter: kvstore } = this.options.storage;
+    const sessionstore = new import_mobile_wallet_protocol_core2.SessionStore(kvstore);
+    const websocket = (
+      // eslint-disable-next-line no-negated-condition
+      typeof window !== "undefined" ? WebSocket : (yield import("ws")).WebSocket
+    );
+    const transport = yield import_mobile_wallet_protocol_core2.WebSocketTransport.create({
+      url: MWP_RELAY_URL,
+      kvstore,
+      websocket
+    });
+    const dappClient = new import_mobile_wallet_protocol_dapp_client.DappClient({ transport, sessionstore, keymanager });
+    return dappClient;
+  });
+};
+setupMWP_fn = function() {
+  return __async(this, null, function* () {
+    if (__privateGet(this, _transport2) instanceof MWPTransport) {
+      return;
+    }
+    const { adapter: kvstore } = this.options.storage;
+    const dappClient = yield __privateMethod(this, _MultichainSDK_instances, createDappClient_fn).call(this);
+    __privateSet(this, _dappClient, dappClient);
+    const apiTransport = new MWPTransport(dappClient, kvstore);
+    __privateSet(this, _transport2, apiTransport);
+    __privateSet(this, _listener, this.transport.onNotification(
+      __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+    ));
+    yield this.storage.setTransport("mwp" /* MWP */);
+  });
+};
+onBeforeUnload_fn = function() {
+  return __async(this, null, function* () {
+    var _a2;
+    if ((_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.isMounted) {
+      yield this.storage.removeTransport();
+    }
+  });
+};
+createBeforeUnloadListener_fn = function() {
+  if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
+    window.addEventListener("beforeunload", __privateMethod(this, _MultichainSDK_instances, onBeforeUnload_fn).bind(this));
+  }
+  return () => {
+    if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined") {
+      window.removeEventListener(
+        "beforeunload",
+        __privateMethod(this, _MultichainSDK_instances, onBeforeUnload_fn).bind(this)
+      );
+    }
+  };
+};
+renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds) {
+  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: {
+                    dapp: this.options.dapp,
+                    sdk: {
+                      version: getVersion(),
+                      platform: getPlatformType()
+                    }
+                  }
+                });
+              }
+            );
+            (() => __async(this, null, function* () {
+              var _a2;
+              try {
+                yield this.transport.connect({ scopes, caipAccountIds });
+                yield this.options.ui.factory.unload();
+                (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
+                this.state = "connected";
+                yield this.storage.setTransport("mwp" /* MWP */);
+              } catch (error) {
+                if (error instanceof import_mobile_wallet_protocol_core2.ProtocolError) {
+                  if (error.code !== import_mobile_wallet_protocol_core2.ErrorCode.REQUEST_EXPIRED) {
+                    this.state = "disconnected";
+                    reject(error);
+                  }
+                } else {
+                  this.state = "disconnected";
+                  reject(
+                    error instanceof Error ? error : new Error(String(error))
+                  );
+                }
+              }
+            }))().catch(() => {
+            });
+          });
+        }),
+        (error) => __async(this, null, function* () {
+          if (error) {
+            yield this.storage.removeTransport();
+            reject(error);
+          } else {
+            yield this.storage.setTransport("mwp" /* MWP */);
+            resolve();
+          }
+        })
+      ).catch((error) => {
+        reject(error instanceof Error ? error : new Error(String(error)));
+      });
+    });
+  });
+};
+showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds) {
+  return __async(this, null, function* () {
+    var _a2;
+    (_a2 = __privateGet(this, _beforeUnloadListener)) != null ? _a2 : __privateSet(this, _beforeUnloadListener, __privateMethod(this, _MultichainSDK_instances, createBeforeUnloadListener_fn).call(this));
+    yield __privateMethod(this, _MultichainSDK_instances, renderInstallModalAsync_fn).call(this, desktopPreferred, scopes, caipAccountIds);
+  });
+};
+setupDefaultTransport_fn = function() {
+  return __async(this, null, function* () {
+    this.state = "connecting";
+    yield this.storage.setTransport("browser" /* Browser */);
+    const transport = new DefaultTransport();
+    __privateSet(this, _listener, transport.onNotification(
+      __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+    ));
+    __privateSet(this, _transport2, transport);
+    return transport;
+  });
+};
+deeplinkConnect_fn = function(scopes, caipAccountIds) {
+  return __async(this, null, function* () {
+    return new Promise((resolve, reject) => {
+      const dappClientMessageHandler = (payload) => {
+        var _a2;
+        if (typeof payload !== "object" || payload === null || !("data" in payload)) {
+          return;
+        }
+        const data = payload.data;
+        if (typeof data === "object" && data !== null) {
+          if (data.error) {
+            this.dappClient.off("message", dappClientMessageHandler);
+            reject(data.error);
+          }
+          if ((_a2 = data == null ? void 0 : data.result) == null ? void 0 : _a2.sessionScopes) {
+            this.dappClient.off("message", dappClientMessageHandler);
+          }
+        }
+      };
+      this.dappClient.on("message", dappClientMessageHandler);
+      let timeout;
+      if (this.transport.isConnected()) {
+        timeout = setTimeout(() => {
+          this.openDeeplinkIfNeeded();
+        }, 250);
+      } else {
+        this.dappClient.once(
+          "session_request",
+          (sessionRequest) => {
+            var _a2;
+            const connectionRequest = {
+              sessionRequest,
+              metadata: {
+                dapp: this.options.dapp,
+                sdk: { version: getVersion(), platform: getPlatformType() }
+              }
+            };
+            const deeplink = this.options.ui.factory.createConnectionDeeplink(
+              connectionRequest
+            );
+            const universalLink = this.options.ui.factory.createConnectionUniversalLink(
+              connectionRequest
+            );
+            if ((_a2 = this.options.mobile) == null ? void 0 : _a2.preferredOpenLink) {
+              this.options.mobile.preferredOpenLink(deeplink, "_self");
+            } else {
+              openDeeplink(this.options, deeplink, universalLink);
+            }
+          }
+        );
+      }
+      return this.transport.connect({ scopes, caipAccountIds }).then(resolve).catch((error) => __async(this, null, function* () {
+        yield this.storage.removeTransport();
+        this.dappClient.off("message", dappClientMessageHandler);
+        reject(error instanceof Error ? error : new Error(String(error)));
+      })).finally(() => {
+        if (timeout) {
+          clearTimeout(timeout);
+        }
+      });
+    });
+  });
+};
+handleConnection_fn = function(promise, scopes, transportType) {
+  return __async(this, null, function* () {
+    this.state = "connecting";
+    return promise.then(() => __async(this, null, function* () {
+      this.state = "connected";
+      try {
+        const baseProps = yield getBaseAnalyticsProperties(
+          this.options,
+          this.storage
+        );
+        import_analytics4.analytics.track("mmconnect_connection_established", __spreadProps(__spreadValues({}, baseProps), {
+          transport_type: transportType,
+          user_permissioned_chains: scopes
+        }));
+      } catch (error) {
+        logger2("Error tracking connection_established event", error);
+      }
+      return void 0;
+    })).catch((error) => __async(this, null, function* () {
+      this.state = "disconnected";
+      try {
+        const baseProps = yield getBaseAnalyticsProperties(
+          this.options,
+          this.storage
+        );
+        const isRejection = isRejectionError(error);
+        if (isRejection) {
+          import_analytics4.analytics.track("mmconnect_connection_rejected", __spreadProps(__spreadValues({}, baseProps), {
+            transport_type: transportType
+          }));
+        } else {
+          import_analytics4.analytics.track("mmconnect_connection_failed", __spreadProps(__spreadValues({}, baseProps), {
+            transport_type: transportType
+          }));
+        }
+      } catch (e) {
+        logger2("Error tracking connection failed/rejected event", error);
+      }
+      throw error;
+    }));
+  });
 };
+var MultichainSDK = _MultichainSDK;
 
 // src/store/index.ts
 var uuid = __toESM(require("uuid"));
@@ -2889,37 +2896,24 @@ var Store = class extends StoreClient {
 // src/ui/index.ts
 var import_onboarding = __toESM(require("@metamask/onboarding"));
 init_domain();
-init_qr();
 init_utils();
-var __instance;
+
+// src/ui/preload.web.ts
 function preload() {
   return __async(this, null, function* () {
-    if (false) {
-      __instance != null ? __instance : __instance = yield null.then((loader) => __async(null, null, function* () {
-        if (typeof (loader == null ? void 0 : loader.defineCustomElements) === "function") {
-          loader.defineCustomElements();
-        }
-        return Promise.resolve(loader);
-      })).catch((error) => __async(null, null, function* () {
-        console.error(`Gracefully Failed to load modal customElements:`, error);
-        return Promise.resolve(void 0);
-      }));
-    } else {
-      const dynamicImport = (0, eval)("import");
-      __instance != null ? __instance : __instance = yield dynamicImport(
-        "@metamask/multichain-ui/dist/loader/index.js"
-      ).then((loader) => __async(null, null, function* () {
-        if (typeof (loader == null ? void 0 : loader.defineCustomElements) === "function") {
-          loader.defineCustomElements();
-        }
-        return Promise.resolve(loader);
-      })).catch((error) => __async(null, null, function* () {
-        console.error(`Gracefully Failed to load modal customElements:`, error);
-        return Promise.resolve(void 0);
-      }));
+    if (typeof document === "undefined") {
+      return;
+    }
+    try {
+      const { defineCustomElements } = yield import("@metamask/multichain-ui/loader");
+      yield defineCustomElements();
+    } catch (error) {
+      console.error("Failed to load customElements:", error);
     }
   });
 }
+
+// src/ui/index.ts
 var ModalFactory = class {
   /**
    * Creates a new modal factory instance.
@@ -2942,8 +2936,8 @@ var ModalFactory = class {
   }
   unload(error) {
     return __async(this, null, function* () {
-      var _a, _b;
-      (_a = this.modal) == null ? void 0 : _a.unmount();
+      var _a2, _b;
+      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
       yield (_b = this.successCallback) == null ? void 0 : _b.call(this, error);
     });
   }
@@ -2981,16 +2975,16 @@ var ModalFactory = class {
     }
     return container;
   }
-  createDeeplink(connectionRequest) {
+  createConnectionDeeplink(connectionRequest) {
     if (!connectionRequest) {
-      throw new Error("createDeeplink can only be called with a connection request");
+      throw new Error("createConnectionDeeplink can only be called with a connection request");
     }
     const json = JSON.stringify(connectionRequest);
     const compressed = compressString(json);
     const urlEncoded = encodeURIComponent(compressed);
     return `${METAMASK_DEEPLINK_BASE}/mwp?p=${urlEncoded}&c=1`;
   }
-  createUniversalLink(connectionRequest) {
+  createConnectionUniversalLink(connectionRequest) {
     if (!connectionRequest) {
       return `${METAMASK_CONNECT_BASE_URL}`;
     }
@@ -3011,13 +3005,13 @@ var ModalFactory = class {
   }
   renderInstallModal(showInstallModal, createConnectionRequest, successCallback) {
     return __async(this, null, function* () {
-      var _a;
-      (_a = this.modal) == null ? void 0 : _a.unmount();
-      yield Promise.all([preload(), preloadQR()]);
+      var _a2;
+      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
+      yield preload();
       this.successCallback = successCallback;
       const parentElement = this.getMountedContainer();
       const connectionRequest = yield createConnectionRequest();
-      const qrCodeLink = this.createDeeplink(connectionRequest);
+      const qrCodeLink = this.createConnectionDeeplink(connectionRequest);
       const modal = new this.options.InstallModal({
         expiresIn: (connectionRequest.sessionRequest.expiresAt - Date.now()) / 1e3,
         connectionRequest,
@@ -3026,7 +3020,7 @@ var ModalFactory = class {
         link: qrCodeLink,
         sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
-          return this.createDeeplink(request);
+          return this.createConnectionDeeplink(request);
         }),
         onClose: this.onCloseModal.bind(this),
         startDesktopOnboarding: this.onStartDesktopOnboarding.bind(this),
@@ -3038,9 +3032,9 @@ var ModalFactory = class {
   }
   renderOTPCodeModal(createOTPCode, successCallback, updateOTPCode) {
     return __async(this, null, function* () {
-      var _a;
-      (_a = this.modal) == null ? void 0 : _a.unmount();
-      yield Promise.all([preload(), preloadQR()]);
+      var _a2;
+      (_a2 = this.modal) == null ? void 0 : _a2.unmount();
+      yield preload();
       this.successCallback = successCallback;
       const container = this.getMountedContainer();
       const otpCode = yield createOTPCode();