@faststats/web 0.8.1 → 0.9.0

package/README.md

@@ -19,7 +19,7 @@ init({
 	extensions: [
 		outboundLinks(),
 		errorTracking(),
-		webVitals({ attribution: true }),
+		webVitals(),
 		sessionReplay({ recordConsole: true }),
 	],
 });
@@ -47,6 +47,37 @@ analytics.destroy();
 Consent remains client-local: use `"anonymous"` for cookieless collection,
 `"granted"` for normal collection, or `"denied"` to keep the client dormant.
 
+### Visit duration
+
+`page_leave.properties.time_on_page` is the accumulated time in milliseconds
+that the page was visible and its document had focus. It pauses when the tab is
+hidden, the window loses focus, or the page enters the back-forward cache, and
+resets on navigation, logout, or session rotation. A monotonic clock keeps
+system-clock changes from affecting this duration. Reading without interacting still counts while the page has focus;
+this metric does not infer whether a person is idle.
+
+Pageviews wait until the page becomes visible. Pages replaced or closed before
+being shown do not emit pageviews or page-leave events.
+
+The SDK sends cumulative `page_leave` checkpoints every 15 seconds while active
+and when activity pauses or the visit ends. Unchanged checkpoints are suppressed.
+Pageviews and their checkpoints share `properties.visit_id`; consumers should use
+the maximum `time_on_page` per visit, never sum its checkpoints. The existing
+session-duration and bounce-rate queries already use maximum values.
+
+Each visit retains its original identity, session, and page metadata. A session
+or identity change starts a new visit, even on the same route. Both persistent
+and cookieless sessions expire after 30 minutes of inactivity or 24 hours of age.
+
+`session_duration` is elapsed wall-clock time since the session started, including
+time away. It is separate from active time on the page. Paused visits do not keep
+sending larger session durations while the user is away.
+
+Delivery is best effort: a sudden process kill or network failure can lose time
+since the last delivered checkpoint. The collector must accept successive events
+for the same visitor and URL; deploy the removal of its five-second debounce
+before releasing this SDK.
+
 ### Custom extensions
 
 An extension registers only the lifecycle hooks it needs. Hook failures are

package/dist/chunks/{identifiers-KgQDX74Q.js → identifiers-xX7o7oZz.js}

@@ -1,4 +1,4 @@
-import { c as removeStorageItem, l as setStorageItem, n as createId, s as getStorageItem } from "./send-data-DFZnsaL2.js";
+import { c as removeStorageItem, l as setStorageItem, n as createId, s as getStorageItem } from "./send-data-Dplz7m4c.js";
 //#region src/utils/identifiers.ts
 const ANONYMOUS_ID_KEY = "faststats_anon_id_";
 function getOrCreateAnonymousId(siteKey) {

package/dist/chunks/{send-data-DFZnsaL2.js → send-data-Dplz7m4c.js}

@@ -64,17 +64,13 @@ function readSession(siteKey) {
 	if (!raw) return memory;
 	try {
 		const session = JSON.parse(raw);
-		return session.id ? session : memory;
+		return typeof session?.id === "string" && session.id && Number.isFinite(session.start) && Number.isFinite(session.activity) ? session : memory;
 	} catch {}
 	return memory;
 }
 function writeSession(siteKey, session) {
 	if (!setStorageItem("localStorage", `${SESSION_KEY}${siteKey}`, JSON.stringify(session))) writeMemory(siteKey, false, session);
 }
-function clearSession(siteKey, cookieless) {
-	memorySessions.delete(memoryKey(siteKey, cookieless));
-	if (!cookieless) removeStorageItem("localStorage", `${SESSION_KEY}${siteKey}`);
-}
 function expired(session, now) {
 	return now - session.activity >= IDLE_MS || now - session.start >= MAX_AGE_MS;
 }
@@ -83,41 +79,27 @@ function emitRotation(siteKey, cookieless, prev, next) {
 }
 function resolveSession(siteKey, cookieless, touch) {
 	const now = Date.now();
-	if (cookieless) {
-		let session = readMemory(siteKey, true) ?? void 0;
-		if (!session) {
-			session = {
-				id: createId(),
-				start: now,
-				activity: now
-			};
-			writeMemory(siteKey, true, session);
-		} else if (touch) session.activity = now;
-		return {
-			session,
-			rotatedFrom: null
-		};
-	}
-	const existing = readSession(siteKey);
-	if (existing && !expired(existing, now)) {
-		if (touch) {
-			existing.activity = now;
-			writeSession(siteKey, existing);
-		}
-		return {
-			session: existing,
-			rotatedFrom: null
-		};
-	}
-	const session = {
+	const existing = cookieless ? readMemory(siteKey, true) : readSession(siteKey);
+	const rotatedFrom = existing && expired(existing, now) ? existing : null;
+	const session = existing && !rotatedFrom ? existing : {
 		id: createId(),
 		start: now,
 		activity: now
 	};
-	writeSession(siteKey, session);
+	if (touch) session.activity = now;
+	if (touch || session !== existing) {
+		if (cookieless) writeMemory(siteKey, true, session);
+		else writeSession(siteKey, session);
+	}
+	const context = toContext(siteKey, session, cookieless);
+	const rotation = rotatedFrom ? {
+		prev: toContext(siteKey, rotatedFrom, cookieless),
+		next: context
+	} : null;
+	if (rotation) emitRotation(siteKey, cookieless, rotation.prev, rotation.next);
 	return {
-		session,
-		rotatedFrom: existing
+		context,
+		rotation
 	};
 }
 function windowId(siteKey, cookieless, sessionId) {
@@ -128,41 +110,26 @@ function windowId(siteKey, cookieless, sessionId) {
 	const id = createId();
 	return setStorageItem("sessionStorage", key, id) ? id : sessionId;
 }
-function toContext(siteKey, session, cookieless, windowIdOverride) {
+function toContext(siteKey, session, cookieless) {
 	return {
 		sessionId: session.id,
-		windowId: windowIdOverride ?? windowId(siteKey, cookieless, session.id),
+		windowId: windowId(siteKey, cookieless, session.id),
 		sessionStart: session.start
 	};
 }
 function getSessionContext(siteKey, cookieless = false) {
-	const { session, rotatedFrom } = resolveSession(siteKey, cookieless, false);
-	const next = toContext(siteKey, session, cookieless);
-	if (rotatedFrom) emitRotation(siteKey, cookieless, toContext(siteKey, rotatedFrom, cookieless, next.windowId), next);
-	return next;
+	return resolveSession(siteKey, cookieless, false).context;
 }
 function touchActivity(siteKey, cookieless = false) {
-	const { session, rotatedFrom } = resolveSession(siteKey, cookieless, true);
-	if (!rotatedFrom) return null;
-	const wid = windowId(siteKey, cookieless, session.id);
-	const rotation = {
-		prev: toContext(siteKey, rotatedFrom, cookieless, wid),
-		next: toContext(siteKey, session, cookieless, wid)
-	};
-	emitRotation(siteKey, cookieless, rotation.prev, rotation.next);
-	return rotation;
+	return resolveSession(siteKey, cookieless, true).rotation;
 }
 function resetSession(siteKey, cookieless = false) {
 	const previous = getSessionContext(siteKey, cookieless);
-	clearSession(siteKey, cookieless);
-	if (cookieless) {
-		const now = Date.now();
-		writeMemory(siteKey, true, {
-			id: createId(),
-			start: now,
-			activity: now
-		});
-	} else removeStorageItem("sessionStorage", `faststats_window_id_${siteKey}`);
+	memorySessions.delete(memoryKey(siteKey, cookieless));
+	if (!cookieless) {
+		removeStorageItem("localStorage", `${SESSION_KEY}${siteKey}`);
+		removeStorageItem("sessionStorage", `faststats_window_id_${siteKey}`);
+	}
 	const next = getSessionContext(siteKey, cookieless);
 	if (previous.sessionId !== next.sessionId) emitRotation(siteKey, cookieless, previous, next);
 	return next;

package/dist/error.d.ts

@@ -1,12 +1,12 @@
 import { t as AnalyticsExtension } from "./chunks/extensions-DW7tJY0T.js";
 //#region src/error.d.ts
-type ErrorEntry = {
+export type ErrorEntry = {
   error: string;
   message?: string;
   stack?: string[];
   handled?: boolean;
 };
-interface ErrorTrackingOptions {
+export interface ErrorTrackingOptions {
   siteKey: string;
   baseUrl?: string;
   debug?: boolean;
@@ -17,9 +17,9 @@ interface ErrorTrackingOptions {
   sdkName?: string;
   sdkVersion?: string;
 }
-type ErrorTrackingExtensionOptions = Omit<ErrorTrackingOptions, "siteKey" | "baseUrl" | "debug" | "trackHash" | "cookieless" | "sdkName" | "sdkVersion">;
-declare function errorTracking(options?: ErrorTrackingExtensionOptions): AnalyticsExtension;
-declare class ErrorTracker {
+export type ErrorTrackingExtensionOptions = Omit<ErrorTrackingOptions, "siteKey" | "baseUrl" | "debug" | "trackHash" | "cookieless" | "sdkName" | "sdkVersion">;
+export declare function errorTracking(options?: ErrorTrackingExtensionOptions): AnalyticsExtension;
+export default class ErrorTracker {
   private readonly options;
   private readonly endpoint;
   private queue;
@@ -38,5 +38,4 @@ declare class ErrorTracker {
   private enqueue;
   private flush;
 }
-//#endregion
-export { ErrorEntry, ErrorTrackingExtensionOptions, ErrorTrackingOptions, ErrorTracker as default, errorTracking };
+//#endregion

package/dist/error.js

@@ -1,9 +1,9 @@
 import { i as resolveBaseUrl, n as URLS, r as getPageContext, t as ANALYTICS_BASE } from "./chunks/api-urls-DWk43fu6.js";
-import { r as getSessionContext, t as sendData } from "./chunks/send-data-DFZnsaL2.js";
-import { t as getAnonymousId } from "./chunks/identifiers-KgQDX74Q.js";
+import { r as getSessionContext, t as sendData } from "./chunks/send-data-Dplz7m4c.js";
+import { t as getAnonymousId } from "./chunks/identifiers-xX7o7oZz.js";
 //#region src/error.ts
 const SDK_NAME = "@faststats/web";
-const SDK_VERSION = "0.8.1";
+const SDK_VERSION = "0.9.0";
 function errorTracking(options = {}) {
 	return {
 		name: "error-tracking",

package/dist/index.d.ts

@@ -27,7 +27,7 @@ interface WebAnalyticsOptions {
   /** @internal */
   sdkVersion?: string;
 }
-declare class WebAnalytics {
+export declare class WebAnalytics {
   private readonly options;
   private readonly baseUrl;
   private readonly debug;
@@ -36,11 +36,8 @@ declare class WebAnalytics {
   private heartbeatTimer;
   private extensions;
   private pageKey;
-  private entry;
-  private left;
-  private visitDuration;
-  private visitStartedAt;
-  private pendingPageviewTrigger;
+  private visit;
+  private pendingPageview;
   private consentMode;
   constructor(options: WebAnalyticsOptions);
   start(): void;
@@ -55,7 +52,7 @@ declare class WebAnalytics {
   reportError(error: Error): void;
   private canTrack;
   private isCookieless;
-  private ensureActive;
+  private isActive;
   private activate;
   private startExtensions;
   private stopExtensions;
@@ -65,30 +62,27 @@ declare class WebAnalytics {
   private readonly onVisibilityChange;
   private readonly onPageHide;
   private readonly onPageShow;
-  private navigate;
-  private enterPage;
+  private readonly onResume;
   private leavePage;
+  private checkpoint;
   private pauseVisit;
   private resumeVisit;
-  private touch;
-  private startHeartbeat;
-  private stopHeartbeat;
   private send;
 }
 //#endregion
 //#region src/client.d.ts
 /** Creates an independent client. Call `start()` when it should begin tracking. */
-declare function createClient(options: WebAnalyticsOptions): WebAnalytics;
+export declare function createClient(options: WebAnalyticsOptions): WebAnalytics;
 /** Initializes and starts the shared client used by the convenience functions. */
-declare function init(options: WebAnalyticsOptions): WebAnalytics;
+export declare function init(options: WebAnalyticsOptions): WebAnalytics;
 /** Stops and forgets the shared client. Independent clients are unaffected. */
-declare function shutdown(): void;
-declare function pageview(properties?: Record<string, unknown>): void;
-declare function track(name: string, properties?: Record<string, unknown>): void;
-declare function identify(user: IdentifyUser): Promise<boolean>;
-declare function identify(externalId: string, email?: string, options?: IdentifyOptions): Promise<boolean>;
-declare function logout(resetAnonymousIdentity?: boolean): void;
-declare function setConsentMode(mode: ConsentMode): void;
-declare function reportError(error: Error): void;
+export declare function shutdown(): void;
+export declare function pageview(properties?: Record<string, unknown>): void;
+export declare function track(name: string, properties?: Record<string, unknown>): void;
+export declare function identify(user: IdentifyUser): Promise<boolean>;
+export declare function identify(externalId: string, email?: string, options?: IdentifyOptions): Promise<boolean>;
+export declare function logout(resetAnonymousIdentity?: boolean): void;
+export declare function setConsentMode(mode: ConsentMode): void;
+export declare function reportError(error: Error): void;
 //#endregion
-export { type AnalyticsExtension, type AnalyticsExtensionContext, type ConsentMode, type ExtensionCleanup, type ExtensionHandler, type ExtensionHook, type ExtensionHooks, type IdentifyOptions, type IdentifyUser, WebAnalytics, type WebAnalyticsOptions, createClient, identify, init, logout, pageview, reportError, setConsentMode, shutdown, track };
+export type { AnalyticsExtension, AnalyticsExtensionContext, ConsentMode, ExtensionCleanup, ExtensionHandler, ExtensionHook, ExtensionHooks, IdentifyOptions, IdentifyUser, WebAnalyticsOptions };

package/dist/index.js

@@ -1,6 +1,6 @@
-import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, r as getPageContext, t as ANALYTICS_BASE } from "./chunks/api-urls-DWk43fu6.js";
-import { a as resetSession, o as touchActivity, r as getSessionContext, t as sendData } from "./chunks/send-data-DFZnsaL2.js";
-import { n as resetAnonymousId, t as getAnonymousId } from "./chunks/identifiers-KgQDX74Q.js";
+import { i as resolveBaseUrl, n as URLS, r as getPageContext, t as ANALYTICS_BASE } from "./chunks/api-urls-DWk43fu6.js";
+import { a as resetSession, n as createId, o as touchActivity, r as getSessionContext, t as sendData } from "./chunks/send-data-Dplz7m4c.js";
+import { n as resetAnonymousId, t as getAnonymousId } from "./chunks/identifiers-xX7o7oZz.js";
 //#region src/extensions.ts
 var ExtensionHost = class {
 	runtime;
@@ -104,15 +104,8 @@ var WebAnalytics = class {
 	heartbeatTimer = null;
 	extensions = null;
 	pageKey = "";
-	entry = {
-		path: "",
-		url: "",
-		search: ""
-	};
-	left = false;
-	visitDuration = 0;
-	visitStartedAt = null;
-	pendingPageviewTrigger = null;
+	visit = null;
+	pendingPageview = null;
 	consentMode;
 	constructor(options) {
 		this.options = options;
@@ -129,29 +122,58 @@ var WebAnalytics = class {
 	}
 	destroy() {
 		if (this.started === null) return;
-		if (this.started && typeof window !== "undefined" && this.canTrack()) this.leavePage();
+		this.leavePage();
 		this.started = null;
-		this.pendingPageviewTrigger = null;
-		this.stopHeartbeat();
+		this.pendingPageview = null;
 		for (const cleanup of this.cleanup.splice(0).reverse()) cleanup();
 		this.stopExtensions(false);
 	}
 	pageview(properties = {}) {
-		if (!this.ensureActive()) return;
-		const includeHash = this.options.trackHash ?? false;
-		const key = `${location.pathname}|${location.search}|${includeHash ? location.hash : ""}`;
-		if (key === this.pageKey) return;
-		this.pageKey = key;
-		this.send("pageview", properties);
+		if (!this.isActive()) return;
+		const key = location.pathname + location.search + (this.options.trackHash ? location.hash : "");
+		if (key !== this.pageKey) {
+			this.leavePage();
+			if (this.pageKey) this.extensions?.emit("pageChange", { url: getPageContext(this.options.trackHash).url ?? "" });
+			this.pageKey = key;
+		}
+		if (document.visibilityState !== "visible") {
+			this.pendingPageview = properties;
+			return;
+		}
+		this.pendingPageview = null;
+		if (document.hasFocus()) touchActivity(this.options.siteKey, this.isCookieless());
+		const session = getSessionContext(this.options.siteKey, this.isCookieless());
+		const userId = this.getAnonymousId();
+		if (this.visit?.session.sessionId === session.sessionId && this.visit.context.userId === (userId || void 0)) return;
+		this.leavePage();
+		this.visit = {
+			id: createId(),
+			session,
+			context: {
+				...getPageContext(this.options.trackHash),
+				userId: userId || void 0,
+				sessionId: session.sessionId,
+				windowId: session.windowId
+			},
+			duration: 0,
+			startedAt: null,
+			reportedDuration: -1
+		};
+		this.send("pageview", {
+			...properties,
+			visit_id: this.visit.id
+		}, this.visit.context);
+		this.resumeVisit();
 	}
 	track(name, properties = {}) {
-		if (!this.ensureActive()) return;
+		if (!this.isActive()) return;
 		const eventName = name.trim();
 		if (!eventName || eventName === "pageview" || eventName === "page_leave" || eventName === "error" || eventName === "outbound_link") return;
+		this.pageview({ trigger: "session" });
 		this.send(eventName, properties);
 	}
 	async identify(userOrExternalId, email, options = {}) {
-		if (!this.ensureActive() || !this.canTrack() || this.isCookieless()) return false;
+		if (!this.isActive() || this.isCookieless()) return false;
 		const user = typeof userOrExternalId === "string" ? {
 			id: userOrExternalId,
 			email,
@@ -165,7 +187,7 @@ var WebAnalytics = class {
 			"phone",
 			"avatarUrl"
 		].filter((field) => user[field] === null);
-		return await sendData({
+		return sendData({
 			url: `${this.baseUrl}${URLS.identify}`,
 			data: JSON.stringify({
 				token: this.options.siteKey,
@@ -188,9 +210,11 @@ var WebAnalytics = class {
 		});
 	}
 	logout(resetAnonymousIdentity = true) {
-		if (!this.ensureActive()) return;
+		if (!this.isActive()) return;
+		this.leavePage();
 		if (resetAnonymousIdentity) resetAnonymousId(this.options.siteKey, this.isCookieless());
 		resetSession(this.options.siteKey, this.isCookieless());
+		this.pageview({ trigger: "logout" });
 	}
 	setConsentMode(mode) {
 		if (mode === this.consentMode) return;
@@ -201,26 +225,21 @@ var WebAnalytics = class {
 		if (wasTracking && willTrack && wasCookieless !== willBeCookieless) this.leavePage();
 		this.consentMode = mode;
 		if (!willTrack) {
-			this.pauseVisit();
-			this.stopHeartbeat();
-			this.pendingPageviewTrigger = null;
+			this.leavePage();
+			this.pendingPageview = null;
 			this.stopExtensions(true);
 			return;
 		}
 		if (wasTracking) {
 			this.extensions?.emit("consentChange", { cookieless: willBeCookieless });
-			if (wasCookieless !== willBeCookieless) {
-				this.enterPage();
-				this.pageKey = "";
-				this.pageview({ trigger: "consent" });
-			}
+			if (wasCookieless !== willBeCookieless) this.pageview({ trigger: "consent" });
 		} else if (this.started) this.activate("consent");
 	}
 	getAnonymousId() {
 		return this.canTrack() ? getAnonymousId(this.options.siteKey, this.isCookieless()) : "";
 	}
 	reportError(error) {
-		if (!this.ensureActive() || !this.canTrack()) return;
+		if (!this.isActive()) return;
 		this.extensions?.emit("error", { error });
 	}
 	canTrack() {
@@ -229,17 +248,12 @@ var WebAnalytics = class {
 	isCookieless() {
 		return this.options.cookieless === true || this.consentMode === "anonymous";
 	}
-	ensureActive() {
-		return this.started === true && typeof window !== "undefined";
+	isActive() {
+		return this.started === true && this.canTrack();
 	}
 	activate(trigger) {
-		this.touch();
 		this.startExtensions();
-		this.enterPage();
-		this.pageKey = "";
-		this.startHeartbeat();
-		if (document.visibilityState === "visible") this.pageview({ trigger });
-		else this.pendingPageviewTrigger = trigger;
+		this.pageview({ trigger });
 	}
 	startExtensions() {
 		if (this.extensions || !this.options.extensions?.length) return;
@@ -268,32 +282,28 @@ var WebAnalytics = class {
 		this.bind(document, "visibilitychange", this.onVisibilityChange);
 		this.bind(window, "pagehide", this.onPageHide);
 		this.bind(window, "pageshow", this.onPageShow);
+		this.bind(window, "focus", this.onResume);
+		this.bind(window, "blur", () => this.pauseVisit());
 		this.bind(window, "popstate", this.onNavigate);
 		if (this.options.trackHash) this.bind(window, "hashchange", this.onNavigate);
-		this.cleanup.push(observeHistory(() => this.navigate()));
+		this.cleanup.push(observeHistory(this.onNavigate));
 	}
-	bind(target, type, listener, options) {
-		target.addEventListener(type, listener, options);
-		this.cleanup.push(() => target.removeEventListener(type, listener, options));
+	bind(target, type, listener) {
+		target.addEventListener(type, listener);
+		this.cleanup.push(() => target.removeEventListener(type, listener));
 	}
-	onNavigate = () => this.navigate();
+	onNavigate = () => this.pageview({ trigger: "navigation" });
 	onVisibilityChange = () => {
 		if (!this.canTrack()) return;
-		this.touch();
 		if (document.visibilityState === "hidden") {
 			this.pauseVisit();
 			this.extensions?.emit("pageHide", {
 				persisted: false,
 				terminal: false
 			});
-			this.stopHeartbeat();
 			return;
 		}
-		this.startHeartbeat();
-		this.resumeVisit();
-		const trigger = this.pendingPageviewTrigger;
-		this.pendingPageviewTrigger = null;
-		if (trigger) this.pageview({ trigger });
+		this.onResume();
 	};
 	onPageHide = (event) => {
 		if (!this.canTrack()) return;
@@ -307,82 +317,69 @@ var WebAnalytics = class {
 	};
 	onPageShow = (event) => {
 		if (!this.canTrack()) return;
-		if (document.visibilityState === "visible") this.resumeVisit();
+		this.onResume();
 		this.extensions?.emit("pageShow", { persisted: event.persisted });
 	};
-	navigate() {
-		if (this.started !== true || !this.canTrack()) return;
-		const includeHash = this.options.trackHash ?? false;
-		if (`${location.pathname}${includeHash ? location.hash : ""}` === this.entry.path && location.search === this.entry.search) return;
-		const url = sanitizeUrl(location.href, includeHash);
-		this.extensions?.emit("pageChange", { url });
-		this.leavePage();
-		this.enterPage();
-		this.pageview({ trigger: "navigation" });
-	}
-	enterPage() {
-		const includeHash = this.options.trackHash ?? false;
-		const hash = includeHash ? location.hash : "";
-		this.entry = {
-			path: `${location.pathname}${hash}`,
-			url: sanitizeUrl(location.href, includeHash),
-			search: location.search
-		};
-		this.left = false;
-		this.visitDuration = 0;
-		this.visitStartedAt = document.visibilityState === "visible" ? Date.now() : null;
-	}
+	onResume = () => {
+		this.pageview(this.pendingPageview ?? { trigger: "session" });
+		this.resumeVisit();
+	};
 	leavePage() {
-		if (this.started !== true || this.left || !this.canTrack()) return;
 		this.pauseVisit();
-		this.left = true;
-		const session = getSessionContext(this.options.siteKey, this.isCookieless());
+		this.visit = null;
+	}
+	checkpoint() {
+		const visit = this.visit;
+		if (!visit || !this.isActive()) return;
+		if (visit.startedAt !== null) {
+			const now = performance.now();
+			visit.duration += now - visit.startedAt;
+			visit.startedAt = now;
+		}
+		const duration = Math.round(visit.duration);
+		if (duration === visit.reportedDuration) return;
+		visit.reportedDuration = duration;
 		this.send("page_leave", {
-			time_on_page: this.visitDuration,
-			session_duration: Date.now() - session.sessionStart
-		}, {
-			page: this.entry.path,
-			url: this.entry.url
-		});
+			visit_id: visit.id,
+			time_on_page: duration,
+			session_duration: Math.max(0, Date.now() - visit.session.sessionStart)
+		}, visit.context);
 	}
 	pauseVisit() {
-		if (this.visitStartedAt === null) return;
-		this.visitDuration += Math.max(0, Date.now() - this.visitStartedAt);
-		this.visitStartedAt = null;
+		if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
+		this.heartbeatTimer = null;
+		this.checkpoint();
+		if (this.visit) this.visit.startedAt = null;
 	}
 	resumeVisit() {
-		if (!this.left && this.visitStartedAt === null) this.visitStartedAt = Date.now();
-	}
-	touch() {
-		if (this.canTrack()) touchActivity(this.options.siteKey, this.isCookieless());
-	}
-	startHeartbeat() {
-		this.stopHeartbeat();
+		if (!this.isActive() || !this.visit || this.visit.startedAt !== null || document.visibilityState !== "visible" || !document.hasFocus()) return;
+		this.visit.startedAt = performance.now();
 		this.heartbeatTimer = setInterval(() => {
-			if (document.visibilityState === "hidden") return this.stopHeartbeat();
-			this.touch();
-		}, 3e5);
-	}
-	stopHeartbeat() {
-		if (!this.heartbeatTimer) return;
-		clearInterval(this.heartbeatTimer);
-		this.heartbeatTimer = null;
+			if (document.visibilityState !== "visible" || !document.hasFocus()) {
+				this.pauseVisit();
+				return;
+			}
+			this.pageview({ trigger: "session" });
+			this.checkpoint();
+		}, 15e3);
 	}
-	send(event, properties = {}, dimensions = {}) {
-		if (this.started !== true || !this.canTrack()) return;
-		const cookieless = this.isCookieless();
-		const userId = getAnonymousId(this.options.siteKey, cookieless);
-		const session = getSessionContext(this.options.siteKey, cookieless);
+	send(event, properties = {}, context) {
+		if (!this.isActive()) return;
+		if (!context) {
+			const session = getSessionContext(this.options.siteKey, this.isCookieless());
+			context = {
+				...getPageContext(this.options.trackHash),
+				userId: this.getAnonymousId() || void 0,
+				sessionId: session.sessionId,
+				windowId: session.windowId
+			};
+		}
 		let data;
 		try {
 			data = JSON.stringify({
 				token: this.options.siteKey,
-				...userId ? { userId } : {},
-				sessionId: session.sessionId,
-				windowId: session.windowId,
 				event,
-				...getPageContext(this.options.trackHash ?? false),
-				...dimensions,
+				...context,
 				properties
 			});
 		} catch (error) {

package/dist/outbound-links.d.ts

@@ -1,10 +1,9 @@
 import { t as AnalyticsExtension } from "./chunks/extensions-DW7tJY0T.js";
 //#region src/outbound-links.d.ts
-declare function outboundLinks(): AnalyticsExtension;
-declare class OutboundLinkTracker {
+export declare function outboundLinks(): AnalyticsExtension;
+export declare class OutboundLinkTracker {
   private lastActivation;
   getHref(event: Event): string | null;
   private isDuplicate;
 }
-//#endregion
-export { OutboundLinkTracker, outboundLinks };
+//#endregion

package/dist/replay.d.ts

@@ -1,7 +1,7 @@
 import { t as AnalyticsExtension } from "./chunks/extensions-DW7tJY0T.js";
 import { record } from "@rrweb/record";
 import { LogLevel } from "@rrweb/rrweb-plugin-console-record";
-//#region ../../node_modules/.bun/@rrweb+types@2.1.1/node_modules/@rrweb/types/dist/index.d.ts
+//#region ../../node_modules/.bun/@rrweb+types@2.1.4/node_modules/@rrweb/types/dist/index.d.ts
 declare global {
   interface Window {
     FontFace: typeof FontFace;
@@ -17,7 +17,7 @@ type ReplayMutationThrottleOptions = {
 //#endregion
 //#region src/replay.d.ts
 type RecordOptions = NonNullable<Parameters<typeof record>[0]>;
-interface ReplayTrackerOptions {
+export interface ReplayTrackerOptions {
   siteKey: string;
   baseUrl?: string;
   debug?: boolean;
@@ -47,9 +47,9 @@ interface ReplayTrackerOptions {
   consoleStringLengthLimit?: number;
   mutationThrottle?: ReplayMutationThrottleOptions;
 }
-type SessionReplayExtensionOptions = Omit<ReplayTrackerOptions, "siteKey" | "baseUrl" | "debug" | "trackHash" | "cookieless">;
-declare function sessionReplay(options?: SessionReplayExtensionOptions): AnalyticsExtension;
-declare class ReplayTracker {
+export type SessionReplayExtensionOptions = Omit<ReplayTrackerOptions, "siteKey" | "baseUrl" | "debug" | "trackHash" | "cookieless">;
+export declare function sessionReplay(options?: SessionReplayExtensionOptions): AnalyticsExtension;
+export default class ReplayTracker {
   private readonly options;
   private readonly endpoint;
   private readonly compressionSupported;
@@ -85,6 +85,7 @@ declare class ReplayTracker {
   private unsubscribeRotation?;
   private lastCookielessMode;
   private terminalFlushRequested;
+  private initialFlushPending;
   private overflowed;
   private replayEventSequence;
   private readonly mutationThrottler;
@@ -126,5 +127,4 @@ declare class ReplayTracker {
   private retryDelay;
   private sendBatch;
 }
-//#endregion
-export { ReplayTrackerOptions, SessionReplayExtensionOptions, ReplayTracker as default, sessionReplay };
+//#endregion

package/dist/replay.js

@@ -1,6 +1,6 @@
 import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as ANALYTICS_BASE } from "./chunks/api-urls-DWk43fu6.js";
-import { i as onSessionRotated, l as setStorageItem, n as createId, o as touchActivity, r as getSessionContext, s as getStorageItem, t as sendData } from "./chunks/send-data-DFZnsaL2.js";
-import { t as getAnonymousId } from "./chunks/identifiers-KgQDX74Q.js";
+import { i as onSessionRotated, l as setStorageItem, n as createId, o as touchActivity, r as getSessionContext, s as getStorageItem, t as sendData } from "./chunks/send-data-Dplz7m4c.js";
+import { t as getAnonymousId } from "./chunks/identifiers-xX7o7oZz.js";
 import { record } from "@rrweb/record";
 import { getRecordConsolePlugin } from "@rrweb/rrweb-plugin-console-record";
 //#region src/replay-mutation-throttler.ts
@@ -122,6 +122,7 @@ var ReplayTracker = class {
 	unsubscribeRotation;
 	lastCookielessMode;
 	terminalFlushRequested = false;
+	initialFlushPending = true;
 	overflowed = false;
 	replayEventSequence = 0;
 	mutationThrottler;
@@ -204,6 +205,7 @@ var ReplayTracker = class {
 		this.started = true;
 		this.disposed = false;
 		this.terminalFlushRequested = false;
+		this.initialFlushPending = true;
 		this.overflowed = false;
 		this.replayEventSequence = 0;
 		this.viewId = createId();
@@ -371,6 +373,7 @@ var ReplayTracker = class {
 		this.minLengthFlushTask = null;
 		this.startTime = next.sessionStart;
 		this.chunkStartedAt = Date.now();
+		this.initialFlushPending = true;
 	}
 	onEvent = (event, _isCheckout) => {
 		if (this.overflowed) return;
@@ -429,10 +432,17 @@ var ReplayTracker = class {
 		}, 0);
 	};
 	scheduleMinLengthFlush() {
-		if (this.minLengthFlushTask || this.events.length === 0 || this.hasReachedMinLength()) return;
+		if (!this.initialFlushPending || this.events.length === 0 || this.minReplayLengthMs <= 0) return;
+		if (this.hasReachedMinLength()) {
+			this.initialFlushPending = false;
+			this.requestFlush("minLength");
+			return;
+		}
+		if (this.minLengthFlushTask) return;
 		const remainingMs = Math.max(0, this.minReplayLengthMs - (Date.now() - this.startTime));
 		this.minLengthFlushTask = setTimeout(() => {
 			this.minLengthFlushTask = null;
+			this.initialFlushPending = false;
 			this.requestFlush("minLength");
 		}, Math.min(remainingMs, MAX_TIMEOUT_MS));
 	}
@@ -600,6 +610,8 @@ var ReplayTracker = class {
 		const json = JSON.stringify(batch);
 		const lowLatencySafe = lowLatency && textEncoder.encode(json).byteLength <= 61440;
 		const sendOptions = {
+			debug: this.options.debug,
+			debugPrefix: "[Replay]",
 			useBeacon: lowLatencySafe,
 			keepalive: lowLatencySafe
 		};

package/dist/web-vitals.d.ts

@@ -1,31 +1,32 @@
 import { t as AnalyticsExtension } from "./chunks/extensions-DW7tJY0T.js";
 //#region src/web-vitals.d.ts
-interface WebVitalsOptions {
+export interface WebVitalsOptions {
   siteKey: string;
   baseUrl?: string;
   debug?: boolean;
-  attribution?: boolean;
   trackHash?: boolean;
   cookieless?: boolean;
 }
-type WebVitalsExtensionOptions = Pick<WebVitalsOptions, "attribution">;
-declare function webVitals(options?: WebVitalsExtensionOptions): AnalyticsExtension;
-declare class WebVitalsTracker {
+export declare function webVitals(): AnalyticsExtension;
+export default class WebVitalsTracker {
   private readonly options;
   private readonly endpoint;
   private metrics;
   private started;
-  private flushing;
+  private sending?;
+  private generation;
+  private unsubscribe?;
+  private readonly sentMetrics;
   private initialUrl;
   private session;
   private cookieless;
   constructor(options: WebVitalsOptions);
   setCookielessMode(cookieless: boolean): void;
-  start(): Promise<void>;
+  start(): void;
   stop(discard?: boolean): void;
   onPageHidden(persisted?: boolean): void;
   private onMetric;
+  private discard;
   private flush;
 }
-//#endregion
-export { WebVitalsExtensionOptions, WebVitalsOptions, WebVitalsTracker as default, webVitals };
+//#endregion

package/dist/web-vitals.js

@@ -1,12 +1,43 @@
 import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as ANALYTICS_BASE } from "./chunks/api-urls-DWk43fu6.js";
-import { r as getSessionContext, t as sendData } from "./chunks/send-data-DFZnsaL2.js";
+import { r as getSessionContext, t as sendData } from "./chunks/send-data-Dplz7m4c.js";
+import { onCLS, onFCP, onINP, onLCP, onTTFB } from "web-vitals/attribution";
+//#region src/utils/web-vitals-collector.ts
+const collectors = /* @__PURE__ */ new WeakMap();
+function subscribeToVitals(subscriber) {
+	let collector = collectors.get(document);
+	if (!collector) {
+		collector = {
+			subscribers: /* @__PURE__ */ new Set(),
+			latest: /* @__PURE__ */ new Map()
+		};
+		collectors.set(document, collector);
+		const { latest, subscribers } = collector;
+		const report = (metric) => {
+			const snapshot = { ...metric };
+			snapshot.attribution = { ...metric.attribution };
+			latest.set(metric.name, snapshot);
+			for (const listener of subscribers) listener(snapshot);
+		};
+		const changes = { reportAllChanges: true };
+		onCLS(report, changes);
+		onINP(report, changes);
+		onLCP(report, changes);
+		onFCP(report);
+		onTTFB(report);
+	}
+	collector.subscribers.add(subscriber);
+	for (const metric of collector.latest.values()) subscriber(metric);
+	return () => {
+		collector.subscribers.delete(subscriber);
+	};
+}
+//#endregion
 //#region src/web-vitals.ts
-function webVitals(options = {}) {
+function webVitals() {
 	return {
 		name: "web-vitals",
-		async setup(context) {
+		setup(context) {
 			const tracker = new WebVitalsTracker({
-				...options,
 				siteKey: context.siteKey,
 				baseUrl: context.baseUrl,
 				debug: context.debug,
@@ -15,7 +46,7 @@ function webVitals(options = {}) {
 			});
 			context.on("pageHide", ({ persisted }) => tracker.onPageHidden(persisted));
 			context.on("consentChange", ({ cookieless }) => tracker.setCookielessMode(cookieless));
-			await tracker.start();
+			tracker.start();
 			return ({ discard }) => tracker.stop(discard);
 		}
 	};
@@ -32,7 +63,10 @@ var WebVitalsTracker = class {
 	endpoint;
 	metrics = /* @__PURE__ */ new Map();
 	started = false;
-	flushing = false;
+	sending;
+	generation = 0;
+	unsubscribe;
+	sentMetrics = /* @__PURE__ */ new Map();
 	initialUrl = "";
 	session = null;
 	cookieless;
@@ -44,77 +78,83 @@ var WebVitalsTracker = class {
 	setCookielessMode(cookieless) {
 		if (this.cookieless === cookieless) return;
 		this.cookieless = cookieless;
-		this.metrics.clear();
+		this.discard();
 		this.session = this.started ? getSessionContext(this.options.siteKey, cookieless) : null;
 	}
-	async start() {
+	start() {
 		if (this.started || typeof window === "undefined") return;
 		this.started = true;
-		this.initialUrl = sanitizeUrl(window.location.href, this.options.trackHash ?? false);
+		this.initialUrl = sanitizeUrl(window.performance?.getEntriesByType("navigation")[0]?.name || window.location.href, this.options.trackHash ?? false);
 		this.session = getSessionContext(this.options.siteKey, this.cookieless);
-		const vitals = this.options.attribution ? await import("web-vitals/attribution") : await import("web-vitals");
-		if (!this.started) return;
-		const changes = { reportAllChanges: true };
-		vitals.onCLS(this.onMetric, changes);
-		vitals.onINP(this.onMetric, changes);
-		vitals.onLCP(this.onMetric, changes);
-		vitals.onFCP(this.onMetric);
-		vitals.onTTFB(this.onMetric);
+		this.unsubscribe = subscribeToVitals(this.onMetric);
 	}
 	stop(discard = false) {
 		if (!this.started) return;
 		this.started = false;
-		if (discard) this.metrics.clear();
+		this.unsubscribe?.();
+		this.unsubscribe = void 0;
+		if (discard) this.discard();
 		else this.flush();
 	}
 	onPageHidden(persisted = false) {
 		if (persisted) return;
-		queueMicrotask(() => void this.flush());
+		const generation = this.generation;
+		queueMicrotask(() => {
+			if (generation === this.generation) this.flush();
+		});
 	}
 	onMetric = (metric) => {
 		if (!this.started) return;
 		const name = metric.name;
 		if (!METRIC_NAMES.has(name) || !Number.isFinite(metric.value) || metric.value < 0) return;
-		const { id, rating, delta, navigationType } = metric;
-		const attribution = this.options.attribution && "attribution" in metric && metric.attribution ? metric.attribution : void 0;
-		this.metrics.set(name, {
-			metric: name,
-			value: metric.value,
-			attributes: {
-				id,
-				rating,
-				delta,
-				navigationType,
-				...attribution
-			}
-		});
+		this.metrics.set(name, metric);
 	};
+	discard() {
+		this.generation++;
+		this.metrics.clear();
+		this.sentMetrics.clear();
+	}
 	async flush() {
-		if (!this.metrics.size || this.flushing) return;
-		this.flushing = true;
+		const generation = this.generation;
+		while (this.sending) await this.sending;
+		if (generation !== this.generation || !this.metrics.size) return;
 		const batch = this.metrics;
-		this.metrics = /* @__PURE__ */ new Map();
 		const session = this.session ?? getSessionContext(this.options.siteKey, this.cookieless);
-		let sent = false;
-		try {
-			sent = await sendData({
-				url: this.endpoint,
-				data: JSON.stringify({
-					token: this.options.siteKey,
-					sessionId: session.sessionId,
-					windowId: session.windowId,
-					vitals: [...batch.values()],
-					metadata: { url: this.initialUrl }
-				}),
-				debug: this.options.debug,
-				debugPrefix: "[WebVitals]"
-			});
-		} finally {
-			if (!sent) {
-				for (const [name, vital] of batch) if (!this.metrics.has(name)) this.metrics.set(name, vital);
-			}
-			this.flushing = false;
-		}
+		const data = JSON.stringify({
+			token: this.options.siteKey,
+			sessionId: session.sessionId,
+			windowId: session.windowId,
+			vitals: [...batch.values()].map(({ name, value, id, rating, navigationType, attribution }) => {
+				const previous = this.sentMetrics.get(name);
+				return {
+					metric: name,
+					value,
+					attributes: {
+						...attribution,
+						id,
+						rating,
+						navigationType,
+						delta: value - (previous?.id === id ? previous.value : 0)
+					}
+				};
+			}),
+			metadata: { url: this.initialUrl }
+		});
+		this.metrics = /* @__PURE__ */ new Map();
+		this.sending = sendData({
+			url: this.endpoint,
+			data,
+			debug: this.options.debug,
+			debugPrefix: "[WebVitals]"
+		});
+		const sent = await this.sending;
+		this.sending = void 0;
+		if (generation !== this.generation) return;
+		for (const [name, vital] of batch) if (sent) this.sentMetrics.set(name, {
+			id: vital.id,
+			value: vital.value
+		});
+		else if (!this.metrics.has(name)) this.metrics.set(name, vital);
 	}
 };
 //#endregion

package/package.json

@@ -42,7 +42,7 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "0.8.1",
+	"version": "0.9.0",
 	"scripts": {
 		"build": "tsdown && bun run check-size",
 		"dev": "bun run build",
@@ -51,14 +51,14 @@
 		"check-size": "node scripts/check-bundle-size.mjs"
 	},
 	"devDependencies": {
-		"@rrweb/types": "^2.1.1",
-		"@types/bun": "^1.4.0",
-		"tsdown": "^0.22.14",
-		"typescript": "^6.0.3"
+		"@rrweb/types": "^2.1.4",
+		"@types/bun": "^1.4.2",
+		"tsdown": "^0.23.0",
+		"typescript": "^7.0.2"
 	},
 	"dependencies": {
-		"@rrweb/record": "^2.1.1",
-		"@rrweb/rrweb-plugin-console-record": "^2.1.1",
+		"@rrweb/record": "^2.1.4",
+		"@rrweb/rrweb-plugin-console-record": "^2.1.4",
 		"web-vitals": "^6.2.1"
 	}
 }