Merge 5e502a6f44 into 6d1d0c626f

debug.js

@@ -0,0 +1,7 @@
+import {createClient} from './index.js';
+import {profile} from './p/dbnav/index.js';
+
+const client = createClient(profile, 'hafas-client-debug');
+
+const journeys = await client.journeys('8000105', '8000261', {results: 1});
+console.log(journeys);

index.js

@@ -26,23 +26,24 @@ const validateLocation = (loc, name = 'location') => {
 	}
 };
 
-const loadEnrichedStationData = (profile) => new Promise(async (resolve, reject) => {
-	const { default: readStations} = await import('db-hafas-stations');
-	const items = {};
-	readStations.full()
-		.on('data', (station) => {
-			items[station.id] = station;
-			items[station.name] = station;
-		})
-		.once('end', () => {
-			if (profile.DEBUG) {
-				console.log('Loaded station index.');
-			}
-			resolve(items);
-		})
-		.once('error', (err) => {
-			reject(err);
-		});
+const loadEnrichedStationData = (profile) => new Promise((resolve, reject) => {
+	import('db-hafas-stations').then(m => {
+		const items = {};
+		m.default.full()
+			.on('data', (station) => {
+				items[station.id] = station;
+				items[station.name] = station;
+			})
+			.once('end', () => {
+				if (profile.DEBUG) {
+					console.log('Loaded station index.');
+				}
+				resolve(items);
+			})
+			.once('error', (err) => {
+				reject(err);
+			});
+	});
 });
 
 const applyEnrichedStationData = async (ctx, shouldLoadEnrichedStationData) => {

lib/default-profile.js

@@ -37,7 +37,7 @@ import {formatTravellers} from '../format/travellers.js';
 import {formatLoyaltyCard} from '../format/loyalty-cards.js';
 import {formatTransfers} from '../format/transfers.js';
 
-const DEBUG = (/(^|,)hafas-client(,|$)/).test((typeof process !== 'undefined') ? (process.env.DEBUG || '') : '');
+const DEBUG = (/(^|,)hafas-client(,|$)/).test(typeof process !== 'undefined' ? process.env.DEBUG || '' : '');
 const logRequest = DEBUG
 	? (_, req, reqId) => console.error(String(req.body))
 	: () => { };

lib/request.js

@@ -7,9 +7,10 @@ const randomBytesHex = (nBytes = 8) => {
 	const array = new Uint8Array(nBytes);
 	crypto.getRandomValues(array);
 	return Array.from(array)
-	  .map((byte) => byte.toString(16).padStart(2, '0'))
-	  .join('');
-  };
+		.map((byte) => byte.toString(16)
+			.padStart(2, '0'))
+		.join('');
+};
 
 const checkIfResponseIsOk = (_) => {
 	const {

p/db/index.js

@@ -1,5 +1,5 @@
-import dbnavBase from '../dbnav/base.json' with { type: "json" };
-import dbregioguideBase from '../dbregioguide/base.json' with { type: "json" };
+import dbnavBase from '../dbnav/base.json' with { type: 'json' };
+import dbregioguideBase from '../dbregioguide/base.json' with { type: 'json' };
 import {products} from '../../lib/products.js';
 
 // journeys()

p/dbnav/index.js

@@ -1,4 +1,4 @@
-import baseProfile from './base.json' with { type: "json" };
+import baseProfile from './base.json' with { type: 'json' };
 import {products} from '../../lib/products.js';
 import {formatJourneysReq, formatRefreshJourneyReq} from './journeys-req.js';
 import {formatTripReq} from './trip-req.js';

p/dbregioguide/index.js

@@ -1,4 +1,4 @@
-import baseProfile from './base.json' with { type: "json" };
+import baseProfile from './base.json' with { type: 'json' };
 import {products} from '../../lib/products.js';
 import {formatTripReq} from './trip-req.js';
 

p/dbweb/index.js

@@ -1,4 +1,4 @@
-import baseProfile from './base.json' with { type: "json" };
+import baseProfile from './base.json' with { type: 'json' };
 import {products} from '../../lib/products.js';
 import {formatJourneysReq, formatRefreshJourneyReq} from './journeys-req.js';
 import {formatLocationFilter} from './location-filter.js';

package.json

@@ -68,12 +68,15 @@
 		"uuid": "^11.0.5"
 	},
 	"devDependencies": {
+		"@eslint/eslintrc": "^3.2.0",
+		"@eslint/js": "^9.20.0",
 		"@pollyjs/adapter-node-http": "^6.0.5",
 		"@pollyjs/core": "^6.0.5",
 		"@pollyjs/persister-fs": "^6.0.5",
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"db-rest": "github:derhuerst/db-rest",
 		"eslint": "^9.20.1",
+		"globals": "^15.15.0",
 		"hafas-rest-api": "^5.1.3",
 		"is-coordinates": "^2.0.2",
 		"is-roughly-equal": "^0.1.0",

test/dbnav-departures.js

@@ -5,7 +5,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbnav/index.js';
-import res from './fixtures/dbnav-departures.json' with { type: "json" };
+import res from './fixtures/dbnav-departures.json' with { type: 'json' };
 import {dbnavDepartures as expected} from './fixtures/dbnav-departures.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbnav-refresh-journey.js

@@ -5,7 +5,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbnav/index.js';
-import res from './fixtures/dbnav-refresh-journey.json' with { type: "json" };
+import res from './fixtures/dbnav-refresh-journey.json' with { type: 'json' };
 import {dbNavJourney as expected} from './fixtures/dbnav-refresh-journey.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbnav-stop.js

@@ -5,7 +5,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbnav/index.js';
-import res from './fixtures/dbnav-stop.json' with { type: "json" };
+import res from './fixtures/dbnav-stop.json' with { type: 'json' };
 import {dbnavDepartures as expected} from './fixtures/dbnav-stop.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbnav-trip.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbnav/index.js';
-import res from './fixtures/dbnav-trip.json' with { type: "json" };
+import res from './fixtures/dbnav-trip.json' with { type: 'json' };
 import {dbTrip as expected} from './fixtures/dbnav-trip.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbregioguide-trip.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbregioguide/index.js';
-import res from './fixtures/dbregioguide-trip.json' with { type: "json" };
+import res from './fixtures/dbregioguide-trip.json' with { type: 'json' };
 import {dbTrip as expected} from './fixtures/dbregioguide-trip.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbris-arrivals.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbweb/index.js';
-import res from './fixtures/dbris-arrivals.json' with { type: "json" };
+import res from './fixtures/dbris-arrivals.json' with { type: 'json' };
 import {dbArrivals as expected} from './fixtures/dbris-arrivals.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbweb-departures.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbweb/index.js';
-import res from './fixtures/dbweb-departures.json' with { type: "json" };
+import res from './fixtures/dbweb-departures.json' with { type: 'json' };
 import {dbwebDepartures as expected} from './fixtures/dbweb-departures.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbweb-journey.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbweb/index.js';
-import res from './fixtures/dbweb-journey.json' with { type: "json" };
+import res from './fixtures/dbweb-journey.json' with { type: 'json' };
 import {dbwebJourney as expected} from './fixtures/dbweb-journey.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbweb-refresh-journey.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbweb/index.js';
-import res from './fixtures/dbweb-refresh-journey.json' with { type: "json" };
+import res from './fixtures/dbweb-refresh-journey.json' with { type: 'json' };
 import {dbJourney as expected} from './fixtures/dbweb-refresh-journey.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});

test/dbweb-trip.js

@@ -4,7 +4,7 @@ import tap from 'tap';
 
 import {createClient} from '../index.js';
 import {profile as rawProfile} from '../p/dbweb/index.js';
-import res from './fixtures/dbweb-trip.json' with { type: "json" };
+import res from './fixtures/dbweb-trip.json' with { type: 'json' };
 import {dbwebTrip as expected} from './fixtures/dbweb-trip.js';
 
 const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});