bot comments

Author: OmerKat

src/modules/analytics.ts

@@ -99,20 +99,31 @@ export const createAnalyticsModule = ({
     }
   };
 
-  if (typeof window !== "undefined" && enabled) {
-    window.addEventListener("visibilitychange", () => {
-      if (document.visibilityState === "hidden") {
-        analyticsSharedState.isProcessing = false;
-        //  flush entire queue on visibility change and hope for the best //
-        const eventsData = analyticsSharedState.requestsQueue.splice(0);
-        flush(eventsData);
-      } else if (document.visibilityState === "visible") {
-        startAnalyticsProcessor(flush, {
-          throttleTime,
-          batchSize,
-        });
-      }
+  const onDocHidden = () => {
+    analyticsSharedState.isProcessing = false;
+    //  flush entire queue on visibility change and hope for the best //
+    const eventsData = analyticsSharedState.requestsQueue.splice(0);
+    flush(eventsData);
+  };
+
+  const onDocVisible = () => {
+    startAnalyticsProcessor(flush, {
+      throttleTime,
+      batchSize,
     });
+  };
+
+  const onVisibilityChange = () => {
+    if (typeof window === "undefined") return;
+    if (document.visibilityState === "hidden") {
+      onDocHidden();
+    } else if (document.visibilityState === "visible") {
+      onDocVisible();
+    }
+  };
+
+  if (typeof window !== "undefined" && enabled) {
+    window.addEventListener("visibilitychange", onVisibilityChange);
   }
 
   // start analytics processor only if it's the first instance and analytics is enabled //
@@ -174,6 +185,7 @@ function transformEventDataToApiRequestData(sessionContext: SessionContext) {
 export function getAnalyticsModuleOptionsFromUrlParams():
   | AnalyticsModuleOptions
   | undefined {
+  if (typeof window === "undefined") return undefined;
   const urlParams = new URLSearchParams(window.location.search);
   const jsonString = urlParams.get("analytics");
   if (!jsonString) return undefined;

src/utils/singleton.ts

@@ -1,26 +1,27 @@
-
-
+const windowObj: {
+  base44SharedInstances?: {
+    [key: string]: { instance: any; _refCount: number };
+  };
+} =
+  typeof window !== "undefined"
+    ? (window as any)
+    : { base44SharedInstances: {} };
 
 // Singleton (shared between sdk instances)//
 export function getSharedInstance<T>(name: string, factory: () => T): T {
-  const windowObj: Window & {
-    base44?: { [key: string]: { instance: T; _refCount: number } };
-  } = typeof window !== "undefined" ? (window as any) : { base44: {} };
-
-  if (!windowObj.base44) {
-    windowObj.base44 = {};
+  if (!windowObj.base44SharedInstances) {
+    windowObj.base44SharedInstances = {};
   }
-  if (!windowObj.base44[name]) {
-    windowObj.base44[name] = { instance: factory(), _refCount: 0 };
+  if (!windowObj.base44SharedInstances[name]) {
+    windowObj.base44SharedInstances[name] = {
+      instance: factory(),
+      _refCount: 0,
+    };
   }
-  windowObj.base44[name]._refCount++;
-  return windowObj.base44[name].instance;
+  windowObj.base44SharedInstances[name]._refCount++;
+  return windowObj.base44SharedInstances[name].instance;
 }
 
 export function getSharedInstanceRefCount<T>(name: string): number {
-  const windowObj: Window & {
-    base44?: { [key: string]: { instance: T; _refCount: number } };
-  } = typeof window !== "undefined" ? (window as any) : { base44: {} };
-
-  return windowObj.base44?.[name]?._refCount ?? 0;
+  return windowObj.base44SharedInstances?.[name]?._refCount ?? 0;
 }