@metamask/connect-multichain 0.7.0 → 0.9.0

package/dist/browser/umd/connect-multichain.d.ts

@@ -386,6 +386,14 @@ type ConnectionRequest = {
         };
     };
 };
+/**
+ * Package versions keyed by connect package name.
+ * connect-multichain is always present; chain-specific packages
+ * appear only when their client is instantiated.
+ */
+type ConnectVersions = {
+    'connect-multichain': string;
+} & Partial<Record<'connect-evm' | 'connect-solana', string>>;
 /**
  * Constructor options for creating a Multichain SDK instance.
  *
@@ -431,6 +439,8 @@ type MultichainOptions = {
     };
     /** Enable debug logging */
     debug?: boolean;
+    /** Package versions contributed by chain-specific clients (merged on each createMultichainClient call) */
+    versions?: Partial<ConnectVersions>;
 };
 type MultiChainFNOptions = Omit<MultichainOptions, 'storage' | 'ui'> & {
     ui?: Omit<MultichainOptions['ui'], 'factory'>;
@@ -441,11 +451,12 @@ type MultiChainFNOptions = Omit<MultichainOptions, 'storage' | 'ui'> & {
  * Options that can be merged/overwritten when createMultichainClient is called
  * with an existing singleton.
  */
-type MergeableMultichainOptions = Omit<MultichainOptions, 'dapp' | 'analytics' | 'storage' | 'api' | 'ui' | 'transport'> & {
+type MergeableMultichainOptions = Omit<MultichainOptions, 'dapp' | 'analytics' | 'storage' | 'api' | 'ui' | 'transport' | 'versions'> & {
     api?: MultichainOptions['api'];
     ui?: Pick<MultichainOptions['ui'], 'headless' | 'preferExtension' | 'showInstallModal'>;
     transport?: Pick<NonNullable<MultichainOptions['transport']>, 'extensionId'>;
     debug?: boolean;
+    versions?: Partial<ConnectVersions>;
 };
 /**
  * Complete options for Multichain SDK configuration.
@@ -455,6 +466,7 @@ type MergeableMultichainOptions = Omit<MultichainOptions, 'dapp' | 'analytics' |
  */
 type CreateMultichainFN = (options: MultiChainFNOptions) => Promise<MultichainCore>;
 type ExtendedTransport = Omit<Transport, 'connect'> & {
+    init: () => Promise<void>;
     connect: (props?: {
         scopes: Scope[];
         caipAccountIds: CaipAccountId[];
@@ -518,7 +530,7 @@ declare abstract class MultichainCore extends EventEmitter<SDKEvents> {
     constructor(options: MultichainOptions);
     /**
      * Merges the given options into the current instance options.
-     * Only the mergeable keys are updated (api.supportedNetworks, ui.*, mobile.*, transport.extensionId, debug).
+     * Only the mergeable keys are updated (api.supportedNetworks, versions, ui.*, mobile.*, transport.extensionId, debug).
      * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
      * subsequent calls to `createMultichainClient` to have a different `dapp` value.
      * Used when createMultichainClient is called with an existing singleton.
@@ -657,15 +669,17 @@ declare function isRejectionError(error: unknown): boolean;
  * @param options - Multichain options containing dapp and analytics config
  * @param storage - Storage client for getting anonymous ID
  * @param invokeOptions - The invoke method options containing method and scope
+ * @param transportType - The transport type to use for the analytics event
  * @returns Wallet action analytics properties
  */
-declare function getWalletActionAnalyticsProperties(options: MultichainOptions, storage: StoreClient, invokeOptions: InvokeMethodOptions): Promise<{
-    mmconnect_version: string;
+declare function getWalletActionAnalyticsProperties(options: MultichainOptions, storage: StoreClient, invokeOptions: InvokeMethodOptions, transportType: TransportType): Promise<{
+    mmconnect_versions: Record<string, string>;
     dapp_id: string;
     method: string;
     integration_type: string;
     caip_chain_id: string;
     anon_id: string;
+    transport_type: TransportType;
 }>;
 
 /**
@@ -677,4 +691,4 @@ declare function getVersion(): string;
 
 declare const createMultichainClient: CreateMultichainFN;
 
-export { type ConnectionRequest, type ConnectionStatus, type CreateMultichainFN, type DappSettings, type DataType, type DomainErrorCodes, type Enumerate, type ErrorCodeRange, type ErrorCodes, EventEmitter, type EventTypes, type ExtendedTransport, type InstallWidgetProps, type InvokeMethodOptions, type LoggerNameSpaces, type MergeableMultichainOptions, Modal, type ModalFactoryConnectOptions, type ModalFactoryOptions, MultichainCore, type MultichainOptions, type NotificationCallback, type OTPCode, type OTPCodeWidgetProps, PlatformType, type QRLink, type RPCAPI, type RPCErrorCodes, RPCHttpErr, RPCInvokeMethodErr, RPCReadonlyRequestErr, RPCReadonlyResponseErr, type RPCResponse, RPC_HANDLED_METHODS, type RpcMethod, type RpcUrlsMap, type SDKEvents, SDK_HANDLED_METHODS, type Scope, type StorageErrorCodes, StoreAdapter, StoreClient, type StoreOptions, TransportType, createLogger, createMultichainClient, enableDebug, getInfuraRpcUrls, getPlatformType, getTransportType, getVersion, getWalletActionAnalyticsProperties, hasExtension, infuraRpcUrls, isEnabled, isMetamaskExtensionInstalled, isRejectionError, isSecure };
+export { type ConnectVersions, type ConnectionRequest, type ConnectionStatus, type CreateMultichainFN, type DappSettings, type DataType, type DomainErrorCodes, type Enumerate, type ErrorCodeRange, type ErrorCodes, EventEmitter, type EventTypes, type ExtendedTransport, type InstallWidgetProps, type InvokeMethodOptions, type LoggerNameSpaces, type MergeableMultichainOptions, Modal, type ModalFactoryConnectOptions, type ModalFactoryOptions, MultichainCore, type MultichainOptions, type NotificationCallback, type OTPCode, type OTPCodeWidgetProps, PlatformType, type QRLink, type RPCAPI, type RPCErrorCodes, RPCHttpErr, RPCInvokeMethodErr, RPCReadonlyRequestErr, RPCReadonlyResponseErr, type RPCResponse, RPC_HANDLED_METHODS, type RpcMethod, type RpcUrlsMap, type SDKEvents, SDK_HANDLED_METHODS, type Scope, type StorageErrorCodes, StoreAdapter, StoreClient, type StoreOptions, TransportType, createLogger, createMultichainClient, enableDebug, getInfuraRpcUrls, getPlatformType, getTransportType, getVersion, getWalletActionAnalyticsProperties, hasExtension, infuraRpcUrls, isEnabled, isMetamaskExtensionInstalled, isRejectionError, isSecure };

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

@@ -422,7 +422,7 @@ var init_multichain = __esm({
       }
       /**
        * Merges the given options into the current instance options.
-       * Only the mergeable keys are updated (api.supportedNetworks, ui.*, mobile.*, transport.extensionId, debug).
+       * Only the mergeable keys are updated (api.supportedNetworks, versions, ui.*, mobile.*, transport.extensionId, debug).
        * The main thing to note is that the value for `dapp` is not merged as it does not make sense for
        * subsequent calls to `createMultichainClient` to have a different `dapp` value.
        * Used when createMultichainClient is called with an existing singleton.
@@ -430,22 +430,23 @@ var init_multichain = __esm({
        * @param partial - Options to merge/overwrite onto the current instance
        */
       mergeOptions(partial) {
-        var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
         const opts = this.options;
         this.options = __spreadProps(__spreadValues({}, opts), {
           api: __spreadProps(__spreadValues({}, opts.api), {
             supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a3 = partial.api) == null ? void 0 : _a3.supportedNetworks) != null ? _b : {})
           }),
+          versions: __spreadValues(__spreadValues({}, opts.versions), (_c = partial.versions) != null ? _c : {}),
           ui: __spreadProps(__spreadValues({}, opts.ui), {
-            headless: (_d = (_c = partial.ui) == null ? void 0 : _c.headless) != null ? _d : opts.ui.headless,
-            preferExtension: (_f = (_e = partial.ui) == null ? void 0 : _e.preferExtension) != null ? _f : opts.ui.preferExtension,
-            showInstallModal: (_h = (_g = partial.ui) == null ? void 0 : _g.showInstallModal) != null ? _h : opts.ui.showInstallModal
+            headless: (_e = (_d = partial.ui) == null ? void 0 : _d.headless) != null ? _e : opts.ui.headless,
+            preferExtension: (_g = (_f = partial.ui) == null ? void 0 : _f.preferExtension) != null ? _g : opts.ui.preferExtension,
+            showInstallModal: (_i = (_h = partial.ui) == null ? void 0 : _h.showInstallModal) != null ? _i : opts.ui.showInstallModal
           }),
-          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_i = partial.mobile) != null ? _i : {}),
-          transport: __spreadProps(__spreadValues({}, (_j = opts.transport) != null ? _j : {}), {
-            extensionId: (_m = (_k = partial.transport) == null ? void 0 : _k.extensionId) != null ? _m : (_l = opts.transport) == null ? void 0 : _l.extensionId
+          mobile: __spreadValues(__spreadValues({}, opts.mobile), (_j = partial.mobile) != null ? _j : {}),
+          transport: __spreadProps(__spreadValues({}, (_k = opts.transport) != null ? _k : {}), {
+            extensionId: (_n = (_l = partial.transport) == null ? void 0 : _l.extensionId) != null ? _n : (_m = opts.transport) == null ? void 0 : _m.extensionId
           }),
-          debug: (_n = partial.debug) != null ? _n : opts.debug
+          debug: (_o = partial.debug) != null ? _o : opts.debug
         });
       }
     };
@@ -647,14 +648,13 @@ function isRejectionError(error) {
 }
 function getBaseAnalyticsProperties(options, storage) {
   return __async(this, null, function* () {
-    var _a3, _b;
-    const version = getVersion();
+    var _a3, _b, _c;
     const dappId = getDappId(options.dapp);
     const platform = getPlatformType();
     const anonId = yield storage.getAnonId();
     const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "unknown" /* UNKNOWN */;
     return {
-      mmconnect_version: version,
+      mmconnect_versions: (_c = options.versions) != null ? _c : {},
       dapp_id: dappId,
       platform,
       integration_type: integrationType,
@@ -662,20 +662,20 @@ function getBaseAnalyticsProperties(options, storage) {
     };
   });
 }
-function getWalletActionAnalyticsProperties(options, storage, invokeOptions) {
+function getWalletActionAnalyticsProperties(options, storage, invokeOptions, transportType) {
   return __async(this, null, function* () {
-    var _a3, _b;
-    const version = getVersion();
+    var _a3, _b, _c;
     const dappId = getDappId(options.dapp);
     const anonId = yield storage.getAnonId();
     const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "unknown";
     return {
-      mmconnect_version: version,
+      mmconnect_versions: (_c = options.versions) != null ? _c : {},
       dapp_id: dappId,
       method: invokeOptions.request.method,
       integration_type: integrationType,
       caip_chain_id: invokeOptions.scope,
-      anon_id: anonId
+      anon_id: anonId,
+      transport_type: transportType
     };
   });
 }
@@ -1111,7 +1111,6 @@ var init_install = __esm({
           "mm-install-modal"
         );
         modal.showInstallModal = options.showInstallModal;
-        modal.sdkVersion = options.sdkVersion;
         modal.addEventListener("close", (ev) => {
           const { detail } = ev;
           options.onClose(detail == null ? void 0 : detail.shouldTerminate);
@@ -1464,10 +1463,11 @@ init_utils2();
 init_analytics();
 var _RequestRouter_instances, withAnalyticsTracking_fn, trackWalletActionRequested_fn, trackWalletActionSucceeded_fn, trackWalletActionFailed_fn, trackWalletActionRejected_fn;
 var RequestRouter = class {
-  constructor(transport, rpcClient, config) {
+  constructor(transport, rpcClient, config, transportType) {
     this.transport = transport;
     this.rpcClient = rpcClient;
     this.config = config;
+    this.transportType = transportType;
     __privateAdd(this, _RequestRouter_instances);
   }
   /**
@@ -1537,16 +1537,14 @@ var RequestRouter = class {
    */
   handleWithRpcNode(options) {
     return __async(this, null, function* () {
-      return __privateMethod(this, _RequestRouter_instances, withAnalyticsTracking_fn).call(this, options, () => __async(this, null, function* () {
-        try {
-          return yield this.rpcClient.request(options);
-        } catch (error) {
-          if (error instanceof MissingRpcEndpointErr) {
-            return this.handleWithWallet(options);
-          }
-          throw error;
+      try {
+        return yield this.rpcClient.request(options);
+      } catch (error) {
+        if (error instanceof MissingRpcEndpointErr) {
+          return this.handleWithWallet(options);
         }
-      }));
+        throw error;
+      }
     });
   }
   /**
@@ -1590,7 +1588,8 @@ trackWalletActionRequested_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_requested", props);
   });
@@ -1600,7 +1599,8 @@ trackWalletActionSucceeded_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_succeeded", props);
   });
@@ -1610,7 +1610,8 @@ trackWalletActionFailed_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_failed", props);
   });
@@ -1620,7 +1621,8 @@ trackWalletActionRejected_fn = function(options) {
     const props = yield getWalletActionAnalyticsProperties(
       this.config,
       this.config.storage,
-      options
+      options,
+      this.transportType
     );
     import_analytics2.analytics.track("mmconnect_wallet_action_rejected", props);
   });
@@ -1630,7 +1632,7 @@ trackWalletActionRejected_fn = function(options) {
 var import_multichain_api_client = require("@metamask/multichain-api-client");
 init_utils2();
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn;
+var _notificationCallbacks, _transport, _defaultRequestOptions, _pendingRequests, _handleResponseListener, _handleNotificationListener, _DefaultTransport_instances, notifyCallbacks_fn, isMetamaskProviderEvent_fn, handleResponse_fn, handleNotification_fn, setupMessageListener_fn, init_fn;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1678,11 +1680,31 @@ var DefaultTransport = class {
       });
     });
   }
+  init() {
+    return __async(this, null, function* () {
+      yield __privateMethod(this, _DefaultTransport_instances, init_fn).call(this);
+      let walletSession = { sessionScopes: {} };
+      try {
+        const sessionRequest = yield this.request(
+          { method: "wallet_getSession" },
+          __privateGet(this, _defaultRequestOptions)
+        );
+        walletSession = sessionRequest.result;
+      } catch (e) {
+        console.error(
+          "Failed to get wallet session during DefaultTransport init"
+        );
+      }
+      __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, {
+        method: "wallet_sessionChanged",
+        params: walletSession
+      });
+    });
+  }
   connect(options) {
     return __async(this, null, function* () {
       var _a3, _b, _c, _d, _e;
-      __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
-      yield __privateGet(this, _transport).connect();
+      yield __privateMethod(this, _DefaultTransport_instances, init_fn).call(this);
       const sessionRequest = yield this.request(
         { method: "wallet_getSession" },
         __privateGet(this, _defaultRequestOptions)
@@ -1739,26 +1761,6 @@ var DefaultTransport = class {
   disconnect() {
     return __async(this, arguments, function* (scopes = []) {
       yield this.request({ method: "wallet_revokeSession", params: { scopes } });
-      const response = yield this.request({ method: "wallet_getSession" });
-      const { sessionScopes } = response.result;
-      if (Object.keys(sessionScopes).length > 0) {
-        return;
-      }
-      __privateGet(this, _notificationCallbacks).clear();
-      if (__privateGet(this, _handleResponseListener)) {
-        window.removeEventListener("message", __privateGet(this, _handleResponseListener));
-        __privateSet(this, _handleResponseListener, void 0);
-      }
-      if (__privateGet(this, _handleNotificationListener)) {
-        window.removeEventListener("message", __privateGet(this, _handleNotificationListener));
-        __privateSet(this, _handleNotificationListener, void 0);
-      }
-      for (const [, request] of __privateGet(this, _pendingRequests)) {
-        clearTimeout(request.timeout);
-        request.reject(new Error("Transport disconnected"));
-      }
-      __privateGet(this, _pendingRequests).clear();
-      yield __privateGet(this, _transport).disconnect();
     });
   }
   isConnected() {
@@ -1847,7 +1849,7 @@ handleNotification_fn = function(event) {
     return;
   }
   const responseData = (_b = (_a3 = event == null ? void 0 : event.data) == null ? void 0 : _a3.data) == null ? void 0 : _b.data;
-  if (typeof responseData === "object" && responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged") {
+  if (typeof responseData === "object" && responseData !== null && (responseData.method === "metamask_chainChanged" || responseData.method === "metamask_accountsChanged")) {
     __privateMethod(this, _DefaultTransport_instances, notifyCallbacks_fn).call(this, responseData);
   }
 };
@@ -1860,6 +1862,14 @@ setupMessageListener_fn = function() {
   window.addEventListener("message", __privateGet(this, _handleResponseListener));
   window.addEventListener("message", __privateGet(this, _handleNotificationListener));
 };
+init_fn = function() {
+  return __async(this, null, function* () {
+    __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
+    if (!__privateGet(this, _transport).isConnected()) {
+      yield __privateGet(this, _transport).connect();
+    }
+  });
+};
 
 // src/multichain/transports/multichainApiClientWrapper/index.ts
 var import_rpc_errors = require("@metamask/rpc-errors");
@@ -2257,6 +2267,10 @@ var MWPTransport = class {
       }
     });
   }
+  init() {
+    return __async(this, null, function* () {
+    });
+  }
   // TODO: Rename this
   sendEip1193Message(payload, options) {
     return __async(this, null, function* () {
@@ -2609,7 +2623,7 @@ var MWPTransport = class {
   getActiveSession() {
     return __async(this, null, function* () {
       const { kvstore } = this;
-      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
+      const sessionStore = yield import_mobile_wallet_protocol_core.SessionStore.create(kvstore);
       try {
         const [activeSession] = yield sessionStore.list();
         return activeSession;
@@ -2683,6 +2697,9 @@ var KeyManager = class {
       return Buffer.from(decryptedBuffer).toString("utf8");
     });
   }
+  validatePeerKey(key) {
+    import_eciesjs.PublicKey.fromHex(Buffer.from(key).toString("hex"));
+  }
 };
 var keymanager = new KeyManager();
 
@@ -2690,10 +2707,10 @@ var keymanager = new KeyManager();
 init_utils2();
 var logger2 = createLogger("metamask-sdk:core");
 var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
-var _a2, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_fn, init_fn, 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 _a2, _provider, _providerTransportWrapper, _transport2, _dappClient, _beforeUnloadListener, _listener, _sdkInfo, _MetaMaskConnectMultichain_instances, setupAnalytics_fn, onTransportNotification_fn, getStoredTransport_fn, setupTransport_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 _a3, _b, _c, _d, _e, _f;
+    var _a3, _b, _c, _d, _e, _f, _g;
     const withDappMetadata = setupDappMetadata(options);
     const integrationType = (_b = (_a3 = options.analytics) == null ? void 0 : _a3.integrationType) != null ? _b : "direct";
     const allOptions = __spreadProps(__spreadValues({}, withDappMetadata), {
@@ -2704,7 +2721,10 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }),
       analytics: __spreadProps(__spreadValues({}, (_f = options.analytics) != null ? _f : {}), {
         integrationType
-      })
+      }),
+      versions: __spreadValues({
+        "connect-multichain": "0.9.0"
+      }, (_g = options.versions) != null ? _g : {})
     });
     super(allOptions);
     __privateAdd(this, _MetaMaskConnectMultichain_instances);
@@ -2728,6 +2748,9 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   }
   set status(value) {
     var _a3, _b;
+    if (this._status === value) {
+      return;
+    }
     this._status = value;
     (_b = (_a3 = this.options.transport) == null ? void 0 : _a3.onNotification) == null ? void 0 : _b.call(_a3, {
       method: "stateChanged",
@@ -2758,23 +2781,28 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   // 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`,
-  // `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note that the
-  // value for `dapp` is not merged as it does not make sense for subsequent calls to
-  // `createMultichainClient` to have a different `dapp` value.
+  // `versions`, `ui.*`, `mobile.*`, `transport.extensionId`, `debug`. Take note
+  // that the value for `dapp` is not merged as it does not make sense for
+  // subsequent calls to `createMultichainClient` to have a different `dapp` value.
   static create(options) {
     return __async(this, null, function* () {
+      var _a3;
       const globalObject = getGlobalObject();
       const existing = globalObject[SINGLETON_KEY];
       if (existing) {
         const instance = yield existing;
         instance.mergeOptions(options);
+        import_analytics4.analytics.setGlobalProperty(
+          "mmconnect_versions",
+          (_a3 = instance.options.versions) != null ? _a3 : {}
+        );
         if (options.debug) {
           enableDebug("metamask-sdk:*");
         }
         return instance;
       }
       const instancePromise = (() => __async(null, null, function* () {
-        var _a3;
+        var _a4;
         const instance = new _MetaMaskConnectMultichain(options);
         const isEnabled2 = yield isEnabled(
           "metamask-sdk:core",
@@ -2783,7 +2811,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
         if (isEnabled2) {
           enableDebug("metamask-sdk:core");
         }
-        yield __privateMethod(_a3 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a3);
+        yield __privateMethod(_a4 = instance, _MetaMaskConnectMultichain_instances, init_fn2).call(_a4);
         return instance;
       }))();
       globalObject[SINGLETON_KEY] = instancePromise;
@@ -2893,14 +2921,16 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       );
       yield (_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.disconnect(scopes);
       if (remainingScopes.length === 0) {
-        yield (_b = __privateGet(this, _listener)) == null ? void 0 : _b.call(this);
-        (_c = __privateGet(this, _beforeUnloadListener)) == null ? void 0 : _c.call(this);
         yield this.storage.removeTransport();
-        __privateSet(this, _listener, void 0);
-        __privateSet(this, _beforeUnloadListener, void 0);
-        __privateSet(this, _transport2, void 0);
-        __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
-        __privateSet(this, _dappClient, void 0);
+        if (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);
+          __privateSet(this, _listener, void 0);
+          __privateSet(this, _beforeUnloadListener, void 0);
+          __privateSet(this, _transport2, void 0);
+          __privateGet(this, _providerTransportWrapper).clearTransportNotificationListener();
+          __privateSet(this, _dappClient, void 0);
+        }
         this.status = "disconnected";
       }
     });
@@ -2909,7 +2939,12 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     return __async(this, null, function* () {
       const { transport, options } = this;
       const rpcClient = new RpcClient(options, __privateGet(this, _sdkInfo));
-      const requestRouter = new RequestRouter(transport, rpcClient, options);
+      const requestRouter = new RequestRouter(
+        transport,
+        rpcClient,
+        options,
+        this.transportType
+      );
       return requestRouter.invokeMethod(request);
     });
   }
@@ -2939,16 +2974,16 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   // without having to concern themselves with the current transport connection status.
   emitSessionChanged() {
     return __async(this, null, function* () {
-      var _a3;
+      var _a3, _b;
       const emptySession = { sessionScopes: {} };
-      if (this.status !== "connected" && this.status !== "connecting") {
+      if (!((_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.isConnected())) {
         this.emit("wallet_sessionChanged", emptySession);
         return;
       }
       const response = yield this.transport.request({
         method: "wallet_getSession"
       });
-      this.emit("wallet_sessionChanged", (_a3 = response.result) != null ? _a3 : emptySession);
+      this.emit("wallet_sessionChanged", (_b = response.result) != null ? _b : emptySession);
     });
   }
 };
@@ -2962,20 +2997,22 @@ _sdkInfo = new WeakMap();
 _MetaMaskConnectMultichain_instances = new WeakSet();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
-    var _a3;
+    var _a3, _b;
     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 } = (_a3 = this.options.analytics) != null ? _a3 : {
       integrationType: ""
     };
-    import_analytics4.analytics.setGlobalProperty("mmconnect_version", version);
+    import_analytics4.analytics.setGlobalProperty(
+      "mmconnect_versions",
+      (_b = this.options.versions) != null ? _b : {}
+    );
     import_analytics4.analytics.setGlobalProperty("dapp_id", dappId);
     import_analytics4.analytics.setGlobalProperty("anon_id", anonId);
     import_analytics4.analytics.setGlobalProperty("platform", platform);
@@ -2985,9 +3022,17 @@ setupAnalytics_fn = function() {
 };
 onTransportNotification_fn = function(payload) {
   return __async(this, null, function* () {
-    var _a3;
+    var _a3, _b, _c;
     if (typeof payload === "object" && payload !== null && "method" in payload) {
-      this.emit(payload.method, (_a3 = payload.params) != null ? _a3 : payload.result);
+      if (payload.method === "wallet_sessionChanged") {
+        const sessionScopes = (_b = (_a3 = payload.params) == null ? void 0 : _a3.sessionScopes) != null ? _b : {};
+        const hasScopes = Object.keys(sessionScopes).length > 0;
+        if (this.status === "loaded" && !hasScopes) {
+          return;
+        }
+        this.status = hasScopes ? "connected" : "disconnected";
+      }
+      this.emit(payload.method, (_c = payload.params) != null ? _c : payload.result);
     }
   });
 };
@@ -3025,6 +3070,7 @@ getStoredTransport_fn = function() {
 };
 setupTransport_fn = function() {
   return __async(this, null, function* () {
+    var _a3;
     const transport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getStoredTransport_fn).call(this);
     if (transport) {
       if (!this.transport.isConnected()) {
@@ -3039,23 +3085,24 @@ setupTransport_fn = function() {
       }
     } else {
       this.status = "loaded";
+      const hasExtensionInstalled = yield hasExtension();
+      const preferExtension = (_a3 = this.options.ui.preferExtension) != null ? _a3 : true;
+      if (hasExtensionInstalled && preferExtension) {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this, { persist: false });
+        try {
+          yield this.transport.init();
+        } catch (error) {
+          console.error("Passive init failed:", error);
+        }
+      }
     }
   });
 };
-init_fn = function() {
+init_fn2 = function() {
   return __async(this, null, function* () {
     try {
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupAnalytics_fn).call(this);
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupTransport_fn).call(this);
-      try {
-        const baseProps = yield getBaseAnalyticsProperties(
-          this.options,
-          this.storage
-        );
-        import_analytics4.analytics.track("mmconnect_initialized", baseProps);
-      } catch (error) {
-        logger2("Error tracking initialized event", error);
-      }
     } catch (error) {
       yield this.storage.removeTransport();
       this.status = "pending";
@@ -3066,7 +3113,7 @@ init_fn = function() {
 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 sessionstore = yield import_mobile_wallet_protocol_core2.SessionStore.create(kvstore);
     const websocket = (
       // eslint-disable-next-line no-negated-condition
       typeof window !== "undefined" ? WebSocket : (yield import("ws")).WebSocket
@@ -3243,9 +3290,13 @@ headlessConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   });
 };
 setupDefaultTransport_fn = function() {
-  return __async(this, null, function* () {
-    this.status = "connecting";
-    yield this.storage.setTransport("browser" /* Browser */);
+  return __async(this, arguments, function* (options = { persist: true }) {
+    if (__privateGet(this, _transport2) instanceof DefaultTransport) {
+      return __privateGet(this, _transport2);
+    }
+    if (options == null ? void 0 : options.persist) {
+      yield this.storage.setTransport("browser" /* Browser */);
+    }
     const transport = new DefaultTransport();
     __privateSet(this, _listener, transport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
@@ -3363,16 +3414,20 @@ handleConnection_fn = function(promise, scopes, transportType) {
 };
 getCaipSession_fn = function() {
   return __async(this, null, function* () {
+    var _a3;
     let sessionData = {
       sessionScopes: {},
       sessionProperties: {}
     };
-    if (this.status === "connected") {
-      const response = yield this.transport.request({
-        method: "wallet_getSession"
-      });
-      if (response.result) {
-        sessionData = response.result;
+    if ((_a3 = __privateGet(this, _transport2)) == null ? void 0 : _a3.isConnected()) {
+      try {
+        const response = yield this.transport.request({
+          method: "wallet_getSession"
+        });
+        if (response.result) {
+          sessionData = response.result;
+        }
+      } catch (e) {
       }
     }
     return sessionData;
@@ -3701,7 +3756,6 @@ var BaseModalFactory = class {
         parentElement,
         showInstallModal,
         link: qrCodeLink,
-        sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
           var _a4;
           const newLink = this.createConnectionDeeplink(request);
@@ -3727,7 +3781,6 @@ var BaseModalFactory = class {
       const otpCode = yield createOTPCode();
       const modal = new this.options.OTPCodeModal({
         parentElement: container,
-        sdkVersion: getVersion(),
         otpCode,
         onClose: this.onCloseModal.bind(this),
         createOTPCode,