@cubejs-backend/server 0.31.59 → 0.31.60
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.
- package/dist/src/index.js +5 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/server/container.js +27 -22
- package/dist/src/server/container.js.map +1 -1
- package/dist/src/server/diagnostic-host.js +5 -1
- package/dist/src/server/diagnostic-host.js.map +1 -1
- package/dist/src/server/gracefull-http.d.ts +2 -1
- package/dist/src/server/gracefull-http.d.ts.map +1 -1
- package/dist/src/server/utils.d.ts +1 -1
- package/dist/src/server/utils.d.ts.map +1 -1
- package/dist/src/server/utils.js +6 -2
- package/dist/src/server/utils.js.map +1 -1
- package/dist/src/server.d.ts +2 -2
- package/dist/src/server.d.ts.map +1 -1
- package/dist/src/server.js +11 -11
- package/dist/src/server.js.map +1 -1
- package/dist/src/websocket-server.d.ts +1 -0
- package/dist/src/websocket-server.d.ts.map +1 -1
- package/dist/src/websocket-server.js +1 -1
- package/dist/src/websocket-server.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +7 -7
package/dist/src/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qCAAwC;AAExC;;GAEG;AACH,2CAAyB;AACzB,qDAAmC;AAEnC,gDAAgD;AAChD,oCAAoC;AACpC,wCAAwC;AAExC,kBAAe,qBAAY,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -34,7 +38,7 @@ const utils_1 = require("./utils");
|
|
|
34
38
|
const server_1 = require("../server");
|
|
35
39
|
function safetyParseSemver(version) {
|
|
36
40
|
if (version) {
|
|
37
|
-
return semver_1.parse(version);
|
|
41
|
+
return (0, semver_1.parse)(version);
|
|
38
42
|
}
|
|
39
43
|
return null;
|
|
40
44
|
}
|
|
@@ -44,7 +48,7 @@ class ServerContainer {
|
|
|
44
48
|
this.isCubeConfigEmpty = true;
|
|
45
49
|
}
|
|
46
50
|
getTypeScriptCompiler() {
|
|
47
|
-
if (shared_1.packageExists('typescript', shared_1.isDockerImage())) {
|
|
51
|
+
if ((0, shared_1.packageExists)('typescript', (0, shared_1.isDockerImage)())) {
|
|
48
52
|
// eslint-disable-next-line global-require
|
|
49
53
|
const { TypescriptCompiler } = require('./typescript-compiler');
|
|
50
54
|
return new TypescriptCompiler();
|
|
@@ -52,7 +56,7 @@ class ServerContainer {
|
|
|
52
56
|
throw new Error('Typescript dependency not found. Please run this command from project directory.');
|
|
53
57
|
}
|
|
54
58
|
compareBuiltInAndUserVersions(builtInVersion, userVersion) {
|
|
55
|
-
const compareResult = semver_1.compare(builtInVersion, userVersion);
|
|
59
|
+
const compareResult = (0, semver_1.compare)(builtInVersion, userVersion);
|
|
56
60
|
if (this.configuration.debug) {
|
|
57
61
|
console.log('[runProjectDockerDiagnostics] compare', {
|
|
58
62
|
builtIn: builtInVersion.raw,
|
|
@@ -61,12 +65,12 @@ class ServerContainer {
|
|
|
61
65
|
});
|
|
62
66
|
}
|
|
63
67
|
if (compareResult === -1) {
|
|
64
|
-
console.log(`${color_1.default.yellow('warning')} You are using old Docker image (${utils_1.getMajorityVersion(builtInVersion, true)}) `
|
|
65
|
-
+ `with new packages (${utils_1.getMajorityVersion(userVersion, true)})`);
|
|
68
|
+
console.log(`${color_1.default.yellow('warning')} You are using old Docker image (${(0, utils_1.getMajorityVersion)(builtInVersion, true)}) `
|
|
69
|
+
+ `with new packages (${(0, utils_1.getMajorityVersion)(userVersion, true)})`);
|
|
66
70
|
}
|
|
67
71
|
if (compareResult === 1) {
|
|
68
|
-
console.log(`${color_1.default.yellow('warning')} You are using old Cube.js packages (${utils_1.getMajorityVersion(userVersion, true)}) `
|
|
69
|
-
+ `with new Docker image (${utils_1.getMajorityVersion(builtInVersion, true)})`);
|
|
72
|
+
console.log(`${color_1.default.yellow('warning')} You are using old Cube.js packages (${(0, utils_1.getMajorityVersion)(userVersion, true)}) `
|
|
73
|
+
+ `with new Docker image (${(0, utils_1.getMajorityVersion)(builtInVersion, true)})`);
|
|
70
74
|
}
|
|
71
75
|
}
|
|
72
76
|
async parseLock() {
|
|
@@ -83,10 +87,10 @@ class ServerContainer {
|
|
|
83
87
|
return null;
|
|
84
88
|
}
|
|
85
89
|
if (hasNpm) {
|
|
86
|
-
return utils_1.parseNpmLock();
|
|
90
|
+
return (0, utils_1.parseNpmLock)();
|
|
87
91
|
}
|
|
88
92
|
if (hasYarn) {
|
|
89
|
-
return utils_1.parseYarnLock();
|
|
93
|
+
return (0, utils_1.parseYarnLock)();
|
|
90
94
|
}
|
|
91
95
|
// @todo Error or notice?
|
|
92
96
|
return null;
|
|
@@ -95,7 +99,7 @@ class ServerContainer {
|
|
|
95
99
|
if (this.configuration.debug) {
|
|
96
100
|
console.log('[runProjectDockerDiagnostics] do');
|
|
97
101
|
}
|
|
98
|
-
const builtInCoreVersion = safetyParseSemver(await shared_1.resolveBuiltInPackageVersion('@cubejs-backend/server'));
|
|
102
|
+
const builtInCoreVersion = safetyParseSemver(await (0, shared_1.resolveBuiltInPackageVersion)('@cubejs-backend/server'));
|
|
99
103
|
if (!builtInCoreVersion) {
|
|
100
104
|
return;
|
|
101
105
|
}
|
|
@@ -138,8 +142,8 @@ class ServerContainer {
|
|
|
138
142
|
if (manifest.dependencies) {
|
|
139
143
|
// eslint-disable-next-line no-restricted-syntax
|
|
140
144
|
for (const [pkgName] of Object.entries(manifest.dependencies)) {
|
|
141
|
-
if (utils_1.isDevPackage(pkgName) && !deepsToIgnore.includes(pkgName)) {
|
|
142
|
-
shared_1.displayCLIWarning(`"${pkgName}" package must be installed in devDependencies`);
|
|
145
|
+
if ((0, utils_1.isDevPackage)(pkgName) && !deepsToIgnore.includes(pkgName)) {
|
|
146
|
+
(0, shared_1.displayCLIWarning)(`"${pkgName}" package must be installed in devDependencies`);
|
|
143
147
|
}
|
|
144
148
|
}
|
|
145
149
|
}
|
|
@@ -154,14 +158,14 @@ class ServerContainer {
|
|
|
154
158
|
// eslint-disable-next-line no-restricted-syntax
|
|
155
159
|
for (const pkgName of depsToCompareVersions) {
|
|
156
160
|
const pkgVersion = safetyParseSemver(lock.resolveVersion(pkgName));
|
|
157
|
-
if (pkgVersion && !utils_1.isSimilarPackageRelease(pkgVersion, coreVersion)) {
|
|
158
|
-
console.log(`${color_1.default.yellow('error')} "${pkgName}" (${utils_1.getMajorityVersion(pkgVersion)}) `
|
|
159
|
-
+ `is using another release then @cubejs-backend/server (${utils_1.getMajorityVersion(coreVersion)}).`);
|
|
161
|
+
if (pkgVersion && !(0, utils_1.isSimilarPackageRelease)(pkgVersion, coreVersion)) {
|
|
162
|
+
console.log(`${color_1.default.yellow('error')} "${pkgName}" (${(0, utils_1.getMajorityVersion)(pkgVersion)}) `
|
|
163
|
+
+ `is using another release then @cubejs-backend/server (${(0, utils_1.getMajorityVersion)(coreVersion)}).`);
|
|
160
164
|
}
|
|
161
165
|
}
|
|
162
166
|
}
|
|
163
167
|
}
|
|
164
|
-
if (shared_1.isDockerImage()) {
|
|
168
|
+
if ((0, shared_1.isDockerImage)()) {
|
|
165
169
|
await this.runProjectDockerDiagnostics(manifest, lock);
|
|
166
170
|
}
|
|
167
171
|
else if (this.configuration.debug) {
|
|
@@ -195,7 +199,7 @@ class ServerContainer {
|
|
|
195
199
|
override,
|
|
196
200
|
multiline: 'line-breaks'
|
|
197
201
|
});
|
|
198
|
-
const devMode = shared_1.getEnv('devMode');
|
|
202
|
+
const devMode = (0, shared_1.getEnv)('devMode');
|
|
199
203
|
if (devMode) {
|
|
200
204
|
process.env.NODE_ENV = 'development';
|
|
201
205
|
}
|
|
@@ -205,7 +209,7 @@ class ServerContainer {
|
|
|
205
209
|
if (fs_1.default.existsSync(path_1.default.join(process.cwd(), 'cube.js'))) {
|
|
206
210
|
return this.loadConfigurationFromFile();
|
|
207
211
|
}
|
|
208
|
-
shared_1.displayCLIWarning('There is no cube.js file. Continue with environment variables');
|
|
212
|
+
(0, shared_1.displayCLIWarning)('There is no cube.js file. Continue with environment variables');
|
|
209
213
|
return {};
|
|
210
214
|
}
|
|
211
215
|
async loadConfigurationFromMemory(content) {
|
|
@@ -230,7 +234,8 @@ class ServerContainer {
|
|
|
230
234
|
throw new Error('Configure file must export configuration as default.');
|
|
231
235
|
}
|
|
232
236
|
async loadConfigurationFromFile() {
|
|
233
|
-
|
|
237
|
+
var _a;
|
|
238
|
+
const file = await (_a = path_1.default.join(process.cwd(), 'cube.js'), Promise.resolve().then(() => __importStar(require(_a))));
|
|
234
239
|
if (this.configuration.debug) {
|
|
235
240
|
console.log('Loaded configuration file', file);
|
|
236
241
|
}
|
|
@@ -247,13 +252,13 @@ class ServerContainer {
|
|
|
247
252
|
const userConfig = await this.lookupConfiguration(override);
|
|
248
253
|
const configuration = {
|
|
249
254
|
// By default graceful shutdown is disabled, but this value is needed for reboot
|
|
250
|
-
gracefulShutdown: shared_1.getEnv('gracefulShutdown') || (process.env.NODE_ENV === 'production' ? 30 : 2),
|
|
255
|
+
gracefulShutdown: (0, shared_1.getEnv)('gracefulShutdown') || (process.env.NODE_ENV === 'production' ? 30 : 2),
|
|
251
256
|
...userConfig,
|
|
252
257
|
};
|
|
253
258
|
const server = await this.runServerInstance(configuration, embedded, Object.keys(userConfig).length === 0);
|
|
254
259
|
return {
|
|
255
260
|
configuration,
|
|
256
|
-
gracefulEnabled: !!(shared_1.getEnv('gracefulShutdown') || userConfig.gracefulShutdown),
|
|
261
|
+
gracefulEnabled: !!((0, shared_1.getEnv)('gracefulShutdown') || userConfig.gracefulShutdown),
|
|
257
262
|
server
|
|
258
263
|
};
|
|
259
264
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../../src/server/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-host.js","sourceRoot":"","sources":["../../../src/server/diagnostic-host.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"diagnostic-host.js","sourceRoot":"","sources":["../../../src/server/diagnostic-host.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6DAA6D;AAC7D,+CAAiC;AAEjC,MAAa,cAAc;IAClB,UAAU;QACf,OAAO,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,mBAAmB;QACxB,OAAO,EAAE,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IACtC,CAAC;IAEM,oBAAoB,CAAC,QAAgB;QAC1C,OAAO,EAAE,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC9E,CAAC;CACF;AAZD,wCAYC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import * as http from 'http';
|
|
3
4
|
import https from 'https';
|
|
4
|
-
export
|
|
5
|
+
export type GracefulHttpServer = (https.Server | http.Server) & {
|
|
5
6
|
stop: (timeout?: number) => Promise<[boolean, Error | undefined]>;
|
|
6
7
|
};
|
|
7
8
|
export declare function gracefulHttp(server: http.Server | https.Server): GracefulHttpServer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gracefull-http.d.ts","sourceRoot":"","sources":["../../../src/server/gracefull-http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gracefull-http.d.ts","sourceRoot":"","sources":["../../../src/server/gracefull-http.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,MAAM,kBAAkB,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG;IAC9D,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;CACnE,CAAC;AAEF,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,kBAAkB,CA2EnF"}
|
|
@@ -4,7 +4,7 @@ export declare function isCubePackage(pkgName: string): boolean;
|
|
|
4
4
|
export declare function isDevPackage(pkgName: string): boolean;
|
|
5
5
|
export declare function isSimilarPackageRelease(pkg: SemVer, core: SemVer): boolean;
|
|
6
6
|
export declare function getMajorityVersion(pkg: SemVer, strict?: boolean): string;
|
|
7
|
-
export
|
|
7
|
+
export type ProjectLock = {
|
|
8
8
|
resolveVersion: (pkg: string) => string | null;
|
|
9
9
|
};
|
|
10
10
|
export declare function parseNpmLock(): ProjectLock | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUhC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM,CAc/E;AAED,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAUhC,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE/D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAErD;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe,GAAG,MAAM,CAc/E;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAA;CAC/C,CAAC;AAEF,wBAAgB,YAAY,IAAI,WAAW,GAAG,IAAI,CA+BjD;AAED,wBAAgB,aAAa,IAAI,WAAW,GAAG,IAAI,CAqBlD"}
|
package/dist/src/server/utils.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -79,7 +83,7 @@ function parseNpmLock() {
|
|
|
79
83
|
};
|
|
80
84
|
}
|
|
81
85
|
catch (e) {
|
|
82
|
-
shared_1.internalExceptions(e);
|
|
86
|
+
(0, shared_1.internalExceptions)(e);
|
|
83
87
|
return null;
|
|
84
88
|
}
|
|
85
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/server/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/src/server.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ import type { BaseDriver } from '@cubejs-backend/query-orchestrator';
|
|
|
8
8
|
import { WebSocketServer, WebSocketServerOptions } from './websocket-server';
|
|
9
9
|
import { GracefulHttpServer } from './server/gracefull-http';
|
|
10
10
|
import { ServerStatusHandler } from './server-status';
|
|
11
|
-
export
|
|
11
|
+
export type InitAppFn = (app: express.Application) => void | Promise<void>;
|
|
12
12
|
interface HttpOptions {
|
|
13
13
|
cors?: CorsOptions;
|
|
14
14
|
}
|
|
@@ -18,7 +18,7 @@ export interface CreateOptions extends CoreCreateOptions, WebSocketServerOptions
|
|
|
18
18
|
http?: HttpOptions;
|
|
19
19
|
gracefulShutdown?: number;
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
type RequireOne<T, K extends keyof T> = {
|
|
22
22
|
[X in Exclude<keyof T, K>]?: T[X];
|
|
23
23
|
} & {
|
|
24
24
|
[P in K]-?: T[P];
|
package/dist/src/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";AAEA,OAAO,QAAQ,EAAE,EACf,aAAa,IAAI,iBAAiB,EAClC,YAAY,EACZ,aAAa,EACb,aAAa,EACb,aAAa,EACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAa,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAgB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";AAEA,OAAO,QAAQ,EAAE,EACf,aAAa,IAAI,iBAAiB,EAClC,YAAY,EACZ,aAAa,EACb,aAAa,EACb,aAAa,EACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAa,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAgB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAQtD,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3E,UAAU,WAAW;IACnB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED,MAAM,WAAW,aAAc,SAAQ,iBAAiB,EAAE,sBAAsB,EAAE,gBAAgB;IAChG,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI;KACrC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAClC,GAAG;KACD,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACjB,CAAC;AAEF,qBAAa,YAAY;IACvB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAElC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC;IAEtG,SAAS,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAEnD,SAAS,CAAC,YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;IAEtD,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAQ;IAE7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAA6B;gBAExD,MAAM,GAAE,aAAkB,EAAE,aAAa,CAAC,EAAE,aAAa;IAoB5E,SAAS,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE,aAAa,GAAG,QAAQ;IAI/E,MAAM,CAAC,OAAO,GAAE,IAAI,CAAC,aAAkB;;;;;;IAyD7C,eAAe;IAKf,8BAA8B,CAAC,OAAO,EAAE,GAAG;;;IAK3C,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG;;;IAKhD,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlD,KAAK;IA6BlB;;;;OAIG;WACW,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa;WAIrD,kBAAkB,CAAC,MAAM,EAAE,YAAY;WAIvC,SAAS;WAIT,OAAO;IAIR,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAc;CAkD/D"}
|
package/dist/src/server.js
CHANGED
|
@@ -29,10 +29,10 @@ class CubejsServer {
|
|
|
29
29
|
this.status = new server_status_1.ServerStatusHandler();
|
|
30
30
|
this.config = {
|
|
31
31
|
...config,
|
|
32
|
-
webSockets: config.webSockets || shared_1.getEnv('webSockets'),
|
|
33
|
-
sqlPort: config.sqlPort || shared_1.getEnv('sqlPort'),
|
|
34
|
-
pgSqlPort: config.pgSqlPort || shared_1.getEnv('pgSqlPort'),
|
|
35
|
-
sqlNonce: config.sqlNonce || shared_1.getEnv('sqlNonce'),
|
|
32
|
+
webSockets: config.webSockets || (0, shared_1.getEnv)('webSockets'),
|
|
33
|
+
sqlPort: config.sqlPort || (0, shared_1.getEnv)('sqlPort'),
|
|
34
|
+
pgSqlPort: config.pgSqlPort || (0, shared_1.getEnv)('pgSqlPort'),
|
|
35
|
+
sqlNonce: config.sqlNonce || (0, shared_1.getEnv)('sqlNonce'),
|
|
36
36
|
http: {
|
|
37
37
|
...config.http,
|
|
38
38
|
cors: {
|
|
@@ -52,21 +52,21 @@ class CubejsServer {
|
|
|
52
52
|
if (this.server) {
|
|
53
53
|
throw new Error('CubeServer is already listening');
|
|
54
54
|
}
|
|
55
|
-
const app = express_1.default();
|
|
56
|
-
app.use(cors_1.default(this.config.http.cors));
|
|
55
|
+
const app = (0, express_1.default)();
|
|
56
|
+
app.use((0, cors_1.default)(this.config.http.cors));
|
|
57
57
|
app.use(body_parser_1.default.json({ limit: '50mb' }));
|
|
58
58
|
if (this.config.gracefulShutdown) {
|
|
59
|
-
app.use(graceful_middleware_1.gracefulMiddleware(this.status, this.config.gracefulShutdown));
|
|
59
|
+
app.use((0, graceful_middleware_1.gracefulMiddleware)(this.status, this.config.gracefulShutdown));
|
|
60
60
|
}
|
|
61
61
|
if (this.config.initApp) {
|
|
62
62
|
await this.config.initApp(app);
|
|
63
63
|
}
|
|
64
64
|
await this.core.initApp(app);
|
|
65
|
-
const enableTls = shared_1.getEnv('tls');
|
|
65
|
+
const enableTls = (0, shared_1.getEnv)('tls');
|
|
66
66
|
if (enableTls) {
|
|
67
67
|
throw new Error('CUBEJS_ENABLE_TLS has been deprecated and removed.');
|
|
68
68
|
}
|
|
69
|
-
this.server = gracefull_http_1.gracefulHttp(http_1.default.createServer(options, app));
|
|
69
|
+
this.server = (0, gracefull_http_1.gracefulHttp)(http_1.default.createServer(options, app));
|
|
70
70
|
if (this.config.webSockets) {
|
|
71
71
|
this.socketServer = new websocket_server_1.WebSocketServer(this.core, this.config);
|
|
72
72
|
this.socketServer.initServer(this.server);
|
|
@@ -75,7 +75,7 @@ class CubejsServer {
|
|
|
75
75
|
this.sqlServer = this.core.initSQLServer();
|
|
76
76
|
await this.sqlServer.init(this.config);
|
|
77
77
|
}
|
|
78
|
-
const PORT = shared_1.getEnv('port');
|
|
78
|
+
const PORT = (0, shared_1.getEnv)('port');
|
|
79
79
|
await this.server.listen(PORT);
|
|
80
80
|
return {
|
|
81
81
|
app,
|
|
@@ -151,7 +151,7 @@ class CubejsServer {
|
|
|
151
151
|
}
|
|
152
152
|
async shutdown(signal, graceful = true) {
|
|
153
153
|
try {
|
|
154
|
-
const timeoutKiller = shared_1.withTimeout(() => {
|
|
154
|
+
const timeoutKiller = (0, shared_1.withTimeout)(() => {
|
|
155
155
|
this.core.logger('Graceful Shutdown Timeout Kill', {
|
|
156
156
|
error: 'Unable to stop Cube.js in expected time, force kill',
|
|
157
157
|
});
|
package/dist/src/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA4C;AAE5C,8EAMqC;AACrC,mDAA6D;AAC7D,sDAA8B;AAC9B,gDAAwB;AACxB,gDAAwB;AACxB,8DAAqC;AACrC,gDAAyC;AAKzC,yDAA6E;AAC7E,4DAA2E;AAC3E,+DAA2D;AAC3D,mDAAsD;AAEtD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAElD,gBAAM,CAAC,MAAM,CAAC;IACZ,SAAS,EAAE,aAAa;CACzB,CAAC,CAAC;AAqBH,MAAa,YAAY;IAavB,YAAmB,SAAwB,EAAE,EAAE,aAA6B;;QARlE,WAAM,GAA8B,IAAI,CAAC;QAEzC,iBAAY,GAA2B,IAAI,CAAC;QAE5C,cAAS,GAAqB,IAAI,CAAC;QAE1B,WAAM,GAAwB,IAAI,mCAAmB,EAAE,CAAC;QAGzE,IAAI,CAAC,MAAM,GAAG;YACZ,GAAG,MAAM;YACT,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,eAAM,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"
|
|
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;IAgDvC,KAAK;CAYnB"}
|
|
@@ -42,7 +42,7 @@ class WebSocketServer {
|
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
44
|
const processSubscriptionsInterval = this.options.processSubscriptionsInterval || 5 * 1000;
|
|
45
|
-
this.subscriptionsTimer = shared_1.createCancelableInterval(async () => {
|
|
45
|
+
this.subscriptionsTimer = (0, shared_1.createCancelableInterval)(async () => {
|
|
46
46
|
await this.subscriptionServer.processSubscriptions();
|
|
47
47
|
}, {
|
|
48
48
|
interval: processSubscriptionsInterval,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA2B;AAC3B,oDAA4B;AAC5B,gDAAwB;AACxB,mDAAsF;AAUtF,MAAa,eAAe;IAO1B,YACqB,UAA4B,EAC5B,UAAkC,EAAE;QADpC,eAAU,GAAV,UAAU,CAAkB;QAC5B,YAAO,GAAP,OAAO,CAA6B;QAR/C,uBAAkB,GAA8B,IAAI,CAAC;QAErD,aAAQ,GAA4B,IAAI,CAAC;QAEzC,uBAAkB,GAAQ,IAAI,CAAC;IAKrC,CAAC;IAEE,UAAU,CAAC,MAAkC;QAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAS,CAAC,MAAM,CAAC;YACnC,MAAM;YACN,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB;SACtC,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAwB,EAAE,CAAC;QAErD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,CAAC,YAAoB,EAAE,OAAY,EAAE,EAAE;YACtG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,cAAc,YAAY,qBAAqB,CAAC,CAAC;aAClE;YAED,oBAAoB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,EAAE;YACpC,MAAM,YAAY,GAAG,gBAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC3D,oBAAoB,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAExC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBACxB,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBACxB,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,4BAA4B,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,IAAI,CAAC,GAAG,IAAI,CAAC;QAE3F,IAAI,CAAC,kBAAkB,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"websocket-server.js","sourceRoot":"","sources":["../../src/websocket-server.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"0.31.
|
|
1
|
+
{"version":"0.31.60","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": "0.31.
|
|
5
|
+
"version": "0.31.60",
|
|
6
6
|
"types": "index.d.ts",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"jest:shapshot": "jest --updateSnapshot test"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@cubejs-backend/cubestore-driver": "^0.31.
|
|
43
|
+
"@cubejs-backend/cubestore-driver": "^0.31.60",
|
|
44
44
|
"@cubejs-backend/dotenv": "^9.0.2",
|
|
45
|
-
"@cubejs-backend/server-core": "^0.31.
|
|
46
|
-
"@cubejs-backend/shared": "^0.31.
|
|
45
|
+
"@cubejs-backend/server-core": "^0.31.60",
|
|
46
|
+
"@cubejs-backend/shared": "^0.31.60",
|
|
47
47
|
"@oclif/color": "^1.0.0",
|
|
48
48
|
"@oclif/command": "^1.8.13",
|
|
49
49
|
"@oclif/config": "^1.18.2",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
63
|
"@cubejs-backend/linter": "^0.31.0",
|
|
64
|
-
"@cubejs-backend/query-orchestrator": "^0.31.
|
|
64
|
+
"@cubejs-backend/query-orchestrator": "^0.31.60",
|
|
65
65
|
"@oclif/dev-cli": "^1.23.1",
|
|
66
66
|
"@types/body-parser": "^1.19.0",
|
|
67
67
|
"@types/cors": "^2.8.8",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"@types/ws": "^7.2.9",
|
|
72
72
|
"@types/yarnpkg__lockfile": "^1.1.4",
|
|
73
73
|
"jest": "^26.0.0",
|
|
74
|
-
"typescript": "~4.
|
|
74
|
+
"typescript": "~4.9.5"
|
|
75
75
|
},
|
|
76
76
|
"license": "Apache-2.0",
|
|
77
77
|
"eslintConfig": {
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
"@oclif/plugin-help"
|
|
91
91
|
]
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "3da3fc07f66506feba4e4b552246aefd8719bb29"
|
|
94
94
|
}
|