Fix race condition with custom events

packages/client/src/analytics/analytics.ts

@@ -1,3 +1,5 @@
+import { Auth } from '../api';
+import { analyticsReadyEvent } from '../events';
 import { initAmplitude, logAmplitudeEvent, logPageView } from './amplitude';
 import { AnalyticsEventArgs } from './constants';
 import {
@@ -8,6 +10,11 @@ import {
 export const initAnalytics = () => {
   initAmplitude();
   initTaskAnalytics();
+   window.addEventListener(analyticsReadyEvent, (e) => {
+        const response = (e as CustomEvent).detail as Auth;
+        window.logPageView(window.__DECORATOR_DATA__.params, response);
+        window.startTaskAnalyticsSurvey(window.__DECORATOR_DATA__);
+   });
 };
 
 // Connects to partytown forwarding
@@ -37,6 +44,7 @@ window.analyticsEvent = function (props: AnalyticsEventArgs) {
     'decorator_next',
   );
 };
+
 window.logPageView = logPageView;
 window.logAmplitudeEvent = logAmplitudeEvent;
 window.startTaskAnalyticsSurvey = startTaskAnalyticsSurvey;

packages/client/src/events.ts

@@ -0,0 +1,8 @@
+import { Auth } from "./api";
+
+export const analyticsReadyEvent = "decorator-analytics-ready";
+
+export const analyticsReady = (response: Auth) => new CustomEvent(analyticsReadyEvent, {
+    bubbles: true,
+    detail: response
+})

packages/client/src/main.ts

@@ -1,7 +1,5 @@
 import { formatParams } from 'decorator-shared/json';
-import { LoginLevel, type Context, type Params } from 'decorator-shared/params';
-import Cookies from 'js-cookie';
-import 'vite/modulepreload-polyfill';
+import { LoginLevel, type Context, type Params } from 'decorator-shared/params'; import Cookies from 'js-cookie'; import 'vite/modulepreload-polyfill';
 import * as api from './api';
 import { logoutWarningController } from './controllers/logout-warning';
 import { onLoadListeners } from './listeners';
@@ -26,6 +24,7 @@ import './views/search-input';
 import './views/search-menu';
 import { Auth } from './api';
 import { addFaroMetaData } from './faro';
+import { analyticsReady } from './events';
 
 import.meta.glob('./styles/*.css', { eager: true });
 
@@ -137,14 +136,14 @@ async function populateLoggedInMenu(authObject: Auth) {
 const init = async () => {
     const response = await api.checkAuth();
 
-    window.logPageView(window.__DECORATOR_DATA__.params, response);
-    window.startTaskAnalyticsSurvey(window.__DECORATOR_DATA__);
 
     if (!response.authenticated) {
         return;
     }
 
     await populateLoggedInMenu(response);
+
+    window.dispatchEvent(analyticsReady(response));
 };
 
 init();

packages/server/src/views/index.ts

@@ -84,15 +84,10 @@ const getEnvAssets = async () => {
       [
         'http://localhost:5173/@vite/client',
         `http://localhost:5173/${entryPointPath}`,
+        `http://localhost:5173/${entryPointPathAnalytics}`,
       ]
         .map(script)
         .join(''),
-      [
-        vendorScripts.taskAnalytics,
-        hostUrl(`/public/${manifest[entryPointPathAnalytics].file}`),
-      ]
-        .map(asyncScript)
-        .join(''),
       [inlineVendorScripts.hotjar].map(partytownInlineScript).join(''),
     ].join(''),
   };