fix: simplify logic and cache the client per hostname on the server

CrystallizeAPI · Jul 23, 2024 · 8805839 · 8805839
1 parent bbf06fa
commit 8805839
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 28 deletions.
diff --git a/shared/application/use-cases/checkout/handleSaveCart.ts b/shared/application/use-cases/checkout/handleSaveCart.ts
@@ -13,18 +13,14 @@ export default async (body: any, { apiClient }: Deps, markets?: string[]) => {
         quantity: item.quantity,
     }));
 
-    if (cartId) {
-        try {
-            return await hydrateCart(localCartItems, { apiClient }, cartId, markets);
-        } catch (error: any) {
-            if (error.message.includes('placed')) {
-                console.log('Cart has been placed, creating a new one');
-                return await hydrateCart(localCartItems, { apiClient }, undefined, markets);
-            }
-            throw error;
+    try {
+        return await hydrateCart(localCartItems, { apiClient }, cartId, markets);
+    } catch (error: any) {
+        if (error.message.includes('placed')) {
+            console.log('Cart has been placed, creating a new one');
+            return await hydrateCart(localCartItems, { apiClient }, undefined, markets);
         }
+        throw error;
     }
-    if (!cartId) {
-        return await hydrateCart(localCartItems, { apiClient }, undefined, markets);
-    }
+
 };
diff --git a/shared/application/use-cases/storefront.server.ts b/shared/application/use-cases/storefront.server.ts
@@ -5,6 +5,7 @@ import {
     createFilesystemAdapter,
     createMemoryAdapter,
     TStoreFrontConfig,
+    TStoreFront,
 } from '@crystallize/js-storefrontaware-utils';
 import { configureStorage } from './storage.server';
 import {
@@ -20,6 +21,13 @@ const storage = configureStorage(`${process.env?.STORAGE_DSN}`, {
     prefix: 'superfast-',
 });
 
+declare global {
+    var __api_clients: Record<string, {
+        shared: TStoreFront;
+        secret: TStoreFront;
+    }>;
+}
+
 export const getStoreFront = async (hostname: string) => {
     const adapter = (() => {
         // if there is a file for the StoreFront, use that, note that it's safer to use the MemoryAdapter
@@ -85,24 +93,31 @@ export const getStoreFront = async (hostname: string) => {
 
     const createClientOptions: CreateClientOptions | undefined = process.env?.ENABLE_JS_API_CLIENT_PROFILING
         ? {
-              profiling: {
-                  onRequestResolved: ({ resolutionTimeMs, serverTimeMs }, query, variables) => {
-                      const timings = `[JS-API-CLIENT]: Request processed in ${serverTimeMs}ms, resolved in ${resolutionTimeMs}ms.`;
-                      if (process.env?.ENABLE_JS_API_CLIENT_PROFILING === 'verbose') {
-                          console.log(timings, { query, variables });
-                          return;
-                      }
-                      console.log(timings);
-                  },
-              },
-          }
+            profiling: {
+                onRequestResolved: ({ resolutionTimeMs, serverTimeMs }, query, variables) => {
+                    const timings = `[JS-API-CLIENT]: Request processed in ${serverTimeMs}ms, resolved in ${resolutionTimeMs}ms.`;
+                    if (process.env?.ENABLE_JS_API_CLIENT_PROFILING === 'verbose') {
+                        console.log(timings, { query, variables });
+                        return;
+                    }
+                    console.log(timings);
+                },
+            },
+        }
         : undefined;
 
-    const [shared, secret] = await Promise.all([
-        createStoreFront(adapter, false, createClientOptions),
-        createStoreFront(adapter, true, createClientOptions),
-    ]);
-    return { shared, secret };
+
+    if (!globalThis.__api_clients) {
+        globalThis.__api_clients = {};
+    }
+    if (!globalThis.__api_clients[hostname]) {
+        const [shared, secret] = await Promise.all([
+            createStoreFront(adapter, false, createClientOptions),
+            createStoreFront(adapter, true, createClientOptions),
+        ]);
+        globalThis.__api_clients[hostname] = { shared, secret };
+    }
+    return globalThis.__api_clients[hostname];
 };
 
 /**