@open-rlb/nestjs-amqp 1.0.24 → 1.0.26
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/modules/broker/broker.module.js +2 -0
- package/modules/broker/broker.module.js.map +1 -1
- package/modules/broker/index.d.ts +2 -0
- package/modules/broker/index.js +2 -0
- package/modules/broker/index.js.map +1 -1
- package/modules/broker/services/shutdown-state.service.d.ts +14 -0
- package/modules/broker/services/shutdown-state.service.js +61 -0
- package/modules/broker/services/shutdown-state.service.js.map +1 -0
- package/modules/broker/utils/drainable-stream.d.ts +8 -0
- package/modules/broker/utils/drainable-stream.js +29 -0
- package/modules/broker/utils/drainable-stream.js.map +1 -0
- package/modules/proxy/services/http-auth-handler.service.d.ts +1 -0
- package/modules/proxy/services/http-auth-handler.service.js +12 -6
- package/modules/proxy/services/http-auth-handler.service.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
|
@@ -16,6 +16,7 @@ const auto_discovery_service_1 = require("./services/auto-discovery.service");
|
|
|
16
16
|
const broker_service_1 = require("./services/broker.service");
|
|
17
17
|
const handler_registry_service_1 = require("./services/handler-registry.service");
|
|
18
18
|
const metadata_scanner_service_1 = require("./services/metadata-scanner.service");
|
|
19
|
+
const shutdown_state_service_1 = require("./services/shutdown-state.service");
|
|
19
20
|
const utils_service_1 = require("./services/utils.service");
|
|
20
21
|
_a = new common_1.ConfigurableModuleBuilder().setClassMethodName('forRoot').build(), exports.ConfigurableModuleClass = _a.ConfigurableModuleClass, exports.MODULE_OPTIONS_TOKEN = _a.MODULE_OPTIONS_TOKEN;
|
|
21
22
|
let BrokerModule = BrokerModule_1 = class BrokerModule {
|
|
@@ -118,6 +119,7 @@ exports.BrokerModule = BrokerModule = BrokerModule_1 = __decorate([
|
|
|
118
119
|
broker_service_1.BrokerService,
|
|
119
120
|
handler_registry_service_1.HandlerRegistryService,
|
|
120
121
|
metadata_scanner_service_1.MetadataScannerService,
|
|
122
|
+
shutdown_state_service_1.ShutdownStateService,
|
|
121
123
|
auto_discovery_service_1.AutoDiscoveryService,
|
|
122
124
|
utils_service_1.UtilsService
|
|
123
125
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broker.module.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/broker.module.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,2CAA0G;AAC1G,6DAAgE;AAKhE,mCAAoJ;AACpJ,8EAAyE;AACzE,8DAA0D;AAC1D,kFAA6E;AAC7E,kFAA6E;AAC7E,4DAAmE;AACtD,KACX,IAAI,kCAAyB,EAAkB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EADxE,+BAAuB,+BAAE,4BAAoB,2BAC4B;
|
|
1
|
+
{"version":3,"file":"broker.module.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/broker.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,3 +9,5 @@ export * from './pipes';
|
|
|
9
9
|
export * from './services/auto-discovery.service';
|
|
10
10
|
export * from './services/broker.service';
|
|
11
11
|
export * from './services/handler-registry.service';
|
|
12
|
+
export * from './services/shutdown-state.service';
|
|
13
|
+
export * from './utils/drainable-stream';
|
package/modules/broker/index.js
CHANGED
|
@@ -25,4 +25,6 @@ __exportStar(require("./pipes"), exports);
|
|
|
25
25
|
__exportStar(require("./services/auto-discovery.service"), exports);
|
|
26
26
|
__exportStar(require("./services/broker.service"), exports);
|
|
27
27
|
__exportStar(require("./services/handler-registry.service"), exports);
|
|
28
|
+
__exportStar(require("./services/shutdown-state.service"), exports);
|
|
29
|
+
__exportStar(require("./utils/drainable-stream"), exports);
|
|
28
30
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,kDAAgC;AAChC,yDAAuC;AACvC,+DAA6C;AAC7C,yDAAuC;AACvC,yDAAuC;AACvC,+CAA6B;AAC7B,0CAAwB;AACxB,oEAAkD;AAClD,4DAA0C;AAC1C,sEAAoD"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../libs/rlb-nestjs-amqp/src/modules/broker/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wEAAsD;AACtD,kDAAgC;AAChC,yDAAuC;AACvC,+DAA6C;AAC7C,yDAAuC;AACvC,yDAAuC;AACvC,+CAA6B;AAC7B,0CAAwB;AACxB,oEAAkD;AAClD,4DAA0C;AAC1C,sEAAoD;AACpD,oEAAkD;AAClD,2DAAyC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
|
|
2
|
+
import { BrokerService } from './broker.service';
|
|
3
|
+
export declare class ShutdownStateService implements OnModuleInit, OnModuleDestroy {
|
|
4
|
+
private readonly brokerService;
|
|
5
|
+
private readonly logger;
|
|
6
|
+
private _isShuttingDown;
|
|
7
|
+
private readonly drainers;
|
|
8
|
+
constructor(brokerService: BrokerService);
|
|
9
|
+
get isShuttingDown(): boolean;
|
|
10
|
+
register(name: string, drain: () => Promise<void>): void;
|
|
11
|
+
onModuleInit(): void;
|
|
12
|
+
onModuleDestroy(): Promise<void>;
|
|
13
|
+
private drainAll;
|
|
14
|
+
}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var ShutdownStateService_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.ShutdownStateService = void 0;
|
|
14
|
+
const common_1 = require("@nestjs/common");
|
|
15
|
+
const broker_service_1 = require("./broker.service");
|
|
16
|
+
const SHUTDOWN_TIMEOUT_MS = 25_000;
|
|
17
|
+
let ShutdownStateService = ShutdownStateService_1 = class ShutdownStateService {
|
|
18
|
+
constructor(brokerService) {
|
|
19
|
+
this.brokerService = brokerService;
|
|
20
|
+
this.logger = new common_1.Logger(ShutdownStateService_1.name);
|
|
21
|
+
this._isShuttingDown = false;
|
|
22
|
+
this.drainers = [];
|
|
23
|
+
}
|
|
24
|
+
get isShuttingDown() {
|
|
25
|
+
return this._isShuttingDown;
|
|
26
|
+
}
|
|
27
|
+
register(name, drain) {
|
|
28
|
+
this.drainers.push({ name, drain });
|
|
29
|
+
}
|
|
30
|
+
onModuleInit() {
|
|
31
|
+
const handleSignal = (signal) => {
|
|
32
|
+
if (this._isShuttingDown)
|
|
33
|
+
return;
|
|
34
|
+
this._isShuttingDown = true;
|
|
35
|
+
this.logger.log(`Shutdown signal '${signal}' received.`);
|
|
36
|
+
setTimeout(() => {
|
|
37
|
+
this.logger.error(`Graceful shutdown timed out after ${SHUTDOWN_TIMEOUT_MS}ms on ${signal}, forcing exit.`);
|
|
38
|
+
process.exit(1);
|
|
39
|
+
}, SHUTDOWN_TIMEOUT_MS).unref();
|
|
40
|
+
};
|
|
41
|
+
process.once('SIGINT', () => handleSignal('SIGINT'));
|
|
42
|
+
process.once('SIGTERM', () => handleSignal('SIGTERM'));
|
|
43
|
+
}
|
|
44
|
+
async onModuleDestroy() {
|
|
45
|
+
await this.brokerService.unregisterAll();
|
|
46
|
+
await this.drainAll();
|
|
47
|
+
}
|
|
48
|
+
async drainAll() {
|
|
49
|
+
if (this.drainers.length === 0)
|
|
50
|
+
return;
|
|
51
|
+
this.logger.log(`Draining ${this.drainers.length} pipeline(s)...`);
|
|
52
|
+
await Promise.all(this.drainers.map(d => d.drain().catch(err => this.logger.error(`Drain failed for ${d.name}: ${err.message}`))));
|
|
53
|
+
this.logger.log('All pipelines drained.');
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
exports.ShutdownStateService = ShutdownStateService;
|
|
57
|
+
exports.ShutdownStateService = ShutdownStateService = ShutdownStateService_1 = __decorate([
|
|
58
|
+
(0, common_1.Injectable)(),
|
|
59
|
+
__metadata("design:paramtypes", [broker_service_1.BrokerService])
|
|
60
|
+
], ShutdownStateService);
|
|
61
|
+
//# sourceMappingURL=shutdown-state.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shutdown-state.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/broker/services/shutdown-state.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAmF;AACnF,qDAAiD;AAEjD,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAG5B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAK/B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;QACxD,oBAAe,GAAG,KAAK,CAAC;QACf,aAAQ,GAAyD,EAAE,CAAC;IAExB,CAAC;IAE9D,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,QAAQ,CAAC,IAAY,EAAE,KAA0B;QAC/C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,YAAY;QACV,MAAM,YAAY,GAAG,CAAC,MAAsB,EAAE,EAAE;YAC9C,IAAI,IAAI,CAAC,eAAe;gBAAE,OAAO;YACjC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,MAAM,aAAa,CAAC,CAAC;YACzD,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,mBAAmB,SAAS,MAAM,iBAAiB,CAAC,CAAC;gBAC5G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,EAAE,mBAAmB,CAAC,CAAC,KAAK,EAAE,CAAC;QAClC,CAAC,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,QAAQ,CAAC,MAAM,iBAAiB,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACtC,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CACxF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;AA1CY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAMiC,8BAAa;GAL9C,oBAAoB,CA0ChC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DrainableStream = void 0;
|
|
4
|
+
const rxjs_1 = require("rxjs");
|
|
5
|
+
class DrainableStream {
|
|
6
|
+
constructor() {
|
|
7
|
+
this.shutdown$ = new rxjs_1.Subject();
|
|
8
|
+
this.drained$ = new rxjs_1.ReplaySubject(1);
|
|
9
|
+
this.pendingStreams = 0;
|
|
10
|
+
}
|
|
11
|
+
takeUntilShutdown() {
|
|
12
|
+
this.pendingStreams++;
|
|
13
|
+
return source$ => source$.pipe((0, rxjs_1.takeUntil)(this.shutdown$), (0, rxjs_1.finalize)(() => {
|
|
14
|
+
if (--this.pendingStreams === 0) {
|
|
15
|
+
this.drained$.next();
|
|
16
|
+
this.drained$.complete();
|
|
17
|
+
}
|
|
18
|
+
}));
|
|
19
|
+
}
|
|
20
|
+
async drain() {
|
|
21
|
+
this.shutdown$.next();
|
|
22
|
+
this.shutdown$.complete();
|
|
23
|
+
if (this.pendingStreams > 0) {
|
|
24
|
+
await (0, rxjs_1.firstValueFrom)(this.drained$.pipe((0, rxjs_1.defaultIfEmpty)(undefined)));
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.DrainableStream = DrainableStream;
|
|
29
|
+
//# sourceMappingURL=drainable-stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"drainable-stream.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/broker/utils/drainable-stream.ts"],"names":[],"mappings":";;;AAAA,+BAA6H;AAQ7H,MAAa,eAAe;IAA5B;QACmB,cAAS,GAAG,IAAI,cAAO,EAAQ,CAAC;QAChC,aAAQ,GAAG,IAAI,oBAAa,CAAO,CAAC,CAAC,CAAC;QAC/C,mBAAc,GAAG,CAAC,CAAC;IAsB7B,CAAC;IApBC,iBAAiB;QACf,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,OAAO,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAC5B,IAAA,gBAAS,EAAC,IAAI,CAAC,SAAS,CAAC,EACzB,IAAA,eAAQ,EAAC,GAAG,EAAE;YACZ,IAAI,EAAE,IAAI,CAAC,cAAc,KAAK,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACrB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAA,qBAAc,EAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,qBAAc,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;CACF;AAzBD,0CAyBC"}
|
|
@@ -8,6 +8,7 @@ export declare class HttpAuthHandlerService {
|
|
|
8
8
|
private readonly aclRoleService;
|
|
9
9
|
private readonly authProviders;
|
|
10
10
|
private readonly jwtService;
|
|
11
|
+
private readonly logger;
|
|
11
12
|
constructor(aclRoleService: IAclRoleService, authProviders: HandlerAuthConfig[], jwtService: JwtService);
|
|
12
13
|
processAuthData(req: Request, path: PathDefinition): Promise<ProcessedAuthData>;
|
|
13
14
|
checkJwt(req: Request, authConfig: HandlerAuthConfig): Promise<ProcessedAuthData>;
|
|
@@ -11,17 +11,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var HttpAuthHandlerService_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.HttpAuthHandlerService = void 0;
|
|
16
17
|
const common_1 = require("@nestjs/common");
|
|
17
18
|
const const_1 = require("../../broker/const");
|
|
18
19
|
const acl_service_1 = require("./acl.service");
|
|
19
20
|
const jwt_service_1 = require("./jwt.service");
|
|
20
|
-
let HttpAuthHandlerService = class HttpAuthHandlerService {
|
|
21
|
+
let HttpAuthHandlerService = HttpAuthHandlerService_1 = class HttpAuthHandlerService {
|
|
21
22
|
constructor(aclRoleService, authProviders, jwtService) {
|
|
22
23
|
this.aclRoleService = aclRoleService;
|
|
23
24
|
this.authProviders = authProviders;
|
|
24
25
|
this.jwtService = jwtService;
|
|
26
|
+
this.logger = new common_1.Logger(HttpAuthHandlerService_1.name);
|
|
25
27
|
}
|
|
26
28
|
async processAuthData(req, path) {
|
|
27
29
|
let out = { success: false };
|
|
@@ -98,12 +100,16 @@ let HttpAuthHandlerService = class HttpAuthHandlerService {
|
|
|
98
100
|
async checkStringCompare(req, authConfig) {
|
|
99
101
|
let out = { success: false };
|
|
100
102
|
const authHeader = req.headers.authorization;
|
|
101
|
-
if (!
|
|
103
|
+
if (!authConfig.secret) {
|
|
104
|
+
out.success = true;
|
|
105
|
+
return out;
|
|
106
|
+
}
|
|
107
|
+
if (authConfig.secret && !authConfig.headerPrefix) {
|
|
108
|
+
this.logger.error("Missing field 'header prefix' in " + authConfig.name);
|
|
102
109
|
return out;
|
|
103
110
|
}
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
out[`${authConfig.headerPrefix}TOKEN`] = token;
|
|
111
|
+
if (authHeader === authConfig.secret) {
|
|
112
|
+
out[`${authConfig.headerPrefix}TOKEN`] = authHeader;
|
|
107
113
|
out.success = true;
|
|
108
114
|
return out;
|
|
109
115
|
}
|
|
@@ -137,7 +143,7 @@ let HttpAuthHandlerService = class HttpAuthHandlerService {
|
|
|
137
143
|
}
|
|
138
144
|
};
|
|
139
145
|
exports.HttpAuthHandlerService = HttpAuthHandlerService;
|
|
140
|
-
exports.HttpAuthHandlerService = HttpAuthHandlerService = __decorate([
|
|
146
|
+
exports.HttpAuthHandlerService = HttpAuthHandlerService = HttpAuthHandlerService_1 = __decorate([
|
|
141
147
|
(0, common_1.Injectable)(),
|
|
142
148
|
__param(0, (0, common_1.Optional)()),
|
|
143
149
|
__param(0, (0, common_1.Inject)(acl_service_1.RLB_GTW_ACL_ROLE_SERVICE)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-auth-handler.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/proxy/services/http-auth-handler.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-auth-handler.service.js","sourceRoot":"","sources":["../../../../libs/rlb-nestjs-amqp/src/modules/proxy/services/http-auth-handler.service.ts"],"names":[],"mappings":"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"}
|