@cubejs-backend/server 0.23.14 → 0.24.2
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/CHANGELOG.md +38 -0
- package/dist/server/container.d.ts +2 -7
- package/dist/server/container.d.ts.map +1 -1
- package/dist/server/container.js +18 -47
- package/dist/server/container.js.map +1 -1
- package/dist/server/utils.d.ts +7 -0
- package/dist/server/utils.d.ts.map +1 -0
- package/dist/server/utils.js +39 -0
- package/dist/server/utils.js.map +1 -0
- package/dist/server.d.ts +13 -3
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +7 -9
- package/dist/server.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,44 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.24.2](https://github.com/cube-js/cube.js/compare/v0.24.1...v0.24.2) (2020-11-27)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add content-type to allowedHeaders ([d176269](https://github.com/cube-js/cube.js/commit/d176269fda12d7213c021026c02f7aec0df50ba6))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
## [0.24.1](https://github.com/cube-js/cube.js/compare/v0.24.0...v0.24.1) (2020-11-27)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Features
|
|
21
|
+
|
|
22
|
+
* Specify CORS for server/serverless ([#1455](https://github.com/cube-js/cube.js/issues/1455)) ([8c371ad](https://github.com/cube-js/cube.js/commit/8c371add2821a851bc51e00fb24e7ad2d8620345))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
# [0.24.0](https://github.com/cube-js/cube.js/compare/v0.23.15...v0.24.0) (2020-11-26)
|
|
29
|
+
|
|
30
|
+
**Note:** Version bump only for package @cubejs-backend/server
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
## [0.23.15](https://github.com/cube-js/cube.js/compare/v0.23.14...v0.23.15) (2020-11-25)
|
|
37
|
+
|
|
38
|
+
**Note:** Version bump only for package @cubejs-backend/server
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
6
44
|
## [0.23.14](https://github.com/cube-js/cube.js/compare/v0.23.13...v0.23.14) (2020-11-22)
|
|
7
45
|
|
|
8
46
|
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
import { CreateOptions } from '@cubejs-backend/server-core';
|
|
2
|
+
import { PackageManifest } from '@cubejs-backend/shared';
|
|
2
3
|
import { SemVer } from 'semver';
|
|
3
4
|
import type { TypescriptCompiler as TypescriptCompilerType } from './typescript-compiler';
|
|
4
|
-
declare type PackageManifest = {
|
|
5
|
-
version: string;
|
|
6
|
-
dependencies: Record<string, string>;
|
|
7
|
-
devDependencies: Record<string, string>;
|
|
8
|
-
};
|
|
9
5
|
export declare class ServerContainer {
|
|
10
6
|
protected readonly configuration: {
|
|
11
7
|
debug: boolean;
|
|
@@ -20,9 +16,8 @@ export declare class ServerContainer {
|
|
|
20
16
|
protected compareBuiltInAndUserVersions(builtInVersion: SemVer, userVersion: SemVer): void;
|
|
21
17
|
protected runProjectDockerDiagnostics(manifest: PackageManifest): Promise<void>;
|
|
22
18
|
runProjectDiagnostics(): Promise<void>;
|
|
23
|
-
runServerInstance(configuration: CreateOptions): void
|
|
19
|
+
runServerInstance(configuration: CreateOptions): Promise<void>;
|
|
24
20
|
lookupConfiguration(): Promise<CreateOptions>;
|
|
25
21
|
protected loadConfiguration(): Promise<CreateOptions>;
|
|
26
22
|
}
|
|
27
|
-
export {};
|
|
28
23
|
//# sourceMappingURL=container.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/server/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/server/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAoD,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI3G,OAAO,EAAwB,MAAM,EAA4B,MAAM,QAAQ,CAAC;AAIhF,OAAO,KAAK,EAAE,kBAAkB,IAAI,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE1F,qBAAa,eAAe;IAExB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE;gBAAjC,aAAa,EAAE;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE;IAItD,SAAS,CAAC,qBAAqB,IAAI,sBAAsB;cAazC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;cAsBvD,4BAA4B,CAAC,OAAO,EAAE,MAAM;cAO5C,yBAAyB,CAAC,OAAO,EAAE,MAAM;IAQzD,SAAS,CAAC,6BAA6B,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;cA0BnE,2BAA2B,CAAC,QAAQ,EAAE,eAAe;IAyCxD,qBAAqB;IA+DrB,iBAAiB,CAAC,aAAa,EAAE,aAAa;IAa9C,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC;cAgB1C,iBAAiB,IAAI,OAAO,CAAC,aAAa,CAAC;CAiB5D"}
|
package/dist/server/container.js
CHANGED
|
@@ -28,37 +28,8 @@ const path_1 = __importDefault(require("path"));
|
|
|
28
28
|
const fs_1 = __importDefault(require("fs"));
|
|
29
29
|
const color_1 = __importDefault(require("@oclif/color"));
|
|
30
30
|
const semver_1 = require("semver");
|
|
31
|
+
const utils_1 = require("./utils");
|
|
31
32
|
const server_1 = require("../server");
|
|
32
|
-
const devPackages = [
|
|
33
|
-
'typescript',
|
|
34
|
-
];
|
|
35
|
-
function isCubeNotServerPackage(pkgName) {
|
|
36
|
-
return pkgName !== '@cubejs-backend/server' && pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
37
|
-
}
|
|
38
|
-
function isCubePackage(pkgName) {
|
|
39
|
-
return pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
40
|
-
}
|
|
41
|
-
function isDevPackage(pkgName) {
|
|
42
|
-
return isCubePackage(pkgName) || devPackages.includes(pkgName.toLowerCase());
|
|
43
|
-
}
|
|
44
|
-
function isSimilarPackageRelease(pkg, core) {
|
|
45
|
-
if (pkg.major === 0 && core.major === 0) {
|
|
46
|
-
return pkg.minor === core.minor;
|
|
47
|
-
}
|
|
48
|
-
return pkg.major === core.major;
|
|
49
|
-
}
|
|
50
|
-
function getMajorityVersion(pkg, strict = false) {
|
|
51
|
-
if (pkg.major === 0) {
|
|
52
|
-
if (strict) {
|
|
53
|
-
return `^${pkg.major}.${pkg.minor}.${pkg.patch}`;
|
|
54
|
-
}
|
|
55
|
-
return `^${pkg.major}.${pkg.minor}`;
|
|
56
|
-
}
|
|
57
|
-
if (strict) {
|
|
58
|
-
return `^${pkg.major}.${pkg.minor}`;
|
|
59
|
-
}
|
|
60
|
-
return `^${pkg.major}`;
|
|
61
|
-
}
|
|
62
33
|
class ServerContainer {
|
|
63
34
|
constructor(configuration) {
|
|
64
35
|
this.configuration = configuration;
|
|
@@ -103,12 +74,12 @@ class ServerContainer {
|
|
|
103
74
|
});
|
|
104
75
|
}
|
|
105
76
|
if (compareResult === -1) {
|
|
106
|
-
console.log(`${color_1.default.yellow('warning')} You are using old Docker image (${getMajorityVersion(builtInVersion, true)}) `
|
|
107
|
-
+ `with new packages (${getMajorityVersion(userVersion, true)})`);
|
|
77
|
+
console.log(`${color_1.default.yellow('warning')} You are using old Docker image (${utils_1.getMajorityVersion(builtInVersion, true)}) `
|
|
78
|
+
+ `with new packages (${utils_1.getMajorityVersion(userVersion, true)})`);
|
|
108
79
|
}
|
|
109
80
|
if (compareResult === 1) {
|
|
110
|
-
console.log(`${color_1.default.yellow('warning')} You are using old Cube.js packages (${getMajorityVersion(userVersion, true)}) `
|
|
111
|
-
+ `with new Docker image (${getMajorityVersion(builtInVersion, true)})`);
|
|
81
|
+
console.log(`${color_1.default.yellow('warning')} You are using old Cube.js packages (${utils_1.getMajorityVersion(userVersion, true)}) `
|
|
82
|
+
+ `with new Docker image (${utils_1.getMajorityVersion(builtInVersion, true)})`);
|
|
112
83
|
}
|
|
113
84
|
}
|
|
114
85
|
async runProjectDockerDiagnostics(manifest) {
|
|
@@ -128,7 +99,7 @@ class ServerContainer {
|
|
|
128
99
|
* It's needed to detect case when user didnt install @cubejs-backend/server, but
|
|
129
100
|
* install @cubejs-backend/postgres-driver and it doesn't fit to built-in server
|
|
130
101
|
*/
|
|
131
|
-
const depsToCompareVersions = Object.keys(manifest.devDependencies).filter(isCubeNotServerPackage);
|
|
102
|
+
const depsToCompareVersions = Object.keys(manifest.devDependencies).filter(utils_1.isCubeNotServerPackage);
|
|
132
103
|
// eslint-disable-next-line no-restricted-syntax
|
|
133
104
|
for (const pkgName of depsToCompareVersions) {
|
|
134
105
|
const pkgVersion = await this.resolveUserPackageVersion(pkgName);
|
|
@@ -151,7 +122,7 @@ class ServerContainer {
|
|
|
151
122
|
if (manifest.dependencies) {
|
|
152
123
|
// eslint-disable-next-line no-restricted-syntax
|
|
153
124
|
for (const [pkgName] of Object.entries(manifest.dependencies)) {
|
|
154
|
-
if (isDevPackage(pkgName)) {
|
|
125
|
+
if (utils_1.isDevPackage(pkgName)) {
|
|
155
126
|
throw new Error(`"${pkgName}" package must be installed in devDependencies`);
|
|
156
127
|
}
|
|
157
128
|
}
|
|
@@ -159,19 +130,19 @@ class ServerContainer {
|
|
|
159
130
|
if (manifest.devDependencies) {
|
|
160
131
|
// eslint-disable-next-line no-restricted-syntax
|
|
161
132
|
for (const pkgName of Object.keys(manifest.devDependencies)) {
|
|
162
|
-
if (!isDevPackage(pkgName)) {
|
|
133
|
+
if (!utils_1.isDevPackage(pkgName)) {
|
|
163
134
|
console.log(`${color_1.default.yellow('warning')} "${pkgName}" will not be installed in Cube Cloud (please move it to dependencies)`);
|
|
164
135
|
}
|
|
165
136
|
}
|
|
166
137
|
const coreVersion = await this.resolveUserPackageVersion('@cubejs-backend/server');
|
|
167
138
|
if (coreVersion) {
|
|
168
|
-
const depsToCompareVersions = Object.keys(manifest.devDependencies).filter(isCubeNotServerPackage);
|
|
139
|
+
const depsToCompareVersions = Object.keys(manifest.devDependencies).filter(utils_1.isCubeNotServerPackage);
|
|
169
140
|
// eslint-disable-next-line no-restricted-syntax
|
|
170
141
|
for (const pkgName of depsToCompareVersions) {
|
|
171
142
|
const pkgVersion = await this.resolveUserPackageVersion(pkgName);
|
|
172
|
-
if (pkgVersion && !isSimilarPackageRelease(pkgVersion, coreVersion)) {
|
|
173
|
-
console.log(`${color_1.default.yellow('error')} "${pkgName}" (${getMajorityVersion(coreVersion)}) `
|
|
174
|
-
+ `is using another release then @cubejs-backend/server (${getMajorityVersion(pkgVersion)}).`);
|
|
143
|
+
if (pkgVersion && !utils_1.isSimilarPackageRelease(pkgVersion, coreVersion)) {
|
|
144
|
+
console.log(`${color_1.default.yellow('error')} "${pkgName}" (${utils_1.getMajorityVersion(coreVersion)}) `
|
|
145
|
+
+ `is using another release then @cubejs-backend/server (${utils_1.getMajorityVersion(pkgVersion)}).`);
|
|
175
146
|
}
|
|
176
147
|
}
|
|
177
148
|
}
|
|
@@ -184,16 +155,17 @@ class ServerContainer {
|
|
|
184
155
|
}
|
|
185
156
|
}
|
|
186
157
|
}
|
|
187
|
-
runServerInstance(configuration) {
|
|
158
|
+
async runServerInstance(configuration) {
|
|
188
159
|
const server = new server_1.CubejsServer(configuration);
|
|
189
|
-
|
|
160
|
+
try {
|
|
161
|
+
const { version, port } = await server.listen();
|
|
190
162
|
console.log(`🚀 Cube.js server (${version}) is listening on ${port}`);
|
|
191
|
-
}
|
|
163
|
+
}
|
|
164
|
+
catch (e) {
|
|
192
165
|
console.error('Fatal error during server start: ');
|
|
193
166
|
console.error(e.stack || e);
|
|
194
|
-
}
|
|
167
|
+
}
|
|
195
168
|
}
|
|
196
|
-
// eslint-disable-next-line consistent-return
|
|
197
169
|
async lookupConfiguration() {
|
|
198
170
|
if (fs_1.default.existsSync(path_1.default.join(process.cwd(), 'cube.ts'))) {
|
|
199
171
|
this.getTypeScriptCompiler().compileConfiguration();
|
|
@@ -204,7 +176,6 @@ class ServerContainer {
|
|
|
204
176
|
console.log(`${color_1.default.yellow('warning')} There is no cube.js file. Continue with environment variables`);
|
|
205
177
|
return {};
|
|
206
178
|
}
|
|
207
|
-
// eslint-disable-next-line consistent-return
|
|
208
179
|
async loadConfiguration() {
|
|
209
180
|
const file = await Promise.resolve().then(() => __importStar(require(path_1.default.join(process.cwd(), 'cube.js'))));
|
|
210
181
|
if (this.configuration.debug) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/server/container.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/server/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { SemVer } from 'semver';
|
|
2
|
+
export declare function isCubeNotServerPackage(pkgName: string): boolean;
|
|
3
|
+
export declare function isCubePackage(pkgName: string): boolean;
|
|
4
|
+
export declare function isDevPackage(pkgName: string): boolean;
|
|
5
|
+
export declare function isSimilarPackageRelease(pkg: SemVer, core: SemVer): boolean;
|
|
6
|
+
export declare function getMajorityVersion(pkg: SemVer, strict?: boolean): string;
|
|
7
|
+
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/server/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getMajorityVersion = exports.isSimilarPackageRelease = exports.isDevPackage = exports.isCubePackage = exports.isCubeNotServerPackage = void 0;
|
|
4
|
+
const devPackages = [
|
|
5
|
+
'typescript',
|
|
6
|
+
];
|
|
7
|
+
function isCubeNotServerPackage(pkgName) {
|
|
8
|
+
return pkgName !== '@cubejs-backend/server' && pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
9
|
+
}
|
|
10
|
+
exports.isCubeNotServerPackage = isCubeNotServerPackage;
|
|
11
|
+
function isCubePackage(pkgName) {
|
|
12
|
+
return pkgName.toLowerCase().startsWith('@cubejs-backend/');
|
|
13
|
+
}
|
|
14
|
+
exports.isCubePackage = isCubePackage;
|
|
15
|
+
function isDevPackage(pkgName) {
|
|
16
|
+
return isCubePackage(pkgName) || devPackages.includes(pkgName.toLowerCase());
|
|
17
|
+
}
|
|
18
|
+
exports.isDevPackage = isDevPackage;
|
|
19
|
+
function isSimilarPackageRelease(pkg, core) {
|
|
20
|
+
if (pkg.major === 0 && core.major === 0) {
|
|
21
|
+
return pkg.minor === core.minor;
|
|
22
|
+
}
|
|
23
|
+
return pkg.major === core.major;
|
|
24
|
+
}
|
|
25
|
+
exports.isSimilarPackageRelease = isSimilarPackageRelease;
|
|
26
|
+
function getMajorityVersion(pkg, strict = false) {
|
|
27
|
+
if (pkg.major === 0) {
|
|
28
|
+
if (strict) {
|
|
29
|
+
return `^${pkg.major}.${pkg.minor}.${pkg.patch}`;
|
|
30
|
+
}
|
|
31
|
+
return `^${pkg.major}.${pkg.minor}`;
|
|
32
|
+
}
|
|
33
|
+
if (strict) {
|
|
34
|
+
return `^${pkg.major}.${pkg.minor}`;
|
|
35
|
+
}
|
|
36
|
+
return `^${pkg.major}`;
|
|
37
|
+
}
|
|
38
|
+
exports.getMajorityVersion = getMajorityVersion;
|
|
39
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/server/utils.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG;IAClB,YAAY;CACb,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAAe;IACpD,OAAO,OAAO,KAAK,wBAAwB,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AACtG,CAAC;AAFD,wDAEC;AAED,SAAgB,aAAa,CAAC,OAAe;IAC3C,OAAO,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;AAC9D,CAAC;AAFD,sCAEC;AAED,SAAgB,YAAY,CAAC,OAAe;IAC1C,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;AAC/E,CAAC;AAFD,oCAEC;AAED,SAAgB,uBAAuB,CAAC,GAAW,EAAE,IAAY;IAC/D,IAAI,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE;QACvC,OAAO,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;KACjC;IAED,OAAO,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;AAClC,CAAC;AAND,0DAMC;AAED,SAAgB,kBAAkB,CAAC,GAAW,EAAE,SAAkB,KAAK;IACrE,IAAI,GAAG,CAAC,KAAK,KAAK,CAAC,EAAE;QACnB,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;SAClD;QAED,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;KACrC;IAED,IAAI,MAAM,EAAE;QACV,OAAO,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;KACrC;IAED,OAAO,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;AACzB,CAAC;AAdD,gDAcC"}
|
package/dist/server.d.ts
CHANGED
|
@@ -3,20 +3,29 @@ import { CreateOptions as CoreCreateOptions, CubejsServerCore, DatabaseType } fr
|
|
|
3
3
|
import express from 'express';
|
|
4
4
|
import https from 'https';
|
|
5
5
|
import http from 'http';
|
|
6
|
+
import { CorsOptions } from 'cors';
|
|
6
7
|
import { WebSocketServer, WebSocketServerOptions } from './websocket-server';
|
|
7
8
|
export declare type InitAppFn = (app: express.Application) => void | Promise<void>;
|
|
9
|
+
interface HttpOptions {
|
|
10
|
+
cors?: CorsOptions;
|
|
11
|
+
}
|
|
8
12
|
export interface CreateOptions extends CoreCreateOptions, WebSocketServerOptions {
|
|
9
13
|
webSockets?: boolean;
|
|
10
14
|
initApp?: InitAppFn;
|
|
15
|
+
http?: HttpOptions;
|
|
11
16
|
}
|
|
17
|
+
declare type RequireOne<T, K extends keyof T> = {
|
|
18
|
+
[X in Exclude<keyof T, K>]?: T[X];
|
|
19
|
+
} & {
|
|
20
|
+
[P in K]-?: T[P];
|
|
21
|
+
};
|
|
12
22
|
export declare class CubejsServer {
|
|
13
23
|
protected readonly core: CubejsServerCore;
|
|
14
|
-
protected readonly
|
|
15
|
-
protected readonly webSockets?: boolean;
|
|
24
|
+
protected readonly config: RequireOne<CreateOptions, 'webSockets' | 'http'>;
|
|
16
25
|
protected redirector: http.Server | null;
|
|
17
26
|
protected server: http.Server | https.Server | null;
|
|
18
27
|
protected socketServer: WebSocketServer | null;
|
|
19
|
-
constructor(config
|
|
28
|
+
constructor(config?: CreateOptions);
|
|
20
29
|
listen(options?: https.ServerOptions | http.ServerOptions): Promise<{
|
|
21
30
|
app: import("express-serve-static-core").Express;
|
|
22
31
|
port: number;
|
|
@@ -32,4 +41,5 @@ export declare class CubejsServer {
|
|
|
32
41
|
static apiSecret(): string | undefined;
|
|
33
42
|
static version(): any;
|
|
34
43
|
}
|
|
44
|
+
export {};
|
|
35
45
|
//# sourceMappingURL=server.d.ts.map
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAEA,OAAiB,EACf,aAAa,IAAI,iBAAiB,EAClC,gBAAgB,EAChB,YAAY,EACb,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";AAEA,OAAiB,EACf,aAAa,IAAI,iBAAiB,EAClC,gBAAgB,EAChB,YAAY,EACb,MAAM,6BAA6B,CAAC;AAErC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAa,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEzC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAM7E,oBAAY,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;IAC9E,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED,aAAK,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,CAAA;AAED,qBAAa,YAAY;IACvB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,aAAa,EAAE,YAAY,GAAG,MAAM,CAAC,CAAC;IAE5E,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAQ;IAEhD,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAQ;IAE3D,SAAS,CAAC,YAAY,EAAE,eAAe,GAAG,IAAI,CAAQ;gBAEnC,MAAM,GAAE,aAAkB;IAkBhC,MAAM,CAAC,OAAO,GAAE,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,aAAkB;;;;;;;IAiFnE,eAAe;IAIf,mBAAmB,CAAC,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG;IAIhD,KAAK;WA+BJ,YAAY,CAAC,MAAM,EAAE,YAAY;WAIjC,kBAAkB,CAAC,MAAM,EAAE,YAAY;WAIvC,SAAS;WAIT,OAAO;CAGtB"}
|
package/dist/server.js
CHANGED
|
@@ -17,17 +17,15 @@ const websocket_server_1 = require("./websocket-server");
|
|
|
17
17
|
const { version } = require('../package.json');
|
|
18
18
|
dotenv_1.default.config();
|
|
19
19
|
class CubejsServer {
|
|
20
|
-
constructor(config) {
|
|
20
|
+
constructor(config = {}) {
|
|
21
|
+
var _a;
|
|
21
22
|
this.redirector = null;
|
|
22
23
|
this.server = null;
|
|
23
24
|
this.socketServer = null;
|
|
24
|
-
config = config || {};
|
|
25
|
-
config.webSockets = config.webSockets || shared_1.getEnv('webSockets');
|
|
25
|
+
this.config = Object.assign(Object.assign({}, config), { webSockets: config.webSockets || shared_1.getEnv('webSockets'), http: Object.assign(Object.assign({}, config.http), { cors: Object.assign({ allowedHeaders: 'authorization,content-type,x-request-id' }, (_a = config.http) === null || _a === void 0 ? void 0 : _a.cors) }) });
|
|
26
26
|
this.core = server_core_1.default.create(config);
|
|
27
|
-
this.webSockets = config.webSockets;
|
|
28
27
|
this.redirector = null;
|
|
29
28
|
this.server = null;
|
|
30
|
-
this.initApp = config.initApp;
|
|
31
29
|
}
|
|
32
30
|
async listen(options = {}) {
|
|
33
31
|
try {
|
|
@@ -35,10 +33,10 @@ class CubejsServer {
|
|
|
35
33
|
throw new Error('CubeServer is already listening');
|
|
36
34
|
}
|
|
37
35
|
const app = express_1.default();
|
|
38
|
-
app.use(cors_1.default());
|
|
36
|
+
app.use(cors_1.default(this.config.http.cors));
|
|
39
37
|
app.use(body_parser_1.default.json({ limit: '50mb' }));
|
|
40
|
-
if (this.initApp) {
|
|
41
|
-
await this.initApp(app);
|
|
38
|
+
if (this.config.initApp) {
|
|
39
|
+
await this.config.initApp(app);
|
|
42
40
|
}
|
|
43
41
|
await this.core.initApp(app);
|
|
44
42
|
const PORT = shared_1.getEnv('port');
|
|
@@ -70,7 +68,7 @@ class CubejsServer {
|
|
|
70
68
|
this.server = http_1.default.createServer(options, app);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
|
-
if (this.webSockets) {
|
|
71
|
+
if (this.config.webSockets) {
|
|
74
72
|
this.socketServer = new websocket_server_1.WebSocketServer(this.core, this.core.options);
|
|
75
73
|
this.socketServer.initServer(this.server);
|
|
76
74
|
}
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,8EAIqC;AACrC,mDAAgD;AAChD,sDAA8B;AAC9B,kDAA0B;AAC1B,gDAAwB;AACxB,gDAAwB;AACxB,8DAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"0.
|
|
1
|
+
{"version":"0.24.2","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.
|
|
5
|
+
"version": "0.24.2",
|
|
6
6
|
"types": "index.d.ts",
|
|
7
7
|
"repository": {
|
|
8
8
|
"type": "git",
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"jest:shapshot": "jest --updateSnapshot"
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@cubejs-backend/server-core": "^0.
|
|
42
|
-
"@cubejs-backend/shared": "^0.
|
|
41
|
+
"@cubejs-backend/server-core": "^0.24.2",
|
|
42
|
+
"@cubejs-backend/shared": "^0.24.2",
|
|
43
43
|
"@oclif/color": "^0.1.2",
|
|
44
44
|
"@oclif/command": "^1.8.0",
|
|
45
45
|
"@oclif/config": "^1.17.0",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"ws": "^7.1.2"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@cubejs-backend/linter": "^0.
|
|
60
|
+
"@cubejs-backend/linter": "^0.24.2",
|
|
61
61
|
"@oclif/dev-cli": "^1.23.1",
|
|
62
62
|
"@types/cors": "^2.8.8",
|
|
63
63
|
"@types/node": "^10.0.10",
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"@oclif/plugin-help"
|
|
95
95
|
]
|
|
96
96
|
},
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "20a2c50c07d1b7602c0958fd3d5a69f310a415f1"
|
|
98
98
|
}
|