diff options
author | Sebastian <sebasjm@gmail.com> | 2023-06-28 09:49:29 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2023-06-28 09:49:52 -0300 |
commit | f1008c966191f5b1d3bf1f7ea8af4fbba4380b46 (patch) | |
tree | 792c0ae54877d7cf86e76c382a16e2093bc5cef9 | |
parent | db9d6dd3943e2a5e6e316e212369520a367d06df (diff) | |
download | wallet-core-f1008c966191f5b1d3bf1f7ea8af4fbba4380b46.tar.xz |
use default http timeout from util
-rw-r--r-- | packages/taler-util/src/time.ts | 6 | ||||
-rw-r--r-- | packages/web-util/src/utils/http-impl.browser.ts | 5 | ||||
-rw-r--r-- | packages/web-util/src/utils/http-impl.sw.ts | 5 |
3 files changed, 14 insertions, 2 deletions
diff --git a/packages/taler-util/src/time.ts b/packages/taler-util/src/time.ts index 3ecf6f92c..75b3c7e94 100644 --- a/packages/taler-util/src/time.ts +++ b/packages/taler-util/src/time.ts @@ -296,6 +296,12 @@ export namespace Duration { }; } + export function fromMilliseconds(ms: number): Duration { + return { + d_ms: ms, + }; + } + export function clamp(args: { lower: Duration; upper: Duration; diff --git a/packages/web-util/src/utils/http-impl.browser.ts b/packages/web-util/src/utils/http-impl.browser.ts index a46e8d63f..598146149 100644 --- a/packages/web-util/src/utils/http-impl.browser.ts +++ b/packages/web-util/src/utils/http-impl.browser.ts @@ -22,6 +22,7 @@ import { RequestThrottler, TalerErrorCode, TalerError, + Duration, } from "@gnu-taler/taler-util"; import { @@ -31,6 +32,7 @@ import { Headers, getDefaultHeaders, encodeBody, + DEFAULT_REQUEST_TIMEOUT_MS, } from "@gnu-taler/taler-util/http"; const logger = new Logger("browserHttpLib"); @@ -50,7 +52,8 @@ export class BrowserHttpLib implements HttpRequestLibrary { const requestMethod = options?.method ?? "GET"; const requestBody = options?.body; const requestHeader = options?.headers; - const requestTimeout = options?.timeout ?? { d_ms: 2 * 1000 }; + const requestTimeout = + options?.timeout ?? Duration.fromMilliseconds(DEFAULT_REQUEST_TIMEOUT_MS); if (this.throttlingEnabled && this.throttle.applyThrottle(requestUrl)) { const parsedUrl = new URL(requestUrl); diff --git a/packages/web-util/src/utils/http-impl.sw.ts b/packages/web-util/src/utils/http-impl.sw.ts index 59bef1775..dbb1f7834 100644 --- a/packages/web-util/src/utils/http-impl.sw.ts +++ b/packages/web-util/src/utils/http-impl.sw.ts @@ -21,9 +21,11 @@ import { RequestThrottler, TalerErrorCode, TalerError, + Duration, } from "@gnu-taler/taler-util"; import { + DEFAULT_REQUEST_TIMEOUT_MS, Headers, HttpRequestLibrary, HttpRequestOptions, @@ -47,7 +49,8 @@ export class ServiceWorkerHttpLib implements HttpRequestLibrary { const requestMethod = options?.method ?? "GET"; const requestBody = options?.body; const requestHeader = options?.headers; - const requestTimeout = options?.timeout ?? { d_ms: 2 * 1000 }; + const requestTimeout = + options?.timeout ?? Duration.fromMilliseconds(DEFAULT_REQUEST_TIMEOUT_MS); if (this.throttlingEnabled && this.throttle.applyThrottle(requestUrl)) { const parsedUrl = new URL(requestUrl); |