From faad6297d7cbca58ed9d69be95caaecf16250b57 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Sat, 1 Apr 2023 17:19:55 +0200
Subject: [PATCH] Handle timeout errors as api errors

---
 packages/api/src/utils/client/client.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/utils/client/client.ts b/packages/api/src/utils/client/client.ts
index 0a8cd95204b1..44c87c4dbbd9 100644
--- a/packages/api/src/utils/client/client.ts
+++ b/packages/api/src/utils/client/client.ts
@@ -1,8 +1,9 @@
-import {mapValues} from "@lodestar/utils";
+import {TimeoutError, mapValues} from "@lodestar/utils";
 import {compileRouteUrlFormater} from "../urlFormat.js";
 import {RouteDef, ReqGeneric, ReturnTypes, TypeJson, ReqSerializer, ReqSerializers, RoutesData} from "../types.js";
 import {APIClientHandler} from "../../interfaces.js";
 import {FetchOpts, HttpError, IHttpClient} from "./httpClient.js";
+import {HttpStatusCode} from "./httpStatusCode.js";
 
 // See /packages/api/src/routes/index.ts for reasoning
 
@@ -83,6 +84,13 @@ export function generateGenericJsonClient<
           >;
         }
 
+        if (err instanceof TimeoutError) {
+          return {
+            ok: false,
+            error: {code: HttpStatusCode.INTERNAL_SERVER_ERROR, message: err.message, operationId: routeId},
+          } as ReturnType<Api[keyof Api]>;
+        }
+
         throw err;
       }
     };