@golemio/core 1.2.25-dev.723880707 → 1.2.25-dev.726368711
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/helpers/connector/interfaces/IQueueConnector.d.ts +8 -0
- package/dist/helpers/connector/interfaces/IQueueConnector.js +3 -0
- package/dist/helpers/connector/interfaces/IQueueConnector.js.map +1 -0
- package/dist/helpers/ioc/Di.d.ts +2 -0
- package/dist/helpers/ioc/Di.js +7 -0
- package/dist/helpers/ioc/Di.js.map +1 -0
- package/dist/helpers/ioc/index.d.ts +1 -0
- package/dist/helpers/ioc/index.js +18 -0
- package/dist/helpers/ioc/index.js.map +1 -0
- package/dist/helpers/utils.d.ts +1 -0
- package/dist/helpers/utils.js +6 -0
- package/dist/helpers/utils.js.map +1 -0
- package/dist/input-gateway/config/InputGatewayConfiguration.d.ts +52 -0
- package/dist/input-gateway/config/InputGatewayConfiguration.js +77 -0
- package/dist/input-gateway/config/InputGatewayConfiguration.js.map +1 -0
- package/dist/input-gateway/config/abstract.d.ts +1 -2
- package/dist/input-gateway/config/config.d.ts +3 -0
- package/dist/input-gateway/config/config.js +5 -56
- package/dist/input-gateway/config/config.js.map +1 -1
- package/dist/input-gateway/connectors/AMQPConnector.d.ts +11 -24
- package/dist/input-gateway/connectors/AMQPConnector.js +45 -39
- package/dist/input-gateway/connectors/AMQPConnector.js.map +1 -1
- package/dist/input-gateway/connectors/index.d.ts +6 -1
- package/dist/input-gateway/connectors/index.js +4 -15
- package/dist/input-gateway/connectors/index.js.map +1 -1
- package/dist/input-gateway/controllers/BaseController.js +2 -2
- package/dist/input-gateway/controllers/BaseController.js.map +1 -1
- package/dist/input-gateway/helpers/Logger.d.ts +16 -20
- package/dist/input-gateway/helpers/Logger.js +16 -38
- package/dist/input-gateway/helpers/Logger.js.map +1 -1
- package/dist/input-gateway/helpers/LoggerEvents.d.ts +11 -0
- package/dist/input-gateway/helpers/LoggerEvents.js +55 -0
- package/dist/input-gateway/helpers/LoggerEvents.js.map +1 -0
- package/dist/input-gateway/helpers/index.d.ts +3 -0
- package/dist/input-gateway/helpers/index.js +5 -0
- package/dist/input-gateway/helpers/index.js.map +1 -1
- package/dist/input-gateway/helpers/interfaces/INumberOfRecordsEventData.d.ts +5 -0
- package/dist/input-gateway/helpers/interfaces/INumberOfRecordsEventData.js +3 -0
- package/dist/input-gateway/helpers/interfaces/INumberOfRecordsEventData.js.map +1 -0
- package/dist/input-gateway/helpers/interfaces/IResponseTimesEventData.d.ts +6 -0
- package/dist/input-gateway/helpers/interfaces/IResponseTimesEventData.js +3 -0
- package/dist/input-gateway/helpers/interfaces/IResponseTimesEventData.js.map +1 -0
- package/dist/input-gateway/ioc/ContainerToken.d.ts +8 -0
- package/dist/input-gateway/ioc/ContainerToken.js +12 -0
- package/dist/input-gateway/ioc/ContainerToken.js.map +1 -0
- package/dist/input-gateway/ioc/Di.d.ts +2 -0
- package/dist/input-gateway/ioc/Di.js +32 -0
- package/dist/input-gateway/ioc/Di.js.map +1 -0
- package/dist/input-gateway/ioc/index.d.ts +2 -0
- package/dist/input-gateway/ioc/index.js +19 -0
- package/dist/input-gateway/ioc/index.js.map +1 -0
- package/dist/integration-engine/config/IntegrationEngineConfiguration.d.ts +78 -0
- package/dist/integration-engine/config/IntegrationEngineConfiguration.js +109 -0
- package/dist/integration-engine/config/IntegrationEngineConfiguration.js.map +1 -0
- package/dist/integration-engine/config/config.d.ts +5 -1
- package/dist/integration-engine/config/config.js +6 -88
- package/dist/integration-engine/config/config.js.map +1 -1
- package/dist/integration-engine/connectors/AMQPConnector.d.ts +12 -5
- package/dist/integration-engine/connectors/AMQPConnector.js +59 -35
- package/dist/integration-engine/connectors/AMQPConnector.js.map +1 -1
- package/dist/integration-engine/connectors/MongoConnector.d.ts +9 -3
- package/dist/integration-engine/connectors/MongoConnector.js +36 -14
- package/dist/integration-engine/connectors/MongoConnector.js.map +1 -1
- package/dist/integration-engine/connectors/PostgresConnector.d.ts +12 -3
- package/dist/integration-engine/connectors/PostgresConnector.js +40 -16
- package/dist/integration-engine/connectors/PostgresConnector.js.map +1 -1
- package/dist/integration-engine/connectors/RedisConnector.d.ts +9 -3
- package/dist/integration-engine/connectors/RedisConnector.js +32 -10
- package/dist/integration-engine/connectors/RedisConnector.js.map +1 -1
- package/dist/integration-engine/connectors/index.d.ts +24 -4
- package/dist/integration-engine/connectors/index.js +22 -19
- package/dist/integration-engine/connectors/index.js.map +1 -1
- package/dist/integration-engine/connectors/interfaces/IMongoConnector.d.ts +7 -0
- package/dist/integration-engine/connectors/interfaces/IMongoConnector.js +3 -0
- package/dist/integration-engine/connectors/interfaces/IMongoConnector.js.map +1 -0
- package/dist/integration-engine/connectors/interfaces/IPostgresConnector.d.ts +7 -0
- package/dist/integration-engine/connectors/interfaces/IPostgresConnector.js +3 -0
- package/dist/integration-engine/connectors/interfaces/IPostgresConnector.js.map +1 -0
- package/dist/integration-engine/connectors/interfaces/IRedisConnector.d.ts +7 -0
- package/dist/integration-engine/connectors/interfaces/IRedisConnector.js +3 -0
- package/dist/integration-engine/connectors/interfaces/IRedisConnector.js.map +1 -0
- package/dist/integration-engine/data-access/RawDataStorage.d.ts +11 -0
- package/dist/integration-engine/data-access/RawDataStorage.js +81 -0
- package/dist/integration-engine/data-access/RawDataStorage.js.map +1 -0
- package/dist/integration-engine/data-access/StorageService.d.ts +10 -4
- package/dist/integration-engine/data-access/StorageService.js +40 -18
- package/dist/integration-engine/data-access/StorageService.js.map +1 -1
- package/dist/integration-engine/data-access/index.d.ts +6 -1
- package/dist/integration-engine/data-access/index.js +7 -15
- package/dist/integration-engine/data-access/index.js.map +1 -1
- package/dist/integration-engine/data-access/interfaces/IStorageService.d.ts +3 -0
- package/dist/integration-engine/data-access/interfaces/IStorageService.js +3 -0
- package/dist/integration-engine/data-access/interfaces/IStorageService.js.map +1 -0
- package/dist/integration-engine/data-access/pubsub/RedisPubSubChannel.d.ts +3 -3
- package/dist/integration-engine/data-access/pubsub/RedisPubSubChannel.js +7 -4
- package/dist/integration-engine/data-access/pubsub/RedisPubSubChannel.js.map +1 -1
- package/dist/integration-engine/data-access/pubsub/subscribers/AbstractSubscriber.d.ts +6 -2
- package/dist/integration-engine/data-access/pubsub/subscribers/AbstractSubscriber.js.map +1 -1
- package/dist/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.d.ts +10 -12
- package/dist/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.js +33 -45
- package/dist/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.js.map +1 -1
- package/dist/integration-engine/data-access/pubsub/subscribers/interfaces/ISubscribeMessage.d.ts +1 -0
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.js +6 -4
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.d.ts +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.js +4 -3
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.js.map +1 -1
- package/dist/integration-engine/helpers/FileCompressor.js +4 -6
- package/dist/integration-engine/helpers/FileCompressor.js.map +1 -1
- package/dist/integration-engine/helpers/GeocodeApi.d.ts +8 -3
- package/dist/integration-engine/helpers/GeocodeApi.js +32 -11
- package/dist/integration-engine/helpers/GeocodeApi.js.map +1 -1
- package/dist/integration-engine/helpers/Logger.d.ts +16 -10
- package/dist/integration-engine/helpers/Logger.js +13 -71
- package/dist/integration-engine/helpers/Logger.js.map +1 -1
- package/dist/integration-engine/helpers/LoggerEvents.d.ts +11 -0
- package/dist/integration-engine/helpers/LoggerEvents.js +91 -0
- package/dist/integration-engine/helpers/LoggerEvents.js.map +1 -0
- package/dist/integration-engine/helpers/RawDataStore.d.ts +3 -0
- package/dist/integration-engine/helpers/RawDataStore.js +5 -39
- package/dist/integration-engine/helpers/RawDataStore.js.map +1 -1
- package/dist/integration-engine/helpers/index.d.ts +8 -2
- package/dist/integration-engine/helpers/index.js +10 -2
- package/dist/integration-engine/helpers/index.js.map +1 -1
- package/dist/integration-engine/ioc/ContainerToken.d.ts +14 -0
- package/dist/integration-engine/ioc/ContainerToken.js +18 -0
- package/dist/integration-engine/ioc/ContainerToken.js.map +1 -0
- package/dist/integration-engine/ioc/Di.d.ts +2 -0
- package/dist/integration-engine/ioc/Di.js +46 -0
- package/dist/integration-engine/ioc/Di.js.map +1 -0
- package/dist/integration-engine/ioc/index.d.ts +2 -0
- package/dist/integration-engine/ioc/index.js +19 -0
- package/dist/integration-engine/ioc/index.js.map +1 -0
- package/dist/integration-engine/models/MongoModel.js +6 -6
- package/dist/integration-engine/models/MongoModel.js.map +1 -1
- package/dist/integration-engine/models/PostgresModel.d.ts +3 -1
- package/dist/integration-engine/models/PostgresModel.js +19 -14
- package/dist/integration-engine/models/PostgresModel.js.map +1 -1
- package/dist/integration-engine/models/RedisModel.js +2 -2
- package/dist/integration-engine/models/RedisModel.js.map +1 -1
- package/dist/output-gateway/Logger.d.ts +10 -2
- package/dist/output-gateway/Logger.js +9 -8
- package/dist/output-gateway/Logger.js.map +1 -1
- package/dist/output-gateway/config/OutputGatewayConfiguration.d.ts +51 -0
- package/dist/output-gateway/config/OutputGatewayConfiguration.js +90 -0
- package/dist/output-gateway/config/OutputGatewayConfiguration.js.map +1 -0
- package/dist/output-gateway/config/config.d.ts +5 -48
- package/dist/output-gateway/config/config.js +5 -69
- package/dist/output-gateway/config/config.js.map +1 -1
- package/dist/output-gateway/database/MongoDatabase.d.ts +7 -4
- package/dist/output-gateway/database/MongoDatabase.js +37 -16
- package/dist/output-gateway/database/MongoDatabase.js.map +1 -1
- package/dist/output-gateway/database/PostgreDatabase.d.ts +20 -3
- package/dist/output-gateway/database/PostgreDatabase.js +40 -17
- package/dist/output-gateway/database/PostgreDatabase.js.map +1 -1
- package/dist/output-gateway/database/index.d.ts +64 -1
- package/dist/output-gateway/database/index.js +17 -1
- package/dist/output-gateway/database/index.js.map +1 -1
- package/dist/output-gateway/ioc/ContainerToken.d.ts +13 -0
- package/dist/output-gateway/ioc/ContainerToken.js +17 -0
- package/dist/output-gateway/ioc/ContainerToken.js.map +1 -0
- package/dist/output-gateway/ioc/Di.d.ts +2 -0
- package/dist/output-gateway/ioc/Di.js +40 -0
- package/dist/output-gateway/ioc/Di.js.map +1 -0
- package/dist/output-gateway/ioc/index.d.ts +2 -0
- package/dist/output-gateway/ioc/index.js +19 -0
- package/dist/output-gateway/ioc/index.js.map +1 -0
- package/dist/output-gateway/models/GeoJsonModel.d.ts +1 -0
- package/dist/output-gateway/models/GeoJsonModel.js +7 -6
- package/dist/output-gateway/models/GeoJsonModel.js.map +1 -1
- package/dist/output-gateway/models/SequelizeModel.js +2 -2
- package/dist/output-gateway/models/SequelizeModel.js.map +1 -1
- package/dist/output-gateway/redis/CacheMiddleware.d.ts +9 -5
- package/dist/output-gateway/redis/CacheMiddleware.js +36 -17
- package/dist/output-gateway/redis/CacheMiddleware.js.map +1 -1
- package/dist/output-gateway/redis/RedisConnector.d.ts +6 -3
- package/dist/output-gateway/redis/RedisConnector.js +33 -13
- package/dist/output-gateway/redis/RedisConnector.js.map +1 -1
- package/dist/output-gateway/redis/index.d.ts +15 -1
- package/dist/output-gateway/redis/index.js +16 -1
- package/dist/output-gateway/redis/index.js.map +1 -1
- package/dist/shared/pino.d.ts +2 -0
- package/dist/shared/pino.js +29 -0
- package/dist/shared/pino.js.map +1 -0
- package/dist/shared/tsyringe.d.ts +1 -0
- package/dist/shared/tsyringe.js +18 -0
- package/dist/shared/tsyringe.js.map +1 -0
- package/package.json +3 -2
|
@@ -8,18 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
-
var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
|
|
12
|
-
var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
|
|
13
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
14
|
-
var g = generator.apply(thisArg, _arguments || []), i, q = [];
|
|
15
|
-
return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
|
|
16
|
-
function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
|
|
17
|
-
function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
|
|
18
|
-
function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
|
|
19
|
-
function fulfill(value) { resume("next", value); }
|
|
20
|
-
function reject(value) { resume("throw", value); }
|
|
21
|
-
function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
|
|
22
|
-
};
|
|
23
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
13
|
};
|
|
@@ -32,12 +20,11 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
32
20
|
const getRedisChannel_1 = require("../helpers/getRedisChannel");
|
|
33
21
|
const AbstractSubscriber_1 = require("./AbstractSubscriber");
|
|
34
22
|
class RedisSubscriber extends AbstractSubscriber_1.Subscriber {
|
|
35
|
-
constructor(
|
|
23
|
+
constructor(options) {
|
|
36
24
|
super();
|
|
37
|
-
this.
|
|
38
|
-
this.activeChannels = new Set();
|
|
25
|
+
this.redisChannel = (0, getRedisChannel_1.getRedisChannel)(options.channelName, options.channelSuffix);
|
|
39
26
|
this.connection = new ioredis_1.default(config_1.config.REDIS_CONN, {
|
|
40
|
-
connectionName: `Subscriber for ${
|
|
27
|
+
connectionName: `Subscriber for ${this.redisChannel}`,
|
|
41
28
|
lazyConnect: true,
|
|
42
29
|
autoResubscribe: true,
|
|
43
30
|
});
|
|
@@ -45,47 +32,48 @@ class RedisSubscriber extends AbstractSubscriber_1.Subscriber {
|
|
|
45
32
|
throw new errors_1.CustomError("Error while connecting to Redis", true, this.constructor.name, undefined, err);
|
|
46
33
|
});
|
|
47
34
|
}
|
|
48
|
-
subscribe(
|
|
49
|
-
var _a;
|
|
35
|
+
subscribe() {
|
|
50
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (this.connection.status !== "ready") {
|
|
54
|
-
yield this.connection.connect();
|
|
55
|
-
}
|
|
56
|
-
if (this.activeChannels.has(redisChannel)) {
|
|
57
|
-
helpers_1.log.warn(`Already subscribed to Redis channel ${redisChannel}`);
|
|
37
|
+
if (this.connection.status === "ready") {
|
|
38
|
+
helpers_1.log.warn(`Already subscribed to Redis channel ${this.redisChannel}`);
|
|
58
39
|
}
|
|
59
40
|
else {
|
|
60
|
-
this.
|
|
61
|
-
yield this.connection.subscribe(redisChannel);
|
|
41
|
+
yield this.connection.connect();
|
|
42
|
+
yield this.connection.subscribe(this.redisChannel);
|
|
62
43
|
}
|
|
63
|
-
return this.
|
|
44
|
+
return this.connection;
|
|
64
45
|
});
|
|
65
46
|
}
|
|
66
|
-
|
|
47
|
+
unsubscribe() {
|
|
67
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
|
-
|
|
69
|
-
this.activeChannels.delete(channel);
|
|
70
|
-
yield this.connection.unsubscribe(channel);
|
|
71
|
-
}
|
|
49
|
+
yield this.connection.unsubscribe(this.redisChannel);
|
|
72
50
|
this.connection.disconnect();
|
|
73
51
|
});
|
|
74
52
|
}
|
|
75
|
-
|
|
76
|
-
return
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
53
|
+
listen(maxMessageCount, messageCallback) {
|
|
54
|
+
return new Promise((resolve, reject) => {
|
|
55
|
+
let messageCount = 0;
|
|
56
|
+
this.connection.on("message", (channel, message) => {
|
|
57
|
+
if (channel !== this.redisChannel) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
messageCount++;
|
|
61
|
+
let isFinal = messageCount >= maxMessageCount;
|
|
62
|
+
try {
|
|
63
|
+
messageCallback({ message, messageCount, isFinal });
|
|
64
|
+
if (isFinal) {
|
|
65
|
+
this.connection.removeAllListeners("message");
|
|
66
|
+
resolve();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
catch (err) {
|
|
70
|
+
this.connection.removeAllListeners("message");
|
|
71
|
+
helpers_1.log.error("Error while processing Redis message", { message, messageCount });
|
|
72
|
+
reject(err);
|
|
73
|
+
}
|
|
74
|
+
});
|
|
86
75
|
});
|
|
87
76
|
}
|
|
88
77
|
}
|
|
89
78
|
exports.RedisSubscriber = RedisSubscriber;
|
|
90
|
-
RedisSubscriber.DEFAULT_MAX_MESSAGES = 1;
|
|
91
79
|
//# sourceMappingURL=RedisSubscriber.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisSubscriber.js","sourceRoot":"","sources":["../../../../../src/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RedisSubscriber.js","sourceRoot":"","sources":["../../../../../src/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAoC;AACpC,8CAAkC;AAClC,4CAA8C;AAC9C,sDAAwD;AACxD,gEAA6D;AAC7D,6DAAmE;AAOnE,MAAa,eAAgB,SAAQ,+BAAU;IAI3C,YAAY,OAA2B;QACnC,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,GAAG,IAAA,iCAAe,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;QAEhF,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAK,CAAC,eAAM,CAAC,UAAU,EAAE;YAC3C,cAAc,EAAE,kBAAkB,IAAI,CAAC,YAAY,EAAE;YACrD,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,IAAI;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAChC,MAAM,IAAI,oBAAW,CAAC,iCAAiC,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAC1G,CAAC,CAAC,CAAC;IACP,CAAC;IAEY,SAAS;;YAClB,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,OAAO,EAAE;gBACpC,aAAG,CAAC,IAAI,CAAC,uCAAuC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;aACxE;iBAAM;gBACH,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACtD;YAED,OAAO,IAAI,CAAC,UAAU,CAAC;QAC3B,CAAC;KAAA;IAEY,WAAW;;YACpB,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACrD,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;KAAA;IAEM,MAAM,CAAC,eAAuB,EAAE,eAAgC;QACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,YAAY,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE;gBAC/C,IAAI,OAAO,KAAK,IAAI,CAAC,YAAY,EAAE;oBAC/B,OAAO;iBACV;gBAED,YAAY,EAAE,CAAC;gBACf,IAAI,OAAO,GAAG,YAAY,IAAI,eAAe,CAAC;gBAE9C,IAAI;oBACA,eAAe,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC,CAAC;oBACpD,IAAI,OAAO,EAAE;wBACT,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBAC9C,OAAO,EAAE,CAAC;qBACb;iBACJ;gBAAC,OAAO,GAAG,EAAE;oBACV,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;oBAC9C,aAAG,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;oBAC7E,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA5DD,0CA4DC"}
|
|
@@ -10,9 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.PostgresProtocolStrategy = void 0;
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const config_1 = require("../../config/config");
|
|
14
|
+
const PostgresConnector_1 = require("../../connectors/PostgresConnector");
|
|
15
15
|
const ProtocolStrategy_1 = require("./ProtocolStrategy");
|
|
16
|
+
const helpers_1 = require("../../helpers");
|
|
17
|
+
const errors_1 = require("@golemio/errors");
|
|
16
18
|
class PostgresProtocolStrategy extends ProtocolStrategy_1.ProtocolStrategy {
|
|
17
19
|
constructor(settings) {
|
|
18
20
|
super(settings);
|
|
@@ -24,7 +26,7 @@ class PostgresProtocolStrategy extends ProtocolStrategy_1.ProtocolStrategy {
|
|
|
24
26
|
});
|
|
25
27
|
this.deleteData = () => __awaiter(this, void 0, void 0, function* () {
|
|
26
28
|
try {
|
|
27
|
-
const connector = new
|
|
29
|
+
const connector = new PostgresConnector_1.PostgresConnector(config_1.config, helpers_1.log);
|
|
28
30
|
const connection = yield connector.connect(this.connectionSettings.connectionString);
|
|
29
31
|
const model = connection.define(this.connectionSettings.tableName, this.connectionSettings.modelAttributes, Object.assign(Object.assign({}, (this.connectionSettings.sequelizeAdditionalSettings
|
|
30
32
|
? this.connectionSettings.sequelizeAdditionalSettings
|
|
@@ -43,7 +45,7 @@ class PostgresProtocolStrategy extends ProtocolStrategy_1.ProtocolStrategy {
|
|
|
43
45
|
});
|
|
44
46
|
this.getRawData = () => __awaiter(this, void 0, void 0, function* () {
|
|
45
47
|
try {
|
|
46
|
-
const connector = new
|
|
48
|
+
const connector = new PostgresConnector_1.PostgresConnector(config_1.config, helpers_1.log); //TODO zeptat se k čemu se používá
|
|
47
49
|
const connection = yield connector.connect(this.connectionSettings.connectionString);
|
|
48
50
|
const model = connection.define(this.connectionSettings.tableName, this.connectionSettings.modelAttributes, Object.assign(Object.assign({}, (this.connectionSettings.sequelizeAdditionalSettings
|
|
49
51
|
? this.connectionSettings.sequelizeAdditionalSettings
|
package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresProtocolStrategy.js","sourceRoot":"","sources":["../../../../src/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"PostgresProtocolStrategy.js","sourceRoot":"","sources":["../../../../src/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PostgresProtocolStrategy } from "./PostgresProtocolStrategy";
|
|
2
1
|
import { IProtocolStrategy } from "./IProtocolStrategy";
|
|
2
|
+
import { PostgresProtocolStrategy } from "./PostgresProtocolStrategy";
|
|
3
3
|
export declare class PostgresProtocolStrategyStreamed extends PostgresProtocolStrategy implements IProtocolStrategy {
|
|
4
4
|
getRawData: () => Promise<any>;
|
|
5
5
|
}
|
package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.js
CHANGED
|
@@ -10,11 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.PostgresProtocolStrategyStreamed = void 0;
|
|
13
|
-
const errors_1 = require("@golemio/errors");
|
|
14
13
|
const config_1 = require("../../config");
|
|
15
|
-
const
|
|
14
|
+
const PostgresConnector_1 = require("../../connectors/PostgresConnector");
|
|
16
15
|
const datasources_1 = require("./..");
|
|
17
16
|
const PostgresProtocolStrategy_1 = require("./PostgresProtocolStrategy");
|
|
17
|
+
const helpers_1 = require("../../helpers");
|
|
18
|
+
const errors_1 = require("@golemio/errors");
|
|
18
19
|
class PostgresProtocolStrategyStreamed extends PostgresProtocolStrategy_1.PostgresProtocolStrategy {
|
|
19
20
|
constructor() {
|
|
20
21
|
super(...arguments);
|
|
@@ -34,7 +35,7 @@ class PostgresProtocolStrategyStreamed extends PostgresProtocolStrategy_1.Postgr
|
|
|
34
35
|
batchLimit = +config_1.config.DATA_BATCH_SIZE;
|
|
35
36
|
}
|
|
36
37
|
try {
|
|
37
|
-
const connector = new
|
|
38
|
+
const connector = new PostgresConnector_1.PostgresConnector(config_1.config, helpers_1.log); //TODO zeptat se k čemu se používá
|
|
38
39
|
const connection = yield connector.connect(this.connectionSettings.connectionString);
|
|
39
40
|
dbConnectionOpened = true;
|
|
40
41
|
const model = connection.define(this.connectionSettings.tableName, this.connectionSettings.modelAttributes, Object.assign(Object.assign({}, (this.connectionSettings.sequelizeAdditionalSettings
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresProtocolStrategyStreamed.js","sourceRoot":"","sources":["../../../../src/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"PostgresProtocolStrategyStreamed.js","sourceRoot":"","sources":["../../../../src/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ class FileCompressor {
|
|
|
29
29
|
return new Promise((resolve, reject) => {
|
|
30
30
|
yauzl_1.default.fromBuffer(buffer, FileCompressor.LIB_OPTIONS, (err, zipFile) => __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
if (err) {
|
|
32
|
-
reject(err);
|
|
32
|
+
return reject(err);
|
|
33
33
|
}
|
|
34
34
|
try {
|
|
35
35
|
const result = yield this.processZipFile(archiveName, zipFile, extractFilePredicate);
|
|
@@ -49,14 +49,13 @@ class FileCompressor {
|
|
|
49
49
|
return new Promise((resolve, reject) => {
|
|
50
50
|
yauzl_1.default.open(archivePath, FileCompressor.LIB_OPTIONS, (err, zipFile) => __awaiter(this, void 0, void 0, function* () {
|
|
51
51
|
if (err) {
|
|
52
|
-
reject(err);
|
|
52
|
+
return reject(err);
|
|
53
53
|
}
|
|
54
54
|
try {
|
|
55
55
|
const result = yield this.processZipFile(archiveName, zipFile, extractFilePredicate);
|
|
56
56
|
resolve(result);
|
|
57
57
|
}
|
|
58
58
|
catch (err) {
|
|
59
|
-
zipFile.close();
|
|
60
59
|
reject(err);
|
|
61
60
|
}
|
|
62
61
|
zipFile.close();
|
|
@@ -72,12 +71,11 @@ class FileCompressor {
|
|
|
72
71
|
zipFile.readEntry();
|
|
73
72
|
zipFile.on("entry", (entry) => {
|
|
74
73
|
if (!extractFilePredicate(entry.fileName)) {
|
|
75
|
-
zipFile.readEntry();
|
|
76
|
-
return;
|
|
74
|
+
return zipFile.readEntry();
|
|
77
75
|
}
|
|
78
76
|
zipFile.openReadStream(entry, (err, readStream) => {
|
|
79
77
|
if (err) {
|
|
80
|
-
reject(err);
|
|
78
|
+
return reject(err);
|
|
81
79
|
}
|
|
82
80
|
const filePath = path_1.default.resolve(extractionPath, entry.fileName);
|
|
83
81
|
const fileStream = (0, fs_1.createWriteStream)(filePath).on("finish", () => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileCompressor.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/FileCompressor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,2BAAuC;AACvC,2DAA6B;AAC7B,gDAAwB;AACxB,kDAAuD;AAGvD,qCAA+B;AAO/B,MAAa,cAAc;IAKvB,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAEpC,aAAa,CAAC,MAAc,EAAE,oBAAyC;;YAChF,MAAM,WAAW,GAAG,gBAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC1D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,eAAK,CAAC,UAAU,CAAC,MAAM,EAAE,cAAc,CAAC,WAAW,EAAE,CAAO,GAAG,EAAE,OAAO,EAAE,EAAE;oBACxE,IAAI,GAAG,EAAE;wBACL,MAAM,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"FileCompressor.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/FileCompressor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { ILogger } from "../../helpers";
|
|
2
|
+
import { IConfiguration } from "../config";
|
|
1
3
|
export interface IPostalAddress {
|
|
2
4
|
address_formatted: string;
|
|
3
5
|
street_address?: string;
|
|
@@ -9,7 +11,12 @@ export interface IPostalAddress {
|
|
|
9
11
|
/**
|
|
10
12
|
* Helper class for requesting additional data from OpenStreetMap API.
|
|
11
13
|
*/
|
|
12
|
-
declare class GeocodeApi {
|
|
14
|
+
export declare class GeocodeApi {
|
|
15
|
+
private readonly log;
|
|
16
|
+
private openStreetApiUrlSearch;
|
|
17
|
+
private openStreetApiUrlReverse;
|
|
18
|
+
private photonApiUrlReverse;
|
|
19
|
+
constructor(config: IConfiguration, log: ILogger);
|
|
13
20
|
/**
|
|
14
21
|
* Gets Address by Coordinates by OpenStreetMap API.
|
|
15
22
|
*
|
|
@@ -32,5 +39,3 @@ declare class GeocodeApi {
|
|
|
32
39
|
*/
|
|
33
40
|
getAddressByLatLngFromPhoton: (lat: number, lng: number) => Promise<IPostalAddress>;
|
|
34
41
|
}
|
|
35
|
-
declare const geocodeApi: GeocodeApi;
|
|
36
|
-
export { geocodeApi as GeocodeApi };
|
|
@@ -1,4 +1,16 @@
|
|
|
1
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 __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
2
14
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
15
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
16
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -13,15 +25,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
25
|
};
|
|
14
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
27
|
exports.GeocodeApi = void 0;
|
|
28
|
+
const ioc_1 = require("../ioc");
|
|
16
29
|
const errors_1 = require("@golemio/errors");
|
|
17
30
|
const axios_1 = __importDefault(require("axios"));
|
|
18
|
-
const
|
|
19
|
-
const helpers_1 = require("./");
|
|
31
|
+
const tsyringe_1 = require("tsyringe");
|
|
20
32
|
/**
|
|
21
33
|
* Helper class for requesting additional data from OpenStreetMap API.
|
|
22
34
|
*/
|
|
23
|
-
class GeocodeApi {
|
|
24
|
-
constructor() {
|
|
35
|
+
let GeocodeApi = class GeocodeApi {
|
|
36
|
+
constructor(config, log) {
|
|
37
|
+
this.log = log;
|
|
25
38
|
/**
|
|
26
39
|
* Gets Address by Coordinates by OpenStreetMap API.
|
|
27
40
|
*
|
|
@@ -34,7 +47,7 @@ class GeocodeApi {
|
|
|
34
47
|
"Cache-Control": "no-cache",
|
|
35
48
|
Referer: "https://www.golemio.cz",
|
|
36
49
|
},
|
|
37
|
-
url:
|
|
50
|
+
url: this.openStreetApiUrlReverse + "&lat=" + lat + "&lon=" + lng,
|
|
38
51
|
};
|
|
39
52
|
try {
|
|
40
53
|
const resp = yield axios_1.default.request(options);
|
|
@@ -84,7 +97,7 @@ class GeocodeApi {
|
|
|
84
97
|
"Cache-Control": "no-cache",
|
|
85
98
|
Referer: "https://www.golemio.cz",
|
|
86
99
|
},
|
|
87
|
-
url:
|
|
100
|
+
url: this.openStreetApiUrlSearch + "&street=" + encodeURI(street) + "&city=" + encodeURI(city),
|
|
88
101
|
};
|
|
89
102
|
try {
|
|
90
103
|
const resp = yield axios_1.default.request(options);
|
|
@@ -95,7 +108,7 @@ class GeocodeApi {
|
|
|
95
108
|
return [parseFloat(result[0].lon), parseFloat(result[0].lat)];
|
|
96
109
|
}
|
|
97
110
|
catch (err) {
|
|
98
|
-
|
|
111
|
+
this.log.error(err);
|
|
99
112
|
throw new errors_1.CustomError("Retrieving of the open street map nominatim data failed.", true, this.constructor.name, 6002, err);
|
|
100
113
|
}
|
|
101
114
|
});
|
|
@@ -107,7 +120,7 @@ class GeocodeApi {
|
|
|
107
120
|
*/
|
|
108
121
|
this.getAddressByLatLngFromPhoton = (lat, lng) => __awaiter(this, void 0, void 0, function* () {
|
|
109
122
|
const options = {
|
|
110
|
-
url:
|
|
123
|
+
url: this.photonApiUrlReverse,
|
|
111
124
|
params: {
|
|
112
125
|
lon: lng,
|
|
113
126
|
lat: lat,
|
|
@@ -139,8 +152,16 @@ class GeocodeApi {
|
|
|
139
152
|
throw new errors_1.CustomError("Retrieving address from Photon failed.", true, this.constructor.name, 6002, err);
|
|
140
153
|
}
|
|
141
154
|
});
|
|
155
|
+
this.openStreetApiUrlReverse = config.OPEN_STREET_MAP_API_URL_REVERSE;
|
|
156
|
+
this.openStreetApiUrlSearch = config.OPEN_STREET_MAP_API_URL_SEARCH;
|
|
157
|
+
this.photonApiUrlReverse = config.PHOTON_MAP_API_URL_REVERSE;
|
|
142
158
|
}
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
|
|
159
|
+
};
|
|
160
|
+
GeocodeApi = __decorate([
|
|
161
|
+
(0, tsyringe_1.injectable)(),
|
|
162
|
+
__param(0, (0, tsyringe_1.inject)(ioc_1.ContainerToken.Config)),
|
|
163
|
+
__param(1, (0, tsyringe_1.inject)(ioc_1.ContainerToken.Logger)),
|
|
164
|
+
__metadata("design:paramtypes", [Object, Object])
|
|
165
|
+
], GeocodeApi);
|
|
166
|
+
exports.GeocodeApi = GeocodeApi;
|
|
146
167
|
//# sourceMappingURL=GeocodeApi.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeocodeApi.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/GeocodeApi.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GeocodeApi.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/GeocodeApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
declare const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
import { ILogger } from "../../helpers/logger";
|
|
2
|
+
import { HttpLogger } from "pino-http";
|
|
3
|
+
import LoggerEvents from "./LoggerEvents";
|
|
4
|
+
/**
|
|
5
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
6
|
+
*/
|
|
7
|
+
declare const log: ILogger;
|
|
8
|
+
/**
|
|
9
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
10
|
+
*/
|
|
11
|
+
declare const loggerEvents: LoggerEvents;
|
|
12
|
+
/**
|
|
13
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
14
|
+
*/
|
|
15
|
+
declare const requestLogger: HttpLogger;
|
|
16
|
+
export { log, loggerEvents, requestLogger };
|
|
@@ -1,78 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.requestLogger = exports.
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
const models_1 = require("../models");
|
|
20
|
-
var LoggerEventType;
|
|
21
|
-
(function (LoggerEventType) {
|
|
22
|
-
LoggerEventType["NumberOfRecords"] = "number-of-records";
|
|
23
|
-
LoggerEventType["PostgresErrorLog"] = "postgres-error-log";
|
|
24
|
-
})(LoggerEventType || (LoggerEventType = {}));
|
|
25
|
-
exports.LoggerEventType = LoggerEventType;
|
|
26
|
-
const logger = (0, logger_1.createLogger)({
|
|
27
|
-
projectName: "integration-engine",
|
|
28
|
-
nodeEnv: config_1.config.NODE_ENV,
|
|
29
|
-
logLevel: config_1.config.LOG_LEVEL,
|
|
30
|
-
});
|
|
31
|
-
exports.log = logger;
|
|
32
|
-
const requestLogger = (0, logger_1.createRequestLogger)(config_1.config.NODE_ENV, logger);
|
|
33
|
-
exports.requestLogger = requestLogger;
|
|
34
|
-
const loggerEvents = new events_1.EventEmitter();
|
|
35
|
-
exports.loggerEvents = loggerEvents;
|
|
36
|
-
loggerEvents.on(LoggerEventType.NumberOfRecords, ({ name, numberOfRecords }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
-
logger.verbose(`NumberOfRecordsLogger: ${name} : ${numberOfRecords}`);
|
|
38
|
-
}));
|
|
39
|
-
loggerEvents.on("error", (error) => {
|
|
40
|
-
errors_1.ErrorHandler.handle(error, logger);
|
|
41
|
-
});
|
|
3
|
+
exports.requestLogger = exports.loggerEvents = exports.log = void 0;
|
|
4
|
+
const ioc_1 = require("../ioc");
|
|
5
|
+
/**
|
|
6
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
7
|
+
*/
|
|
8
|
+
const log = ioc_1.IntegrationEngineContainer.resolve(ioc_1.ContainerToken.Logger);
|
|
9
|
+
exports.log = log;
|
|
42
10
|
/**
|
|
43
|
-
*
|
|
11
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
44
12
|
*/
|
|
45
|
-
|
|
13
|
+
const loggerEvents = ioc_1.IntegrationEngineContainer.resolve(ioc_1.ContainerToken.LoggerEvents);
|
|
14
|
+
exports.loggerEvents = loggerEvents;
|
|
46
15
|
/**
|
|
47
|
-
*
|
|
16
|
+
* @deprecated For backwards compatibility. Use ioc container instead.
|
|
48
17
|
*/
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
pgErrorLogModel = new models_1.PostgresModel(ErrorLog_1.ErrorLog.name + "Model", {
|
|
52
|
-
outputSequelizeAttributes: ErrorLog_1.ErrorLog.outputSequelizeAttributes,
|
|
53
|
-
pgTableName: ErrorLog_1.ErrorLog.pgTableName,
|
|
54
|
-
savingType: "insertOnly",
|
|
55
|
-
}, new validator_1.Validator(ErrorLog_1.ErrorLog.name + "ModelValidator", ErrorLog_1.ErrorLog.outputMongooseSchemaObject));
|
|
56
|
-
}
|
|
57
|
-
try {
|
|
58
|
-
const transformedData = {
|
|
59
|
-
class_name: null,
|
|
60
|
-
info: null,
|
|
61
|
-
message: error.message,
|
|
62
|
-
service: "integration-engine",
|
|
63
|
-
stack_trace: error.stack || null,
|
|
64
|
-
status: null,
|
|
65
|
-
};
|
|
66
|
-
if (error instanceof errors_1.CustomError) {
|
|
67
|
-
const errorObject = error.toObject();
|
|
68
|
-
transformedData.class_name = errorObject.error_class_name || null;
|
|
69
|
-
transformedData.info = errorObject.error_info || null;
|
|
70
|
-
transformedData.status = errorObject.error_status || null;
|
|
71
|
-
}
|
|
72
|
-
yield pgErrorLogModel.save(transformedData);
|
|
73
|
-
}
|
|
74
|
-
catch (err) {
|
|
75
|
-
loggerEvents.emit(err);
|
|
76
|
-
}
|
|
77
|
-
}));
|
|
18
|
+
const requestLogger = ioc_1.IntegrationEngineContainer.resolve(ioc_1.ContainerToken.RequestLogger);
|
|
19
|
+
exports.requestLogger = requestLogger;
|
|
78
20
|
//# sourceMappingURL=Logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/Logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/integration-engine/helpers/Logger.ts"],"names":[],"mappings":";;;AACA,gCAAqE;AAIrE;;GAEG;AACH,MAAM,GAAG,GAAG,gCAA0B,CAAC,OAAO,CAAU,oBAAc,CAAC,MAAM,CAAC,CAAC;AAUtE,kBAAG;AATZ;;GAEG;AACH,MAAM,YAAY,GAAG,gCAA0B,CAAC,OAAO,CAAe,oBAAc,CAAC,YAAY,CAAC,CAAC;AAMrF,oCAAY;AAL1B;;GAEG;AACH,MAAM,aAAa,GAAG,gCAA0B,CAAC,OAAO,CAAa,oBAAc,CAAC,aAAa,CAAC,CAAC;AAEvE,sCAAa"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { ILogger } from "../../helpers/logger";
|
|
3
|
+
import { EventEmitter } from "events";
|
|
4
|
+
export declare enum LoggerEventType {
|
|
5
|
+
NumberOfRecords = "number-of-records",
|
|
6
|
+
PostgresErrorLog = "postgres-error-log"
|
|
7
|
+
}
|
|
8
|
+
export default class LoggerEvents extends EventEmitter {
|
|
9
|
+
private readonly logger;
|
|
10
|
+
constructor(logger: ILogger);
|
|
11
|
+
}
|