index.js

@@ -27,18 +27,25 @@ const validateLocation = (loc, name = 'location') => {
 	}
 };
 
-const loadEnrichedStationData = async (profile) => {
+const loadEnrichedStationData = (profile) => new Promise((resolve, reject) => {
-	const dbHafasStations = await import('db-hafas-stations');
+	import('db-hafas-stations').then(m => {
-	const items = {};
+		const items = {};
-	for await (const station of dbHafasStations.readFullStations()) {
+		m.default.full()
-		items[station.id] = station;
+			.on('data', (station) => {
-		items[station.name] = station;
+				items[station.id] = station;
-	}
+				items[station.name] = station;
-	if (profile.DEBUG) {
+			})
-		console.log('Loaded station index.');
+			.once('end', () => {
-	}
+				if (profile.DEBUG) {
-	return items;
+					console.log('Loaded station index.');
-};
+				}
+				resolve(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.7.0",
+	"version": "6.6.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "db-vendo-client",
-			"version": "6.7.0",
+			"version": "6.6.2",
 			"license": "ISC",
 			"dependencies": {
 				"content-type": "^1.0.5",
 				"cross-fetch": "^4.1.0",
-				"db-hafas-stations": "2.0.0",
+				"db-hafas-stations": "^1.1.0",
 				"gps-distance": "0.0.4",
 				"https-proxy-agent": "^7.0.6",
 				"luxon": "^3.5.0",
@@ -3447,15 +3447,14 @@
 			}
 		},
 		"node_modules/db-hafas-stations": {
-			"version": "2.0.0",
+			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/db-hafas-stations/-/db-hafas-stations-2.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/db-hafas-stations/-/db-hafas-stations-1.1.0.tgz",
-			"integrity": "sha512-GjcqpZhs+HeOvc2dnAJs2Uy3/b8zRNlvTfLCvqFe9J2JYOlQVyuYCjjdsPBTOmJol42sPToPs71wr03kTMVJDw==",
+			"integrity": "sha512-o6NhX3YExhdxd8IA1cfWf1px5nJTym/2hXcnnINgXjSCBmD4ujv/pCUcXZcj8ucozhk5koR2SBgdKhWJpM39pw==",
 			"dependencies": {
-				"ndjson": "^2.0.0",
+				"ndjson": "^2.0.0"
-				"qs": "^6.14.0"
 			},
 			"engines": {
-				"node": ">=18"
+				"node": ">=14"
 			}
 		},
 		"node_modules/db-rest": {

package.json

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

parse/location.js

@@ -78,14 +78,6 @@ 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,139 +99,138 @@ const potsdamHbf = '8012666';
 const berlinSüdkreuz = '8011113';
 const kölnHbf = '8000207';
 
-if (!process.env.VCR_OFF) {
+tap.test('journeys – Berlin Schwedter Str. to München Hbf', async (t) => {
-	tap.test('journeys – Berlin Schwedter Str. to München Hbf', async (t) => {
+	const res = await client.journeys(blnSchwedterStr, münchenHbf, {
-		const res = await client.journeys(blnSchwedterStr, münchenHbf, {
+		results: 4,
-			results: 4,
+		departure: when,
-			departure: when,
+		stopovers: true,
-			stopovers: true,
+	});
-		});
 
-		await testJourneysStationToStation({
+	await testJourneysStationToStation({
-			test: t,
+		test: t,
-			res,
+		res,
-			validate,
+		validate,
-			fromId: blnSchwedterStr,
+		fromId: blnSchwedterStr,
-			toId: münchenHbf,
+		toId: münchenHbf,
-		});
+	});
-		// todo: find a journey where there pricing info is always available
+	// todo: find a journey where there pricing info is always available
-		for (let journey of res.journeys) {
+	for (let journey of res.journeys) {
-			if (journey.price) {
+		if (journey.price) {
-				assertValidPrice(t, journey.price);
+			assertValidPrice(t, journey.price);
-			}
-			if (journey.tickets) {
-				assertValidTickets(t, journey.tickets);
-			}
 		}
-		t.end();
+		if (journey.tickets) {
-	});
+			assertValidTickets(t, journey.tickets);
-
-	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);
-
-		const journeysRes = await client.journeys(berlinHbf, münchenHbf, {
-			results: 4,
-			departure: when,
-			stopovers: true,
-		});
-		const refreshWithoutTicketsRes = await client.refreshJourney(journeysRes.journeys[0].refreshToken, {
-			tickets: false,
-		});
-		const refreshWithTicketsRes = await client.refreshJourney(journeysRes.journeys[0].refreshToken, {
-			tickets: true,
-		});
-		for (let res of [refreshWithoutTicketsRes, refreshWithTicketsRes]) {
-			if (res.journey.tickets !== undefined) {
-				assertValidTickets(t, res.journey.tickets);
-			}
 		}
+	}
+	t.end();
+});
 
-		t.end();
+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);
+
+	const journeysRes = await client.journeys(berlinHbf, münchenHbf, {
+		results: 4,
+		departure: when,
+		stopovers: true,
+	});
+	const refreshWithoutTicketsRes = await client.refreshJourney(journeysRes.journeys[0].refreshToken, {
+		tickets: false,
+	});
+	const refreshWithTicketsRes = await client.refreshJourney(journeysRes.journeys[0].refreshToken, {
+		tickets: true,
+	});
+	for (let res of [refreshWithoutTicketsRes, refreshWithTicketsRes]) {
+		if (res.journey.tickets !== undefined) {
+			assertValidTickets(t, res.journey.tickets);
+		}
+	}
+
+	t.end();
+});
+
+// todo: journeys, only one product
+
+tap.test('journeys – fails with no product', async (t) => {
+	await journeysFailsWithNoProduct({
+		test: t,
+		fetchJourneys: client.journeys,
+		fromId: blnSchwedterStr,
+		toId: münchenHbf,
+		when,
+		products: dbProfile.products,
+	});
+	t.end();
+});
+
+tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
+	const torfstr = {
+		type: 'location',
+		address: 'Torfstraße 17',
+		latitude: 52.5416823,
+		longitude: 13.3491223,
+	};
+	const res = await client.journeys(blnSchwedterStr, torfstr, {
+		results: 3,
+		departure: when,
 	});
 
-	// todo: journeys, only one product
+	await testJourneysStationToAddress({
+		test: t,
+		res,
+		validate,
+		fromId: blnSchwedterStr,
+		to: torfstr,
+	});
+	t.end();
+});
 
-	tap.test('journeys – fails with no product', async (t) => {
+tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
-		await journeysFailsWithNoProduct({
+	const atze = {
-			test: t,
+		type: 'location',
-			fetchJourneys: client.journeys,
+		id: '991598902',
-			fromId: blnSchwedterStr,
+		poi: true,
-			toId: münchenHbf,
+		name: 'Berlin, Atze Musiktheater für Kinder (Kultur und U',
-			when,
+		latitude: 52.542417,
-			products: dbProfile.products,
+		longitude: 13.350437,
-		});
+	};
-		t.end();
+	const res = await client.journeys(blnSchwedterStr, atze, {
+		results: 3,
+		departure: when,
 	});
 
-	tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
+	await testJourneysStationToPoi({
-		const torfstr = {
+		test: t,
-			type: 'location',
+		res,
-			address: 'Torfstraße 17',
+		validate,
-			latitude: 52.5416823,
+		fromId: blnSchwedterStr,
-			longitude: 13.3491223,
+		to: atze,
-		};
+	});
-		const res = await client.journeys(blnSchwedterStr, torfstr, {
+	t.end();
-			results: 3,
+});
-			departure: when,
-		});
 
-		await testJourneysStationToAddress({
+tap.test('journeys: via works – with detour', async (t) => {
-			test: t,
+	// Going from Westhafen to Wedding via Württembergallee without detour
-			res,
+	// is currently impossible. We check if the routing engine computes a detour.
-			validate,
+	const res = await client.journeys(westhafen, wedding, {
-			fromId: blnSchwedterStr,
+		via: württembergallee,
-			to: torfstr,
+		results: 1,
-		});
+		departure: when,
-		t.end();
+		stopovers: true,
 	});
 
-	tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
+	await testJourneysWithDetour({
-		const atze = {
+		test: t,
-			type: 'location',
+		res,
-			id: '991598902',
+		validate,
-			poi: true,
+		detourIds: [württembergallee],
-			name: 'Berlin, Atze Musiktheater für Kinder (Kultur und U',
-			latitude: 52.542417,
-			longitude: 13.350437,
-		};
-		const res = await client.journeys(blnSchwedterStr, atze, {
-			results: 3,
-			departure: when,
-		});
-
-		await testJourneysStationToPoi({
-			test: t,
-			res,
-			validate,
-			fromId: blnSchwedterStr,
-			to: atze,
-		});
-		t.end();
 	});
+	t.end();
+});
 
-	tap.test('journeys: via works – with detour', async (t) => {
+// todo: walkingSpeed "Berlin - Charlottenburg, Hallerstraße" -> jungfernheide
-		// Going from Westhafen to Wedding via Württembergallee without detour
+// todo: without detour
-		// is currently impossible. We check if the routing engine computes a detour.
-		const res = await client.journeys(westhafen, wedding, {
-			via: württembergallee,
-			results: 1,
-			departure: when,
-			stopovers: true,
-		});
 
-		await testJourneysWithDetour({
-			test: t,
-			res,
-			validate,
-			detourIds: [württembergallee],
-		});
-		t.end();
-	});
-
-	// 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,133 +151,131 @@ tap.test('refreshJourney – valid tickets', async (t) => {
 
 // todo: journeys, only one product
 
-if (!process.env.VCR_OFF) {
+tap.test('journeys – fails with no product', async (t) => {
-	tap.test('journeys – fails with no product', async (t) => {
+	await journeysFailsWithNoProduct({
-		await journeysFailsWithNoProduct({
+		test: t,
+		fetchJourneys: client.journeys,
+		fromId: blnSchwedterStr,
+		toId: münchenHbf,
+		when,
+		products: dbProfile.products,
+	});
+	t.end();
+});
+
+tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
+	const torfstr = {
+		type: 'location',
+		address: 'Torfstraße 17',
+		latitude: 52.5416823,
+		longitude: 13.3491223,
+	};
+	const res = await client.journeys(blnSchwedterStr, torfstr, {
+		results: 3,
+		departure: when,
+	});
+
+	await testJourneysStationToAddress({
+		test: t,
+		res,
+		validate,
+		fromId: blnSchwedterStr,
+		to: torfstr,
+	});
+	t.end();
+});
+
+tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
+	const atze = {
+		type: 'location',
+		id: '991598902',
+		poi: true,
+		name: 'Berlin, Atze Musiktheater für Kinder (Kultur und U',
+		latitude: 52.542417,
+		longitude: 13.350437,
+	};
+	const res = await client.journeys(blnSchwedterStr, atze, {
+		results: 3,
+		departure: when,
+	});
+
+	await testJourneysStationToPoi({
+		test: t,
+		res,
+		validate,
+		fromId: blnSchwedterStr,
+		to: atze,
+	});
+	t.end();
+});
+
+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, {
+		via: württembergallee,
+		results: 1,
+		departure: when,
+		stopovers: true,
+	});
+
+	await testJourneysWithDetour({
+		test: t,
+		res,
+		validate,
+		detourIds: [württembergallee],
+	});
+	t.end();
+});
+
+// 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) => {
+	await testEarlierLaterJourneys({
+		test: t,
+		fetchJourneys: client.journeys,
+		validate,
+		fromId: jungfernheide,
+		toId: münchenHbf,
+		when,
+	});
+
+	t.end();
+});
+
+if (!process.env.VCR_MODE) {
+	tap.test('journeys – leg cycle & alternatives', async (t) => {
+		await testLegCycleAlternatives({
 			test: t,
 			fetchJourneys: client.journeys,
-			fromId: blnSchwedterStr,
+			fromId: blnTiergarten,
-			toId: münchenHbf,
+			toId: blnJannowitzbrücke,
-			when,
-			products: dbProfile.products,
-		});
-		t.end();
-	});
-
-	tap.test('Berlin Schwedter Str. to Torfstraße 17', async (t) => {
-		const torfstr = {
-			type: 'location',
-			address: 'Torfstraße 17',
-			latitude: 52.5416823,
-			longitude: 13.3491223,
-		};
-		const res = await client.journeys(blnSchwedterStr, torfstr, {
-			results: 3,
-			departure: when,
-		});
-
-		await testJourneysStationToAddress({
-			test: t,
-			res,
-			validate,
-			fromId: blnSchwedterStr,
-			to: torfstr,
-		});
-		t.end();
-	});
-
-	tap.test('Berlin Schwedter Str. to ATZE Musiktheater', async (t) => {
-		const atze = {
-			type: 'location',
-			id: '991598902',
-			poi: true,
-			name: 'Berlin, Atze Musiktheater für Kinder (Kultur und U',
-			latitude: 52.542417,
-			longitude: 13.350437,
-		};
-		const res = await client.journeys(blnSchwedterStr, atze, {
-			results: 3,
-			departure: when,
-		});
-
-		await testJourneysStationToPoi({
-			test: t,
-			res,
-			validate,
-			fromId: blnSchwedterStr,
-			to: atze,
-		});
-		t.end();
-	});
-
-	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, {
-			via: württembergallee,
-			results: 1,
-			departure: when,
-			stopovers: true,
-		});
-
-		await testJourneysWithDetour({
-			test: t,
-			res,
-			validate,
-			detourIds: [württembergallee],
-		});
-		t.end();
-	});
-
-	// 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) => {
-		await testEarlierLaterJourneys({
-			test: t,
-			fetchJourneys: client.journeys,
-			validate,
-			fromId: jungfernheide,
-			toId: münchenHbf,
-			when,
-		});
-
-		t.end();
-	});
-
-	if (!process.env.VCR_MODE) {
-		tap.test('journeys – leg cycle & alternatives', async (t) => {
-			await testLegCycleAlternatives({
-				test: t,
-				fetchJourneys: client.journeys,
-				fromId: blnTiergarten,
-				toId: blnJannowitzbrücke,
-				when,
-			});
-			t.end();
-		});
-	}
-
-	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});
-
-		await testRefreshJourney({
-			test: t,
-			fetchJourneys: client.journeys,
-			refreshJourney: client.refreshJourney,
-			validate,
-			fromId: jungfernheide,
-			toId: münchenHbf,
 			when,
 		});
 		t.end();
 	});
 }
 
+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});
+
+	await testRefreshJourney({
+		test: t,
+		fetchJourneys: client.journeys,
+		refreshJourney: client.refreshJourney,
+		validate,
+		fromId: jungfernheide,
+		toId: münchenHbf,
+		when,
+	});
+	t.end();
+});
+
 /*
 tap.skip('journeysFromTrip – U Mehringdamm to U Naturkundemuseum, reroute to Spittelmarkt.', async (t) => {
 	const blnMehringdamm = '730939';