@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
|
@@ -34,7 +34,7 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
34
34
|
this.messageTransformation = new MpvMessageTransformation_1.MpvMessageTransformation();
|
|
35
35
|
this.logger = ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.Logger);
|
|
36
36
|
}
|
|
37
|
-
execute(data) {
|
|
37
|
+
execute(data, messageProperties) {
|
|
38
38
|
var _a;
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
const taskStartTimestamp = new Date().getTime();
|
|
@@ -47,8 +47,8 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
47
47
|
.concat("updated_at"), true);
|
|
48
48
|
const { inserted, updated } = TripsMapper_1.default.mapTripEntitiesToUpdateDto(tripEntities, taskStartTimestamp);
|
|
49
49
|
// At this point we want to send ACK to rabbit and let the rest of the processing to be done in the background
|
|
50
|
-
yield this.sendDataToUpdateGtfsTripId(inserted, positions);
|
|
51
|
-
yield this.sendDataToUpdateDelay(updated, positions);
|
|
50
|
+
yield this.sendDataToUpdateGtfsTripId(inserted, positions, messageProperties === null || messageProperties === void 0 ? void 0 : messageProperties.timestamp);
|
|
51
|
+
yield this.sendDataToUpdateDelay(updated, positions, messageProperties === null || messageProperties === void 0 ? void 0 : messageProperties.timestamp);
|
|
52
52
|
// Save cis stops to later propagate platform codes to departure boards
|
|
53
53
|
yield this.saveStops(stops);
|
|
54
54
|
});
|
|
@@ -68,7 +68,7 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
68
68
|
}
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
|
-
sendDataToUpdateGtfsTripId(insertedTrips, positions) {
|
|
71
|
+
sendDataToUpdateGtfsTripId(insertedTrips, positions, firstMessageCreatedAt) {
|
|
72
72
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
73
|
try {
|
|
74
74
|
// send message for update GTFSTripIds
|
|
@@ -80,6 +80,8 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
80
80
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateGTFSTripId", {
|
|
81
81
|
trips: insertedBatch,
|
|
82
82
|
positions: positions.filter((position) => insertedIds.includes(position.trips_id)),
|
|
83
|
+
}, {
|
|
84
|
+
timestamp: firstMessageCreatedAt,
|
|
83
85
|
});
|
|
84
86
|
}
|
|
85
87
|
}
|
|
@@ -93,7 +95,7 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
93
95
|
}
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
|
-
sendDataToUpdateDelay(updatedTrips, positions) {
|
|
98
|
+
sendDataToUpdateDelay(updatedTrips, positions, firstMessageCreatedAt) {
|
|
97
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
100
|
try {
|
|
99
101
|
// aggregate runs by origin_route_name & run_number to keep related messages in same bulk
|
|
@@ -120,7 +122,7 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
120
122
|
}
|
|
121
123
|
const promises = [];
|
|
122
124
|
for (const key in chunks) {
|
|
123
|
-
promises.push(this.getTripDataAndSendToUpdateDelay(chunks[key], positions));
|
|
125
|
+
promises.push(this.getTripDataAndSendToUpdateDelay(chunks[key], positions, firstMessageCreatedAt));
|
|
124
126
|
}
|
|
125
127
|
yield Promise.all(promises);
|
|
126
128
|
}
|
|
@@ -134,13 +136,15 @@ class SaveDataToDBTask extends workers_1.AbstractTask {
|
|
|
134
136
|
}
|
|
135
137
|
});
|
|
136
138
|
}
|
|
137
|
-
getTripDataAndSendToUpdateDelay(chunk, positions) {
|
|
139
|
+
getTripDataAndSendToUpdateDelay(chunk, positions, firstMessageCreatedAt) {
|
|
138
140
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
141
|
try {
|
|
140
142
|
const updatedTrips = yield this.tripsRepository.findAllAssocTripIds(chunk);
|
|
141
143
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", {
|
|
142
144
|
updatedTrips,
|
|
143
145
|
positions: positions.filter((position) => chunk.includes(position.trips_id)),
|
|
146
|
+
}, {
|
|
147
|
+
timestamp: firstMessageCreatedAt,
|
|
144
148
|
});
|
|
145
149
|
}
|
|
146
150
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SaveDataToDBTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/SaveDataToDBTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 UpdateDelayTask extends AbstractTask<IUpdateDelayInput> {
|
|
@@ -12,8 +13,9 @@ export declare class UpdateDelayTask extends AbstractTask<IUpdateDelayInput> {
|
|
|
12
13
|
private readonly tripStopsManager;
|
|
13
14
|
private readonly delayComputationManager;
|
|
14
15
|
private readonly metroShapePointsFixer;
|
|
16
|
+
private readonly updateDelayLimiter;
|
|
15
17
|
constructor(queuePrefix: string);
|
|
16
|
-
protected execute(data: IUpdateDelayInput): Promise<void>;
|
|
18
|
+
protected execute(data: IUpdateDelayInput, messageProperties?: MessageProperties): Promise<void>;
|
|
17
19
|
private enrichTripWithGtfsComputationData;
|
|
18
20
|
/**
|
|
19
21
|
* Propagate known position properties from trips positions to processed positions, when the processed position property is
|
|
@@ -29,6 +31,7 @@ export declare class UpdateDelayTask extends AbstractTask<IUpdateDelayInput> {
|
|
|
29
31
|
* @param processedPositions - Arrays of all newly computed positions
|
|
30
32
|
*/
|
|
31
33
|
private updateComputedPositionsAndTrips;
|
|
34
|
+
private savePositions;
|
|
32
35
|
/**
|
|
33
36
|
* Expire delay computation cache for given trips
|
|
34
37
|
*/
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js
CHANGED
|
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.UpdateDelayTask = void 0;
|
|
16
|
+
const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
|
|
16
17
|
const RopidGTFSStopTimesModel_1 = require("../../../../ropid-gtfs/RopidGTFSStopTimesModel");
|
|
17
18
|
const RopidGTFSTripsModel_1 = require("../../../../ropid-gtfs/RopidGTFSTripsModel");
|
|
18
19
|
const cache_1 = require("../../../../ropid-gtfs/data-access/cache");
|
|
@@ -32,12 +33,12 @@ const PositionsManager_1 = __importDefault(require("../helpers/PositionsManager"
|
|
|
32
33
|
const TripStopsManager_1 = require("../helpers/TripStopsManager");
|
|
33
34
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
34
35
|
const UpdateDelaySchema_1 = require("../schema/UpdateDelaySchema");
|
|
35
|
-
const
|
|
36
|
+
const UpdateDelayLimiter_1 = require("./helpers/UpdateDelayLimiter");
|
|
36
37
|
class UpdateDelayTask extends workers_1.AbstractTask {
|
|
37
38
|
constructor(queuePrefix) {
|
|
38
39
|
super(queuePrefix);
|
|
39
40
|
this.queueName = "updateDelay";
|
|
40
|
-
this.queueTtl =
|
|
41
|
+
this.queueTtl = 50 * 1000; // 50 seconds
|
|
41
42
|
this.schema = UpdateDelaySchema_1.UpdateDelayValidationSchema;
|
|
42
43
|
this.enrichTripWithGtfsComputationData = (trip) => __awaiter(this, void 0, void 0, function* () {
|
|
43
44
|
try {
|
|
@@ -104,79 +105,19 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
104
105
|
this.tripStopsManager = new TripStopsManager_1.TripStopsManager(gtfsStopTimesRepository, blockStopsRedisRepository);
|
|
105
106
|
this.delayComputationManager = new DelayComputationManager_1.DelayComputationManager(gtfsTripsRepository);
|
|
106
107
|
this.metroShapePointsFixer = Di_2.VPContainer.resolve(VPContainerToken_1.VPContainerToken.MetroShapePointsFixer);
|
|
108
|
+
this.updateDelayLimiter = new UpdateDelayLimiter_1.UpdateDelayLimiter("UpdateDelayTask", this.queueTtl);
|
|
107
109
|
}
|
|
108
|
-
execute(data) {
|
|
110
|
+
execute(data, messageProperties) {
|
|
109
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
112
|
const tripIds = data.updatedTrips.map((trip) => trip.id);
|
|
111
113
|
if (tripIds.length === 0) {
|
|
112
114
|
return;
|
|
113
115
|
}
|
|
114
116
|
if (data.positions.length > 0) {
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
// unique block_ids and its parent input trips_id in key-value structure
|
|
121
|
-
let tripsIdsByBlockIds = {};
|
|
122
|
-
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
123
|
-
let blockIdToTripIdsDict = {};
|
|
124
|
-
for (const trip of data.updatedTrips) {
|
|
125
|
-
if (!trip.gtfs_block_id) {
|
|
126
|
-
continue;
|
|
127
|
-
}
|
|
128
|
-
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
129
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
132
|
-
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
133
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
134
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
135
|
-
}
|
|
136
|
-
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
137
|
-
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
138
|
-
}
|
|
139
|
-
if (trip.gtfs_trip_id) {
|
|
140
|
-
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
// Get cached schedule for each unique block_id
|
|
144
|
-
const blockIdToTripStopScheduleDict = yield Object.entries(blockIdToTripIdsDict).reduce((acc, [blockId, gtfsTripIds]) => __awaiter(this, void 0, void 0, function* () {
|
|
145
|
-
const tripStops = yield acc;
|
|
146
|
-
try {
|
|
147
|
-
const schedule = yield this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds]);
|
|
148
|
-
tripStops[blockId] = schedule;
|
|
149
|
-
}
|
|
150
|
-
catch (err) {
|
|
151
|
-
helpers_1.IntegrationErrorHandler.handle(err);
|
|
152
|
-
}
|
|
153
|
-
return acc;
|
|
154
|
-
}), Promise.resolve({}));
|
|
155
|
-
// duplicate positions for trips with block_ids
|
|
156
|
-
for (const trip of data.updatedTrips) {
|
|
157
|
-
if (tripIdToPositionDict[trip.id]) {
|
|
158
|
-
if (trip.gtfs_block_id) {
|
|
159
|
-
// Determine current position tracking status
|
|
160
|
-
tripIdToPositionDict[trip.id].is_tracked = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
|
|
161
|
-
}
|
|
162
|
-
continue;
|
|
163
|
-
}
|
|
164
|
-
const currentPosition = data.positions.find((position) => {
|
|
165
|
-
return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
166
|
-
});
|
|
167
|
-
if (!currentPosition) {
|
|
168
|
-
continue;
|
|
169
|
-
}
|
|
170
|
-
// Determine position duplication and new position tracking status
|
|
171
|
-
const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
|
|
172
|
-
// duplicate position with new created trip for second trip
|
|
173
|
-
const newPosition = Object.assign({}, currentPosition);
|
|
174
|
-
newPosition.trips_id = trip.id;
|
|
175
|
-
newPosition.is_tracked = newPositionTrackingStatus;
|
|
176
|
-
data.positions.push(newPosition);
|
|
177
|
-
}
|
|
178
|
-
// save all new positions
|
|
179
|
-
yield this.positionsRepository.bulkSave(data.positions);
|
|
117
|
+
yield this.savePositions(data);
|
|
118
|
+
}
|
|
119
|
+
if (!this.updateDelayLimiter.isActualMessage(messageProperties)) {
|
|
120
|
+
return; // skip processing of old messages
|
|
180
121
|
}
|
|
181
122
|
let gtfsComputationTrips = [];
|
|
182
123
|
let tripsPositionsWithGtfsData = [];
|
|
@@ -217,6 +158,75 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
217
158
|
}
|
|
218
159
|
});
|
|
219
160
|
}
|
|
161
|
+
savePositions(data) {
|
|
162
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
163
|
+
// unique ids in input data in key-value (id-positions) structure
|
|
164
|
+
let tripIdToPositionDict = {};
|
|
165
|
+
for (const position of data.positions) {
|
|
166
|
+
tripIdToPositionDict[position.trips_id] = position;
|
|
167
|
+
}
|
|
168
|
+
// unique block_ids and its parent input trips_id in key-value structure
|
|
169
|
+
let tripsIdsByBlockIds = {};
|
|
170
|
+
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
171
|
+
let blockIdToTripIdsDict = {};
|
|
172
|
+
for (const trip of data.updatedTrips) {
|
|
173
|
+
if (!trip.gtfs_block_id) {
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
177
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
181
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
182
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
183
|
+
}
|
|
184
|
+
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
185
|
+
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
186
|
+
}
|
|
187
|
+
if (trip.gtfs_trip_id) {
|
|
188
|
+
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
// Get cached schedule for each unique block_id
|
|
192
|
+
const blockIdToTripStopScheduleDict = yield Object.entries(blockIdToTripIdsDict).reduce((acc, [blockId, gtfsTripIds]) => __awaiter(this, void 0, void 0, function* () {
|
|
193
|
+
const tripStops = yield acc;
|
|
194
|
+
try {
|
|
195
|
+
const schedule = yield this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds]);
|
|
196
|
+
tripStops[blockId] = schedule;
|
|
197
|
+
}
|
|
198
|
+
catch (err) {
|
|
199
|
+
helpers_1.IntegrationErrorHandler.handle(err);
|
|
200
|
+
}
|
|
201
|
+
return acc;
|
|
202
|
+
}), Promise.resolve({}));
|
|
203
|
+
// duplicate positions for trips with block_ids
|
|
204
|
+
for (const trip of data.updatedTrips) {
|
|
205
|
+
if (tripIdToPositionDict[trip.id]) {
|
|
206
|
+
if (trip.gtfs_block_id) {
|
|
207
|
+
// Determine current position tracking status
|
|
208
|
+
tripIdToPositionDict[trip.id].is_tracked = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
|
|
209
|
+
}
|
|
210
|
+
continue;
|
|
211
|
+
}
|
|
212
|
+
const currentPosition = data.positions.find((position) => {
|
|
213
|
+
return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
214
|
+
});
|
|
215
|
+
if (!currentPosition) {
|
|
216
|
+
continue;
|
|
217
|
+
}
|
|
218
|
+
// Determine position duplication and new position tracking status
|
|
219
|
+
const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
|
|
220
|
+
// duplicate position with new created trip for second trip
|
|
221
|
+
const newPosition = Object.assign({}, currentPosition);
|
|
222
|
+
newPosition.trips_id = trip.id;
|
|
223
|
+
newPosition.is_tracked = newPositionTrackingStatus;
|
|
224
|
+
data.positions.push(newPosition);
|
|
225
|
+
}
|
|
226
|
+
// save all new positions
|
|
227
|
+
yield this.positionsRepository.bulkSave(data.positions);
|
|
228
|
+
});
|
|
229
|
+
}
|
|
220
230
|
/**
|
|
221
231
|
* Expire delay computation cache for given trips
|
|
222
232
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4FAAiF;AACjF,oFAAyE;AACzE,oEAA8G;AAC9G,sDAA2D;AAC3D,gGAAqF;AACrF,wCAA2D;AAC3D,oEAA8E;AAE9E,wEAAqE;AAErE,2EAAwF;AACxF,2FAAqF;AACrF,2EAA6E;AAC7E,6EAA8F;
|
|
1
|
+
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IUpdateGtfsTripIdInput } from "../interfaces/IUpdateGtfsTripIdInput";
|
|
3
4
|
import { UpdateGtfsTripIdValidationSchema } from "../schema/UpdateGtfsTripIdSchema";
|
|
4
5
|
export declare class UpdateGtfsTripIdTask extends AbstractTask<IUpdateGtfsTripIdInput> {
|
|
@@ -14,6 +15,6 @@ export declare class UpdateGtfsTripIdTask extends AbstractTask<IUpdateGtfsTripId
|
|
|
14
15
|
/**
|
|
15
16
|
* Take all newly computed positions and save it, then save the last ones to the trips
|
|
16
17
|
*/
|
|
17
|
-
protected execute(data: IUpdateGtfsTripIdInput): Promise<void>;
|
|
18
|
+
protected execute(data: IUpdateGtfsTripIdInput, messageProperties?: MessageProperties): Promise<void>;
|
|
18
19
|
private generateAndSaveScheduledTrips;
|
|
19
20
|
}
|
|
@@ -41,7 +41,7 @@ class UpdateGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
41
41
|
/**
|
|
42
42
|
* Take all newly computed positions and save it, then save the last ones to the trips
|
|
43
43
|
*/
|
|
44
|
-
execute(data) {
|
|
44
|
+
execute(data, messageProperties) {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
// unique ids in input data in key-value (id-positions) structure
|
|
47
47
|
let tripIdToPositionDict = {};
|
|
@@ -122,7 +122,7 @@ class UpdateGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
122
122
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", {
|
|
123
123
|
positions: [],
|
|
124
124
|
updatedTrips: existingTrips.slice(i, i + chunkSize),
|
|
125
|
-
});
|
|
125
|
+
}, { timestamp: messageProperties === null || messageProperties === void 0 ? void 0 : messageProperties.timestamp });
|
|
126
126
|
}
|
|
127
127
|
// gtfsId updating errors
|
|
128
128
|
for (let i = 0, imax = existingTripErrors.length; i < imax; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4FAAiF;AACjF,oEAAsG;AACtG,sFAA2G;AAC3G,2EAA6F;AAC7F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAA8F;
|
|
1
|
+
{"version":3,"file":"UpdateGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4FAAiF;AACjF,oEAAsG;AACtG,sFAA2G;AAC3G,2EAA6F;AAC7F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAA8F;AAE9F,4EAAyE;AACzE,oEAAiE;AAEjE,kEAA+D;AAC/D,gDAA6C;AAE7C,kGAAgH;AAIhH,6EAAoF;AAEpF,MAAa,oBAAqB,SAAQ,sBAAoC;IAW1E,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAXP,cAAS,GAAG,kBAAkB,CAAC;QAC/B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;QACtC,WAAM,GAAG,yDAAgC,CAAC;QAUtD,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,EAAE,CAAC;QAC7C,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,EAAE,CAAC;QACrD,IAAI,CAAC,uBAAuB,GAAG,IAAI,iDAAuB,EAAE,CAAC;QAE7D,MAAM,oBAAoB,GAAG,IAAI,2CAAoB,EAAE,CAAC;QACxD,MAAM,uBAAuB,GAAG,IAAI,+BAAuB,EAAE,CAAC;QAC9D,MAAM,yBAAyB,GAAG,IAAI,iCAAyB,EAAE,CAAC;QAElE,IAAI,CAAC,kBAAkB,GAAG,qDAAyB,CAAC,MAAM,CACtD,2CAAe,CAAC,MAAM,EACtB,IAAI,CAAC,mBAAmB,EACxB,IAAI,CAAC,eAAe,EACpB,oBAAoB,EACpB,uBAAuB,CAC1B,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,CAAC;IAC1G,CAAC;IAED;;OAEG;IACa,OAAO,CAAC,IAA4B,EAAE,iBAAqC;;YACvF,iEAAiE;YACjE,IAAI,oBAAoB,GAAkD,EAAE,CAAC;YAC7E,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnC,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;aACtD;YAED,+BAA+B;YAC/B,MAAM,UAAU,GACZ,MAAM,OAAO,CAAC,GAAG,CACb,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;gBAC1B,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;oBACvB,OAAO;iBACV;gBAED,IAAI;oBACA,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;iBAC1D;gBAAC,OAAO,GAAG,EAAE;oBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACf,OAAO,GAA2B,CAAC;iBACtC;YACL,CAAC,CAAA,CAAC,CACL,CAAC;YAEN,IAAI,aAAa,GAA+B,EAAE,EAC9C,kBAAkB,GAA2B,EAAE,CAAC;YAEpD,yCAAyC;YACzC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE;gBAC3B,IAAI,IAAI,YAAY,qCAAoB,EAAE;oBACtC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACjC;qBAAM,IAAI,IAAI,YAAY,KAAK,EAAE;oBAC9B,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;iBAC/B;qBAAM,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW,MAAK,MAAM,EAAE;oBACrC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC5B;aACJ;YAED,IAAI,oBAAoB,GAAgC,EAAE,CAAC;YAC3D,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,YAAY;oBAAE,SAAS;gBACxD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;oBAC3C,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;iBACxD;gBAED,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;aACnE;YAED,oDAAoD;YACpD,MAAM,6BAA6B,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,MAAM,CACnF,CAAO,GAAG,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,EAAE;gBAClC,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC;gBAC5B,IAAI;oBACA,SAAS,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC;iBAC7G;gBAAC,OAAO,GAAG,EAAE;oBACV,iCAAuB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;iBACvC;gBAED,OAAO,GAAG,CAAC;YACf,CAAC,CAAA,EACD,OAAO,CAAC,OAAO,CAAC,EAAuC,CAAC,CAC3D,CAAC;YAEF,IAAI,eAA0D,CAAC;YAC/D,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAC9B,IAAI,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;oBAC/B,eAAe,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAEhD,IAAI,IAAI,CAAC,aAAa,EAAE;wBACpB,6CAA6C;wBAC7C,eAAe,CAAC,UAAU,GAAG,iBAAO,CAAC,uBAAuB,CACxD,IAAI,CAAC,YAAa,EAClB,6BAA6B,CAAC,IAAI,CAAC,aAAa,CAAC,EACjD,eAAe,CAClB,CAAC;qBACL;oBAED,SAAS;iBACZ;gBAED,IAAI,CAAC,eAAe,EAAE;oBAClB,SAAS;iBACZ;gBAED,yCAAyC;gBACzC,MAAM,yBAAyB,GAAG,iBAAO,CAAC,4BAA4B,CAClE,6BAA6B,CAAC,IAAI,CAAC,aAAc,CAAC,EAClD,IAAI,EACJ,eAAe,CAClB,CAAC;gBAEF,2DAA2D;gBAC3D,MAAM,WAAW,qBAAQ,eAAe,CAAE,CAAC;gBAC3C,WAAW,CAAC,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC;gBAC/B,WAAW,CAAC,UAAU,GAAG,yBAAyB,CAAC;gBACnD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aACpC;YAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACxD,MAAM,IAAI,CAAC,6BAA6B,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YAE1F,gCAAgC;YAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,SAAS,GAAG,GAAG,EAAE,IAAI,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,IAAI,SAAS,EAAE;gBACpF,MAAM,8BAAY,CAAC,qBAAqB,CACpC,IAAI,CAAC,WAAW,EAChB,aAAa,EACb;oBACI,SAAS,EAAE,EAAE;oBACb,YAAY,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;iBACtD,EACD,EAAE,SAAS,EAAE,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,SAAS,EAAE,CAC9C,CAAC;aACL;YAED,yBAAyB;YACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;gBAC7D,iCAAuB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAiB,CAAC,CAAC;aACzE;QACL,CAAC;KAAA;IAEO,6BAA6B,CACjC,oBAAmE,EACnE,UAAmC,EACnC,aAAyC;;QAEzC,IAAI,iBAAiB,GAAyB,EAAE,CAAC;QAEjD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,IAAI,CAAC,CAAA,MAAA,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,0CAAE,gBAAgB,CAAA,EAAE;gBACvD,SAAS;aACZ;YAED,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAE,CAAC;YAC7F,MAAM,wBAAwB,GAAG,IAAI,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7G,IAAI,OAAO,GAAG,SAAS,CAAC,iBAAiB,CAAC;YAC1C,IAAI,SAAS,GAAG,SAAS,CAAC,UAAU,CAAC;YAErC,mEAAmE;YACnE,oEAAoE;YACpE,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,mBAAmB,MAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,mBAAmB,CAAA,EAAE;gBACxE,OAAO,GAAG,YAAY,CAAC,mBAAmB,CAAC;gBAC3C,SAAS,GAAG,YAAY,CAAC,mBAAmB,CAAC;aAChD;YAED,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE;gBACxB,SAAS;aACZ;YAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,kBAAkB;iBAC3C,0BAA0B,CAAC;gBACxB,QAAQ,EAAE,OAAO;gBACjB,UAAU,EAAE,SAAS;gBACrB,kBAAkB,EAAE,wBAAwB;aAC/C,CAAC;iBACD,IAAI,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,KAAK,cAAc,CAAC,CAAC;YAEnD,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC5C;QAED,OAAO,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;CACJ;AApMD,oDAoMC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
2
3
|
import { IUpdateRunsGtfsTripInput } from "../interfaces/IUpdateRunsGtfsTripInput";
|
|
3
4
|
import { UpdateRunsGtfsTripIdValidationSchema } from "../schema/UpdateRunsGtfsTripIdSchema";
|
|
4
5
|
export declare class UpdateRunsGtfsTripIdTask extends AbstractTask<IUpdateRunsGtfsTripInput> {
|
|
@@ -14,7 +15,7 @@ export declare class UpdateRunsGtfsTripIdTask extends AbstractTask<IUpdateRunsGt
|
|
|
14
15
|
/**
|
|
15
16
|
* Process trips from runs data
|
|
16
17
|
*/
|
|
17
|
-
protected execute(data: IUpdateRunsGtfsTripInput): Promise<void>;
|
|
18
|
+
protected execute(data: IUpdateRunsGtfsTripInput, messageProperties?: MessageProperties): Promise<void>;
|
|
18
19
|
/**
|
|
19
20
|
* Process not public trips from runs data
|
|
20
21
|
*/
|
|
@@ -19,11 +19,11 @@ const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
|
19
19
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
20
20
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
21
21
|
const const_1 = require("../../../../../const");
|
|
22
|
+
const PositionsRepository_1 = require("../data-access/PositionsRepository");
|
|
23
|
+
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
22
24
|
const PositionsMapper_1 = __importDefault(require("../data-access/helpers/PositionsMapper"));
|
|
23
25
|
const TripsIdGenerator_1 = __importDefault(require("../data-access/helpers/TripsIdGenerator"));
|
|
24
26
|
const TripsMapper_1 = __importDefault(require("../data-access/helpers/TripsMapper"));
|
|
25
|
-
const PositionsRepository_1 = require("../data-access/PositionsRepository");
|
|
26
|
-
const TripsRepository_1 = require("../data-access/TripsRepository");
|
|
27
27
|
const GTFSTripRunManagerFactory_1 = require("../helpers/gtfs-trip-run/GTFSTripRunManagerFactory");
|
|
28
28
|
const UpdateRunsGtfsTripIdSchema_1 = require("../schema/UpdateRunsGtfsTripIdSchema");
|
|
29
29
|
class UpdateRunsGtfsTripIdTask extends workers_1.AbstractTask {
|
|
@@ -55,7 +55,7 @@ class UpdateRunsGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
55
55
|
/**
|
|
56
56
|
* Process trips from runs data
|
|
57
57
|
*/
|
|
58
|
-
execute(data) {
|
|
58
|
+
execute(data, messageProperties) {
|
|
59
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
60
|
const schedule = yield this.gtfsTripRunManager.setAndReturnScheduledTrips(data.run);
|
|
61
61
|
if (schedule.length === 0) {
|
|
@@ -74,7 +74,9 @@ class UpdateRunsGtfsTripIdTask extends workers_1.AbstractTask {
|
|
|
74
74
|
const delayMsg = yield this.gtfsTripRunManager.generateDelayMsg(schedule, data);
|
|
75
75
|
// send to updateDelay only if there are some trips updated
|
|
76
76
|
if (delayMsg.updatedTrips.length > 0) {
|
|
77
|
-
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", delayMsg
|
|
77
|
+
yield queueprocessors_1.QueueManager.sendMessageToExchange(this.queuePrefix, "updateDelay", delayMsg, {
|
|
78
|
+
timestamp: messageProperties === null || messageProperties === void 0 ? void 0 : messageProperties.timestamp,
|
|
79
|
+
});
|
|
78
80
|
}
|
|
79
81
|
});
|
|
80
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateRunsGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oEAA2E;AAC3E,sFAA2G;AAC3G,2EAAoE;AACpE,2FAAqF;AACrF,2EAA6E;
|
|
1
|
+
{"version":3,"file":"UpdateRunsGtfsTripIdTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateRunsGtfsTripIdTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { ILogger } from "@golemio/core/dist/helpers/logger/LoggerProvider";
|
|
2
|
+
import { MessageProperties } from "amqplib";
|
|
3
|
+
export declare class UpdateDelayLimiter {
|
|
4
|
+
private name;
|
|
5
|
+
private queueTtl;
|
|
6
|
+
private static readonly MAX_SKIPPED_ITERATIONS;
|
|
7
|
+
private skippedIterations;
|
|
8
|
+
private logger;
|
|
9
|
+
constructor(name: string, queueTtl: number, logger?: ILogger);
|
|
10
|
+
isActualMessage(messageProperties: MessageProperties | undefined): boolean;
|
|
11
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UpdateDelayLimiter = void 0;
|
|
4
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
5
|
+
const Di_1 = require("@golemio/core/dist/integration-engine/ioc/Di");
|
|
6
|
+
/* Helper to decide whether initial message is older than the queue TTL, do not continue with processing it.
|
|
7
|
+
* It is expected that older positions will be processed with more actual data.
|
|
8
|
+
*/
|
|
9
|
+
class UpdateDelayLimiter {
|
|
10
|
+
constructor(name, queueTtl, logger) {
|
|
11
|
+
this.name = name;
|
|
12
|
+
this.queueTtl = queueTtl;
|
|
13
|
+
this.skippedIterations = 0;
|
|
14
|
+
this.logger = logger !== null && logger !== void 0 ? logger : Di_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.Logger);
|
|
15
|
+
}
|
|
16
|
+
isActualMessage(messageProperties) {
|
|
17
|
+
if (!messageProperties) {
|
|
18
|
+
this.logger.warn(`[UpdateDelayLimiter] Missing message properties for ${this.name}`);
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
else if (!messageProperties.timestamp) {
|
|
22
|
+
this.logger.warn(`[UpdateDelayLimiter] Missing message timestamp for ${this.name}`);
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
else if (new Date().getTime() - messageProperties.timestamp > this.queueTtl) {
|
|
26
|
+
this.skippedIterations++;
|
|
27
|
+
if (this.skippedIterations > UpdateDelayLimiter.MAX_SKIPPED_ITERATIONS) {
|
|
28
|
+
this.logger.warn(`[UpdateDelayLimiter] Skipped processing of update delay task ${this.skippedIterations} times.`);
|
|
29
|
+
this.skippedIterations = 0;
|
|
30
|
+
}
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.UpdateDelayLimiter = UpdateDelayLimiter;
|
|
37
|
+
UpdateDelayLimiter.MAX_SKIPPED_ITERATIONS = 100;
|
|
38
|
+
//# sourceMappingURL=UpdateDelayLimiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UpdateDelayLimiter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/helpers/UpdateDelayLimiter.ts"],"names":[],"mappings":";;;AAAA,wEAAqE;AAErE,qEAA0F;AAG1F;;GAEG;AACH,MAAa,kBAAkB;IAK3B,YAAoB,IAAY,EAAU,QAAgB,EAAE,MAAgB;QAAxD,SAAI,GAAJ,IAAI,CAAQ;QAAU,aAAQ,GAAR,QAAQ,CAAQ;QAHlD,sBAAiB,GAAG,CAAC,CAAC;QAI1B,IAAI,CAAC,MAAM,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,+BAA0B,CAAC,OAAO,CAAU,qBAAS,CAAC,MAAM,CAAC,CAAC;IAC1F,CAAC;IAEM,eAAe,CAAC,iBAAgD;QACnE,IAAI,CAAC,iBAAiB,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAErF,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE;YACrC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAEpF,OAAO,IAAI,CAAC;SACf;aAAM,IAAI,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAI,iBAAiB,CAAC,SAAoB,GAAG,IAAI,CAAC,QAAQ,EAAE;YACvF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,sBAAsB,EAAE;gBACpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gEAAgE,IAAI,CAAC,iBAAiB,SAAS,CAAC,CAAC;gBAClH,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAC;aAC9B;YAED,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;;AA7BL,gDA8BC;AA7B2B,yCAAsB,GAAG,GAAG,AAAN,CAAO"}
|
|
@@ -733,9 +733,10 @@ Worker má na starost zpracování a transformaci polohových dat, výpočet zpo
|
|
|
733
733
|
|
|
734
734
|
- vstupní rabbitmq fronta
|
|
735
735
|
- název: vehicle-positions.vehiclepositions.updateDelay
|
|
736
|
-
- TTL:
|
|
736
|
+
- TTL: 50 sekund (včetně zpracování v předchozích frontách)
|
|
737
737
|
- parametry: `{ updatedTrips, positions, schedule }`
|
|
738
738
|
- validační schéma: [UpdateDelaySchema](../src/integration-engine/vehicle-positions/workers/vehicle-positions/schema/UpdateDelaySchema.ts)
|
|
739
|
+
- očekává parametrech zprávy `timestamp` s časovou značkou z první fronty, která obdržela nová data např. saveDataToDB
|
|
739
740
|
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
740
741
|
- název: vehicle-positions.vehiclepositions.propagateDelay
|
|
741
742
|
- datové zdroje
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -540,12 +540,6 @@ paths:
|
|
|
540
540
|
type: boolean
|
|
541
541
|
default: false
|
|
542
542
|
example: true
|
|
543
|
-
- name: includePositions
|
|
544
|
-
in: query
|
|
545
|
-
description: Enrich result dataset with positions. Limits the result dataset to 100.
|
|
546
|
-
schema:
|
|
547
|
-
type: boolean
|
|
548
|
-
example: true
|
|
549
543
|
- name: cisTripNumber
|
|
550
544
|
in: query
|
|
551
545
|
description: Filter result by CIS trip number
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.12.
|
|
3
|
+
"version": "2.12.6-rc.1250500832",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@commitlint/cli": "^11.0.0",
|
|
39
39
|
"@commitlint/config-conventional": "^11.0.0",
|
|
40
40
|
"@golemio/cli": "1.5.0",
|
|
41
|
-
"@golemio/core": "1.9.
|
|
41
|
+
"@golemio/core": "1.9.16",
|
|
42
42
|
"@golemio/db-common": "1.1.3",
|
|
43
43
|
"@golemio/eslint-config": "1.1.1",
|
|
44
44
|
"@types/amqplib": "^0.5.17",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@golemio/core": ">=1.7.0"
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.
|
|
80
|
+
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.1-dev.1248990715",
|
|
81
81
|
"@turf/turf": "^6.5.0",
|
|
82
82
|
"cheap-ruler": "^3.0.2",
|
|
83
83
|
"csv-parser": "^3.0.0",
|
|
@@ -85,4 +85,4 @@
|
|
|
85
85
|
"html-entities": "^2.3.3",
|
|
86
86
|
"pg-copy-streams": "^5.1.1"
|
|
87
87
|
}
|
|
88
|
-
}
|
|
88
|
+
}
|