gtfs 4.18.7 → 4.19.0

package/dist/index.d.ts

@@ -619,13 +619,24 @@ interface RunPiece {
     end_trip_id: string;
     end_trip_position: number | null;
 }
+interface ServiceAlertInformedEntity {
+    alert_id: string;
+    stop_id: string | null;
+    route_id: string | null;
+    route_type: number | null;
+    trip_id: string | null;
+    direction_id: number | null;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
+}
 interface ServiceAlert {
     id: string;
+    active_period: string | null;
     cause: string | null;
     effect: string | null;
     url: string | null;
-    start_time: string;
-    end_time: string;
+    start_time: string | null;
+    end_time: string | null;
     header_text: string;
     description_text: string;
     tts_header_text: string | null;
@@ -633,6 +644,7 @@ interface ServiceAlert {
     severity_level: string | null;
     created_timestamp: UnixTimestamp;
     expiration_timestamp: UnixTimestamp;
+    informed_entities: ServiceAlertInformedEntity[];
 }
 interface StopTimeUpdate {
     trip_id: string | null;
@@ -965,7 +977,25 @@ declare function getTripUpdates<Fields extends keyof TripUpdate>(query?: SqlWher
 
 declare function getVehiclePositions<Fields extends keyof VehiclePosition>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<VehiclePosition, Fields>[];
 
-declare function getServiceAlerts<Fields extends keyof ServiceAlert>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<ServiceAlert, Fields>[];
+declare function getServiceAlerts<Fields extends keyof ServiceAlert>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): {
+    informed_entities: ServiceAlertInformedEntity[];
+    start_time: string | null;
+    end_time: string | null;
+    id: string;
+    created_timestamp: UnixTimestamp;
+    expiration_timestamp: UnixTimestamp;
+    active_period: string | null;
+    cause: string | null;
+    effect: string | null;
+    url: string | null;
+    header_text: string;
+    description_text: string;
+    tts_header_text: string | null;
+    tts_description_text: string | null;
+    severity_level: string | null;
+}[];
+
+declare function getServiceAlertInformedEntities<Fields extends keyof ServiceAlertInformedEntity>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<ServiceAlertInformedEntity, Fields>[];
 
 declare function getDeadheads<Fields extends keyof Deadhead>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<Deadhead, Fields>[];
 
@@ -977,4 +1007,4 @@ declare function getRunEvents<Fields extends keyof RunEvent>(query?: SqlWhere, f
 
 declare function getRunsPieces<Fields extends keyof RunPiece>(query?: SqlWhere, fields?: Fields[], orderBy?: SqlOrderBy, options?: QueryOptions): QueryResult<RunPiece, Fields>[];
 
-export { type Agency, type Area, type Attribution, type BoardAlight, type BookingRule, type Calendar, type CalendarAttribute, type CalendarDate, type Config, type ConfigAgency, type Deadhead, type DeadheadTime, type Direction, type FareAttribute, type FareLegRule, type FareMedia, type FareProduct, type FareRule, type FareTransferRule, type FeedInfo, type Frequency, GtfsError, GtfsErrorCategory, GtfsErrorCode, type GtfsWarning, GtfsWarningCode, type ImportReport, type JoinOptions, type Level, type Location, type LocationGroup, type LocationGroupStop, type Model, type ModelColumn, type Network, type OpsLocation, type Pathway, type QueryOptions, type QueryResult, type RideFeedInfo, type RiderCategory, type RiderTrip, type Ridership, type Route, type RouteAttribute, type RouteNetwork, type RunEvent, type RunPiece, type ServiceAlert, type Shape, type SqlOrderBy, type SqlValue, type SqlWhere, type Stop, type StopArea, type StopAttribute, type StopTime, type StopTimeUpdate, type TableNames, type Timeframe, type Timetable, type TimetableNote, type TimetableNotesReference, type TimetablePage, type TimetableStopOrder, type Transfer, type Translation, type Trip, type TripCapacity, type TripUpdate, type TripsDatedVehicleJourney, type UnixTimestamp, type VehiclePosition, advancedQuery, closeDb, deleteDb, exportGtfs, formatGtfsError, generateFolderName, getAgencies, getAreas, getAttributions, getBoardAlights, getBookingRules, getCalendarAttributes, getCalendarDates, getCalendars, getDeadheadTimes, getDeadheads, getDirections, getFareAttributes, getFareLegRules, getFareMedia, getFareProducts, getFareRules, getFareTransferRules, getFeedInfo, getFrequencies, getLevels, getLocationGroupStops, getLocationGroups, getLocations, getNetworks, getOpsLocations, getPathways, getRideFeedInfo, getRiderCategories, getRiderTrips, getRidership, getRouteAttributes, getRouteNetworks, getRoutes, getRunEvents, getRunsPieces, getServiceAlerts, getServiceIdsByDate, getShapes, getShapesAsGeoJSON, getStopAreas, getStopAttributes, getStopTimeUpdates, getStops, getStopsAsGeoJSON, getStoptimes, getTimeframes, getTimetableNotes, getTimetableNotesReferences, getTimetablePages, getTimetableStopOrders, getTimetables, getTransfers, getTranslations, getTripCapacities, getTripUpdates, getTrips, getTripsDatedVehicleJourneys, getVehiclePositions, importGtfs, isGtfsError, isGtfsValidationError, openDb, prepDirectory, untildify, unzip, updateGtfsRealtime };
+export { type Agency, type Area, type Attribution, type BoardAlight, type BookingRule, type Calendar, type CalendarAttribute, type CalendarDate, type Config, type ConfigAgency, type Deadhead, type DeadheadTime, type Direction, type FareAttribute, type FareLegRule, type FareMedia, type FareProduct, type FareRule, type FareTransferRule, type FeedInfo, type Frequency, GtfsError, GtfsErrorCategory, GtfsErrorCode, type GtfsWarning, GtfsWarningCode, type ImportReport, type JoinOptions, type Level, type Location, type LocationGroup, type LocationGroupStop, type Model, type ModelColumn, type Network, type OpsLocation, type Pathway, type QueryOptions, type QueryResult, type RideFeedInfo, type RiderCategory, type RiderTrip, type Ridership, type Route, type RouteAttribute, type RouteNetwork, type RunEvent, type RunPiece, type ServiceAlert, type ServiceAlertInformedEntity, type Shape, type SqlOrderBy, type SqlValue, type SqlWhere, type Stop, type StopArea, type StopAttribute, type StopTime, type StopTimeUpdate, type TableNames, type Timeframe, type Timetable, type TimetableNote, type TimetableNotesReference, type TimetablePage, type TimetableStopOrder, type Transfer, type Translation, type Trip, type TripCapacity, type TripUpdate, type TripsDatedVehicleJourney, type UnixTimestamp, type VehiclePosition, advancedQuery, closeDb, deleteDb, exportGtfs, formatGtfsError, generateFolderName, getAgencies, getAreas, getAttributions, getBoardAlights, getBookingRules, getCalendarAttributes, getCalendarDates, getCalendars, getDeadheadTimes, getDeadheads, getDirections, getFareAttributes, getFareLegRules, getFareMedia, getFareProducts, getFareRules, getFareTransferRules, getFeedInfo, getFrequencies, getLevels, getLocationGroupStops, getLocationGroups, getLocations, getNetworks, getOpsLocations, getPathways, getRideFeedInfo, getRiderCategories, getRiderTrips, getRidership, getRouteAttributes, getRouteNetworks, getRoutes, getRunEvents, getRunsPieces, getServiceAlertInformedEntities, getServiceAlerts, getServiceIdsByDate, getShapes, getShapesAsGeoJSON, getStopAreas, getStopAttributes, getStopTimeUpdates, getStops, getStopsAsGeoJSON, getStoptimes, getTimeframes, getTimetableNotes, getTimetableNotesReferences, getTimetablePages, getTimetableStopOrders, getTimetables, getTransfers, getTranslations, getTripCapacities, getTripUpdates, getTrips, getTripsDatedVehicleJourneys, getVehiclePositions, importGtfs, isGtfsError, isGtfsValidationError, openDb, prepDirectory, untildify, unzip, updateGtfsRealtime };

package/dist/index.js

@@ -1006,6 +1006,7 @@ var routes = {
     {
       name: "agency_id",
       type: "text",
+      index: true,
       prefix: true
     },
     {
@@ -1258,7 +1259,8 @@ var stops = {
     },
     {
       name: "stop_code",
-      type: "text"
+      type: "text",
+      index: true
     },
     {
       name: "stop_name",
@@ -2760,16 +2762,14 @@ var serviceAlerts = {
     {
       name: "start_time",
       type: "text",
-      required: true,
       source: "alert.activePeriod[0].start",
-      default: ""
+      default: null
     },
     {
       name: "end_time",
       type: "text",
-      required: true,
       source: "alert.activePeriod[0].end",
-      default: ""
+      default: null
     },
     {
       name: "header_text",
@@ -2829,7 +2829,7 @@ var serviceAlertInformedEntities = {
     {
       name: "stop_id",
       type: "text",
-      index: true,
+      primary: true,
       source: "stopId",
       default: null,
       prefix: true
@@ -2837,7 +2837,7 @@ var serviceAlertInformedEntities = {
     {
       name: "route_id",
       type: "text",
-      index: true,
+      primary: true,
       source: "routeId",
       default: null,
       prefix: true
@@ -2845,14 +2845,14 @@ var serviceAlertInformedEntities = {
     {
       name: "route_type",
       type: "integer",
-      index: true,
+      primary: true,
       source: "routeType",
       default: null
     },
     {
       name: "trip_id",
       type: "text",
-      index: true,
+      primary: true,
       source: "trip.tripId",
       default: null,
       prefix: true
@@ -2860,7 +2860,7 @@ var serviceAlertInformedEntities = {
     {
       name: "direction_id",
       type: "integer",
-      index: true,
+      primary: true,
       source: "directionId",
       default: null
     },
@@ -3377,7 +3377,8 @@ var passengerEvents = {
     {
       name: "trip_stop_sequence",
       type: "integer",
-      min: 1
+      min: 1,
+      required: true
     },
     {
       name: "scheduled_stop_sequence",
@@ -3603,7 +3604,8 @@ var stopVisits = {
     },
     {
       name: "ramp_deployed_time",
-      type: "text"
+      type: "real",
+      min: 0
     },
     {
       name: "ramp_failure",
@@ -3611,12 +3613,12 @@ var stopVisits = {
     },
     {
       name: "kneel_deployed_time",
-      type: "integer",
+      type: "real",
       min: 0
     },
     {
       name: "lift_deployed_time",
-      type: "integer",
+      type: "real",
       min: 0
     },
     {
@@ -4278,7 +4280,9 @@ function deleteDb(db = null) {
     db = dbs[Object.keys(dbs)[0]];
   }
   db.close();
-  fs.unlinkSync(db.name);
+  if (db.name !== ":memory:") {
+    fs.unlinkSync(db.name);
+  }
   delete dbs[db.name];
 }
 
@@ -4588,7 +4592,7 @@ function getTimestampColumnName(columnName) {
   return columnName.endsWith("time") ? `${columnName}stamp` : `${columnName}_timestamp`;
 }
 function applyPrefixToValue(value, columnShouldBePrefixed, prefix) {
-  if (!columnShouldBePrefixed || prefix === void 0 || value === null) {
+  if (!columnShouldBePrefixed || prefix === void 0 || value === null || value === void 0) {
     return value;
   }
   return `${prefix}${value}`;
@@ -4651,13 +4655,15 @@ async function fetchGtfsRealtimeData(type, task) {
     try {
       const response = await fetch(urlConfig.url, {
         method: "GET",
+        redirect: "follow",
         headers: {
+          "User-Agent": "node-gtfs",
           ...urlConfig.headers ?? {},
           "Accept-Encoding": "gzip"
         },
         signal: task.downloadTimeout ? AbortSignal.timeout(task.downloadTimeout) : void 0
       });
-      if (response.status !== 200) {
+      if (!response.ok) {
         throw new GtfsError(`HTTP ${response.status}: ${response.statusText}`, {
           code: "GTFS_DOWNLOAD_HTTP" /* GTFS_DOWNLOAD_HTTP */,
           category: "download" /* DOWNLOAD */,
@@ -4730,12 +4736,17 @@ function createServiceAlertsProcessor(db, task) {
     db,
     serviceAlertInformedEntities
   );
+  const deleteInformedEntitiesStmt = db.prepare(
+    `DELETE FROM ${serviceAlertInformedEntities.filenameBase} WHERE alert_id = ?`
+  );
   return async (batch) => {
     let recordCount = 0;
     let errorCount = 0;
     db.transaction(() => {
       for (const entity of batch) {
         try {
+          const alertId = applyPrefixToValue(entity.id, true, task.prefix);
+          deleteInformedEntitiesStmt.run(alertId);
           const alertValues = serviceAlerts.schema.map((column) => prepareRealtimeFieldValue(entity, column, task));
           alertStmt.run(alertValues);
           recordCount++;
@@ -4768,6 +4779,9 @@ function createTripUpdatesProcessor(db, task) {
     db,
     stopTimeUpdates
   );
+  const deleteStopTimesByTripStmt = db.prepare(
+    `DELETE FROM ${stopTimeUpdates.filenameBase} WHERE trip_id = ? AND trip_start_time IS ?`
+  );
   return async (batch) => {
     let recordCount = 0;
     let errorCount = 0;
@@ -4778,6 +4792,15 @@ function createTripUpdatesProcessor(db, task) {
           tripUpdateStmt.run(tripUpdateValues);
           recordCount++;
           if (entity.tripUpdate?.stopTimeUpdate?.length) {
+            const tripId = applyPrefixToValue(
+              entity.tripUpdate?.trip?.tripId ?? null,
+              true,
+              task.prefix
+            );
+            const tripStartTime = entity.tripUpdate?.trip?.startTime ?? null;
+            if (tripId !== null) {
+              deleteStopTimesByTripStmt.run(tripId, tripStartTime);
+            }
             for (const stopTimeUpdate of entity.tripUpdate.stopTimeUpdate) {
               stopTimeUpdate.parent = entity;
               const stopTimeValues = stopTimeUpdates.schema.map(
@@ -4857,41 +4880,30 @@ async function updateGtfsRealtimeData(task) {
     tripupdates: 0,
     vehiclepositions: 0
   };
-  const processingPromises = [];
   if (alertsData?.entity?.length) {
-    processingPromises.push(
-      processBatch(
-        alertsData.entity,
-        BATCH_SIZE,
-        createServiceAlertsProcessor(db, task)
-      ).then((result) => {
-        recordCounts.alerts = result.recordCount;
-      })
+    const result = await processBatch(
+      alertsData.entity,
+      BATCH_SIZE,
+      createServiceAlertsProcessor(db, task)
     );
+    recordCounts.alerts = result.recordCount;
   }
   if (tripUpdatesData?.entity?.length) {
-    processingPromises.push(
-      processBatch(
-        tripUpdatesData.entity,
-        BATCH_SIZE,
-        createTripUpdatesProcessor(db, task)
-      ).then((result) => {
-        recordCounts.tripupdates = result.recordCount;
-      })
+    const result = await processBatch(
+      tripUpdatesData.entity,
+      BATCH_SIZE,
+      createTripUpdatesProcessor(db, task)
     );
+    recordCounts.tripupdates = result.recordCount;
   }
   if (vehiclePositionsData?.entity?.length) {
-    processingPromises.push(
-      processBatch(
-        vehiclePositionsData.entity,
-        BATCH_SIZE,
-        createVehiclePositionsProcessor(db, task)
-      ).then((result) => {
-        recordCounts.vehiclepositions = result.recordCount;
-      })
+    const result = await processBatch(
+      vehiclePositionsData.entity,
+      BATCH_SIZE,
+      createVehiclePositionsProcessor(db, task)
     );
+    recordCounts.vehiclepositions = result.recordCount;
   }
-  await Promise.all(processingPromises);
   task.log(
     `GTFS-Realtime import complete: ${recordCounts.alerts} alerts, ${recordCounts.tripupdates} trip updates, ${recordCounts.vehiclepositions} vehicle positions`
   );
@@ -5000,10 +5012,14 @@ var downloadGtfsFiles = async (task) => {
   try {
     const response = await fetch(task.url, {
       method: "GET",
-      headers: task.headers || {},
+      redirect: "follow",
+      headers: {
+        "User-Agent": "node-gtfs",
+        ...task.headers
+      },
       signal: task.downloadTimeout ? AbortSignal.timeout(task.downloadTimeout) : void 0
     });
-    if (response.status !== 200) {
+    if (!response.ok) {
       throw new GtfsError(
         `Unable to download GTFS from ${task.url}. Got status ${response.status}.`,
         {
@@ -5116,18 +5132,18 @@ var extractGtfsFiles = async (task) => {
 var createGtfsTables = (db) => {
   for (const model of Object.values(models_exports)) {
     if (!model.schema) {
-      return;
+      continue;
     }
     const sqlColumnCreateStatements = [];
     for (const column of model.schema) {
       const checks = [];
-      if (column.min !== void 0 && column.max) {
+      if (column.min !== void 0 && column.max !== void 0) {
         checks.push(
           `${column.name} >= ${column.min} AND ${column.name} <= ${column.max}`
         );
-      } else if (column.min) {
+      } else if (column.min !== void 0) {
         checks.push(`${column.name} >= ${column.min}`);
-      } else if (column.max) {
+      } else if (column.max !== void 0) {
         checks.push(`${column.name} <= ${column.max}`);
       }
       if (column.type === "integer") {
@@ -5176,7 +5192,7 @@ var createGtfsTables = (db) => {
 var createGtfsIndexes = (db) => {
   for (const model of Object.values(models_exports)) {
     if (!model.schema) {
-      return;
+      continue;
     }
     for (const column of model.schema) {
       if (column.index) {
@@ -6308,7 +6324,7 @@ function getStopsAsGeoJSON(query = {}, options = {}) {
         routes2,
         (route) => route?.route_short_name ? Number.parseInt(route.route_short_name, 10) : 0
       ),
-      agency_name: agencies[0].agency_name
+      agency_name: agencies[0]?.agency_name ?? null
     };
   });
   const filteredStops = preparedStops.filter((stop) => stop.routes.length > 0);
@@ -6637,15 +6653,66 @@ function getVehiclePositions(query = {}, fields = [], orderBy2 = [], options = {
 }
 
 // src/lib/gtfs-realtime/service-alerts.ts
+var ENTITY_COLUMNS = /* @__PURE__ */ new Set([
+  "alert_id",
+  "stop_id",
+  "route_id",
+  "route_type",
+  "trip_id",
+  "direction_id"
+]);
 function getServiceAlerts(query = {}, fields = [], orderBy2 = [], options = {}) {
   const db = options.db ?? openDb();
   const tableName = "service_alerts";
   const joinTableName = "service_alert_informed_entities";
   const selectClause = formatSelectClause(fields);
+  const orderByClause = formatOrderByClause(orderBy2);
+  const alertQuery = {};
+  const entityQuery = {};
+  for (const [key, value] of Object.entries(query)) {
+    if (ENTITY_COLUMNS.has(key)) {
+      entityQuery[key] = value;
+    } else {
+      alertQuery[key] = value;
+    }
+  }
+  const whereClause = formatWhereClauses(alertQuery);
+  const alerts = db.prepare(
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
+  ).all();
+  const alertIds = alerts.map((alert) => alert.id);
+  if (alertIds.length === 0) {
+    return [];
+  }
+  const alertIdPlaceholders = alertIds.map(() => "?").join(", ");
+  const entityFilterClause = formatWhereClauses(entityQuery);
+  const entityWhereClause = entityFilterClause ? `${entityFilterClause} AND alert_id IN (${alertIdPlaceholders})` : `WHERE alert_id IN (${alertIdPlaceholders})`;
+  const entities = db.prepare(`SELECT * FROM ${joinTableName} ${entityWhereClause};`).all(...alertIds);
+  const entitiesByAlertId = /* @__PURE__ */ new Map();
+  for (const entity of entities) {
+    const group = entitiesByAlertId.get(entity.alert_id);
+    if (group) {
+      group.push(entity);
+    } else {
+      entitiesByAlertId.set(entity.alert_id, [entity]);
+    }
+  }
+  const matchedAlerts = Object.keys(entityQuery).length > 0 ? alerts.filter((alert) => entitiesByAlertId.has(alert.id)) : alerts;
+  return matchedAlerts.map((alert) => ({
+    ...alert,
+    informed_entities: entitiesByAlertId.get(alert.id) ?? []
+  }));
+}
+
+// src/lib/gtfs-realtime/service-alert-informed-entities.ts
+function getServiceAlertInformedEntities(query = {}, fields = [], orderBy2 = [], options = {}) {
+  const db = options.db ?? openDb();
+  const tableName = "service_alert_informed_entities";
+  const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy2);
   return db.prepare(
-    `${selectClause} FROM ${tableName} INNER JOIN ${joinTableName} ON ${tableName}.id=${joinTableName}.alert_id ${whereClause} ${orderByClause};`
+    `${selectClause} FROM ${tableName} ${whereClause} ${orderByClause};`
   ).all();
 }
 
@@ -6754,6 +6821,7 @@ export {
   getRoutes,
   getRunEvents,
   getRunsPieces,
+  getServiceAlertInformedEntities,
   getServiceAlerts,
   getServiceIdsByDate,
   getShapes,