@base44-preview/sdk 0.8.6-pr.57.2eea21a → 0.8.6-pr.57.5bc7e40

package/dist/modules/analytics.d.ts

@@ -2,6 +2,8 @@ import { AxiosInstance } from "axios";
 import { TrackEventParams, AnalyticsModuleOptions } from "./analytics.types";
 import type { AuthModule } from "./auth.types";
 export declare const USER_HEARTBEAT_EVENT_NAME = "__user_heartbeat_event__";
+export declare const ANALYTICS_CONFIG_LOCAL_STORAGE_KEY = "base44_analytics_config";
+export declare const ANALYTICS_SESSION_ID_LOCAL_STORAGE_KEY = "base44_analytics_session_id";
 export interface AnalyticsModuleArgs {
     axiosClient: AxiosInstance;
     serverUrl: string;
@@ -13,3 +15,4 @@ export declare const createAnalyticsModule: ({ axiosClient, serverUrl, appId, us
     cleanup: () => void;
 };
 export declare function getAnalyticsModuleOptionsFromLocalStorage(): AnalyticsModuleOptions | undefined;
+export declare function getAnalyticsSessionId(): string;

package/dist/modules/analytics.js

@@ -1,5 +1,8 @@
 import { getSharedInstance } from "../utils/sharedInstance";
+import { generateUuid } from "../utils/common";
 export const USER_HEARTBEAT_EVENT_NAME = "__user_heartbeat_event__";
+export const ANALYTICS_CONFIG_LOCAL_STORAGE_KEY = "base44_analytics_config";
+export const ANALYTICS_SESSION_ID_LOCAL_STORAGE_KEY = "base44_analytics_session_id";
 const defaultConfiguration = {
     enabled: true,
     maxQueueSize: 1000,
@@ -23,8 +26,15 @@ const analyticsSharedState = getSharedInstance(ANALYTICS_SHARED_STATE_NAME, () =
     },
 }));
 export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthModule, }) => {
+    var _a;
     // prevent overflow of events //
-    const { enabled, maxQueueSize, throttleTime, batchSize } = analyticsSharedState.config;
+    const { maxQueueSize, throttleTime, batchSize } = analyticsSharedState.config;
+    if (!((_a = analyticsSharedState.config) === null || _a === void 0 ? void 0 : _a.enabled)) {
+        return {
+            track: () => { },
+            cleanup: () => { },
+        };
+    }
     let clearHeartBeatProcessor = undefined;
     const trackBatchUrl = `${serverUrl}/api/apps/${appId}/analytics/track/batch`;
     const batchRequestFallback = async (events) => {
@@ -51,15 +61,13 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         }
     };
     const startProcessing = () => {
-        if (!enabled)
-            return;
         startAnalyticsProcessor(flush, {
             throttleTime,
             batchSize,
         });
     };
     const track = (params) => {
-        if (!enabled || analyticsSharedState.requestsQueue.length >= maxQueueSize) {
+        if (analyticsSharedState.requestsQueue.length >= maxQueueSize) {
             return;
         }
         const intrinsicData = getEventIntrinsicData();
@@ -105,7 +113,7 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
     // start the heart beat processor //
     clearHeartBeatProcessor = startHeartBeatProcessor(track);
     // start the visibility change listener //
-    if (typeof window !== "undefined" && enabled) {
+    if (typeof window !== "undefined") {
         window.addEventListener("visibilitychange", onVisibilityChange);
     }
     return {
@@ -165,13 +173,16 @@ let sessionContextPromise = null;
 async function getSessionContext(userAuthModule) {
     if (!analyticsSharedState.sessionContext) {
         if (!sessionContextPromise) {
+            const sessionId = getAnalyticsSessionId();
             sessionContextPromise = userAuthModule
                 .me()
                 .then((user) => ({
                 user_id: user.id,
+                session_id: sessionId,
             }))
                 .catch(() => ({
-                user_id: "unknown: error getting session context",
+                user_id: null,
+                session_id: sessionId,
             }));
         }
         analyticsSharedState.sessionContext = await sessionContextPromise;
@@ -182,7 +193,7 @@ export function getAnalyticsModuleOptionsFromLocalStorage() {
     if (typeof window === "undefined")
         return undefined;
     try {
-        const jsonString = localStorage.getItem("base44_analytics_config");
+        const jsonString = localStorage.getItem(ANALYTICS_CONFIG_LOCAL_STORAGE_KEY);
         if (!jsonString)
             return undefined;
         return JSON.parse(jsonString);
@@ -191,3 +202,20 @@ export function getAnalyticsModuleOptionsFromLocalStorage() {
         return undefined;
     }
 }
+export function getAnalyticsSessionId() {
+    if (typeof window === "undefined") {
+        return generateUuid();
+    }
+    try {
+        const sessionId = localStorage.getItem(ANALYTICS_SESSION_ID_LOCAL_STORAGE_KEY);
+        if (!sessionId) {
+            const newSessionId = generateUuid();
+            localStorage.setItem(ANALYTICS_SESSION_ID_LOCAL_STORAGE_KEY, newSessionId);
+            return newSessionId;
+        }
+        return sessionId;
+    }
+    catch (_a) {
+        return generateUuid();
+    }
+}

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

@@ -15,6 +15,7 @@ export type TrackEventData = {
 } & TrackEventIntrinsicData;
 export type SessionContext = {
     user_id?: string | null;
+    session_id?: string | null;
 };
 export type AnalyticsApiRequestData = {
     event_name: string;

package/dist/utils/common.d.ts

@@ -1,2 +1,3 @@
 export declare const isNode: boolean;
 export declare const isInIFrame: boolean;
+export declare const generateUuid: () => string;

package/dist/utils/common.js

@@ -1,2 +1,6 @@
 export const isNode = typeof window === "undefined";
 export const isInIFrame = !isNode && window.self !== window.top;
+export const generateUuid = () => {
+    return (Math.random().toString(36).substring(2, 15) +
+        Math.random().toString(36).substring(2, 15));
+};

package/package.json

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