fix(headless): defensive code against clientID access from relay (#4165)

https://coveord.atlassian.net/browse/KIT-3374
coveo · Jul 9, 2024 · 26bf619 · 26bf619
1 parent aa001e4
commit 26bf619
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/packages/headless/src/app/engine.ts b/packages/headless/src/app/engine.ts
@@ -288,6 +288,15 @@ function buildCoreEngine<
     reducerManager.addCrossReducer(options.crossReducer);
   }
   const logger = thunkExtraArguments.logger;
+  const getClientId = () => {
+    let clientId = '';
+    try {
+      clientId = getRelayInstanceFromState(engine.state).getMeta('').clientId;
+    } catch (e) {
+      logger.warn('Error while obtaining clientID from relay', e);
+    }
+    return clientId;
+  };
   const thunkExtraArgumentsWithRelay: CoreExtraArguments & ExtraArguments = {
     ...thunkExtraArguments,
     get relay() {
@@ -301,9 +310,7 @@ function buildCoreEngine<
         return defaultNodeJSNavigatorContextProvider();
       }
 
-      return defaultBrowserNavigatorContextProvider(
-        getRelayInstanceFromState(engine.state).getMeta('').clientId
-      );
+      return defaultBrowserNavigatorContextProvider(getClientId());
     },
   };
   const store = createStore(
@@ -350,9 +357,7 @@ function buildCoreEngine<
         return defaultNodeJSNavigatorContextProvider();
       }
 
-      return defaultBrowserNavigatorContextProvider(
-        getRelayInstanceFromState(engine.state).getMeta('').clientId
-      );
+      return defaultBrowserNavigatorContextProvider(getClientId());
     },
 
     logger,