Catch fetch error

Zaubrik · Aug 5, 2023 · fc93517 · fc93517
1 parent aec6614
commit fc93517
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/client/client.ts b/client/client.ts
@@ -28,9 +28,25 @@ export function createFetchRequest(
 async function fetchResponse(
   request: Request,
 ): Promise<JsonValue | undefined> {
-  const response = await fetch(request);
-  const text = await response.text();
-  return text === "" ? undefined : JSON.parse(text);
+  try {
+    const response = await fetch(request);
+    if (!response.ok) {
+      throw new Error(
+        `Received HTTP status code ${response.status} (${response.statusText}).`,
+      );
+    }
+    const text = await response.text();
+    return text === "" ? undefined : JSON.parse(text);
+  } catch (error) {
+    return {
+      jsonrpc: "2.0",
+      error: {
+        code: 0,
+        message: error.message,
+      },
+      id: null,
+    };
+  }
 }
 
 type MakeRpcCallOrNotificationOptions = CreateRequestOptions & {

diff --git a/client/dist/mod.js b/client/dist/mod.js
@@ -68,9 +68,23 @@ function createFetchRequest(resource, rpcRequestOrBatch, options = {}) {
     });
 }
 async function fetchResponse(request) {
-    const response = await fetch(request);
-    const text = await response.text();
-    return text === "" ? undefined : JSON.parse(text);
+    try {
+        const response = await fetch(request);
+        if (!response.ok) {
+            throw new Error(`Received HTTP status code ${response.status} (${response.statusText}).`);
+        }
+        const text = await response.text();
+        return text === "" ? undefined : JSON.parse(text);
+    } catch (error) {
+        return {
+            jsonrpc: "2.0",
+            error: {
+                code: 0,
+                message: error.message
+            },
+            id: null
+        };
+    }
 }
 function makeRpcCall(resource) {
     return async (rpcRequestInput, options = {})=>{