@fin.cx/opendata 4.6.0 → 4.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/handelsregister/classes.handelsregisterclient.d.ts +8 -2
- package/dist_ts/handelsregister/classes.handelsregisterclient.js +14 -5
- package/dist_ts/handelsregister/classes.handelsregistererror.d.ts +3 -1
- package/dist_ts/handelsregister/classes.handelsregistererror.js +1 -1
- package/dist_ts/handelsregister/classes.portalsession.d.ts +19 -3
- package/dist_ts/handelsregister/classes.portalsession.js +67 -9
- package/dist_ts/handelsregister/interfaces.d.ts +9 -2
- package/package.json +3 -3
- package/readme.md +4 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/handelsregister/classes.handelsregisterclient.ts +18 -4
- package/ts/handelsregister/classes.handelsregistererror.ts +3 -0
- package/ts/handelsregister/classes.portalsession.ts +78 -9
- package/ts/handelsregister/interfaces.ts +9 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@fin.cx/opendata',
|
|
6
|
-
version: '4.
|
|
6
|
+
version: '4.7.0',
|
|
7
7
|
description: 'Open business and financial data for TypeScript: register lookups on the German register portal (handelsregister.de) without storage, the statutory public holidays of the German federal states, the base rate of § 247 BGB, the German consumer price index with the arithmetic of index clauses, and stock and crypto prices and fundamentals from several providers.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxrQkFBa0I7SUFDeEIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDBXQUEwVztDQUN4WCxDQUFBIn0=
|
|
@@ -5,14 +5,18 @@ import type { IHandelsregisterClientOptions, IRegisterCallOptions, IRegisterEntr
|
|
|
5
5
|
* plain HTTP and without storage.
|
|
6
6
|
*
|
|
7
7
|
* Every call opens its own visit to the portal and forgets it afterwards: nothing is cached or
|
|
8
|
-
* shared between calls. The client never
|
|
9
|
-
*
|
|
8
|
+
* shared between calls. The client never logs, and asks its gate before every request the portal's
|
|
9
|
+
* terms count:
|
|
10
10
|
* - `search()` makes one counted search;
|
|
11
11
|
* - `getEntry()` makes one counted search and, when the portal offers structured content for the
|
|
12
12
|
* entry, one counted retrieval.
|
|
13
13
|
*
|
|
14
14
|
* Each search also loads the search form and the result list, two pages the terms do not count.
|
|
15
15
|
*
|
|
16
|
+
* The client repeats a request only when the portal closed the connection without answering it,
|
|
17
|
+
* and only once: the portal's front end does that to have the request sent again. A counted request
|
|
18
|
+
* sent once more asks the gate again and counts again.
|
|
19
|
+
*
|
|
16
20
|
* The portal's terms allow single lookups for information only, at most 60 searches or
|
|
17
21
|
* retrievals per hour, and no systematic retrieval to build or update a copy of the registers.
|
|
18
22
|
*/
|
|
@@ -49,6 +53,8 @@ export declare class HandelsregisterClient {
|
|
|
49
53
|
* error of the gate reaches the caller unchanged.
|
|
50
54
|
*/
|
|
51
55
|
private acquireSlot;
|
|
56
|
+
/** asks the gate for a counted request the portal dropped before it is sent once more, and counts it */
|
|
57
|
+
private countAgain;
|
|
52
58
|
private runSearch;
|
|
53
59
|
private pickRow;
|
|
54
60
|
private retrieveStructuredContent;
|
|
@@ -72,14 +72,18 @@ const decodeUtf8 = (bytesArg) => new TextDecoder('utf-8').decode(bytesArg);
|
|
|
72
72
|
* plain HTTP and without storage.
|
|
73
73
|
*
|
|
74
74
|
* Every call opens its own visit to the portal and forgets it afterwards: nothing is cached or
|
|
75
|
-
* shared between calls. The client never
|
|
76
|
-
*
|
|
75
|
+
* shared between calls. The client never logs, and asks its gate before every request the portal's
|
|
76
|
+
* terms count:
|
|
77
77
|
* - `search()` makes one counted search;
|
|
78
78
|
* - `getEntry()` makes one counted search and, when the portal offers structured content for the
|
|
79
79
|
* entry, one counted retrieval.
|
|
80
80
|
*
|
|
81
81
|
* Each search also loads the search form and the result list, two pages the terms do not count.
|
|
82
82
|
*
|
|
83
|
+
* The client repeats a request only when the portal closed the connection without answering it,
|
|
84
|
+
* and only once: the portal's front end does that to have the request sent again. A counted request
|
|
85
|
+
* sent once more asks the gate again and counts again.
|
|
86
|
+
*
|
|
83
87
|
* The portal's terms allow single lookups for information only, at most 60 searches or
|
|
84
88
|
* retrievals per hour, and no systematic retrieval to build or update a copy of the registers.
|
|
85
89
|
*/
|
|
@@ -226,6 +230,11 @@ export class HandelsregisterClient {
|
|
|
226
230
|
throw error;
|
|
227
231
|
}
|
|
228
232
|
}
|
|
233
|
+
/** asks the gate for a counted request the portal dropped before it is sent once more, and counts it */
|
|
234
|
+
async countAgain(kindArg, stepArg, progressArg) {
|
|
235
|
+
await this.acquireSlot(kindArg, stepArg, progressArg);
|
|
236
|
+
progressArg.countedRequests += 1;
|
|
237
|
+
}
|
|
229
238
|
async runSearch(planArg, progressArg, sessionArg) {
|
|
230
239
|
await this.acquireSlot('search', 'search', progressArg);
|
|
231
240
|
try {
|
|
@@ -270,7 +279,7 @@ export class HandelsregisterClient {
|
|
|
270
279
|
forms.setField(fields, field.searchButton, '');
|
|
271
280
|
progressArg.step = 'search';
|
|
272
281
|
progressArg.countedRequests += 1;
|
|
273
|
-
const resultPage = await sessionArg.post(sessionArg.resolve(form.action, formPage.url), fields);
|
|
282
|
+
const resultPage = await sessionArg.post(sessionArg.resolve(form.action, formPage.url), fields, () => this.countAgain('search', 'search', progressArg));
|
|
274
283
|
progressArg.step = 'result_list';
|
|
275
284
|
const resultText = decodeUtf8(resultPage.body);
|
|
276
285
|
try {
|
|
@@ -333,7 +342,7 @@ export class HandelsregisterClient {
|
|
|
333
342
|
forms.setField(fields, name, value);
|
|
334
343
|
}
|
|
335
344
|
progressArg.countedRequests += 1;
|
|
336
|
-
const answer = await sessionArg.post(sessionArg.resolve(resultForm.action, outcomeArg.pageUrl), fields);
|
|
345
|
+
const answer = await sessionArg.post(sessionArg.resolve(resultForm.action, outcomeArg.pageUrl), fields, () => this.countAgain('retrieval', 'structured_content', progressArg));
|
|
337
346
|
if (/html/i.test(answer.contentType)) {
|
|
338
347
|
this.throwIfBlocked(decodeUtf8(answer.body));
|
|
339
348
|
throw new HandelsregisterError('unexpected_response', 'The portal answered with a page instead of the structured content.');
|
|
@@ -394,4 +403,4 @@ export class HandelsregisterClient {
|
|
|
394
403
|
return text ? text : undefined;
|
|
395
404
|
}
|
|
396
405
|
}
|
|
397
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.handelsregisterclient.js","sourceRoot":"","sources":["../../ts/handelsregister/classes.handelsregisterclient.ts"],"names":[],"mappings":"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"}
|
|
406
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.handelsregisterclient.js","sourceRoot":"","sources":["../../ts/handelsregister/classes.handelsregisterclient.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ import type { IRegisterMatch } from './interfaces.js';
|
|
|
6
6
|
* - `aborted`: the caller's signal aborted the call;
|
|
7
7
|
* - `timeout`: a request to the portal took longer than the client's limit;
|
|
8
8
|
* - `unreachable`: the portal could not be reached (name resolution, connection, TLS);
|
|
9
|
+
* - `dropped`: the portal closed the connection without answering, also when the request was sent
|
|
10
|
+
* once more. Its front end does so when it lost its back end's answer;
|
|
9
11
|
* - `refused`: the portal answered with an HTTP error, for example 403 when it blocks an address,
|
|
10
12
|
* 429 or 503 when it is overloaded (`status` carries the code), or with its notice that it refuses
|
|
11
13
|
* retrievals from this address (`portalMessage` carries its words);
|
|
@@ -16,7 +18,7 @@ import type { IRegisterMatch } from './interfaces.js';
|
|
|
16
18
|
* - `ambiguous`: several register sheets match the reference; `matches` lists them;
|
|
17
19
|
* - `invalid_structured_content`: the structured register content could not be read.
|
|
18
20
|
*/
|
|
19
|
-
export type THandelsregisterErrorCode = 'invalid_query' | 'rate_limited' | 'aborted' | 'timeout' | 'unreachable' | 'refused' | 'too_large' | 'unexpected_response' | 'not_found' | 'ambiguous' | 'invalid_structured_content';
|
|
21
|
+
export type THandelsregisterErrorCode = 'invalid_query' | 'rate_limited' | 'aborted' | 'timeout' | 'unreachable' | 'dropped' | 'refused' | 'too_large' | 'unexpected_response' | 'not_found' | 'ambiguous' | 'invalid_structured_content';
|
|
20
22
|
/** the step of a call that failed */
|
|
21
23
|
export type THandelsregisterStep = 'search_form' | 'search' | 'result_list' | 'structured_content';
|
|
22
24
|
export interface IHandelsregisterErrorDetails {
|
|
@@ -34,4 +34,4 @@ export class HandelsregisterError extends Error {
|
|
|
34
34
|
this.portalMessage = detailsArg.portalMessage;
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5oYW5kZWxzcmVnaXN0ZXJlcnJvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2hhbmRlbHNyZWdpc3Rlci9jbGFzc2VzLmhhbmRlbHNyZWdpc3RlcmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWdEQTs7O0dBR0c7QUFDSCxNQUFNLE9BQU8sb0JBQXFCLFNBQVEsS0FBSztJQUM3QixJQUFJLENBQTRCO0lBQ2hELG1DQUFtQztJQUNuQixNQUFNLENBQVU7SUFDaEMsNkRBQTZEO0lBQzdDLE9BQU8sQ0FBVTtJQUNqQywyQkFBMkI7SUFDWCxJQUFJLENBQXdCO0lBQzVDOzs7T0FHRztJQUNhLGVBQWUsQ0FBVTtJQUN6Qzs7O09BR0c7SUFDYSxPQUFPLENBQW9CO0lBQzNDLHVFQUF1RTtJQUN2RCxhQUFhLENBQVU7SUFFdkMsWUFBWSxPQUFrQyxFQUFFLFVBQWtCLEVBQUUsVUFBVSxHQUFpQyxFQUFFO1FBQy9HLEtBQUssQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLEtBQUssS0FBSyxTQUFTLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUM7UUFDNUYsSUFBSSxDQUFDLElBQUksR0FBRyxzQkFBc0IsQ0FBQztRQUNuQyxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQztRQUNwQixJQUFJLENBQUMsTUFBTSxHQUFHLFVBQVUsQ0FBQyxNQUFNLENBQUM7UUFDaEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxJQUFJLEdBQUcsVUFBVSxDQUFDLElBQUksQ0FBQztRQUM1QixJQUFJLENBQUMsZUFBZSxHQUFHLFVBQVUsQ0FBQyxlQUFlLENBQUM7UUFDbEQsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxhQUFhLEdBQUcsVUFBVSxDQUFDLGFBQWEsQ0FBQztJQUNoRCxDQUFDO0NBQ0YifQ==
|
|
@@ -33,11 +33,27 @@ export declare class PortalSession {
|
|
|
33
33
|
constructor(settings: IPortalSessionSettings, progress: ICallProgress);
|
|
34
34
|
/** resolves a path or a relative action against the portal or a page */
|
|
35
35
|
resolve(targetArg: string, baseArg?: string): string;
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
36
|
+
/**
|
|
37
|
+
* Loads a page. Like `post()`, it sends the request once more when the portal closes the
|
|
38
|
+
* connection without answering; `beforeRepeatArg` runs before that.
|
|
39
|
+
*/
|
|
40
|
+
get(urlArg: string, beforeRepeatArg?: () => Promise<void>): Promise<IPortalResponse>;
|
|
41
|
+
/**
|
|
42
|
+
* Submits a form as `application/x-www-form-urlencoded`. When the portal closes the connection
|
|
43
|
+
* without answering, the form is sent once more after `beforeRepeatArg`; a redirect it answers
|
|
44
|
+
* with is followed the same way, without `beforeRepeatArg`.
|
|
45
|
+
*/
|
|
46
|
+
post(urlArg: string, fieldsArg: Array<[string, string]>, beforeRepeatArg?: () => Promise<void>): Promise<IPortalResponse>;
|
|
39
47
|
private fail;
|
|
40
48
|
private request;
|
|
49
|
+
/**
|
|
50
|
+
* Sends a request, and once more when the portal closed the connection without answering it. The
|
|
51
|
+
* portal's front end, Apache httpd with mod_proxy_http before the application servers, closes a
|
|
52
|
+
* kept-alive connection without any answer when it could not read its back end's answer, so that
|
|
53
|
+
* the client sends the request again, as browsers do. Every request of this client reads; sending
|
|
54
|
+
* one again changes nothing at the portal. A second close without an answer ends in `dropped`.
|
|
55
|
+
*/
|
|
56
|
+
private sendRepeating;
|
|
41
57
|
private send;
|
|
42
58
|
/** a signal for one request: the caller's signal and the request's own time limit */
|
|
43
59
|
private requestSignal;
|
|
@@ -1,6 +1,24 @@
|
|
|
1
1
|
import { HandelsregisterError } from './classes.handelsregistererror.js';
|
|
2
2
|
const redirectStatuses = new Set([301, 302, 303]);
|
|
3
3
|
const maxRedirects = 3;
|
|
4
|
+
/**
|
|
5
|
+
* error codes of a connection the other side closed or reset before it answered: undici's
|
|
6
|
+
* `UND_ERR_SOCKET` (the `fetch` of Node.js: "other side closed") and the system's `ECONNRESET` and
|
|
7
|
+
* `EPIPE`
|
|
8
|
+
*/
|
|
9
|
+
const closedConnectionCodes = new Set(['UND_ERR_SOCKET', 'ECONNRESET', 'EPIPE']);
|
|
10
|
+
/** whether a failed `fetch` failed because the connection was closed before any answer arrived */
|
|
11
|
+
const closedWithoutAnswer = (errorArg) => {
|
|
12
|
+
let current = errorArg;
|
|
13
|
+
for (let depth = 0; depth < 4 && current instanceof Error; depth++) {
|
|
14
|
+
const code = current.code;
|
|
15
|
+
if (typeof code === 'string' && closedConnectionCodes.has(code)) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
current = current.cause;
|
|
19
|
+
}
|
|
20
|
+
return false;
|
|
21
|
+
};
|
|
4
22
|
/**
|
|
5
23
|
* One visit to the register portal: a cookie jar, the fixed language and a limit for every
|
|
6
24
|
* request. It lives for one call of the client and is dropped afterwards, so nothing is shared
|
|
@@ -22,12 +40,20 @@ export class PortalSession {
|
|
|
22
40
|
resolve(targetArg, baseArg = this.origin) {
|
|
23
41
|
return new URL(targetArg, baseArg).toString();
|
|
24
42
|
}
|
|
25
|
-
|
|
26
|
-
|
|
43
|
+
/**
|
|
44
|
+
* Loads a page. Like `post()`, it sends the request once more when the portal closes the
|
|
45
|
+
* connection without answering; `beforeRepeatArg` runs before that.
|
|
46
|
+
*/
|
|
47
|
+
async get(urlArg, beforeRepeatArg) {
|
|
48
|
+
return this.request('GET', urlArg, undefined, beforeRepeatArg);
|
|
27
49
|
}
|
|
28
|
-
/**
|
|
29
|
-
|
|
30
|
-
|
|
50
|
+
/**
|
|
51
|
+
* Submits a form as `application/x-www-form-urlencoded`. When the portal closes the connection
|
|
52
|
+
* without answering, the form is sent once more after `beforeRepeatArg`; a redirect it answers
|
|
53
|
+
* with is followed the same way, without `beforeRepeatArg`.
|
|
54
|
+
*/
|
|
55
|
+
async post(urlArg, fieldsArg, beforeRepeatArg) {
|
|
56
|
+
return this.request('POST', urlArg, new URLSearchParams(fieldsArg).toString(), beforeRepeatArg);
|
|
31
57
|
}
|
|
32
58
|
fail(codeArg, messageArg, extraArg = {}) {
|
|
33
59
|
return new HandelsregisterError(codeArg, messageArg, {
|
|
@@ -36,7 +62,7 @@ export class PortalSession {
|
|
|
36
62
|
countedRequests: this.progress.countedRequests,
|
|
37
63
|
});
|
|
38
64
|
}
|
|
39
|
-
async request(methodArg, urlArg, bodyArg) {
|
|
65
|
+
async request(methodArg, urlArg, bodyArg, beforeRepeatArg) {
|
|
40
66
|
let method = methodArg;
|
|
41
67
|
let url = urlArg;
|
|
42
68
|
let body = bodyArg;
|
|
@@ -44,7 +70,7 @@ export class PortalSession {
|
|
|
44
70
|
if (new URL(url).origin !== this.origin) {
|
|
45
71
|
throw this.fail('unexpected_response', 'The portal pointed to another site.');
|
|
46
72
|
}
|
|
47
|
-
const response = await this.
|
|
73
|
+
const response = await this.sendRepeating(method, url, body, redirects === 0 ? beforeRepeatArg : undefined);
|
|
48
74
|
if (redirectStatuses.has(response.status)) {
|
|
49
75
|
const location = response.headers.get('location');
|
|
50
76
|
await response.body?.cancel();
|
|
@@ -69,6 +95,35 @@ export class PortalSession {
|
|
|
69
95
|
};
|
|
70
96
|
}
|
|
71
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* Sends a request, and once more when the portal closed the connection without answering it. The
|
|
100
|
+
* portal's front end, Apache httpd with mod_proxy_http before the application servers, closes a
|
|
101
|
+
* kept-alive connection without any answer when it could not read its back end's answer, so that
|
|
102
|
+
* the client sends the request again, as browsers do. Every request of this client reads; sending
|
|
103
|
+
* one again changes nothing at the portal. A second close without an answer ends in `dropped`.
|
|
104
|
+
*/
|
|
105
|
+
async sendRepeating(methodArg, urlArg, bodyArg, beforeRepeatArg) {
|
|
106
|
+
try {
|
|
107
|
+
return await this.send(methodArg, urlArg, bodyArg);
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
if (!(error instanceof HandelsregisterError) || error.code !== 'dropped') {
|
|
111
|
+
throw error;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
await beforeRepeatArg?.();
|
|
115
|
+
try {
|
|
116
|
+
return await this.send(methodArg, urlArg, bodyArg);
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
if (error instanceof HandelsregisterError && error.code === 'dropped') {
|
|
120
|
+
throw this.fail('dropped', 'The register portal closed the connection without answering, also when the request was sent once more.', {
|
|
121
|
+
cause: error.cause,
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
throw error;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
72
127
|
async send(methodArg, urlArg, bodyArg) {
|
|
73
128
|
if (this.settings.signal?.aborted) {
|
|
74
129
|
throw this.fail('aborted', 'The call was aborted.', { cause: this.settings.signal.reason });
|
|
@@ -95,7 +150,10 @@ export class PortalSession {
|
|
|
95
150
|
});
|
|
96
151
|
}
|
|
97
152
|
catch (error) {
|
|
98
|
-
|
|
153
|
+
const failure = this.failureOf(error);
|
|
154
|
+
throw failure.code === 'unreachable' && closedWithoutAnswer(error)
|
|
155
|
+
? this.fail('dropped', 'The register portal closed the connection without answering.', { cause: error })
|
|
156
|
+
: failure;
|
|
99
157
|
}
|
|
100
158
|
for (const cookie of response.headers.getSetCookie()) {
|
|
101
159
|
const pair = cookie.split(';', 1)[0];
|
|
@@ -157,4 +215,4 @@ export class PortalSession {
|
|
|
157
215
|
return body;
|
|
158
216
|
}
|
|
159
217
|
}
|
|
160
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
218
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.portalsession.js","sourceRoot":"","sources":["../../ts/handelsregister/classes.portalsession.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,10 @@ export interface IRegisterSearchResult {
|
|
|
83
83
|
portalNotice?: string;
|
|
84
84
|
/** epoch ms: when the result list arrived */
|
|
85
85
|
retrievedAt: number;
|
|
86
|
-
/**
|
|
86
|
+
/**
|
|
87
|
+
* requests of this call that count against the portal's limit of 60 per hour: 1, or 2 when the
|
|
88
|
+
* portal dropped the search without an answer and it was sent once more
|
|
89
|
+
*/
|
|
87
90
|
countedRequests: number;
|
|
88
91
|
notice: IStructuredContentNotice;
|
|
89
92
|
}
|
|
@@ -178,7 +181,11 @@ export interface IRegisterEntry {
|
|
|
178
181
|
structuredContent: IRegisterStructuredContent | null;
|
|
179
182
|
/** epoch ms: when the last answer of the portal arrived */
|
|
180
183
|
retrievedAt: number;
|
|
181
|
-
/**
|
|
184
|
+
/**
|
|
185
|
+
* requests of this call that count against the portal's limit: 2, or 1 without structured content;
|
|
186
|
+
* one more for the search or the retrieval when the portal dropped it without an answer and it was
|
|
187
|
+
* sent once more
|
|
188
|
+
*/
|
|
182
189
|
countedRequests: number;
|
|
183
190
|
notice: IStructuredContentNotice;
|
|
184
191
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fin.cx/opendata",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Open business and financial data for TypeScript: register lookups on the German register portal (handelsregister.de) without storage, the statutory public holidays of the German federal states, the base rate of § 247 BGB, the German consumer price index with the arithmetic of index clauses, and stock and crypto prices and fundamentals from several providers.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -37,10 +37,10 @@
|
|
|
37
37
|
"license": "MIT",
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@git.zone/tsbuild": "^6.0.2",
|
|
40
|
-
"@git.zone/tsrun": "^3.0.
|
|
40
|
+
"@git.zone/tsrun": "^3.0.3",
|
|
41
41
|
"@git.zone/tstest": "^7.2.0",
|
|
42
42
|
"@push.rocks/qenv": "^6.1.3",
|
|
43
|
-
"@types/node": "
|
|
43
|
+
"@types/node": "26.6.4"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
46
|
"@push.rocks/smartpath": "^6.0.0",
|
package/readme.md
CHANGED
|
@@ -398,7 +398,9 @@ Searches take a name or a register number:
|
|
|
398
398
|
| `search()` | 1 search | the search form and the result list |
|
|
399
399
|
| `getEntry()` | 1 search, plus 1 retrieval when the portal offers structured content | the search form and the result list |
|
|
400
400
|
|
|
401
|
-
The client asks the gate before each counted request and before that step sends anything, so a refusal costs no traffic. A slot taken for a step that then fails before its request is sent stays taken; the count errs on the safe side. The client never
|
|
401
|
+
The client asks the gate before each counted request and before that step sends anything, so a refusal costs no traffic. A slot taken for a step that then fails before its request is sent stays taken; the count errs on the safe side. The client never caches and never writes to the console. Every call opens its own visit to the portal and forgets it afterwards.
|
|
402
|
+
|
|
403
|
+
The client repeats a request in one case only, and only once: when the portal closed the connection without any answer. The portal's front end, Apache httpd before its application servers, closes a kept-alive connection that way when it could not read its back end's answer, so that the client sends the request again, as a browser does. A search or retrieval sent once more asks the gate again and counts again, so `countedRequests` can be one higher than the table says. Closed a second time, the call ends in `dropped`.
|
|
402
404
|
|
|
403
405
|
A refusal of `SlidingWindowGate` is a `HandelsregisterError` with the code `rate_limited` and `retryAt`, the moment the next request is possible. Like every error of the client it carries the refused `step` (`search` or `structured_content`) and the `countedRequests` made before it: a `getEntry()` refused at the retrieval has already counted its search. A gate of your own may refuse with any error; a `HandelsregisterError` gains the step and the count the same way, and any other error reaches the caller unchanged.
|
|
404
406
|
|
|
@@ -429,6 +431,7 @@ A refusal of `SlidingWindowGate` is a `HandelsregisterError` with the code `rate
|
|
|
429
431
|
| Portal answers with an HTTP error (blocked address, overload) | `refused` with `status` |
|
|
430
432
|
| Portal shows its notice that it refuses retrievals from this address | `refused` with its words in `portalMessage` |
|
|
431
433
|
| Portal too slow, unreachable, or call aborted | `timeout`, `unreachable`, `aborted` |
|
|
434
|
+
| Portal closes the connection without answering, also when the request is sent once more | `dropped` |
|
|
432
435
|
| Portal changed its pages or answered in another language | `unexpected_response`, with the portal's own message in `portalMessage` when it showed one |
|
|
433
436
|
| Structured content that cannot be read | `invalid_structured_content` |
|
|
434
437
|
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@fin.cx/opendata',
|
|
6
|
-
version: '4.
|
|
6
|
+
version: '4.7.0',
|
|
7
7
|
description: 'Open business and financial data for TypeScript: register lookups on the German register portal (handelsregister.de) without storage, the statutory public holidays of the German federal states, the base rate of § 247 BGB, the German consumer price index with the arithmetic of index clauses, and stock and crypto prices and fundamentals from several providers.'
|
|
8
8
|
}
|
|
@@ -120,14 +120,18 @@ const decodeUtf8 = (bytesArg: Uint8Array): string => new TextDecoder('utf-8').de
|
|
|
120
120
|
* plain HTTP and without storage.
|
|
121
121
|
*
|
|
122
122
|
* Every call opens its own visit to the portal and forgets it afterwards: nothing is cached or
|
|
123
|
-
* shared between calls. The client never
|
|
124
|
-
*
|
|
123
|
+
* shared between calls. The client never logs, and asks its gate before every request the portal's
|
|
124
|
+
* terms count:
|
|
125
125
|
* - `search()` makes one counted search;
|
|
126
126
|
* - `getEntry()` makes one counted search and, when the portal offers structured content for the
|
|
127
127
|
* entry, one counted retrieval.
|
|
128
128
|
*
|
|
129
129
|
* Each search also loads the search form and the result list, two pages the terms do not count.
|
|
130
130
|
*
|
|
131
|
+
* The client repeats a request only when the portal closed the connection without answering it,
|
|
132
|
+
* and only once: the portal's front end does that to have the request sent again. A counted request
|
|
133
|
+
* sent once more asks the gate again and counts again.
|
|
134
|
+
*
|
|
131
135
|
* The portal's terms allow single lookups for information only, at most 60 searches or
|
|
132
136
|
* retrievals per hour, and no systematic retrieval to build or update a copy of the registers.
|
|
133
137
|
*/
|
|
@@ -288,6 +292,12 @@ export class HandelsregisterClient {
|
|
|
288
292
|
}
|
|
289
293
|
}
|
|
290
294
|
|
|
295
|
+
/** asks the gate for a counted request the portal dropped before it is sent once more, and counts it */
|
|
296
|
+
private async countAgain(kindArg: TRegisterCountedRequestKind, stepArg: THandelsregisterStep, progressArg: ICallProgress): Promise<void> {
|
|
297
|
+
await this.acquireSlot(kindArg, stepArg, progressArg);
|
|
298
|
+
progressArg.countedRequests += 1;
|
|
299
|
+
}
|
|
300
|
+
|
|
291
301
|
private async runSearch(planArg: ISearchPlan, progressArg: ICallProgress, sessionArg: PortalSession): Promise<ISearchOutcome> {
|
|
292
302
|
await this.acquireSlot('search', 'search', progressArg);
|
|
293
303
|
try {
|
|
@@ -333,7 +343,9 @@ export class HandelsregisterClient {
|
|
|
333
343
|
|
|
334
344
|
progressArg.step = 'search';
|
|
335
345
|
progressArg.countedRequests += 1;
|
|
336
|
-
const resultPage = await sessionArg.post(sessionArg.resolve(form.action, formPage.url), fields)
|
|
346
|
+
const resultPage = await sessionArg.post(sessionArg.resolve(form.action, formPage.url), fields, () =>
|
|
347
|
+
this.countAgain('search', 'search', progressArg)
|
|
348
|
+
);
|
|
337
349
|
|
|
338
350
|
progressArg.step = 'result_list';
|
|
339
351
|
const resultText = decodeUtf8(resultPage.body);
|
|
@@ -406,7 +418,9 @@ export class HandelsregisterClient {
|
|
|
406
418
|
forms.setField(fields, name, value);
|
|
407
419
|
}
|
|
408
420
|
progressArg.countedRequests += 1;
|
|
409
|
-
const answer = await sessionArg.post(sessionArg.resolve(resultForm.action, outcomeArg.pageUrl), fields)
|
|
421
|
+
const answer = await sessionArg.post(sessionArg.resolve(resultForm.action, outcomeArg.pageUrl), fields, () =>
|
|
422
|
+
this.countAgain('retrieval', 'structured_content', progressArg)
|
|
423
|
+
);
|
|
410
424
|
if (/html/i.test(answer.contentType)) {
|
|
411
425
|
this.throwIfBlocked(decodeUtf8(answer.body));
|
|
412
426
|
throw new HandelsregisterError('unexpected_response', 'The portal answered with a page instead of the structured content.');
|
|
@@ -7,6 +7,8 @@ import type { IRegisterMatch } from './interfaces.js';
|
|
|
7
7
|
* - `aborted`: the caller's signal aborted the call;
|
|
8
8
|
* - `timeout`: a request to the portal took longer than the client's limit;
|
|
9
9
|
* - `unreachable`: the portal could not be reached (name resolution, connection, TLS);
|
|
10
|
+
* - `dropped`: the portal closed the connection without answering, also when the request was sent
|
|
11
|
+
* once more. Its front end does so when it lost its back end's answer;
|
|
10
12
|
* - `refused`: the portal answered with an HTTP error, for example 403 when it blocks an address,
|
|
11
13
|
* 429 or 503 when it is overloaded (`status` carries the code), or with its notice that it refuses
|
|
12
14
|
* retrievals from this address (`portalMessage` carries its words);
|
|
@@ -23,6 +25,7 @@ export type THandelsregisterErrorCode =
|
|
|
23
25
|
| 'aborted'
|
|
24
26
|
| 'timeout'
|
|
25
27
|
| 'unreachable'
|
|
28
|
+
| 'dropped'
|
|
26
29
|
| 'refused'
|
|
27
30
|
| 'too_large'
|
|
28
31
|
| 'unexpected_response'
|
|
@@ -25,6 +25,26 @@ export interface IPortalResponse {
|
|
|
25
25
|
const redirectStatuses = new Set([301, 302, 303]);
|
|
26
26
|
const maxRedirects = 3;
|
|
27
27
|
|
|
28
|
+
/**
|
|
29
|
+
* error codes of a connection the other side closed or reset before it answered: undici's
|
|
30
|
+
* `UND_ERR_SOCKET` (the `fetch` of Node.js: "other side closed") and the system's `ECONNRESET` and
|
|
31
|
+
* `EPIPE`
|
|
32
|
+
*/
|
|
33
|
+
const closedConnectionCodes = new Set(['UND_ERR_SOCKET', 'ECONNRESET', 'EPIPE']);
|
|
34
|
+
|
|
35
|
+
/** whether a failed `fetch` failed because the connection was closed before any answer arrived */
|
|
36
|
+
const closedWithoutAnswer = (errorArg: unknown): boolean => {
|
|
37
|
+
let current: unknown = errorArg;
|
|
38
|
+
for (let depth = 0; depth < 4 && current instanceof Error; depth++) {
|
|
39
|
+
const code = (current as Error & { code?: unknown }).code;
|
|
40
|
+
if (typeof code === 'string' && closedConnectionCodes.has(code)) {
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
current = current.cause;
|
|
44
|
+
}
|
|
45
|
+
return false;
|
|
46
|
+
};
|
|
47
|
+
|
|
28
48
|
/**
|
|
29
49
|
* One visit to the register portal: a cookie jar, the fixed language and a limit for every
|
|
30
50
|
* request. It lives for one call of the client and is dropped afterwards, so nothing is shared
|
|
@@ -45,17 +65,25 @@ export class PortalSession {
|
|
|
45
65
|
return new URL(targetArg, baseArg).toString();
|
|
46
66
|
}
|
|
47
67
|
|
|
48
|
-
|
|
49
|
-
|
|
68
|
+
/**
|
|
69
|
+
* Loads a page. Like `post()`, it sends the request once more when the portal closes the
|
|
70
|
+
* connection without answering; `beforeRepeatArg` runs before that.
|
|
71
|
+
*/
|
|
72
|
+
public async get(urlArg: string, beforeRepeatArg?: () => Promise<void>): Promise<IPortalResponse> {
|
|
73
|
+
return this.request('GET', urlArg, undefined, beforeRepeatArg);
|
|
50
74
|
}
|
|
51
75
|
|
|
52
|
-
/**
|
|
53
|
-
|
|
54
|
-
|
|
76
|
+
/**
|
|
77
|
+
* Submits a form as `application/x-www-form-urlencoded`. When the portal closes the connection
|
|
78
|
+
* without answering, the form is sent once more after `beforeRepeatArg`; a redirect it answers
|
|
79
|
+
* with is followed the same way, without `beforeRepeatArg`.
|
|
80
|
+
*/
|
|
81
|
+
public async post(urlArg: string, fieldsArg: Array<[string, string]>, beforeRepeatArg?: () => Promise<void>): Promise<IPortalResponse> {
|
|
82
|
+
return this.request('POST', urlArg, new URLSearchParams(fieldsArg).toString(), beforeRepeatArg);
|
|
55
83
|
}
|
|
56
84
|
|
|
57
85
|
private fail(
|
|
58
|
-
codeArg: 'aborted' | 'timeout' | 'unreachable' | 'refused' | 'too_large' | 'unexpected_response',
|
|
86
|
+
codeArg: 'aborted' | 'timeout' | 'unreachable' | 'dropped' | 'refused' | 'too_large' | 'unexpected_response',
|
|
59
87
|
messageArg: string,
|
|
60
88
|
extraArg: { status?: number; cause?: unknown } = {}
|
|
61
89
|
): HandelsregisterError {
|
|
@@ -66,7 +94,12 @@ export class PortalSession {
|
|
|
66
94
|
});
|
|
67
95
|
}
|
|
68
96
|
|
|
69
|
-
private async request(
|
|
97
|
+
private async request(
|
|
98
|
+
methodArg: 'GET' | 'POST',
|
|
99
|
+
urlArg: string,
|
|
100
|
+
bodyArg?: string,
|
|
101
|
+
beforeRepeatArg?: () => Promise<void>
|
|
102
|
+
): Promise<IPortalResponse> {
|
|
70
103
|
let method = methodArg;
|
|
71
104
|
let url = urlArg;
|
|
72
105
|
let body = bodyArg;
|
|
@@ -74,7 +107,7 @@ export class PortalSession {
|
|
|
74
107
|
if (new URL(url).origin !== this.origin) {
|
|
75
108
|
throw this.fail('unexpected_response', 'The portal pointed to another site.');
|
|
76
109
|
}
|
|
77
|
-
const response = await this.
|
|
110
|
+
const response = await this.sendRepeating(method, url, body, redirects === 0 ? beforeRepeatArg : undefined);
|
|
78
111
|
if (redirectStatuses.has(response.status)) {
|
|
79
112
|
const location = response.headers.get('location');
|
|
80
113
|
await response.body?.cancel();
|
|
@@ -100,6 +133,39 @@ export class PortalSession {
|
|
|
100
133
|
}
|
|
101
134
|
}
|
|
102
135
|
|
|
136
|
+
/**
|
|
137
|
+
* Sends a request, and once more when the portal closed the connection without answering it. The
|
|
138
|
+
* portal's front end, Apache httpd with mod_proxy_http before the application servers, closes a
|
|
139
|
+
* kept-alive connection without any answer when it could not read its back end's answer, so that
|
|
140
|
+
* the client sends the request again, as browsers do. Every request of this client reads; sending
|
|
141
|
+
* one again changes nothing at the portal. A second close without an answer ends in `dropped`.
|
|
142
|
+
*/
|
|
143
|
+
private async sendRepeating(
|
|
144
|
+
methodArg: 'GET' | 'POST',
|
|
145
|
+
urlArg: string,
|
|
146
|
+
bodyArg: string | undefined,
|
|
147
|
+
beforeRepeatArg?: () => Promise<void>
|
|
148
|
+
): Promise<Response> {
|
|
149
|
+
try {
|
|
150
|
+
return await this.send(methodArg, urlArg, bodyArg);
|
|
151
|
+
} catch (error) {
|
|
152
|
+
if (!(error instanceof HandelsregisterError) || error.code !== 'dropped') {
|
|
153
|
+
throw error;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
await beforeRepeatArg?.();
|
|
157
|
+
try {
|
|
158
|
+
return await this.send(methodArg, urlArg, bodyArg);
|
|
159
|
+
} catch (error) {
|
|
160
|
+
if (error instanceof HandelsregisterError && error.code === 'dropped') {
|
|
161
|
+
throw this.fail('dropped', 'The register portal closed the connection without answering, also when the request was sent once more.', {
|
|
162
|
+
cause: error.cause,
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
throw error;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
|
|
103
169
|
private async send(methodArg: 'GET' | 'POST', urlArg: string, bodyArg?: string): Promise<Response> {
|
|
104
170
|
if (this.settings.signal?.aborted) {
|
|
105
171
|
throw this.fail('aborted', 'The call was aborted.', { cause: this.settings.signal.reason });
|
|
@@ -125,7 +191,10 @@ export class PortalSession {
|
|
|
125
191
|
signal: this.requestSignal(),
|
|
126
192
|
});
|
|
127
193
|
} catch (error) {
|
|
128
|
-
|
|
194
|
+
const failure = this.failureOf(error);
|
|
195
|
+
throw failure.code === 'unreachable' && closedWithoutAnswer(error)
|
|
196
|
+
? this.fail('dropped', 'The register portal closed the connection without answering.', { cause: error })
|
|
197
|
+
: failure;
|
|
129
198
|
}
|
|
130
199
|
for (const cookie of response.headers.getSetCookie()) {
|
|
131
200
|
const pair = cookie.split(';', 1)[0];
|
|
@@ -92,7 +92,10 @@ export interface IRegisterSearchResult {
|
|
|
92
92
|
portalNotice?: string;
|
|
93
93
|
/** epoch ms: when the result list arrived */
|
|
94
94
|
retrievedAt: number;
|
|
95
|
-
/**
|
|
95
|
+
/**
|
|
96
|
+
* requests of this call that count against the portal's limit of 60 per hour: 1, or 2 when the
|
|
97
|
+
* portal dropped the search without an answer and it was sent once more
|
|
98
|
+
*/
|
|
96
99
|
countedRequests: number;
|
|
97
100
|
notice: IStructuredContentNotice;
|
|
98
101
|
}
|
|
@@ -202,7 +205,11 @@ export interface IRegisterEntry {
|
|
|
202
205
|
structuredContent: IRegisterStructuredContent | null;
|
|
203
206
|
/** epoch ms: when the last answer of the portal arrived */
|
|
204
207
|
retrievedAt: number;
|
|
205
|
-
/**
|
|
208
|
+
/**
|
|
209
|
+
* requests of this call that count against the portal's limit: 2, or 1 without structured content;
|
|
210
|
+
* one more for the search or the retrieval when the portal dropped it without an answer and it was
|
|
211
|
+
* sent once more
|
|
212
|
+
*/
|
|
206
213
|
countedRequests: number;
|
|
207
214
|
notice: IStructuredContentNotice;
|
|
208
215
|
}
|