@metamask/connect-multichain 0.5.3 → 0.7.0

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

@@ -55,14 +55,6 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var __privateWrapper = (obj, member, setter, getter) => ({
-  set _(value) {
-    __privateSet(obj, member, value, setter);
-  },
-  get _() {
-    return __privateGet(obj, member, getter);
-  }
-});
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -428,6 +420,34 @@ var init_multichain = __esm({
         super();
         this.options = options;
       }
+      /**
+       * Merges the given options into the current instance options.
+       * Only the mergeable keys are updated (api.supportedNetworks, 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.
+       *
+       * @param partial - Options to merge/overwrite onto the current instance
+       */
+      mergeOptions(partial) {
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+        const opts = this.options;
+        this.options = __spreadProps(__spreadValues({}, opts), {
+          api: __spreadProps(__spreadValues({}, opts.api), {
+            supportedNetworks: __spreadValues(__spreadValues({}, opts.api.supportedNetworks), (_b = (_a2 = partial.api) == null ? void 0 : _a2.supportedNetworks) != null ? _b : {})
+          }),
+          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
+          }),
+          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
+          }),
+          debug: (_n = partial.debug) != null ? _n : opts.debug
+        });
+      }
     };
   }
 });
@@ -613,6 +633,21 @@ var init_ui = __esm({
 });
 
 // src/multichain/utils/index.ts
+function getGlobalObject() {
+  if (typeof globalThis !== "undefined") {
+    return globalThis;
+  }
+  if (typeof global !== "undefined") {
+    return global;
+  }
+  if (typeof self !== "undefined") {
+    return self;
+  }
+  if (typeof window !== "undefined") {
+    return window;
+  }
+  throw new Error("Unable to locate global object");
+}
 function base64Encode(str) {
   if (typeof btoa !== "undefined") {
     return btoa(str);
@@ -646,6 +681,29 @@ function openDeeplink(options, deeplink, universalLink) {
     link.click();
   }
 }
+function mergeRequestedSessionWithExisting(sessionData, scopes, caipAccountIds, sessionProperties) {
+  const existingCaipChainIds = Object.keys(sessionData.sessionScopes);
+  const existingCaipAccountIds = [];
+  Object.values(sessionData.sessionScopes).forEach((scopeObject) => {
+    if ((scopeObject == null ? void 0 : scopeObject.accounts) && Array.isArray(scopeObject.accounts)) {
+      scopeObject.accounts.forEach((account) => {
+        existingCaipAccountIds.push(account);
+      });
+    }
+  });
+  const mergedScopes = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipChainIds, ...scopes])
+  );
+  const mergedCaipAccountIds = Array.from(
+    /* @__PURE__ */ new Set([...existingCaipAccountIds, ...caipAccountIds])
+  );
+  const mergedSessionProperties = __spreadValues(__spreadValues({}, sessionData.sessionProperties), sessionProperties);
+  return {
+    mergedScopes,
+    mergedCaipAccountIds,
+    mergedSessionProperties
+  };
+}
 function getOptionalScopes(scopes) {
   return scopes.reduce(
     (prev, scope) => __spreadProps(__spreadValues({}, prev), {
@@ -658,6 +716,21 @@ function getOptionalScopes(scopes) {
     {}
   );
 }
+function normalizeNativeUrl(url) {
+  var _a2;
+  const httpPattern = /^https?:\/\//u;
+  if (httpPattern.test(url)) {
+    return void 0;
+  }
+  const schemeMatch = url.match(/^([^:]*):\/\//u);
+  const rawScheme = (_a2 = schemeMatch == null ? void 0 : schemeMatch[1]) != null ? _a2 : url;
+  const sanitized = rawScheme.toLowerCase().replace(/[^a-z0-9-]/gu, "-").replace(/^-+|-+$/gu, "");
+  const subdomain = (sanitized || "unknown").slice(0, 63).replace(/-+$/u, "");
+  return {
+    url: `https://${subdomain}.rn.dapp.local`,
+    nativeScheme: url
+  };
+}
 function setupDappMetadata(options) {
   var _a2, _b;
   const platform = getPlatformType();
@@ -673,6 +746,18 @@ function setupDappMetadata(options) {
   if (!((_b = options.dapp) == null ? void 0 : _b.url)) {
     throw new Error("You must provide dapp url");
   }
+  if (platform === "react-native" /* ReactNative */ && options.dapp.url) {
+    const normalized = normalizeNativeUrl(options.dapp.url);
+    if (normalized) {
+      console.info(
+        `Normalizing dapp URL for React Native: "${options.dapp.url}" -> "${normalized.url}"`
+      );
+      options.dapp = __spreadProps(__spreadValues({}, options.dapp), {
+        url: normalized.url,
+        nativeScheme: normalized.nativeScheme
+      });
+    }
+  }
   const BASE_64_ICON_MAX_LENGTH = 163400;
   const urlPattern = /^(http|https):\/\/[^\s]*$/u;
   if (options.dapp) {
@@ -784,7 +869,7 @@ function addValidAccounts(optionalScopes, validAccounts) {
   }
   return result;
 }
-var import_utils, import_pako, extractFavicon;
+var import_utils, import_pako, extractFavicon, MAX, idCounter, getUniqueRequestId;
 var init_utils = __esm({
   "src/multichain/utils/index.ts"() {
     "use strict";
@@ -805,6 +890,12 @@ var init_utils = __esm({
       }
       return favicon;
     };
+    MAX = 4294967295;
+    idCounter = Math.floor(Math.random() * MAX);
+    getUniqueRequestId = () => {
+      idCounter = (idCounter + 1) % MAX;
+      return idCounter;
+    };
   }
 });
 
@@ -1475,7 +1566,7 @@ trackWalletActionRejected_fn = function(options) {
 var import_multichain_api_client = require("@metamask/multichain-api-client");
 init_utils();
 var DEFAULT_REQUEST_TIMEOUT = 60 * 1e3;
-var _notificationCallbacks, _transport, _defaultRequestOptions, _reqId, _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;
 var DefaultTransport = class {
   constructor() {
     __privateAdd(this, _DefaultTransport_instances);
@@ -1484,8 +1575,6 @@ var DefaultTransport = class {
     __privateAdd(this, _defaultRequestOptions, {
       timeout: DEFAULT_REQUEST_TIMEOUT
     });
-    // Use timestamp-based ID to avoid conflicts across disconnect/reconnect cycles
-    __privateAdd(this, _reqId, Date.now());
     __privateAdd(this, _pendingRequests, /* @__PURE__ */ new Map());
     __privateAdd(this, _handleResponseListener);
     __privateAdd(this, _handleNotificationListener);
@@ -1493,8 +1582,7 @@ var DefaultTransport = class {
   sendEip1193Message(payload, options) {
     return __async(this, null, function* () {
       __privateMethod(this, _DefaultTransport_instances, setupMessageListener_fn).call(this);
-      __privateSet(this, _reqId, __privateGet(this, _reqId) + 1);
-      const requestId = `${__privateGet(this, _reqId)}`;
+      const requestId = String(getUniqueRequestId());
       const request = __spreadValues({
         jsonrpc: "2.0",
         id: requestId
@@ -1559,10 +1647,6 @@ var DefaultTransport = class {
           proposedCaipAccountIds
         );
         if (!hasSameScopesAndAccounts) {
-          yield this.request(
-            { method: "wallet_revokeSession", params: walletSession },
-            __privateGet(this, _defaultRequestOptions)
-          );
           const response = yield this.request(
             { method: "wallet_createSession", params: createSessionParams },
             __privateGet(this, _defaultRequestOptions)
@@ -1589,9 +1673,14 @@ var DefaultTransport = class {
     });
   }
   disconnect() {
-    return __async(this, null, function* () {
+    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();
-      yield this.request({ method: "wallet_revokeSession", params: {} });
       if (__privateGet(this, _handleResponseListener)) {
         window.removeEventListener("message", __privateGet(this, _handleResponseListener));
         __privateSet(this, _handleResponseListener, void 0);
@@ -1605,7 +1694,7 @@ var DefaultTransport = class {
         request.reject(new Error("Transport disconnected"));
       }
       __privateGet(this, _pendingRequests).clear();
-      return __privateGet(this, _transport).disconnect();
+      yield __privateGet(this, _transport).disconnect();
     });
   }
   isConnected() {
@@ -1630,11 +1719,17 @@ var DefaultTransport = class {
       );
     });
   }
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      throw new Error(
+        "getStoredPendingSessionRequest is purposely not implemented for the DefaultTransport"
+      );
+    });
+  }
 };
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
 _defaultRequestOptions = new WeakMap();
-_reqId = new WeakMap();
 _pendingRequests = new WeakMap();
 _handleResponseListener = new WeakMap();
 _handleNotificationListener = new WeakMap();
@@ -1704,18 +1799,12 @@ setupMessageListener_fn = function() {
 
 // src/multichain/transports/multichainApiClientWrapper/index.ts
 var import_rpc_errors = require("@metamask/rpc-errors");
-var MAX = 4294967295;
-var idCounter = Math.floor(Math.random() * MAX);
-var getUniqueId = () => {
-  idCounter = (idCounter + 1) % MAX;
-  return idCounter;
-};
-var _requestId, _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+init_utils();
+var _notificationCallbacks2, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
 var MultichainApiClientWrapperTransport = class {
   constructor(metamaskConnectMultichain) {
     this.metamaskConnectMultichain = metamaskConnectMultichain;
     __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
-    __privateAdd(this, _requestId, getUniqueId());
     __privateAdd(this, _notificationCallbacks2, /* @__PURE__ */ new Set());
   }
   isTransportDefined() {
@@ -1733,15 +1822,23 @@ var MultichainApiClientWrapperTransport = class {
       callback(data);
     });
   }
-  setupNotifcationListener() {
-    this.metamaskConnectMultichain.transport.onNotification(
+  clearTransportNotificationListener() {
+    var _a2;
+    (_a2 = this.notificationListener) == null ? void 0 : _a2.call(this);
+    this.notificationListener = void 0;
+  }
+  setupTransportNotificationListener() {
+    if (!this.isTransportDefined() || this.notificationListener) {
+      return;
+    }
+    this.notificationListener = this.metamaskConnectMultichain.transport.onNotification(
       this.notifyCallbacks.bind(this)
     );
   }
   connect() {
     return __async(this, null, function* () {
       console.log("\u{1F4DA} connect");
-      return Promise.resolve();
+      yield this.metamaskConnectMultichain.emitSessionChanged();
     });
   }
   disconnect() {
@@ -1754,7 +1851,7 @@ var MultichainApiClientWrapperTransport = class {
   }
   request(_0) {
     return __async(this, arguments, function* (params, _options = {}) {
-      const id = __privateWrapper(this, _requestId)._++;
+      const id = getUniqueRequestId();
       const requestPayload = __spreadValues({
         id,
         jsonrpc: "2.0"
@@ -1775,21 +1872,17 @@ var MultichainApiClientWrapperTransport = class {
     });
   }
   onNotification(callback) {
-    if (!this.isTransportDefined()) {
-      __privateGet(this, _notificationCallbacks2).add(callback);
-      return () => {
-        __privateGet(this, _notificationCallbacks2).delete(callback);
-      };
-    }
-    return this.metamaskConnectMultichain.transport.onNotification(callback);
+    this.setupTransportNotificationListener();
+    __privateGet(this, _notificationCallbacks2).add(callback);
+    return () => {
+      __privateGet(this, _notificationCallbacks2).delete(callback);
+    };
   }
 };
-_requestId = new WeakMap();
 _notificationCallbacks2 = new WeakMap();
 _MultichainApiClientWrapperTransport_instances = new WeakSet();
 walletCreateSession_fn = function(request) {
   return __async(this, null, function* () {
-    console.log("\u{1F4DA} #walletCreateSession", request);
     const createSessionParams = request.params;
     const scopes = Object.keys(__spreadValues(__spreadValues({}, createSessionParams.optionalScopes), createSessionParams.requiredScopes));
     const scopeAccounts = [];
@@ -1835,11 +1928,14 @@ walletGetSession_fn = function(request) {
 };
 walletRevokeSession_fn = function(request) {
   return __async(this, null, function* () {
+    var _a2;
     if (!this.isTransportDefined()) {
       return { jsonrpc: "2.0", id: request.id, result: true };
     }
+    const revokeSessionParams = request.params;
+    const scopes = (_a2 = revokeSessionParams == null ? void 0 : revokeSessionParams.scopes) != null ? _a2 : [];
     try {
-      this.metamaskConnectMultichain.disconnect();
+      yield this.metamaskConnectMultichain.disconnect(scopes);
       return { jsonrpc: "2.0", id: request.id, result: true };
     } catch (_error) {
       return { jsonrpc: "2.0", id: request.id, result: false };
@@ -1863,6 +1959,7 @@ walletInvokeMethod_fn = function(request) {
 // src/multichain/transports/mwp/index.ts
 var import_mobile_wallet_protocol_core = require("@metamask/mobile-wallet-protocol-core");
 var import_multichain_api_client2 = require("@metamask/multichain-api-client");
+var import_rpc_errors2 = require("@metamask/rpc-errors");
 init_domain();
 init_utils();
 
@@ -1877,6 +1974,7 @@ var DEFAULT_RESUME_TIMEOUT = 10 * 1e3;
 var SESSION_STORE_KEY = "cache_wallet_getSession";
 var ACCOUNTS_STORE_KEY = "cache_eth_accounts";
 var CHAIN_STORE_KEY = "cache_eth_chainId";
+var PENDING_SESSION_REQUEST_KEY = "pending_session_request";
 var CACHED_METHOD_LIST = [
   "wallet_getSession",
   "wallet_createSession",
@@ -1896,10 +1994,15 @@ var MWPTransport = class {
     this.dappClient = dappClient;
     this.kvstore = kvstore;
     this.options = options;
-    this.__reqId = 0;
     this.__pendingRequests = /* @__PURE__ */ new Map();
     this.notificationCallbacks = /* @__PURE__ */ new Set();
     this.dappClient.on("message", this.handleMessage.bind(this));
+    this.dappClient.on("session_request", (sessionRequest) => {
+      this.currentSessionRequest = sessionRequest;
+      this.kvstore.set(PENDING_SESSION_REQUEST_KEY, JSON.stringify(sessionRequest)).catch((err) => {
+        logger("Failed to store pending session request", err);
+      });
+    });
     if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
       this.windowFocusHandler = this.onWindowFocus.bind(this);
       window.addEventListener("focus", this.windowFocusHandler);
@@ -1914,6 +2017,34 @@ var MWPTransport = class {
   get sessionRequest() {
     return this.currentSessionRequest;
   }
+  /**
+   * Returns the stored pending session request from the dappClient session_request event, if any.
+   *
+   * @returns The stored SessionRequest, or null if none or invalid.
+   */
+  getStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      try {
+        const raw = yield this.kvstore.get(PENDING_SESSION_REQUEST_KEY);
+        if (!raw) {
+          return null;
+        }
+        return JSON.parse(raw);
+      } catch (e) {
+        return null;
+      }
+    });
+  }
+  /**
+   * Removes the stored pending session request from the KVStore.
+   * This is necessary to ensure that ConnectMultichain is able to correctly
+   * infer the MWP Transport connection attempt status.
+   */
+  removeStoredPendingSessionRequest() {
+    return __async(this, null, function* () {
+      yield this.kvstore.delete(PENDING_SESSION_REQUEST_KEY);
+    });
+  }
   onWindowFocus() {
     if (!this.isConnected()) {
       this.dappClient.reconnect();
@@ -1930,6 +2061,18 @@ var MWPTransport = class {
       request.reject(error);
     }
   }
+  parseWalletError(errorPayload) {
+    const errorData = errorPayload;
+    if (typeof errorData.code === "number" && typeof errorData.message === "string") {
+      const { code, message: message2 } = errorData;
+      if (code >= 1e3 && code <= 4999) {
+        return import_rpc_errors2.providerErrors.custom({ code, message: message2 });
+      }
+      return new import_rpc_errors2.JsonRpcError(code, message2);
+    }
+    const message = errorPayload instanceof Error ? errorPayload.message : JSON.stringify(errorPayload);
+    return import_rpc_errors2.rpcErrors.internal({ message });
+  }
   handleMessage(message) {
     if (typeof message === "object" && message !== null) {
       if ("data" in message) {
@@ -1937,6 +2080,12 @@ var MWPTransport = class {
         if ("id" in messagePayload && typeof messagePayload.id === "string") {
           const request = this.pendingRequests.get(messagePayload.id);
           if (request) {
+            clearTimeout(request.timeout);
+            if ("error" in messagePayload && messagePayload.error) {
+              this.pendingRequests.delete(messagePayload.id);
+              request.reject(this.parseWalletError(messagePayload.error));
+              return;
+            }
             const requestWithName = __spreadProps(__spreadValues({}, messagePayload), {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method
             });
@@ -1944,7 +2093,6 @@ var MWPTransport = class {
               method: request.method === "wallet_getSession" || request.method === "wallet_createSession" ? "wallet_sessionChanged" : request.method,
               params: requestWithName.result
             });
-            clearTimeout(request.timeout);
             this.notifyCallbacks(notification);
             request.resolve(requestWithName);
             this.pendingRequests.delete(messagePayload.id);
@@ -2034,6 +2182,7 @@ var MWPTransport = class {
           }
           walletSession = response.result;
         }
+        yield this.removeStoredPendingSessionRequest();
         this.notifyCallbacks({
           method: "wallet_sessionChanged",
           params: walletSession
@@ -2049,7 +2198,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -2083,8 +2232,13 @@ var MWPTransport = class {
       const { dappClient } = this;
       const session = yield this.getActiveSession();
       if (session) {
-        logger("active session found", session);
+        logger("active session found", {
+          id: session.id,
+          channel: session.channel,
+          expiresAt: session.expiresAt
+        });
       }
+      const storedSessionRequestBeforeConnectionAttempt = yield this.getStoredPendingSessionRequest();
       let timeout;
       let initialConnectionMessageHandler;
       const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
@@ -2115,33 +2269,35 @@ var MWPTransport = class {
               };
               const request = {
                 jsonrpc: "2.0",
-                id: `${this.__reqId++}`,
+                id: String(getUniqueRequestId()),
                 method: "wallet_createSession",
                 params: sessionRequest
               };
               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(
-                        request,
-                        messagePayload
-                      );
-                      this.notifyCallbacks(messagePayload);
-                      return resolveConnection();
-                    }
-                  }
+                if (typeof message !== "object" || message === null) {
+                  return;
+                }
+                if (!("data" in message)) {
+                  return;
                 }
+                const messagePayload = message.data;
+                const isMatchingId = messagePayload.id === request.id;
+                const isMatchingMethod = messagePayload.method === "wallet_createSession" || messagePayload.method === "wallet_sessionChanged";
+                if (!isMatchingId && !isMatchingMethod) {
+                  return;
+                }
+                if (messagePayload.error) {
+                  return rejectConnection(
+                    this.parseWalletError(messagePayload.error)
+                  );
+                }
+                yield this.storeWalletSession(
+                  request,
+                  messagePayload
+                );
+                yield this.removeStoredPendingSessionRequest();
+                this.notifyCallbacks(messagePayload);
+                return resolveConnection();
               });
               this.dappClient.on("message", initialConnectionMessageHandler);
               dappClient.connect({
@@ -2162,14 +2318,18 @@ var MWPTransport = class {
             }
           );
         }
-        timeout = setTimeout(() => {
-          reject(new import_multichain_api_client2.TransportTimeoutError());
-        }, this.options.connectionTimeout);
+        timeout = setTimeout(
+          () => {
+            reject(new import_multichain_api_client2.TransportTimeoutError());
+          },
+          storedSessionRequestBeforeConnectionAttempt ? this.options.resumeTimeout : this.options.connectionTimeout
+        );
         connection.then(resolve).catch(reject);
       }));
-      return connectionPromise.catch((error) => {
+      return connectionPromise.catch((error) => __async(this, null, function* () {
+        yield this.dappClient.disconnect();
         throw error;
-      }).finally(() => {
+      })).finally(() => {
         if (timeout) {
           clearTimeout(timeout);
         }
@@ -2177,24 +2337,68 @@ var MWPTransport = class {
           this.dappClient.off("message", initialConnectionMessageHandler);
           initialConnectionMessageHandler = void 0;
         }
+        this.removeStoredPendingSessionRequest();
       });
     });
   }
   /**
    * Disconnects from the Mobile Wallet Protocol
    *
+   * @param [scopes] - The scopes to revoke. If not provided or empty, all scopes will be revoked.
    * @returns Nothing
    */
   disconnect() {
-    return __async(this, null, function* () {
-      if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
-        window.removeEventListener("focus", this.windowFocusHandler);
-        this.windowFocusHandler = void 0;
-      }
-      this.kvstore.delete(SESSION_STORE_KEY);
-      this.kvstore.delete(ACCOUNTS_STORE_KEY);
-      this.kvstore.delete(CHAIN_STORE_KEY);
-      return this.dappClient.disconnect();
+    return __async(this, arguments, function* (scopes = []) {
+      var _a2, _b;
+      const cachedSession = yield this.getCachedResponse({
+        jsonrpc: "2.0",
+        id: "0",
+        method: "wallet_getSession"
+      });
+      const cachedSessionScopes = (_b = (_a2 = cachedSession == null ? void 0 : cachedSession.result) == null ? void 0 : _a2.sessionScopes) != null ? _b : {};
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(cachedSessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      const newSessionScopes = Object.fromEntries(
+        Object.entries(cachedSessionScopes).filter(
+          ([key]) => remainingScopes.includes(key)
+        )
+      );
+      this.request({ method: "wallet_revokeSession", params: { scopes } }).catch(
+        (err) => {
+          console.error("error revoking session", err);
+        }
+      );
+      const remainingScopesIncludeEip155 = remainingScopes.some(
+        (scope) => scope.includes("eip155")
+      );
+      if (!remainingScopesIncludeEip155) {
+        this.kvstore.delete(ACCOUNTS_STORE_KEY);
+        this.kvstore.delete(CHAIN_STORE_KEY);
+      }
+      if (remainingScopes.length > 0) {
+        this.kvstore.set(
+          SESSION_STORE_KEY,
+          JSON.stringify({
+            result: {
+              sessionScopes: newSessionScopes
+            }
+          })
+        );
+      } else {
+        this.kvstore.delete(SESSION_STORE_KEY);
+        if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined" && this.windowFocusHandler) {
+          window.removeEventListener("focus", this.windowFocusHandler);
+          this.windowFocusHandler = void 0;
+        }
+        yield this.dappClient.disconnect();
+      }
+      this.notifyCallbacks({
+        method: "wallet_sessionChanged",
+        params: {
+          sessionScopes: newSessionScopes
+        }
+      });
     });
   }
   /**
@@ -2300,7 +2504,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       const request = __spreadValues({
         jsonrpc: "2.0",
-        id: `${this.__reqId++}`
+        id: String(getUniqueRequestId())
       }, payload);
       const cachedWalletSession = yield this.getCachedResponse(request);
       if (cachedWalletSession) {
@@ -2382,6 +2586,7 @@ var MWPTransport = class {
       const timeoutPromise = new Promise((_resolve, reject) => {
         setTimeout(() => {
           unsubscribe();
+          this.removeStoredPendingSessionRequest();
           reject(new import_multichain_api_client2.TransportTimeoutError());
         }, this.options.resumeTimeout);
       });
@@ -2420,7 +2625,8 @@ var keymanager = new KeyManager();
 // src/multichain/index.ts
 init_utils();
 var logger2 = createLogger("metamask-sdk:core");
-var _a, _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;
+var SINGLETON_KEY = "__METAMASK_CONNECT_MULTICHAIN_SINGLETON__";
+var _a, _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 _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
   constructor(options) {
     var _a2, _b, _c, _d, _e, _f;
@@ -2485,27 +2691,54 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
   get transportType() {
     return __privateGet(this, _transport2) instanceof MWPTransport ? "mwp" /* MWP */ : "browser" /* Browser */;
   }
+  // 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.
   static create(options) {
     return __async(this, null, function* () {
-      var _a2;
-      const instance = new _MetaMaskConnectMultichain(options);
-      const isEnabled2 = yield isEnabled(
-        "metamask-sdk:core",
-        instance.options.storage
-      );
-      if (isEnabled2) {
-        enableDebug("metamask-sdk:core");
+      const globalObject = getGlobalObject();
+      const existing = globalObject[SINGLETON_KEY];
+      if (existing) {
+        const instance = yield existing;
+        instance.mergeOptions(options);
+        if (options.debug) {
+          enableDebug("metamask-sdk:*");
+        }
+        return instance;
       }
-      yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
-      return instance;
+      const instancePromise = (() => __async(null, null, function* () {
+        var _a2;
+        const instance = new _MetaMaskConnectMultichain(options);
+        const isEnabled2 = yield isEnabled(
+          "metamask-sdk:core",
+          instance.options.storage
+        );
+        if (isEnabled2) {
+          enableDebug("metamask-sdk:core");
+        }
+        yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
+        return instance;
+      }))();
+      globalObject[SINGLETON_KEY] = instancePromise;
+      instancePromise.catch((error) => {
+        globalObject[SINGLETON_KEY] = void 0;
+        console.error("Error initializing MetaMaskConnectMultichain", error);
+      });
+      return instancePromise;
     });
   }
   // TODO: make this into param object
   connect(scopes, caipAccountIds, sessionProperties, forceRequest) {
     return __async(this, null, function* () {
       var _a2;
-      if (this.status !== "connected") {
-        yield this.disconnect();
+      if (this.status === "connecting" && this.transportType === "mwp" /* MWP */) {
+        yield __privateMethod(this, _MetaMaskConnectMultichain_instances, openConnectDeeplinkIfNeeded_fn).call(this);
+        throw new Error(
+          "Existing connection is pending. Please check your MetaMask Mobile app to continue."
+        );
       }
       const { ui } = this.options;
       const platformType = getPlatformType();
@@ -2535,12 +2768,19 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       } catch (error) {
         logger2("Error tracking connection_initiated event", error);
       }
-      const nonEmptySessionProperites = Object.keys(sessionProperties != null ? sessionProperties : {}).length > 0 ? sessionProperties : void 0;
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const { mergedScopes, mergedCaipAccountIds, mergedSessionProperties } = mergeRequestedSessionWithExisting(
+        sessionData,
+        scopes,
+        caipAccountIds,
+        sessionProperties
+      );
+      const nonEmptySessionProperties = Object.keys(mergedSessionProperties != null ? mergedSessionProperties : {}).length > 0 ? mergedSessionProperties : void 0;
       if (((_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.isConnected()) && !secure) {
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }).then(() => __async(this, null, function* () {
           if (__privateGet(this, _transport2) instanceof MWPTransport) {
@@ -2552,27 +2792,27 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }), scopes, transportType);
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
         const defaultTransport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupDefaultTransport_fn).call(this);
         return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, defaultTransport.connect({
-          scopes,
-          caipAccountIds,
-          sessionProperties: nonEmptySessionProperites,
+          scopes: mergedScopes,
+          caipAccountIds: mergedCaipAccountIds,
+          sessionProperties: nonEmptySessionProperties,
           forceRequest
         }), scopes, transportType);
       }
       yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupMWP_fn).call(this);
       const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
       if (secure && !shouldShowInstallModal) {
-        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
       }
-      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds, nonEmptySessionProperites), scopes, transportType);
+      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, mergedScopes, mergedCaipAccountIds, nonEmptySessionProperties), scopes, transportType);
     });
   }
   emit(event, args) {
@@ -2581,18 +2821,24 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     super.emit(event, args);
   }
   disconnect() {
-    return __async(this, null, function* () {
+    return __async(this, arguments, function* (scopes = []) {
       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("stateChanged", "disconnected");
-      __privateSet(this, _listener, void 0);
-      __privateSet(this, _beforeUnloadListener, void 0);
-      __privateSet(this, _transport2, void 0);
-      __privateGet(this, _providerTransportWrapper).clearNotificationCallbacks();
-      __privateSet(this, _dappClient, void 0);
+      const sessionData = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getCaipSession_fn).call(this);
+      const remainingScopes = scopes.length === 0 ? [] : Object.keys(sessionData.sessionScopes).filter(
+        (scope) => !scopes.includes(scope)
+      );
+      yield (_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.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);
+        this.status = "disconnected";
+      }
     });
   }
   invokeMethod(request) {
@@ -2604,7 +2850,7 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
     });
   }
   // DRY THIS WITH REQUEST ROUTER
-  openDeeplinkIfNeeded() {
+  openSimpleDeeplinkIfNeeded() {
     const { ui, mobile } = this.options;
     const { showInstallModal = false } = ui != null ? ui : {};
     const secure = isSecure();
@@ -2624,6 +2870,23 @@ var _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends Multic
       }), 10);
     }
   }
+  // Provides a way for ecosystem clients (EVM, Solana, etc.) to get the current CAIP session data
+  // when instantiating themselves (as they would have already missed any initial sessionChanged events emitted by ConnectMultichain)
+  // without having to concern themselves with the current transport connection status.
+  emitSessionChanged() {
+    return __async(this, null, function* () {
+      var _a2;
+      const emptySession = { sessionScopes: {} };
+      if (this.status !== "connected" && this.status !== "connecting") {
+        this.emit("wallet_sessionChanged", emptySession);
+        return;
+      }
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      this.emit("wallet_sessionChanged", (_a2 = response.result) != null ? _a2 : emptySession);
+    });
+  }
 };
 _provider = new WeakMap();
 _providerTransportWrapper = new WeakMap();
@@ -2673,7 +2936,7 @@ getStoredTransport_fn = function() {
         if (hasExtensionInstalled) {
           const apiTransport = new DefaultTransport();
           __privateSet(this, _transport2, apiTransport);
-          __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+          __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
           __privateSet(this, _listener, apiTransport.onNotification(
             __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
           ));
@@ -2685,7 +2948,7 @@ getStoredTransport_fn = function() {
         const apiTransport = new MWPTransport(dappClient, kvstore);
         __privateSet(this, _dappClient, dappClient);
         __privateSet(this, _transport2, apiTransport);
-        __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+        __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
         __privateSet(this, _listener, apiTransport.onNotification(
           __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
         ));
@@ -2717,25 +2980,17 @@ setupTransport_fn = function() {
 };
 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, _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);
-        }
-        if (typeof window !== "undefined") {
-          window.mmsdk = this;
-        }
+      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();
@@ -2771,7 +3026,7 @@ setupMWP_fn = function() {
     __privateSet(this, _dappClient, dappClient);
     const apiTransport = new MWPTransport(dappClient, kvstore);
     __privateSet(this, _transport2, apiTransport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     __privateSet(this, _listener, this.transport.onNotification(
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
@@ -2787,15 +3042,13 @@ onBeforeUnload_fn = function() {
   });
 };
 createBeforeUnloadListener_fn = function() {
+  const handler = __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this);
   if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
-    window.addEventListener("beforeunload", __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this));
+    window.addEventListener("beforeunload", handler);
   }
   return () => {
     if (typeof window !== "undefined" && typeof window.removeEventListener !== "undefined") {
-      window.removeEventListener(
-        "beforeunload",
-        __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this)
-      );
+      window.removeEventListener("beforeunload", handler);
     }
   };
 };
@@ -2840,13 +3093,14 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds,
                 if (error instanceof import_mobile_wallet_protocol_core2.ProtocolError) {
                   if (error.code !== import_mobile_wallet_protocol_core2.ErrorCode.REQUEST_EXPIRED) {
                     this.status = "disconnected";
+                    yield this.options.ui.factory.unload(error);
                     reject(error);
                   }
                 } else {
                   this.status = "disconnected";
-                  reject(
-                    error instanceof Error ? error : new Error(String(error))
-                  );
+                  const normalizedError = error instanceof Error ? error : new Error(String(error));
+                  yield this.options.ui.factory.unload(normalizedError);
+                  reject(normalizedError);
                 }
               }
             }))().catch(() => {
@@ -2933,7 +3187,7 @@ setupDefaultTransport_fn = function() {
       __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
     __privateSet(this, _transport2, transport);
-    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
+    __privateGet(this, _providerTransportWrapper).setupTransportNotificationListener();
     return transport;
   });
 };
@@ -2960,7 +3214,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
       let timeout;
       if (this.transport.isConnected()) {
         timeout = setTimeout(() => {
-          this.openDeeplinkIfNeeded();
+          this.openSimpleDeeplinkIfNeeded();
         }, 250);
       } else {
         this.dappClient.once(
@@ -3043,6 +3297,53 @@ handleConnection_fn = function(promise, scopes, transportType) {
     }));
   });
 };
+getCaipSession_fn = function() {
+  return __async(this, null, function* () {
+    let sessionData = {
+      sessionScopes: {},
+      sessionProperties: {}
+    };
+    if (this.status === "connected") {
+      const response = yield this.transport.request({
+        method: "wallet_getSession"
+      });
+      if (response.result) {
+        sessionData = response.result;
+      }
+    }
+    return sessionData;
+  });
+};
+openConnectDeeplinkIfNeeded_fn = function() {
+  return __async(this, null, function* () {
+    var _a2, _b;
+    const { ui } = this.options;
+    const { showInstallModal = false } = ui != null ? ui : {};
+    const secure = isSecure();
+    const shouldOpenDeeplink = secure && !showInstallModal;
+    if (!shouldOpenDeeplink) {
+      return;
+    }
+    const storedSessionRequest = yield (_a2 = __privateGet(this, _transport2)) == null ? void 0 : _a2.getStoredPendingSessionRequest();
+    if (!storedSessionRequest) {
+      return;
+    }
+    const connectionRequest = {
+      sessionRequest: storedSessionRequest,
+      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 ((_b = this.options.mobile) == null ? void 0 : _b.preferredOpenLink) {
+      this.options.mobile.preferredOpenLink(deeplink, "_self");
+    } else {
+      openDeeplink(this.options, deeplink, universalLink);
+    }
+  });
+};
 var MetaMaskConnectMultichain = _MetaMaskConnectMultichain;
 
 // src/store/index.ts