fix:refactor error handling logic

Signed-off-by: Amitkanswal <[email protected]>

Author: Amitkanswal

src/utils/adapter.ts

@@ -1,26 +1,37 @@
 import PostRobot from "post-robot";
-import { Response } from 'node-fetch';
-import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { Response } from "node-fetch";
+import {
+    AxiosError,
+    AxiosRequestConfig,
+    AxiosResponse,
+} from "axios";
 
-import { onError, fetchToAxiosConfig, serializeAxiosResponse, handleApiError, sanitizeResponseHeader } from "./utils";
+import {
+    onError,
+    fetchToAxiosConfig,
+    handleApiError,
+    sanitizeResponseHeader,
+} from "./utils";
 
 /**
  * Dispatches a request using PostRobot.
  * @param postRobot - The PostRobot instance.
  * @returns A function that takes AxiosRequestConfig and returns a promise.
  */
-export const dispatchAdapter = (postRobot: typeof PostRobot) => (config: AxiosRequestConfig): Promise<AxiosResponse> => {
-  return postRobot
-    .sendToParent("apiAdapter", config)
-    .then((event:unknown) => {
-      const { data } = event as { data: AxiosResponse };
-      if (data.status >= 400) {
-        throw serializeAxiosResponse(data, config);
-      }
-      return serializeAxiosResponse(data, config);
-    })
-    .catch(onError);
-};
+export const dispatchAdapter =
+    (postRobot: typeof PostRobot) =>
+    (config: AxiosRequestConfig): Promise<AxiosResponse> => {
+        return postRobot
+            .sendToParent("apiAdapter", config)
+            .then((event: unknown) => {
+                const { data } = event as { data: AxiosResponse };
+                if (data.status >= 400) {
+                    throw data
+                }
+                return data as AxiosResponse;
+            })
+            .catch((err)=>onError(err));
+    };
 /**
  * Dispatches an API request using axios and PostRobot.
  * @param url - The URL of the API endpoint.
@@ -29,22 +40,24 @@ export const dispatchAdapter = (postRobot: typeof PostRobot) => (config: AxiosRe
  */
 export const dispatchApiRequest = async (
     url: string,
-    options?: RequestInit,
+    options?: RequestInit
 ): Promise<Response> => {
     try {
         const config = fetchToAxiosConfig(url, options);
         const responseData = (await dispatchAdapter(PostRobot)(
             config
         )) as AxiosResponse;
+       
 
         return new Response(responseData?.data, {
             status: responseData.status,
             statusText: responseData.statusText,
             url: responseData.config.url,
-            headers: new Headers(sanitizeResponseHeader(responseData.config.headers || {})),
+            headers: new Headers(
+                sanitizeResponseHeader(responseData.config.headers || {})
+            ),
         });
-        
     } catch (error) {
-     return handleApiError(error);
-  }
+        return handleApiError(error as AxiosResponse | AxiosError);
+    }
 };

src/utils/utils.ts

@@ -10,6 +10,14 @@ import { Response } from "node-fetch";
 
 import { Region, RegionType } from "../types";
 
+const filterHeaders = [
+    "api_key",
+    "authorization",
+    "auth_token",
+    "x-api-key",
+    "user-agent",
+  ];
+
 export function onData<Data extends Record<string, any>>(data: { data: Data }) {
     if (typeof data.data === "string") {
         return Promise.reject(data.data);
@@ -21,58 +29,38 @@ export function onError(error: Error) {
     return Promise.reject(error);
 }
 
-export const createAxiosErrorResponse = (error: AxiosError): Response => {
-    const { response, message, config } = error;
+export function sanitizeResponseHeader(axiosHeaders) {
+    const fetchHeaders = new Headers();
+    for (const key in axiosHeaders) {
+        if (axiosHeaders.hasOwnProperty(key) && !filterHeaders.includes(key)) {
+            fetchHeaders.append(key, axiosHeaders[key]);
+          }    
+    }
+    return fetchHeaders;
+};
+export const handleApiError = (error: AxiosResponse | AxiosError): Response => {
+    // Extract relevant information from the error
+    const isServerError = (error as AxiosResponse).status >= 500;
+    const responseBody = isServerError
+        ? (error as AxiosError).stack || "Internal Server Error"
+        : (error as AxiosResponse).data || "An error occurred";
+
+    const status = (error as AxiosResponse).status || 500;
+    const statusText =
+        isServerError
+            ? (error as AxiosError).message || "Internal Server Error"
+            : (error as AxiosResponse).statusText || "Error";
 
-    const responseBody = response?.data || { message };
-    const status = response?.status || 500;
-    const statusText = response?.statusText || "Internal Server Error";
     const headers = new Headers(
-        sanitizeResponseHeader(config?.headers || {})
+        sanitizeResponseHeader((error as AxiosResponse).headers || {})
     );
 
     return new Response(JSON.stringify(responseBody), {
         status,
         statusText,
         headers,
     });
-};
-
-export const sanitizeResponseHeader = (headers: RawAxiosRequestHeaders) => {
-    const responseHeaders = new Headers();
-    const filterHeaders = [
-        "api_key",
-        "authorization",
-        "x-api-key",
-        "user-agent",
-    ];
-    if (headers instanceof Headers) {
-        headers.forEach((value, key) => {
-            if (!filterHeaders.includes(key.toLowerCase())) {
-                responseHeaders.set(key, value);
-            }
-        });
-    }
-    return responseHeaders;
-};
-
-export const handleApiError = (error: unknown): Response => {
-    return isAxiosError(error)
-        ? createErrorResponse(createAxiosErrorResponse(error))
-        : createErrorResponse(error as Error);
-};
-
-export const createErrorResponse = (error: Error): Response => {
-    return new Response(
-        JSON.stringify({ message: (error).message || error }),
-        {
-            status: 500,
-            statusText: "Internal Server Error",
-            headers: new Headers(),
-        }
-    );
-};
-
+}
 export function formatAppRegion(region: string): RegionType {
     return region ?? Region.UNKNOWN;
 }
@@ -145,13 +133,3 @@ export const fetchToAxiosConfig = (
 
     return axiosConfig;
 };
-
-export const serializeAxiosResponse = (responseData: AxiosResponse, config) => {
-    return {
-        data: responseData.data,
-        status: responseData.status,
-        statusText: responseData.statusText,
-        headers: responseData.headers as AxiosHeaders,
-        config,
-    };
-};