feat(carto): Cache pending requests (#8648)

visgl · Mar 14, 2024 · c1bf8a0 · c1bf8a0
1 parent 19d3018
commit c1bf8a0
Showing 1 changed file with 36 additions and 34 deletions.
diff --git a/modules/carto/src/api/request-with-parameters.ts b/modules/carto/src/api/request-with-parameters.ts
@@ -9,7 +9,7 @@ function encodeParameter(name: string, value: string | boolean | number): string
   return `${name}=${encodeURIComponent(value)}`;
 }
 
-const REQUEST_CACHE = new Map();
+const REQUEST_CACHE = new Map<string, Promise<unknown>>();
 export async function requestWithParameters<T = any>({
   accessToken,
   baseUrl,
@@ -25,47 +25,40 @@ export async function requestWithParameters<T = any>({
 }): Promise<T> {
   const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
-    return REQUEST_CACHE.get(key);
-  }
-
-  let url = baseUrl;
-  if (parameters) {
-    const encodedParameters = Object.entries({...DEFAULT_PARAMETERS, ...parameters}).map(
-      ([key, value]) => {
-        return encodeParameter(key, value);
-      }
-    );
-    url += `?${encodedParameters.join('&')}`;
+    return REQUEST_CACHE.get(key) as Promise<T>;
   }
 
+  const url = parameters ? createURLWithParameters(baseUrl, parameters) : baseUrl;
   const headers = {...DEFAULT_HEADERS, ...customHeaders};
-  try {
-    /* global fetch */
-    let response: Response;
-    if (url.length > MAX_GET_LENGTH) {
-      response = await fetch(baseUrl, {method: 'POST', body: JSON.stringify(parameters), headers});
-    } else {
-      response = await fetch(url, {headers});
-    }
-    let json: any;
-    try {
-      json = await response.json();
+
+  /* global fetch */
+  const fetchPromise =
+    url.length > MAX_GET_LENGTH
+      ? fetch(baseUrl, {method: 'POST', body: JSON.stringify(parameters), headers})
+      : fetch(url, {headers});
+
+  let response: Response | undefined;
+  const jsonPromise: Promise<T> = fetchPromise
+    .then((_response: Response) => {
+      response = _response;
+      return response.json();
+    })
+    .then((json: any) => {
+      if (!response || !response.ok) {
+        throw new Error(json.error);
+      }
       if (accessToken) {
         json.accessToken = accessToken;
       }
-    } catch {
-      json = {error: ''};
-    }
-    if (!response.ok) {
+      return json;
+    })
+    .catch((error: Error) => {
       REQUEST_CACHE.delete(key);
-      throw new CartoAPIError(json.error, errorContext, response);
-    }
+      throw new CartoAPIError(error, errorContext, response);
+    });
 
-    REQUEST_CACHE.set(key, json);
-    return json;
-  } catch (error) {
-    throw new CartoAPIError(error as Error, errorContext);
-  }
+  REQUEST_CACHE.set(key, jsonPromise);
+  return jsonPromise;
 }
 
 function createCacheKey(
@@ -77,3 +70,12 @@ function createCacheKey(
   const headerEntries = Object.entries(headers).sort(([a], [b]) => (a > b ? 1 : -1));
   return JSON.stringify({baseUrl, parameters: parameterEntries, headers: headerEntries});
 }
+
+function createURLWithParameters(baseUrl: string, parameters: Record<string, string>): string {
+  const encodedParameters = Object.entries({...DEFAULT_PARAMETERS, ...parameters}).map(
+    ([key, value]) => {
+      return encodeParameter(key, value);
+    }
+  );
+  return `${baseUrl}?${encodedParameters.join('&')}`;
+}