diff --git a/ts/jobs/helpers/findRetryAfterTimeFromError.ts b/ts/jobs/helpers/findRetryAfterTimeFromError.ts index be36ad6d44..8714537047 100644 --- a/ts/jobs/helpers/findRetryAfterTimeFromError.ts +++ b/ts/jobs/helpers/findRetryAfterTimeFromError.ts @@ -16,5 +16,9 @@ export function findRetryAfterTimeFromError(err: unknown): number { } } + if (Array.isArray(rawValue)) { + return parseRetryAfterWithDefault(rawValue[0]); + } + return parseRetryAfterWithDefault(rawValue); } diff --git a/ts/textsecure/Errors.ts b/ts/textsecure/Errors.ts index 610c8609f7..7c44652ff9 100644 --- a/ts/textsecure/Errors.ts +++ b/ts/textsecure/Errors.ts @@ -16,16 +16,12 @@ function appendStack(newError: Error, originalError: Error) { newError.stack += `\nOriginal stack:\n${originalError.stack}`; } -export type HTTPErrorHeadersType = { - [name: string]: string | ReadonlyArray; -}; - export class HTTPError extends Error { public override readonly name = 'HTTPError'; public readonly code: number; - public readonly responseHeaders: HTTPErrorHeadersType; + public readonly responseHeaders: HeaderListType; public readonly response: unknown; @@ -33,7 +29,7 @@ export class HTTPError extends Error { message: string, options: { code: number; - headers: HTTPErrorHeadersType; + headers: HeaderListType; response?: unknown; stack?: string; cause?: unknown;