@dofek/provider-http 0.1.12 → 0.1.13
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/rate-limit.d.ts +3 -1
- package/dist/rate-limit.d.ts.map +1 -1
- package/dist/rate-limit.js +8 -4
- package/dist/rate-limit.js.map +1 -1
- package/package.json +1 -1
package/dist/rate-limit.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ export { ProviderRateLimitError, ProviderRequestTimeoutError, ProviderServiceUna
|
|
|
5
5
|
export interface FetchRateLimitHandlingOptions {
|
|
6
6
|
createRateLimitError: (response: Response, responseBody: string) => Error;
|
|
7
7
|
createServiceUnavailableError?: (response: Response, responseBody: string) => Error;
|
|
8
|
+
additionalServiceUnavailableStatusCodes?: readonly number[];
|
|
8
9
|
}
|
|
9
10
|
export interface RateLimitAwareFetchOptions {
|
|
10
11
|
providerId: string;
|
|
@@ -13,6 +14,7 @@ export interface RateLimitAwareFetchOptions {
|
|
|
13
14
|
createRateLimitError?: (response: Response, responseBody: string) => Error;
|
|
14
15
|
createServiceUnavailableError?: (response: Response, responseBody: string) => Error;
|
|
15
16
|
adaptiveStore?: AdaptiveRateLimitStore;
|
|
17
|
+
additionalServiceUnavailableStatusCodes?: readonly number[];
|
|
16
18
|
}
|
|
17
19
|
export declare const PROVIDER_HTTP_REQUEST_TIMEOUT_MS: number;
|
|
18
20
|
/**
|
|
@@ -21,8 +23,8 @@ export declare const PROVIDER_HTTP_REQUEST_TIMEOUT_MS: number;
|
|
|
21
23
|
* unparseable.
|
|
22
24
|
*/
|
|
23
25
|
export declare function parseRetryAfterHeader(header: string | null | undefined): number | null;
|
|
24
|
-
export declare function isServiceUnavailableStatus(statusCode: number): boolean;
|
|
25
26
|
export declare function isProviderConnectFailure(error: unknown): boolean;
|
|
27
|
+
export declare function isServiceUnavailableStatus(statusCode: number, additionalStatusCodes?: readonly number[]): boolean;
|
|
26
28
|
export declare function fetchWithRateLimitHandling(fetchFn: typeof globalThis.fetch, input: RequestInfo | URL, init: RequestInit | undefined, options: FetchRateLimitHandlingOptions): Promise<Response>;
|
|
27
29
|
export declare function createRateLimitAwareFetch(fetchFn: typeof globalThis.fetch, options: RateLimitAwareFetchOptions): typeof globalThis.fetch;
|
|
28
30
|
//# sourceMappingURL=rate-limit.d.ts.map
|
package/dist/rate-limit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAEL,sBAAsB,EACtB,KAAK,sBAAsB,EAC3B,2BAA2B,EAC3B,+BAA+B,EAChC,MAAM,uBAAuB,CAAC;AAE/B,YAAY,EACV,sBAAsB,EACtB,sBAAsB,EACtB,6BAA6B,EAC7B,sBAAsB,EACtB,kCAAkC,EAClC,sCAAsC,GACvC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,+BAA+B,EAAE,CAAC;AAEhG,MAAM,WAAW,6BAA6B;IAC5C,oBAAoB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;IAC1E,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAEL,sBAAsB,EACtB,KAAK,sBAAsB,EAC3B,2BAA2B,EAC3B,+BAA+B,EAChC,MAAM,uBAAuB,CAAC;AAE/B,YAAY,EACV,sBAAsB,EACtB,sBAAsB,EACtB,6BAA6B,EAC7B,sBAAsB,EACtB,kCAAkC,EAClC,sCAAsC,GACvC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,+BAA+B,EAAE,CAAC;AAEhG,MAAM,WAAW,6BAA6B;IAC5C,oBAAoB,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;IAC1E,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;IACpF,uCAAuC,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7D;AAED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,sBAAsB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;IAC3E,6BAA6B,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,KAAK,KAAK,CAAC;IACpF,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,uCAAuC,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7D;AAGD,eAAO,MAAM,gCAAgC,QAAgB,CAAC;AAU9D;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAUtF;AAWD,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAoBhE;AAED,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,qBAAqB,GAAE,SAAS,MAAM,EAAO,GAC5C,OAAO,CAOT;AAED,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,OAAO,UAAU,CAAC,KAAK,EAChC,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,EAAE,WAAW,GAAG,SAAS,EAC7B,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,QAAQ,CAAC,CAuBnB;AAsCD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,OAAO,UAAU,CAAC,KAAK,EAChC,OAAO,EAAE,0BAA0B,GAClC,OAAO,UAAU,CAAC,KAAK,CAmFzB"}
|
package/dist/rate-limit.js
CHANGED
|
@@ -23,9 +23,6 @@ export function parseRetryAfterHeader(header) {
|
|
|
23
23
|
return null;
|
|
24
24
|
return Math.max(0, Math.ceil((retryAt - Date.now()) / 1000));
|
|
25
25
|
}
|
|
26
|
-
export function isServiceUnavailableStatus(statusCode) {
|
|
27
|
-
return statusCode === 502 || statusCode === 503 || statusCode === 504;
|
|
28
|
-
}
|
|
29
26
|
const PROVIDER_CONNECT_FAILURE_CODES = new Set(["ETIMEDOUT", "ECONNRESET", "ENETUNREACH"]);
|
|
30
27
|
function errorCause(error) {
|
|
31
28
|
if (typeof error !== "object" || error === null || !("cause" in error)) {
|
|
@@ -49,13 +46,19 @@ export function isProviderConnectFailure(error) {
|
|
|
49
46
|
}
|
|
50
47
|
return false;
|
|
51
48
|
}
|
|
49
|
+
export function isServiceUnavailableStatus(statusCode, additionalStatusCodes = []) {
|
|
50
|
+
return (statusCode === 502 ||
|
|
51
|
+
statusCode === 503 ||
|
|
52
|
+
statusCode === 504 ||
|
|
53
|
+
additionalStatusCodes.includes(statusCode));
|
|
54
|
+
}
|
|
52
55
|
export async function fetchWithRateLimitHandling(fetchFn, input, init, options) {
|
|
53
56
|
const response = init === undefined ? await fetchFn(input) : await fetchFn(input, init);
|
|
54
57
|
if (response.status === 429) {
|
|
55
58
|
const responseBody = await response.text();
|
|
56
59
|
throw options.createRateLimitError(response, responseBody);
|
|
57
60
|
}
|
|
58
|
-
if (isServiceUnavailableStatus(response.status)) {
|
|
61
|
+
if (isServiceUnavailableStatus(response.status, options.additionalServiceUnavailableStatusCodes)) {
|
|
59
62
|
const responseBody = await response.text();
|
|
60
63
|
const createServiceUnavailableError = options.createServiceUnavailableError ??
|
|
61
64
|
((unavailableResponse, unavailableResponseBody) => createDefaultServiceUnavailableError("unknown", "provider", null, unavailableResponse, unavailableResponseBody));
|
|
@@ -105,6 +108,7 @@ export function createRateLimitAwareFetch(fetchFn, options) {
|
|
|
105
108
|
((response, responseBody) => createDefaultRateLimitError(options.providerId, scope, userId, response, responseBody)),
|
|
106
109
|
createServiceUnavailableError: options.createServiceUnavailableError ??
|
|
107
110
|
((response, responseBody) => createDefaultServiceUnavailableError(options.providerId, scope, userId, response, responseBody)),
|
|
111
|
+
additionalServiceUnavailableStatusCodes: options.additionalServiceUnavailableStatusCodes,
|
|
108
112
|
});
|
|
109
113
|
if (options.adaptiveStore && response.ok) {
|
|
110
114
|
await options.adaptiveStore.recordSuccess(options.providerId, scope, userId, response.headers);
|
package/dist/rate-limit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,sBAAsB,EAEtB,2BAA2B,EAC3B,+BAA+B,GAChC,MAAM,uBAAuB,CAAC;AAU/B,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,+BAA+B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"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"}
|