@contember/engine-server 1.2.0-alpha.18 → 1.2.0-alpha.19
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/config/configSchema.d.ts +12 -0
- package/dist/src/config/configSchema.d.ts.map +1 -1
- package/dist/src/config/configSchema.js +2 -0
- package/dist/src/config/configSchema.js.map +1 -1
- package/dist/src/config/configTemplate.d.ts.map +1 -1
- package/dist/src/config/configTemplate.js +23 -36
- package/dist/src/config/configTemplate.js.map +1 -1
- package/dist/src/projectGroup/ProjectGroupContainer.js +2 -2
- package/dist/src/projectGroup/ProjectGroupContainer.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/src/utils/serverStartup.js +2 -2
- package/dist/src/utils/serverStartup.js.map +1 -1
- package/dist/src/utils/serverTermination.js +2 -2
- package/dist/src/utils/serverTermination.js.map +1 -1
- package/dist/tests/src/tester.js +2 -2
- package/dist/tests/src/tester.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -22
- package/src/config/configSchema.ts +2 -0
- package/src/config/configTemplate.ts +23 -36
- package/src/projectGroup/ProjectGroupContainer.ts +1 -1
- package/src/tsconfig.json +3 -15
- package/src/utils/serverStartup.ts +1 -1
- package/src/utils/serverTermination.ts +1 -1
- package/tests/src/tester.ts +1 -1
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createDefaultLogger = exports.resolveServerConfig = exports.printStartInfo = exports.isDebugMode = exports.getServerVersion = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
5
5
|
const config_1 = require("../config/config");
|
|
6
6
|
const logger_1 = require("@contember/logger");
|
|
7
7
|
const getServerVersion = () => {
|
|
8
|
-
const packageJsonFile = process.env.CONTEMBER_PACKAGE_JSON || (0,
|
|
8
|
+
const packageJsonFile = process.env.CONTEMBER_PACKAGE_JSON || (0, node_path_1.join)(__dirname, '../../../package.json');
|
|
9
9
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
10
10
|
const version = require(packageJsonFile).version;
|
|
11
11
|
return version;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverStartup.js","sourceRoot":"","sources":["../../../src/utils/serverStartup.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"serverStartup.js","sourceRoot":"","sources":["../../../src/utils/serverStartup.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.listenOnProcessTermination = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_cluster_1 = __importDefault(require("node:cluster"));
|
|
8
8
|
const signals = {
|
|
9
9
|
SIGHUP: 1,
|
|
10
10
|
SIGINT: 2,
|
|
@@ -15,7 +15,7 @@ const listenOnProcessTermination = (jobs, logger) => {
|
|
|
15
15
|
process.on(signal, async () => {
|
|
16
16
|
logger.info(`Process ${process.pid} received a ${signal} signal, executing ${jobs.length} termination jobs`);
|
|
17
17
|
await Promise.allSettled(jobs.map(it => it({ signal: signal, code })));
|
|
18
|
-
logger.info(
|
|
18
|
+
logger.info(node_cluster_1.default.isMaster ? `All terminated, exiting` : 'All terminated, exiting a worker');
|
|
19
19
|
process.exit(128 + code);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serverTermination.js","sourceRoot":"","sources":["../../../src/utils/serverTermination.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"serverTermination.js","sourceRoot":"","sources":["../../../src/utils/serverTermination.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAkC;AAGlC,MAAM,OAAO,GAAG;IACf,MAAM,EAAE,CAAC;IACT,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,EAAE;CACX,CAAA;AAEM,MAAM,0BAA0B,GAAG,CAAC,IAAsB,EAAE,MAAc,EAAE,EAAE;IACpF,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACrD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,CAAC,GAAG,eAAe,MAAM,sBAAsB,IAAI,CAAC,MAAM,mBAAmB,CAAC,CAAA;YAC5G,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAA8B,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC9F,MAAM,CAAC,IAAI,CAAC,sBAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,kCAAkC,CAAC,CAAA;YAC9F,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;QACzB,CAAC,CAAC,CAAA;KACF;AACF,CAAC,CAAA;AATY,QAAA,0BAA0B,8BAStC"}
|
package/dist/tests/src/tester.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createTester = exports.executeGraphql = exports.gql = exports.apiUrl = exports.loginToken = exports.rootToken = void 0;
|
|
7
|
-
const
|
|
7
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
8
8
|
const supertest_1 = __importDefault(require("supertest"));
|
|
9
9
|
const schema_migrations_1 = require("@contember/schema-migrations");
|
|
10
10
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
@@ -14,7 +14,7 @@ exports.loginToken = String(process.env.CONTEMBER_LOGIN_TOKEN);
|
|
|
14
14
|
exports.apiUrl = String(process.env.CONTEMBER_API_URL);
|
|
15
15
|
// Used to allow prettier formatting of GraphQL queries
|
|
16
16
|
const gql = (strings) => {
|
|
17
|
-
|
|
17
|
+
node_assert_1.default.strictEqual(strings.length, 1);
|
|
18
18
|
return strings[0];
|
|
19
19
|
};
|
|
20
20
|
exports.gql = gql;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tester.js","sourceRoot":"","sources":["../../../tests/src/tester.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"tester.js","sourceRoot":"","sources":["../../../tests/src/tester.ts"],"names":[],"mappings":"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"}
|