From f6a9a3bbd0138032337eedfca3bd1b78b7b8f629 Mon Sep 17 00:00:00 2001 From: Leibale Eidelman Date: Sat, 28 Jan 2023 18:12:12 -0500 Subject: [PATCH 1/2] fix #2395 - fix reconnecting event --- packages/client/lib/client/socket.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/client/lib/client/socket.ts b/packages/client/lib/client/socket.ts index 4c64f899559..7a5adabdf74 100644 --- a/packages/client/lib/client/socket.ts +++ b/packages/client/lib/client/socket.ts @@ -162,17 +162,16 @@ export default class RedisSocket extends EventEmitter { this.#isReady = true; this.emit('ready'); } catch (err) { - const retryIn = this.#shouldReconnect(retries, err as Error); + const retryIn = this.#shouldReconnect(retries++, err as Error); if (typeof retryIn !== 'number') { throw retryIn; } this.emit('error', err); await promiseTimeout(retryIn); + + this.emit('reconnecting'); } - - retries++; - this.emit('reconnecting'); } while (this.#isOpen && !this.#isReady); } From c66fd08d2f38d00c55186cfb1607daabb04f5e13 Mon Sep 17 00:00:00 2001 From: Leibale Eidelman Date: Sat, 28 Jan 2023 18:18:43 -0500 Subject: [PATCH 2/2] Update socket.ts --- packages/client/lib/client/socket.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client/lib/client/socket.ts b/packages/client/lib/client/socket.ts index 7a5adabdf74..ac3b7f5bf3b 100644 --- a/packages/client/lib/client/socket.ts +++ b/packages/client/lib/client/socket.ts @@ -169,7 +169,6 @@ export default class RedisSocket extends EventEmitter { this.emit('error', err); await promiseTimeout(retryIn); - this.emit('reconnecting'); } } while (this.#isOpen && !this.#isReady);