update db-hafas-stations

index.js

@@ -27,25 +27,18 @@ const validateLocation = (loc, name = 'location') => {
 	}
 };
 
-const loadEnrichedStationData = (profile) => new Promise((resolve, reject) => {
+const loadEnrichedStationData = async (profile) => {
-	import('db-hafas-stations').then(m => {
+	const dbHafasStations = await import('db-hafas-stations');
 	const items = {};
-		m.default.full()
+	for await (const station of dbHafasStations.readFullStations()) {
-			.on('data', (station) => {
 		items[station.id] = station;
 		items[station.name] = station;
-			})
+	}
-			.once('end', () => {
 	if (profile.DEBUG) {
 		console.log('Loaded station index.');
 	}
-				resolve(items);
+	return items;
-			})
+};
-			.once('error', (err) => {
-				reject(err);
-			});
-	});
-});
 
 const applyEnrichedStationData = async (ctx, shouldLoadEnrichedStationData) => {
 	const {profile, common} = ctx;

package-lock.json

@@ -1,17 +1,17 @@
 {
 	"name": "db-vendo-client",
-	"version": "6.6.2",
+	"version": "6.7.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "db-vendo-client",
-			"version": "6.6.2",
+			"version": "6.7.0",
 			"license": "ISC",
 			"dependencies": {
 				"content-type": "^1.0.5",
 				"cross-fetch": "^4.1.0",
-				"db-hafas-stations": "^1.1.0",
+				"db-hafas-stations": "2.0.0",
 				"gps-distance": "0.0.4",
 				"https-proxy-agent": "^7.0.6",
 				"luxon": "^3.5.0",
@@ -3447,14 +3447,15 @@
 			}
 		},
 		"node_modules/db-hafas-stations": {
-			"version": "1.1.0",
+			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/db-hafas-stations/-/db-hafas-stations-1.1.0.tgz",
+			"resolved": "https://registry.npmjs.org/db-hafas-stations/-/db-hafas-stations-2.0.0.tgz",
-			"integrity": "sha512-o6NhX3YExhdxd8IA1cfWf1px5nJTym/2hXcnnINgXjSCBmD4ujv/pCUcXZcj8ucozhk5koR2SBgdKhWJpM39pw==",
+			"integrity": "sha512-GjcqpZhs+HeOvc2dnAJs2Uy3/b8zRNlvTfLCvqFe9J2JYOlQVyuYCjjdsPBTOmJol42sPToPs71wr03kTMVJDw==",
 			"dependencies": {
-				"ndjson": "^2.0.0"
+				"ndjson": "^2.0.0",
+				"qs": "^6.14.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/db-rest": {

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "db-vendo-client",
 	"description": "Client for bahn.de public transport APIs.",
-	"version": "6.6.2",
+	"version": "6.7.0",
 	"type": "module",
 	"main": "index.js",
 	"files": [
@@ -60,7 +60,7 @@
 	"dependencies": {
 		"content-type": "^1.0.5",
 		"cross-fetch": "^4.1.0",
-		"db-hafas-stations": "^1.1.0",
+		"db-hafas-stations": "2.0.0",
 		"gps-distance": "0.0.4",
 		"https-proxy-agent": "^7.0.6",
 		"luxon": "^3.5.0",

parse/location.js

@@ -78,6 +78,14 @@ const enrichStation = (ctx, stop, locations) => {
 			...stop,
 		};
 		delete stop.lines;
+		delete stop.facilities;
+		delete stop.reisezentrumOpeningHours;
+		if (stop.station) {
+			stop.station = {...stop.station};
+			delete stop.station.lines;
+			delete stop.station.facilities;
+			delete stop.station.reisezentrumOpeningHours;
+		}
 	}
 	return stop;
 };

test/e2e/db.js

@@ -99,7 +99,8 @@ const potsdamHbf = '8012666';
 const berlinSüdkreuz = '8011113';
 const kölnHbf = '8000207';
 
-tap.test('journeys – Berlin Schwedter Str. to München Hbf', async (t) => {
+if (!process.env.VCR_OFF) {
+	tap.test('journeys – Berlin Schwedter Str. to München Hbf', async (t) => {
 		const res = await client.journeys(blnSchwedterStr, münchenHbf, {
 			results: 4,
 			departure: when,
@@ -123,9 +124,9 @@ tap.test('journeys – Berlin Schwedter Str. to München Hbf', async (t) => {
 			}
 		}
 		t.end();
-});
+	});
 
-tap.test('refreshJourney – valid tickets', async (t) => {
+	tap.test('refreshJourney – valid tickets', async (t) => {
 		const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
 		const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
 
@@ -147,11 +148,11 @@ tap.test('refreshJourney – valid tickets', async (t) => {
 		}
 
 		t.end();
-});
+	});
 
-// todo: journeys, only one product
+	// todo: journeys, only one product
 
-tap.test('journeys – fails with no product', async (t) => {
+	tap.test('journeys – fails with no product', async (t) => {
 		await journeysFailsWithNoProduct({
 			test: t,
 			fetchJourneys: client.journeys,
@@ -161,9 +162,9 @@ tap.test('journeys – fails with no product', async (t) => {
 			products: dbProfile.products,
 		});
 		t.end();
-});
+	});
 
-tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
+	tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
 		const torfstr = {
 			type: 'location',
 			address: 'Torfstraße 17',
@@ -183,9 +184,9 @@ tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
 			to: torfstr,
 		});
 		t.end();
-});
+	});
 
-tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
+	tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
 		const atze = {
 			type: 'location',
 			id: '991598902',
@@ -207,9 +208,9 @@ tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
 			to: atze,
 		});
 		t.end();
-});
+	});
 
-tap.test('journeys: via works – with detour', async (t) => {
+	tap.test('journeys: via works – with detour', async (t) => {
 		// Going from Westhafen to Wedding via Württembergallee without detour
 		// is currently impossible. We check if the routing engine computes a detour.
 		const res = await client.journeys(westhafen, wedding, {
@@ -226,11 +227,11 @@ tap.test('journeys: via works – with detour', async (t) => {
 			detourIds: [württembergallee],
 		});
 		t.end();
-});
+	});
-
-// todo: walkingSpeed "Berlin - Charlottenburg, Hallerstraße" -> jungfernheide
-// todo: without detour
 
+	// todo: walkingSpeed "Berlin - Charlottenburg, Hallerstraße" -> jungfernheide
+	// todo: without detour
+}
 
 // todo: with the DB endpoint, earlierRef/laterRef is missing queries many days in the future
 tap.skip('earlier/later journeys, Jungfernheide -> München Hbf', async (t) => {

test/e2e/dbnav.js

@@ -151,7 +151,8 @@ tap.test('refreshJourney – valid tickets', async (t) => {
 
 // todo: journeys, only one product
 
-tap.test('journeys – fails with no product', async (t) => {
+if (!process.env.VCR_OFF) {
+	tap.test('journeys – fails with no product', async (t) => {
 		await journeysFailsWithNoProduct({
 			test: t,
 			fetchJourneys: client.journeys,
@@ -161,9 +162,9 @@ tap.test('journeys – fails with no product', async (t) => {
 			products: dbProfile.products,
 		});
 		t.end();
-});
+	});
 
-tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
+	tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
 		const torfstr = {
 			type: 'location',
 			address: 'Torfstraße 17',
@@ -183,9 +184,9 @@ tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
 			to: torfstr,
 		});
 		t.end();
-});
+	});
 
-tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
+	tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
 		const atze = {
 			type: 'location',
 			id: '991598902',
@@ -207,9 +208,9 @@ tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
 			to: atze,
 		});
 		t.end();
-});
+	});
 
-tap.test('journeys: via works – with detour', async (t) => {
+	tap.test('journeys: via works – with detour', async (t) => {
 		// Going from Westhafen to Wedding via Württembergallee without detour
 		// is currently impossible. We check if the routing engine computes a detour.
 		const res = await client.journeys(westhafen, wedding, {
@@ -226,14 +227,14 @@ tap.test('journeys: via works – with detour', async (t) => {
 			detourIds: [württembergallee],
 		});
 		t.end();
-});
+	});
 
-// todo: walkingSpeed "Berlin - Charlottenburg, Hallerstraße" -> jungfernheide
+	// todo: walkingSpeed "Berlin - Charlottenburg, Hallerstraße" -> jungfernheide
-// todo: without detour
+	// todo: without detour
 
 
-// todo: with the DB endpoint, earlierRef/laterRef is missing queries many days in the future
+	// todo: with the DB endpoint, earlierRef/laterRef is missing queries many days in the future
-tap.skip('earlier/later journeys, Jungfernheide -> München Hbf', async (t) => {
+	tap.skip('earlier/later journeys, Jungfernheide -> München Hbf', async (t) => {
 		await testEarlierLaterJourneys({
 			test: t,
 			fetchJourneys: client.journeys,
@@ -244,9 +245,9 @@ tap.skip('earlier/later journeys, Jungfernheide -> München Hbf', async (t) => {
 		});
 
 		t.end();
-});
+	});
 
-if (!process.env.VCR_MODE) {
+	if (!process.env.VCR_MODE) {
 		tap.test('journeys – leg cycle & alternatives', async (t) => {
 			await testLegCycleAlternatives({
 				test: t,
@@ -257,9 +258,9 @@ if (!process.env.VCR_MODE) {
 			});
 			t.end();
 		});
-}
+	}
 
-tap.test('refreshJourney', async (t) => {
+	tap.test('refreshJourney', async (t) => {
 		const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
 		const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
 		const validate = createValidate({...cfg, when});
@@ -274,7 +275,8 @@ tap.test('refreshJourney', async (t) => {
 			when,
 		});
 		t.end();
-});
+	});
+}
 
 /*
 tap.skip('journeysFromTrip – U Mehringdamm to U Naturkundemuseum, reroute to Spittelmarkt.', async (t) => {