@base44-preview/sdk 0.8.48-pr.280.b5c6133 → 0.8.48-pr.280.dac0f98

package/dist/client.js

@@ -230,6 +230,7 @@ export function createClient(config) {
             userAuthModule,
             enabled: (_f = analytics === null || analytics === void 0 ? void 0 : analytics.enabled) !== null && _f !== void 0 ? _f : true,
             getVisitorId: experiments.visitorId,
+            experimentsContext,
         }),
         actors: actorsModule.module,
         cleanup: () => {

package/dist/modules/analytics.d.ts

@@ -1,6 +1,7 @@
 import { AxiosInstance } from "axios";
-import { TrackEventParams, AnalyticsModuleOptions } from "./analytics.types";
+import { TrackEventParams, TrackEventData, AnalyticsModuleOptions, SessionContext } from "./analytics.types";
 import type { InternalAuthModule } from "./auth.types";
+import type { ExperimentsContext } from "./experiments-config.types.js";
 export declare const USER_HEARTBEAT_EVENT_NAME = "__user_heartbeat_event__";
 export declare const ANALYTICS_INITIALIZATION_EVENT_NAME = "__initialization_event__";
 export declare const ANALYTICS_SESSION_DURATION_EVENT_NAME = "__session_duration_event__";
@@ -13,10 +14,21 @@ export interface AnalyticsModuleArgs {
     userAuthModule: InternalAuthModule;
     enabled: boolean;
     getVisitorId?: () => string | undefined;
+    experimentsContext?: ExperimentsContext;
 }
 /** @internal */
-export declare function isAnalyticsEnabled(enabled: boolean): boolean;
-export declare const createAnalyticsModule: ({ axiosClient, serverUrl, appId, userAuthModule, enabled, getVisitorId, }: AnalyticsModuleArgs) => {
+export declare function isAnalyticsEnabled(enabled: boolean, state?: {
+    requestsQueue: TrackEventData[];
+    isProcessing: boolean;
+    isHeartBeatProcessing: boolean;
+    wasInitializationTracked: boolean;
+    sessionContext: SessionContext | null;
+    sessionContextPromise: Promise<SessionContext> | null;
+    sessionStartTime: string | null;
+    fallbackSessionId: string | null;
+    config: Required<AnalyticsModuleOptions>;
+}): boolean;
+export declare const createAnalyticsModule: ({ axiosClient, serverUrl, appId, userAuthModule, enabled, getVisitorId, experimentsContext, }: AnalyticsModuleArgs) => {
     track: (params: TrackEventParams) => void;
     cleanup: () => void;
 };
@@ -30,6 +42,16 @@ export declare const createAnalyticsModule: ({ axiosClient, serverUrl, appId, us
  *
  * @internal
  */
-export declare function resetAnalyticsSessionContext(): void;
+export declare function resetAnalyticsSessionContext(axiosClient?: AxiosInstance): void;
 export declare function getAnalyticsConfigFromUrlParams(): AnalyticsModuleOptions | undefined;
-export declare function getAnalyticsSessionId(): string;
+export declare function getAnalyticsSessionId(state?: {
+    requestsQueue: TrackEventData[];
+    isProcessing: boolean;
+    isHeartBeatProcessing: boolean;
+    wasInitializationTracked: boolean;
+    sessionContext: SessionContext | null;
+    sessionContextPromise: Promise<SessionContext> | null;
+    sessionStartTime: string | null;
+    fallbackSessionId: string | null;
+    config: Required<AnalyticsModuleOptions>;
+}): string;

package/dist/modules/analytics.js

@@ -18,34 +18,41 @@ const defaultConfiguration = {
 //// shared queue for analytics events     ////
 ///////////////////////////////////////////////
 const ANALYTICS_SHARED_STATE_NAME = "analytics";
-// shared state//
-const analyticsSharedState = getSharedInstance(ANALYTICS_SHARED_STATE_NAME, () => ({
-    requestsQueue: [],
-    isProcessing: false,
-    isHeartBeatProcessing: false,
-    wasInitializationTracked: false,
-    sessionContext: null,
-    sessionStartTime: null,
-    // Memoized session id for when `localStorage` can't persist one — see
-    // getAnalyticsSessionId.
-    fallbackSessionId: null,
-    config: {
-        ...defaultConfiguration,
-        ...getAnalyticsConfigFromUrlParams(),
-    },
-}));
+function createAnalyticsState() {
+    return {
+        requestsQueue: [],
+        isProcessing: false,
+        isHeartBeatProcessing: false,
+        wasInitializationTracked: false,
+        sessionContext: null,
+        sessionContextPromise: null,
+        sessionStartTime: null,
+        // Memoized session id for when `localStorage` can't persist one — see
+        // getAnalyticsSessionId.
+        fallbackSessionId: null,
+        config: {
+            ...defaultConfiguration,
+            ...getAnalyticsConfigFromUrlParams(),
+        },
+    };
+}
+const analyticsSharedState = getSharedInstance(ANALYTICS_SHARED_STATE_NAME, createAnalyticsState);
+const serverAnalyticsStates = new WeakMap();
 /** @internal */
-export function isAnalyticsEnabled(enabled) {
-    return enabled && analyticsSharedState.config.enabled && !isReactNative;
+export function isAnalyticsEnabled(enabled, state = analyticsSharedState) {
+    return enabled && state.config.enabled && !isReactNative;
 }
-export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthModule, enabled, getVisitorId, }) => {
+export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthModule, enabled, getVisitorId, experimentsContext, }) => {
+    const state = typeof window === "undefined" ? createAnalyticsState() : analyticsSharedState;
+    if (typeof window === "undefined")
+        serverAnalyticsStates.set(axiosClient, state);
     // prevent overflow of events //
-    const { maxQueueSize, throttleTime, batchSize } = analyticsSharedState.config;
+    const { maxQueueSize, throttleTime, batchSize } = state.config;
     // Disable analytics on React Native. It defines `window` but not `document`,
     // so the per-callsite `typeof window` guards below aren't enough to keep it
     // from touching `document` (e.g. `document.referrer` on init). Node/SSR is
     // still handled by those `window` guards, so this doesn't affect it.
-    if (!isAnalyticsEnabled(enabled)) {
+    if (!isAnalyticsEnabled(enabled, state)) {
         return {
             track: () => { },
             cleanup: () => { },
@@ -77,7 +84,7 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         var _a;
         if (eventsData.length === 0)
             return;
-        const sessionContext_ = await getSessionContext(userAuthModule);
+        const sessionContext_ = await getSessionContext(userAuthModule, state);
         const events = eventsData.map(transformEventDataToApiRequestData({ ...sessionContext_, session_id: (_a = getVisitorId === null || getVisitorId === void 0 ? void 0 : getVisitorId()) !== null && _a !== void 0 ? _a : sessionContext_.session_id }));
         try {
             if (!options.isBeacon || !beaconRequest(events)) {
@@ -92,16 +99,25 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         startAnalyticsProcessor(flush, {
             throttleTime,
             batchSize,
-        });
+        }, state);
     };
     const track = (params) => {
-        if (analyticsSharedState.requestsQueue.length >= maxQueueSize) {
+        var _a;
+        if (state.requestsQueue.length >= maxQueueSize) {
             return;
         }
         const intrinsicData = getEventIntrinsicData();
-        analyticsSharedState.requestsQueue.push({
+        const preview = Object.fromEntries(Object.entries((_a = experimentsContext === null || experimentsContext === void 0 ? void 0 : experimentsContext.preview) !== null && _a !== void 0 ? _a : {}).filter(([, value]) => typeof value === "boolean"));
+        const properties = { ...params.properties };
+        delete properties.__b44_experiment_preview;
+        if (Object.keys(preview).length) {
+            // Capture now: a queued event must retain its occurrence-time preview.
+            properties.__b44_experiment_preview = JSON.stringify(preview);
+        }
+        state.requestsQueue.push({
             ...params,
             ...intrinsicData,
+            properties: params.properties || Object.keys(properties).length ? properties : undefined,
         });
         startProcessing();
     };
@@ -109,16 +125,16 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         startAnalyticsProcessor(flush, {
             throttleTime,
             batchSize,
-        });
-        clearHeartBeatProcessor = startHeartBeatProcessor(track);
-        setSessionDurationTimerStart();
+        }, state);
+        clearHeartBeatProcessor = startHeartBeatProcessor(track, state);
+        setSessionDurationTimerStart(state);
     };
     const onDocHidden = () => {
-        stopAnalyticsProcessor();
+        stopAnalyticsProcessor(state);
         clearHeartBeatProcessor === null || clearHeartBeatProcessor === void 0 ? void 0 : clearHeartBeatProcessor();
-        trackSessionDurationEvent(track);
+        trackSessionDurationEvent(track, state);
         //  flush entire queue on visibility change and hope for the best //
-        const eventsData = analyticsSharedState.requestsQueue.splice(0);
+        const eventsData = state.requestsQueue.splice(0);
         flush(eventsData, { isBeacon: true });
     };
     const onVisibilityChange = () => {
@@ -132,7 +148,7 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         }
     };
     const cleanup = () => {
-        stopAnalyticsProcessor();
+        stopAnalyticsProcessor(state);
         clearHeartBeatProcessor === null || clearHeartBeatProcessor === void 0 ? void 0 : clearHeartBeatProcessor();
         if (typeof window !== "undefined") {
             window.removeEventListener("visibilitychange", onVisibilityChange);
@@ -141,9 +157,9 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
     // start the flusing process ///
     startProcessing();
     // start the heart beat processor //
-    clearHeartBeatProcessor = startHeartBeatProcessor(track);
+    clearHeartBeatProcessor = startHeartBeatProcessor(track, state);
     // track the referrer event //
-    trackInitializationEvent(track);
+    trackInitializationEvent(track, state);
     // start the visibility change listener //
     if (typeof window !== "undefined") {
         window.addEventListener("visibilitychange", onVisibilityChange);
@@ -153,50 +169,50 @@ export const createAnalyticsModule = ({ axiosClient, serverUrl, appId, userAuthM
         cleanup,
     };
 };
-function stopAnalyticsProcessor() {
-    analyticsSharedState.isProcessing = false;
+function stopAnalyticsProcessor(state) {
+    state.isProcessing = false;
 }
-async function startAnalyticsProcessor(handleTrack, options) {
-    if (analyticsSharedState.isProcessing) {
+async function startAnalyticsProcessor(handleTrack, options, state) {
+    if (state.isProcessing) {
         // only one instance of the analytics processor can be running at a time //
         return;
     }
-    analyticsSharedState.isProcessing = true;
+    state.isProcessing = true;
     const { throttleTime = 1000, batchSize = 30 } = options !== null && options !== void 0 ? options : {};
-    while (analyticsSharedState.isProcessing &&
-        analyticsSharedState.requestsQueue.length > 0) {
-        const requests = analyticsSharedState.requestsQueue.splice(0, batchSize);
+    while (state.isProcessing &&
+        state.requestsQueue.length > 0) {
+        const requests = state.requestsQueue.splice(0, batchSize);
         requests.length && (await handleTrack(requests));
         await new Promise((resolve) => setTimeout(resolve, throttleTime));
     }
-    analyticsSharedState.isProcessing = false;
+    state.isProcessing = false;
 }
-function startHeartBeatProcessor(track) {
+function startHeartBeatProcessor(track, state) {
     var _a;
     // Browser-only, like the other automatic events here (initialization, session
     // duration, visibility). Outside a browser this timer fired a `me()` every
     // interval for the lifetime of a long-lived server-side client, and kept the
     // Node event loop alive. Explicit `analytics.track()` calls still work.
     if (typeof window === "undefined" ||
-        analyticsSharedState.isHeartBeatProcessing ||
-        ((_a = analyticsSharedState.config.heartBeatInterval) !== null && _a !== void 0 ? _a : 0) < 10) {
+        state.isHeartBeatProcessing ||
+        ((_a = state.config.heartBeatInterval) !== null && _a !== void 0 ? _a : 0) < 10) {
         return () => { };
     }
-    analyticsSharedState.isHeartBeatProcessing = true;
+    state.isHeartBeatProcessing = true;
     const interval = setInterval(() => {
         track({ eventName: USER_HEARTBEAT_EVENT_NAME });
-    }, analyticsSharedState.config.heartBeatInterval);
+    }, state.config.heartBeatInterval);
     return () => {
         clearInterval(interval);
-        analyticsSharedState.isHeartBeatProcessing = false;
+        state.isHeartBeatProcessing = false;
     };
 }
-function trackInitializationEvent(track) {
+function trackInitializationEvent(track, state) {
     if (typeof window === "undefined" ||
-        analyticsSharedState.wasInitializationTracked) {
+        state.wasInitializationTracked) {
         return;
     }
-    analyticsSharedState.wasInitializationTracked = true;
+    state.wasInitializationTracked = true;
     track({
         eventName: ANALYTICS_INITIALIZATION_EVENT_NAME,
         properties: {
@@ -204,20 +220,20 @@ function trackInitializationEvent(track) {
         },
     });
 }
-function setSessionDurationTimerStart() {
+function setSessionDurationTimerStart(state) {
     if (typeof window === "undefined" ||
-        analyticsSharedState.sessionStartTime !== null) {
+        state.sessionStartTime !== null) {
         return;
     }
-    analyticsSharedState.sessionStartTime = new Date().toISOString();
+    state.sessionStartTime = new Date().toISOString();
 }
-function trackSessionDurationEvent(track) {
+function trackSessionDurationEvent(track, state) {
     if (typeof window === "undefined" ||
-        analyticsSharedState.sessionStartTime === null)
+        state.sessionStartTime === null)
         return;
     const sessionDuration = new Date().getTime() -
-        new Date(analyticsSharedState.sessionStartTime).getTime();
-    analyticsSharedState.sessionStartTime = null;
+        new Date(state.sessionStartTime).getTime();
+    state.sessionStartTime = null;
     track({
         eventName: ANALYTICS_SESSION_DURATION_EVENT_NAME,
         properties: { sessionDuration },
@@ -240,7 +256,6 @@ function transformEventDataToApiRequestData(sessionContext) {
         ...sessionContext,
     });
 }
-let sessionContextPromise = null;
 /**
  * Clears the memoized analytics session context.
  *
@@ -251,22 +266,24 @@ let sessionContextPromise = null;
  *
  * @internal
  */
-export function resetAnalyticsSessionContext() {
-    analyticsSharedState.sessionContext = null;
-    sessionContextPromise = null;
+export function resetAnalyticsSessionContext(axiosClient) {
+    var _a;
+    const state = axiosClient ? (_a = serverAnalyticsStates.get(axiosClient)) !== null && _a !== void 0 ? _a : analyticsSharedState : analyticsSharedState;
+    state.sessionContext = null;
+    state.sessionContextPromise = null;
 }
-async function getSessionContext(userAuthModule) {
-    if (!analyticsSharedState.sessionContext) {
+async function getSessionContext(userAuthModule, state) {
+    if (!state.sessionContext) {
         // With no token there is no identity to resolve: `me()` can only answer 401,
         // which the browser logs to the console before any handler here sees it. On
         // a public page that request is the sole reason an error appears, so skip
         // it. This is not memoized — a visitor who logs in later must still resolve.
         if (!userAuthModule.hasToken()) {
-            return { user_id: null, session_id: getAnalyticsSessionId() };
+            return { user_id: null, session_id: getAnalyticsSessionId(state) };
         }
-        if (!sessionContextPromise) {
-            const sessionId = getAnalyticsSessionId();
-            sessionContextPromise = userAuthModule
+        if (!state.sessionContextPromise) {
+            const sessionId = getAnalyticsSessionId(state);
+            state.sessionContextPromise = userAuthModule
                 .me()
                 .then((user) => ({
                 user_id: user.id,
@@ -277,7 +294,7 @@ async function getSessionContext(userAuthModule) {
                 session_id: sessionId,
             }));
         }
-        const pending = sessionContextPromise;
+        const pending = state.sessionContextPromise;
         const context = await pending;
         // Publish only if this lookup is still the current one. A reset that lands
         // while the request is in flight nulls `sessionContextPromise`, and an
@@ -285,12 +302,12 @@ async function getSessionContext(userAuthModule) {
         // for the rest of the session. The awaited value is still returned: these
         // events were queued before the identity changed, so that is who they
         // belong to.
-        if (sessionContextPromise === pending) {
-            analyticsSharedState.sessionContext = context;
+        if (state.sessionContextPromise === pending) {
+            state.sessionContext = context;
         }
         return context;
     }
-    return analyticsSharedState.sessionContext;
+    return state.sessionContext;
 }
 export function getAnalyticsConfigFromUrlParams() {
     // `window.location` is absent on React Native. This runs at module load (via
@@ -312,19 +329,18 @@ export function getAnalyticsConfigFromUrlParams() {
     // return the config object //
     return { enabled: analyticsEnable === "true" };
 }
-// When the id can't be persisted (React Native has no `localStorage`), keep
-// it stable for the process instead of minting a fresh one per call.
-function getFallbackSessionId() {
+// Without persistent storage, keep the id stable within this analytics state.
+function getFallbackSessionId(state) {
     var _a;
-    return ((_a = analyticsSharedState.fallbackSessionId) !== null && _a !== void 0 ? _a : (analyticsSharedState.fallbackSessionId = generateUuid()));
+    return ((_a = state.fallbackSessionId) !== null && _a !== void 0 ? _a : (state.fallbackSessionId = generateUuid()));
 }
-export function getAnalyticsSessionId() {
+export function getAnalyticsSessionId(state = analyticsSharedState) {
     var _a;
     const visitorId = (_a = getExperimentsRuntime()) === null || _a === void 0 ? void 0 : _a.visitorId;
     if (visitorId && visitorId !== "anon")
         return visitorId;
     if (typeof window === "undefined") {
-        return getFallbackSessionId();
+        return getFallbackSessionId(state);
     }
     try {
         const sessionId = localStorage.getItem(ANALYTICS_SESSION_ID_LOCAL_STORAGE_KEY);
@@ -336,6 +352,6 @@ export function getAnalyticsSessionId() {
         return sessionId;
     }
     catch (_b) {
-        return getFallbackSessionId();
+        return getFallbackSessionId(state);
     }
 }

package/dist/modules/auth.js

@@ -177,7 +177,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             // Drop identity resolved under the previous session: a `me()` already in
             // flight would otherwise resolve into callers that run after the logout.
             clearPendingMe();
-            resetAnalyticsSessionContext();
+            resetAnalyticsSessionContext(axios);
             hasAccessToken = false;
             notifyAuthState({ status: "anonymous" });
             // Only do the rest if in a browser environment
@@ -207,7 +207,7 @@ export function createAuthModule(axios, functionsAxiosClient, appId, options) {
             // Same reasoning as in `logout`: the identity changes here, so anything
             // resolved for the previous one must not be handed to later callers.
             clearPendingMe();
-            resetAnalyticsSessionContext();
+            resetAnalyticsSessionContext(axios);
             hasAccessToken = true;
             // handle token change for axios clients
             axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/sdk",
-  "version": "0.8.48-pr.280.b5c6133",
+  "version": "0.8.48-pr.280.dac0f98",
   "description": "JavaScript SDK for Base44 API",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",