feat: Improve httpclient

client/src/utils/http.ts

@@ -6,6 +6,7 @@
 
 import axios, {
   AxiosError,
+  AxiosResponse,
   isAxiosError,
   type AxiosRequestConfig,
 } from 'axios';
@@ -44,10 +45,16 @@ export interface APIPostRequestParams<T extends APIPayload>
   extends APIRequestParams {
   payload?: T;
 }
+export interface APIPutRequestParams<T extends APIPayload>
+  extends APIPostRequestParams<T> {}
+export interface APIDeleteRequestParams extends APIGetRequestParams {}
 
+/** Exposed class */
 export interface APIHttpClient {
   get<T>(params: APIGetRequestParams): Promise<T>;
   post<T, D extends APIPayload>(params: APIPostRequestParams<D>): Promise<T>;
+  put<T, D extends APIPayload>(params: APIPutRequestParams<D>): Promise<T>;
+  delete<T>(params: APIDeleteRequestParams): Promise<T>;
 }
 
 // Implementation
@@ -78,6 +85,28 @@ const resolveUrl = ({
     ? `${API_BASE_URL}${uri}${queryParams ? `?${queryParams}` : ''}`
     : `${API_BASE_URL}/${API_VERSION}${uri}${queryParams ? `?${queryParams}` : ''}`;
 
+const httpRequestWithCacheHandling = async <T>(
+  httpRequest: Promise<AxiosResponse<T, unknown>>,
+): Promise<T> => {
+  const resp = await httpRequest.catch((err: AxiosError) => err);
+  const isErr = isAxiosError(resp);
+
+  if (!isErr && isSuccessResponse(resp.data)) {
+    return resp.data;
+  } else if (!isErr) {
+    throw resp;
+  }
+
+  // See if cached
+  const data = resp.response?.data as T;
+  if (!data) throw resp;
+
+  // Resolve if cached is OK
+  if (isSuccessResponse(data)) return data;
+
+  throw resp;
+};
+
 class HTTPClient implements APIHttpClient {
   get = async <T>({
     withCredentials,
@@ -89,23 +118,7 @@ class HTTPClient implements APIHttpClient {
       ? addCredentials(withCredentials, options ?? DEFAULT_OPTS)
       : (options ?? DEFAULT_OPTS);
 
-    const resp = await axios.get<T>(url, opts).catch((err: AxiosError) => err);
-    const isErr = isAxiosError(resp);
-
-    if (!isErr && isSuccessResponse(resp.data)) {
-      return resp.data;
-    } else if (!isErr) {
-      throw resp;
-    }
-
-    // See if cached
-    const data = resp.response?.data as T;
-    if (!data) throw resp;
-
-    // Resolve if cached is OK
-    if (isSuccessResponse(data)) return data;
-
-    throw resp;
+    return httpRequestWithCacheHandling<T>(axios.get<T>(url, opts));
   };
 
   post = async <T, D extends APIPayload>({
@@ -119,25 +132,34 @@ class HTTPClient implements APIHttpClient {
       ? addCredentials(withCredentials, options ?? DEFAULT_OPTS)
       : (options ?? DEFAULT_OPTS);
 
-    const resp = await axios
-      .post<T>(url, payload, opts)
-      .catch((err: AxiosError) => err);
-    const isErr = isAxiosError(resp);
+    return httpRequestWithCacheHandling<T>(axios.post<T>(url, payload, opts));
+  };
 
-    if (!isErr && isSuccessResponse(resp.data)) {
-      return resp.data;
-    } else if (!isErr) {
-      throw resp;
-    }
+  put = async <T, D extends APIPayload>({
+    payload,
+    withCredentials,
+    options,
+    ...uri
+  }: APIPutRequestParams<D>): Promise<T> => {
+    const url = resolveUrl(uri);
+    const opts: AxiosRequestConfig = withCredentials
+      ? addCredentials(withCredentials, options ?? DEFAULT_OPTS)
+      : (options ?? DEFAULT_OPTS);
 
-    // See if cached
-    const data = resp.response?.data as T;
-    if (!data) throw resp;
+    return httpRequestWithCacheHandling<T>(axios.put<T>(url, payload, opts));
+  };
 
-    // Resolve if cached is OK
-    if (isSuccessResponse(data)) return data;
+  delete = async <T>({
+    withCredentials,
+    options,
+    ...uri
+  }: APIDeleteRequestParams): Promise<T> => {
+    const url = resolveUrl(uri);
+    const opts: AxiosRequestConfig = withCredentials
+      ? addCredentials(withCredentials, options ?? DEFAULT_OPTS)
+      : (options ?? DEFAULT_OPTS);
 
-    throw resp;
+    return httpRequestWithCacheHandling<T>(axios.delete<T>(url, opts));
   };
 }