Compare commits

...

20 commits
v6.6.1 ... main

Author SHA1 Message Date
Traines
b59d7b3084 fix docs
[skip ci]
2025-04-27 17:13:10 +00:00
Traines
db4c03054a cspell...
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-04-11 21:05:18 +00:00
Traines
eac21d188b 6.8.1 2025-04-11 20:59:29 +00:00
Traines
ad09f8b1be dticket support 2025-04-11 20:59:06 +00:00
Traines
c4d0a55d41 docs
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-03-22 00:56:43 +00:00
Traines
29aab87cdf add dbbahnhof 2025-03-22 00:39:43 +00:00
Traines
883eb8c8de refactor 2025-03-21 21:13:20 +00:00
Traines
b20cf1060a add dbris, moreStops param 2025-03-21 20:49:38 +00:00
Traines
b887c674d4 fix param parsing for refreshJourney
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-03-20 10:58:32 +00:00
Traines
b3e0e764e2 update db-hafas-stations
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-03-19 00:39:01 +00:00
Traines
2ea47f7792 disable some more live e2e tests 2025-03-19 00:38:48 +00:00
Traines
6c2081c14e fix spelling and tests...
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-03-15 23:25:48 +00:00
Traines
f741a13670 docs 2025-03-15 23:15:40 +00:00
Traines
bcaad526c7 disable blocked endpoints tests for now 2025-03-15 22:54:12 +00:00
Traines
162b946bac support for bestprice, notOnlyFastRoutes, serviceDays, fix param default handling 2025-03-15 22:44:08 +00:00
Traines
14b80dbf33 update deps
[skip ci]
2025-03-14 17:28:14 +00:00
Traines
1927f98906 fix station enrichment 2025-03-14 17:19:48 +00:00
Traines
0ef3935a35 update db-hafas-stations, bump version 2025-03-14 16:57:38 +00:00
Traines
b04a671b50 improve duration explanation 2025-03-14 16:57:02 +00:00
Traines
9975a6c9ac more reliable setup of proxy agent
Some checks failed
test / lint-and-spellcheck (push) Has been cancelled
test / unit-tests (18.x) (push) Has been cancelled
test / unit-tests (20.x) (push) Has been cancelled
test / unit-tests (22.x) (push) Has been cancelled
test / integration-tests (18.x) (push) Has been cancelled
test / integration-tests (20.x) (push) Has been cancelled
test / integration-tests (22.x) (push) Has been cancelled
test / e2e-tests (18.x) (push) Has been cancelled
2025-03-08 23:12:36 +00:00
55 changed files with 5082 additions and 2151 deletions

6
api.js
View file

@ -2,6 +2,9 @@ import {createClient} from './index.js';
import {profile as dbProfile} from './p/db/index.js';
import {profile as dbnavProfile} from './p/dbnav/index.js';
import {profile as dbwebProfile} from './p/dbweb/index.js';
import {profile as dbrisProfile} from './p/dbris/index.js';
import {profile as dbbahnhofProfile} from './p/dbbahnhof/index.js';
import {profile as dbregioguideProfile} from './p/dbregioguide/index.js';
import {mapRouteParsers} from './lib/api-parsers.js';
import {createHafasRestApi as createApi} from 'hafas-rest-api';
@ -26,6 +29,9 @@ const profiles = {
db: dbProfile,
dbnav: dbnavProfile,
dbweb: dbwebProfile,
dbris: dbrisProfile,
dbbahnhof: dbbahnhofProfile,
dbregioguide: dbregioguideProfile,
};
const start = async () => {

View file

@ -621,11 +621,20 @@
"Zusammenfassung",
"Züttlingen",
"Zwickauer",
"zwischenhalte"
"zwischenhalte",
"bestprice",
"intervalle",
"Intervalle",
"tagesbest",
"dbbahnhof",
"Deutschlandticket",
"fahrverguenstigungen",
"cancelation"
],
"ignorePaths": [
"docs/dumps/**",
"test/e2e/fixtures/**",
"test/fixtures/**",
"test/parse/remarks.js",
"test/parse/dbnav-journey.js"
],

View file

@ -36,10 +36,11 @@ With `opt`, you can override the default options, which look like this:
// departures at related stations
// e.g. those that belong together on the metro map.
includeRelatedStations: true,
moreStops: null // also include departures/arrivals for array of up to nine additional station evaNumbers (not supported with dbnav and dbweb)
language: 'en' // language to get results in
}
```
The maximum supported duration is 720 for `db` and 60 for other profiles.
The maximum supported duration depends on the profile (see main readme), e.g. 720 for `db` and 60 for `dbnav`. In order to use the `dbris` profile, you need to pass the env vars `DB_API_KEY` and `DB_CLIENT_ID`.
If you pass an object `opt.products`, its fields will partially override the default products defined in the profile.
## Response

View file

@ -75,7 +75,9 @@ With `opt`, you can override the default options, which look like this:
subStops: true, // not supported
entrances: true, // not supported
remarks: true, // parse & expose hints & warnings?
scheduledDays: false, // not yet supported
scheduledDays: false, // returns a field `serviceDays` (instead of `scheduledDays` in hafas-client!) with a different, human-readable structure
notOnlyFastRoutes: false, // if true, also show journeys that are mathematically non-optimal
bestprice: false, // search for lowest prices across the entire day, returns list of journeys sorted by price
firstClass: false, // first or second class for tickets
loyaltyCard: null, // BahnCards etc., see below
language: 'en', // language to get results in

View file

@ -10,7 +10,7 @@ With `opt`, you can override the default options, which look like this:
{
results: 8, // maximum number of results
distance: null, // maximum walking distance in meters
poi: false, // return points of interest?
poi: false, // not supported
stops: true, // return stops/stations?
subStops: true, // not supported
entrances: true, // not supported

View file

@ -365,7 +365,19 @@ paths:
default: true
- name: scheduledDays
in: query
description: Parse & return dates each journey is valid on?
description: Parse & return dates the journey is valid on?, returns a field `serviceDays` (instead of `scheduledDays` in hafas-client!) with a different, human-readable structure
schema:
type: boolean
default: false
- name: notOnlyFastRoutes
in: query
description: if true, also show journeys that are mathematically non-optimal
schema:
type: boolean
default: false
- name: bestprice
in: query
description: search for lowest prices across the entire day
schema:
type: boolean
default: false
@ -601,7 +613,7 @@ paths:
default: true
- name: linesOfStops
in: query
description: Parse & return lines of each stop/station?
description: not supported
schema:
type: boolean
default: false
@ -683,7 +695,19 @@ paths:
default: true
- name: scheduledDays
in: query
description: Parse & return dates the journey is valid on?
description: Parse & return dates the journey is valid on?, returns a field `serviceDays` (instead of `scheduledDays` in hafas-client!) with a different, human-readable structure
schema:
type: boolean
default: false
- name: notOnlyFastRoutes
in: query
description: if true, also show journeys that are mathematically non-optimal
schema:
type: boolean
default: false
- name: bestprice
in: query
description: search for lowest prices across the entire day
schema:
type: boolean
default: false
@ -1863,11 +1887,11 @@ components:
default: false
type: boolean
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: false
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
remarks:
@ -1971,11 +1995,11 @@ components:
default: false
type: boolean
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
remarks:
@ -2010,15 +2034,15 @@ components:
default: true
type: boolean
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: false
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
linesOfStops:
description: parse & expose lines at each stop/station?
description: not supported
default: false
type: boolean
language:
@ -2037,11 +2061,11 @@ components:
default: false
type: boolean
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
remarks:
@ -2064,11 +2088,11 @@ components:
default: false
type: boolean
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
remarks:
@ -2104,11 +2128,11 @@ components:
default: 10
type: number
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
linesOfStops:
@ -2182,7 +2206,7 @@ components:
default: undefined
type: number
poi:
description: return points of interest?
description: not supported
default: false
type: boolean
stops:
@ -2194,15 +2218,15 @@ components:
description: products
default: undefined
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
linesOfStops:
description: parse & expose lines at each stop/station?
description: not supported
default: false
type: boolean
language:
@ -2230,11 +2254,11 @@ components:
description: products
default: undefined
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
polylines:
@ -2272,11 +2296,11 @@ components:
default: 20
type: number
subStops:
description: parse & expose sub-stops of stations?
description: not supported
default: true
type: boolean
entrances:
description: parse & expose entrances of stops/stations?
description: not supported
default: true
type: boolean
polylines:

View file

@ -1,49 +0,0 @@
const formatStationBoardReq = (ctx, station, type) => {
const {profile, opt} = ctx;
return {
endpoint: profile.boardEndpoint,
path: (type == 'departures' ? 'departure' : 'arrival') + '/' + station,
query: {
// TODO direction, fields below
modeOfTransport: profile.formatProductsFilter(ctx, opt.products || {}, 'ris'),
timeStart: profile.formatTime(profile, opt.when, true),
timeEnd: profile.formatTime(profile, opt.when.getTime() + opt.duration * 60 * 1000, true),
expandTimeFrame: 'TIME_END', // TODO impact?
},
method: 'get',
};
};
/*
TODO separate RIS::Boards profile?
const formatRisStationBoardReq = (ctx, station, type) => {
const {profile, opt} = ctx;
return {
endpoint: profile.boardEndpoint,
path: type + '/' + station,
query: {
// TODO direction
filterTransports: profile.formatProductsFilter(ctx, opt.products || {}, 'ris'),
timeStart: profile.formatTime(profile, opt.when, true),
timeEnd: profile.formatTime(profile, opt.when.getTime() + opt.duration * 60 * 1000, true),
maxViaStops: opt.stopovers ? undefined : 0,
includeStationGroup: opt.includeRelatedStations,
maxTransportsPerType: opt.results === Infinity ? undefined : opt.results,
includeMessagesDisruptions: opt.remarks,
sortBy: 'TIME_SCHEDULE',
},
method: 'get',
headers: {
'Db-Client-Id': process.env.DB_CLIENT_ID,
'Db-Api-Key': process.env.DB_API_KEY,
'Accept': 'application/vnd.de.db.ris+json',
},
};
};
*/
export {
formatStationBoardReq,
};

View file

@ -27,25 +27,18 @@ const validateLocation = (loc, name = 'location') => {
}
};
const loadEnrichedStationData = (profile) => new Promise((resolve, reject) => {
import('db-hafas-stations').then(m => {
const loadEnrichedStationData = async (profile) => {
const dbHafasStations = await import('db-hafas-stations');
const items = {};
m.default.full()
.on('data', (station) => {
for await (const station of dbHafasStations.readFullStations()) {
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);
});
});
});
return items;
};
const applyEnrichedStationData = async (ctx, shouldLoadEnrichedStationData) => {
const {profile, common} = ctx;
@ -85,10 +78,10 @@ const createClient = (profile, userAgent, opt = {}) => {
throw new TypeError('type must be a non-empty string.');
}
if (!profile.departuresGetPasslist && 'stopovers' in opt) {
if (!profile.departuresGetPasslist && opt.stopovers) {
throw new Error('opt.stopovers is not supported by this endpoint');
}
if (!profile.departuresStbFltrEquiv && 'includeRelatedStations' in opt) { // TODO artificially filter?
if (!profile.departuresStbFltrEquiv && 'includeRelatedStations' in opt) {
throw new Error('opt.includeRelatedStations is not supported by this endpoint');
}
@ -106,6 +99,7 @@ const createClient = (profile, userAgent, opt = {}) => {
// departures at related stations
// e.g. those that belong together on the metro map.
includeRelatedStations: true,
moreStops: null, // also include departures/arrivals for array of up to nine additional station evaNumbers (not supported with dbnav and dbweb)
}, opt);
opt.when = new Date(opt.when || Date.now());
if (Number.isNaN(Number(opt.when))) {
@ -117,7 +111,7 @@ const createClient = (profile, userAgent, opt = {}) => {
const {res} = await profile.request({profile, opt}, userAgent, req);
const ctx = {profile, opt, common, res};
let results = (res[resultsField] || res.items || res.bahnhofstafelAbfahrtPositionen || res.bahnhofstafelAnkunftPositionen || res.entries)
let results = (res[resultsField] || res.items || res.bahnhofstafelAbfahrtPositionen || res.bahnhofstafelAnkunftPositionen || res.entries.flat())
.map(res => parse(ctx, res)); // TODO sort?, slice
if (!opt.includeRelatedStations) {
@ -185,6 +179,10 @@ const createClient = (profile, userAgent, opt = {}) => {
entrances: true, // parse & expose entrances of stops/stations?
remarks: true, // parse & expose hints & warnings?
scheduledDays: false, // parse & expose dates each journey is valid on?
notOnlyFastRoutes: false, // if true, also show routes that are mathematically non-optimal
bestprice: false, // search for lowest prices across the entire day
deutschlandTicketDiscount: false,
deutschlandTicketConnectionsOnly: false,
}, opt);
if (opt.when !== undefined) {
@ -210,9 +208,15 @@ const createClient = (profile, userAgent, opt = {}) => {
const req = profile.formatJourneysReq({profile, opt}, from, to, when, outFrwd, journeysRef);
const {res} = await profile.request({profile, opt}, userAgent, req);
const ctx = {profile, opt, common, res};
const verbindungen = Number.isInteger(opt.results) ? res.verbindungen.slice(0, opt.results) : res.verbindungen;
if (opt.bestprice) {
res.verbindungen = (res.intervalle || res.tagesbestPreisIntervalle).flatMap(i => i.verbindungen.map(v => ({...v, ...v.verbindung})));
}
const verbindungen = Number.isInteger(opt.results) && opt.results != 3 ? res.verbindungen.slice(0, opt.results) : res.verbindungen; // TODO remove default from hafas-rest-api
const journeys = verbindungen
.map(j => profile.parseJourney(ctx, j));
if (opt.bestprice) {
journeys.sort((a, b) => a.price?.amount - b.price?.amount);
}
return {
earlierRef: res.verbindungReference?.earlier || res.frueherContext || null,
@ -237,6 +241,8 @@ const createClient = (profile, userAgent, opt = {}) => {
entrances: true, // parse & expose entrances of stops/stations?
remarks: true, // parse & expose hints & warnings?
scheduledDays: false, // parse & expose dates the journey is valid on?
deutschlandTicketDiscount: false,
deutschlandTicketConnectionsOnly: false,
}, opt);
const req = profile.formatRefreshJourneyReq({profile, opt}, refreshToken);

View file

@ -1,5 +1,5 @@
import {data as cards} from '../format/loyalty-cards.js';
import {parseBoolean, parseInteger} from 'hafas-rest-api/lib/parse.js';
import {parseBoolean, parseInteger, parseArrayOfStrings} from 'hafas-rest-api/lib/parse.js';
const typesByName = new Map([
['bahncard-1st-25', {type: cards.BAHNCARD, discount: 25, class: 1}],
@ -42,15 +42,13 @@ const parseArrayOr = (parseEntry) => {
};
const mapRouteParsers = (route, parsers) => {
if (route !== 'journeys') {
return parsers;
}
if (route.includes('journey')) {
return {
...parsers,
firstClass: {
description: 'Search for first-class options?',
type: 'boolean',
default: 'false',
default: false,
parse: parseBoolean,
},
loyaltyCard: {
@ -66,7 +64,44 @@ const mapRouteParsers = (route, parsers) => {
defaultStr: '*adult*',
parse: parseArrayOr(parseInteger),
},
notOnlyFastRoutes: {
description: 'If true, also show routes that are mathematically non-optimal',
type: 'boolean',
default: false,
parse: parseBoolean,
},
bestprice: {
description: 'Search for lowest prices across the entire day',
type: 'boolean',
default: false,
parse: parseBoolean,
},
deutschlandTicketDiscount: {
description: 'Calculate ticket prices assuming Deutschlandticket is present',
type: 'boolean',
default: false,
parse: parseBoolean,
},
deutschlandTicketConnectionsOnly: {
description: 'Only return journeys that can be used with the Deutschlandticket',
type: 'boolean',
default: false,
parse: parseBoolean,
},
};
}
if (route.includes('departures') || route.includes('arrivals')) {
return {
...parsers,
moreStops: {
description: 'Also include departures/arrivals for up to nine comma-separated station evaNumbers (not supported with dbnav and dbweb)',
type: 'string',
default: '',
parse: parseArrayOfStrings,
},
};
}
return parsers;
};
export {

View file

@ -2,10 +2,6 @@ import {request} from '../lib/request.js';
import {products} from '../lib/products.js';
import {ageGroup, ageGroupFromAge, ageGroupLabel} from './age-group.js';
import {formatStationBoardReq} from '../format/station-board-req.js';
import {formatTripReq} from '../format/trip-req.js';
import {formatNearbyReq} from '../format/nearby-req.js';
import {parseDateTime} from '../parse/date-time.js';
import {parsePlatform} from '../parse/platform.js';
import {parseProducts} from '../parse/products.js';
@ -61,13 +57,13 @@ const defaultProfile = {
logRequest,
logResponse,
formatStationBoardReq,
formatLocationsReq: notImplemented,
formatStopReq: notImplemented,
formatTripReq,
formatNearbyReq,
formatJourneysReq: notImplemented,
formatRefreshJourneyReq: notImplemented,
formatTripReq: notImplemented,
formatNearbyReq: notImplemented,
formatLocationsReq: notImplemented,
formatStopReq: notImplemented,
formatStationBoardReq: notImplemented,
transformJourneysQuery: id,
parseDateTime,

View file

@ -7,15 +7,16 @@ const proxyAddress = typeof process !== 'undefined' && (process.env.HTTPS_PROXY
let getAgent = () => undefined;
if (proxyAddress) {
import('https-proxy-agent').then(a => {
const setupProxy = async () => {
if (proxyAddress && !getAgent()) {
const a = await import('https-proxy-agent');
const agent = new a.default.HttpsProxyAgent(proxyAddress, {
keepAlive: true,
keepAliveMsecs: 10 * 1000, // 10s
});
getAgent = () => agent;
});
}
};
const randomBytesHexString = length => [...Array(length)].map(() => Math.floor(Math.random() * 16)
.toString(16))
@ -66,14 +67,15 @@ const checkIfResponseIsOk = (_) => {
};
};
if (body.fehlerNachricht) { // TODO better handling
if (body.fehlerNachricht || body.errors) { // TODO better handling
const {Error: HafasError, message, props} = getError(body);
throw new HafasError(message, body.err, {...errProps, ...props});
throw new HafasError(message, body.err || body.errors, {...errProps, ...props});
}
};
const request = async (ctx, userAgent, reqData) => {
const {profile, opt} = ctx;
await setupProxy();
const endpoint = reqData.endpoint;
delete reqData.endpoint;
@ -119,6 +121,7 @@ const request = async (ctx, userAgent, reqData) => {
if (!res.ok) {
// todo [breaking]: make this a FetchError or a HafasClientError?
console.log(JSON.stringify(res), await res.text());
const err = new Error(res.statusText);
Object.assign(err, errProps);
throw err;

View file

@ -30,6 +30,7 @@ const tripEndpoint_dbnav = dbnavBase.tripEndpoint;
const tripEndpoint_dbregioguide = dbregioguideBase.tripEndpoint;
// arrivals(), departures()
import {formatStationBoardReq} from '../dbregioguide/station-board-req.js';
const {boardEndpoint} = dbregioguideBase;
const profile = {
@ -56,6 +57,7 @@ const profile = {
formatTripReq,
tripEndpoint_dbnav, tripEndpoint_dbregioguide,
formatStationBoardReq,
boardEndpoint,
};

4
p/dbbahnhof/base.json Normal file
View file

@ -0,0 +1,4 @@
{
"boardEndpoint": "https://www.bahnhof.de/api/boards/",
"defaultLanguage": "en"
}

31
p/dbbahnhof/index.js Normal file
View file

@ -0,0 +1,31 @@
import baseProfile from './base.json' with { type: 'json' };
import {products} from '../../lib/products.js';
import {formatStationBoardReq} from './station-board-req.js';
const profile = {
...baseProfile,
locale: 'de-DE',
timezone: 'Europe/Berlin',
products,
formatStationBoardReq,
journeysOutFrwd: false,
departuresGetPasslist: true,
departuresStbFltrEquiv: true,
trip: false,
radar: false,
refreshJourney: false,
journeysFromTrip: false,
refreshJourneyUseOutReconL: false,
tripsByName: false,
remarks: false,
remarksGetPolyline: false,
reachableFrom: false,
lines: false,
};
export {
profile,
};

View file

@ -0,0 +1,30 @@
import {stringify} from 'qs';
const formatStationBoardReq = (ctx, station, type) => {
const {profile, opt} = ctx;
if (opt.departure || opt.arrival) {
throw new Error('opt.departure/opt.arrival is not supported for profile dbbahnhof, can only query for current time.');
}
const evaNumbers = [station];
if (opt.moreStops) {
evaNumbers.push(...opt.moreStops);
}
const query = {
filterTransports: profile.formatProductsFilter(ctx, opt.products || {}, 'ris_alt'),
evaNumbers: evaNumbers,
duration: opt.duration,
sortBy: 'TIME_SCHEDULE',
locale: opt.language,
};
return {
endpoint: profile.boardEndpoint,
path: type + '?' + stringify(query, {arrayFormat: 'repeat', encodeValuesOnly: true}),
method: 'get',
};
};
export {
formatStationBoardReq,
};

View file

@ -1,5 +1,6 @@
{
"journeysEndpoint": "https://app.vendo.noncd.db.de/mob/angebote/fahrplan",
"bestpriceEndpoint": "https://app.vendo.noncd.db.de/mob/angebote/tagesbestpreis",
"refreshJourneysEndpointTickets": "https://app.vendo.noncd.db.de/mob/angebote/recon",
"refreshJourneysEndpointPolyline": "https://app.vendo.noncd.db.de/mob/trip/recon",
"locationsEndpoint": "https://app.vendo.noncd.db.de/mob/location/search",

View file

@ -9,6 +9,10 @@ const formatBaseJourneysReq = (ctx) => {
einstiegsTypList: [
'STANDARD',
],
fahrverguenstigungen: {
deutschlandTicketVorhanden: ctx.opt.deutschlandTicketDiscount,
nurDeutschlandTicketVerbindungen: ctx.opt.deutschlandTicketConnectionsOnly,
},
klasse: travellers.klasse,
reisendenProfil: {
reisende: travellers.reisende.map(t => {
@ -55,8 +59,11 @@ const formatJourneysReq = (ctx, from, to, when, outFrwd, journeysRef) => {
if (journeysRef) {
query.reiseHin.wunsch.context = journeysRef;
}
if (opt.notOnlyFastRoutes) {
query.reiseHin.wunsch.economic = true;
}
return {
endpoint: ctx.profile.journeysEndpoint,
endpoint: opt.bestprice ? profile.bestpriceEndpoint : profile.journeysEndpoint,
body: query,
headers: getHeaders('application/x.db.vendo.mob.verbindungssuche.v8+json'),
method: 'post',

View file

@ -1,6 +1,7 @@
import baseProfile from './base.json' with { type: 'json' };
import {products} from '../../lib/products.js';
import {formatTripReq} from './trip-req.js';
import {formatStationBoardReq} from './station-board-req.js';
const profile = {
...baseProfile,
@ -9,6 +10,21 @@ const profile = {
products,
formatTripReq,
formatStationBoardReq,
journeysOutFrwd: false,
departuresGetPasslist: false,
departuresStbFltrEquiv: true,
trip: false,
radar: false,
refreshJourney: false,
journeysFromTrip: false,
refreshJourneyUseOutReconL: false,
tripsByName: false,
remarks: false,
remarksGetPolyline: false,
reachableFrom: false,
lines: false,
};
export {

View file

@ -0,0 +1,24 @@
const formatStationBoardReq = (ctx, station, type) => {
const {profile, opt} = ctx;
if (opt.moreStops) {
station += ',' + opt.moreStops.join(',');
}
return {
endpoint: profile.boardEndpoint,
path: (type == 'departures' ? 'departure' : 'arrival') + '/' + station,
query: {
// TODO direction, fields below
modeOfTransport: profile.formatProductsFilter(ctx, opt.products || {}, 'ris'),
timeStart: profile.formatTime(profile, opt.when, true),
timeEnd: profile.formatTime(profile, opt.when.getTime() + opt.duration * 60 * 1000, true),
expandTimeFrame: 'TIME_END', // TODO impact?
},
method: 'get',
};
};
export {
formatStationBoardReq,
};

4
p/dbris/base.json Normal file
View file

@ -0,0 +1,4 @@
{
"boardEndpoint": "https://apis.deutschebahn.com/db/apis/ris-boards/v1/public/",
"defaultLanguage": "en"
}

31
p/dbris/index.js Normal file
View file

@ -0,0 +1,31 @@
import baseProfile from './base.json' with { type: 'json' };
import {products} from '../../lib/products.js';
import {formatStationBoardReq} from './station-board-req.js';
const profile = {
...baseProfile,
locale: 'de-DE',
timezone: 'Europe/Berlin',
products,
formatStationBoardReq,
journeysOutFrwd: false,
departuresGetPasslist: true,
departuresStbFltrEquiv: true,
trip: false,
radar: false,
refreshJourney: false,
journeysFromTrip: false,
refreshJourneyUseOutReconL: false,
tripsByName: false,
remarks: false,
remarksGetPolyline: false,
reachableFrom: false,
lines: false,
};
export {
profile,
};

View file

@ -0,0 +1,34 @@
const formatStationBoardReq = (ctx, station, type) => {
const {profile, opt} = ctx;
const query = {
filterTransports: profile.formatProductsFilter(ctx, opt.products || {}, 'ris_alt'),
timeStart: profile.formatTime(profile, opt.when, true),
timeEnd: profile.formatTime(profile, opt.when.getTime() + opt.duration * 60 * 1000, true),
includeStationGroup: opt.includeRelatedStations,
maxTransportsPerType: opt.results === Infinity ? undefined : opt.results,
includeMessagesDisruptions: opt.remarks,
sortBy: 'TIME_SCHEDULE',
};
if (!opt.stopovers) {
query.maxViaStops = 0;
}
if (opt.moreStops) {
station += ',' + opt.moreStops.join(',');
}
return {
endpoint: profile.boardEndpoint,
path: type + '/' + station,
query: query,
method: 'get',
headers: {
'Db-Client-Id': process.env.DB_CLIENT_ID,
'Db-Api-Key': process.env.DB_API_KEY,
'Accept': 'application/vnd.de.db.ris+json',
},
};
};
export {
formatStationBoardReq,
};

View file

@ -1,5 +1,6 @@
{
"journeysEndpoint": "https://int.bahn.de/web/api/angebote/fahrplan",
"bestpriceEndpoint": "https://int.bahn.de/web/api/angebote/tagesbestpreis",
"refreshJourneysEndpointTickets": "https://int.bahn.de/web/api/angebote/recon",
"refreshJourneysEndpointPolyline": "https://int.bahn.de/web/api/reiseloesung/verbindung",
"locationsEndpoint": "https://int.bahn.de/web/api/reiseloesung/orte",

View file

@ -4,6 +4,8 @@ import {formatJourneysReq, formatRefreshJourneyReq} from './journeys-req.js';
import {formatLocationFilter} from './location-filter.js';
import {formatLocationsReq} from './locations-req.js';
import {formatStationBoardReq} from './station-board-req.js';
import {formatTripReq} from './trip-req.js';
import {formatNearbyReq} from './nearby-req.js';
const profile = {
...baseProfile,
@ -14,9 +16,11 @@ const profile = {
formatJourneysReq,
formatRefreshJourneyReq,
formatTripReq,
formatNearbyReq,
formatLocationsReq,
formatLocationFilter,
formatStationBoardReq,
formatLocationFilter,
departuresGetPasslist: true,
};

View file

@ -10,10 +10,10 @@ const formatJourneysReq = (ctx, from, to, when, outFrwd, journeysRef) => {
let query = {
maxUmstiege: transfers,
minUmstiegszeit: opt.transferTime,
deutschlandTicketVorhanden: false,
nurDeutschlandTicketVerbindungen: false,
deutschlandTicketVorhanden: opt.deutschlandTicketDiscount,
nurDeutschlandTicketVerbindungen: opt.deutschlandTicketConnectionsOnly,
reservierungsKontingenteVorhanden: false,
schnelleVerbindungen: true,
schnelleVerbindungen: !opt.notOnlyFastRoutes,
sitzplatzOnly: false,
abfahrtsHalt: from.lid,
zwischenhalte: opt.via
@ -35,14 +35,14 @@ const formatJourneysReq = (ctx, from, to, when, outFrwd, journeysRef) => {
if (opt.results !== null) {
// TODO query.numF = opt.results;
}
query = Object.assign(query, ctx.profile.formatTravellers(ctx));
query = Object.assign(query, profile.formatTravellers(ctx));
return {
endpoint: ctx.profile.journeysEndpoint,
endpoint: opt.bestprice ? profile.bestpriceEndpoint : profile.journeysEndpoint,
body: query,
method: 'post',
};
};
// TODO poly conditional other endpoint
const formatRefreshJourneyReq = (ctx, refreshToken) => {
const {profile, opt} = ctx;
if (opt.tickets) {

2087
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,7 @@
{
"name": "db-vendo-client",
"description": "Client for bahn.de public transport APIs.",
"version": "6.6.1",
"version": "6.8.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": "^1.0.0",
"db-hafas-stations": "2.0.0",
"gps-distance": "0.0.4",
"https-proxy-agent": "^7.0.6",
"luxon": "^3.5.0",

View file

@ -11,12 +11,12 @@ const createParseArrOrDep = (prefix) => {
const cancelled = profile.parseCancelled(d);
const res = {
tripId: d.journeyID || d.journeyId || d.train?.journeyId || d.zuglaufId,
stop: profile.parseLocation(ctx, d.station || d.abfrageOrt || {bahnhofsId: d.bahnhofsId}),
stop: profile.parseLocation(ctx, d.station || d.abfrageOrt || d.stopPlace || {bahnhofsId: d.bahnhofsId}),
...profile.parseWhen(
ctx,
null,
d.timeSchedule || d.time || d.zeit || d.abgangsDatum || d.ankunftsDatum,
d.timeType != 'SCHEDULE' ? d.timePredicted || d.time || d.ezZeit || d.ezAbgangsDatum || d.ezAnkunftsDatum : null,
d.timeType != 'SCHEDULE' ? d.timePredicted || d.timeDelayed || d.time || d.ezZeit || d.ezAbgangsDatum || d.ezAnkunftsDatum : null,
cancelled),
...profile.parsePlatform(ctx, d.platformSchedule || d.platform || d.gleis, d.platformPredicted || d.platform || d.ezGleis, cancelled),
// prognosisType: TODO
@ -40,16 +40,23 @@ const createParseArrOrDep = (prefix) => {
res.remarks = profile.parseRemarks(ctx, d);
}
if ((opt.stopovers || opt.direction) && Array.isArray(d.ueber)) {
const stopovers = d.ueber
if (opt.stopovers || opt.direction) {
let stopovers = undefined;
if (Array.isArray(d.ueber)) {
stopovers = d.ueber
.map(viaName => profile.parseStopover(ctx, {name: viaName}, null));
} else if (Array.isArray(d.transport?.via) || Array.isArray(d.viaStops)) {
stopovers = (d.transport?.via || d.viaStops)
.map(via => profile.parseStopover(ctx, via, null));
}
if (stopovers) {
if (prefix === ARRIVAL) {
res.previousStopovers = stopovers;
} else if (prefix === DEPARTURE) {
res.nextStopovers = stopovers;
}
}
}
return res;
};

View file

@ -69,7 +69,15 @@ const parseJourney = (ctx, jj) => { // j = raw journey
// TODO
if (opt.scheduledDays && j.serviceDays) {
// todo [breaking]: rename to scheduledDates
// res.scheduledDays = profile.parseScheduledDays(ctx, j.serviceDays);
// TODO parse scheduledDays as before
res.serviceDays = j.serviceDays.map(d => ({
irregular: d.irregular,
lastDateInPeriod: d.lastDateInPeriod || d.letztesDatumInZeitraum,
planningPeriodBegin: d.planningPeriodBegin || d.planungsZeitraumAnfang,
planningPeriodEnd: d.planningPeriodEnd || d.planungsZeitraumEnde,
regular: d.regular,
weekdays: d.weekdays || d.wochentage,
}));
}
res.price = profile.parsePrice(ctx, jj);

View file

@ -2,20 +2,20 @@ import slugg from 'slugg';
const parseLine = (ctx, p) => {
const profile = ctx.profile;
const fahrtNr = p.verkehrsmittel?.nummer || p.transport?.number || p.train?.no || p.no || ((p.risZuglaufId || '') + '_').split('_')[1] || p.verkehrsmittelNummer || (p.verkehrmittel?.langText || p.verkehrsmittel?.langText || p.mitteltext || p.zugName || '').replace(/\D/g, '');
const fahrtNr = p.verkehrsmittel?.nummer || p.transport?.number || p.train?.no || p.no || ((p.risZuglaufId || '') + '_').split('_')[1] || p.verkehrsmittelNummer || (p.verkehrmittel?.langText || p.verkehrsmittel?.langText || p.mitteltext || p.zugName || p.lineName || '').replace(/\D/g, '');
const res = {
type: 'line',
id: slugg(p.verkehrsmittel?.langText || p.verkehrmittel?.langText || p.transport?.journeyDescription || p.risZuglaufId || p.train && p.train.category + ' ' + p.train.lineName + ' ' + p.train.no || p.no && p.name + ' ' + p.no || p.langtext || p.mitteltext || p.zugName), // TODO terrible
id: slugg(p.verkehrsmittel?.langText || p.verkehrmittel?.langText || p.transport?.journeyDescription || p.risZuglaufId || p.train && p.train.category + ' ' + p.train.lineName + ' ' + p.train.no || p.no && p.name + ' ' + p.no || p.langtext || p.mitteltext || p.zugName || p.lineName), // TODO terrible
fahrtNr: String(fahrtNr),
name: p.verkehrsmittel?.name || p.verkehrsmittel?.langText || p.verkehrmittel?.name || p.verkehrmittel?.langText || p.zugName || p.transport && p.transport.category + ' ' + p.transport.line || p.train && p.train.category + ' ' + p.train.lineName || p.name || p.mitteltext || p.langtext,
name: p.verkehrsmittel?.name || p.verkehrsmittel?.langText || p.verkehrmittel?.name || p.verkehrmittel?.langText || p.zugName || p.transport && p.transport.category + ' ' + p.transport.line || p.train && p.train.category + ' ' + p.train.lineName || p.name || p.mitteltext || p.langtext || p.lineName,
public: true,
};
const adminCode = p.administrationId || p.administration?.id || p.administration?.administrationID;
const adminCode = p.administrationID || p.administrationId || p.administration?.id || p.administration?.administrationID;
if (adminCode) {
res.adminCode = adminCode;
}
res.productName = p.verkehrsmittel?.kurzText || p.verkehrmittel?.kurzText || p.transport?.category || p.train?.category || p.category || p.kurztext;
res.productName = p.verkehrsmittel?.kurzText || p.verkehrmittel?.kurzText || p.transport?.category || p.train?.category || p.category || p.kurztext || p.lineName?.replace(/\d/g, '');
const foundProduct = profile.products.find(pp => pp.vendo == p.verkehrsmittel?.produktGattung || pp.vendo == p.verkehrmittel?.produktGattung || pp.ris == p.transport?.type || pp.ris == p.train?.type || pp.ris == p.type || pp.ris_alt == p.train?.type || pp.ris_alt == p.type || pp.dbnav_short == p.produktGattung);
res.mode = foundProduct?.mode;
res.product = foundProduct?.id;

View file

@ -9,7 +9,7 @@ const parseLoadFactor = (opt, auslastung) => {
if (!auslastung) {
return null;
}
const cls = opt.firstClass
const cls = opt.firstClass === true
? 'KLASSE_1'
: 'KLASSE_2';
const load = auslastung.find(a => a.klasse === cls)?.stufe;

View file

@ -7,7 +7,7 @@ const ADDRESS = 'ADR';
const leadingZeros = /^0+/;
const parseLocation = (ctx, l) => {
const {profile, common} = ctx;
const {profile} = ctx;
if (!l) {
return null;
@ -53,16 +53,6 @@ const parseLocation = (ctx, l) => {
return stop;
}
if (name && common?.locations?.[name] && res.id === null) {
delete res.type;
delete res.id;
return {
...common.locations[name],
...res,
};
}
res.name = name;
res = profile.enrichStation(ctx, res);
@ -87,6 +77,15 @@ const enrichStation = (ctx, stop, locations) => {
...rich,
...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;
};

View file

@ -10,7 +10,12 @@ const parseRemarks = (ctx, ref) => {
ref.himNotizen || [],
ref.hims || [],
ref.serviceNotiz && [ref.serviceNotiz] || [],
ref.messages || [],
ref.messages?.common || [],
ref.messages?.delay || [],
ref.messages?.cancelation || [],
ref.messages?.destination || [],
ref.messages?.via || [],
Array.isArray(ref.messages) ? ref.messages : [],
ref.meldungen || [],
ref.meldungenAsObject || [],
ref.attributNotizen || [],
@ -28,12 +33,12 @@ const parseRemarks = (ctx, ref) => {
if (remark.prioritaet || remark.prio || remark.type) {
type = 'status';
}
if (!remark.priority && !remark.kategorie && remark.key || remark.disruptionID
if (!remark.priority && !remark.kategorie && remark.key || remark.disruptionID || remark.important
|| remark.prioritaet && remark.prioritaet == 'HOCH' || remark.prio && remark.prio == 'HOCH' || remark.priority && remark.priority < 100) {
type = 'warning';
}
let res = {
code: remark.code || remark.key || remark.id,
code: remark.code || remark.key || remark.id || remark.type,
summary: remark.nachrichtKurz || remark.value || remark.ueberschrift || remark.text || remark.shortText
|| Object.values(remark.descriptions || {})
.shift()?.textShort,

View file

@ -1,11 +1,14 @@
const PARTIAL_FARE_HINT = 'Teilpreis / partial fare';
const parsePrice = (ctx, raw) => {
const p = raw.angebotsPreis || raw.angebote?.preise?.gesamt?.ab; // TODO teilpreis
const p = raw.angebotsPreis || raw.angebote?.preise?.gesamt?.ab || raw.abPreis;
if (p?.betrag) {
const partialFare = raw.hasTeilpreis ?? raw.angebote?.preise?.istTeilpreis ?? raw.teilpreis;
return {
amount: p.betrag,
currency: p.waehrung,
hint: null,
hint: partialFare ? PARTIAL_FARE_HINT : null,
partialFare: partialFare,
};
}
return undefined;
@ -45,7 +48,7 @@ const parseTickets = (ctx, j) => {
partialFare: s.teilpreis,
};
if (s.teilpreis) {
p.addData = 'Teilpreis / partial fare';
p.addData = PARTIAL_FARE_HINT;
}
const conds = s.konditionsAnzeigen || s.konditionen;
if (conds) {

View file

@ -6,16 +6,16 @@
![ISC-licensed](https://img.shields.io/github/license/public-transport/db-vendo-client.svg)
[![support Jannis via GitHub Sponsors](https://img.shields.io/badge/support%20Jannis-donate-fa7664.svg)](https://github.com/sponsors/derhuerst)
This is an early version. What works:
The following [FPTF](https://github.com/public-transport/friendly-public-transport-format)/[hafas-client](https://github.com/public-transport/hafas-client/) endpoints are supported (depending on the chosen profile, see below):
* `journeys()`, `refreshJourney()` including tickets
* `journeys()`, `refreshJourney()` including tickets and bestprice option
* `locations()`, `nearby()`,
* `departures()`, `arrivals()` boards
* `trip()`
What doesn't work:
* `journeys()` details like scheduledDays, stop/station groups, some line details ...
* `journeys()` details like stop/station groups, some line details ...
* loadFactor and other details in boards
* certain stop details like products for `locations()` and geopositions for boards this can be remedied with `enrichStations` in the config (turned on by default), enriching stop info with [db-hafas-stations](https://github.com/derhuerst/db-hafas-stations).
* some query options/filters (e.g. routingMode for journeys, direction for boards)
@ -23,21 +23,25 @@ What doesn't work:
Depending on the configured profile, db-vendo-client will use multiple different DB APIs that offer varying functionality, so choose wisely:
| | `db` Profile | `dbnav` Profile | `dbweb` Profile
| ------------- | ------------- | ------------- | ------------- |
| no API key required | ✅ | ✅ | ✅ |
| max duration boards | 12h | 1h | 1h |
| remarks | not for boards | for boards only most important remarks | all remarks on boards and journeys |
| cancelled trips | contained with cancelled flag in journeys, not contained in boards | contained with cancelled flag | contained with cancelled flag |
| tickets | only for `refreshJourney()`, mutually exclusive with polylines | only for `refreshJourney()`, mutually exclusive with polylines | only for `refreshJourney()`, mutually exclusive with polylines |
| polylines | only for `refreshJourney()` (mutually exclusive with tickets) and for `trip()` (only for HAFAS trip ids) | only for `refreshJourney()/trip()`, mutually exclusive with tickets | only for `refreshJourney()/trip()`, mutually exclusive with tickets |
| trip ids used | HAFAS trip ids for journeys, RIS trip ids for boards (static on train splits?) | HAFAS trip ids | HAFAS trip ids |
| line.id/fahrtNr used | actual fahrtNr | actual fahrtNr for journeys, unreliable/route id for boards and `trip()` | unreliable/route id |
| adminCode/operator | ✅ | only for journeys | only operator |
| stopovers | not in boards | not in boards | ✅ |
| `stop()` | ✅ | ✅ | ❌ |
| assumed backend API stability | less stable | more stable | less stable |
| quotas | 60 requests per minute for journeys, unknown for boards (IPv4) | 60 requests per minute (IPv4) | ? (IPv6) |
| Profile | `db` | `dbnav` | `dbweb` | `dbbahnhof` | `dbris` |
| ------------- | ------------- | ------------- | ------------- | ------------- | ------------- |
| no API key required | ✅ | ✅ | ✅ | ✅ | ❌ |
| all above endpoints supported | ✅ | ✅ | except `stop()` | only boards | only boards |
| duration for boards | up to 12h | always 1h | always 1h | up to 6h, only from current time | up to 12h |
| remarks | not for boards | for boards only most important remarks | all remarks on boards and journeys | most remarks | all remarks |
| cancelled trips | contained with cancelled flag in journeys, not contained in boards | contained with cancelled flag | contained with cancelled flag | contained with cancelled flag | contained with cancelled flag |
| tickets | only for `refreshJourney()`, mutually exclusive with polylines | only for `refreshJourney()`, mutually exclusive with polylines | only for `refreshJourney()`, mutually exclusive with polylines | ❌ | ❌ |
| polylines | only for `refreshJourney()` (mutually exclusive with tickets) and for `trip()` (only for HAFAS trip ids) | only for `refreshJourney()/trip()`, mutually exclusive with tickets | only for `refreshJourney()/trip()`, mutually exclusive with tickets | ❌ | ❌ |
| trip ids used | HAFAS trip ids for journeys, RIS trip ids for boards (static on train splits?) | HAFAS trip ids | HAFAS trip ids | RIS trip ids | RIS trip ids |
| line.id/fahrtNr used | actual fahrtNr | actual fahrtNr for journeys, unreliable/route id for boards and `trip()` | unreliable/route id | unreliable/route id | ✅ |
| adminCode/operator | ✅ | only for journeys | only operator | only adminCode | ✅ |
| stopovers | not in boards | not in boards | ✅ | some | ✅ |
| assumed backend API stability | less stable | more stable | less stable | less stable | more stable |
| quotas | 60 requests per minute for journeys, unknown for boards (IPv4) | 60 requests per minute (IPv4) | aggressive blocking (IPv4/IPv6) | ? | depends on API key |
> [!IMPORTANT]
> If you think that for your project, quotas may become an issue, [consider alternative ways to obtain the data you need.](https://github.com/derhuerst/db-rest/blob/6/docs/readme.md#why-not-to-use-this-api).
Feel free to report anything that you stumble upon via Issues or create a PR :)
@ -81,7 +85,7 @@ There are [community-maintained TypeScript typings available as `@types/hafas-cl
`db-vendo-client` is mostly browser compatible, however none of the endpoints enables CORS, so it is impossible to use `db-vendo-client` in normal browser environments. It was tested with vite + capacitorjs and should also work with cordova or react native and similar projects.
**Limitations:** Does not work with `enrichStations` option enabled.
**Limitations:** Does not work with `enrichStations` option enabled or with the `dbris` profile.
## Related Projects

View file

@ -0,0 +1,29 @@
import tap from 'tap';
import {createClient} from '../index.js';
import {profile as rawProfile} from '../p/dbbahnhof/index.js';
import res from './fixtures/dbbahnhof-departures.json' with { type: 'json' };
import {dbDepartures as expected} from './fixtures/dbbahnhof-departures.js';
const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});
const {profile} = client;
const opt = {
direction: null,
duration: 10,
linesOfStops: true,
remarks: true,
stopovers: false,
includeRelatedStations: true,
when: '2019-08-19T20:30:00+02:00',
products: {},
};
tap.test('parses a bahnhof.de departure correctly', (t) => {
const ctx = {profile, opt, common: null, res};
const arrivals = res.entries.flat()
.map(d => profile.parseArrival(ctx, d));
t.same(arrivals, expected);
t.end();
});

View file

@ -1,7 +1,7 @@
import tap from 'tap';
import {createClient} from '../index.js';
import {profile as rawProfile} from '../p/dbweb/index.js';
import {profile as rawProfile} from '../p/dbris/index.js';
import res from './fixtures/dbris-arrivals.json' with { type: 'json' };
import {dbArrivals as expected} from './fixtures/dbris-arrivals.js';

28
test/dbris-departures.js Normal file
View file

@ -0,0 +1,28 @@
import tap from 'tap';
import {createClient} from '../index.js';
import {profile as rawProfile} from '../p/dbris/index.js';
import res from './fixtures/dbris-departures.json' with { type: 'json' };
import {dbDepartures as expected} from './fixtures/dbris-departures.js';
const client = createClient(rawProfile, 'public-transport/hafas-client:test', {enrichStations: false});
const {profile} = client;
const opt = {
direction: null,
duration: 10,
linesOfStops: true,
remarks: true,
stopovers: false,
includeRelatedStations: true,
when: '2019-08-19T20:30:00+02:00',
products: {},
};
tap.test('parses a RIS::Boards departure correctly', (t) => {
const ctx = {profile, opt, common: null, res};
const arrivals = res.departures.map(d => profile.parseArrival(ctx, d));
t.same(arrivals, expected);
t.end();
});

View file

@ -99,6 +99,7 @@ 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) => {
const res = await client.journeys(blnSchwedterStr, münchenHbf, {
results: 4,
@ -126,7 +127,7 @@ tap.test('journeys  Berlin Schwedter Str. to München Hbf', async (t) => {
});
tap.test('refreshJourney valid tickets', async (t) => {
const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
const T_MOCK = 1758279600 * 1000;
const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
const journeysRes = await client.journeys(berlinHbf, münchenHbf, {
@ -230,7 +231,7 @@ tap.test('journeys: via works with detour', async (t) => {
// 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) => {
@ -260,7 +261,7 @@ if (!process.env.VCR_MODE) {
}
tap.test('refreshJourney', async (t) => {
const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
const T_MOCK = 1763542800 * 1000;
const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
const validate = createValidate({...cfg, when});

146
test/e2e/dbbahnhof.js Normal file
View file

@ -0,0 +1,146 @@
import tap from 'tap';
import isRoughlyEqual from 'is-roughly-equal';
import {createWhen} from './lib/util.js';
import {createClient} from '../../index.js';
import {profile as dbProfile} from '../../p/dbregioguide/index.js';
import {
createValidateStation,
createValidateTrip,
} from './lib/validators.js';
import {createValidateFptfWith as createValidate} from './lib/validate-fptf-with.js';
import {testJourneysStationToStation} from './lib/journeys-station-to-station.js';
import {testJourneysStationToAddress} from './lib/journeys-station-to-address.js';
import {testJourneysStationToPoi} from './lib/journeys-station-to-poi.js';
import {testEarlierLaterJourneys} from './lib/earlier-later-journeys.js';
import {testLegCycleAlternatives} from './lib/leg-cycle-alternatives.js';
import {testRefreshJourney} from './lib/refresh-journey.js';
import {journeysFailsWithNoProduct} from './lib/journeys-fails-with-no-product.js';
import {testDepartures} from './lib/departures.js';
import {testArrivals} from './lib/arrivals.js';
import {testJourneysWithDetour} from './lib/journeys-with-detour.js';
const isObj = o => o !== null && 'object' === typeof o && !Array.isArray(o);
const minute = 60 * 1000;
const T_MOCK = 1747040400 * 1000; // 2025-05-12T08:00:00+01:00
const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
const cfg = {
when,
stationCoordsOptional: true, // TODO
products: dbProfile.products,
minLatitude: 46.673100,
maxLatitude: 55.030671,
minLongitude: 6.896517,
maxLongitude: 16.180237,
};
const validate = createValidate(cfg);
const assertValidPrice = (t, p) => {
t.ok(p);
if (p.amount !== null) {
t.equal(typeof p.amount, 'number');
t.ok(p.amount > 0);
}
if (p.hint !== null) {
t.equal(typeof p.hint, 'string');
t.ok(p.hint);
}
};
const assertValidTickets = (test, tickets) => {
test.ok(Array.isArray(tickets));
for (let fare of tickets) {
test.equal(typeof fare.name, 'string', 'Mandatory field "name" is missing or not a string');
test.ok(fare.name);
test.ok(isObj(fare.priceObj), 'Mandatory field "priceObj" is missing or not an object');
test.equal(typeof fare.priceObj.amount, 'number', 'Mandatory field "amount" in "priceObj" is missing or not a number');
test.ok(fare.priceObj.amount > 0);
if ('currency' in fare.priceObj) {
test.equal(typeof fare.priceObj.currency, 'string');
}
// Check optional fields
if ('addData' in fare) {
test.equal(typeof fare.addData, 'string');
}
if ('addDataTicketInfo' in fare) {
test.equal(typeof fare.addDataTicketInfo, 'string');
}
if ('addDataTicketDetails' in fare) {
test.equal(typeof fare.addDataTicketDetails, 'string');
}
if ('addDataTravelInfo' in fare) {
test.equal(typeof fare.addDataTravelInfo, 'string');
}
if ('addDataTravelDetails' in fare) {
test.equal(typeof fare.firstClass, 'boolean');
}
}
};
const client = createClient(dbProfile, 'public-transport/hafas-client:test', {enrichStations: false});
const berlinHbf = '8011160';
const münchenHbf = '8000261';
const jungfernheide = '8011167';
const blnSchwedterStr = '732652';
const westhafen = '8089116';
const wedding = '8089131';
const württembergallee = '731084';
const regensburgHbf = '8000309';
const blnOstbahnhof = '8010255';
const blnTiergarten = '8089091';
const blnJannowitzbrücke = '8089019';
const potsdamHbf = '8012666';
const berlinSüdkreuz = '8011113';
const kölnHbf = '8000207';
tap.test('departures at Berlin Schwedter Str.', async (t) => {
const res = await client.departures(blnSchwedterStr, {
duration: 5, when,
});
await testDepartures({
test: t,
res,
validate,
id: blnSchwedterStr,
});
t.end();
});
tap.test('departures with station object', async (t) => {
const res = await client.departures({
type: 'station',
id: jungfernheide,
name: 'Berlin Jungfernheide',
location: {
type: 'location',
latitude: 1.23,
longitude: 2.34,
},
}, {when});
validate(t, res, 'departuresResponse', 'res');
t.end();
});
tap.test('arrivals at Berlin Schwedter Str.', async (t) => {
const res = await client.arrivals(blnSchwedterStr, {
duration: 5, when,
});
await testArrivals({
test: t,
res,
validate,
id: blnSchwedterStr,
});
t.end();
});

View file

@ -126,7 +126,7 @@ tap.test('journeys  Berlin Schwedter Str. to München Hbf', async (t) => {
});
tap.test('refreshJourney valid tickets', async (t) => {
const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
const T_MOCK = 1758279600 * 1000;
const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
const journeysRes = await client.journeys(berlinHbf, münchenHbf, {
@ -151,6 +151,7 @@ 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) => {
await journeysFailsWithNoProduct({
test: t,
@ -260,7 +261,7 @@ if (!process.env.VCR_MODE) {
}
tap.test('refreshJourney', async (t) => {
const T_MOCK = 1710831600 * 1000; // 2024-03-19T08:00:00+01:00
const T_MOCK = 1763542800 * 1000;
const when = createWhen(dbProfile.timezone, dbProfile.locale, T_MOCK);
const validate = createValidate({...cfg, when});
@ -275,6 +276,7 @@ tap.test('refreshJourney', async (t) => {
});
t.end();
});
}
/*
tap.skip('journeysFromTrip U Mehringdamm to U Naturkundemuseum, reroute to Spittelmarkt.', async (t) => {

View file

@ -99,6 +99,7 @@ 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) => {
const res = await client.journeys(blnSchwedterStr, münchenHbf, {
results: 4,
@ -276,6 +277,7 @@ tap.test('refreshJourney', async (t) => {
t.end();
});
/*
tap.skip('journeysFromTrip U Mehringdamm to U Naturkundemuseum, reroute to Spittelmarkt.', async (t) => {
const blnMehringdamm = '730939';
@ -393,6 +395,7 @@ tap.test('trip details', async (t) => {
t.end();
});
}
tap.test('departures at Berlin Schwedter Str.', async (t) => {
const res = await client.departures(blnSchwedterStr, {

File diff suppressed because one or more lines are too long

492
test/fixtures/dbbahnhof-departures.js vendored Normal file
View file

@ -0,0 +1,492 @@
const dbDepartures = [
{
tripId: '20250322-f6cd6d71-510f-378c-b825-fbb9380f5b03',
stop: {
type: 'station',
id: '8000105',
name: 'Frankfurt(Main)Hbf',
},
when: '2025-03-22T00:42:00+01:00',
plannedWhen: '2025-03-22T00:42:00+01:00',
delay: 0,
platform: '11',
plannedPlatform: '11',
direction: 'Fulda',
provenance: null,
line: {
type: 'line',
id: 'rb51',
fahrtNr: '51',
name: 'RB51',
public: true,
adminCode: '8005KG',
productName: 'RB',
mode: 'train',
product: 'regional',
operator: null,
},
remarks: [
{
code: 'bicycle-transport',
summary: 'Limited bicycle transport possible',
text: 'Limited bicycle transport possible',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8000115',
name: 'Fulda',
},
},
{
tripId: '20250321-69f912f7-2b47-3ffd-b00f-708e8c568f6b',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:43:00+01:00',
plannedWhen: '2025-03-22T00:42:00+01:00',
delay: 60,
platform: '103',
plannedPlatform: '103',
direction: 'Wiesbaden Hbf',
provenance: null,
line: {
type: 'line',
id: 's1',
fahrtNr: '1',
name: 'S1',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'bicycle-transport',
summary: 'Limited bicycle transport possible',
text: 'Limited bicycle transport possible',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8000250',
name: 'Wiesbaden Hbf',
},
},
{
tripId: '20250322-fcf0de07-fc6e-3aeb-9757-3b08e6760c3f',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:44:00+01:00',
plannedWhen: '2025-03-22T00:44:00+01:00',
delay: null,
platform: null,
plannedPlatform: null,
direction: 'Bad Soden(Taunus)',
provenance: null,
line: {
type: 'line',
id: 'sev',
fahrtNr: '',
name: 'SEV',
public: true,
adminCode: 'B4',
productName: 'SEV',
mode: 'train',
product: 'regional',
operator: null,
},
remarks: [
{
code: 'replacement-service',
summary: 'Replacement bus for {{1}}',
text: 'Replacement bus for {{1}}',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8000752',
name: 'Bad Soden(Taunus)',
},
},
{
tripId: '20250321-bff43415-303b-36ad-ae4e-8d9605fc3f1e',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:44:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '102',
prognosedPlatform: '102',
direction: 'Offenbach(Main)Ost',
provenance: null,
line: {
type: 'line',
id: 's8',
fahrtNr: '8',
name: 'S8',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'unplanned-info',
summary: 'Defective signal box',
text: 'Defective signal box',
type: 'status',
},
{
code: 'canceled-trip',
summary: 'Trip cancelled',
text: 'Trip cancelled',
type: 'warning',
},
],
origin: null,
destination: {
type: 'station',
id: '8004645',
name: 'Offenbach(Main)Ost',
},
cancelled: true,
},
{
tripId: '20250322-1423f343-0076-3f29-b1e8-004dc1f27068',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:47:00+01:00',
plannedWhen: '2025-03-22T00:47:00+01:00',
delay: 0,
platform: '101',
plannedPlatform: '101',
direction: 'Darmstadt Hbf',
provenance: null,
line: {
type: 'line',
id: 's6',
fahrtNr: '6',
name: 'S6',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'bicycle-transport',
summary: 'Limited bicycle transport possible',
text: 'Limited bicycle transport possible',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8000068',
name: 'Darmstadt Hbf',
},
},
{
tripId: '20250322-f2c61208-75b1-3c19-a580-172988addf2c',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:47:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '103',
prognosedPlatform: '103',
direction: 'Wiesbaden Hbf',
provenance: null,
line: {
type: 'line',
id: 's8',
fahrtNr: '8',
name: 'S8',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'unplanned-info',
summary: 'Defective signal box',
text: 'Defective signal box',
type: 'status',
},
{
code: 'canceled-trip',
summary: 'Trip cancelled',
text: 'Trip cancelled',
type: 'warning',
},
],
origin: null,
destination: {
type: 'station',
id: '8000250',
name: 'Wiesbaden Hbf',
},
cancelled: true,
},
{
tripId: '20250322-841901b7-7420-3890-8691-05c8cbbacdce',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T01:05:00+01:00',
plannedWhen: '2025-03-22T00:49:00+01:00',
delay: 960,
platform: '102',
plannedPlatform: '102',
direction: 'Rödermark-Ober Roden',
provenance: null,
line: {
type: 'line',
id: 's1',
fahrtNr: '1',
name: 'S1',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'unplanned-info',
summary: 'Repair on the turnout',
text: 'Repair on the turnout',
type: 'status',
},
{
code: 'bicycle-transport',
summary: 'Limited bicycle transport possible',
text: 'Limited bicycle transport possible',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8000285',
name: 'Rödermark-Ober Roden',
},
},
{
tripId: '20250322-08673537-4773-3e90-afa3-ab467119a609',
stop: {
type: 'station',
id: '100010',
name: 'Hauptbahnhof, Frankfurt a.M.',
},
when: '2025-03-22T00:50:00+01:00',
plannedWhen: '2025-03-22T00:50:00+01:00',
delay: 0,
platform: null,
plannedPlatform: null,
direction: 'Bockenheimer Warte, Frankfurt a.M.',
provenance: null,
line: {
type: 'line',
id: 'u4',
fahrtNr: '4',
name: 'U4',
public: true,
adminCode: 'rmv255',
productName: 'U',
mode: 'train',
product: 'subway',
operator: null,
},
remarks: [],
origin: null,
destination: {
type: 'station',
id: '101201',
name: 'Bockenheimer Warte, Frankfurt a.M.',
},
},
{
tripId: '20250322-29a07ddd-969e-3660-ae2e-4d6c6af4a866',
stop: {
type: 'station',
id: '8000105',
name: 'Frankfurt(Main)Hbf',
},
when: null,
plannedWhen: '2025-03-22T00:50:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '2',
prognosedPlatform: '2',
direction: 'Riedstadt-Goddelau',
provenance: null,
line: {
type: 'line',
id: 's7',
fahrtNr: '7',
name: 'S7',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'unplanned-info',
summary: 'Short-term unavailability of employees',
text: 'Short-term unavailability of employees',
type: 'status',
},
{
code: 'canceled-trip',
summary: 'Trip cancelled',
text: 'Trip cancelled',
type: 'warning',
},
],
origin: null,
destination: {
type: 'station',
id: '8000126',
name: 'Riedstadt-Goddelau',
},
cancelled: true,
},
{
tripId: '20250322-01575b72-00ad-36da-bc88-49410d87321a',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:52:00+01:00',
plannedWhen: '2025-03-22T00:52:00+01:00',
delay: 0,
platform: '103',
plannedPlatform: '103',
direction: 'Niedernhausen(Taunus)',
provenance: null,
line: {
type: 'line',
id: 's2',
fahrtNr: '2',
name: 'S2',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'bicycle-transport',
summary: 'Limited bicycle transport possible',
text: 'Limited bicycle transport possible',
type: 'status',
},
],
origin: null,
destination: {
type: 'station',
id: '8004400',
name: 'Niedernhausen(Taunus)',
},
},
{
tripId: '20250322-2b5b5913-2b2d-39da-b29d-2fff067ba6a2',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:52:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '101',
prognosedPlatform: '101',
direction: 'Frankfurt(Main)Süd',
provenance: null,
line: {
type: 'line',
id: 's4',
fahrtNr: '4',
name: 'S4',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: null,
},
remarks: [
{
code: 'unplanned-info',
summary: 'Defective signal box',
text: 'Defective signal box',
type: 'status',
},
{
code: 'canceled-trip',
summary: 'Trip cancelled',
text: 'Trip cancelled',
type: 'warning',
},
],
origin: null,
destination: {
type: 'station',
id: '8002041',
name: 'Frankfurt(Main)Süd',
},
cancelled: true,
},
];
export {
dbDepartures,
};

File diff suppressed because one or more lines are too long

View file

@ -212,6 +212,7 @@ const dbNavJourney = {
amount: 43.99,
currency: 'EUR',
hint: null,
partialFare: false,
},
tickets: [
{

580
test/fixtures/dbris-departures.js vendored Normal file
View file

@ -0,0 +1,580 @@
const dbDepartures = [
{
tripId: '20250321-69f912f7-2b47-3ffd-b00f-708e8c568f6b',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:43:00+01:00',
plannedWhen: '2025-03-22T00:42:00+01:00',
delay: 60,
platform: '103',
plannedPlatform: '103',
direction: 'Wiesbaden Hbf',
provenance: null,
line: {
type: 'line',
id: 's-1',
fahrtNr: '35182',
name: 'S 1',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: '43',
summary: 'Verspätung eines vorausfahrenden Zuges',
text: 'Verspätung eines vorausfahrenden Zuges',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8000250',
name: 'Wiesbaden Hbf',
},
},
{
tripId: '20250322-fcf0de07-fc6e-3aeb-9757-3b08e6760c3f',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:44:00+01:00',
plannedWhen: '2025-03-22T00:44:00+01:00',
delay: null,
platform: null,
plannedPlatform: null,
direction: null,
provenance: null,
line: {
type: 'line',
id: 'bus-sev-353821',
fahrtNr: '353821',
name: 'Bus SEV',
public: true,
adminCode: 'B4',
productName: 'Bus',
mode: 'train',
product: 'regional',
operator: {
type: 'operator',
id: '---',
name: 'Busse/SEV S-Bahn Rhein-Main',
},
},
remarks: [],
origin: null,
destination: {
type: 'station',
id: '8000752',
name: 'Bad Soden(Taunus)',
},
},
{
tripId: '20250321-bff43415-303b-36ad-ae4e-8d9605fc3f1e',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:44:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '102',
prognosedPlatform: '102',
direction: 'Offenbach(Main)Ost',
provenance: null,
line: {
type: 'line',
id: 's-8',
fahrtNr: '35883',
name: 'S 8',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: undefined,
summary: 'S8: Kein Betrieb möglich. Grund: Erkrankung von Stellwerkspersonal. Dauer der Beeinträchtigung bis Betriebsschluss. Ersatzverkehr mit Bussen eingerichtet. Andere Verkehrsmittel mit einbeziehen. Reiseverbindung frühzeitig prüfen.',
text: 'Auf der S8 ist kein Betrieb möglich. Der Grund ist eine Erkrankung von Stellwerkspersonal. Dauer der Beeinträchtigung bis Betriebsschluss. Wir haben für Sie einen Ersatzverkehr mit 8 Bussen der Firma Holiday-Reisen GmbH zwischen Wiesbaden Hbf und Frankfurt(M) Flughafen Regionalbf eingerichtet. Außerdem haben wir für Sie ab ca. 01:00 Uhr einen Ersatzverkehr mit 4 Bussen der Firma Holiday-Reisen GmbH zwischen Hanau Hbf und Offenbach(Main)Ost eingerichtet. Beziehen Sie auch andere Verkehrsmittel mit ein, um an Ihr Reiseziel zu gelangen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können.',
type: 'warning',
},
{
code: '40',
summary: 'defektes Stellwerk',
text: 'defektes Stellwerk',
type: 'status',
},
{
code: 'CUSTOMER_TEXT',
summary: 'Auf der S8 und S9 kommt es zwischen Wiesbaden Hbf - Frankfurt(M) Flughafen Regionalbf - Frankfurt(Main)Hbf - Offenbach(Main)Ost in den Nächten bis zum 22.03.25 zu geänderten Fahrtzeiten, einzelnen Umleitungen, Teil- und Zugausfällen. Der Grund sind Bauarbeiten. Auf dem jeweils ausfallenden Abschnitt haben wir für Sie einen Ersatzverkehr mit Bussen eingerichtet. Die Mitnahme von Fahrrädern im Bus ist ausgeschlossen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können. Die Fahrplanänderungen zu dieser Baumaßnahme sind in die Online-Fahrplanauskünfte eingearbeitet.',
text: 'Auf der S8 und S9 kommt es zwischen Wiesbaden Hbf - Frankfurt(M) Flughafen Regionalbf - Frankfurt(Main)Hbf - Offenbach(Main)Ost in den Nächten bis zum 22.03.25 zu geänderten Fahrtzeiten, einzelnen Umleitungen, Teil- und Zugausfällen. Der Grund sind Bauarbeiten. Auf dem jeweils ausfallenden Abschnitt haben wir für Sie einen Ersatzverkehr mit Bussen eingerichtet. Die Mitnahme von Fahrrädern im Bus ist ausgeschlossen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können. Die Fahrplanänderungen zu dieser Baumaßnahme sind in die Online-Fahrplanauskünfte eingearbeitet.',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8004645',
name: 'Offenbach(Main)Ost',
},
cancelled: true,
},
{
tripId: '20250322-f2c61208-75b1-3c19-a580-172988addf2c',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:47:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '103',
prognosedPlatform: '103',
direction: 'Wiesbaden Hbf',
provenance: null,
line: {
type: 'line',
id: 's-8',
fahrtNr: '35884',
name: 'S 8',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: undefined,
summary: 'S8: Kein Betrieb möglich. Grund: Erkrankung von Stellwerkspersonal. Dauer der Beeinträchtigung bis Betriebsschluss. Ersatzverkehr mit Bussen eingerichtet. Andere Verkehrsmittel mit einbeziehen. Reiseverbindung frühzeitig prüfen.',
text: 'Auf der S8 ist kein Betrieb möglich. Der Grund ist eine Erkrankung von Stellwerkspersonal. Dauer der Beeinträchtigung bis Betriebsschluss. Wir haben für Sie einen Ersatzverkehr mit 8 Bussen der Firma Holiday-Reisen GmbH zwischen Wiesbaden Hbf und Frankfurt(M) Flughafen Regionalbf eingerichtet. Außerdem haben wir für Sie ab ca. 01:00 Uhr einen Ersatzverkehr mit 4 Bussen der Firma Holiday-Reisen GmbH zwischen Hanau Hbf und Offenbach(Main)Ost eingerichtet. Beziehen Sie auch andere Verkehrsmittel mit ein, um an Ihr Reiseziel zu gelangen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können.',
type: 'warning',
},
{
code: '40',
summary: 'defektes Stellwerk',
text: 'defektes Stellwerk',
type: 'status',
},
{
code: 'CUSTOMER_TEXT',
summary: 'Die Halte Frankfurt(Main)-Gateway Gardens, Frankfurt(M) Flughafen Regionalbf und Kelsterbach entfallen. Bitte prüfen Sie Ihre Reiseverbindung kurz vor der Abfahrt des Zuges.',
text: 'Die Halte Frankfurt(Main)-Gateway Gardens, Frankfurt(M) Flughafen Regionalbf und Kelsterbach entfallen. Bitte prüfen Sie Ihre Reiseverbindung kurz vor der Abfahrt des Zuges.',
type: 'status',
},
{
code: 'CUSTOMER_TEXT',
summary: 'Auf der S8 und S9 kommt es zwischen Wiesbaden Hbf - Frankfurt(M) Flughafen Regionalbf - Frankfurt(Main)Hbf - Offenbach(Main)Ost in den Nächten bis zum 22.03.25 zu geänderten Fahrtzeiten, einzelnen Umleitungen, Teil- und Zugausfällen. Der Grund sind Bauarbeiten. Auf dem jeweils ausfallenden Abschnitt haben wir für Sie einen Ersatzverkehr mit Bussen eingerichtet. Die Mitnahme von Fahrrädern im Bus ist ausgeschlossen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können. Die Fahrplanänderungen zu dieser Baumaßnahme sind in die Online-Fahrplanauskünfte eingearbeitet.',
text: 'Auf der S8 und S9 kommt es zwischen Wiesbaden Hbf - Frankfurt(M) Flughafen Regionalbf - Frankfurt(Main)Hbf - Offenbach(Main)Ost in den Nächten bis zum 22.03.25 zu geänderten Fahrtzeiten, einzelnen Umleitungen, Teil- und Zugausfällen. Der Grund sind Bauarbeiten. Auf dem jeweils ausfallenden Abschnitt haben wir für Sie einen Ersatzverkehr mit Bussen eingerichtet. Die Mitnahme von Fahrrädern im Bus ist ausgeschlossen. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können. Die Fahrplanänderungen zu dieser Baumaßnahme sind in die Online-Fahrplanauskünfte eingearbeitet.',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8000250',
name: 'Wiesbaden Hbf',
},
cancelled: true,
},
{
tripId: '20250322-1423f343-0076-3f29-b1e8-004dc1f27068',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:47:00+01:00',
plannedWhen: '2025-03-22T00:47:00+01:00',
delay: 0,
platform: '101',
plannedPlatform: '101',
direction: 'Darmstadt Hbf',
provenance: null,
line: {
type: 'line',
id: 's-6',
fahrtNr: '36683',
name: 'S 6',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8000068',
name: 'Darmstadt Hbf',
},
},
{
tripId: '20250322-841901b7-7420-3890-8691-05c8cbbacdce',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T01:05:00+01:00',
plannedWhen: '2025-03-22T00:49:00+01:00',
delay: 960,
platform: '102',
plannedPlatform: '102',
direction: 'Rödermark-Ober Roden',
provenance: null,
line: {
type: 'line',
id: 's-1',
fahrtNr: '35185',
name: 'S 1',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: '64',
summary: 'Reparatur an einer Weiche',
text: 'Reparatur an einer Weiche',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8000285',
name: 'Rödermark-Ober Roden',
},
},
{
tripId: '20250322-08673537-4773-3e90-afa3-ab467119a609',
stop: {
type: 'station',
id: '100010',
name: 'Hauptbahnhof, Frankfurt a.M.',
},
when: '2025-03-22T00:50:00+01:00',
plannedWhen: '2025-03-22T00:50:00+01:00',
delay: 0,
platform: null,
plannedPlatform: null,
direction: 'Bockenheimer Warte, Frankfurt a.M.',
provenance: null,
line: {
type: 'line',
id: 'u-4',
fahrtNr: '1954',
name: 'U 4',
public: true,
adminCode: 'rmv255',
productName: 'U',
mode: 'train',
product: 'subway',
operator: {
type: 'operator',
id: 'DPN',
name: 'Nahreisezug',
},
},
remarks: [],
origin: null,
destination: {
type: 'station',
id: '101201',
name: 'Bockenheimer Warte, Frankfurt a.M.',
},
},
{
tripId: '20250322-29a07ddd-969e-3660-ae2e-4d6c6af4a866',
stop: {
type: 'station',
id: '8000105',
name: 'Frankfurt(Main)Hbf',
},
when: null,
plannedWhen: '2025-03-22T00:50:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '2',
prognosedPlatform: '2',
direction: 'Riedstadt-Goddelau',
provenance: null,
line: {
type: 'line',
id: 's-7',
fahrtNr: '35787',
name: 'S 7',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: undefined,
summary: 'S7: Kein Betrieb möglich. Grund: Kurzfristige Erkrankung von Personal. Am 21.03.25/22.03.25 von 18:00 Uhr bis voraussichtlich 03:00 Uhr. Alternative Reisemöglichkeit: RE70. Die Züge halten zusätzlich in Riedstadt-Wolfskehlen - Groß Gerau-Dornheim - Zeppelinheim. Reiseverbindung frühzeitig prüfen.',
text: 'Auf der S7 ist kein Betrieb möglich. Der Grund ist eine kurzfristige Erkrankung von Personal. Die Beeinträchtigung ist am 21.03.25/22.03.25 von 18:00 Uhr bis voraussichtlich 03:00 Uhr. Alternative Reisemöglichkeit: RE70. Die Züge halten zusätzlich für Sie in Riedstadt-Wolfskehlen - Groß Gerau-Dornheim - Zeppelinheim zum Ein- und Ausstieg. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können.',
type: 'warning',
},
{
code: '49',
summary: 'kurzfristiger Personalausfall',
text: 'kurzfristiger Personalausfall',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8000126',
name: 'Riedstadt-Goddelau',
},
cancelled: true,
},
{
tripId: '20250322-01575b72-00ad-36da-bc88-49410d87321a',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: '2025-03-22T00:52:00+01:00',
plannedWhen: '2025-03-22T00:52:00+01:00',
delay: 0,
platform: '103',
plannedPlatform: '103',
direction: 'Niedernhausen(Taunus)',
provenance: null,
line: {
type: 'line',
id: 's-2',
fahrtNr: '35284',
name: 'S 2',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8004400',
name: 'Niedernhausen(Taunus)',
},
},
{
tripId: '20250322-2b5b5913-2b2d-39da-b29d-2fff067ba6a2',
stop: {
type: 'station',
id: '8098105',
name: 'Frankfurt Hbf (tief)',
},
when: null,
plannedWhen: '2025-03-22T00:52:00+01:00',
prognosedWhen: null,
delay: null,
platform: null,
plannedPlatform: '101',
prognosedPlatform: '101',
direction: 'Frankfurt(Main)Süd',
provenance: null,
line: {
type: 'line',
id: 's-4',
fahrtNr: '35483',
name: 'S 4',
public: true,
adminCode: '800528',
productName: 'S',
mode: 'train',
product: 'suburban',
operator: {
type: 'operator',
id: 'DB',
name: 'DB Regio, S-Bahn Rhein-Main',
},
},
remarks: [
{
code: undefined,
summary: 'S3 und S4: Kein Betrieb möglich. Am 21./22.03.25 von 20:00 Uhr bis voraussichtlich 04:00 Uhr. Grund: Erkrankung von Stellwerkspersonal. Ersatzverkehr mit Bussen eingerichtet. Reiseverbindung frühzeitig prüfen.',
text: 'Auf der S3 und S4 ist kein Betrieb möglich. Die Beeinträchtigung ist am 21./22.03.25 von 20:00 Uhr bis voraussichtlich 04:00 Uhr. Der Grund ist eine Erkrankung von Stellwerkspersonal. Wir haben für Sie einen Ersatzverkehr mit 8 Bussen der Firma Holiday-Reisen GmbH zwischen Frankfurt(Main)Hbf und Bad Soden(Taunus) eingerichtet. Außerdem haben wir für Sie einen Ersatzverkehr mit 7 Bussen der Firma Holiday-Reisen GmbH zwischen Frankfurt(Main)Hbf und Kronberg(Taunus) eingerichtet. Bitte informieren Sie sich frühzeitig über Ihre geplanten Verbindungen und wählen Sie gegebenenfalls eine frühere Zugverbindung, um Ihre Anschlüsse an Ihren Umsteigebahnhöfen erreichen zu können.',
type: 'warning',
},
{
code: '40',
summary: 'defektes Stellwerk',
text: 'defektes Stellwerk',
type: 'status',
},
{
code: 'FK',
summary: 'Fahrradmitnahme begrenzt möglich',
text: 'Fahrradmitnahme begrenzt möglich',
type: 'hint',
},
{
code: 'EH',
summary: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
text: 'Fahrzeuggebundene Einstiegshilfe vorhanden',
type: 'hint',
},
],
origin: null,
destination: {
type: 'station',
id: '8002041',
name: 'Frankfurt(Main)Süd',
},
cancelled: true,
},
];
export {
dbDepartures,
};

1
test/fixtures/dbris-departures.json vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -1290,7 +1290,7 @@ const dbwebDepartures = [
},
remarks: [
{
code: undefined,
code: 'HALT_AUSFALL',
summary: 'Halt entfällt',
text: 'Halt entfällt',
type: 'warning',

View file

@ -292,7 +292,7 @@ const dbwebJourney = {
},
],
refreshToken: '¶HKI¶T$A=1@O=Köln Hbf@X=6958730@Y=50943029@L=8000207@a=128@$A=1@O=Köln Messe/Deutz@X=6975000@Y=50940872@L=8003368@a=128@$202504110511$202504110512$S 12$$1$$$$$$§W$A=1@O=Köln Messe/Deutz@X=6975000@Y=50940872@L=8003368@a=128@$A=1@O=Köln Messe/Deutz Gl.11-12@X=6974065@Y=50941717@L=8073368@a=128@$202504110512$202504110519$$$1$$$$$$§T$A=1@O=Köln Messe/Deutz Gl.11-12@X=6974065@Y=50941717@L=8073368@a=128@$A=1@O=Nürnberg Hbf@X=11082989@Y=49445615@L=8000284@a=128@$202504110520$202504110858$ICE 523$$1$$$$$$',
price: {amount: 31.49, currency: 'EUR', hint: null},
price: {amount: 31.49, currency: 'EUR', hint: null, partialFare: false},
tickets: [{
name: 'from',
priceObj: {

View file

@ -210,6 +210,7 @@ const dbJourney = {
amount: 27.99,
currency: 'EUR',
hint: null,
partialFare: false,
},
tickets: [
{

View file

@ -41,6 +41,10 @@ const berlinWienQuery0 = Object.freeze(
einstiegsTypList: [
'STANDARD',
],
fahrverguenstigungen: {
deutschlandTicketVorhanden: undefined,
nurDeutschlandTicketVerbindungen: undefined,
},
klasse: 'KLASSE_2',
reiseHin: {
wunsch: {

View file

@ -57,8 +57,8 @@ const berlinWienQuery0 = Object.freeze(
sitzplatzOnly: false,
bikeCarriage: false,
reservierungsKontingenteVorhanden: false,
nurDeutschlandTicketVerbindungen: false,
deutschlandTicketVorhanden: false,
nurDeutschlandTicketVerbindungen: undefined,
deutschlandTicketVorhanden: undefined,
maxUmstiege: null,
zwischenhalte: null,
minUmstiegszeit: 0,