From fa3937e084fd43dcef32e9ed001dd295ee3cb9ce Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:23:41 -0800
Subject: [PATCH] Fix parsing of Retry-After

---
 ts/jobs/helpers/findRetryAfterTimeFromError.ts | 4 ++++
 ts/textsecure/Errors.ts                        | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

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<string>;
-};
-
 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;