@cubejs-backend/server 1.5.12 → 1.5.14

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.
@@ -5,6 +5,7 @@ import { CancelableInterval } from '@cubejs-backend/shared';
5
5
  import type { CubejsServerCore } from '@cubejs-backend/server-core';
6
6
  import type http from 'http';
7
7
  import type https from 'https';
8
+ import type { SubscriptionServer } from '@cubejs-backend/api-gateway';
8
9
  export interface WebSocketServerOptions {
9
10
  processSubscriptionsInterval?: number;
10
11
  webSocketsBasePath?: string;
@@ -14,7 +15,7 @@ export declare class WebSocketServer {
14
15
  protected readonly options: WebSocketServerOptions;
15
16
  protected subscriptionsTimer: CancelableInterval | null;
16
17
  protected wsServer: WebSocket.Server | null;
17
- protected subscriptionServer: any;
18
+ protected subscriptionServer: SubscriptionServer | null;
18
19
  constructor(serverCore: CubejsServerCore, options?: WebSocketServerOptions);
19
20
  initServer(server: http.Server | https.Server): void;
20
21
  close(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAC;AACtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,eAAe;IAQxB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IARpD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAE/D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,kBAAkB,EAAE,GAAG,CAAQ;gBAGpB,UAAU,EAAE,gBAAgB,EAC5B,OAAO,GAAE,sBAA2B;IAGlD,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;IAmEvC,KAAK;CAYnB"}
1
+ {"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":";;AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAA4B,MAAM,wBAAwB,CAAC;AAEtF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,eAAe;IAQxB,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB;IAC/C,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IARpD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAE/D,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI,CAAQ;gBAG1C,UAAU,EAAE,gBAAgB,EAC5B,OAAO,GAAE,sBAA2B;IAGlD,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM;IAmEvC,KAAK;CAcnB"}
@@ -52,7 +52,7 @@ class WebSocketServer {
52
52
  const connectionId = crypto_1.default.randomBytes(8).toString('hex');
53
53
  connectionIdToSocket[connectionId] = ws;
54
54
  ws.on('message', async (message) => {
55
- await this.subscriptionServer.processMessage(connectionId, message, true);
55
+ await this.subscriptionServer.processMessage(connectionId, message);
56
56
  });
57
57
  ws.on('close', async () => {
58
58
  await this.subscriptionServer.disconnect(connectionId);
@@ -79,7 +79,9 @@ class WebSocketServer {
79
79
  const close = util_1.default.promisify(this.wsServer.close.bind(this.wsServer));
80
80
  await close();
81
81
  }
82
- this.subscriptionServer.clear();
82
+ if (this.subscriptionServer) {
83
+ this.subscriptionServer.clear();
84
+ }
83
85
  }
84
86
  }
85
87
  exports.WebSocketServer = WebSocketServer;
@@ -1 +1 @@
1
- {"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":"1.5.12","commands":{"dev-server":{"id":"dev-server","description":"Run server in Development mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]},"server":{"id":"server","description":"Run server in Production mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]}}}
1
+ {"version":"1.5.14","commands":{"dev-server":{"id":"dev-server","description":"Run server in Development mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]},"server":{"id":"server","description":"Run server in Production mode","pluginName":"@cubejs-backend/server","pluginType":"core","aliases":[],"flags":{"debug":{"name":"debug","type":"boolean","description":"Print useful debug information","allowNo":false}},"args":[]}}}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/server",
3
3
  "description": "Cube.js all-in-one server",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.5.12",
5
+ "version": "1.5.14",
6
6
  "types": "index.d.ts",
7
7
  "repository": {
8
8
  "type": "git",
@@ -40,11 +40,11 @@
40
40
  "jest:shapshot": "jest --updateSnapshot test"
41
41
  },
42
42
  "dependencies": {
43
- "@cubejs-backend/cubestore-driver": "1.5.12",
43
+ "@cubejs-backend/cubestore-driver": "1.5.14",
44
44
  "@cubejs-backend/dotenv": "^9.0.2",
45
- "@cubejs-backend/native": "1.5.12",
46
- "@cubejs-backend/server-core": "1.5.12",
47
- "@cubejs-backend/shared": "1.5.12",
45
+ "@cubejs-backend/native": "1.5.14",
46
+ "@cubejs-backend/server-core": "1.5.14",
47
+ "@cubejs-backend/shared": "1.5.14",
48
48
  "@oclif/color": "^1.0.0",
49
49
  "@oclif/command": "^1.8.13",
50
50
  "@oclif/config": "^1.18.2",
@@ -61,8 +61,8 @@
61
61
  "ws": "^7.1.2"
62
62
  },
63
63
  "devDependencies": {
64
- "@cubejs-backend/linter": "1.5.12",
65
- "@cubejs-backend/query-orchestrator": "1.5.12",
64
+ "@cubejs-backend/linter": "1.5.14",
65
+ "@cubejs-backend/query-orchestrator": "1.5.14",
66
66
  "@oclif/dev-cli": "^1.23.1",
67
67
  "@types/body-parser": "^1.19.0",
68
68
  "@types/cors": "^2.8.8",
@@ -86,5 +86,5 @@
86
86
  "@oclif/plugin-help"
87
87
  ]
88
88
  },
89
- "gitHead": "89bd72bdaab24eefb9868990a709c909258d5609"
89
+ "gitHead": "521c47e5fe52f68f8e7dbe7bdb158a840903669d"
90
90
  }