@golemio/core 1.18.0 → 1.18.1-dev.1622172793
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/DateTime.js +4 -5
- package/dist/helpers/DateTime.js.map +1 -1
- package/dist/helpers/HealthCheck.js +5 -14
- package/dist/helpers/HealthCheck.js.map +1 -1
- package/dist/helpers/configuration/SimpleConfig.js +4 -1
- package/dist/helpers/configuration/SimpleConfig.js.map +1 -1
- package/dist/helpers/data-access/amqp/AlternateExchangeCreator.js +4 -13
- package/dist/helpers/data-access/amqp/AlternateExchangeCreator.js.map +1 -1
- package/dist/helpers/data-access/amqp/AmqpConnector.js +28 -40
- package/dist/helpers/data-access/amqp/AmqpConnector.js.map +1 -1
- package/dist/helpers/data-access/feature-flags/helpers/AbstractFeatureFlagServiceWrapper.js +2 -13
- package/dist/helpers/data-access/feature-flags/helpers/AbstractFeatureFlagServiceWrapper.js.map +1 -1
- package/dist/helpers/data-access/feature-flags/providers/NoopFeatureFlagService.js +9 -24
- package/dist/helpers/data-access/feature-flags/providers/NoopFeatureFlagService.js.map +1 -1
- package/dist/helpers/data-access/postgres/DatabaseConnector.js +23 -25
- package/dist/helpers/data-access/postgres/DatabaseConnector.js.map +1 -1
- package/dist/helpers/data-access/postgres/repositories/AbstractCachedRepository.js +3 -12
- package/dist/helpers/data-access/postgres/repositories/AbstractCachedRepository.js.map +1 -1
- package/dist/helpers/data-access/pubsub/subscribers/RedisSubscriber.js +15 -30
- package/dist/helpers/data-access/pubsub/subscribers/RedisSubscriber.js.map +1 -1
- package/dist/helpers/data-access/redis/IoRedisConnector.js +8 -17
- package/dist/helpers/data-access/redis/IoRedisConnector.js.map +1 -1
- package/dist/helpers/data-access/storage/AzureBlobStorageService.js +64 -81
- package/dist/helpers/data-access/storage/AzureBlobStorageService.js.map +1 -1
- package/dist/helpers/data-access/storage/NoopStorageService.js +9 -26
- package/dist/helpers/data-access/storage/NoopStorageService.js.map +1 -1
- package/dist/helpers/data-access/table-storage/TableStorageServiceFactory.js +1 -2
- package/dist/helpers/data-access/table-storage/TableStorageServiceFactory.js.map +1 -1
- package/dist/helpers/data-access/table-storage/providers/AzureTableStorageService.js +39 -68
- package/dist/helpers/data-access/table-storage/providers/AzureTableStorageService.js.map +1 -1
- package/dist/helpers/data-access/table-storage/providers/NoopTableStorageService.js +4 -17
- package/dist/helpers/data-access/table-storage/providers/NoopTableStorageService.js.map +1 -1
- package/dist/helpers/logger/LoggerProvider.js +33 -14
- package/dist/helpers/logger/LoggerProvider.js.map +1 -1
- package/dist/helpers/logger/RequestLoggerProvider.js +1 -2
- package/dist/helpers/logger/RequestLoggerProvider.js.map +1 -1
- package/dist/helpers/routing/AbstractGeoJsonRouter.js +16 -34
- package/dist/helpers/routing/AbstractGeoJsonRouter.js.map +1 -1
- package/dist/input-gateway/config/InputGatewayConfiguration.js +1 -2
- package/dist/input-gateway/config/InputGatewayConfiguration.js.map +1 -1
- package/dist/input-gateway/connectors/AMQPConnector.js +52 -68
- package/dist/input-gateway/connectors/AMQPConnector.js.map +1 -1
- package/dist/input-gateway/controllers/BaseController.js +4 -13
- package/dist/input-gateway/controllers/BaseController.js.map +1 -1
- package/dist/integration-engine/connectors/AMQPConnector.js +28 -40
- package/dist/integration-engine/connectors/AMQPConnector.js.map +1 -1
- package/dist/integration-engine/data-access/RawDataStorage.js +7 -16
- package/dist/integration-engine/data-access/RawDataStorage.js.map +1 -1
- package/dist/integration-engine/data-access/pubsub/RedisPubSubChannel.js +3 -14
- package/dist/integration-engine/data-access/pubsub/RedisPubSubChannel.js.map +1 -1
- package/dist/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.js +12 -25
- package/dist/integration-engine/data-access/pubsub/subscribers/RedisSubscriber.js.map +1 -1
- package/dist/integration-engine/datasources/DataSource.js +41 -60
- package/dist/integration-engine/datasources/DataSource.js.map +1 -1
- package/dist/integration-engine/datasources/DataSourceStream.js +12 -21
- package/dist/integration-engine/datasources/DataSourceStream.js.map +1 -1
- package/dist/integration-engine/datasources/DataSourceStreamManager.js +4 -13
- package/dist/integration-engine/datasources/DataSourceStreamManager.js.map +1 -1
- package/dist/integration-engine/datasources/DataSourceStreamed.js +37 -51
- package/dist/integration-engine/datasources/DataSourceStreamed.js.map +1 -1
- package/dist/integration-engine/datasources/RetryDataSource.js +25 -40
- package/dist/integration-engine/datasources/RetryDataSource.js.map +1 -1
- package/dist/integration-engine/datasources/datatype-strategy/CSVDataTypeStrategy.js +22 -33
- package/dist/integration-engine/datasources/datatype-strategy/CSVDataTypeStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/datatype-strategy/JSONDataTypeStrategy.js +14 -25
- package/dist/integration-engine/datasources/datatype-strategy/JSONDataTypeStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/datatype-strategy/XMLDataTypeStrategy.js +11 -22
- package/dist/integration-engine/datasources/datatype-strategy/XMLDataTypeStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/datatype-strategy/ZipFileDataTypeStrategy.js +33 -45
- package/dist/integration-engine/datasources/datatype-strategy/ZipFileDataTypeStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/FTPProtocolStrategy.js +17 -26
- package/dist/integration-engine/datasources/protocol-strategy/FTPProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/GoogleCloudStorageProtocolStrategy.js +10 -19
- package/dist/integration-engine/datasources/protocol-strategy/GoogleCloudStorageProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy.js +42 -51
- package/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/HTTPRequestProtocolStrategy.js +49 -62
- package/dist/integration-engine/datasources/protocol-strategy/HTTPRequestProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/HTTPRequestProtocolStrategyStreamed.js +67 -81
- package/dist/integration-engine/datasources/protocol-strategy/HTTPRequestProtocolStrategyStreamed.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/PaginatedHTTPProtocolStrategy.js +29 -38
- package/dist/integration-engine/datasources/protocol-strategy/PaginatedHTTPProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.js +37 -42
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.js +29 -32
- package/dist/integration-engine/datasources/protocol-strategy/PostgresProtocolStrategyStreamed.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/ProtocolStrategy.js +73 -88
- package/dist/integration-engine/datasources/protocol-strategy/ProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/SFTPProtocolStrategy.js +17 -26
- package/dist/integration-engine/datasources/protocol-strategy/SFTPProtocolStrategy.js.map +1 -1
- package/dist/integration-engine/datasources/protocol-strategy/helpers/FTPFileProcessor.js +37 -49
- package/dist/integration-engine/datasources/protocol-strategy/helpers/FTPFileProcessor.js.map +1 -1
- package/dist/integration-engine/helpers/FileCompressor.js +59 -76
- package/dist/integration-engine/helpers/FileCompressor.js.map +1 -1
- package/dist/integration-engine/helpers/GeocodeApi.js +20 -30
- package/dist/integration-engine/helpers/GeocodeApi.js.map +1 -1
- package/dist/integration-engine/helpers/IntegrationErrorHandler.js +3 -3
- package/dist/integration-engine/helpers/IntegrationErrorHandler.js.map +1 -1
- package/dist/integration-engine/helpers/PaginationHelper.js +1 -2
- package/dist/integration-engine/helpers/PaginationHelper.js.map +1 -1
- package/dist/integration-engine/models/PostgresModel.js +70 -75
- package/dist/integration-engine/models/PostgresModel.js.map +1 -1
- package/dist/integration-engine/models/RedisModel.js +28 -39
- package/dist/integration-engine/models/RedisModel.js.map +1 -1
- package/dist/integration-engine/queueprocessors/QueueProcessor.js +23 -28
- package/dist/integration-engine/queueprocessors/QueueProcessor.js.map +1 -1
- package/dist/integration-engine/transformations/BaseTransformation.js +8 -17
- package/dist/integration-engine/transformations/BaseTransformation.js.map +1 -1
- package/dist/integration-engine/workers/AbstractTask.js +7 -18
- package/dist/integration-engine/workers/AbstractTask.js.map +1 -1
- package/dist/integration-engine/workers/AbstractTaskJsonSchema.js +25 -38
- package/dist/integration-engine/workers/AbstractTaskJsonSchema.js.map +1 -1
- package/dist/integration-engine/workers/AbstractTaskWithoutValidation.js +2 -13
- package/dist/integration-engine/workers/AbstractTaskWithoutValidation.js.map +1 -1
- package/dist/integration-engine/workers/BaseWorker.js +4 -13
- package/dist/integration-engine/workers/BaseWorker.js.map +1 -1
- package/dist/integration-engine/workers/helpers/MessageDataParser.js +1 -2
- package/dist/integration-engine/workers/helpers/MessageDataParser.js.map +1 -1
- package/dist/integration-engine/workers/helpers/MessageDataValidator.js +18 -29
- package/dist/integration-engine/workers/helpers/MessageDataValidator.js.map +1 -1
- package/dist/integration-engine/workers/helpers/WebhookDecorators.js +1 -10
- package/dist/integration-engine/workers/helpers/WebhookDecorators.js.map +1 -1
- package/dist/integration-engine/workers/webhooks/CloudflareCachePurgeWebhook.js +13 -24
- package/dist/integration-engine/workers/webhooks/CloudflareCachePurgeWebhook.js.map +1 -1
- package/dist/monitoring/metrics/metrics-builder.js +21 -17
- package/dist/monitoring/metrics/metrics-builder.js.map +1 -1
- package/dist/monitoring/metrics/metrics-service.js +4 -14
- package/dist/monitoring/metrics/metrics-service.js.map +1 -1
- package/dist/monitoring/opentelemetry/instrumentation/configs/amqplib.js +1 -2
- package/dist/monitoring/opentelemetry/instrumentation/configs/amqplib.js.map +1 -1
- package/dist/monitoring/opentelemetry/instrumentation/configs/aws-sdk.js +1 -1
- package/dist/monitoring/opentelemetry/instrumentation/configs/aws-sdk.js.map +1 -1
- package/dist/monitoring/opentelemetry/trace-provider.js +8 -2
- package/dist/monitoring/opentelemetry/trace-provider.js.map +1 -1
- package/dist/monitoring/sentry/sentry-provider.js +1 -1
- package/dist/monitoring/sentry/sentry-provider.js.map +1 -1
- package/dist/monitoring/sentry/sentry-transactions.js +9 -19
- package/dist/monitoring/sentry/sentry-transactions.js.map +1 -1
- package/dist/output-gateway/Geo.js +3 -24
- package/dist/output-gateway/Geo.js.map +1 -1
- package/dist/output-gateway/config/OutputGatewayConfiguration.js +1 -2
- package/dist/output-gateway/config/OutputGatewayConfiguration.js.map +1 -1
- package/dist/output-gateway/database/index.js +3 -12
- package/dist/output-gateway/database/index.js.map +1 -1
- package/dist/output-gateway/ioc/Di.js +1 -10
- package/dist/output-gateway/ioc/Di.js.map +1 -1
- package/dist/output-gateway/models/SequelizeModel.js +4 -2
- package/dist/output-gateway/models/SequelizeModel.js.map +1 -1
- package/dist/output-gateway/routes/GeoJsonRouter.js +14 -32
- package/dist/output-gateway/routes/GeoJsonRouter.js.map +1 -1
- package/package.json +6 -5
- package/tsconfig.base.json +2 -2
|
@@ -10,7 +10,16 @@ const { wrapErrorSerializer } = pino_1.default.stdSerializers;
|
|
|
10
10
|
const errors_1 = require("@golemio/errors");
|
|
11
11
|
const formatGolemioErrorLog = (err) => {
|
|
12
12
|
const obj = err.toObject();
|
|
13
|
-
return
|
|
13
|
+
return {
|
|
14
|
+
message: obj.error_message.substring(0, 2000),
|
|
15
|
+
...(obj.error_class_name && { class_name: obj.error_class_name }),
|
|
16
|
+
...(obj.error_status && { status: obj.error_status }),
|
|
17
|
+
...(obj.error_info && { cause: obj.error_info.substring(0, 2000) }),
|
|
18
|
+
...(obj.error_stack && { stack: obj.error_stack }),
|
|
19
|
+
...(obj.error_module_name && { module_name: obj.error_module_name }),
|
|
20
|
+
...(obj.error_queue_name && { queue_name: obj.error_queue_name }),
|
|
21
|
+
type: err.constructor.name,
|
|
22
|
+
};
|
|
14
23
|
};
|
|
15
24
|
exports.formatGolemioErrorLog = formatGolemioErrorLog;
|
|
16
25
|
const errorSerializer = wrapErrorSerializer((err) => {
|
|
@@ -20,26 +29,36 @@ const errorSerializer = wrapErrorSerializer((err) => {
|
|
|
20
29
|
return err;
|
|
21
30
|
});
|
|
22
31
|
const createLogger = ({ projectName, nodeEnv, logLevel }, stream) => {
|
|
23
|
-
const options =
|
|
32
|
+
const options = {
|
|
33
|
+
level: logLevel?.toLowerCase() || "info",
|
|
34
|
+
customLevels: {
|
|
24
35
|
verbose: 25,
|
|
25
36
|
silly: 5,
|
|
26
|
-
},
|
|
37
|
+
},
|
|
38
|
+
base: undefined,
|
|
39
|
+
messageKey: "message",
|
|
40
|
+
errorKey: "error",
|
|
41
|
+
timestamp: nodeEnv === "development",
|
|
42
|
+
formatters: {
|
|
27
43
|
level: (label) => {
|
|
28
44
|
return { level: label };
|
|
29
45
|
},
|
|
30
|
-
},
|
|
46
|
+
},
|
|
47
|
+
serializers: {
|
|
31
48
|
error: errorSerializer,
|
|
32
|
-
} }, (nodeEnv === "development" && {
|
|
33
|
-
transport: {
|
|
34
|
-
target: "pino-pretty",
|
|
35
|
-
options: {
|
|
36
|
-
colorize: true,
|
|
37
|
-
destination: 1,
|
|
38
|
-
translateTime: "SYS:HH:MM:ss.l",
|
|
39
|
-
messageKey: "message",
|
|
40
|
-
},
|
|
41
49
|
},
|
|
42
|
-
|
|
50
|
+
...(nodeEnv === "development" && {
|
|
51
|
+
transport: {
|
|
52
|
+
target: "pino-pretty",
|
|
53
|
+
options: {
|
|
54
|
+
colorize: true,
|
|
55
|
+
destination: 1,
|
|
56
|
+
translateTime: "SYS:HH:MM:ss.l",
|
|
57
|
+
messageKey: "message",
|
|
58
|
+
},
|
|
59
|
+
},
|
|
60
|
+
}),
|
|
61
|
+
};
|
|
43
62
|
const logger = stream ? (0, pino_1.default)(options, stream) : (0, pino_1.default)(options);
|
|
44
63
|
// Log all "SILLY" and "DEBUG" logs to debug module as well
|
|
45
64
|
const debugLog = (0, debug_1.default)(`golemio:${projectName}:debug`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/LoggerProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,gDAA+C;AAC/C,MAAM,EAAE,mBAAmB,EAAE,GAAG,cAAI,CAAC,cAAc,CAAC;AACpD,4CAAuD;AAuBhD,MAAM,qBAAqB,GAAG,CAAC,GAAyB,EAA0B,EAAE;IACvF,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"LoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/LoggerProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,7 @@ const responseSerializer = (res) => ({
|
|
|
17
17
|
status: res.statusCode,
|
|
18
18
|
contentLength: res.raw.getHeader("content-length"),
|
|
19
19
|
get userId() {
|
|
20
|
-
|
|
21
|
-
return ((_a = res.raw.req.session) === null || _a === void 0 ? void 0 : _a.user) ? res.raw.req.session.user.id : null;
|
|
20
|
+
return res.raw.req.session?.user ? res.raw.req.session.user.id : null;
|
|
22
21
|
},
|
|
23
22
|
});
|
|
24
23
|
exports.responseSerializer = responseSerializer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestLoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/RequestLoggerProvider.ts"],"names":[],"mappings":";;;;;;AAEA,0DAA8C;AAUvC,MAAM,iBAAiB,GAAG,CAAC,GAAiD,EAAE,EAAE,CAAC,CAAC;IACrF,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW;IAChC,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,GAAG,EAAE,GAAG,CAAC,GAAG;IACZ,aAAa,EAAE,GAAG,CAAC,aAAa;IAChC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;CACvC,CAAC,CAAC;AANU,QAAA,iBAAiB,qBAM3B;AAEI,MAAM,kBAAkB,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,EAAE,GAAG,CAAC,UAAU;IACtB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;IAClD,IAAI,MAAM
|
|
1
|
+
{"version":3,"file":"RequestLoggerProvider.js","sourceRoot":"","sources":["../../../src/helpers/logger/RequestLoggerProvider.ts"],"names":[],"mappings":";;;;;;AAEA,0DAA8C;AAUvC,MAAM,iBAAiB,GAAG,CAAC,GAAiD,EAAE,EAAE,CAAC,CAAC;IACrF,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW;IAChC,MAAM,EAAE,GAAG,CAAC,MAAM;IAClB,GAAG,EAAE,GAAG,CAAC,GAAG;IACZ,aAAa,EAAE,GAAG,CAAC,aAAa;IAChC,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;CACvC,CAAC,CAAC;AANU,QAAA,iBAAiB,qBAM3B;AAEI,MAAM,kBAAkB,GAAG,CAAC,GAAuB,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,EAAE,GAAG,CAAC,UAAU;IACtB,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC;IAClD,IAAI,MAAM;QACN,OAAQ,GAAG,CAAC,GAAG,CAAC,GAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAE,GAAG,CAAC,GAAG,CAAC,GAAuB,CAAC,OAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACrH,CAAC;CACJ,CAAC,CAAC;AANU,QAAA,kBAAkB,sBAM5B;AAEI,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,MAA0B,EAAE,EAAE;IAChG,MAAM,OAAO,GAAiE;QAC1E,MAAM;QACN,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,MAAM;QACb,UAAU,EAAE,SAAS;QACrB,cAAc,EAAE,CAAC,GAAoB,EAAE,GAAmB,EAAE,GAAQ,EAAE,EAAE;YACpE,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,IAAI,GAAG,EAAE;gBACjD,OAAO,OAAO,CAAC;aAClB;YACD,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE;gBACvB,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,WAAW,EAAE;YACT,GAAG,EAAE,yBAAiB;YACtB,GAAG,EAAE,0BAAkB;SAC1B;KACJ,CAAC;IAEF,OAAO,MAAM,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAA,mBAAQ,EAAC,OAAO,CAAC,CAAC;AAClE,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B"}
|
|
@@ -1,24 +1,4 @@
|
|
|
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
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
-
var t = {};
|
|
13
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
-
t[p] = s[p];
|
|
15
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
-
t[p[i]] = s[p[i]];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
21
|
-
};
|
|
22
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
3
|
exports.AbstractGeoJsonRouter = void 0;
|
|
24
4
|
const AbstractRouter_1 = require("./AbstractRouter");
|
|
@@ -67,15 +47,15 @@ class AbstractGeoJsonRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
67
47
|
* Initiates all routes. Should respond with correct data to a HTTP requests to all routes.
|
|
68
48
|
* @param {number|string} expire TTL for the caching middleware
|
|
69
49
|
*/
|
|
70
|
-
this.initRoutes = (expire = { maxAge: 6 * 60, staleWhileRevalidate: 5 }) =>
|
|
71
|
-
const idParam =
|
|
72
|
-
this.router.get("/", this.standardParams, Validation_1.pagination, (0, Validation_1.paginationLimitMiddleware)("GeoJsonRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(expire
|
|
50
|
+
this.initRoutes = async (expire = { maxAge: 6 * 60, staleWhileRevalidate: 5 }) => {
|
|
51
|
+
const idParam = await this.GetIdQueryParamWithCorrectType();
|
|
52
|
+
this.router.get("/", this.standardParams, Validation_1.pagination, (0, Validation_1.paginationLimitMiddleware)("GeoJsonRouter"), Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(expire?.maxAge, expire?.staleWhileRevalidate), this.GetAll);
|
|
73
53
|
this.router.get("/:id", [
|
|
74
54
|
// Previously set parameter of type according to the data's primary ID type
|
|
75
55
|
idParam,
|
|
76
|
-
], Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(expire
|
|
77
|
-
}
|
|
78
|
-
this.GetAll = (req, res, next) =>
|
|
56
|
+
], Validation_1.checkErrors, this.cacheHeaderMiddleware.getMiddleware(expire?.maxAge, expire?.staleWhileRevalidate), this.GetOne);
|
|
57
|
+
};
|
|
58
|
+
this.GetAll = async (req, res, next) => {
|
|
79
59
|
// Parsing parameters
|
|
80
60
|
let ids = req.query.ids;
|
|
81
61
|
let districts = req.query.districts;
|
|
@@ -86,8 +66,8 @@ class AbstractGeoJsonRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
86
66
|
ids = this.ConvertToArray(ids);
|
|
87
67
|
}
|
|
88
68
|
try {
|
|
89
|
-
const coords =
|
|
90
|
-
const data =
|
|
69
|
+
const coords = await (0, Geo_1.parseCoordinates)(req.query.latlng, req.query.range);
|
|
70
|
+
const data = await this.model.GetAll({
|
|
91
71
|
districts,
|
|
92
72
|
ids: ids,
|
|
93
73
|
lat: coords.lat,
|
|
@@ -103,7 +83,7 @@ class AbstractGeoJsonRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
103
83
|
catch (err) {
|
|
104
84
|
next(err);
|
|
105
85
|
}
|
|
106
|
-
}
|
|
86
|
+
};
|
|
107
87
|
this.GetOne = (req, res, next) => {
|
|
108
88
|
const id = req.params.id;
|
|
109
89
|
this.model
|
|
@@ -115,12 +95,12 @@ class AbstractGeoJsonRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
115
95
|
next(err);
|
|
116
96
|
});
|
|
117
97
|
};
|
|
118
|
-
this.GetIdQueryParamWithCorrectType = () =>
|
|
98
|
+
this.GetIdQueryParamWithCorrectType = async () => {
|
|
119
99
|
let idParam;
|
|
120
100
|
// Get the primary ID of the schema (the attribute name)
|
|
121
101
|
const idKey = Object.keys(this.model.PrimaryIdentifierSelection("0"))[0];
|
|
122
102
|
let message = "Created model " + this.model.GetName() + " has ID `" + idKey + "` of type ";
|
|
123
|
-
const isPrimaryIdNumber =
|
|
103
|
+
const isPrimaryIdNumber = await this.model.IsPrimaryIdNumber(idKey);
|
|
124
104
|
if (isPrimaryIdNumber) {
|
|
125
105
|
message += "number.";
|
|
126
106
|
// Create a url parameter for detail route with type number
|
|
@@ -133,10 +113,12 @@ class AbstractGeoJsonRouter extends AbstractRouter_1.AbstractRouter {
|
|
|
133
113
|
}
|
|
134
114
|
Logger_1.log.silly(message);
|
|
135
115
|
return idParam;
|
|
136
|
-
}
|
|
116
|
+
};
|
|
137
117
|
this.GetAdditionalFilters = (query) => {
|
|
138
|
-
const { districts, ids, latlng, limit, offset, range, updatedSince
|
|
139
|
-
return
|
|
118
|
+
const { districts, ids, latlng, limit, offset, range, updatedSince, ...rest } = query;
|
|
119
|
+
return {
|
|
120
|
+
...rest,
|
|
121
|
+
};
|
|
140
122
|
};
|
|
141
123
|
this.model = inModel;
|
|
142
124
|
this.cacheHeaderMiddleware = Di_1.OutputGatewayContainer.resolve(ContainerToken_1.ContainerToken.CacheHeaderMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractGeoJsonRouter.js","sourceRoot":"","sources":["../../../src/helpers/routing/AbstractGeoJsonRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AbstractGeoJsonRouter.js","sourceRoot":"","sources":["../../../src/helpers/routing/AbstractGeoJsonRouter.ts"],"names":[],"mappings":";;;AAAA,qDAAiE;AAGjE,kDAA2C;AAC3C,4EAAwD;AACxD,oDAAoD;AACpD,wDAAiC;AAGjC,gEAAoF;AAEpF,yDAAkE;AAGlE;;;;;;GAMG;AACH,MAAsB,qBAAsB,SAAQ,+BAAc;IAwB9D,YAAsB,OAAe,EAAE,IAAY,EAAE,OAAsB;QACvE,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QArBf,mBAAc,GAAG;YACvB,IAAA,yBAAK,EAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YAC5D,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;YACxE,IAAA,yBAAK,EAAC,KAAK,CAAC;iBACP,QAAQ,EAAE;iBACV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACd,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACtB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;wBAC7C,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;qBACtD;iBACJ;qBAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE;oBAClC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;iBACrC;gBAED,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC;YACN,IAAA,yBAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACrD,IAAA,yBAAK,EAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;SACxD,CAAC;QAQF;;WAEG;QACI,mBAAc,GAAG,CAAC,SAAc,EAAE,EAAE;YACvC,OAAO,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF;;;WAGG;QACO,eAAU,GAAG,KAAK,EAAE,SAAkC,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,oBAAoB,EAAE,CAAC,EAAE,EAAE,EAAE;YAC3G,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAI,CAAC,cAAc,EACnB,uBAAU,EACV,IAAA,sCAAyB,EAAC,eAAe,CAAC,EAC1C,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,EACtF,IAAI,CAAC,MAAM,CACd,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN;gBACI,2EAA2E;gBAC3E,OAAO;aACV,EACD,wBAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,CAAC,EACtF,IAAI,CAAC,MAAM,CACd,CAAC;QACN,CAAC,CAAC;QAEK,WAAM,GAAG,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,qBAAqB;YACrB,IAAI,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAe,CAAC;YACpC,IAAI,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,SAAqB,CAAC;YAEhD,IAAI,SAAS,EAAE;gBACX,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;aAC9C;YACD,IAAI,GAAG,EAAE;gBACL,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;aAClC;YAED,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAgB,EAAC,GAAG,CAAC,KAAK,CAAC,MAAgB,EAAE,GAAG,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;gBAC7F,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBACjC,SAAS;oBACT,GAAG,EAAE,GAAY;oBACjB,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;oBAC9B,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;oBAChC,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,YAAsB;oBAC9C,iBAAiB,EAAE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC;iBAC3B,CAAC,CAAC;gBAElC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAC;QAEK,WAAM,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YAChE,MAAM,EAAE,GAAW,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAEjC,IAAI,CAAC,KAAK;iBACL,MAAM,CAAC,EAAE,CAAC;iBACV,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACX,CAAC,CAAC;QAEQ,mCAA8B,GAAG,KAAK,IAA8B,EAAE;YAC5E,IAAI,OAAwB,CAAC;YAE7B,wDAAwD;YACxD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,IAAI,OAAO,GAAW,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,KAAK,GAAG,YAAY,CAAC;YACnG,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAEpE,IAAI,iBAAiB,EAAE;gBACnB,OAAO,IAAI,SAAS,CAAC;gBACrB,2DAA2D;gBAC3D,OAAO,GAAG,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;aAC9C;iBAAM;gBACH,OAAO,IAAI,SAAS,CAAC;gBACrB,2DAA2D;gBAC3D,OAAO,GAAG,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;aAC7C;YACD,YAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnB,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC;QAEK,yBAAoB,GAAG,CAAC,KAA2B,EAAE,EAAE;YAC1D,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;YACtF,OAAO;gBACH,GAAG,IAAI;aACV,CAAC;QACN,CAAC,CAAC;QA7GE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;QACrB,IAAI,CAAC,qBAAqB,GAAG,2BAAsB,CAAC,OAAO,CAAwB,+BAAc,CAAC,qBAAqB,CAAC,CAAC;IAC7H,CAAC;CA4GJ;AAxID,sDAwIC"}
|
|
@@ -15,7 +15,6 @@ const utils_1 = require("../../helpers/utils");
|
|
|
15
15
|
const tsyringe_1 = require("tsyringe");
|
|
16
16
|
let InputGatewayConfiguration = exports.InputGatewayConfiguration = class InputGatewayConfiguration {
|
|
17
17
|
constructor() {
|
|
18
|
-
var _a;
|
|
19
18
|
this.app_version = process.env.npm_package_version;
|
|
20
19
|
this.app_name = process.env.APP_NAME || "input-gateway";
|
|
21
20
|
this.colorful_logs = process.env.COLORFUL_LOGS;
|
|
@@ -25,7 +24,7 @@ let InputGatewayConfiguration = exports.InputGatewayConfiguration = class InputG
|
|
|
25
24
|
this.payload_limit_json = process.env.PAYLOAD_LIMIT_JSON;
|
|
26
25
|
this.payload_limit_xml = process.env.PAYLOAD_LIMIT_XML;
|
|
27
26
|
this.port = process.env.PORT;
|
|
28
|
-
this.rabbit_connections =
|
|
27
|
+
this.rabbit_connections = process.env.RABBIT_CONN?.split(",");
|
|
29
28
|
this.rabbit_exchange_name = process.env.RABBIT_EXCHANGE_NAME;
|
|
30
29
|
this.sentry = {
|
|
31
30
|
enabled: process.env.SENTRY_ENABLED === "true",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InputGatewayConfiguration.js","sourceRoot":"","sources":["../../../src/input-gateway/config/InputGatewayConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwC;AACxC,+CAAyC;AACzC,uCAAsC;AAI/B,IAAM,yBAAyB,uCAA/B,MAAM,yBAAyB;IAgClC
|
|
1
|
+
{"version":3,"file":"InputGatewayConfiguration.js","sourceRoot":"","sources":["../../../src/input-gateway/config/InputGatewayConfiguration.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAwC;AACxC,+CAAyC;AACzC,uCAAsC;AAI/B,IAAM,yBAAyB,uCAA/B,MAAM,yBAAyB;IAgClC;QA/BO,gBAAW,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAC9C,aAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,eAAe,CAAC;QACnD,kBAAa,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAC1C,cAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;QAClC,aAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;QACjD,sBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAClD,uBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACpD,sBAAiB,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAClD,SAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QACxB,uBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;QACzD,yBAAoB,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;QAExD,WAAM,GAAG;YACZ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM;YAC9C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;YAC3B,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;YACrE,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YAC3C,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM;YAC1C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;SAClG,CAAC;QACK,YAAO,GAAG;YACb,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;YAC/C,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,YAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;YACxF,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE;SAC3C,CAAC;QACK,cAAS,GAAG;YACf,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;YAC/G,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK;YACtH,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;SACrH,CAAC;QAGE,MAAM,oBAAoB,GAAG,IAAI,uBAAY,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC;QAC3E,IAAI,CAAC,oBAAoB,GAAG,IAAA,eAAO,EAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC;IAC1F,CAAC;CACJ,CAAA;oCApCY,yBAAyB;IADrC,IAAA,qBAAU,GAAE;;GACA,yBAAyB,CAoCrC"}
|
|
@@ -11,15 +11,6 @@ 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
14
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
15
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
16
|
};
|
|
@@ -33,62 +24,57 @@ const tsyringe_1 = require("tsyringe");
|
|
|
33
24
|
let AMQPConnector = exports.AMQPConnector = class AMQPConnector {
|
|
34
25
|
constructor(config, log) {
|
|
35
26
|
this.log = log;
|
|
36
|
-
this.isConnected = () =>
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
this.disconnect = () => __awaiter(this, void 0, void 0, function* () {
|
|
41
|
-
var _b, _c;
|
|
27
|
+
this.isConnected = async () => {
|
|
28
|
+
return !!(await this.channel?.checkExchange(this.rabbitExchangeName));
|
|
29
|
+
};
|
|
30
|
+
this.disconnect = async () => {
|
|
42
31
|
this.log.info("RabbitMQ disconnect called");
|
|
43
32
|
this.gracefulShutdown = true;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
}
|
|
47
|
-
this.dispose = () =>
|
|
48
|
-
|
|
49
|
-
}
|
|
33
|
+
await this.channel?.close();
|
|
34
|
+
await this.connection?.close();
|
|
35
|
+
};
|
|
36
|
+
this.dispose = async () => {
|
|
37
|
+
await this.disconnect();
|
|
38
|
+
};
|
|
50
39
|
this.rabbitExchangeName = config.rabbit_exchange_name;
|
|
51
40
|
this.availableConnectionUrls = config.rabbit_connections;
|
|
52
41
|
this.currentUrlIndex = 0;
|
|
53
42
|
this.gracefulShutdown = false;
|
|
54
43
|
}
|
|
55
|
-
connect() {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
if (this.channel) {
|
|
59
|
-
return this.channel;
|
|
60
|
-
}
|
|
61
|
-
this.connection = yield amqplib_1.default.connect(this.availableConnectionUrls[this.currentUrlIndex]);
|
|
62
|
-
this.connection
|
|
63
|
-
.on("error", (err) => {
|
|
64
|
-
this.log.error(err);
|
|
65
|
-
})
|
|
66
|
-
.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
67
|
-
this.log.warn("RabbitMQ Connection closed");
|
|
68
|
-
if (!this.gracefulShutdown) {
|
|
69
|
-
errors_1.ErrorHandler.handle(new errors_1.FatalError("[AMQP] Connection closed", this.constructor.name), this.log);
|
|
70
|
-
}
|
|
71
|
-
}));
|
|
72
|
-
this.channel = yield this.connection.createChannel();
|
|
73
|
-
this.channel
|
|
74
|
-
.on("error", (err) => {
|
|
75
|
-
this.log.error(err);
|
|
76
|
-
})
|
|
77
|
-
.on("close", () => {
|
|
78
|
-
var _a;
|
|
79
|
-
this.log.warn("Channel closing.");
|
|
80
|
-
if (!this.gracefulShutdown) {
|
|
81
|
-
(_a = this.connection) === null || _a === void 0 ? void 0 : _a.close();
|
|
82
|
-
}
|
|
83
|
-
});
|
|
84
|
-
this.log.info(`Connected to Queue! (url index ${this.currentUrlIndex})`);
|
|
85
|
-
yield this.assertDeadQueue(this.channel);
|
|
44
|
+
async connect() {
|
|
45
|
+
try {
|
|
46
|
+
if (this.channel) {
|
|
86
47
|
return this.channel;
|
|
87
48
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
49
|
+
this.connection = await amqplib_1.default.connect(this.availableConnectionUrls[this.currentUrlIndex]);
|
|
50
|
+
this.connection
|
|
51
|
+
.on("error", (err) => {
|
|
52
|
+
this.log.error(err);
|
|
53
|
+
})
|
|
54
|
+
.on("close", async () => {
|
|
55
|
+
this.log.warn("RabbitMQ Connection closed");
|
|
56
|
+
if (!this.gracefulShutdown) {
|
|
57
|
+
errors_1.ErrorHandler.handle(new errors_1.FatalError("[AMQP] Connection closed", this.constructor.name), this.log);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
this.channel = await this.connection.createChannel();
|
|
61
|
+
this.channel
|
|
62
|
+
.on("error", (err) => {
|
|
63
|
+
this.log.error(err);
|
|
64
|
+
})
|
|
65
|
+
.on("close", () => {
|
|
66
|
+
this.log.warn("Channel closing.");
|
|
67
|
+
if (!this.gracefulShutdown) {
|
|
68
|
+
this.connection?.close();
|
|
69
|
+
}
|
|
70
|
+
});
|
|
71
|
+
this.log.info(`Connected to Queue! (url index ${this.currentUrlIndex})`);
|
|
72
|
+
await this.assertDeadQueue(this.channel);
|
|
73
|
+
return this.channel;
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
throw new errors_1.FatalError("Error while creating AMQP Channel.", this.constructor.name, err);
|
|
77
|
+
}
|
|
92
78
|
}
|
|
93
79
|
getChannel() {
|
|
94
80
|
if (!this.channel) {
|
|
@@ -99,19 +85,17 @@ let AMQPConnector = exports.AMQPConnector = class AMQPConnector {
|
|
|
99
85
|
sendMessage(key, msg, options) {
|
|
100
86
|
throw new Error("Method not implemented.");
|
|
101
87
|
}
|
|
102
|
-
assertDeadQueue(channel) {
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
arguments: { "x-queue-type": "quorum" },
|
|
112
|
-
});
|
|
113
|
-
yield channel.bindQueue(q.queue, this.rabbitExchangeName, "dead");
|
|
88
|
+
async assertDeadQueue(channel) {
|
|
89
|
+
await channel.assertExchange(this.rabbitExchangeName, "topic", {
|
|
90
|
+
durable: false,
|
|
91
|
+
alternateExchange: AlternateExchangeCreator_1.default.getAltExchangeName(this.rabbitExchangeName),
|
|
92
|
+
});
|
|
93
|
+
const q = await channel.assertQueue(this.rabbitExchangeName + ".deadqueue", {
|
|
94
|
+
durable: true,
|
|
95
|
+
messageTtl: 3 * 24 * 60 * 60 * 1000,
|
|
96
|
+
arguments: { "x-queue-type": "quorum" },
|
|
114
97
|
});
|
|
98
|
+
await channel.bindQueue(q.queue, this.rabbitExchangeName, "dead");
|
|
115
99
|
}
|
|
116
100
|
};
|
|
117
101
|
exports.AMQPConnector = AMQPConnector = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -27,19 +18,19 @@ class BaseController {
|
|
|
27
18
|
/**
|
|
28
19
|
* Sends message to RabbitMQ Exchange
|
|
29
20
|
*/
|
|
30
|
-
this.sendMessage = (key, msg, options = {}) =>
|
|
21
|
+
this.sendMessage = async (key, msg, options = {}) => {
|
|
31
22
|
try {
|
|
32
23
|
const ch = ioc_1.InputGatewayContainer.resolve(ioc_1.ContainerToken.AmqpConnector).getChannel();
|
|
33
|
-
|
|
24
|
+
await ch.assertExchange(config_1.config.rabbit_exchange_name, "topic", {
|
|
34
25
|
durable: false,
|
|
35
26
|
alternateExchange: AlternateExchangeCreator_1.default.getAltExchangeName(config_1.config.rabbit_exchange_name),
|
|
36
27
|
});
|
|
37
|
-
|
|
28
|
+
await ch.publish(config_1.config.rabbit_exchange_name, key, Buffer.from(msg), options);
|
|
38
29
|
}
|
|
39
30
|
catch (err) {
|
|
40
31
|
throw new errors_1.GeneralError(`Sending the message to exchange failed. (${key})`, "BaseController", err, 500);
|
|
41
32
|
}
|
|
42
|
-
}
|
|
33
|
+
};
|
|
43
34
|
this.sendMessageToExchange = (0, sentry_transactions_1.withSentryProducerTrace)(this.sendMessage);
|
|
44
35
|
this.name = name + "Controller";
|
|
45
36
|
this.validator = validator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../../../src/input-gateway/controllers/BaseController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseController.js","sourceRoot":"","sources":["../../../src/input-gateway/controllers/BaseController.ts"],"names":[],"mappings":";;;;;;AAAA,yGAA4E;AAC5E,uHAA0F;AAC1F,sCAAoC;AACpC,gCAAgE;AAChE,qFAAiF;AACjF,4CAA+C;AAG/C;;GAEG;AACH,MAAsB,cAAc;IAUhC,YAAY,IAAY,EAAE,SAAqB;QAM/C;;WAEG;QACK,gBAAW,GAAG,KAAK,EAAE,GAAW,EAAE,GAAQ,EAAE,UAAkB,EAAE,EAAiB,EAAE;YACvF,IAAI;gBACA,MAAM,EAAE,GAAG,2BAAqB,CAAC,OAAO,CAAkB,oBAAc,CAAC,aAAa,CAAC,CAAC,UAAU,EAAE,CAAC;gBACrG,MAAM,EAAE,CAAC,cAAc,CAAC,eAAM,CAAC,oBAA8B,EAAE,OAAO,EAAE;oBACpE,OAAO,EAAE,KAAK;oBACd,iBAAiB,EAAE,kCAAwB,CAAC,kBAAkB,CAAC,eAAM,CAAC,oBAAqB,CAAC;iBAC/F,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC,OAAO,CAAC,eAAM,CAAC,oBAA8B,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;aAC3F;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,qBAAY,CAAC,4CAA4C,GAAG,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC1G;QACL,CAAC,CAAC;QAEQ,0BAAqB,GAAG,IAAA,6CAAuB,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QArBxE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,YAAY,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,eAAM,CAAC,oBAAoB,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9E,CAAC;CAmBJ;AAjCD,wCAiCC"}
|
|
@@ -11,15 +11,6 @@ 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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
15
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
16
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
17
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
18
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
19
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
20
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
14
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
15
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
16
|
};
|
|
@@ -34,7 +25,7 @@ const tsyringe_1 = require("tsyringe");
|
|
|
34
25
|
let AMQPConnector = exports.AMQPConnector = class AMQPConnector {
|
|
35
26
|
constructor(config, log) {
|
|
36
27
|
this.log = log;
|
|
37
|
-
this.connect = () =>
|
|
28
|
+
this.connect = async () => {
|
|
38
29
|
try {
|
|
39
30
|
if (this.channel) {
|
|
40
31
|
return this.channel;
|
|
@@ -42,51 +33,50 @@ let AMQPConnector = exports.AMQPConnector = class AMQPConnector {
|
|
|
42
33
|
if (!this.rabbitConnectionString) {
|
|
43
34
|
throw new errors_1.GeneralError("[AMQP] The ENV variable RABBIT_CONN cannot be undefined.", this.constructor.name);
|
|
44
35
|
}
|
|
45
|
-
this.connection =
|
|
36
|
+
this.connection = await amqplib_1.default.connect(this.rabbitConnectionString);
|
|
46
37
|
this.connection
|
|
47
38
|
.on("error", (err) => {
|
|
48
39
|
this.log.error(err);
|
|
49
40
|
})
|
|
50
|
-
.on("close", () =>
|
|
41
|
+
.on("close", async () => {
|
|
51
42
|
this.log.warn("[AMQP] Connection closing.");
|
|
52
43
|
if (!this.gracefulShutdown) {
|
|
53
44
|
errors_1.ErrorHandler.handle(new errors_1.FatalError("[AMQP] Connection closed", this.constructor.name), this.log);
|
|
54
45
|
}
|
|
55
|
-
})
|
|
56
|
-
this.channel =
|
|
46
|
+
});
|
|
47
|
+
this.channel = await this.connection.createChannel();
|
|
57
48
|
this.channel
|
|
58
49
|
.on("error", (err) => {
|
|
59
50
|
this.log.error(err);
|
|
60
51
|
})
|
|
61
52
|
.on("close", () => {
|
|
62
|
-
var _a;
|
|
63
53
|
this.log.warn("[AMQP] Channel closing.");
|
|
64
54
|
if (!this.gracefulShutdown) {
|
|
65
|
-
|
|
55
|
+
this.connection?.close();
|
|
66
56
|
}
|
|
67
57
|
});
|
|
68
58
|
this.log.info("[AMQP] Connected to Queue!");
|
|
69
|
-
|
|
70
|
-
|
|
59
|
+
await AlternateExchangeCreator_1.default.createAlternateExchange(this.channel, this.rabbitExchangeName);
|
|
60
|
+
await this.assertDeadQueue(this.channel);
|
|
71
61
|
// Set the maximum number of messages sent over the channel
|
|
72
62
|
// that can be awaiting ack
|
|
73
|
-
|
|
63
|
+
await this.channel.prefetch(this.rabbitChannelMaxPrefetchCount);
|
|
74
64
|
return this.channel;
|
|
75
65
|
}
|
|
76
66
|
catch (err) {
|
|
77
67
|
throw new errors_1.FatalError("[AMQP] Error while creating AMQP Channel.", this.constructor.name, err);
|
|
78
68
|
}
|
|
79
|
-
}
|
|
69
|
+
};
|
|
80
70
|
this.getChannel = () => {
|
|
81
71
|
if (!this.channel) {
|
|
82
72
|
throw new errors_1.FatalError("[AMQP] Channel does not exist. First call connect() method.", this.constructor.name);
|
|
83
73
|
}
|
|
84
74
|
return this.channel;
|
|
85
75
|
};
|
|
86
|
-
this.sendMessage = (key, msg, options = {}) =>
|
|
76
|
+
this.sendMessage = async (key, msg, options = {}) => {
|
|
87
77
|
try {
|
|
88
78
|
const channel = this.getChannel();
|
|
89
|
-
|
|
79
|
+
await channel.assertExchange(this.rabbitExchangeName, "topic", {
|
|
90
80
|
durable: false,
|
|
91
81
|
alternateExchange: AlternateExchangeCreator_1.default.getAltExchangeName(this.rabbitExchangeName),
|
|
92
82
|
});
|
|
@@ -95,36 +85,34 @@ let AMQPConnector = exports.AMQPConnector = class AMQPConnector {
|
|
|
95
85
|
catch (err) {
|
|
96
86
|
throw new errors_1.GeneralError("Sending the message to exchange failed.", this.constructor.name, err);
|
|
97
87
|
}
|
|
98
|
-
}
|
|
99
|
-
this.isConnected = () =>
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
this.disconnect = () => __awaiter(this, void 0, void 0, function* () {
|
|
104
|
-
var _b, _c;
|
|
88
|
+
};
|
|
89
|
+
this.isConnected = async () => {
|
|
90
|
+
return !!(await this.channel?.checkExchange(this.rabbitExchangeName));
|
|
91
|
+
};
|
|
92
|
+
this.disconnect = async () => {
|
|
105
93
|
this.log.info("[AMQP] disconnect called");
|
|
106
94
|
this.gracefulShutdown = true;
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
}
|
|
110
|
-
this.assertDeadQueue = (channel) =>
|
|
95
|
+
await this.channel?.close();
|
|
96
|
+
await this.connection?.close();
|
|
97
|
+
};
|
|
98
|
+
this.assertDeadQueue = async (channel) => {
|
|
111
99
|
if (!this.rabbitExchangeName) {
|
|
112
100
|
throw new errors_1.GeneralError("[AMQP] The ENV variable RABBIT_EXCHANGE_NAME cannot be undefined.", this.constructor.name);
|
|
113
101
|
}
|
|
114
|
-
|
|
102
|
+
await channel.assertExchange(this.rabbitExchangeName, "topic", {
|
|
115
103
|
durable: false,
|
|
116
104
|
alternateExchange: AlternateExchangeCreator_1.default.getAltExchangeName(this.rabbitExchangeName),
|
|
117
105
|
});
|
|
118
|
-
const q =
|
|
106
|
+
const q = await channel.assertQueue(this.rabbitExchangeName + ".deadqueue", {
|
|
119
107
|
durable: true,
|
|
120
108
|
messageTtl: 3 * 24 * 60 * 60 * 1000,
|
|
121
109
|
arguments: { "x-queue-type": "quorum" },
|
|
122
110
|
});
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
this.dispose = () =>
|
|
126
|
-
|
|
127
|
-
}
|
|
111
|
+
await channel.bindQueue(q.queue, this.rabbitExchangeName, "dead");
|
|
112
|
+
};
|
|
113
|
+
this.dispose = async () => {
|
|
114
|
+
await this.disconnect();
|
|
115
|
+
};
|
|
128
116
|
this.gracefulShutdown = false;
|
|
129
117
|
this.rabbitExchangeName = config.RABBIT_EXCHANGE_NAME;
|
|
130
118
|
this.rabbitConnectionString = config.RABBIT_CONN;
|