@base44-preview/sdk 0.8.6-pr.57.aa9ac21 → 0.8.6-pr.57.bb6a61e

package/dist/client.js

@@ -124,6 +124,7 @@ export function createClient(config) {
             userAuthModule,
         }),
         cleanup: () => {
+            userModules.analytics.cleanup();
             if (socket) {
                 socket.disconnect();
             }

package/dist/client.types.d.ts

@@ -6,6 +6,7 @@ import type { ConnectorsModule } from "./modules/connectors.types.js";
 import type { FunctionsModule } from "./modules/functions.types.js";
 import type { AgentsModule } from "./modules/agents.types.js";
 import type { AppLogsModule } from "./modules/app-logs.types.js";
+import type { AnalyticsModule } from "./modules/analytics.types.js";
 /**
  * Options for creating a Base44 client.
  */
@@ -82,6 +83,8 @@ export interface Base44Client {
     agents: AgentsModule;
     /** {@link AppLogsModule | App logs module} for tracking app usage. */
     appLogs: AppLogsModule;
+    /** {@link AnalyticsModule | Analytics module} for tracking app usage. */
+    analytics: AnalyticsModule;
     /** Cleanup function to disconnect WebSocket connections. Call when you're done with the client. */
     cleanup: () => void;
     /**

package/dist/modules/analytics.d.ts

@@ -9,5 +9,6 @@ export interface AnalyticsModuleArgs {
 }
 export declare const createAnalyticsModule: ({ axiosClient, serverUrl, appId, userAuthModule, }: AnalyticsModuleArgs) => {
     track: (params: TrackEventParams) => void;
+    cleanup: () => void;
 };
 export declare function getAnalyticsModuleOptionsFromUrlParams(): AnalyticsModuleOptions | undefined;

package/dist/modules/analytics.js

@@ -1,33 +1,36 @@
-import { getSharedInstance, getSharedInstanceRefCount, } from "../utils/singleton";
+import { getSharedInstance } from "../utils/sharedInstance";
+const defaultConfiguration = {
+    enabled: true,
+    maxQueueSize: 1000,
+    throttleTime: 1000,
+    batchSize: 30,
+};
+///////////////////////////////////////////////
+//// shared queue for analytics events     ////
+///////////////////////////////////////////////
 const ANALYTICS_SHARED_STATE_NAME = "analytics";
 // shared state//
 const analyticsSharedState = getSharedInstance(ANALYTICS_SHARED_STATE_NAME, () => ({
     requestsQueue: [],
+    isProcessing: false,
+    sessionContext: null,
+    config: {
+        ...defaultConfiguration,
+        ...getAnalyticsModuleOptionsFromUrlParams(),
+    },
 }));
 export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthModule, }) => {
-    var _a;
     // prevent overflow of events //
-    const { enabled = true, maxQueueSize = 1000, throttleTime = 1000, batchSize = 30, } = (_a = getAnalyticsModuleOptionsFromUrlParams()) !== null && _a !== void 0 ? _a : {};
+    const { enabled, maxQueueSize, throttleTime, batchSize } = analyticsSharedState.config;
     const trackBatchUrl = `${serverUrl}/api/apps/${appId}/analytics/track/batch`;
-    let sessionContext = null;
     const getSessionContext = async () => {
-        if (sessionContext)
-            return sessionContext;
-        const user = await userAuthModule.me();
-        sessionContext = {
-            user_id: user.id,
-        };
-        return sessionContext;
-    };
-    const track = (params) => {
-        if (!enabled || analyticsSharedState.requestsQueue.length >= maxQueueSize) {
-            return;
+        if (!analyticsSharedState.sessionContext) {
+            const user = await userAuthModule.me();
+            analyticsSharedState.sessionContext = {
+                user_id: user.id,
+            };
         }
-        const intrinsicData = getEventIntrinsicData();
-        analyticsSharedState.requestsQueue.push({
-            ...params,
-            ...intrinsicData,
-        });
+        return analyticsSharedState.sessionContext;
     };
     const batchRequestFallback = async (events) => {
         await axiosClient.request({
@@ -37,7 +40,7 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         });
     };
     const flush = async (eventsData) => {
-        const sessionContext_ = sessionContext !== null && sessionContext !== void 0 ? sessionContext : (await getSessionContext());
+        const sessionContext_ = await getSessionContext();
         const events = eventsData.map(transformEventDataToApiRequestData(sessionContext_));
         const beaconPayload = JSON.stringify({ events });
         if (typeof navigator === "undefined" ||
@@ -47,28 +50,75 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
             await batchRequestFallback(events);
         }
     };
-    if (typeof window !== "undefined") {
-        window.addEventListener("visibilitychange", () => {
-            //  flush entire queue on visibility change and hope for the best //
-            const eventsData = analyticsSharedState.requestsQueue.splice(0);
-            flush(eventsData);
+    const onDocHidden = () => {
+        stopAnalyticsProcessor();
+        //  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 //
-    if (getSharedInstanceRefCount(ANALYTICS_SHARED_STATE_NAME) <= 1 && enabled) {
+    const startProcessing = () => {
+        if (!enabled)
+            return;
         startAnalyticsProcessor(flush, {
             throttleTime,
             batchSize,
         });
-    }
+    };
+    const track = (params) => {
+        if (!enabled || analyticsSharedState.requestsQueue.length >= maxQueueSize) {
+            return;
+        }
+        const intrinsicData = getEventIntrinsicData();
+        analyticsSharedState.requestsQueue.push({
+            ...params,
+            ...intrinsicData,
+        });
+        startProcessing();
+    };
+    const cleanup = () => {
+        if (typeof window === "undefined")
+            return;
+        window.removeEventListener("visibilitychange", onVisibilityChange);
+        stopAnalyticsProcessor();
+    };
+    // start the flusing process ///
+    startProcessing();
     return {
         track,
+        cleanup,
     };
 };
+function stopAnalyticsProcessor() {
+    analyticsSharedState.isProcessing = false;
+}
 async function startAnalyticsProcessor(handleTrack, options) {
+    if (analyticsSharedState.isProcessing) {
+        // only one instance of the analytics processor can be running at a time //
+        return;
+    }
+    analyticsSharedState.isProcessing = true;
     const { throttleTime = 1000, batchSize = 30 } = options !== null && options !== void 0 ? options : {};
-    while (true) {
-        await new Promise((resolve) => setTimeout(resolve, throttleTime));
+    while (analyticsSharedState.isProcessing &&
+        analyticsSharedState.requestsQueue.length > 0) {
         const requests = analyticsSharedState.requestsQueue.splice(0, batchSize);
         if (requests.length > 0) {
             try {
@@ -79,12 +129,14 @@ async function startAnalyticsProcessor(handleTrack, options) {
                 console.error("Error processing analytics request:", error);
             }
         }
+        await new Promise((resolve) => setTimeout(resolve, throttleTime));
     }
+    analyticsSharedState.isProcessing = false;
 }
 function getEventIntrinsicData() {
     return {
         timestamp: new Date().toISOString(),
-        pageUrl: typeof window !== "undefined" ? window.location.href : null,
+        pageUrl: typeof window !== "undefined" ? window.location.pathname : null,
     };
 }
 function transformEventDataToApiRequestData(sessionContext) {
@@ -97,6 +149,8 @@ function transformEventDataToApiRequestData(sessionContext) {
     });
 }
 export function getAnalyticsModuleOptionsFromUrlParams() {
+    if (typeof window === "undefined")
+        return undefined;
     const urlParams = new URLSearchParams(window.location.search);
     const jsonString = urlParams.get("analytics");
     if (!jsonString)

package/dist/modules/analytics.types.d.ts

@@ -35,3 +35,6 @@ export type AnalyticsModuleOptions = {
     throttleTime?: number;
     batchSize?: number;
 };
+export type AnalyticsModule = {
+    track: (params: TrackEventParams) => void;
+};

package/dist/utils/{singleton.d.ts → sharedInstance.d.ts}

@@ -1,2 +1 @@
 export declare function getSharedInstance<T>(name: string, factory: () => T): T;
-export declare function getSharedInstanceRefCount<T>(name: string): number;

package/dist/utils/sharedInstance.js

@@ -0,0 +1,15 @@
+const windowObj = typeof window !== "undefined"
+    ? window
+    : { base44SharedInstances: {} };
+// Singleton (shared between sdk instances)//
+export function getSharedInstance(name, factory) {
+    if (!windowObj.base44SharedInstances) {
+        windowObj.base44SharedInstances = {};
+    }
+    if (!windowObj.base44SharedInstances[name]) {
+        windowObj.base44SharedInstances[name] = {
+            instance: factory(),
+        };
+    }
+    return windowObj.base44SharedInstances[name].instance;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/sdk",
-  "version": "0.8.6-pr.57.aa9ac21",
+  "version": "0.8.6-pr.57.bb6a61e",
   "description": "JavaScript SDK for Base44 API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/singleton.js

@@ -1,16 +0,0 @@
-// Singleton (shared between sdk instances)//
-export function getSharedInstance(name, factory) {
-    const windowObj = typeof window !== "undefined" ? window : { base44: {} };
-    if (!windowObj.base44) {
-        windowObj.base44 = {};
-    }
-    if (!windowObj.base44[name]) {
-        windowObj.base44[name] = { instance: factory(), _refCount: 1 };
-    }
-    return windowObj.base44[name].instance;
-}
-export function getSharedInstanceRefCount(name) {
-    var _a, _b, _c;
-    const windowObj = typeof window !== "undefined" ? window : { base44: {} };
-    return (_c = (_b = (_a = windowObj.base44) === null || _a === void 0 ? void 0 : _a[name]) === null || _b === void 0 ? void 0 : _b._refCount) !== null && _c !== void 0 ? _c : 0;
-}