@golemio/pid 2.12.5 → 2.12.6-rc.1250500832
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/input-gateway/vehicle-positions/VehiclePositionsController.js +1 -0
- package/dist/input-gateway/vehicle-positions/VehiclePositionsController.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/presets/datasources/grafana-loki/GrafanaLokiDataSourceProvider.js +3 -2
- package/dist/integration-engine/ropid-gtfs/workers/presets/datasources/grafana-loki/GrafanaLokiDataSourceProvider.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.js +3 -8
- package/dist/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.js.map +1 -1
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js +4 -3
- package/dist/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js +4 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/datasources/seznam-autobusu/SeznamAutobusuDataSourceProvider.js +3 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/datasources/seznam-autobusu/SeznamAutobusuDataSourceProvider.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.d.ts +3 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.js +7 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.d.ts +3 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js +11 -7
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.d.ts +4 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +78 -68
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.d.ts +2 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js +6 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/helpers/UpdateDelayLimiter.d.ts +11 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/helpers/UpdateDelayLimiter.js +38 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/helpers/UpdateDelayLimiter.js.map +1 -0
- package/docs/implementation_documentation.md +2 -1
- package/docs/openapi-output.yaml +0 -6
- package/package.json +4 -4
|
@@ -30,6 +30,7 @@ class VehiclePositionsController extends controllers_1.BaseController {
|
|
|
30
30
|
for (const batch of dataBatches) {
|
|
31
31
|
yield this.sendMessageToExchange("input." + this.queuePrefix + ".saveDataToDB", JSON.stringify(batch), {
|
|
32
32
|
persistent: true,
|
|
33
|
+
timestamp: new Date().getTime(),
|
|
33
34
|
});
|
|
34
35
|
}
|
|
35
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VehiclePositionsController.js","sourceRoot":"","sources":["../../../src/input-gateway/vehicle-positions/VehiclePositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kFAA0D;AAG1D,wEAAqE;AACrE,8EAA8E;AAC9E,8DAA6E;AAC7E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAa,0BAA2B,SAAQ,4BAAc;IAM1D;QACI,KAAK,CACD,oCAAgB,CAAC,IAAI,EACrB,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,IAAI,GAAG,YAAY,EAAE,oCAAgB,CAAC,oBAAoB,CAAC,CACvG,CAAC;QAMN;;WAEG;QACI,gBAAW,GAAG,CAAO,SAA2B,EAAiB,EAAE;YACtE,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC9C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;oBAC7B,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;wBACnG,UAAU,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"VehiclePositionsController.js","sourceRoot":"","sources":["../../../src/input-gateway/vehicle-positions/VehiclePositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kFAA0D;AAG1D,wEAAqE;AACrE,8EAA8E;AAC9E,8DAA6E;AAC7E,6EAA8F;AAC9F,mFAAkF;AAElF,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B,MAAa,0BAA2B,SAAQ,4BAAc;IAM1D;QACI,KAAK,CACD,oCAAgB,CAAC,IAAI,EACrB,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,IAAI,GAAG,YAAY,EAAE,oCAAgB,CAAC,oBAAoB,CAAC,CACvG,CAAC;QAMN;;WAEG;QACI,gBAAW,GAAG,CAAO,SAA2B,EAAiB,EAAE;YACtE,IAAI;gBACA,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;gBAC5D,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;gBAC9C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE;oBAC7B,MAAM,IAAI,CAAC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,CAAC,WAAW,GAAG,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;wBACnG,UAAU,EAAE,IAAI;wBAChB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;qBAClC,CAAC,CAAC;iBACN;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;iBACrF;aACJ;QACL,CAAC,CAAA,CAAC;QAEM,cAAS,GAAG,CAAC,IAAsB,EAAsB,EAAE;YAC/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;gBAC7B,OAAO,CAAC,IAAI,CAAC,CAAC;aACjB;YAED,MAAM,MAAM,GAAuB,EAAE,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;gBAChF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;gBAClD,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;QAtCE,MAAM,MAAM,GAAG,2BAAqB,CAAC,OAAO,CAAgB,qBAAS,CAAC,YAAY,CAAC,CAAC;QACpF,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,4CAA4C,EAAE,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC/G,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;CAoCJ;AAlDD,gEAkDC"}
|
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.GrafanaLokiDataSourceProvider = void 0;
|
|
17
17
|
const datasources_1 = require("../../../../../../schema-definitions/ropid-departures-preset-logs/datasources");
|
|
18
18
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
19
|
+
const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
|
|
19
20
|
const ContainerToken_1 = require("@golemio/core/dist/integration-engine/ioc/ContainerToken");
|
|
20
21
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
21
22
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
@@ -34,11 +35,11 @@ let GrafanaLokiDataSourceProvider = exports.GrafanaLokiDataSourceProvider = Graf
|
|
|
34
35
|
url.searchParams.set("end", params.end.toString());
|
|
35
36
|
url.searchParams.set("query", params.query);
|
|
36
37
|
url.searchParams.set("limit", (_a = this.config.datasources.GrafanaLokiApiLimit) !== null && _a !== void 0 ? _a : DEFAULT_API_LIMIT);
|
|
37
|
-
return new
|
|
38
|
+
return new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
38
39
|
method: "GET",
|
|
39
40
|
url: url.toString(),
|
|
40
41
|
headers: this.config.datasources.GrafanaLokiApiHeaders,
|
|
41
|
-
|
|
42
|
+
timeoutInSeconds: 20,
|
|
42
43
|
});
|
|
43
44
|
}
|
|
44
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GrafanaLokiDataSourceProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/presets/datasources/grafana-loki/GrafanaLokiDataSourceProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+GAAsF;AAEtF,
|
|
1
|
+
{"version":3,"file":"GrafanaLokiDataSourceProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/presets/datasources/grafana-loki/GrafanaLokiDataSourceProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,+GAAsF;AAEtF,8EAAwH;AAExH,6IAA0I;AAC1I,6FAA0F;AAC1F,mFAAkF;AAClF,iEAAwE;AAQxE,MAAM,iBAAiB,GAAG,IAAI,CAAC;AAGxB,IAAM,6BAA6B,6EAAnC,MAAM,6BAA6B;IAGtC,YAAmD,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEtE,aAAa,CAAC,MAAoB;QACrC,OAAO,IAAI,+BAAU,CACjB,+BAA6B,CAAC,eAAe,EAC7C,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAChC,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,EACxD,IAAI,uCAAmB,CAAC,+BAA6B,CAAC,eAAe,EAAE,mCAAqB,CAAC,CAChG,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,MAAoB;;QAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAC3F,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,mCAAI,iBAAiB,CAAC,CAAC;QAEhG,OAAO,IAAI,qDAAyB,CAAC;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE;YACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB;YACtD,gBAAgB,EAAE,EAAE;SACvB,CAAC,CAAC;IACP,CAAC;;AA1Bc,6CAAe,GAAG,uBAAuB,AAA1B,CAA2B;wCADhD,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GAHjC,6BAA6B,CA4BzC"}
|
package/dist/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.js
CHANGED
|
@@ -20,13 +20,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
20
20
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
21
21
|
});
|
|
22
22
|
};
|
|
23
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
24
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
25
|
-
};
|
|
26
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
24
|
exports.RopidMonitoringService = void 0;
|
|
28
25
|
const ContainerToken_1 = require("@golemio/core/dist/integration-engine/ioc/ContainerToken");
|
|
29
|
-
const axios_1 = __importDefault(require("@golemio/core/dist/shared/axios"));
|
|
30
26
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
31
27
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
32
28
|
let RopidMonitoringService = exports.RopidMonitoringService = class RopidMonitoringService {
|
|
@@ -37,7 +33,7 @@ let RopidMonitoringService = exports.RopidMonitoringService = class RopidMonitor
|
|
|
37
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
38
34
|
const requestConfig = this.getRequestConfig(logEntries);
|
|
39
35
|
try {
|
|
40
|
-
const response = yield
|
|
36
|
+
const response = yield fetch(this.config.datasources.RopidMonitoringPushUrl, requestConfig);
|
|
41
37
|
if (response.status < 200 || response.status >= 300) {
|
|
42
38
|
throw new golemio_errors_1.GeneralError(`Error while sending logs to the ROPID monitoring system. Status code: ${response.status}`, this.constructor.name);
|
|
43
39
|
}
|
|
@@ -53,10 +49,9 @@ let RopidMonitoringService = exports.RopidMonitoringService = class RopidMonitor
|
|
|
53
49
|
getRequestConfig(logEntries) {
|
|
54
50
|
return {
|
|
55
51
|
method: "POST",
|
|
56
|
-
url: this.config.datasources.RopidMonitoringPushUrl,
|
|
57
52
|
headers: this.config.datasources.RopidMonitoringPushHeaders,
|
|
58
|
-
|
|
59
|
-
|
|
53
|
+
body: JSON.stringify(logEntries),
|
|
54
|
+
signal: AbortSignal.timeout(20 * 1000),
|
|
60
55
|
};
|
|
61
56
|
}
|
|
62
57
|
};
|
package/dist/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidMonitoringService.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RopidMonitoringService.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/helpers/RopidMonitoringService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAEA,6FAA0F;AAC1F,6EAAwE;AACxE,iEAAwE;AAIjE,IAAM,sBAAsB,oCAA5B,MAAM,sBAAsB;IAC/B,YAAmD,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEhE,0BAA0B,CAAC,UAAoC;;YACxE,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAExD,IAAI;gBACA,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;gBAC5F,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;oBACjD,MAAM,IAAI,6BAAY,CAClB,yEAAyE,QAAQ,CAAC,MAAM,EAAE,EAC1F,IAAI,CAAC,WAAW,CAAC,IAAI,CACxB,CAAC;iBACL;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,GAAG,YAAY,6BAAY,EAAE;oBAC7B,MAAM,GAAG,CAAC;iBACb;gBAED,MAAM,IAAI,6BAAY,CAAC,yDAAyD,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aACjH;QACL,CAAC;KAAA;IAEO,gBAAgB,CAAC,UAAoC;QACzD,OAAO;YACH,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,0BAA0B;YAC3D,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YAChC,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;SACzC,CAAC;IACN,CAAC;CACJ,CAAA;iCA/BY,sBAAsB;IADlC,IAAA,qBAAU,GAAE;IAEI,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GADjC,sBAAsB,CA+BlC"}
|
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
const ropid_vymi_1 = require("../../../../../schema-definitions/ropid-vymi");
|
|
17
17
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
18
18
|
const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
19
|
+
const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
|
|
19
20
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
20
21
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
21
22
|
const crypto_1 = __importDefault(require("crypto"));
|
|
@@ -44,12 +45,12 @@ class RopidVYMIApiHelper {
|
|
|
44
45
|
this.createDigest = (data) => {
|
|
45
46
|
return crypto_1.default.createHash("sha1").update(data).digest("hex");
|
|
46
47
|
};
|
|
47
|
-
this.datasource = new integration_engine_1.DataSource(ropid_vymi_1.RopidVYMI.events.name + "DataSource", new
|
|
48
|
+
this.datasource = new integration_engine_1.DataSource(ropid_vymi_1.RopidVYMI.events.name + "DataSource", new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
48
49
|
headers: config_1.config.datasources.RopidVYMIApiHeaders,
|
|
49
50
|
method: "GET",
|
|
50
|
-
|
|
51
|
+
timeoutInSeconds: 25,
|
|
51
52
|
url: `${config_1.config.datasources.RopidVYMIApiUrl}?level=${RopidVYMIApiOutputLevel_1.RopidVYMIApiOutputLevel.Standard}`,
|
|
52
|
-
|
|
53
|
+
responseType: "json",
|
|
53
54
|
}), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "vymi-report.vymi-list" }), new golemio_validator_1.JSONSchemaValidator(ropid_vymi_1.RopidVYMI.events.name + "DataSource", ropid_vymi_1.RopidVYMI.events.datasourceJsonSchema));
|
|
54
55
|
}
|
|
55
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidVYMIApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"RopidVYMIApiHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-vymi/workers/tasks/helpers/RopidVYMIApiHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAA6D;AAC7D,8EAA8F;AAC9F,yEAAsE;AACtE,6IAA0I;AAC1I,6EAA8F;AAC9F,mFAAkF;AAClF,oDAA4C;AAE5C,uEAAoE;AAEpE,MAAqB,kBAAkB;IAYnC;QAeO,iBAAY,GAAG,GAAqC,EAAE;YACzD,IAAI;gBACA,MAAM,MAAM,GAAsB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACjE,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;gBAEzD,OAAO;oBACH,IAAI,EAAE,MAAM;oBACZ,MAAM;iBACT,CAAC;aACL;YAAC,OAAO,GAAQ,EAAE;gBACf,wBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,IAAI,GAAG,YAAY,qCAAoB,EAAE;oBACrC,MAAM,GAAG,CAAC;iBACb;qBAAM;oBACH,MAAM,IAAI,6BAAY,CAAC,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;iBAClF;aACJ;QACL,CAAC,CAAA,CAAC;QAEK,iBAAY,GAAG,CAAC,IAAgB,EAAU,EAAE;YAC/C,OAAO,gBAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC,CAAC;QAnCE,IAAI,CAAC,UAAU,GAAG,IAAI,+BAAU,CAC5B,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,EACpC,IAAI,qDAAyB,CAAC;YAC1B,OAAO,EAAE,eAAM,CAAC,WAAW,CAAC,mBAAmB;YAC/C,MAAM,EAAE,KAAK;YACb,gBAAgB,EAAE,EAAE;YACpB,GAAG,EAAE,GAAG,eAAM,CAAC,WAAW,CAAC,eAAe,UAAU,iDAAuB,CAAC,QAAQ,EAAE;YACtF,YAAY,EAAE,MAAM;SACvB,CAAC,EACF,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC,EAClE,IAAI,uCAAmB,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,YAAY,EAAE,sBAAS,CAAC,MAAM,CAAC,oBAAoB,CAAC,CACvG,CAAC;IACN,CAAC;;;AArBa,8BAAW,GAAG,GAAG,EAAE;IAC7B,IAAI,CAAC,EAAI,CAAC,SAAS,EAAE;QACjB,EAAI,CAAC,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;KAC7C;IAED,OAAO,EAAI,CAAC,SAAS,CAAC;AAC1B,CAAC,AANwB,CAMvB;kBAVe,kBAAkB"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.d.ts
CHANGED
|
@@ -7,6 +7,6 @@ export declare class CommonMessageProcessor {
|
|
|
7
7
|
/**
|
|
8
8
|
* Create/update and process transformed run
|
|
9
9
|
*/
|
|
10
|
-
processTransformedRun: (element: ICommonRunWithMessageDto) => Promise<void>;
|
|
10
|
+
processTransformedRun: (element: ICommonRunWithMessageDto, firstMessageCreatedAt?: number) => Promise<void>;
|
|
11
11
|
private logElementIssues;
|
|
12
12
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js
CHANGED
|
@@ -25,7 +25,7 @@ class CommonMessageProcessor {
|
|
|
25
25
|
/**
|
|
26
26
|
* Create/update and process transformed run
|
|
27
27
|
*/
|
|
28
|
-
this.processTransformedRun = (element) => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
this.processTransformedRun = (element, firstMessageCreatedAt) => __awaiter(this, void 0, void 0, function* () {
|
|
29
29
|
this.logElementIssues(element);
|
|
30
30
|
const record = yield this.runsRepository.getRunRecordForUpdate(element.run);
|
|
31
31
|
let outputMsg;
|
|
@@ -42,7 +42,7 @@ class CommonMessageProcessor {
|
|
|
42
42
|
else {
|
|
43
43
|
outputMsg = yield this.runsRepository.createAndAssociate(element);
|
|
44
44
|
}
|
|
45
|
-
yield queueprocessors_1.QueueManager.sendMessageToExchange(`${config_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateRunsGTFSTripId", outputMsg);
|
|
45
|
+
yield queueprocessors_1.QueueManager.sendMessageToExchange(`${config_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateRunsGTFSTripId", outputMsg, { timestamp: firstMessageCreatedAt });
|
|
46
46
|
});
|
|
47
47
|
this.logger = Di_1.PidContainer.resolve(CoreToken_1.CoreToken.Logger);
|
|
48
48
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonMessageProcessor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,2FAA0D;AAE1D,wEAAqE;AAErE,yEAAsE;AACtE,2FAAqF;AACrF,6EAAwE;AACxE,gDAAyE;AAGzE,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1C,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,MAAa,sBAAsB;IAG/B,YAA6B,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;QAIjE;;WAEG;QACI,0BAAqB,GAAG,CAAO,OAAiC,EAAiB,EAAE;
|
|
1
|
+
{"version":3,"file":"CommonMessageProcessor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,2FAA0D;AAE1D,wEAAqE;AAErE,yEAAsE;AACtE,2FAAqF;AACrF,6EAAwE;AACxE,gDAAyE;AAGzE,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC1C,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAEjC,MAAa,sBAAsB;IAG/B,YAA6B,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;QAIjE;;WAEG;QACI,0BAAqB,GAAG,CAAO,OAAiC,EAAE,qBAA8B,EAAiB,EAAE;YACtH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAE5E,IAAI,SAAmC,CAAC;YACxC,IAAI,MAAM,EAAE;gBACR,IACI,CAAC,OAAO,CAAC,WAAW,CAAC,+BAA+B;oBACpD,CAAC,yCAAiC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAC9E;oBACE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACxG,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,+BAA+B;wBAAE,OAAO;oBACrF,OAAO,CAAC,WAAW,CAAC,+BAA+B,GAAG,iBAAiB,CAAC,+BAA+B,CAAC;iBAC3G;gBAED,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;aAChF;iBAAM;gBACH,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;aACrE;YAED,MAAM,8BAAY,CAAC,qBAAqB,CACpC,GAAG,eAAM,CAAC,oBAAoB,IAAI,oCAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EACvE,sBAAsB,EACtB,SAAS,EACT,EAAE,SAAS,EAAE,qBAAqB,EAAE,CACvC,CAAC;QACN,CAAC,CAAA,CAAC;QAhCE,IAAI,CAAC,MAAM,GAAG,iBAAY,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAiCO,gBAAgB,CAAC,OAAiC;QACtD,IACI,OAAO,CAAC,WAAW,CAAC,+BAA+B,YAAY,IAAI;YACnE,OAAO,CAAC,WAAW,CAAC,+BAA+B,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE;gBACtE,qBAAqB,GAAG,kBAAkB,EAChD;YACE,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,6BAAY,CACZ,qCAAqC,OAAO,CAAC,WAAW,CAAC,+BAA+B,eAAe;gBACnG,eAAe,OAAO,CAAC,GAAG,CAAC,eAAe,SAAS,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,EAChF,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,SAAS,EACT,SAAS,EACT,KAAK,CACR,CACJ,CAAC;SACL;IACL,CAAC;CACJ;AAxDD,wDAwDC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IProcessMetroRunsMessagesInput } from "../interfaces/IProcessMetroRunsMessagesInput";
|
|
3
4
|
import { MetroTransformedRunsValidationSchema } from "../schema/MetroTransformedRunsSchema";
|
|
4
5
|
export declare class ProcessMetroRunMessagesTask extends AbstractTask<IProcessMetroRunsMessagesInput> {
|
|
@@ -14,7 +15,7 @@ export declare class ProcessMetroRunMessagesTask extends AbstractTask<IProcessMe
|
|
|
14
15
|
private readonly gtfsTripRunManager;
|
|
15
16
|
private readonly tripScheduleRepository;
|
|
16
17
|
constructor(queuePrefix: string);
|
|
17
|
-
protected execute({ routeName, messages }: IProcessMetroRunsMessagesInput): Promise<void>;
|
|
18
|
+
protected execute({ routeName, messages }: IProcessMetroRunsMessagesInput, msgProperties?: MessageProperties): Promise<void>;
|
|
18
19
|
private processMessage;
|
|
19
20
|
private enrichRunMessage;
|
|
20
21
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.js
CHANGED
|
@@ -40,7 +40,7 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
40
40
|
this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
|
|
41
41
|
this.gtfsTripRunManager = GTFSTripRunManagerFactory_1.GTFSTripRunManagerFactory.create(GTFSTripRunManagerFactory_1.GTFSTripRunType.Metro, this.positionsRepository, this.tripsRepository, this.runsRepository, this.runTripsRedisRepository);
|
|
42
42
|
}
|
|
43
|
-
execute({ routeName, messages }) {
|
|
43
|
+
execute({ routeName, messages }, msgProperties) {
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
const { filteredMessages, trackIds } = MetroMessageFilter_1.MetroMessageFilter.getValidMessagesWithTrackIds(messages);
|
|
46
46
|
if (filteredMessages.length === 0) {
|
|
@@ -48,11 +48,11 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
48
48
|
}
|
|
49
49
|
const gpsData = yield this.railtrackGPSRepository.findCoordinates(routeName, trackIds);
|
|
50
50
|
for (const message of filteredMessages) {
|
|
51
|
-
yield this.processMessage(message, gpsData);
|
|
51
|
+
yield this.processMessage(message, gpsData, msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp);
|
|
52
52
|
}
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
|
-
processMessage(message, gpsData) {
|
|
55
|
+
processMessage(message, gpsData, firstMessageCreatedAt) {
|
|
56
56
|
var _a;
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
58
|
const data = yield this.processingTransformation.transform({ message, gpsData });
|
|
@@ -79,7 +79,7 @@ class ProcessMetroRunMessagesTask extends integration_engine_1.AbstractTask {
|
|
|
79
79
|
}
|
|
80
80
|
const delayMsg = yield this.gtfsTripRunManager.generateDelayMsg(scheduledTrips, enhancedMessage);
|
|
81
81
|
if (delayMsg.updatedTrips.length > 0) {
|
|
82
|
-
yield integration_engine_1.QueueManager.sendMessageToExchange(`${integration_engine_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateDelay", delayMsg);
|
|
82
|
+
yield integration_engine_1.QueueManager.sendMessageToExchange(`${integration_engine_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateDelay", delayMsg, { timestamp: firstMessageCreatedAt });
|
|
83
83
|
}
|
|
84
84
|
});
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oEAA2E;AAC3E,gFAAgF;AAChF,wIAA6H;AAM7H,iGAAsH;AACtH,yFAA8G;AAE9G,uHAGyG;AACzG,2FAA0D;AAC1D,8EAA2F;AAC3F,2EAAoE;AACpE,6EAAwE;AACxE,mEAAoE;
|
|
1
|
+
{"version":3,"file":"ProcessMetroRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessMetroRunMessagesTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
2
2
|
import { AbstractTask } from "@golemio/core/dist/integration-engine";
|
|
3
|
+
import { MessageProperties } from "amqplib";
|
|
3
4
|
import { DescriptorRepository } from "../../vehicle-descriptors/data-access/DescriptorRepository";
|
|
4
5
|
import { IGtfsLookupManager } from "../helpers/regional-bus/interfaces/IGtfsLookupManager";
|
|
5
6
|
import { ITripScheduleManager } from "../helpers/regional-bus/interfaces/ITripScheduleManager";
|
|
@@ -16,7 +17,7 @@ export declare class ProcessRegionalBusRunMessagesTask extends AbstractTask<IPro
|
|
|
16
17
|
private readonly routeSubAgencyRepository;
|
|
17
18
|
private readonly gtfsTripRunManager;
|
|
18
19
|
constructor(config: ISimpleConfig, descriptorRepository: DescriptorRepository, gtfsLookupManager: IGtfsLookupManager, tripScheduleManager: ITripScheduleManager);
|
|
19
|
-
protected execute({ messages }: IProcessRegionalBusRunMessagesInput): Promise<void>;
|
|
20
|
+
protected execute({ messages }: IProcessRegionalBusRunMessagesInput, msgProperties?: MessageProperties): Promise<void>;
|
|
20
21
|
private getGtfsTripsFromCache;
|
|
21
22
|
private getGtfsTripsFromDb;
|
|
22
23
|
}
|
|
@@ -46,7 +46,7 @@ let ProcessRegionalBusRunMessagesTask = exports.ProcessRegionalBusRunMessagesTas
|
|
|
46
46
|
this.routeSubAgencyRepository = new RouteSubAgencyRepository_1.RouteSubAgencyRepository();
|
|
47
47
|
this.gtfsTripRunManager = new GtfsTripRegionalBusRunManager_1.GtfsTripRegionalBusRunManager();
|
|
48
48
|
}
|
|
49
|
-
execute({ messages }) {
|
|
49
|
+
execute({ messages }, msgProperties) {
|
|
50
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
51
|
let gtfsTripByExternalId = yield this.getGtfsTripsFromCache(messages);
|
|
52
52
|
const messagesWithoutGtfsData = messages.filter((message) => !gtfsTripByExternalId.has(message.external_trip_id));
|
|
@@ -75,7 +75,7 @@ let ProcessRegionalBusRunMessagesTask = exports.ProcessRegionalBusRunMessagesTas
|
|
|
75
75
|
const delayMsg = yield this.gtfsTripRunManager.generateDelayMsg(scheduledTrips, runInput);
|
|
76
76
|
if (delayMsg.updatedTrips.length > 0) {
|
|
77
77
|
const rabbitExchangeName = this.config.getValue("env.RABBIT_EXCHANGE_NAME");
|
|
78
|
-
yield integration_engine_1.QueueManager.sendMessageToExchange(`${rabbitExchangeName}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "processRegionalBusPositions", delayMsg);
|
|
78
|
+
yield integration_engine_1.QueueManager.sendMessageToExchange(`${rabbitExchangeName}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "processRegionalBusPositions", delayMsg, { timestamp: msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp });
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessRegionalBusRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA4D;AAC5D,0GAA+F;AAC/F,oEAA8E;AAC9E,2FAA0D;AAE1D,wEAAqE;AACrE,8EAAmF;AACnF,iEAAwE;
|
|
1
|
+
{"version":3,"file":"ProcessRegionalBusRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IRegionalBusRunsFacade } from "../helpers/regional-bus/interfaces/IRegionalBusRunsFacade";
|
|
3
4
|
import { IRegionalBusRunsInput } from "../interfaces/RegionalBusRunsMessageInterfaces";
|
|
4
5
|
import { RegionalBusRunsValidationSchema } from "../schema/RegionalBusRunsSchema";
|
|
@@ -8,5 +9,5 @@ export declare class SaveArrivaCityRunsToDBTask extends AbstractTask<IRegionalBu
|
|
|
8
9
|
readonly queueTtl: number;
|
|
9
10
|
readonly schema: typeof RegionalBusRunsValidationSchema;
|
|
10
11
|
constructor(regionalBusRunsFacade: IRegionalBusRunsFacade);
|
|
11
|
-
protected execute(data: IRegionalBusRunsInput): Promise<void>;
|
|
12
|
+
protected execute(data: IRegionalBusRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
12
13
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.js
CHANGED
|
@@ -36,7 +36,7 @@ let SaveArrivaCityRunsToDBTask = exports.SaveArrivaCityRunsToDBTask = class Save
|
|
|
36
36
|
this.queueTtl = 3 * 60 * 1000; // 3 minutes
|
|
37
37
|
this.schema = RegionalBusRunsSchema_1.RegionalBusRunsValidationSchema;
|
|
38
38
|
}
|
|
39
|
-
execute(data) {
|
|
39
|
+
execute(data, msgProperties) {
|
|
40
40
|
return __awaiter(this, void 0, void 0, function* () {
|
|
41
41
|
const inputMessages = Array.isArray(data.M.V) ? data.M.V : [data.M.V];
|
|
42
42
|
const transformedMessages = yield this.regionalBusRunsFacade.transformAndSaveMessages(inputMessages);
|
|
@@ -45,7 +45,7 @@ let SaveArrivaCityRunsToDBTask = exports.SaveArrivaCityRunsToDBTask = class Save
|
|
|
45
45
|
}
|
|
46
46
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "processRegionalBusRunMessages", {
|
|
47
47
|
messages: transformedMessages,
|
|
48
|
-
});
|
|
48
|
+
}, { timestamp: msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp });
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveArrivaCityRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA8E;AAC9E,2FAAqF;AACrF,2EAA6E;AAC7E,iEAAwE;
|
|
1
|
+
{"version":3,"file":"SaveArrivaCityRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveArrivaCityRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,oEAA8E;AAC9E,2FAAqF;AACrF,2EAA6E;AAC7E,iEAAwE;AAExE,4CAA2C;AAG3C,2EAAkF;AAG3E,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,sBAAmC;IAK/E,YAA4D,qBAAqD;QAC7G,KAAK,CAAC,uBAAW,CAAC,CAAC;QAD6C,0BAAqB,GAArB,qBAAqB,CAAwB;QAJjG,cAAS,GAAG,wBAAwB,CAAC;QACrC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,uDAA+B,CAAC;IAIzD,CAAC;IAEe,OAAO,CAAC,IAA2B,EAAE,aAAiC;;YAClF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtE,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YACrG,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAClC,OAAO;aACV;YAED,MAAM,8BAAY,CAAC,qBAAqB,CACpC,IAAI,CAAC,WAAW,EAChB,+BAA+B,EAC/B;gBACI,QAAQ,EAAE,mBAAmB;aAChC,EACD,EAAE,SAAS,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,EAAE,CAC1C,CAAC;QACN,CAAC;KAAA;CACJ,CAAA;qCAzBY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAMI,WAAA,IAAA,iBAAM,EAAC,mCAAgB,CAAC,qBAAqB,CAAC,CAAA;;GALlD,0BAA0B,CAyBtC"}
|
|
@@ -38,7 +38,7 @@ class SaveBusRunsToDBTask extends workers_1.AbstractTask {
|
|
|
38
38
|
const messages = yield this.messagesTransformation.transform({ data: data.M.V, timestamp });
|
|
39
39
|
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages);
|
|
40
40
|
for (const runMessage of filteredMessages) {
|
|
41
|
-
yield this.messageProcessor.processTransformedRun(runMessage);
|
|
41
|
+
yield this.messageProcessor.processTransformedRun(runMessage, timestamp);
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveBusRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAE3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AACvG,wCAA2D;AAC3D,oEAA8E;AAE9E,MAAa,mBAAoB,SAAQ,sBAA8B;IAUnE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,gBAAgB,CAAC,CAAC;IACtG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAC/G;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5F,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SaveBusRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveBusRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAE3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AACvG,wCAA2D;AAC3D,oEAA8E;AAE9E,MAAa,mBAAoB,SAAQ,sBAA8B;IAUnE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,iBAAiB,CAAC;QAC9B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,gBAAgB,CAAC,CAAC;IACtG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,sCAAsC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAC/G;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YAC5F,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;aAC5E;QACL,CAAC;KAAA;CACJ;AA/BD,kDA+BC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IMetroRunsInput } from "../interfaces/MetroRunsMessageInterfaces";
|
|
3
4
|
import { MetroRunsValidationSchema } from "../schema/MetroRunsSchema";
|
|
4
5
|
export declare class SaveMetroRunsToDBTask extends AbstractTask<IMetroRunsInput> {
|
|
@@ -8,5 +9,5 @@ export declare class SaveMetroRunsToDBTask extends AbstractTask<IMetroRunsInput>
|
|
|
8
9
|
private readonly messagesTransformation;
|
|
9
10
|
private readonly messagesRepository;
|
|
10
11
|
constructor(queuePrefix: string);
|
|
11
|
-
protected execute(data: IMetroRunsInput): Promise<void>;
|
|
12
|
+
protected execute(data: IMetroRunsInput, msgProperties?: MessageProperties): Promise<void>;
|
|
12
13
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js
CHANGED
|
@@ -24,7 +24,7 @@ class SaveMetroRunsToDBTask extends workers_1.AbstractTask {
|
|
|
24
24
|
this.messagesTransformation = new MetroRunsMessagesTransformation_1.MetroRunsMessagesTransformation();
|
|
25
25
|
this.messagesRepository = new MetroRunsMessagesRepository_1.MetroRunsMessagesRepository();
|
|
26
26
|
}
|
|
27
|
-
execute(data) {
|
|
27
|
+
execute(data, msgProperties) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
29
|
const messages = yield this.messagesTransformation.transform(data);
|
|
30
30
|
if (messages.length === 0) {
|
|
@@ -34,7 +34,7 @@ class SaveMetroRunsToDBTask extends workers_1.AbstractTask {
|
|
|
34
34
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "processMetroRunMessages", {
|
|
35
35
|
routeName: data.m.$.linka,
|
|
36
36
|
messages,
|
|
37
|
-
});
|
|
37
|
+
}, { timestamp: msgProperties === null || msgProperties === void 0 ? void 0 : msgProperties.timestamp });
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
40
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;
|
|
1
|
+
{"version":3,"file":"SaveMetroRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveMetroRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAAqF;AACrF,2EAA6E;AAE7E,4FAAyF;AAEzF,+DAAsE;AACtE,wGAAqG;AAErG,MAAa,qBAAsB,SAAQ,sBAA6B;IAQpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QARP,cAAS,GAAG,mBAAmB,CAAC;QAChC,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,2CAAyB,CAAC;QAO/C,IAAI,CAAC,sBAAsB,GAAG,IAAI,iEAA+B,EAAE,CAAC;QACpE,IAAI,CAAC,kBAAkB,GAAG,IAAI,yDAA2B,EAAE,CAAC;IAChE,CAAC;IAEe,OAAO,CAAC,IAAqB,EAAE,aAAiC;;YAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO;aACV;YAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,8BAAY,CAAC,qBAAqB,CACpC,IAAI,CAAC,WAAW,EAChB,yBAAyB,EACzB;gBACI,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;gBACzB,QAAQ;aACX,EACD,EAAE,SAAS,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,EAAE,CAC1C,CAAC;QACN,CAAC;KAAA;CACJ;AA/BD,sDA+BC"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js
CHANGED
|
@@ -38,7 +38,7 @@ class SaveTramRunsToDBTask extends workers_1.AbstractTask {
|
|
|
38
38
|
const messages = yield this.messagesTransformation.transform({ data: data.M.V, timestamp }, true);
|
|
39
39
|
const filteredMessages = this.messageFilter.yieldFilteredMessages(messages);
|
|
40
40
|
for (const runMessage of filteredMessages) {
|
|
41
|
-
yield this.messageProcessor.processTransformedRun(runMessage);
|
|
41
|
+
yield this.messageProcessor.processTransformedRun(runMessage, timestamp);
|
|
42
42
|
}
|
|
43
43
|
});
|
|
44
44
|
}
|
package/dist/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveTramRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAC3D,oEAA8E;AAC9E,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAC3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AAEvG,MAAa,oBAAqB,SAAQ,sBAA8B;IAUpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,iBAAiB,CAAC,CAAC;IACvG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAChH;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;YAClG,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"SaveTramRunsToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/SaveTramRunsToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAC3D,oEAA8E;AAC9E,2EAA6E;AAC7E,6EAAwE;AAExE,8EAA2E;AAC3E,8EAA2E;AAG3E,iEAAwE;AACxE,0GAAuG;AAEvG,MAAa,oBAAqB,SAAQ,sBAA8B;IAUpE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAVP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,6CAA0B,CAAC;QAShD,IAAI,CAAC,sBAAsB,GAAG,IAAI,mEAAgC,EAAE,CAAC;QACrE,IAAI,CAAC,cAAc,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,aAAa,GAAG,gBAAW,CAAC,OAAO,CAAuB,mCAAgB,CAAC,iBAAiB,CAAC,CAAC;IACvG,CAAC;IAEe,OAAO,CAAC,IAAsB,EAAE,aAAiC;;YAC7E,MAAM,SAAS,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,SAAS,CAAC;YAC3C,IAAI,CAAC,SAAS,EAAE;gBACZ,MAAM,IAAI,6BAAY,CAAC,uCAAuC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAChH;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;YAClG,MAAM,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;YAE5E,KAAK,MAAM,UAAU,IAAI,gBAAgB,EAAE;gBACvC,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;aAC5E;QACL,CAAC;KAAA;CACJ;AA/BD,oDA+BC"}
|
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.SeznamAutobusuDataSourceProvider = void 0;
|
|
17
17
|
const datasources_1 = require("../../../../../../schema-definitions/vehicle-descriptors/datasources");
|
|
18
18
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
19
|
+
const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
|
|
19
20
|
const ContainerToken_1 = require("@golemio/core/dist/integration-engine/ioc/ContainerToken");
|
|
20
21
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
21
22
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
@@ -27,11 +28,11 @@ let SeznamAutobusuDataSourceProvider = exports.SeznamAutobusuDataSourceProvider
|
|
|
27
28
|
return new integration_engine_1.DataSource(SeznamAutobusuDataSourceProvider_1.DATASOURCE_NAME, this.getProtocolStrategy(), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "" }), new golemio_validator_1.JSONSchemaValidator(SeznamAutobusuDataSourceProvider_1.DATASOURCE_NAME + "Validator", datasources_1.seznamAutobusuJsonSchema));
|
|
28
29
|
}
|
|
29
30
|
getProtocolStrategy() {
|
|
30
|
-
return new
|
|
31
|
+
return new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
|
|
31
32
|
method: "GET",
|
|
32
33
|
url: this.config.datasources.SeznamAutobusuApiUrl,
|
|
33
34
|
headers: this.config.datasources.SeznamAutobusuApiHeaders,
|
|
34
|
-
|
|
35
|
+
timeoutInSeconds: 20,
|
|
35
36
|
});
|
|
36
37
|
}
|
|
37
38
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SeznamAutobusuDataSourceProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/datasources/seznam-autobusu/SeznamAutobusuDataSourceProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,sGAAgF;AAEhF,
|
|
1
|
+
{"version":3,"file":"SeznamAutobusuDataSourceProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/datasources/seznam-autobusu/SeznamAutobusuDataSourceProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,sGAAgF;AAEhF,8EAAwH;AAExH,6IAA0I;AAC1I,6FAA0F;AAC1F,mFAAkF;AAClF,iEAAwE;AAGjE,IAAM,gCAAgC,mFAAtC,MAAM,gCAAgC;IAGzC,YAAmD,MAAsB;QAAtB,WAAM,GAAN,MAAM,CAAgB;IAAG,CAAC;IAEtE,aAAa;QAChB,OAAO,IAAI,+BAAU,CACjB,kCAAgC,CAAC,eAAe,EAChD,IAAI,CAAC,mBAAmB,EAAE,EAC1B,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,EAC7C,IAAI,uCAAmB,CAAC,kCAAgC,CAAC,eAAe,GAAG,WAAW,EAAE,sCAAwB,CAAC,CACpH,CAAC;IACN,CAAC;IAEO,mBAAmB;QACvB,OAAO,IAAI,qDAAyB,CAAC;YACjC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,oBAAoB;YACjD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,wBAAwB;YACzD,gBAAgB,EAAE,EAAE;SACvB,CAAC,CAAC;IACP,CAAC;;AApBc,gDAAe,GAAG,0BAA0B,AAA7B,CAA8B;2CADnD,gCAAgC;IAD5C,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,+BAAc,CAAC,MAAM,CAAC,CAAA;;GAHjC,gCAAgC,CAsB5C"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IUpdateDelayInput } from "../interfaces/IUpdateDelayInput";
|
|
3
4
|
import { UpdateDelayValidationSchema } from "../schema/UpdateDelaySchema";
|
|
4
5
|
export declare class ProcessRegionalBusPositionsTask extends AbstractTask<IUpdateDelayInput> {
|
|
@@ -10,8 +11,9 @@ export declare class ProcessRegionalBusPositionsTask extends AbstractTask<IUpdat
|
|
|
10
11
|
private readonly positionsRepository;
|
|
11
12
|
private readonly delayComputationRedisRepository;
|
|
12
13
|
private readonly delayComputationManager;
|
|
14
|
+
private readonly updateDelayLimiter;
|
|
13
15
|
constructor(queuePrefix: string);
|
|
14
|
-
protected execute(data: IUpdateDelayInput): Promise<void>;
|
|
16
|
+
protected execute(data: IUpdateDelayInput, msgProperties?: MessageProperties): Promise<void>;
|
|
15
17
|
private enrichTripWithGtfsComputationData;
|
|
16
18
|
/**
|
|
17
19
|
* Propagate known position properties from trips positions to processed positions, when the processed position property is
|
|
@@ -23,11 +23,12 @@ const DelayComputationManager_1 = require("../helpers/DelayComputationManager");
|
|
|
23
23
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
24
24
|
const RegionalBusPositionsManager_1 = require("../helpers/regional-bus/RegionalBusPositionsManager");
|
|
25
25
|
const UpdateDelaySchema_1 = require("../schema/UpdateDelaySchema");
|
|
26
|
+
const UpdateDelayLimiter_1 = require("./helpers/UpdateDelayLimiter");
|
|
26
27
|
class ProcessRegionalBusPositionsTask extends workers_1.AbstractTask {
|
|
27
28
|
constructor(queuePrefix) {
|
|
28
29
|
super(queuePrefix);
|
|
29
30
|
this.queueName = "processRegionalBusPositions";
|
|
30
|
-
this.queueTtl =
|
|
31
|
+
this.queueTtl = 2 * 60 * 1000; // 2 minutes
|
|
31
32
|
this.schema = UpdateDelaySchema_1.UpdateDelayValidationSchema;
|
|
32
33
|
this.enrichTripWithGtfsComputationData = (trip) => __awaiter(this, void 0, void 0, function* () {
|
|
33
34
|
try {
|
|
@@ -82,9 +83,13 @@ class ProcessRegionalBusPositionsTask extends workers_1.AbstractTask {
|
|
|
82
83
|
this.delayComputationRedisRepository = new cache_1.DelayComputationRedisRepository();
|
|
83
84
|
const gtfsTripsRepository = new RopidGTFSTripsModel_1.RopidGTFSTripsModel();
|
|
84
85
|
this.delayComputationManager = new DelayComputationManager_1.DelayComputationManager(gtfsTripsRepository);
|
|
86
|
+
this.updateDelayLimiter = new UpdateDelayLimiter_1.UpdateDelayLimiter("ProcessRegionalBusPositionsTask", this.queueTtl);
|
|
85
87
|
}
|
|
86
|
-
execute(data) {
|
|
88
|
+
execute(data, msgProperties) {
|
|
87
89
|
return __awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
if (!this.updateDelayLimiter.isActualMessage(msgProperties)) {
|
|
91
|
+
return; // skip processing of old messages
|
|
92
|
+
}
|
|
88
93
|
const tripIds = data.updatedTrips.map((trip) => trip.id);
|
|
89
94
|
let gtfsComputationTrips = [];
|
|
90
95
|
let tripsPositionsWithGtfsData = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessRegionalBusPositionsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oFAAyE;AACzE,oEAAmF;AAEnF,wEAAqE;AAErE,qEAA0F;AAC1F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAA8F;
|
|
1
|
+
{"version":3,"file":"ProcessRegionalBusPositionsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
1
|
import { IMpvMessageInput } from "../../../../../schema-definitions/vehicle-positions/interfaces/IMpvMessageInterfaces";
|
|
2
|
+
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
3
|
+
import { MessageProperties } from "amqplib";
|
|
3
4
|
import { SaveDataToDBValidationSchema } from "../schema/SaveDataToDBSchema";
|
|
4
5
|
export declare class SaveDataToDBTask extends AbstractTask<IMpvMessageInput> {
|
|
5
6
|
readonly queueName = "saveDataToDB";
|
|
@@ -10,7 +11,7 @@ export declare class SaveDataToDBTask extends AbstractTask<IMpvMessageInput> {
|
|
|
10
11
|
private readonly messageTransformation;
|
|
11
12
|
private readonly logger;
|
|
12
13
|
constructor(queuePrefix: string);
|
|
13
|
-
protected execute(data: IMpvMessageInput): Promise<void>;
|
|
14
|
+
protected execute(data: IMpvMessageInput, messageProperties?: MessageProperties): Promise<void>;
|
|
14
15
|
private saveStops;
|
|
15
16
|
private sendDataToUpdateGtfsTripId;
|
|
16
17
|
private sendDataToUpdateDelay;
|