address PR comments

Author: nkaradzhov

packages/client/lib/client/commands-queue.ts

@@ -3,7 +3,7 @@ import encodeCommand from '../RESP/encoder';
 import { Decoder, PUSH_TYPE_MAPPING, RESP_TYPES } from '../RESP/decoder';
 import { TypeMapping, ReplyUnion, RespVersions, RedisArgument } from '../RESP/types';
 import { ChannelListeners, PubSub, PubSubCommand, PubSubListener, PubSubType, PubSubTypeListeners } from './pub-sub';
-import { AbortError, ErrorReply, CommandTimeoutDuringMaintananceError, TimeoutError } from '../errors';
+import { AbortError, ErrorReply, CommandTimeoutDuringMaintenanceError, TimeoutError } from '../errors';
 import { MonitorCallback } from '.';
 import { dbgMaintenance } from './enterprise-maintenance-manager';
 
@@ -107,7 +107,7 @@ export default class RedisCommandsQueue {
         signal,
         listener: () => {
           this.#toWrite.remove(node);
-          command.reject(new CommandTimeoutDuringMaintananceError(newTimeout));
+          command.reject(new CommandTimeoutDuringMaintenanceError(newTimeout));
         },
         originalTimeout: command.timeout?.originalTimeout
       };
@@ -231,7 +231,7 @@ export default class RedisCommandsQueue {
           signal,
           listener: () => {
             this.#toWrite.remove(node);
-            value.reject(wasInMaintenance ? new CommandTimeoutDuringMaintananceError(timeout) : new TimeoutError());
+            value.reject(wasInMaintenance ? new CommandTimeoutDuringMaintenanceError(timeout) : new TimeoutError());
           },
           originalTimeout: options?.timeout
         };

packages/client/lib/client/enterprise-maintenance-manager.ts

@@ -221,27 +221,25 @@ export default class EnterpriseMaintenanceManager {
     } else {
       tmpOptions.socket = {
         ...tmpOptions.socket,
-        host, port
+        host,
+        port
       }
     }
     const tmpClient = this.#client.duplicate(tmpOptions);
     dbgMaintenance(`Tmp client created in ${( performance.now() - start ).toFixed(2)}ms`);
-    dbgMaintenance(`Connecting tmp client: ${host}:${port}`);
-    start = performance.now();
+    dbgMaintenance(
+      `Set timeout for tmp client to ${this.#options.maintRelaxedSocketTimeout}`,
+    );
     tmpClient._maintenanceUpdate({
       relaxedCommandTimeout: this.#options.maintRelaxedCommandTimeout,
       relaxedSocketTimeout: this.#options.maintRelaxedSocketTimeout,
     });
+    dbgMaintenance(`Connecting tmp client: ${host}:${port}`);
+    start = performance.now();
     await tmpClient.connect();
     dbgMaintenance(`Connected to tmp client in ${(performance.now() - start).toFixed(2)}ms`);
     // 3 [EVENT] New socket connected
 
-    //TODO
-    // dbgMaintenance(
-    //   `Set timeout for new socket to ${this.#options.maintRelaxedSocketTimeout}`,
-    // );
-    // newSocket.setMaintenanceTimeout(this.#options.maintRelaxedSocketTimeout);
-
     dbgMaintenance(`Wait for all in-flight commands to complete`);
     await this.#commandsQueue.waitForInflightCommandsToComplete();
     dbgMaintenance(`In-flight commands completed`);
@@ -260,7 +258,7 @@ export default class EnterpriseMaintenanceManager {
     this.#onMigrated();
   };
 
-  #onMigrating = async () => {
+  #onMigrating = () => {
     this.#isMaintenance++;
     if (this.#isMaintenance > 1) {
       dbgMaintenance(`Timeout relaxation already done`);
@@ -275,9 +273,9 @@ export default class EnterpriseMaintenanceManager {
     this.#client._maintenanceUpdate(update);
   };
 
-  #onMigrated = async () => {
-    this.#isMaintenance--;
-    assert(this.#isMaintenance >= 0);
+  #onMigrated = () => {
+    //ensure that #isMaintenance doesnt go under 0
+    this.#isMaintenance = Math.max(this.#isMaintenance - 1, 0);
     if (this.#isMaintenance > 0) {
       dbgMaintenance(`Not ready to unrelax timeouts yet`);
       return;

packages/client/lib/client/index.ts

@@ -171,15 +171,15 @@ export interface RedisClientOptions<
   /**
    * Specifies a more relaxed timeout (in milliseconds) for commands during a maintenance window.
    * This helps minimize command timeouts during maintenance. If not provided, the `commandOptions.timeout`
-   * will be used instead. Timeouts during maintenance period result in a `CommandTimeoutDuringMaintanance` error.
+   * will be used instead. Timeouts during maintenance period result in a `CommandTimeoutDuringMaintenance` error.
    *
    * The default is 10000
    */
   maintRelaxedCommandTimeout?: number;
   /**
    * Specifies a more relaxed timeout (in milliseconds) for the socket during a maintenance window.
    * This helps minimize socket timeouts during maintenance. If not provided, the `socket.timeout`
-   * will be used instead. Timeouts during maintenance period result in a `SocketTimeoutDuringMaintanance` error.
+   * will be used instead. Timeouts during maintenance period result in a `SocketTimeoutDuringMaintenance` error.
    *
    * The default is 10000
    */
@@ -943,7 +943,7 @@ export default class RedisClient<
    }
 
    /**
-    * @intenal
+    * @internal
     */
    _insertSocket(socket: RedisSocket) {
      if(this._self.#socket) {

packages/client/lib/client/socket.ts

@@ -1,7 +1,7 @@
 import { EventEmitter, once } from 'node:events';
 import net from 'node:net';
 import tls from 'node:tls';
-import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, ReconnectStrategyError, SocketTimeoutError, SocketTimeoutDuringMaintananceError } from '../errors';
+import { ConnectionTimeoutError, ClientClosedError, SocketClosedUnexpectedlyError, ReconnectStrategyError, SocketTimeoutError, SocketTimeoutDuringMaintenanceError } from '../errors';
 import { setTimeout } from 'node:timers/promises';
 import { RedisArgument } from '../RESP/types';
 import { dbgMaintenance } from './enterprise-maintenance-manager';
@@ -280,7 +280,7 @@ export default class RedisSocket extends EventEmitter {
     if (this.#socketTimeout) {
       socket.once('timeout', () => {
         const error = this.#maintenanceTimeout
-          ? new SocketTimeoutDuringMaintananceError(this.#maintenanceTimeout)
+          ? new SocketTimeoutDuringMaintenanceError(this.#maintenanceTimeout)
           : new SocketTimeoutError(this.#socketTimeout!)
         socket.destroy(error);
       });

packages/client/lib/errors.ts

@@ -71,13 +71,13 @@ export class BlobError extends ErrorReply {}
 
 export class TimeoutError extends Error {}
 
-export class SocketTimeoutDuringMaintananceError extends TimeoutError {
+export class SocketTimeoutDuringMaintenanceError extends TimeoutError {
   constructor(timeout: number) {
     super(`Socket timeout during maintenance. Expecting data, but didn't receive any in ${timeout}ms.`);
   }
 }
 
-export class CommandTimeoutDuringMaintananceError extends TimeoutError {
+export class CommandTimeoutDuringMaintenanceError extends TimeoutError {
   constructor(timeout: number) {
     super(`Command timeout during maintenance. Waited to write command for more than ${timeout}ms.`);
   }