--wip-- [skip ci]

Author: nkaradzhov

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

@@ -1,4 +1,4 @@
-import { SinglyLinkedList, DoublyLinkedNode, DoublyLinkedList, EmptyAwareSinglyLinkedList } from './linked-list';
+import { DoublyLinkedNode, DoublyLinkedList, EmptyAwareSinglyLinkedList } from './linked-list';
 import encodeCommand from '../RESP/encoder';
 import { Decoder, PUSH_TYPE_MAPPING, RESP_TYPES } from '../RESP/decoder';
 import { TypeMapping, ReplyUnion, RespVersions, RedisArgument } from '../RESP/types';

packages/client/lib/client/index.ts

@@ -492,7 +492,8 @@ export default class RedisClient<
       console.log(`Moving to ${host}:${port} before ${afterMs}ms`);
 
       // 2
-      this.#paused = true;
+      console.log(`Pausing writing until new socket is ready and all in-flight commands are completed`);
+      // this.#paused = true;
 
       const oldSocket = this.#socket;
       this.#socket = this.#initiateSocket({
@@ -512,17 +513,21 @@ export default class RedisClient<
         // 4
         if(!this.#queue.isWaitingForReply()) {
           // 5 and 6
+          console.log(`All in-flight commands completed`);
+          console.log(`Resume writing`)
           oldSocket.destroy();
           this.#paused = false;
         }
       });
 
       // 4
       this.#queue.events.once('waitingForReplyEmpty', () => {
-
+        console.log(`All in-flight commands completed`);
         // 3
         if(this.#socket.isReady) {
           // 5 and 6
+          console.log(`Connected to ${host}:${port}`);
+          console.log(`Resume writing`)
           oldSocket.destroy();
           this.#paused = false;
         }
@@ -793,7 +798,6 @@ export default class RedisClient<
 
     return new RedisSocket(socketInitiator, options?.socket)
       .on('data', chunk => {
-        console.log('Data received', chunk.toString());
         try {
           this.#queue.decoder.write(chunk);
         } catch (err) {
@@ -802,7 +806,6 @@ export default class RedisClient<
         }
       })
       .on('error', err => {
-        console.error('Socket error', err);
         this.emit('error', err);
         this.#clientSideCache?.onError();
         if (this.#socket.isOpen && !this.#options?.disableOfflineQueue) {

packages/client/lib/client/linked-list.ts

@@ -218,7 +218,7 @@ export class EmptyAwareSinglyLinkedList<T> extends SinglyLinkedList<T> {
     }
     return ret;
   }
-  remove(node: SinglyLinkedNode<T>, parent: SinglyLinkedNode<T> | undefined): T | undefined {
+  remove(node: SinglyLinkedNode<T>, parent: SinglyLinkedNode<T> | undefined) {
     const old = this.length;
     super.remove(node, parent);
     if(old !== this.length && this.length === 0) {

packages/client/lib/client/socket.ts

@@ -219,6 +219,7 @@ export default class RedisSocket extends EventEmitter {
         try {
           await this.#initiator();
         } catch (err) {
+          console.log('Initiator failed', err);
           this.#socket.destroy();
           this.#socket = undefined;
           throw err;