gtfs 4.0.0 → 4.0.2

package/@types/index.d.ts

@@ -1,5 +1,7 @@
 import CsvParse = require('csv-parse');
 
+import Database = require('better-sqlite3');
+
 import { FeatureCollection, Geometry } from '@turf/helpers';
 
 export {}; // disable implicit exporting of types
@@ -19,7 +21,7 @@ export type SqlSelect = string[];
 
 export type SqlOrderBy = Array<[string, 'ASC' | 'DESC']>;
 
-export type JoinTables = Array<JoinOptions>;
+export type JoinTables = JoinOptions[];
 
 export type SqlResults = Array<Record<string, any>>;
 
@@ -29,25 +31,26 @@ export type SqlTableName = string;
 
 export type Config = ExportConfig & ImportConfig;
 
-export type AdvancedQueryOptions = {
+export interface AdvancedQueryOptions {
   /**
-   * An advanced query
+   * Queries the database with support for table joins and custom tables and returns an array of data.
    */
   query?: SqlWhere;
   fields?: SqlSelect;
   orderBy?: SqlOrderBy;
-  join?: Array<JoinOptions>;
+  join?: JoinOptions[];
   options?: QueryOptions;
-};
+}
 
-export type JoinOptions = {
+export interface JoinOptions {
   /**
    * Options for joining, type
    */
   type?: 'LEFT OUTER' | 'INNER';
   table: string;
   on: string;
-};
+}
+
 interface VerboseConfig {
   /**
    * Whether or not to print output to the console. Defaults to true.
@@ -57,7 +60,7 @@ interface VerboseConfig {
 
 export interface DbConfig {
   /**
-   * A path to an SQLite database. Defaults to using an in-memory database.
+   * A path to a SQLite database. Defaults to using an in-memory database.
    */
   sqlitePath?: string;
 }
@@ -71,7 +74,7 @@ export interface ExportConfig extends DbConfig, VerboseConfig {
 
 export interface ImportConfig extends DbConfig, VerboseConfig {
   /**
-   * An array of GTFS files to be imported.
+   * An array of agencies with GTFS files to be imported.
    */
   agencies: Array<{
     /**
@@ -114,11 +117,11 @@ export interface ImportConfig extends DbConfig, VerboseConfig {
 }
 
 export interface QueryOptions {
-  db?: SqlDatabase;
+  db?: Database.Database;
 }
 
 /**
- * Use exportGtfs() in your code to run an export of a GTFS file specified in a config.json file.
+ * Use exportGtfs() in your code to run an export of a GTFS from SQLite specified in a config.json file.
  */
 export function exportGtfs(config: ExportConfig): Promise<void>;
 
@@ -133,17 +136,17 @@ export function importGtfs(config: ImportConfig): Promise<void>;
 export function updateGtfsRealtime(config: ImportConfig): Promise<void>;
 
 /**
- * Open database before making any queries.
+ * Opens the database specified in the config object.
  */
-export function openDb(config: DbConfig): Promise<SqlDatabase>;
+export function openDb(config: DbConfig): Database.Database;
 
 /**
- * Closes open database.
+ * Closes the specified database.
  */
-export function closeDb(db?: SqlDatabase): Promise<void>;
+export function closeDb(db?: Database.Database): void;
 
 /**
- * Queries agencies and returns a promise for an array of agencies.
+ * Returns an array of agencies that match query parameters.
  */
 export function getAgencies(
   query?: SqlWhere,
@@ -153,7 +156,17 @@ export function getAgencies(
 ): SqlResults;
 
 /**
- * Queries attributions and returns a promise for an array of attributions.
+ * Returns an array of areas that match query parameters.
+ */
+export function getAreas(
+  query?: SqlWhere,
+  fields?: SqlSelect,
+  sortBy?: SqlOrderBy,
+  options?: QueryOptions
+): SqlResults;
+
+/**
+ * Returns an array of attributions that match query parameters.
  */
 export function getAttributions(
   query?: SqlWhere,
@@ -163,7 +176,7 @@ export function getAttributions(
 ): SqlResults;
 
 /**
- * Queries routes and returns a promise for an array of routes.
+ * Returns an array of routes that match query parameters.
  */
 export function getRoutes(
   query?: SqlWhere,
@@ -173,7 +186,7 @@ export function getRoutes(
 ): SqlResults;
 
 /**
- * Queries stops and returns a promise for an array of stops.
+ * Returns an array of stops that match query parameters.
  */
 export function getStops(
   query?: SqlWhere,
@@ -183,7 +196,7 @@ export function getStops(
 ): SqlResults;
 
 /**
- * Queries stops and returns a promise for an geoJSON object of stops.
+ * Returns geoJSON object of stops that match query parameters.
  * All valid queries for `getStops()` work for `getStopsAsGeoJSON()`.
  */
 export function getStopsAsGeoJSON(
@@ -192,7 +205,7 @@ export function getStopsAsGeoJSON(
 ): Promise<FeatureCollection<Geometry, { [name: string]: any }>>;
 
 /**
- * Queries `stop_times` and returns a promise for an array of stop_times.
+ * Returns an array of stop_times that match query parameters.
  */
 export function getStoptimes(
   query?: SqlWhere,
@@ -202,7 +215,7 @@ export function getStoptimes(
 ): SqlResults;
 
 /**
- * Queries trips and returns a promise for an array of trips.
+ * Returns an array of trips that match query parameters.
  */
 export function getTrips(
   query?: SqlWhere,
@@ -212,7 +225,7 @@ export function getTrips(
 ): SqlResults;
 
 /**
- * Queries shapes and returns a promise for an array of shapes.
+ * Returns an array of shapes that match query parameters.
  */
 export function getShapes(
   query?: SqlWhere,
@@ -222,16 +235,16 @@ export function getShapes(
 ): SqlResults;
 
 /**
- * Queries shapes and returns a promise for an geoJSON object of shapes.
+ * Returns a geoJSON object of shapes that match query parameters.
  * All valid queries for `getShapes()` work for `getShapesAsGeoJSON()`.
  */
 export function getShapesAsGeoJSON(
   query?: SqlWhere,
   options?: QueryOptions
-): Promise<FeatureCollection<Geometry, { [name: string]: any }>>;
+): FeatureCollection<Geometry, { [name: string]: any }>;
 
 /**
- * Queries calendars and returns a promise for an array of calendars.
+ * Returns an array of calendars that match query parameters.
  */
 export function getCalendars(
   query?: SqlWhere,
@@ -241,7 +254,7 @@ export function getCalendars(
 ): SqlResults;
 
 /**
- * Queries calendar_dates and returns a promise for an array of calendar_dates.
+ * Returns an array of calendar_dates that match query parameters.
  */
 export function getCalendarDates(
   query?: SqlWhere,
@@ -251,7 +264,7 @@ export function getCalendarDates(
 ): SqlResults;
 
 /**
- * Queries fare_attributes and returns a promise for an array of fare_attributes.
+ * Returns an array of fare_attributes that match query parameters.
  */
 export function getFareAttributes(
   query?: SqlWhere,
@@ -261,9 +274,9 @@ export function getFareAttributes(
 ): SqlResults;
 
 /**
- * Queries fare_rules and returns a promise for an array of fare_rules.
+ * Returns an array of fare_leg_rules that match query parameters.
  */
-export function getFareRules(
+export function getFareLegRules(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -271,9 +284,9 @@ export function getFareRules(
 ): SqlResults;
 
 /**
- * Queries feed_info and returns a promise for an array of feed_infos.
+ * Returns an array of fare_products that match query parameters.
  */
-export function getFeedInfo(
+export function getFareProducts(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -281,9 +294,9 @@ export function getFeedInfo(
 ): SqlResults;
 
 /**
- * Queries frequencies and returns a promise for an array of frequencies.
+ * Returns an array of fare_rules that match query parameters.
  */
-export function getFrequencies(
+export function getFareRules(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -291,9 +304,9 @@ export function getFrequencies(
 ): SqlResults;
 
 /**
- * Queries levels and returns a promise for an array of levels.
+ * Returns an array of fare_transfer_rules that match query parameters.
  */
-export function getLevels(
+export function getFareTransferRules(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -301,9 +314,9 @@ export function getLevels(
 ): SqlResults;
 
 /**
- * Queries pathways and returns a promise for an array of pathways.
+ * Returns an array of feed_info that match query parameters.
  */
-export function getPathways(
+export function getFeedInfo(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -311,9 +324,9 @@ export function getPathways(
 ): SqlResults;
 
 /**
- * Queries transfers and returns a promise for an array of transfers.
+ * Returns an array of frequencies that match query parameters.
  */
-export function getTransfers(
+export function getFrequencies(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -321,9 +334,9 @@ export function getTransfers(
 ): SqlResults;
 
 /**
- * Queries translations and returns a promise for an array of translations.
+ * Returns an array of levels that match query parameters.
  */
-export function getTranslations(
+export function getLevels(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -331,10 +344,9 @@ export function getTranslations(
 ): SqlResults;
 
 /**
- * Queries directions and returns a promise for an array of directions.
- * These are from the non-standard `directions.txt` file.
+ * Returns an array of pathways that match query parameters.
  */
-export function getDirections(
+export function getPathways(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -342,10 +354,9 @@ export function getDirections(
 ): SqlResults;
 
 /**
- * Queries stop_attributes and returns a promise for an array of stop_attributes.
- * These are from the non-standard `stop_attributes.txt` file.
+ * Returns an array of transfers that match query parameters.
  */
-export function getStopAttributes(
+export function getTransfers(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -353,10 +364,9 @@ export function getStopAttributes(
 ): SqlResults;
 
 /**
- * Queries timetables and returns a promise for an array of timetables.
- * These are from the non-standard `timetables.txt` file.
+ * Returns an array of translations that match query parameters.
  */
-export function getTimetables(
+export function getTranslations(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -364,10 +374,9 @@ export function getTimetables(
 ): SqlResults;
 
 /**
- * Queries timetable_stop_orders and returns a promise for an array of timetable_stop_orders.
- * These are from the non-standard `timetable_stop_order.txt` file.
+ * Returns an array of stop_areas that match query parameters.
  */
-export function getTimetableStopOrders(
+export function getStopAreas(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -375,10 +384,10 @@ export function getTimetableStopOrders(
 ): SqlResults;
 
 /**
- * Queries timetable_pages and returns a promise for an array of timetable_pages.
- * These are from the non-standard `timetable_pages.txt` file.
+ * Returns an array of directions that match query parameters.
+ * This is for the non-standard `directions.txt` file.
  */
-export function getTimetablePages(
+export function getDirections(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -386,10 +395,10 @@ export function getTimetablePages(
 ): SqlResults;
 
 /**
- * Queries timetable_notes and returns a promise for an array of timetable_notes.
- * These are from the non-standard `timetable_notes.txt` file.
+ * Returns an array of stop_attributes that match query parameters.
+ * This is for the non-standard `stop_attributes.txt` file.
  */
-export function getTimetableNotes(
+export function getStopAttributes(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -397,10 +406,10 @@ export function getTimetableNotes(
 ): SqlResults;
 
 /**
- * Queries timetable_notes_references and returns a promise for an array of timetable_notes references.
- * These are from the non-standard `timetable_notes_references.txt` file.
+ * Returns an array of timetables that match query parameters.
+ * This is for the non-standard `timetables.txt` file used in GTFS-to-HTML.
  */
-export function getTimetableNotesReferences(
+export function getTimetables(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -408,9 +417,10 @@ export function getTimetableNotesReferences(
 ): SqlResults;
 
 /**
- * Queries board-alights and returns a promise for an array of board-alights.
+ * Returns an array of timetable_stop_orders that match query parameters.
+ * This is for the non-standard `timetable_stop_order.txt` file used in GTFS-to-HTML.
  */
-export function getBoardAlights(
+export function getTimetableStopOrders(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -418,9 +428,10 @@ export function getBoardAlights(
 ): SqlResults;
 
 /**
- * Queries ride-feed-info and returns a promise for an array of ride-feed-info.
+ * Returns an array of timetable_pages that match query parameters.
+ * This is for the non-standard `timetable_pages.txt` file used in GTFS-to-HTML.
  */
-export function getRideFeedInfos(
+export function getTimetablePages(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -428,9 +439,10 @@ export function getRideFeedInfos(
 ): SqlResults;
 
 /**
- * Queries rider trips and returns a promise for an array of rider trips.
+ * Returns an array of timetable_notes that match query parameters.
+ * This is for the non-standard `timetable_notes.txt` file used in GTFS-to-HTML.
  */
-export function getRiderTrips(
+export function getTimetableNotes(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -438,9 +450,10 @@ export function getRiderTrips(
 ): SqlResults;
 
 /**
- * Queries riderships and returns a promise for an array of riderships.
+ * Returns an array of timetable_notes_references that match query parameters.
+ * This is for the non-standard `timetable_notes_references.txt` file used in GTFS-to-HTML.
  */
-export function getRiderships(
+export function getTimetableNotesReferences(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -448,9 +461,10 @@ export function getRiderships(
 ): SqlResults;
 
 /**
- * Queries trip-capacities and returns a promise for an array of trip-capacities.
+ * Returns an array of trips_dated_vehicle_journey that match query parameters.
+ * This is for the non-standard `trips_dated_vehicle_journey.txt` file.
  */
-export function getTripCapacities(
+export function getTripsDatedVehicleJourneys(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -458,7 +472,8 @@ export function getTripCapacities(
 ): SqlResults;
 
 /**
- * Queries trip-capacities and returns a promise for an array of service-alerts.
+ * Returns an array of GTFS Realtime service alerts that match query parameters.
+ * This only works if you configure GTFS Realtime import in node-gtfs.
  */
 export function getServiceAlerts(
   query?: SqlWhere,
@@ -468,7 +483,8 @@ export function getServiceAlerts(
 ): SqlResults;
 
 /**
- * Queries trip-capacities and returns a promise for an array of trip-updates.
+ * Returns an array of GTFS Realtime trip updates that match query parameters.
+ * This only works if you configure GTFS Realtime import in node-gtfs.
  */
 export function getTripUpdates(
   query?: SqlWhere,
@@ -478,9 +494,10 @@ export function getTripUpdates(
 ): SqlResults;
 
 /**
- * Queries trip-capacities and returns a promise for an array of vehicle-positions.
+ * Returns an array of GTFS Realtime stop time updates that match query parameters.
+ * This only works if you configure GTFS Realtime import in node-gtfs.
  */
-export function getVehiclePositions(
+export function getStopTimesUpdates(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,
@@ -488,9 +505,10 @@ export function getVehiclePositions(
 ): SqlResults;
 
 /**
- * Queries trip-capacities and returns a promise for an array of stop-times-updates.
+ * Returns an array of GTFS Realtime vehicle positions that match query parameters.
+ * This only works if you configure GTFS Realtime import in node-gtfs.
  */
-export function getStopTimesUpdates(
+export function getVehiclePositions(
   query?: SqlWhere,
   fields?: SqlSelect,
   sortBy?: SqlOrderBy,

package/@types/tests.ts

@@ -22,7 +22,7 @@ import {
 
   await exportGtfs(config); // $ExpectType void
 
-  openDb(config); // $ExpectType Database<Database, Statement>
+  openDb(config); // $ExpectType Database
 
   const results = getAgencies();
   results[0]; // $ExpectType Record<string, any>

package/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.2] - 2023-01-15
+
+### Changed
+
+- In getStopsAsGeoJSON only return stops that are part of a route.
+
+### Updated
+
+- Dependency updates
+
+## [4.0.1] - 2022-12-31
+
+### Updated
+
+- Update types info
+- Improved readme
+- Improved queries
+
 ## [4.0.0] - 2022-12-30
 
 ### Changed

package/README.md

@@ -688,7 +688,7 @@ const stops = getStops({
 });
 ```
 
-### getStopsAsGeoJSON(query)
+### getStopsAsGeoJSON(query, options)
 
 Returns geoJSON object of stops that match query parameters. All valid queries for `getStops()` work for `getStopsAsGeoJSON()`.
 
@@ -800,7 +800,7 @@ const shapes = getShapes({
 });
 ```
 
-### getShapesAsGeoJSON(query)
+### getShapesAsGeoJSON(query, options)
 
 Returns a geoJSON object of shapes that match query parameters. All valid queries for `getShapes()` work for `getShapesAsGeoJSON()`.
 
@@ -1237,23 +1237,24 @@ import { openDb } from 'gtfs';
 const db = openDb(config);
 
 // Get a specific trip
-const statement = db.prepare('SELECT * FROM trips WHERE trip_id = ?');
-const trip = statement.get('123');
+const trip = db.prepare('SELECT * FROM trips WHERE trip_id = ?').get('123');
 
 // Get all stops
 const stops = db.prepare('SELECT * from stops').all();
 
 // Get all calendar_ids for specific date
-const statement = db.prepare(
-  'SELECT service_id from calendar WHERE start_date <= $date AND end_date >= $date'
-);
-const calendarIds = statement.all({ date: 20150101 });
+const calendarIds = db
+  .prepare(
+    'SELECT service_id from calendar WHERE start_date <= $date AND end_date >= $date'
+  )
+  .all({ date: 20150101 });
 
 // Find all stops for route_id=18 by joining tables
-const statement = db.prepare(
-  'SELECT DISTINCT stops.stop_id from stops INNER JOIN stop_times ON stops.stop_id = stop_times.stop_id INNER JOIN trips on trips.trip_id = stop_times.trip_id WHERE trips.route_id = ?'
-);
-const calendarIds = statement.all('18');
+const stopIds = db
+  .prepare(
+    'SELECT DISTINCT stops.stop_id from stops INNER JOIN stop_times ON stops.stop_id = stop_times.stop_id INNER JOIN trips on trips.trip_id = stop_times.trip_id WHERE trips.route_id = ?'
+  )
+  .all('18');
 
 // Execute raw SQL
 const sql = "DELETE FROM trips where trip_id = '329'";

package/config-sample-rtupdates.json

@@ -1,28 +1,16 @@
 {
   "agencies": [
     {
-      "url": "http://www.bart.gov/dev/schedules/google_transit.zip",
-      "exclude": ["shapes"],
+      "url": "https://marintransit.org/data/google_transit.zip",
       "realtimeUrls": [
-        "https://opendata.samtrafiken.se/gtfs-rt/sl/TripUpdates.pb?key=yourkey",
-        "https://opendata.samtrafiken.se/gtfs-rt/sl/VehiclePositions.pb?key=yourkey",
-        "https://opendata.samtrafiken.se/gtfs-rt/sl/ServiceAlerts.pb?key=yourkey"
-      ],
-      "realtimeHeaders": {
-        "X-CustomHeader": "MyCustomHeader"
-      },
-      "headers": {
-        "X-CustomHeader": "MyCustomHeader"
-      }
-    },
-    {
-      "path": "/path/to/gtfs.zip",
-      "exclude": ["stop_times", "shapes"]
+        "https://marintransit.net/gtfs-rt/alerts",
+        "https://marintransit.net/gtfs-rt/tripupdates",
+        "https://marintransit.net/gtfs-rt/vehiclepositions"
+      ]
     }
   ],
   "csvOptions": {
     "skip_lines_with_error": true
   },
-  "sqlitePath": "/tmp/gtfs",
-  "exportPath": "~/path/to/export/gtfs"
+  "sqlitePath": "/tmp/gtfs"
 }

package/lib/db.js

@@ -27,6 +27,12 @@ export function openDb(config) {
     return dbs[filename];
   }
 
+  if (Object.keys(dbs).length > 1) {
+    throw new Error(
+      'Multiple databases open, please specify which one to use.'
+    );
+  }
+
   throw new Error('Unable to find database connection.');
 }
 

package/lib/gtfs/stops.js

@@ -87,7 +87,7 @@ export function getStopsAsGeoJSON(query = {}, options = {}) {
       'SELECT DISTINCT route_id FROM trips WHERE trip_id IN (SELECT DISTINCT trip_id FROM stop_times WHERE stop_id = ?)';
     const routes = db
       .prepare(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`)
-      .run(stop.stop_id);
+      .all(stop.stop_id);
 
     stop.routes = orderBy(routes, (route) =>
       Number.parseInt(route.route_short_name, 10)
@@ -97,5 +97,8 @@ export function getStopsAsGeoJSON(query = {}, options = {}) {
     return stop;
   });
 
-  return stopsToGeoJSON(preparedStops);
+  // Exclude stops not part of any route
+  const filteredStops = preparedStops.filter((stop) => stop.routes.length > 0);
+
+  return stopsToGeoJSON(filteredStops);
 }

package/lib/import.js

@@ -82,76 +82,33 @@ function getDescendantProp(obj, desc, defaultvalue) {
   return obj;
 }
 
-const markRealtimeDataStale = (db, log) => {
-  const vehiclePositionModel = models.find(
-    (x) => x.filenameBase === 'vehicle_positions'
-  );
-  const tripUpdatesModel = models.find(
-    (x) => x.filenameBase === 'trip_updates'
-  );
-  const stopTimesUpdatesModel = models.find(
-    (x) => x.filenameBase === 'stop_times_updates'
-  );
-  const serviceAlertsModel = models.find(
-    (x) => x.filenameBase === 'service_alerts'
-  );
-  const serviceAlertTargetsModel = models.find(
-    (x) => x.filenameBase === 'service_alert_targets'
-  );
+const markRealtimeDataStale = (config, log) => {
+  const db = openDb(config);
 
-  // Mark all data as stale
   log(`Marking GTFS-Realtime data as stale..`);
-  db.prepare(
-    `UPDATE ${vehiclePositionModel.filenameBase} SET isUpdated=0`
-  ).run();
-  db.prepare(`UPDATE ${tripUpdatesModel.filenameBase} SET isUpdated=0`).run();
-  db.prepare(
-    `UPDATE ${stopTimesUpdatesModel.filenameBase} SET isUpdated=0`
-  ).run();
-  db.prepare(`UPDATE ${serviceAlertsModel.filenameBase} SET isUpdated=0`).run();
-  db.prepare(
-    `UPDATE ${serviceAlertTargetsModel.filenameBase} SET isUpdated=0`
-  ).run();
+  db.prepare(`UPDATE vehicle_positions SET isUpdated=0`).run();
+  db.prepare(`UPDATE trip_updates SET isUpdated=0`).run();
+  db.prepare(`UPDATE stop_times_updates SET isUpdated=0`).run();
+  db.prepare(`UPDATE service_alerts SET isUpdated=0`).run();
+  db.prepare(`UPDATE service_alert_targets SET isUpdated=0`).run();
   log(`Marked GTFS-Realtime data as stale\r`, true);
 };
 
-const cleanStaleRealtimeData = (db, log) => {
-  const vehiclePositionModel = models.find(
-    (x) => x.filenameBase === 'vehicle_positions'
-  );
-  const tripUpdatesModel = models.find(
-    (x) => x.filenameBase === 'trip_updates'
-  );
-  const stopTimesUpdatesModel = models.find(
-    (x) => x.filenameBase === 'stop_times_updates'
-  );
-  const serviceAlertsModel = models.find(
-    (x) => x.filenameBase === 'service_alerts'
-  );
-  const serviceAlertTargetsModel = models.find(
-    (x) => x.filenameBase === 'service_alert_targets'
-  );
+const cleanStaleRealtimeData = (config, log) => {
+  const db = openDb(config);
 
   log(`Cleaning stale GTFS-RT data..`);
-  db.prepare(
-    `DELETE FROM ${vehiclePositionModel.filenameBase} WHERE isUpdated=0`
-  ).run();
-  db.prepare(
-    `DELETE FROM ${tripUpdatesModel.filenameBase} WHERE isUpdated=0`
-  ).run();
-  db.prepare(
-    `DELETE FROM ${stopTimesUpdatesModel.filenameBase} WHERE isUpdated=0`
-  ).run();
-  db.prepare(
-    `DELETE FROM ${serviceAlertsModel.filenameBase} WHERE isUpdated=0`
-  ).run();
-  db.prepare(
-    `DELETE FROM ${serviceAlertTargetsModel.filenameBase} WHERE isUpdated=0`
-  ).run();
+  db.prepare(`DELETE FROM vehicle_positions WHERE isUpdated=0`).run();
+  db.prepare(`DELETE FROM trip_updates WHERE isUpdated=0`).run();
+  db.prepare(`DELETE FROM stop_times_updates WHERE isUpdated=0`).run();
+  db.prepare(`DELETE FROM service_alerts WHERE isUpdated=0`).run();
+  db.prepare(`DELETE FROM service_alert_targets WHERE isUpdated=0`).run();
   log(`Cleaned stale GTFS-Realtime data\r`, true);
 };
 
 const updateRealtimeData = async (task) => {
+  const db = openDb(task);
+
   const model = {
     vehicle_positions: models.find(
       (x) => x.filenameBase === 'vehicle_positions'
@@ -225,13 +182,11 @@ const updateRealtimeData = async (task) => {
       );
 
       try {
-        task.db
-          .prepare(
-            `REPLACE INTO ${model[gtfsRealtimeType].filenameBase} (${
-              fields[gtfsRealtimeType]
-            }) VALUES (${fieldValues.join(', ')})`
-          )
-          .run();
+        db.prepare(
+          `REPLACE INTO ${model[gtfsRealtimeType].filenameBase} (${
+            fields[gtfsRealtimeType]
+          }) VALUES (${fieldValues.join(', ')})`
+        ).run();
       } catch (error) {
         task.warn('Import error: ' + error.message);
       }
@@ -251,13 +206,11 @@ const updateRealtimeData = async (task) => {
         }
 
         try {
-          task.db
-            .prepare(
-              `REPLACE INTO ${model.stop_times_updates.filenameBase} (${
-                fields.stop_times_updates
-              }) VALUES ${stopUpdateArray.join(', ')}`
-            )
-            .run();
+          db.prepare(
+            `REPLACE INTO ${model.stop_times_updates.filenameBase} (${
+              fields.stop_times_updates
+            }) VALUES ${stopUpdateArray.join(', ')}`
+          ).run();
         } catch (error) {
           task.warn('Import error: ' + error.message);
         }
@@ -278,13 +231,11 @@ const updateRealtimeData = async (task) => {
         }
 
         try {
-          task.db
-            .prepare(
-              `REPLACE INTO ${model.service_alert_targets.filenameBase} (${
-                fields.service_alert_targets
-              }) VALUES ${alertTargetArray.join(', ')}`
-            )
-            .run();
+          db.prepare(
+            `REPLACE INTO ${model.service_alert_targets.filenameBase} (${
+              fields.service_alert_targets
+            }) VALUES ${alertTargetArray.join(', ')}`
+          ).run();
         } catch (error) {
           task.warn('Import error: ' + error.message);
         }
@@ -478,6 +429,8 @@ const formatLine = (line, model, totalLineCount) => {
 };
 
 const importLines = (task, lines, model, totalLineCount) => {
+  const db = openDb(task);
+
   if (lines.length === 0) {
     return;
   }
@@ -496,12 +449,11 @@ const importLines = (task, lines, model, totalLineCount) => {
   }
 
   try {
-    const insert = task.db.prepare(
+    db.prepare(
       `INSERT ${task.ignoreDuplicates ? 'OR IGNORE' : ''} INTO ${
         model.filenameBase
       } (${fieldNames.join(', ')}) VALUES ${placeholders.join(',')}`
-    );
-    insert.run(...values);
+    ).run(...values);
   } catch (error) {
     task.warn(
       `Check ${model.filenameBase}.txt for invalid data between lines ${
@@ -625,16 +577,10 @@ export async function importGtfs(initialConfig) {
         path: agency.path,
         csvOptions: config.csvOptions || {},
         ignoreDuplicates: config.ignoreDuplicates,
-        db,
-        log(message, overwrite) {
-          log(message, overwrite);
-        },
-        warn(message) {
-          logWarning(message);
-        },
-        error(message) {
-          logError(message);
-        },
+        sqlitePath: config.sqlitePath,
+        log,
+        warn: logWarning,
+        error: logError,
       };
 
       if (task.agency_url) {
@@ -671,7 +617,49 @@ export async function updateGtfsRealtime(initialConfig) {
   const log = _log(config);
   const logError = _logError(config);
   const logWarning = _logWarning(config);
-  const db = openDb(config).catch((error) => {
+
+  try {
+    openDb(config);
+
+    const agencyCount = config.agencies.length;
+    log(
+      `Starting GTFS-Realtime refresh for ${pluralize(
+        'agencies',
+        agencyCount,
+        true
+      )} using SQLite database at ${config.sqlitePath}`
+    );
+
+    markRealtimeDataStale(config, log);
+
+    await Promise.all(
+      config.agencies.map(async (agency) => {
+        if (!agency.realtimeUrls) {
+          return;
+        }
+
+        const task = {
+          realtime_headers: agency.realtimeHeaders || false,
+          realtime_urls: agency.realtimeUrls || false,
+          sqlitePath: config.sqlitePath,
+          log,
+          warn: logWarning,
+          error: logError,
+        };
+
+        await updateRealtimeData(task);
+      })
+    );
+
+    cleanStaleRealtimeData(config, log);
+    log(
+      `Completed GTFS-Realtime refresh for ${pluralize(
+        'agencies',
+        agencyCount,
+        true
+      )}\n`
+    );
+  } catch (error) {
     if (error instanceof Error && error.code === 'SQLITE_CANTOPEN') {
       logError(
         `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
@@ -679,46 +667,5 @@ export async function updateGtfsRealtime(initialConfig) {
     }
 
     throw error;
-  });
-
-  const agencyCount = config.agencies.length;
-  log(
-    `Starting GTFS-Realtime refresh for ${pluralize(
-      'agencies',
-      agencyCount,
-      true
-    )} using SQLite database at ${config.sqlitePath}`
-  );
-
-  await markRealtimeDataStale(db, log);
-
-  await mapSeries(config.agencies, async (agency) => {
-    const task = {
-      realtime_headers: agency.realtimeHeaders || false,
-      realtime_urls: agency.realtimeUrls || false,
-      db,
-      log(message, overwrite) {
-        log(message, overwrite);
-      },
-      warn(message) {
-        logWarning(message);
-      },
-      error(message) {
-        logError(message);
-      },
-    };
-
-    if (task.realtime_urls) {
-      await updateRealtimeData(task);
-    }
-  });
-
-  await cleanStaleRealtimeData(db, log);
-  log(
-    `Completed GTFS-Realtime refresh for ${pluralize(
-      'agencies',
-      agencyCount,
-      true
-    )}\n`
-  );
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -95,13 +95,14 @@
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
+    "@types/better-sqlite3": "^7.6.3",
     "dtslint": "^4.2.1",
-    "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.32.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-config-xo": "^0.43.1",
-    "husky": "^8.0.2",
+    "husky": "^8.0.3",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.3",
     "pretty-quick": "^3.1.3",
     "should": "^13.2.3"
   },