starta.microservice 0.1.4664 → 0.1.4671
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/rabbitmq/index.js +4 -3
- package/lib/adapters/rabbitmq/index.js.map +1 -1
- package/lib/agenda/index.js +5 -6
- package/lib/agenda/index.js.map +1 -1
- package/lib/services/ServiceFactoryBase.d.ts +2 -1
- package/lib/services/ServiceFactoryBase.js.map +1 -1
- package/lib/services/ServiceHandlerBase.js +2 -1
- package/lib/services/ServiceHandlerBase.js.map +1 -1
- package/package.json +1 -1
|
@@ -27,6 +27,7 @@ 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
29
|
const executionContext_1 = __importDefault(require("../../contexts/executionContext"));
|
|
30
|
+
const loggerContext_1 = __importDefault(require("../../contexts/loggerContext"));
|
|
30
31
|
class Rabbitmq {
|
|
31
32
|
constructor(logger) {
|
|
32
33
|
_Rabbitmq_logger.set(this, void 0);
|
|
@@ -77,10 +78,9 @@ class Rabbitmq {
|
|
|
77
78
|
});
|
|
78
79
|
}
|
|
79
80
|
emitEvent(exchange, eventData) {
|
|
81
|
+
var _a;
|
|
80
82
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
-
const logger = __classPrivateFieldGet(this, _Rabbitmq_logger, "f").withParams({
|
|
82
|
-
correlationId: executionContext_1.default.getCorrelationId(),
|
|
83
|
-
login: executionContext_1.default.getAuthorizedUserLogin(),
|
|
83
|
+
const logger = ((_a = loggerContext_1.default.getLogger()) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _Rabbitmq_logger, "f")).withParams({
|
|
84
84
|
serviceBroker: { exchange },
|
|
85
85
|
});
|
|
86
86
|
yield this.createExchanges([exchange]);
|
|
@@ -127,6 +127,7 @@ class Rabbitmq {
|
|
|
127
127
|
login: executionContext_1.default.getAuthorizedUserLogin(),
|
|
128
128
|
serviceBroker: { queue, exchange },
|
|
129
129
|
});
|
|
130
|
+
loggerContext_1.default.setLogger(logger);
|
|
130
131
|
try {
|
|
131
132
|
logger.generic.info("Consuming started");
|
|
132
133
|
yield onMessage(msg, { logger });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sFAAgE;AAKhE,0DAAkC;AAClC,uFAA+D;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/rabbitmq/index.ts"],"names":[],"mappings":"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"}
|
package/lib/agenda/index.js
CHANGED
|
@@ -25,25 +25,24 @@ exports.default = {
|
|
|
25
25
|
agenda.define(jobDescription.name, (job) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
26
|
const startTime = process.hrtime();
|
|
27
27
|
executionContext_1.default.setCorrelationId(crypto_1.default.randomBytes(10).toString('hex'));
|
|
28
|
-
|
|
28
|
+
loggerContext_1.default.setLogger(logger.withParams({
|
|
29
29
|
correlationId: executionContext_1.default.getCorrelationId(),
|
|
30
30
|
agenda: {
|
|
31
31
|
jobName: jobDescription.name,
|
|
32
32
|
}
|
|
33
|
-
});
|
|
34
|
-
loggerContext_1.default.
|
|
35
|
-
loggerWithCtx.generic.info("Job started");
|
|
33
|
+
}));
|
|
34
|
+
loggerContext_1.default.getLogger().generic.info("Job started");
|
|
36
35
|
try {
|
|
37
36
|
jobDescription.handler(job, () => stopRequested, {
|
|
38
37
|
redis, repositories, serviceExecutor
|
|
39
38
|
});
|
|
40
|
-
|
|
39
|
+
loggerContext_1.default.getLogger().generic.info("Job Finished");
|
|
41
40
|
const diff = process.hrtime(startTime);
|
|
42
41
|
const timeInMilliseconds = diff[0] * 1000 + diff[1] / 1000000;
|
|
43
42
|
logger.generic.info("Consuming finished", { requestDuration: timeInMilliseconds });
|
|
44
43
|
}
|
|
45
44
|
catch (e) {
|
|
46
|
-
|
|
45
|
+
loggerContext_1.default.getLogger().generic.error(`
|
|
47
46
|
Agenda error
|
|
48
47
|
error: |${JSON.stringify(e.toHash ? e.toHash() : e.stack)}|
|
|
49
48
|
`, e);
|
package/lib/agenda/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agenda/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uDAA+B;AAC/B,oDAAqC;AACrC,oDAA4B;AAI5B,oFAA4D;AAC5D,8EAAsD;AAEtD,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,gBAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAEzE,IAAI,aAAa,GAAG,KAAK,CAAC;AAe1B,kBAAe;IACb,KAAK,EAAE,CACL,YAA2B,EAC3B,eAAgC,EAChC,KAAmB,EACnB,MAAoB,EACpB,eAAgD,EAAE,EAAE;QAEpD,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACvC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAO,GAAQ,EAAE,EAAE;gBACpD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnC,0BAAgB,CAAC,gBAAgB,CAAC,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;gBACzE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/agenda/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uDAA+B;AAC/B,oDAAqC;AACrC,oDAA4B;AAI5B,oFAA4D;AAC5D,8EAAsD;AAEtD,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,gBAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;AAEzE,IAAI,aAAa,GAAG,KAAK,CAAC;AAe1B,kBAAe;IACb,KAAK,EAAE,CACL,YAA2B,EAC3B,eAAgC,EAChC,KAAmB,EACnB,MAAoB,EACpB,eAAgD,EAAE,EAAE;QAEpD,eAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACvC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAO,GAAQ,EAAE,EAAE;gBACpD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnC,0BAAgB,CAAC,gBAAgB,CAAC,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;gBACzE,uBAAa,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC;oBACxC,aAAa,EAAE,0BAAgB,CAAC,gBAAgB,EAAE;oBAClD,MAAM,EAAE;wBACN,OAAO,EAAE,cAAc,CAAC,IAAI;qBAC7B;iBACF,CAAC,CAAC,CAAC;gBAEJ,uBAAa,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAEtD,IAAI;oBACF,cAAc,CAAC,OAAO,CACpB,GAAG,EACH,GAAG,EAAE,CAAC,aAAa,EACnB;wBACE,KAAK,EAAE,YAAY,EAAE,eAAe;qBACrC,CACF,CAAC;oBAEF,uBAAa,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBACvD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;oBACvC,MAAM,kBAAkB,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;oBAC9D,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,eAAe,EAAE,kBAAkB,EAAE,CAAC,CAAC;iBACpF;gBAAC,OAAO,CAAC,EAAE;oBACV,uBAAa,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,KAAK,CACrC;;YAEA,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aAC9C,EACD,CAAC,CACF,CAAC;oBACF,MAAM,CAAC,CAAC;iBACT;YACH,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAErB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC3D,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YAC9C,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,cAAc,CAAC,iBAAiB,UAAU,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;SACxF;IACH,CAAC,CAAA;IAED,IAAI,EAAE,GAAS,EAAE;QACf,aAAa,GAAG,IAAI,CAAC;QACrB,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC,CAAA;CACF,CAAA"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import Redis from '../adapters/redisService';
|
|
2
2
|
import EntityBase from '../entities/Base';
|
|
3
3
|
import { IServiceDescription, IAuthorizedRequest, IServiceHandler, IServiceFactory, IServiceExecutor } from '../types';
|
|
4
|
+
import ServerLogger from '../adapters/logger';
|
|
4
5
|
import Rabbitmq from '../adapters/rabbitmq';
|
|
5
6
|
import Repositories from '../repositories';
|
|
6
7
|
declare abstract class ServiceFactory<R extends Repositories, T extends EntityBase> implements IServiceFactory {
|
|
@@ -9,6 +10,6 @@ declare abstract class ServiceFactory<R extends Repositories, T extends EntityBa
|
|
|
9
10
|
protected rabbit: Rabbitmq;
|
|
10
11
|
constructor(repositories: R, redis: Redis, rabbit: Rabbitmq);
|
|
11
12
|
abstract getServiceDescription(): IServiceDescription;
|
|
12
|
-
abstract createHandler(serviceExecutor: IServiceExecutor, request: IAuthorizedRequest): IServiceHandler;
|
|
13
|
+
abstract createHandler(serviceExecutor: IServiceExecutor, request: IAuthorizedRequest, logger: ServerLogger): IServiceHandler;
|
|
13
14
|
}
|
|
14
15
|
export default ServiceFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceFactoryBase.js","sourceRoot":"","sources":["../../src/services/ServiceFactoryBase.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ServiceFactoryBase.js","sourceRoot":"","sources":["../../src/services/ServiceFactoryBase.ts"],"names":[],"mappings":";;AAQA,MAAe,cAAc;IAK3B,YAAY,YAAe,EAAE,KAAY,EAAE,MAAgB;QACzD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CAKF;AAED,kBAAe,cAAc,CAAC"}
|
|
@@ -16,6 +16,7 @@ const helpers_1 = __importDefault(require("../helpers"));
|
|
|
16
16
|
const Exception_1 = __importDefault(require("../Exception"));
|
|
17
17
|
const timeProvider_1 = __importDefault(require("../timeProvider"));
|
|
18
18
|
const Revision_1 = __importDefault(require("../entities/Revision"));
|
|
19
|
+
const executionContext_1 = __importDefault(require("../contexts/executionContext"));
|
|
19
20
|
const uniquify = helpers_1.default.uniquify;
|
|
20
21
|
const clone = helpers_1.default.clone;
|
|
21
22
|
const diffPatcher = helpers_1.default.diffPatcher();
|
|
@@ -42,7 +43,7 @@ class ServiceHandlerBase {
|
|
|
42
43
|
simpleHandleRevisions(entityClone, entity) {
|
|
43
44
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
44
45
|
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
|
-
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
|
+
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) || executionContext_1.default.getAuthorizedUserLogin() || ((_h = this.requestData) === null || _h === void 0 ? void 0 : _h.updatedBy) || ((_j = this.requestData) === null || _j === void 0 ? void 0 : _j.createdBy) || '%system';
|
|
46
47
|
entity.createdAt = entityClone.createdAt;
|
|
47
48
|
entity.createdBy = entityClone.createdBy;
|
|
48
49
|
const delta = diffPatcher.diff(entityClone, entity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceHandlerBase.js","sourceRoot":"","sources":["../../src/services/ServiceHandlerBase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,yDAAiC;AACjC,6DAAqC;AACrC,mEAA2C;AAO3C,oEAA4C;
|
|
1
|
+
{"version":3,"file":"ServiceHandlerBase.js","sourceRoot":"","sources":["../../src/services/ServiceHandlerBase.ts"],"names":[],"mappings":"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"}
|