@golemio/public-transport 0.1.0-dev.2771546326 → 0.1.0-dev.2772532070
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/integration-engine/gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js +28 -17
- package/dist/integration-engine/gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js.map +1 -1
- package/dist/integration-engine/gtfs/workers/timetables/tasks/ImportGtfsFromStorageTask.js +3 -1
- package/dist/integration-engine/gtfs/workers/timetables/tasks/ImportGtfsFromStorageTask.js.map +1 -1
- package/docs/follow-ups.md +6 -0
- package/docs/openapi-output.yaml +13 -9
- package/package.json +1 -1
package/dist/integration-engine/gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js
CHANGED
|
@@ -13,6 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.CheckSavedRowsAndReplaceTablesTask = void 0;
|
|
16
|
+
const const_1 = require("../../../../../schema-definitions/gtfs/const");
|
|
16
17
|
const GtfsFacade_1 = require("../../../GtfsFacade");
|
|
17
18
|
const GtfsMetadataRepository_1 = require("../../../GtfsMetadataRepository");
|
|
18
19
|
const GtfsFeedRepository_1 = require("../../../data-access/GtfsFeedRepository");
|
|
@@ -20,18 +21,17 @@ const GtfsRepository_1 = require("../../../data-access/GtfsRepository");
|
|
|
20
21
|
const DataCacheManager_1 = require("../../../helpers/DataCacheManager");
|
|
21
22
|
const SourceTableSuffixEnum_1 = require("../../../helpers/SourceTableSuffixEnum");
|
|
22
23
|
const GtfsContainerToken_1 = require("../../../ioc/GtfsContainerToken");
|
|
23
|
-
const constants_1 = require("../../../../vehicle-positions/workers/vehicle-positions/constants");
|
|
24
24
|
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
25
25
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
26
26
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
27
27
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
28
28
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
29
|
-
const
|
|
29
|
+
const constants_1 = require("../constants");
|
|
30
30
|
const PrecomputedTablesFacade_1 = require("./helpers/PrecomputedTablesFacade");
|
|
31
31
|
const DownloadDataInputSchema_1 = require("./schema/DownloadDataInputSchema");
|
|
32
32
|
let CheckSavedRowsAndReplaceTablesTask = class CheckSavedRowsAndReplaceTablesTask extends workers_1.AbstractTask {
|
|
33
33
|
constructor(metadataRepository, gtfsRepository, precomputeTablesFacade, gtfsFacade, feedRepository, config, logger) {
|
|
34
|
-
super(
|
|
34
|
+
super(constants_1.TIMETABLE_WORKER_NAME);
|
|
35
35
|
this.metadataRepository = metadataRepository;
|
|
36
36
|
this.gtfsRepository = gtfsRepository;
|
|
37
37
|
this.precomputeTablesFacade = precomputeTablesFacade;
|
|
@@ -64,24 +64,28 @@ let CheckSavedRowsAndReplaceTablesTask = class CheckSavedRowsAndReplaceTablesTas
|
|
|
64
64
|
await this.gtfsFacade.replaceTables(notDeployedVersions, feedCode, feedId);
|
|
65
65
|
await this.dataCacheManager.cleanCache();
|
|
66
66
|
await this.gtfsRepository.cleanTmpAndOldTables(feedCode);
|
|
67
|
-
const rabbitExchangeName = this.config.getValue("env.RABBIT_EXCHANGE_NAME");
|
|
68
|
-
await Promise.all([
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
67
|
+
// const rabbitExchangeName = this.config.getValue<string>("env.RABBIT_EXCHANGE_NAME");
|
|
68
|
+
// await Promise.all([
|
|
69
|
+
// // send message to VP worker to refresh GTFS trip data (see task description for more info)
|
|
70
|
+
// QueueManager.sendMessageToExchange(
|
|
71
|
+
// `${rabbitExchangeName}.${VP_WORKER_NAME.toLowerCase()}`,
|
|
72
|
+
// "refreshGTFSTripData",
|
|
73
|
+
// {}
|
|
74
|
+
// ),
|
|
75
|
+
// // send message to GTFS timetable worker to refresh public GTFS departure cache
|
|
76
|
+
// // so that the new data is available in the public (Lítačka) API
|
|
77
|
+
// QueueManager.sendMessageToExchange(this.queuePrefix, "refreshPublicGtfsDepartureCache", {}),
|
|
78
|
+
// QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsStopsCache", {}),
|
|
79
|
+
// QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsTripStopsCache", {}),
|
|
80
|
+
// QueueManager.sendMessageToExchange(this.queuePrefix, "remapPresetsToGtfsStops", {}),
|
|
81
|
+
// ]);
|
|
78
82
|
}
|
|
79
83
|
catch (err) {
|
|
80
84
|
await this.retryOrThrow(notDeployedVersions, data, err);
|
|
81
85
|
}
|
|
82
86
|
}
|
|
83
87
|
async retryOrThrow(notDeployedVersions, data, err) {
|
|
84
|
-
const feedCode = data.feedCode ??
|
|
88
|
+
const feedCode = data.feedCode ?? const_1.PID_FEED_CODE;
|
|
85
89
|
// log failed saving process
|
|
86
90
|
await Promise.all(notDeployedVersions.map(async (el) => {
|
|
87
91
|
await this.metadataRepository.rollbackFailedSaving(el.dataset, el.version);
|
|
@@ -92,8 +96,15 @@ let CheckSavedRowsAndReplaceTablesTask = class CheckSavedRowsAndReplaceTablesTas
|
|
|
92
96
|
}));
|
|
93
97
|
await this.gtfsRepository.cleanTmpAndOldTables(feedCode);
|
|
94
98
|
if (Math.max(...retries) <= 5) {
|
|
95
|
-
//
|
|
96
|
-
|
|
99
|
+
// re-acquire the source data and try again. The FTP download path only ever serves the
|
|
100
|
+
// PID feed -- retrying a storage-imported feed through it would download PID's data and
|
|
101
|
+
// stamp it with the failing feed's code, so non-PID feeds retry via the storage import.
|
|
102
|
+
if (feedCode === const_1.PID_FEED_CODE) {
|
|
103
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "downloadDatasets", data);
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "importGtfsFromStorage", { feedCode });
|
|
107
|
+
}
|
|
97
108
|
integration_engine_1.IntegrationErrorHandler.handle(new golemio_errors_1.GeneralError(`Error while checking Gtfs saved rows. Attempt number ${Math.min(...retries)} was resent.`, this.constructor.name, err));
|
|
98
109
|
}
|
|
99
110
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAiD;AACjD,4EAAyE;AACzE,gFAA6E;AAC7E,wEAAqE;AACrE,wEAAqE;AACrE,kFAA+E;AAC/E,wEAAqE;
|
|
1
|
+
{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -108,7 +108,9 @@ let ImportGtfsFromStorageTask = class ImportGtfsFromStorageTask extends workers_
|
|
|
108
108
|
}
|
|
109
109
|
const redisKey = `${feedCode}/${file.name}`;
|
|
110
110
|
await this.staticFileRedisRepository.pipeStream(redisKey, node_fs_1.default.createReadStream(file.path));
|
|
111
|
-
|
|
111
|
+
// downstream (datasetFileModelMap/GtfsTransformation) keys on the bare model name,
|
|
112
|
+
// e.g. "agency", never the file name "agency.txt"
|
|
113
|
+
stagedFiles.push({ name: file.name.replace(/\.txt$/, ""), redisKey });
|
|
112
114
|
}
|
|
113
115
|
return stagedFiles;
|
|
114
116
|
}
|
package/dist/integration-engine/gtfs/workers/timetables/tasks/ImportGtfsFromStorageTask.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportGtfsFromStorageTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/gtfs/workers/timetables/tasks/ImportGtfsFromStorageTask.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ImportGtfsFromStorageTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/gtfs/workers/timetables/tasks/ImportGtfsFromStorageTask.ts"],"names":[],"mappings":"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"}
|
package/docs/follow-ups.md
CHANGED
|
@@ -102,3 +102,9 @@ Still required per deployment:
|
|
|
102
102
|
`AZURE_BLOB_STORAGE_CONTAINER_NAME`, Azure AD creds). Don't schedule the classic PID download cron
|
|
103
103
|
(`checkForNewData`) — it would double-fetch alongside pid's
|
|
104
104
|
- the Input Gateway needs NO Redis connection (the deleted upload endpoint was its only consumer)
|
|
105
|
+
- the post-import cache-refresh fan-out in `CheckSavedRowsAndReplaceTablesTask` (refreshGTFSTripData,
|
|
106
|
+
refreshPublicGtfsDepartureCache, refreshGtfsStopsCache, refreshGtfsTripStopsCache,
|
|
107
|
+
remapPresetsToGtfsStops) is commented out — every consumer of those caches is currently a disabled
|
|
108
|
+
router or an idle worker. Re-enable it when the public/pid OG endpoints return or when VP starts
|
|
109
|
+
consuming a feed this module imports (stale gtfs trip matching otherwise); `ensureCache` can rebuild
|
|
110
|
+
everything on demand in the meantime
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -2367,14 +2367,19 @@ components:
|
|
|
2367
2367
|
type: integer
|
|
2368
2368
|
minimum: 0
|
|
2369
2369
|
example: 3
|
|
2370
|
-
DepartureBoardsPreset
|
|
2371
|
-
|
|
2372
|
-
|
|
2373
|
-
|
|
2374
|
-
|
|
2375
|
-
|
|
2376
|
-
|
|
2377
|
-
|
|
2370
|
+
# DepartureBoardsPreset is only referenced by the commented-out departure-boards paths.
|
|
2371
|
+
# It must stay out of components while @golemio/pid is co-installed in host gateways:
|
|
2372
|
+
# pid defines the same parameter with a null description, and openapi-merge's component
|
|
2373
|
+
# comparison crashes on nulls when both specs define the same name. Restore together
|
|
2374
|
+
# with the departure-boards paths (after the two-repo split).
|
|
2375
|
+
# DepartureBoardsPreset:
|
|
2376
|
+
# name: preset
|
|
2377
|
+
# in: query
|
|
2378
|
+
# description: Name of a saved departure boards preset to apply.
|
|
2379
|
+
# required: false
|
|
2380
|
+
# schema:
|
|
2381
|
+
# type: string
|
|
2382
|
+
# example: "thmp-slovinska-b-8939"
|
|
2378
2383
|
schemas:
|
|
2379
2384
|
RepeatOnlyTimes:
|
|
2380
2385
|
title: Repeat Only Times
|
|
@@ -2636,7 +2641,6 @@ components:
|
|
|
2636
2641
|
example: "00A562"
|
|
2637
2642
|
route_desc:
|
|
2638
2643
|
type: string
|
|
2639
|
-
example: null
|
|
2640
2644
|
nullable: true
|
|
2641
2645
|
route_id:
|
|
2642
2646
|
type: string
|