@metamask/connect-multichain 0.4.0 → 0.5.1

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

@@ -973,11 +973,6 @@ var init_AbstractInstallModal = __esm({
                 `[UI: InstallModal-nodejs()] \u274C Error generating new QR code: ${error}`
               );
             }
-          } else {
-            const generateQRCode = yield this.options.generateQRCode(
-              currentConnectionRequest
-            );
-            this.renderQRCode(generateQRCode, currentConnectionRequest);
           }
         }), 1e3);
       }
@@ -1207,7 +1202,7 @@ __export(index_browser_exports, {
   StoreClient: () => StoreClient,
   TransportType: () => TransportType,
   createLogger: () => createLogger,
-  createMetamaskConnect: () => createMetamaskConnect,
+  createMultichainClient: () => createMultichainClient,
   enableDebug: () => enableDebug,
   getInfuraRpcUrls: () => getInfuraRpcUrls,
   getPlatformType: () => getPlatformType,
@@ -1223,6 +1218,13 @@ __export(index_browser_exports, {
 });
 module.exports = __toCommonJS(index_browser_exports);
 
+// src/polyfills/buffer-shim.ts
+var import_buffer = require("buffer");
+var g = typeof globalThis !== "undefined" ? globalThis : typeof global !== "undefined" ? global : typeof window !== "undefined" ? window : {};
+if (!g.Buffer) {
+  g.Buffer = import_buffer.Buffer;
+}
+
 // src/multichain/index.ts
 var import_analytics4 = require("@metamask/analytics");
 var import_mobile_wallet_protocol_core2 = require("@metamask/mobile-wallet-protocol-core");
@@ -1580,7 +1582,8 @@ var DefaultTransport = class {
           getValidAccounts((_g = options == null ? void 0 : options.caipAccountIds) != null ? _g : [])
         );
         const createSessionParams = {
-          optionalScopes
+          optionalScopes,
+          sessionProperties: options == null ? void 0 : options.sessionProperties
         };
         const response = yield this.request(
           { method: "wallet_createSession", params: createSessionParams },
@@ -1720,6 +1723,7 @@ var MULTICHAIN_PROVIDER_STREAM_NAME = "metamask-multichain-provider";
 var DEFAULT_REQUEST_TIMEOUT2 = 60 * 1e3;
 var CONNECTION_GRACE_PERIOD = 60 * 1e3;
 var DEFAULT_CONNECTION_TIMEOUT = DEFAULT_REQUEST_TIMEOUT2 + CONNECTION_GRACE_PERIOD;
+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";
@@ -1736,7 +1740,8 @@ var logger = createLogger("metamask-sdk:transport");
 var MWPTransport = class {
   constructor(dappClient, kvstore, options = {
     requestTimeout: DEFAULT_REQUEST_TIMEOUT2,
-    connectionTimeout: DEFAULT_CONNECTION_TIMEOUT
+    connectionTimeout: DEFAULT_CONNECTION_TIMEOUT,
+    resumeTimeout: DEFAULT_RESUME_TIMEOUT
   }) {
     this.dappClient = dappClient;
     this.kvstore = kvstore;
@@ -1811,6 +1816,13 @@ var MWPTransport = class {
               )
             );
           }
+          if (message.data.method === "wallet_sessionChanged") {
+            const notification = message.data;
+            const response = {
+              result: notification.params
+            };
+            this.kvstore.set(SESSION_STORE_KEY, JSON.stringify(response));
+          }
           this.notifyCallbacks(message.data);
         }
       }
@@ -1820,6 +1832,7 @@ var MWPTransport = class {
     return __async(this, null, function* () {
       var _a2, _b, _c, _d, _e, _f, _g;
       try {
+        yield this.waitForWalletSessionIfNotCached();
         const sessionRequest = yield this.request({
           method: "wallet_getSession"
         });
@@ -1924,7 +1937,7 @@ var MWPTransport = class {
       }
       let timeout;
       let initialConnectionMessageHandler;
-      const connectionPromise = new Promise((resolve, reject) => {
+      const connectionPromise = new Promise((resolve, reject) => __async(this, null, function* () {
         let connection;
         if (session) {
           connection = new Promise((resumeResolve, resumeReject) => {
@@ -1947,7 +1960,8 @@ var MWPTransport = class {
                 getValidAccounts((_b = options == null ? void 0 : options.caipAccountIds) != null ? _b : [])
               );
               const sessionRequest = {
-                optionalScopes
+                optionalScopes,
+                sessionProperties: options == null ? void 0 : options.sessionProperties
               };
               const request = {
                 jsonrpc: "2.0",
@@ -2002,7 +2016,7 @@ var MWPTransport = class {
           reject(new import_multichain_api_client2.TransportTimeoutError());
         }, this.options.connectionTimeout);
         connection.then(resolve).catch(reject);
-      });
+      }));
       return connectionPromise.catch((error) => {
         throw error;
       }).finally(() => {
@@ -2187,6 +2201,43 @@ var MWPTransport = class {
       }
     });
   }
+  // This method checks if an existing CAIP session response is cached or waits for one
+  // to be received from the wallet if not cached. This is necessary because there is an edge
+  // case during the initial connection flow where after the user has accepted the permission approval
+  // and returned back to the dapp from the wallet, the dapp page may have gotten unloaded and refreshed.
+  // When it is unloaded and refreshed, it will try to resume the session by making a request for wallet_getSession
+  // which should resolve from cache, but because a race condition makes it possible for the response from the wallet
+  // for the initial wallet_createSession connection request to not have been handled and cached yet. This results
+  // in the wallet_getSession request never resolving unless we wait for it explicitly as done in this method.
+  waitForWalletSessionIfNotCached() {
+    return __async(this, null, function* () {
+      const cachedWalletGetSessionResponse = yield this.kvstore.get(SESSION_STORE_KEY);
+      if (cachedWalletGetSessionResponse) {
+        return;
+      }
+      let unsubscribe;
+      const responsePromise = new Promise((resolve) => {
+        unsubscribe = this.onNotification((message) => {
+          if (typeof message === "object" && message !== null) {
+            if ("data" in message) {
+              const messagePayload = message.data;
+              if (messagePayload.method === "wallet_getSession" || messagePayload.method === "wallet_sessionChanged") {
+                unsubscribe();
+                resolve();
+              }
+            }
+          }
+        });
+      });
+      const timeoutPromise = new Promise((_resolve, reject) => {
+        setTimeout(() => {
+          unsubscribe();
+          reject(new import_multichain_api_client2.TransportTimeoutError());
+        }, this.options.resumeTimeout);
+      });
+      return Promise.race([responsePromise, timeoutPromise]);
+    });
+  }
 };
 
 // src/multichain/transports/mwp/KeyManager.ts
@@ -2218,9 +2269,167 @@ var keymanager = new KeyManager();
 
 // src/multichain/index.ts
 init_utils();
+
+// 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 _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn, walletGetSession_fn, walletRevokeSession_fn, walletInvokeMethod_fn;
+var MultichainApiClientWrapperTransport = class {
+  constructor(metamaskConnectMultichain) {
+    this.metamaskConnectMultichain = metamaskConnectMultichain;
+    __privateAdd(this, _MultichainApiClientWrapperTransport_instances);
+    this.requestId = getUniqueId();
+    this.notificationCallbacks = /* @__PURE__ */ new Set();
+  }
+  isTransportDefined() {
+    try {
+      return Boolean(this.metamaskConnectMultichain.transport);
+    } catch (error) {
+      return false;
+    }
+  }
+  clearNotificationCallbacks() {
+    this.notificationCallbacks.clear();
+  }
+  notifyCallbacks(data) {
+    this.notificationCallbacks.forEach((callback) => {
+      callback(data);
+    });
+  }
+  setupNotifcationListener() {
+    this.metamaskConnectMultichain.transport.onNotification(
+      this.notifyCallbacks.bind(this)
+    );
+  }
+  connect() {
+    return __async(this, null, function* () {
+      console.log("\u{1F4DA} connect");
+      return Promise.resolve();
+    });
+  }
+  disconnect() {
+    return __async(this, null, function* () {
+      return Promise.resolve();
+    });
+  }
+  isConnected() {
+    return true;
+  }
+  request(_0) {
+    return __async(this, arguments, function* (params, _options = {}) {
+      const id = this.requestId++;
+      const requestPayload = __spreadValues({
+        id,
+        jsonrpc: "2.0"
+      }, params);
+      switch (requestPayload.method) {
+        case "wallet_createSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletCreateSession_fn).call(this, requestPayload);
+        case "wallet_getSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletGetSession_fn).call(this, requestPayload);
+        case "wallet_revokeSession":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletRevokeSession_fn).call(this, requestPayload);
+        case "wallet_invokeMethod":
+          return __privateMethod(this, _MultichainApiClientWrapperTransport_instances, walletInvokeMethod_fn).call(this, requestPayload);
+        default:
+          throw new Error(`Unsupported method: ${requestPayload.method}`);
+      }
+      throw new Error(`Unknown method: ${requestPayload.method}`);
+    });
+  }
+  onNotification(callback) {
+    if (!this.isTransportDefined()) {
+      this.notificationCallbacks.add(callback);
+      return () => {
+        this.notificationCallbacks.delete(callback);
+      };
+    }
+    return this.metamaskConnectMultichain.transport.onNotification(callback);
+  }
+};
+_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 = [];
+    scopes.forEach((scope) => {
+      var _a2, _b, _c, _d;
+      const requiredScope = (_a2 = createSessionParams.requiredScopes) == null ? void 0 : _a2[scope];
+      const optionalScope = (_b = createSessionParams.optionalScopes) == null ? void 0 : _b[scope];
+      if (requiredScope) {
+        scopeAccounts.push(...(_c = requiredScope.accounts) != null ? _c : []);
+      }
+      if (optionalScope) {
+        scopeAccounts.push(...(_d = optionalScope.accounts) != null ? _d : []);
+      }
+    });
+    const accounts = [...new Set(scopeAccounts)];
+    console.log("\u{1F4DA} SDK connect");
+    yield this.metamaskConnectMultichain.connect(
+      scopes,
+      accounts,
+      createSessionParams.sessionProperties
+    );
+    console.log("\u{1F4DA} SDK connected");
+    return this.metamaskConnectMultichain.transport.request({
+      method: "wallet_getSession"
+    });
+  });
+};
+walletGetSession_fn = function(request) {
+  return __async(this, null, function* () {
+    if (!this.isTransportDefined()) {
+      return {
+        jsonrpc: "2.0",
+        id: request.id,
+        result: {
+          sessionScopes: {}
+        }
+      };
+    }
+    return this.metamaskConnectMultichain.transport.request({
+      method: "wallet_getSession"
+    });
+  });
+};
+walletRevokeSession_fn = function(request) {
+  return __async(this, null, function* () {
+    if (!this.isTransportDefined()) {
+      return { jsonrpc: "2.0", id: request.id, result: true };
+    }
+    try {
+      this.metamaskConnectMultichain.disconnect();
+      return { jsonrpc: "2.0", id: request.id, result: true };
+    } catch (error) {
+      return { jsonrpc: "2.0", id: request.id, result: false };
+    }
+  });
+};
+walletInvokeMethod_fn = function(request) {
+  return __async(this, null, function* () {
+    if (!this.isTransportDefined()) {
+      return { error: import_rpc_errors.providerErrors.unauthorized() };
+    }
+    const result = this.metamaskConnectMultichain.invokeMethod(
+      request.params
+    );
+    return {
+      result
+    };
+  });
+};
+
+// src/multichain/index.ts
 var logger2 = createLogger("metamask-sdk:core");
-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 {
+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 _MetaMaskConnectMultichain = class _MetaMaskConnectMultichain extends MultichainCore {
   constructor(options) {
     var _a2, _b, _c, _d, _e, _f;
     const withDappMetadata = setupDappMetadata(options);
@@ -2236,34 +2445,30 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
       })
     });
     super(allOptions);
-    __privateAdd(this, _MultichainSDK_instances);
+    __privateAdd(this, _MetaMaskConnectMultichain_instances);
     __privateAdd(this, _provider);
+    __privateAdd(this, _providerTransportWrapper);
     __privateAdd(this, _transport2);
     __privateAdd(this, _dappClient);
     __privateAdd(this, _beforeUnloadListener);
-    this._state = "pending";
+    this._status = "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}`);
+    __privateSet(this, _providerTransportWrapper, new MultichainApiClientWrapperTransport(this));
+    __privateSet(this, _provider, (0, import_multichain_api_client3.getMultichainClient)({ transport: __privateGet(this, _providerTransportWrapper) }));
   }
-  get state() {
-    return this._state;
+  get status() {
+    return this._status;
   }
-  set state(value) {
+  set status(value) {
     var _a2, _b;
-    this._state = value;
+    this._status = value;
     (_b = (_a2 = this.options.transport) == null ? void 0 : _a2.onNotification) == null ? void 0 : _b.call(_a2, {
       method: "stateChanged",
       params: value
     });
   }
   get 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 (!__privateGet(this, _provider)) {
-      throw new Error("Provider not initialized, establish connection first");
-    }
     return __privateGet(this, _provider);
   }
   get transport() {
@@ -2287,7 +2492,7 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
   static create(options) {
     return __async(this, null, function* () {
       var _a2;
-      const instance = new _MultichainSDK(options);
+      const instance = new _MetaMaskConnectMultichain(options);
       const isEnabled2 = yield isEnabled(
         "metamask-sdk:core",
         instance.options.storage
@@ -2295,14 +2500,15 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
       if (isEnabled2) {
         enableDebug("metamask-sdk:core");
       }
-      yield __privateMethod(_a2 = instance, _MultichainSDK_instances, init_fn).call(_a2);
+      yield __privateMethod(_a2 = instance, _MetaMaskConnectMultichain_instances, init_fn).call(_a2);
       return instance;
     });
   }
-  connect(scopes, caipAccountIds, forceRequest) {
+  // TODO: make this into param object
+  connect(scopes, caipAccountIds, sessionProperties, forceRequest) {
     return __async(this, null, function* () {
       var _a2;
-      if (this.state !== "connected") {
+      if (this.status !== "connected") {
         yield this.disconnect();
       }
       const { ui } = this.options;
@@ -2334,7 +2540,7 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
         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* () {
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateGet(this, _transport2).connect({ scopes, caipAccountIds, sessionProperties, forceRequest }).then(() => __async(this, null, function* () {
           if (__privateGet(this, _transport2) instanceof MWPTransport) {
             return this.storage.setTransport("mwp" /* MWP */);
           }
@@ -2342,19 +2548,19 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
         })), scopes, transportType);
       }
       if (platformType === "in-app-browser" /* MetaMaskMobileWebview */) {
-        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);
+        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, forceRequest }), scopes, transportType);
       }
       if (isWeb && hasExtensionInstalled && preferExtension) {
-        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);
+        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, forceRequest }), scopes, transportType);
       }
-      yield __privateMethod(this, _MultichainSDK_instances, setupMWP_fn).call(this);
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, setupMWP_fn).call(this);
       const shouldShowInstallModal = hasExtensionInstalled ? showInstallModal : !preferExtension || showInstallModal;
       if (secure && !shouldShowInstallModal) {
-        return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, __privateMethod(this, _MultichainSDK_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds), scopes, transportType);
+        return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, deeplinkConnect_fn).call(this, scopes, caipAccountIds, sessionProperties), scopes, transportType);
       }
-      return __privateMethod(this, _MultichainSDK_instances, handleConnection_fn).call(this, __privateMethod(this, _MultichainSDK_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds), scopes, transportType);
+      return __privateMethod(this, _MetaMaskConnectMultichain_instances, handleConnection_fn).call(this, __privateMethod(this, _MetaMaskConnectMultichain_instances, showInstallModal_fn).call(this, shouldShowInstallModal, scopes, caipAccountIds, sessionProperties), scopes, transportType);
     });
   }
   emit(event, args) {
@@ -2373,15 +2579,13 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
       __privateSet(this, _listener, void 0);
       __privateSet(this, _beforeUnloadListener, void 0);
       __privateSet(this, _transport2, void 0);
-      __privateSet(this, _provider, void 0);
+      __privateGet(this, _providerTransportWrapper).clearNotificationCallbacks();
       __privateSet(this, _dappClient, void 0);
     });
   }
   invokeMethod(request) {
     return __async(this, null, function* () {
-      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);
@@ -2410,12 +2614,13 @@ var _MultichainSDK = class _MultichainSDK extends MultichainCore {
   }
 };
 _provider = new WeakMap();
+_providerTransportWrapper = new WeakMap();
 _transport2 = new WeakMap();
 _dappClient = new WeakMap();
 _beforeUnloadListener = new WeakMap();
 _listener = new WeakMap();
 _sdkInfo = new WeakMap();
-_MultichainSDK_instances = new WeakSet();
+_MetaMaskConnectMultichain_instances = new WeakSet();
 setupAnalytics_fn = function() {
   return __async(this, null, function* () {
     var _a2;
@@ -2456,19 +2661,21 @@ getStoredTransport_fn = function() {
         if (hasExtensionInstalled) {
           const apiTransport = new DefaultTransport();
           __privateSet(this, _transport2, apiTransport);
+          __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
           __privateSet(this, _listener, apiTransport.onNotification(
-            __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+            __privateMethod(this, _MetaMaskConnectMultichain_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 dappClient = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, createDappClient_fn).call(this);
         const apiTransport = new MWPTransport(dappClient, kvstore);
         __privateSet(this, _dappClient, dappClient);
         __privateSet(this, _transport2, apiTransport);
+        __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
         __privateSet(this, _listener, apiTransport.onNotification(
-          __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+          __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
         ));
         return apiTransport;
       }
@@ -2479,20 +2686,20 @@ getStoredTransport_fn = function() {
 };
 setupTransport_fn = function() {
   return __async(this, null, function* () {
-    const transport = yield __privateMethod(this, _MultichainSDK_instances, getStoredTransport_fn).call(this);
+    const transport = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, getStoredTransport_fn).call(this);
     if (transport) {
       if (!this.transport.isConnected()) {
-        this.state = "connecting";
+        this.status = "connecting";
         yield this.transport.connect();
       }
-      this.state = "connected";
+      this.status = "connected";
       if (this.transport instanceof MWPTransport) {
         yield this.storage.setTransport("mwp" /* MWP */);
       } else {
         yield this.storage.setTransport("browser" /* Browser */);
       }
     } else {
-      this.state = "loaded";
+      this.status = "loaded";
     }
   });
 };
@@ -2503,8 +2710,8 @@ init_fn = function() {
       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);
+        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,
@@ -2520,7 +2727,7 @@ init_fn = function() {
       }
     } catch (error) {
       yield this.storage.removeTransport();
-      this.state = "pending";
+      this.status = "pending";
       logger2("MetaMaskSDK error during initialization", error);
     }
   });
@@ -2548,12 +2755,13 @@ setupMWP_fn = function() {
       return;
     }
     const { adapter: kvstore } = this.options.storage;
-    const dappClient = yield __privateMethod(this, _MultichainSDK_instances, createDappClient_fn).call(this);
+    const dappClient = yield __privateMethod(this, _MetaMaskConnectMultichain_instances, createDappClient_fn).call(this);
     __privateSet(this, _dappClient, dappClient);
     const apiTransport = new MWPTransport(dappClient, kvstore);
     __privateSet(this, _transport2, apiTransport);
+    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
     __privateSet(this, _listener, this.transport.onNotification(
-      __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+      __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
     yield this.storage.setTransport("mwp" /* MWP */);
   });
@@ -2568,18 +2776,18 @@ onBeforeUnload_fn = function() {
 };
 createBeforeUnloadListener_fn = function() {
   if (typeof window !== "undefined" && typeof window.addEventListener !== "undefined") {
-    window.addEventListener("beforeunload", __privateMethod(this, _MultichainSDK_instances, onBeforeUnload_fn).bind(this));
+    window.addEventListener("beforeunload", __privateMethod(this, _MetaMaskConnectMultichain_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)
+        __privateMethod(this, _MetaMaskConnectMultichain_instances, onBeforeUnload_fn).bind(this)
       );
     }
   };
 };
-renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds) {
+renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
     return new Promise((resolve, reject) => {
       this.options.ui.factory.renderInstallModal(
@@ -2607,19 +2815,19 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds)
             (() => __async(this, null, function* () {
               var _a2;
               try {
-                yield this.transport.connect({ scopes, caipAccountIds });
+                yield this.transport.connect({ scopes, caipAccountIds, sessionProperties });
                 yield this.options.ui.factory.unload();
                 (_a2 = this.options.ui.factory.modal) == null ? void 0 : _a2.unmount();
-                this.state = "connected";
+                this.status = "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";
+                    this.status = "disconnected";
                     reject(error);
                   }
                 } else {
-                  this.state = "disconnected";
+                  this.status = "disconnected";
                   reject(
                     error instanceof Error ? error : new Error(String(error))
                   );
@@ -2637,33 +2845,83 @@ renderInstallModalAsync_fn = function(desktopPreferred, scopes, caipAccountIds)
             yield this.storage.setTransport("mwp" /* MWP */);
             resolve();
           }
-        })
+        }),
+        (uri) => {
+          this.emit("display_uri", uri);
+        }
       ).catch((error) => {
         reject(error instanceof Error ? error : new Error(String(error)));
       });
     });
   });
 };
-showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds) {
+showInstallModal_fn = function(desktopPreferred, scopes, caipAccountIds, sessionProperties) {
   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);
+    (_a2 = __privateGet(this, _beforeUnloadListener)) != null ? _a2 : __privateSet(this, _beforeUnloadListener, __privateMethod(this, _MetaMaskConnectMultichain_instances, createBeforeUnloadListener_fn).call(this));
+    if (this.options.ui.headless) {
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, headlessConnect_fn).call(this, scopes, caipAccountIds, sessionProperties);
+    } else {
+      yield __privateMethod(this, _MetaMaskConnectMultichain_instances, renderInstallModalAsync_fn).call(this, desktopPreferred, scopes, caipAccountIds, sessionProperties);
+    }
+  });
+};
+headlessConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
+  return __async(this, null, function* () {
+    return new Promise((resolve, reject) => {
+      if (this.dappClient.state === "CONNECTED" || this.dappClient.state === "CONNECTING") {
+        this.dappClient.disconnect().catch(() => {
+        });
+      }
+      this.dappClient.on(
+        "session_request",
+        (sessionRequest) => {
+          const connectionRequest = {
+            sessionRequest,
+            metadata: {
+              dapp: this.options.dapp,
+              sdk: {
+                version: getVersion(),
+                platform: getPlatformType()
+              }
+            }
+          };
+          const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+          this.emit("display_uri", deeplink);
+        }
+      );
+      this.transport.connect({ scopes, caipAccountIds, sessionProperties }).then(() => __async(this, null, function* () {
+        this.status = "connected";
+        yield this.storage.setTransport("mwp" /* MWP */);
+        resolve();
+      })).catch((error) => __async(this, null, function* () {
+        if (error instanceof import_mobile_wallet_protocol_core2.ProtocolError) {
+          this.status = "disconnected";
+          yield this.storage.removeTransport();
+          reject(error);
+        } else {
+          this.status = "disconnected";
+          yield this.storage.removeTransport();
+          reject(error instanceof Error ? error : new Error(String(error)));
+        }
+      }));
+    });
   });
 };
 setupDefaultTransport_fn = function() {
   return __async(this, null, function* () {
-    this.state = "connecting";
+    this.status = "connecting";
     yield this.storage.setTransport("browser" /* Browser */);
     const transport = new DefaultTransport();
     __privateSet(this, _listener, transport.onNotification(
-      __privateMethod(this, _MultichainSDK_instances, onTransportNotification_fn).bind(this)
+      __privateMethod(this, _MetaMaskConnectMultichain_instances, onTransportNotification_fn).bind(this)
     ));
     __privateSet(this, _transport2, transport);
+    __privateGet(this, _providerTransportWrapper).setupNotifcationListener();
     return transport;
   });
 };
-deeplinkConnect_fn = function(scopes, caipAccountIds) {
+deeplinkConnect_fn = function(scopes, caipAccountIds, sessionProperties) {
   return __async(this, null, function* () {
     return new Promise((resolve, reject) => {
       const dappClientMessageHandler = (payload) => {
@@ -2706,6 +2964,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds) {
             const universalLink = this.options.ui.factory.createConnectionUniversalLink(
               connectionRequest
             );
+            this.emit("display_uri", deeplink);
             if ((_a2 = this.options.mobile) == null ? void 0 : _a2.preferredOpenLink) {
               this.options.mobile.preferredOpenLink(deeplink, "_self");
             } else {
@@ -2714,7 +2973,7 @@ deeplinkConnect_fn = function(scopes, caipAccountIds) {
           }
         );
       }
-      return this.transport.connect({ scopes, caipAccountIds }).then(resolve).catch((error) => __async(this, null, function* () {
+      return this.transport.connect({ scopes, caipAccountIds, sessionProperties }).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)));
@@ -2728,9 +2987,9 @@ deeplinkConnect_fn = function(scopes, caipAccountIds) {
 };
 handleConnection_fn = function(promise, scopes, transportType) {
   return __async(this, null, function* () {
-    this.state = "connecting";
+    this.status = "connecting";
     return promise.then(() => __async(this, null, function* () {
-      this.state = "connected";
+      this.status = "connected";
       try {
         const baseProps = yield getBaseAnalyticsProperties(
           this.options,
@@ -2745,7 +3004,7 @@ handleConnection_fn = function(promise, scopes, transportType) {
       }
       return void 0;
     })).catch((error) => __async(this, null, function* () {
-      this.state = "disconnected";
+      this.status = "disconnected";
       try {
         const baseProps = yield getBaseAnalyticsProperties(
           this.options,
@@ -2768,7 +3027,7 @@ handleConnection_fn = function(promise, scopes, transportType) {
     }));
   });
 };
-var MultichainSDK = _MultichainSDK;
+var MetaMaskConnectMultichain = _MetaMaskConnectMultichain;
 
 // src/store/index.ts
 var uuid = __toESM(require("uuid"));
@@ -2949,28 +3208,11 @@ var Store = class extends StoreClient {
   }
 };
 
-// src/ui/index.ts
+// src/ui/ModalFactory.ts
 var import_onboarding = __toESM(require("@metamask/onboarding"));
 init_domain();
 init_utils();
-
-// src/ui/preload.web.ts
-function preload() {
-  return __async(this, null, function* () {
-    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 {
+var BaseModalFactory = class {
   /**
    * Creates a new modal factory instance.
    *
@@ -3059,15 +3301,17 @@ var ModalFactory = class {
   onStartDesktopOnboarding() {
     new import_onboarding.default().startOnboarding();
   }
-  renderInstallModal(showInstallModal, createConnectionRequest, successCallback) {
+  renderInstallModal(showInstallModal, createConnectionRequest, successCallback, onDisplayUri) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a2, _b;
       (_a2 = this.modal) == null ? void 0 : _a2.unmount();
-      yield preload();
+      yield this.preload();
       this.successCallback = successCallback;
+      this.displayUriCallback = onDisplayUri;
       const parentElement = this.getMountedContainer();
       const connectionRequest = yield createConnectionRequest();
       const qrCodeLink = this.createConnectionDeeplink(connectionRequest);
+      (_b = this.displayUriCallback) == null ? void 0 : _b.call(this, qrCodeLink);
       const modal = new this.options.InstallModal({
         expiresIn: (connectionRequest.sessionRequest.expiresAt - Date.now()) / 1e3,
         connectionRequest,
@@ -3076,11 +3320,15 @@ var ModalFactory = class {
         link: qrCodeLink,
         sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
-          return this.createConnectionDeeplink(request);
+          var _a3;
+          const newLink = this.createConnectionDeeplink(request);
+          (_a3 = this.displayUriCallback) == null ? void 0 : _a3.call(this, newLink);
+          return newLink;
         }),
         onClose: this.onCloseModal.bind(this),
         startDesktopOnboarding: this.onStartDesktopOnboarding.bind(this),
-        createConnectionRequest
+        createConnectionRequest,
+        onDisplayUri: this.displayUriCallback
       });
       this.modal = modal;
       modal.mount();
@@ -3090,7 +3338,7 @@ var ModalFactory = class {
     return __async(this, null, function* () {
       var _a2;
       (_a2 = this.modal) == null ? void 0 : _a2.unmount();
-      yield preload();
+      yield this.preload();
       this.successCallback = successCallback;
       const container = this.getMountedContainer();
       const otpCode = yield createOTPCode();
@@ -3108,9 +3356,31 @@ var ModalFactory = class {
   }
 };
 
+// src/ui/index.ts
+function preload() {
+  return __async(this, null, function* () {
+    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);
+    }
+  });
+}
+var ModalFactory = class extends BaseModalFactory {
+  preload() {
+    return __async(this, null, function* () {
+      return preload();
+    });
+  }
+};
+
 // src/index.browser.ts
 init_domain();
-var createMetamaskConnect = (options) => __async(null, null, function* () {
+var createMultichainClient = (options) => __async(null, null, function* () {
   const uiModules = yield Promise.resolve().then(() => (init_web(), web_exports));
   let storage;
   if (!options.storage) {
@@ -3121,7 +3391,7 @@ var createMetamaskConnect = (options) => __async(null, null, function* () {
     storage = options.storage;
   }
   const factory = new ModalFactory(uiModules);
-  return MultichainSDK.create(__spreadProps(__spreadValues({}, options), {
+  return MetaMaskConnectMultichain.create(__spreadProps(__spreadValues({}, options), {
     storage,
     ui: __spreadProps(__spreadValues({}, options.ui), {
       factory