@tramvai/module-server 1.67.0 → 1.68.0
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/lib/server.es.js +8 -6
- package/lib/server.js +7 -5
- package/package.json +11 -11
package/lib/server.es.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate } from 'tslib';
|
|
2
2
|
import { Scope, APP_INFO_TOKEN, Module, provide, DI_TOKEN, COMMAND_LINE_RUNNER_TOKEN, commandLineListTokens } from '@tramvai/core';
|
|
3
|
-
import { SERVER_MODULE_PAPI_PUBLIC_ROUTE, SERVER_MODULE_PAPI_PUBLIC_URL, SERVER_MODULE_PAPI_PRIVATE_URL, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_TOKEN, SERVER_MODULE_PAPI_PRIVATE_ROUTE, SERVER_MODULE_STATICS_OPTIONS, WEB_APP_INIT_TOKEN, SERVER_TOKEN, SPECIAL_SERVER_PATHS, PROXY_CONFIG_TOKEN, DEPENDENCIES_VERSION_FILTER_TOKEN, WEB_APP_AFTER_INIT_TOKEN } from '@tramvai/tokens-server';
|
|
3
|
+
import { SERVER_MODULE_PAPI_PUBLIC_ROUTE, SERVER_MODULE_PAPI_PUBLIC_URL, SERVER_MODULE_PAPI_PRIVATE_URL, WEB_APP_BEFORE_INIT_TOKEN, WEB_APP_TOKEN, SERVER_MODULE_PAPI_PRIVATE_ROUTE, SERVER_MODULE_STATICS_OPTIONS, WEB_APP_INIT_TOKEN, SERVER_TOKEN, READINESS_PROBE_TOKEN, LIVENESS_PROBE_TOKEN, SPECIAL_SERVER_PATHS, PROXY_CONFIG_TOKEN, DEPENDENCIES_VERSION_FILTER_TOKEN, WEB_APP_AFTER_INIT_TOKEN } from '@tramvai/tokens-server';
|
|
4
4
|
export * from '@tramvai/tokens-server';
|
|
5
5
|
import { REQUEST, RESPONSE, RESPONSE_MANAGER_TOKEN, LOGGER_TOKEN as LOGGER_TOKEN$1, ENV_MANAGER_TOKEN as ENV_MANAGER_TOKEN$1, ENV_USED_TOKEN } from '@tramvai/module-common';
|
|
6
6
|
import { MetricsModule } from '@tramvai/module-metrics';
|
|
@@ -408,6 +408,7 @@ const GRACEFUL_SHUTDOWN_TIMEOUT = 25000;
|
|
|
408
408
|
const GRACEFUL_READINESS_TIMEOUT = 5000;
|
|
409
409
|
const healthzPath = '/healthz';
|
|
410
410
|
const readyzPath = '/readyz';
|
|
411
|
+
const noopCheck = () => { };
|
|
411
412
|
let ServerGracefulShutdownModule = class ServerGracefulShutdownModule {
|
|
412
413
|
};
|
|
413
414
|
ServerGracefulShutdownModule = __decorate([
|
|
@@ -416,7 +417,7 @@ ServerGracefulShutdownModule = __decorate([
|
|
|
416
417
|
{
|
|
417
418
|
provide: WEB_APP_INIT_TOKEN,
|
|
418
419
|
multi: true,
|
|
419
|
-
useFactory: ({ server, app, logger, commandLineRunner }) => {
|
|
420
|
+
useFactory: ({ server, app, logger, commandLineRunner, livenessProbe, readinessProbe, }) => {
|
|
420
421
|
const log = logger('server');
|
|
421
422
|
return function serverListen() {
|
|
422
423
|
createTerminus(server, app, {
|
|
@@ -442,7 +443,7 @@ ServerGracefulShutdownModule = __decorate([
|
|
|
442
443
|
event: 'terminus-run-command',
|
|
443
444
|
message: 'run commandLineRunner close line',
|
|
444
445
|
});
|
|
445
|
-
|
|
446
|
+
commandLineRunner.run('server', 'close');
|
|
446
447
|
},
|
|
447
448
|
onShutdown: () => {
|
|
448
449
|
log.warn({
|
|
@@ -450,11 +451,10 @@ ServerGracefulShutdownModule = __decorate([
|
|
|
450
451
|
message: 'calling process.exit',
|
|
451
452
|
});
|
|
452
453
|
process.exit();
|
|
453
|
-
return Promise.resolve();
|
|
454
454
|
},
|
|
455
455
|
healthChecks: {
|
|
456
|
-
[healthzPath]:
|
|
457
|
-
[readyzPath]:
|
|
456
|
+
[healthzPath]: livenessProbe || noopCheck,
|
|
457
|
+
[readyzPath]: readinessProbe || noopCheck,
|
|
458
458
|
},
|
|
459
459
|
});
|
|
460
460
|
};
|
|
@@ -464,6 +464,8 @@ ServerGracefulShutdownModule = __decorate([
|
|
|
464
464
|
app: WEB_APP_TOKEN,
|
|
465
465
|
logger: LOGGER_TOKEN,
|
|
466
466
|
commandLineRunner: COMMAND_LINE_RUNNER_TOKEN,
|
|
467
|
+
readinessProbe: { token: READINESS_PROBE_TOKEN, optional: true },
|
|
468
|
+
livenessProbe: { token: LIVENESS_PROBE_TOKEN, optional: true },
|
|
467
469
|
},
|
|
468
470
|
},
|
|
469
471
|
{
|
package/lib/server.js
CHANGED
|
@@ -430,6 +430,7 @@ const GRACEFUL_SHUTDOWN_TIMEOUT = 25000;
|
|
|
430
430
|
const GRACEFUL_READINESS_TIMEOUT = 5000;
|
|
431
431
|
const healthzPath = '/healthz';
|
|
432
432
|
const readyzPath = '/readyz';
|
|
433
|
+
const noopCheck = () => { };
|
|
433
434
|
let ServerGracefulShutdownModule = class ServerGracefulShutdownModule {
|
|
434
435
|
};
|
|
435
436
|
ServerGracefulShutdownModule = tslib.__decorate([
|
|
@@ -438,7 +439,7 @@ ServerGracefulShutdownModule = tslib.__decorate([
|
|
|
438
439
|
{
|
|
439
440
|
provide: tokensServer.WEB_APP_INIT_TOKEN,
|
|
440
441
|
multi: true,
|
|
441
|
-
useFactory: ({ server, app, logger, commandLineRunner }) => {
|
|
442
|
+
useFactory: ({ server, app, logger, commandLineRunner, livenessProbe, readinessProbe, }) => {
|
|
442
443
|
const log = logger('server');
|
|
443
444
|
return function serverListen() {
|
|
444
445
|
expressTerminus.createTerminus(server, app, {
|
|
@@ -464,7 +465,7 @@ ServerGracefulShutdownModule = tslib.__decorate([
|
|
|
464
465
|
event: 'terminus-run-command',
|
|
465
466
|
message: 'run commandLineRunner close line',
|
|
466
467
|
});
|
|
467
|
-
|
|
468
|
+
commandLineRunner.run('server', 'close');
|
|
468
469
|
},
|
|
469
470
|
onShutdown: () => {
|
|
470
471
|
log.warn({
|
|
@@ -472,11 +473,10 @@ ServerGracefulShutdownModule = tslib.__decorate([
|
|
|
472
473
|
message: 'calling process.exit',
|
|
473
474
|
});
|
|
474
475
|
process.exit();
|
|
475
|
-
return Promise.resolve();
|
|
476
476
|
},
|
|
477
477
|
healthChecks: {
|
|
478
|
-
[healthzPath]:
|
|
479
|
-
[readyzPath]:
|
|
478
|
+
[healthzPath]: livenessProbe || noopCheck,
|
|
479
|
+
[readyzPath]: readinessProbe || noopCheck,
|
|
480
480
|
},
|
|
481
481
|
});
|
|
482
482
|
};
|
|
@@ -486,6 +486,8 @@ ServerGracefulShutdownModule = tslib.__decorate([
|
|
|
486
486
|
app: tokensServer.WEB_APP_TOKEN,
|
|
487
487
|
logger: tokensCommon.LOGGER_TOKEN,
|
|
488
488
|
commandLineRunner: core.COMMAND_LINE_RUNNER_TOKEN,
|
|
489
|
+
readinessProbe: { token: tokensServer.READINESS_PROBE_TOKEN, optional: true },
|
|
490
|
+
livenessProbe: { token: tokensServer.LIVENESS_PROBE_TOKEN, optional: true },
|
|
489
491
|
},
|
|
490
492
|
},
|
|
491
493
|
{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tramvai/module-server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.68.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"browser": "lib/browser.js",
|
|
6
6
|
"main": "lib/server.js",
|
|
@@ -20,13 +20,13 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@tinkoff/errors": "0.2.18",
|
|
23
|
-
"@tinkoff/express-terminus": "0.1.
|
|
23
|
+
"@tinkoff/express-terminus": "0.1.13",
|
|
24
24
|
"@tinkoff/monkeypatch": "1.3.3",
|
|
25
25
|
"@tinkoff/url": "0.7.37",
|
|
26
|
-
"@tramvai/module-cache-warmup": "1.
|
|
27
|
-
"@tramvai/module-metrics": "1.
|
|
28
|
-
"@tramvai/papi": "1.
|
|
29
|
-
"@tramvai/tokens-server": "1.
|
|
26
|
+
"@tramvai/module-cache-warmup": "1.68.0",
|
|
27
|
+
"@tramvai/module-metrics": "1.68.0",
|
|
28
|
+
"@tramvai/papi": "1.68.0",
|
|
29
|
+
"@tramvai/tokens-server": "1.68.0",
|
|
30
30
|
"body-parser": "^1.19.0",
|
|
31
31
|
"compression": "^1.7.4",
|
|
32
32
|
"cookie-parser": "^1.4.3",
|
|
@@ -36,11 +36,11 @@
|
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {
|
|
38
38
|
"@tinkoff/utils": "^2.1.2",
|
|
39
|
-
"@tramvai/cli": "1.
|
|
40
|
-
"@tramvai/core": "1.
|
|
41
|
-
"@tramvai/module-common": "1.
|
|
42
|
-
"@tramvai/module-environment": "1.
|
|
43
|
-
"@tramvai/tokens-common": "1.
|
|
39
|
+
"@tramvai/cli": "1.68.0",
|
|
40
|
+
"@tramvai/core": "1.68.0",
|
|
41
|
+
"@tramvai/module-common": "1.68.0",
|
|
42
|
+
"@tramvai/module-environment": "1.68.0",
|
|
43
|
+
"@tramvai/tokens-common": "1.68.0",
|
|
44
44
|
"@tinkoff/dippy": "0.7.38",
|
|
45
45
|
"tslib": "^2.0.3"
|
|
46
46
|
},
|