fix: reconnect dappClient on resumed session (#43)

* fix: reconnect dappClient on resumed session

* chore: update CHANGELOG.md

* docs: address code review

Author: ffmcgee725

packages/connect-multichain/CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fix validation of `MWPTransport` connection state after resuming a session ([#43](https://github.com/MetaMask/connect-monorepo/pull/43))
 - Fix install modal not rendering when called from Vite application ([#42](https://github.com/MetaMask/connect-monorepo/pull/42))
 - Fix requests not being sent to the mobile wallet with proper wrapping metadata ([#28](https://github.com/MetaMask/connect-monorepo/pull/28))
 - Fix connections made from within the MetaMask Mobile In-App Browser ([#21](https://github.com/MetaMask/connect-monorepo/pull/21))

packages/connect-multichain/src/multichain/transports/mwp/index.ts

@@ -148,7 +148,7 @@ export class MWPTransport implements ExtendedTransport {
               ...messagePayload,
               method:
                 request.method === 'wallet_getSession' ||
-                  request.method === 'wallet_createSession'
+                request.method === 'wallet_createSession'
                   ? 'wallet_sessionChanged'
                   : request.method,
             } as unknown as {
@@ -160,7 +160,7 @@ export class MWPTransport implements ExtendedTransport {
               ...messagePayload,
               method:
                 request.method === 'wallet_getSession' ||
-                  request.method === 'wallet_createSession'
+                request.method === 'wallet_createSession'
                   ? 'wallet_sessionChanged'
                   : request.method,
               params: requestWithName.result,
@@ -203,7 +203,6 @@ export class MWPTransport implements ExtendedTransport {
     }
   }
 
-
   private async onResumeSuccess(
     resumeResolve: () => void,
     resumeReject: (err: Error) => void,
@@ -449,6 +448,39 @@ export class MWPTransport implements ExtendedTransport {
     return (this.dappClient as any).state === 'CONNECTED';
   }
 
+  /**
+   * Attempts to re-establish a connection via DappClient
+   *
+   * @returns Nothing
+   */
+  // TODO: We should re-evaluate adding this to the WebSocketTransport layer from `@metamask/mobile-wallet-protocol-core`
+  // ticket: https://consensyssoftware.atlassian.net/browse/WAPI-862
+  private async attemptResumeSession(): Promise<void> {
+    try {
+      await this.dappClient.reconnect();
+      // Wait for connection to be established
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error('Resume timeout'));
+        }, 2_000);
+
+        if (this.isConnected()) {
+          clearTimeout(timeout);
+          resolve();
+        } else {
+          this.dappClient.once('connected', () => {
+            clearTimeout(timeout);
+            resolve();
+          });
+        }
+      });
+    } catch (error) {
+      return Promise.reject(
+        new Error(`Failed to resume session: ${error.message}`),
+      );
+    }
+  }
+
   private async getCachedResponse(
     request: { jsonrpc: string; id: string } & TransportRequest,
   ): Promise<TransportResponse | undefined> {
@@ -522,6 +554,10 @@ export class MWPTransport implements ExtendedTransport {
       return cachedWalletSession as TResponse;
     }
 
+    if (!this.isConnected()) {
+      await this.attemptResumeSession();
+    }
+
     return new Promise<TResponse>((resolve, reject) => {
       const timeout = setTimeout(() => {
         this.rejectRequest(request.id, new TransportTimeoutError());