fix(cubestore-driver): Increase retry timeout to avoid endless loop connection retries

paveltiunov · paveltiunov · commit 8bd19fafb36d · 2022-12-21T18:39:36.000-08:00
diff --git a/packages/cubejs-cubestore-driver/src/WebSocketConnection.ts b/packages/cubejs-cubestore-driver/src/WebSocketConnection.ts
@@ -71,7 +71,9 @@ export class WebSocketConnection {
           }
         });
         webSocket.on('pong', () => {
-          this.currentConnectionTry = 0;
+          if (webSocket === this.webSocket) {
+            this.currentConnectionTry = 0;
+          }
           webSocket.lastHeartBeat = new Date();
         });
         webSocket.on('close', () => {
@@ -155,7 +157,7 @@ export class WebSocketConnection {
   }
 
   private retryWaitTime() {
-    return 1000 * this.currentConnectionTry;
+    return 1000 * (this.currentConnectionTry + 1);
   }
 
   private async sendMessage(messageId: number, buffer: Uint8Array): Promise<any> {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,9 @@ export class WebSocketConnection {`
`71`	`71`	`}`
`72`	`72`	`});`
`73`	`73`	`webSocket.on('pong', () => {`
`74`		`- this.currentConnectionTry = 0;`
	`74`	`+ if (webSocket === this.webSocket) {`
	`75`	`+ this.currentConnectionTry = 0;`
	`76`	`+ }`
`75`	`77`	`webSocket.lastHeartBeat = new Date();`
`76`	`78`	`});`
`77`	`79`	`webSocket.on('close', () => {`
`@@ -155,7 +157,7 @@ export class WebSocketConnection {`
`155`	`157`	`}`
`156`	`158`
`157`	`159`	`private retryWaitTime() {`
`158`		`- return 1000 * this.currentConnectionTry;`
	`160`	`+ return 1000 * (this.currentConnectionTry + 1);`
`159`	`161`	`}`
`160`	`162`
`161`	`163`	`private async sendMessage(messageId: number, buffer: Uint8Array): Promise<any> {`