@cubejs-backend/cubestore-driver 0.31.26 → 0.31.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,10 +1,13 @@
1
1
  import { InlineTable } from '@cubejs-backend/base-driver';
2
2
  export declare class WebSocketConnection {
3
3
  protected messageCounter: number;
4
+ protected maxConnectRetries: number;
5
+ protected currentConnectionTry: number;
4
6
  protected webSocket: any;
5
7
  private url;
6
8
  constructor(url: string);
7
9
  protected initWebSocket(): Promise<any>;
10
+ private retryWaitTime;
8
11
  private sendMessage;
9
12
  query(query: string, inlineTables: InlineTable[], queryTracingObj?: any): Promise<any[]>;
10
13
  close(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"WebSocketConnection.d.ts","sourceRoot":"","sources":["../../src/WebSocketConnection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAU1D,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAED,GAAG,EAAE,MAAM;cAKd,aAAa;YAkHf,WAAW;IAiBZ,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAkD9F,KAAK;CAKb"}
1
+ {"version":3,"file":"WebSocketConnection.d.ts","sourceRoot":"","sources":["../../src/WebSocketConnection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAW1D,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC;IAEjC,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAC;IAEpC,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IAEvC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAS;gBAED,GAAG,EAAE,MAAM;cAOd,aAAa;IA6H7B,OAAO,CAAC,aAAa;YAIP,WAAW;IAqBZ,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,eAAe,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAkD9F,KAAK;CAKb"}
@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.WebSocketConnection = void 0;
7
7
  const ws_1 = __importDefault(require("ws"));
8
8
  const flatbuffers_1 = require("flatbuffers");
9
+ const shared_1 = require("@cubejs-backend/shared");
9
10
  const HttpMessage_1 = require("../codegen/HttpMessage");
10
11
  class WebSocketConnection {
11
12
  constructor(url) {
12
13
  this.url = url;
13
14
  this.messageCounter = 1;
15
+ this.maxConnectRetries = shared_1.getEnv('cubeStoreMaxConnectRetries');
16
+ this.currentConnectionTry = 0;
14
17
  }
15
18
  async initWebSocket() {
16
19
  if (!this.webSocket) {
@@ -26,23 +29,35 @@ class WebSocketConnection {
26
29
  }
27
30
  }, 5000);
28
31
  webSocket.sendAsync = async (message) => new Promise((resolveSend, rejectSend) => {
29
- webSocket.send(message, (err) => {
30
- if (err) {
31
- rejectSend(err);
32
- }
33
- else {
34
- resolveSend();
35
- }
36
- });
32
+ // If socket is closing this message should be resent
33
+ if (webSocket.readyState === ws_1.default.OPEN) {
34
+ webSocket.send(message, (err) => {
35
+ if (err) {
36
+ rejectSend(err);
37
+ }
38
+ else {
39
+ resolveSend();
40
+ }
41
+ });
42
+ }
37
43
  });
38
44
  webSocket.on('open', () => resolve(webSocket));
39
45
  webSocket.on('error', (err) => {
40
- reject(err);
46
+ this.currentConnectionTry += 1;
47
+ if (this.currentConnectionTry < this.maxConnectRetries) {
48
+ setTimeout(async () => {
49
+ resolve(this.initWebSocket());
50
+ }, this.retryWaitTime());
51
+ }
52
+ else {
53
+ reject(err);
54
+ }
41
55
  if (webSocket === this.webSocket) {
42
56
  this.webSocket = undefined;
43
57
  }
44
58
  });
45
59
  webSocket.on('pong', () => {
60
+ this.currentConnectionTry = 0;
46
61
  webSocket.lastHeartBeat = new Date();
47
62
  });
48
63
  webSocket.on('close', () => {
@@ -63,7 +78,7 @@ class WebSocketConnection {
63
78
  webSocket.sentMessages[key].reject(e);
64
79
  }
65
80
  }
66
- }, 1000);
81
+ }, this.retryWaitTime());
67
82
  }
68
83
  if (webSocket === this.webSocket) {
69
84
  this.webSocket = undefined;
@@ -126,20 +141,28 @@ class WebSocketConnection {
126
141
  }
127
142
  return this.webSocket.readyPromise;
128
143
  }
144
+ retryWaitTime() {
145
+ return 1000 * this.currentConnectionTry;
146
+ }
129
147
  async sendMessage(messageId, buffer) {
130
148
  const socket = await this.initWebSocket();
131
149
  return new Promise((resolve, reject) => {
132
- socket.send(buffer, (err) => {
133
- if (err) {
134
- delete socket.sentMessages[messageId];
135
- reject(err);
136
- }
137
- });
138
- socket.sentMessages[messageId] = {
139
- resolve,
140
- reject,
141
- buffer
142
- };
150
+ if (socket.readyState === ws_1.default.OPEN) {
151
+ socket.send(buffer, (err) => {
152
+ if (err) {
153
+ delete socket.sentMessages[messageId];
154
+ reject(err);
155
+ }
156
+ });
157
+ socket.sentMessages[messageId] = {
158
+ resolve,
159
+ reject,
160
+ buffer
161
+ };
162
+ }
163
+ else {
164
+ resolve(this.sendMessage(messageId, buffer));
165
+ }
143
166
  });
144
167
  }
145
168
  async query(query, inlineTables, queryTracingObj) {
@@ -1 +1 @@
1
- {"version":3,"file":"WebSocketConnection.js","sourceRoot":"","sources":["../../src/WebSocketConnection.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebSocketConnection.js","sourceRoot":"","sources":["../../src/WebSocketConnection.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/cubestore-driver",
3
3
  "description": "Cube Store driver",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.31.26",
5
+ "version": "0.31.29",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.js.git",
@@ -29,10 +29,10 @@
29
29
  "integration:cubestore": "jest"
30
30
  },
31
31
  "dependencies": {
32
- "@cubejs-backend/base-driver": "^0.31.26",
33
- "@cubejs-backend/cubestore": "^0.31.26",
34
- "@cubejs-backend/schema-compiler": "^0.31.26",
35
- "@cubejs-backend/shared": "^0.31.26",
32
+ "@cubejs-backend/base-driver": "^0.31.29",
33
+ "@cubejs-backend/cubestore": "^0.31.29",
34
+ "@cubejs-backend/schema-compiler": "^0.31.29",
35
+ "@cubejs-backend/shared": "^0.31.29",
36
36
  "csv-write-stream": "^2.0.0",
37
37
  "flatbuffers": "^1.12.0",
38
38
  "fs-extra": "^9.1.0",
@@ -46,7 +46,7 @@
46
46
  },
47
47
  "devDependencies": {
48
48
  "@cubejs-backend/linter": "^0.31.0",
49
- "@cubejs-backend/testing-shared": "^0.31.26",
49
+ "@cubejs-backend/testing-shared": "^0.31.29",
50
50
  "@types/flatbuffers": "^1.10.0",
51
51
  "@types/generic-pool": "^3.1.9",
52
52
  "@types/mysql": "^2.15.17",
@@ -67,5 +67,5 @@
67
67
  "eslintConfig": {
68
68
  "extends": "../cubejs-linter"
69
69
  },
70
- "gitHead": "546191141cc54f3df7d66a02ab25ad56f8ca74c4"
70
+ "gitHead": "a8907df035cf53aeab3775990bd9e3ae891380e3"
71
71
  }