fix: signClient.connect connection hanged

airgap-it · Dec 20, 2024 · b2a8567 · b2a8567
1 parent 58d0f1d
commit b2a8567
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/packages/beacon-core/src/constants.ts b/packages/beacon-core/src/constants.ts
@@ -1,5 +1,5 @@
-export const SDK_VERSION: string = '4.3.1'
-export const BEACON_VERSION: string = '3'
+export const SDK_VERSION: string = '4.3.2-beta.0'
+export const BEACON_VERSION: string = '4'
 
 export const NOTIFICATION_ORACLE_URL: string =
   'https://beacon-notification-oracle.dev.gke.papers.tech'
diff --git a/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts b/...acon-transport-walletconnect/src/communication-client/WalletConnectCommunicationClient.ts
@@ -625,11 +625,16 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
       }
     }
 
-    const { uri, approval } = await signClient.connect(connectParams).catch((error) => {
-      logger.error(`Init error: ${error.message}`)
-      localStorage && localStorage.setItem(StorageKey.WC_INIT_ERROR, error.message)
-      throw new Error(error.message)
-    })
+    const { uri, approval }: { uri: string, approval: () => Promise<SessionTypes.Struct> } =
+      await Promise.race([
+        signClient.connect(connectParams),
+        new Promise<any>((_, reject) => setTimeout(() => reject(new Error('The connection timed out.')), 60000))
+      ])
+        .catch((error) => {
+          logger.error(`Init error: ${error.message}`)
+          localStorage && localStorage.setItem(StorageKey.WC_INIT_ERROR, error.message)
+          throw new Error(error.message)
+        })
 
     // Extract topic from uri. Format is wc:topic@2...
     const topic = getStringBetween(uri, ':', '@')
@@ -1043,7 +1048,11 @@ export class WalletConnectCommunicationClient extends CommunicationClient {
 
     try {
       logger.debug('connect', [pairingTopic])
-      const { approval } = await signClient.connect(connectParams)
+      const { approval }: { approval: () => Promise<SessionTypes.Struct> } =
+        await Promise.race([
+          signClient.connect(connectParams),
+          new Promise<any>((_, reject) => setTimeout(() => reject(new Error('The connection timed out.')), 60000))
+        ])
       logger.debug('before await approal', [pairingTopic])
       const session = await approval()
       logger.debug('after await approal, have session', [pairingTopic])