@metamask/connect-multichain 0.3.0 → 0.3.2

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

@@ -2,7 +2,7 @@ import debug from 'debug';
 import { SessionData, Transport, TransportRequest, TransportResponse, MultichainApiClient } from '@metamask/multichain-api-client';
 export { SessionData } from '@metamask/multichain-api-client';
 import { CaipAccountId, Json } from '@metamask/utils';
-import { SessionRequest } from '@metamask/mobile-wallet-protocol-core';
+import { SessionRequest, Session } from '@metamask/mobile-wallet-protocol-core';
 import { Components } from '@metamask/multichain-ui';
 
 type Enumerate<N extends number, Acc extends number[] = []> = Acc['length'] extends N ? Acc[number] : Enumerate<N, [...Acc, Acc['length']]>;
@@ -326,8 +326,8 @@ declare class ModalFactory<T extends FactoryModals = FactoryModals> {
     get isWeb(): boolean;
     private getContainer;
     private getMountedContainer;
-    createDeeplink(connectionRequest?: ConnectionRequest): string;
-    createUniversalLink(connectionRequest?: ConnectionRequest): string;
+    createConnectionDeeplink(connectionRequest?: ConnectionRequest): string;
+    createConnectionUniversalLink(connectionRequest?: ConnectionRequest): string;
     private onCloseModal;
     private onStartDesktopOnboarding;
     renderInstallModal(showInstallModal: boolean, createConnectionRequest: () => Promise<ConnectionRequest>, successCallback: (error?: Error) => Promise<void>): Promise<void>;
@@ -444,6 +444,7 @@ type ExtendedTransport = Omit<Transport, 'connect'> & {
     sendEip1193Message: <TRequest extends TransportRequest, TResponse extends TransportResponse>(request: TRequest, options?: {
         timeout?: number;
     }) => Promise<TResponse>;
+    getActiveSession: () => Promise<Session | undefined>;
 };
 
 declare const infuraRpcUrls: RpcUrlsMap;

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

@@ -1381,13 +1381,18 @@ var RequestRouter = class {
         const secure = isSecure();
         const shouldOpenDeeplink = secure && !showInstallModal;
         if (shouldOpenDeeplink) {
-          setTimeout(() => {
+          setTimeout(() => __async(this, null, function* () {
+            const session = yield this.transport.getActiveSession();
+            if (!session) {
+              throw new Error("No active session found");
+            }
+            const url = `${METAMASK_DEEPLINK_BASE}/mwp?id=${encodeURIComponent(session.id)}`;
             if (mobile == null ? void 0 : mobile.preferredOpenLink) {
-              mobile.preferredOpenLink(METAMASK_DEEPLINK_BASE, "_self");
+              mobile.preferredOpenLink(url, "_self");
             } else {
-              openDeeplink(this.config, METAMASK_DEEPLINK_BASE, METAMASK_CONNECT_BASE_URL);
+              openDeeplink(this.config, url, METAMASK_CONNECT_BASE_URL);
             }
-          }, 10);
+          }), 10);
         }
         const response = yield request;
         if (response.error) {
@@ -1607,6 +1612,10 @@ var DefaultTransport = class {
         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"));
@@ -1630,6 +1639,9 @@ var DefaultTransport = class {
       __privateGet(this, _notificationCallbacks).delete(callback);
     };
   }
+  getActiveSession() {
+    throw new Error("getActiveSession is purposely not implemented for the DefaultTransport");
+  }
 };
 _notificationCallbacks = new WeakMap();
 _transport = new WeakMap();
@@ -1912,16 +1924,10 @@ var MWPTransport = class {
   }
   connect(options) {
     return __async(this, null, function* () {
-      const { dappClient, kvstore } = this;
-      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
-      let session;
-      try {
-        const [activeSession] = yield sessionStore.list();
-        if (activeSession) {
-          logger("active session found", activeSession);
-          session = activeSession;
-        }
-      } catch (e) {
+      const { dappClient } = this;
+      const session = yield this.getActiveSession();
+      if (session) {
+        logger("active session found", session);
       }
       let timeout;
       const connectionPromise = new Promise((resolve, reject) => {
@@ -2092,6 +2098,9 @@ var MWPTransport = class {
   }
   storeWalletSession(request, response) {
     return __async(this, null, function* () {
+      if (response.error) {
+        return;
+      }
       if (CACHED_METHOD_LIST.includes(request.method)) {
         yield this.kvstore.set(SESSION_STORE_KEY, JSON.stringify(response));
       } else if (request.method === "eth_accounts") {
@@ -2150,6 +2159,19 @@ var MWPTransport = class {
       this.notificationCallbacks.delete(callback);
     };
   }
+  getActiveSession() {
+    return __async(this, null, function* () {
+      const { kvstore } = this;
+      const sessionStore = new import_mobile_wallet_protocol_core.SessionStore(kvstore);
+      try {
+        const [activeSession] = yield sessionStore.list();
+        return activeSession;
+      } catch (error) {
+        logger("error getting active session", error);
+        return void 0;
+      }
+    });
+  }
 };
 
 // src/multichain/transports/mwp/KeyManager.ts
@@ -2533,8 +2555,8 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
                   sdk: { version: getVersion(), platform: getPlatformType() }
                 }
               };
-              const deeplink = this.options.ui.factory.createDeeplink(connectionRequest);
-              const universalLink = this.options.ui.factory.createUniversalLink(connectionRequest);
+              const deeplink = this.options.ui.factory.createConnectionDeeplink(connectionRequest);
+              const universalLink = this.options.ui.factory.createConnectionUniversalLink(connectionRequest);
               if ((_a = this.options.mobile) == null ? void 0 : _a.preferredOpenLink) {
                 this.options.mobile.preferredOpenLink(deeplink, "_self");
               } else {
@@ -2717,17 +2739,22 @@ var MultichainSDK = class _MultichainSDK extends MultichainCore {
     const secure = isSecure();
     const shouldOpenDeeplink = secure && !showInstallModal;
     if (shouldOpenDeeplink) {
-      setTimeout(() => {
+      setTimeout(() => __async(this, null, function* () {
+        const session = yield this.transport.getActiveSession();
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const url = `${METAMASK_DEEPLINK_BASE}/mwp?id=${encodeURIComponent(session.id)}`;
         if (mobile == null ? void 0 : mobile.preferredOpenLink) {
-          mobile.preferredOpenLink(METAMASK_DEEPLINK_BASE, "_self");
+          mobile.preferredOpenLink(url, "_self");
         } else {
           openDeeplink(
             this.options,
-            METAMASK_DEEPLINK_BASE,
+            url,
             METAMASK_CONNECT_BASE_URL
           );
         }
-      }, 10);
+      }), 10);
     }
   }
 };
@@ -3019,16 +3046,16 @@ var ModalFactory = class {
     }
     return container;
   }
-  createDeeplink(connectionRequest) {
+  createConnectionDeeplink(connectionRequest) {
     if (!connectionRequest) {
-      throw new Error("createDeeplink can only be called with a connection request");
+      throw new Error("createConnectionDeeplink can only be called with a connection request");
     }
     const json = JSON.stringify(connectionRequest);
     const compressed = compressString(json);
     const urlEncoded = encodeURIComponent(compressed);
     return `${METAMASK_DEEPLINK_BASE}/mwp?p=${urlEncoded}&c=1`;
   }
-  createUniversalLink(connectionRequest) {
+  createConnectionUniversalLink(connectionRequest) {
     if (!connectionRequest) {
       return `${METAMASK_CONNECT_BASE_URL}`;
     }
@@ -3055,7 +3082,7 @@ var ModalFactory = class {
       this.successCallback = successCallback;
       const parentElement = this.getMountedContainer();
       const connectionRequest = yield createConnectionRequest();
-      const qrCodeLink = this.createDeeplink(connectionRequest);
+      const qrCodeLink = this.createConnectionDeeplink(connectionRequest);
       const modal = new this.options.InstallModal({
         expiresIn: (connectionRequest.sessionRequest.expiresAt - Date.now()) / 1e3,
         connectionRequest,
@@ -3064,7 +3091,7 @@ var ModalFactory = class {
         link: qrCodeLink,
         sdkVersion: getVersion(),
         generateQRCode: (request) => __async(this, null, function* () {
-          return this.createDeeplink(request);
+          return this.createConnectionDeeplink(request);
         }),
         onClose: this.onCloseModal.bind(this),
         startDesktopOnboarding: this.onStartDesktopOnboarding.bind(this),