starta.microservice 0.1.4467 → 0.1.4662
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/adapters/executionContext/index.d.ts +17 -0
- package/lib/adapters/executionContext/index.js +54 -0
- package/lib/adapters/executionContext/index.js.map +1 -0
- package/lib/adapters/rabbitmq/index.d.ts +3 -1
- package/lib/adapters/rabbitmq/index.js +34 -4
- package/lib/adapters/rabbitmq/index.js.map +1 -1
- package/lib/services/ServiceExecutorHandler.js +3 -0
- package/lib/services/ServiceExecutorHandler.js.map +1 -1
- package/lib/services/ServiceHandlerBase.js +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
interface ExecutionContextData {
|
|
2
|
+
correlationId?: string;
|
|
3
|
+
authorizedUserLogin?: string;
|
|
4
|
+
}
|
|
5
|
+
declare class ExecutionContext {
|
|
6
|
+
private asyncLocalStorage;
|
|
7
|
+
setCorrelationId(correlationId: string): void;
|
|
8
|
+
getCorrelationId(): string | undefined;
|
|
9
|
+
setAuthorizedUserLogin(authorizedUserLogin: string): void;
|
|
10
|
+
getAuthorizedUserLogin(): string | undefined;
|
|
11
|
+
setFullData(contextData: ExecutionContextData): void;
|
|
12
|
+
getFullData(): ExecutionContextData;
|
|
13
|
+
private getContextValue;
|
|
14
|
+
private ensureStore;
|
|
15
|
+
}
|
|
16
|
+
declare const _default: ExecutionContext;
|
|
17
|
+
export default _default;
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const async_hooks_1 = require("async_hooks");
|
|
4
|
+
class ExecutionContext {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.asyncLocalStorage = new async_hooks_1.AsyncLocalStorage();
|
|
7
|
+
}
|
|
8
|
+
// Set a correlationId in the current context
|
|
9
|
+
setCorrelationId(correlationId) {
|
|
10
|
+
const store = this.ensureStore();
|
|
11
|
+
store.set('correlationId', correlationId);
|
|
12
|
+
}
|
|
13
|
+
getCorrelationId() {
|
|
14
|
+
return this.getContextValue('correlationId');
|
|
15
|
+
}
|
|
16
|
+
setAuthorizedUserLogin(authorizedUserLogin) {
|
|
17
|
+
const store = this.ensureStore();
|
|
18
|
+
store.set('authorizedUserLogin', authorizedUserLogin);
|
|
19
|
+
}
|
|
20
|
+
getAuthorizedUserLogin() {
|
|
21
|
+
return this.getContextValue('authorizedUserLogin');
|
|
22
|
+
}
|
|
23
|
+
setFullData(contextData) {
|
|
24
|
+
const store = this.ensureStore();
|
|
25
|
+
for (const [key, value] of Object.entries(contextData)) {
|
|
26
|
+
store.set(key, value);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
getFullData() {
|
|
30
|
+
const store = this.asyncLocalStorage.getStore();
|
|
31
|
+
if (!store) {
|
|
32
|
+
return {};
|
|
33
|
+
}
|
|
34
|
+
let contextData = {};
|
|
35
|
+
for (const [key, value] of store.entries()) {
|
|
36
|
+
contextData[key] = value;
|
|
37
|
+
}
|
|
38
|
+
return contextData;
|
|
39
|
+
}
|
|
40
|
+
getContextValue(key) {
|
|
41
|
+
const store = this.asyncLocalStorage.getStore();
|
|
42
|
+
return store ? store.get(key) : undefined;
|
|
43
|
+
}
|
|
44
|
+
ensureStore() {
|
|
45
|
+
let store = this.asyncLocalStorage.getStore();
|
|
46
|
+
if (!store) {
|
|
47
|
+
store = new Map();
|
|
48
|
+
this.asyncLocalStorage.enterWith(store);
|
|
49
|
+
}
|
|
50
|
+
return store;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
exports.default = new ExecutionContext();
|
|
54
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/executionContext/index.ts"],"names":[],"mappings":";;AAAA,6CAAgD;AAOhD,MAAM,gBAAgB;IAAtB;QACU,sBAAiB,GAAG,IAAI,+BAAiB,EAAoB,CAAC;IAsDxE,CAAC;IApDC,6CAA6C;IAC7C,gBAAgB,CAAC,aAAqB;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACjC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,sBAAsB,CAAC,mBAA2B;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACjC,KAAK,CAAC,GAAG,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,CAAC;IACxD,CAAC;IAED,sBAAsB;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CAAC,WAAiC;QAC3C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACjC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;YACtD,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACvB;IACH,CAAC;IAED,WAAW;QACT,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAChD,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,EAAE,CAAC;SACX;QAED,IAAI,WAAW,GAAyB,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE;YAC1C,WAAW,CAAC,GAAiC,CAAC,GAAG,KAAK,CAAC;SACxD;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,eAAe,CAAI,GAA+B;QACxD,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5C,CAAC;IAEO,WAAW;QACjB,IAAI,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAC9C,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,IAAI,GAAG,EAAe,CAAC;YAC/B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SACzC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAED,kBAAe,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -6,7 +6,9 @@ declare class Rabbitmq {
|
|
|
6
6
|
connect(tryRecconect?: boolean, timeout?: number): Promise<void>;
|
|
7
7
|
disconnect(): Promise<void>;
|
|
8
8
|
emitEvent(exchange: string, eventData: Object): Promise<void>;
|
|
9
|
-
consume(exchange: string, queue: string, onMessage: (msg: amqp.Message
|
|
9
|
+
consume(exchange: string, queue: string, onMessage: (msg: amqp.Message, { logger }?: {
|
|
10
|
+
logger: ServerLogger;
|
|
11
|
+
}) => Promise<void>, options?: {
|
|
10
12
|
pattern: string;
|
|
11
13
|
noAck: boolean;
|
|
12
14
|
}): Promise<void>;
|
|
@@ -26,6 +26,7 @@ var _Rabbitmq_logger, _Rabbitmq_connection, _Rabbitmq_channel, _Rabbitmq_created
|
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
27
|
const amqp_connection_manager_1 = __importDefault(require("amqp-connection-manager"));
|
|
28
28
|
const config_1 = __importDefault(require("../../config"));
|
|
29
|
+
const executionContext_1 = __importDefault(require("../executionContext"));
|
|
29
30
|
class Rabbitmq {
|
|
30
31
|
constructor(logger) {
|
|
31
32
|
_Rabbitmq_logger.set(this, void 0);
|
|
@@ -77,13 +78,19 @@ class Rabbitmq {
|
|
|
77
78
|
}
|
|
78
79
|
emitEvent(exchange, eventData) {
|
|
79
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
const logger = __classPrivateFieldGet(this, _Rabbitmq_logger, "f").withParams({ serviceBroker: { exchange } });
|
|
80
82
|
yield this.createExchanges([exchange]);
|
|
81
|
-
const emit = () => __classPrivateFieldGet(this, _Rabbitmq_channel, "f").publish(exchange, '*', Buffer.from(JSON.stringify(eventData))
|
|
83
|
+
const emit = () => __classPrivateFieldGet(this, _Rabbitmq_channel, "f").publish(exchange, '*', Buffer.from(JSON.stringify(eventData)), {
|
|
84
|
+
headers: {
|
|
85
|
+
context: executionContext_1.default.getFullData()
|
|
86
|
+
}
|
|
87
|
+
});
|
|
82
88
|
try {
|
|
83
89
|
emit();
|
|
90
|
+
logger.generic.info("Message published to rabbit");
|
|
84
91
|
}
|
|
85
92
|
catch (e) {
|
|
86
|
-
|
|
93
|
+
logger.internalError(e, "Unable to publish to rabbit");
|
|
87
94
|
try {
|
|
88
95
|
yield this.disconnect();
|
|
89
96
|
}
|
|
@@ -106,16 +113,39 @@ class Rabbitmq {
|
|
|
106
113
|
yield this.createQueues([queue]);
|
|
107
114
|
yield __classPrivateFieldGet(this, _Rabbitmq_channel, "f").bindQueue(queue, exchange, options.pattern);
|
|
108
115
|
yield __classPrivateFieldGet(this, _Rabbitmq_channel, "f").consume(queue, (msg) => __awaiter(this, void 0, void 0, function* () {
|
|
116
|
+
const startTime = process.hrtime();
|
|
117
|
+
const contextData = msg.properties.headers.context;
|
|
118
|
+
if (contextData) {
|
|
119
|
+
executionContext_1.default.setFullData(contextData);
|
|
120
|
+
}
|
|
121
|
+
const logger = __classPrivateFieldGet(this, _Rabbitmq_logger, "f").withParams({
|
|
122
|
+
correlationId: executionContext_1.default.getCorrelationId(),
|
|
123
|
+
login: executionContext_1.default.getAuthorizedUserLogin(),
|
|
124
|
+
serviceBroker: { queue, exchange },
|
|
125
|
+
});
|
|
109
126
|
try {
|
|
110
|
-
|
|
127
|
+
logger.generic.info("Consuming started");
|
|
128
|
+
yield onMessage(msg, { logger });
|
|
129
|
+
const diff = process.hrtime(startTime);
|
|
130
|
+
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
131
|
+
logger.generic.info("Consuming finished", { requestDuration: timeInMilliseconds });
|
|
111
132
|
}
|
|
112
133
|
catch (e) {
|
|
134
|
+
logger.generic.error(`
|
|
135
|
+
Consuming error
|
|
136
|
+
error: |${JSON.stringify(e.toHash ? e.toHash() : e.stack)}|
|
|
137
|
+
object: |${msg.content.toString()}|
|
|
138
|
+
`, e);
|
|
113
139
|
const errorQueueName = 'ERROR:' + queue;
|
|
114
140
|
yield this.createQueues([errorQueueName]);
|
|
115
141
|
__classPrivateFieldGet(this, _Rabbitmq_channel, "f").publish('', errorQueueName, Buffer.from(JSON.stringify({
|
|
116
142
|
message: msg.content.toString(),
|
|
117
143
|
error: e
|
|
118
|
-
}))
|
|
144
|
+
})), {
|
|
145
|
+
headers: {
|
|
146
|
+
context: executionContext_1.default.getFullData()
|
|
147
|
+
}
|
|
148
|
+
});
|
|
119
149
|
}
|
|
120
150
|
}), { noAck: options.noAck });
|
|
121
151
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sFAAgE;AAKhE,0DAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ const Account_1 = __importDefault(require("../entities/Account"));
|
|
|
57
57
|
const config_1 = __importDefault(require("../config"));
|
|
58
58
|
const aws_1 = __importDefault(require("../adapters/aws"));
|
|
59
59
|
const dataSelectors_1 = __importDefault(require("./dataSelectors"));
|
|
60
|
+
const executionContext_1 = __importDefault(require("../adapters/executionContext"));
|
|
60
61
|
const crypto_1 = __importDefault(require("crypto"));
|
|
61
62
|
class ServiceExecutorHandler {
|
|
62
63
|
constructor(redis, logger, serviceDescription, serviceFactory, serviceExecutor) {
|
|
@@ -82,6 +83,7 @@ class ServiceExecutorHandler {
|
|
|
82
83
|
correlationId: ((_a = originalRequest.headers['x-correlation-id']) === null || _a === void 0 ? void 0 : _a.toString()) || crypto_1.default.randomBytes(10).toString('hex')
|
|
83
84
|
};
|
|
84
85
|
response.setHeader('x-correlation-id', request.correlationId);
|
|
86
|
+
executionContext_1.default.setCorrelationId(request.correlationId);
|
|
85
87
|
__classPrivateFieldSet(this, _ServiceExecutorHandler_logger, __classPrivateFieldGet(this, _ServiceExecutorHandler_logger, "f").withParams({
|
|
86
88
|
correlationId: request.correlationId,
|
|
87
89
|
clientIp: (_b = dataSelectors_1.default.selectClientIp(request)) === null || _b === void 0 ? void 0 : _b.clientIp,
|
|
@@ -338,6 +340,7 @@ class ServiceExecutorHandler {
|
|
|
338
340
|
__classPrivateFieldSet(this, _ServiceExecutorHandler_logger, __classPrivateFieldGet(this, _ServiceExecutorHandler_logger, "f").withParams({
|
|
339
341
|
login: request.session.account.login
|
|
340
342
|
}), "f");
|
|
343
|
+
executionContext_1.default.setAuthorizedUserLogin(request.session.account.login);
|
|
341
344
|
});
|
|
342
345
|
}
|
|
343
346
|
executeRequest(request, requestData = undefined, permissions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceExecutorHandler.js","sourceRoot":"","sources":["../../src/services/ServiceExecutorHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ServiceExecutorHandler.js","sourceRoot":"","sources":["../../src/services/ServiceExecutorHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ class ServiceHandlerBase {
|
|
|
41
41
|
}
|
|
42
42
|
simpleHandleRevisions(entityClone, entity) {
|
|
43
43
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
44
|
-
entity.updatedAt = ((_b = (_a = this.request) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.date) || ((_c = this.requestData) === null || _c === void 0 ? void 0 : _c.
|
|
44
|
+
entity.updatedAt = ((_b = (_a = this.request) === null || _a === void 0 ? void 0 : _a.session) === null || _b === void 0 ? void 0 : _b.date) || ((_c = this.requestData) === null || _c === void 0 ? void 0 : _c.updatedAt) || ((_d = this.requestData) === null || _d === void 0 ? void 0 : _d.createdAt) || timeProvider_1.default.jsDate();
|
|
45
45
|
entity.updatedBy = ((_g = (_f = (_e = this.request) === null || _e === void 0 ? void 0 : _e.session) === null || _f === void 0 ? void 0 : _f.account) === null || _g === void 0 ? void 0 : _g.login) || ((_h = this.requestData) === null || _h === void 0 ? void 0 : _h.updatedBy) || ((_j = this.requestData) === null || _j === void 0 ? void 0 : _j.createdBy) || '%system';
|
|
46
46
|
entity.createdAt = entityClone.createdAt;
|
|
47
47
|
entity.createdBy = entityClone.createdBy;
|