Won't show challenge timeout error

Signed-off-by: Yilun <[email protected]>
nknorg · Mar 29, 2023 · 433ea40 · 433ea40
1 parent fa95a95
commit 433ea40
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 15 deletions.
diff --git a/__tests__/client.js b/__tests__/client.js
@@ -28,7 +28,7 @@ class ClientTest {
         new Promise(resolve => this.alice.onConnect(resolve)),
         new Promise(resolve => this.bob.onConnect(resolve)),
       ]);
-      await new Promise(resolve => setTimeout(resolve, 1000));
+      await new Promise(resolve => setTimeout(resolve, 10000));
       expect(this.alice.isReady).toBe(true);
       expect(this.bob.isReady).toBe(true);
     });

diff --git a/__tests__/session.js b/__tests__/session.js
@@ -75,7 +75,7 @@ class SessionTest {
         new Promise(resolve => this.alice.onConnect(resolve)),
         new Promise(resolve => this.bob.onConnect(resolve)),
       ]);
-      await new Promise(resolve => setTimeout(resolve, 1000));
+      await new Promise(resolve => setTimeout(resolve, 10000));
       expect(this.alice.isReady).toBe(true);
       expect(this.bob.isReady).toBe(true);
     });

diff --git a/dist/nkn.js b/dist/nkn.js
@@ -701,10 +701,10 @@ class Client {
     }
 
     let challengeDone;
-    let challengeHandler = new Promise(async (resolve, reject) => {
+    let challengeHandler = new Promise((resolve, reject) => {
       challengeDone = resolve;
       setTimeout(() => {
-        reject(new Error('Challenge timeout'));
+        reject(new common.errors.ChallengeTimeoutError());
       }, consts.waitForChallengeTimeout);
     });
 
@@ -722,7 +722,9 @@ class Client {
           data.Signature = common.util.bytesToHex(req.Signature);
         }
       } catch (e) {
-        console.log(e);
+        if (!e instanceof common.errors.ChallengeTimeoutError) {
+          console.log(e);
+        }
       }
 
       ws.send(JSON.stringify(data));
@@ -1682,7 +1684,7 @@ async function sign(privateKey, message) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rpcRespErrCodes = exports.WrongPasswordError = exports.UnknownError = exports.ServerError = exports.RpcTimeoutError = exports.RpcError = exports.NotEnoughBalanceError = exports.InvalidWalletVersionError = exports.InvalidWalletFormatError = exports.InvalidResponseError = exports.InvalidDestinationError = exports.InvalidArgumentError = exports.InvalidAddressError = exports.DecryptionError = exports.DataSizeTooLargeError = exports.ClientNotReadyError = exports.AddrNotAllowedError = void 0;
+exports.rpcRespErrCodes = exports.WrongPasswordError = exports.UnknownError = exports.ServerError = exports.RpcTimeoutError = exports.RpcError = exports.NotEnoughBalanceError = exports.InvalidWalletVersionError = exports.InvalidWalletFormatError = exports.InvalidResponseError = exports.InvalidDestinationError = exports.InvalidArgumentError = exports.InvalidAddressError = exports.DecryptionError = exports.DataSizeTooLargeError = exports.ClientNotReadyError = exports.ChallengeTimeoutError = exports.AddrNotAllowedError = void 0;
 const rpcRespErrCodes = {
   success: 0,
   wrongNode: 48001,
@@ -1941,6 +1943,21 @@ class RpcError extends Error {
 }
 
 exports.RpcError = RpcError;
+
+class ChallengeTimeoutError extends Error {
+  constructor(message = 'challenge timeout', ...params) {
+    super(message, ...params);
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, ChallengeTimeoutError);
+    }
+
+    this.name = 'ChallengeTimeoutError';
+  }
+
+}
+
+exports.ChallengeTimeoutError = ChallengeTimeoutError;
 },{}],9:[function(require,module,exports){
 'use strict';
 

diff --git a/dist/nkn.min.js b/dist/nkn.min.js
diff --git a/lib/client/client.js b/lib/client/client.js
@@ -700,10 +700,10 @@ class Client {
     }
 
     let challengeDone;
-    let challengeHandler = new Promise(async (resolve, reject) => {
+    let challengeHandler = new Promise((resolve, reject) => {
       challengeDone = resolve;
       setTimeout(() => {
-        reject(new Error('Challenge timeout'));
+        reject(new common.errors.ChallengeTimeoutError());
       }, consts.waitForChallengeTimeout);
     });
 
@@ -721,7 +721,9 @@ class Client {
           data.Signature = common.util.bytesToHex(req.Signature);
         }
       } catch (e) {
-        console.log(e);
+        if (!e instanceof common.errors.ChallengeTimeoutError) {
+          console.log(e);
+        }
       }
 
       ws.send(JSON.stringify(data));

diff --git a/lib/common/errors.js b/lib/common/errors.js
@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.rpcRespErrCodes = exports.WrongPasswordError = exports.UnknownError = exports.ServerError = exports.RpcTimeoutError = exports.RpcError = exports.NotEnoughBalanceError = exports.InvalidWalletVersionError = exports.InvalidWalletFormatError = exports.InvalidResponseError = exports.InvalidDestinationError = exports.InvalidArgumentError = exports.InvalidAddressError = exports.DecryptionError = exports.DataSizeTooLargeError = exports.ClientNotReadyError = exports.AddrNotAllowedError = void 0;
+exports.rpcRespErrCodes = exports.WrongPasswordError = exports.UnknownError = exports.ServerError = exports.RpcTimeoutError = exports.RpcError = exports.NotEnoughBalanceError = exports.InvalidWalletVersionError = exports.InvalidWalletFormatError = exports.InvalidResponseError = exports.InvalidDestinationError = exports.InvalidArgumentError = exports.InvalidAddressError = exports.DecryptionError = exports.DataSizeTooLargeError = exports.ClientNotReadyError = exports.ChallengeTimeoutError = exports.AddrNotAllowedError = void 0;
 const rpcRespErrCodes = {
   success: 0,
   wrongNode: 48001,
@@ -261,4 +261,19 @@ class RpcError extends Error {
 
 }
 
-exports.RpcError = RpcError;
+exports.RpcError = RpcError;
+
+class ChallengeTimeoutError extends Error {
+  constructor(message = 'challenge timeout', ...params) {
+    super(message, ...params);
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, ChallengeTimeoutError);
+    }
+
+    this.name = 'ChallengeTimeoutError';
+  }
+
+}
+
+exports.ChallengeTimeoutError = ChallengeTimeoutError;
diff --git a/src/client/client.js b/src/client/client.js
@@ -614,10 +614,10 @@ export default class Client {
     }
 
     let challengeDone: Function;
-    let challengeHandler: Promise<SaltAndSignature> = new Promise<SaltAndSignature>(async (resolve, reject) => {
+    let challengeHandler: Promise<SaltAndSignature> = new Promise<SaltAndSignature>((resolve, reject) => {
       challengeDone = resolve;
       setTimeout(() => {
-        reject(new Error('Challenge timeout'));
+        reject(new common.errors.ChallengeTimeoutError());
       }, waitForChallengeTimeout);
     });
 
@@ -633,7 +633,9 @@ export default class Client {
           data.Signature = common.util.bytesToHex(req.Signature);
         }
       } catch (e) {
-        console.log(e);
+        if (!e instanceof common.errors.ChallengeTimeoutError) {
+          console.log(e);
+        }
       }
       ws.send(JSON.stringify(data));
       this.shouldReconnect = true;

diff --git a/src/common/errors.js b/src/common/errors.js
@@ -174,3 +174,13 @@ export class RpcError extends Error {
     this.name = 'RpcError';
   }
 }
+
+export class ChallengeTimeoutError extends Error {
+  constructor(message = 'challenge timeout', ...params) {
+    super(message, ...params);
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, ChallengeTimeoutError);
+    }
+    this.name = 'ChallengeTimeoutError';
+  }
+}