@tamsensedev/dataclient 0.1.1 → 0.1.4

package/dist/index.d.cts

@@ -75,7 +75,10 @@ interface ExcludeEvent {
 interface RrwebEvent {
     event: 'rrweb';
     timestamp: string;
-    rrwebEvent: unknown;
+    rrwebEvent: {
+        type: number;
+        [key: string]: unknown;
+    };
 }
 type SceneEvent = SnapshotEvent | MutationEvent | ActionEvent | RrwebEvent | IdentifyEvent | ExcludeEvent;
 interface Config {
@@ -84,6 +87,7 @@ interface Config {
     batchSize: number;
     flushInterval: number;
     checkpointInterval: number;
+    idleTimeout: number;
     mutationDebounce: number;
     inputDebounce: number;
     sessionIdKey: string;
@@ -115,10 +119,16 @@ declare class DataClient {
     private sender;
     private trackers;
     private config;
+    private deviceId;
+    private idleTimer;
+    private userId;
     constructor(options?: Partial<Config>);
     setUser(userId: string): void;
     excludeSession(reason?: string): void;
-    destroy(): void;
+    private onActivity;
+    private resetIdleTimer;
+    private startSession;
+    private stopSession;
 }
 
 export { type ActionEvent, type AttrChange, type Config, DataClient, type ExcludeEvent, type IdentifyEvent, type MutationAdd, type MutationEvent, type Rect, type RrwebEvent, type SceneBatch, type SceneEvent, type SerializedNode, type SnapshotEvent, type TextChange, type Tracker, type Viewport };

package/dist/index.d.ts

@@ -75,7 +75,10 @@ interface ExcludeEvent {
 interface RrwebEvent {
     event: 'rrweb';
     timestamp: string;
-    rrwebEvent: unknown;
+    rrwebEvent: {
+        type: number;
+        [key: string]: unknown;
+    };
 }
 type SceneEvent = SnapshotEvent | MutationEvent | ActionEvent | RrwebEvent | IdentifyEvent | ExcludeEvent;
 interface Config {
@@ -84,6 +87,7 @@ interface Config {
     batchSize: number;
     flushInterval: number;
     checkpointInterval: number;
+    idleTimeout: number;
     mutationDebounce: number;
     inputDebounce: number;
     sessionIdKey: string;
@@ -115,10 +119,16 @@ declare class DataClient {
     private sender;
     private trackers;
     private config;
+    private deviceId;
+    private idleTimer;
+    private userId;
     constructor(options?: Partial<Config>);
     setUser(userId: string): void;
     excludeSession(reason?: string): void;
-    destroy(): void;
+    private onActivity;
+    private resetIdleTimer;
+    private startSession;
+    private stopSession;
 }
 
 export { type ActionEvent, type AttrChange, type Config, DataClient, type ExcludeEvent, type IdentifyEvent, type MutationAdd, type MutationEvent, type Rect, type RrwebEvent, type SceneBatch, type SceneEvent, type SerializedNode, type SnapshotEvent, type TextChange, type Tracker, type Viewport };

package/dist/index.global.js

@@ -13111,34 +13111,21 @@ var dataclient = (() => {
     deviceId;
     queue = [];
     timer = null;
-    isFlushing = false;
+    flushPromise = Promise.resolve();
     add(event) {
       this.queue.push(event);
-      if (event.event === "rrweb" || this.queue.length >= this.batchSize) {
+      const isRrwebSnapshot = event.event === "rrweb" && event.rrwebEvent.type === 2;
+      if (isRrwebSnapshot || this.queue.length >= this.batchSize) {
         this.flush();
       }
     }
-    async flush() {
-      if (this.queue.length === 0 || this.isFlushing) {
-        return;
-      }
-      this.isFlushing = true;
-      const events = this.queue.splice(0);
-      const batch = this.buildBatch(events);
-      const json = JSON.stringify(batch);
-      const url = this.buildUrl();
-      const success = await this.send(json, url);
-      if (!success) {
-        this.queue.unshift(...events);
-      }
-      this.isFlushing = false;
+    flush() {
+      this.flushPromise = this.flushPromise.then(() => this.doFlush());
     }
     flushSync() {
-      if (this.queue.length === 0) {
+      if (this.queue.length === 0)
         return;
-      }
       const events = this.queue.splice(0);
-      if (events.length === 0) return;
       const url = this.buildUrl();
       let chunk = [];
       let chunkSize = 0;
@@ -13162,6 +13149,18 @@ var dataclient = (() => {
       }
       this.flushSync();
     }
+    async doFlush() {
+      if (this.queue.length === 0)
+        return;
+      const events = this.queue.splice(0);
+      const batch = this.buildBatch(events);
+      const json = JSON.stringify(batch);
+      const url = this.buildUrl();
+      const success = await this.send(json, url);
+      if (!success) {
+        this.queue.unshift(...events);
+      }
+    }
     sendBeacon(events, url) {
       const batch = this.buildBatch(events);
       const json = JSON.stringify(batch);
@@ -13193,12 +13192,10 @@ var dataclient = (() => {
           const response = await fetch(url, {
             method: "POST",
             headers: { "Content-Type": "application/json" },
-            body: json,
-            keepalive: true
+            body: json
           });
-          if (response.ok) {
+          if (response.ok)
             return true;
-          }
         } catch {
         }
         if (attempt < MAX_RETRIES) {
@@ -13216,6 +13213,7 @@ var dataclient = (() => {
     batchSize: 5,
     flushInterval: 5e3,
     checkpointInterval: 3e4,
+    idleTimeout: 60 * 60 * 1e3,
     mutationDebounce: 200,
     inputDebounce: 1e3,
     sessionIdKey: "sc2_sid",
@@ -13223,19 +13221,47 @@ var dataclient = (() => {
     apiKey: ""
   };
   var DataClient = class {
-    sender;
+    sender = null;
     trackers = [];
     config;
+    deviceId;
+    idleTimer = null;
+    userId = null;
     constructor(options) {
       this.config = { ...defaults, ...options };
+      this.deviceId = getDeviceId(this.config.deviceIdKey);
+      this.startSession();
+      document.addEventListener("click", () => this.onActivity(), true);
+      document.addEventListener("input", () => this.onActivity(), true);
+      document.addEventListener("change", () => this.onActivity(), true);
+    }
+    setUser(userId) {
+      this.userId = userId;
+      this.sender?.add({ event: "identify", timestamp: (/* @__PURE__ */ new Date()).toISOString(), user_id: userId });
+    }
+    excludeSession(reason = "") {
+      this.sender?.add({ event: "exclude", timestamp: (/* @__PURE__ */ new Date()).toISOString(), reason });
+      this.stopSession();
+    }
+    onActivity() {
+      if (!this.sender) {
+        this.startSession();
+      }
+      this.resetIdleTimer();
+    }
+    resetIdleTimer() {
+      if (this.idleTimer)
+        clearTimeout(this.idleTimer);
+      this.idleTimer = setTimeout(() => this.stopSession(), this.config.idleTimeout);
+    }
+    startSession() {
       const sessionId = generateId();
-      const deviceId = getDeviceId(this.config.deviceIdKey);
       this.sender = new Sender(
         this.config.endpoint,
         this.config.apiKey,
         this.config.batchSize,
         sessionId,
-        deviceId,
+        this.deviceId,
         this.config.flushInterval
       );
       const snapshotTracker = new SnapshotTracker(this.config, this.sender);
@@ -13244,26 +13270,37 @@ var dataclient = (() => {
       const rrwebTracker = new RrwebTracker(this.config, this.sender);
       this.trackers = [snapshotTracker, mutationTracker, actionTracker, rrwebTracker];
       this.trackers.forEach((t) => t.start());
+      if (this.userId) {
+        this.sender.add({ event: "identify", timestamp: (/* @__PURE__ */ new Date()).toISOString(), user_id: this.userId });
+      }
+      this.resetIdleTimer();
       const onLeave = () => {
         this.trackers.forEach((t) => t.beforeUnload?.());
-        this.sender.flushSync();
+        this.sender?.flushSync();
       };
       document.addEventListener("visibilitychange", () => {
-        if (document.visibilityState === "hidden") onLeave();
+        if (document.visibilityState === "hidden")
+          onLeave();
       });
       window.addEventListener("pagehide", onLeave);
+      if (this.config.debug) {
+        console.log(`[dataclient] Session started: ${sessionId}`);
+      }
     }
-    setUser(userId) {
-      this.sender.add({ event: "identify", timestamp: (/* @__PURE__ */ new Date()).toISOString(), user_id: userId });
-    }
-    excludeSession(reason = "") {
-      this.sender.add({ event: "exclude", timestamp: (/* @__PURE__ */ new Date()).toISOString(), reason });
-      this.destroy();
-    }
-    destroy() {
+    stopSession() {
+      if (this.idleTimer) {
+        clearTimeout(this.idleTimer);
+        this.idleTimer = null;
+      }
       this.trackers.forEach((t) => t.stop());
       this.trackers = [];
-      this.sender.destroy();
+      if (this.sender) {
+        this.sender.destroy();
+        this.sender = null;
+      }
+      if (this.config.debug) {
+        console.log("[dataclient] Session stopped (idle timeout)");
+      }
     }
   };
   return __toCommonJS(index_exports);