@faststats/web 0.12.0 → 0.12.1

package/README.md

@@ -52,8 +52,10 @@ Consent remains client-local: use `"anonymous"` for cookieless collection,
 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.
+system-clock changes from affecting this duration. It also pauses after 60
+seconds without pointer, keyboard, or scroll input, unless a `<video>` or
+`<audio>` element on the page is playing, and resumes on the next input. Time
+the device spent asleep or the tab frozen is not counted.
 
 Pageviews wait until the page becomes visible. Pages replaced or closed before
 being shown do not emit pageviews or page-leave events.
@@ -68,9 +70,10 @@ 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.
+`session_duration` is elapsed wall-clock time from the session start to the last
+counted activity. It includes time away between two active periods of the same
+session, so it is separate from active time on the page. An idle visitor stops
+extending the session, which then expires after 30 minutes like any other.
 
 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

package/dist/chunks/{identifiers-CpmDmpDv.js → identifiers-DOtve3E5.js}

@@ -1,4 +1,4 @@
-import { c as setStorageItem, o as getStorageItem, s as removeStorageItem, t as createId } from "./session-manager-CFQEWbgo.js";
+import { c as setStorageItem, o as getStorageItem, s as removeStorageItem, t as createId } from "./session-manager-DUpF3mi3.js";
 //#region src/utils/identifiers.ts
 const ANONYMOUS_ID_KEY = "faststats_anon_id_";
 function getAnonymousId(siteKey, cookieless = false) {

package/dist/chunks/{send-data-DYZZjeM-.js → send-data-gBIF6DTb.js}

@@ -27,8 +27,7 @@ function getReferrer() {
 	const raw = document.referrer;
 	if (!raw) return null;
 	try {
-		const pageOrigin = new URL(location.href).origin;
-		if (new URL(raw, location.href).origin === pageOrigin) return null;
+		if (new URL(raw, location.href).origin === location.origin) return null;
 	} catch {}
 	return sanitizeUrl(raw);
 }
@@ -38,7 +37,7 @@ function getPageContext(includeHash = false) {
 		page: `${location.pathname}${hash}`,
 		url: sanitizeUrl(location.href, includeHash),
 		referrer: getReferrer(),
-		title: document.title || ""
+		title: document.title
 	};
 	if (!location.search) return ctx;
 	const sp = new URLSearchParams(location.search);
@@ -53,8 +52,8 @@ function getPageContext(includeHash = false) {
 async function sendData(options) {
 	const { url, data, contentType = "application/json", debug = false, debugPrefix = "[Analytics]", useBeacon = true, keepalive = true, settleRejected } = options;
 	if (useBeacon && typeof globalThis.navigator?.sendBeacon === "function") try {
-		const beaconBody = data instanceof Blob || typeof Blob === "undefined" ? data : new Blob([data], { type: contentType });
-		if (globalThis.navigator.sendBeacon(url, beaconBody)) {
+		const body = data instanceof Blob ? data : new Blob([data], { type: contentType });
+		if (globalThis.navigator.sendBeacon(url, body)) {
 			if (debug) console.log(`${debugPrefix} Sent via beacon`);
 			return true;
 		}

package/dist/chunks/{session-manager-CFQEWbgo.js → session-manager-DUpF3mi3.js}

@@ -137,15 +137,12 @@ function resetSession(siteKey, cookieless = false) {
 }
 function onSessionRotated(siteKey, cookieless, listener) {
 	const key = memoryKey(siteKey, cookieless);
-	let listeners = rotationListeners.get(key);
-	if (!listeners) {
-		listeners = /* @__PURE__ */ new Set();
-		rotationListeners.set(key, listeners);
-	}
+	const listeners = rotationListeners.get(key) ?? /* @__PURE__ */ new Set();
+	rotationListeners.set(key, listeners);
 	listeners.add(listener);
 	return () => {
-		listeners?.delete(listener);
-		if (listeners?.size === 0) rotationListeners.delete(key);
+		listeners.delete(listener);
+		if (listeners.size === 0) rotationListeners.delete(key);
 	};
 }
 //#endregion

package/dist/error.js

@@ -1,9 +1,9 @@
-import { i as resolveBaseUrl, n as URLS, r as getPageContext, t as sendData } from "./chunks/send-data-DYZZjeM-.js";
-import { n as getSessionContext } from "./chunks/session-manager-CFQEWbgo.js";
-import { t as getAnonymousId } from "./chunks/identifiers-CpmDmpDv.js";
+import { i as resolveBaseUrl, n as URLS, r as getPageContext, t as sendData } from "./chunks/send-data-gBIF6DTb.js";
+import { n as getSessionContext } from "./chunks/session-manager-DUpF3mi3.js";
+import { t as getAnonymousId } from "./chunks/identifiers-DOtve3E5.js";
 //#region src/error.ts
 const SDK_NAME = "@faststats/web";
-const SDK_VERSION = "0.12.0";
+const SDK_VERSION = "0.12.1";
 function errorTracking(options = {}) {
 	return {
 		name: "error-tracking",

package/dist/flags.js

@@ -1,5 +1,5 @@
-import { n as getSessionContext } from "./chunks/session-manager-CFQEWbgo.js";
-import { t as getAnonymousId } from "./chunks/identifiers-CpmDmpDv.js";
+import { n as getSessionContext } from "./chunks/session-manager-DUpF3mi3.js";
+import { t as getAnonymousId } from "./chunks/identifiers-DOtve3E5.js";
 //#region src/flags.ts
 const DEFAULT_ENDPOINT = "https://flags.faststats.dev";
 const DEFAULT_TIMEOUT_MS = 3e3;
@@ -138,7 +138,7 @@ var FeatureFlags = class {
 		}
 	}
 };
-function featureFlags(options = {}) {
+function featureFlags(options) {
 	return new FeatureFlags(options);
 }
 //#endregion

package/dist/index.d.ts

@@ -38,6 +38,7 @@ export declare class WebAnalytics {
   private pageKey;
   private visit;
   private pendingPageview;
+  private lastInputAt;
   private consentMode;
   constructor(options: WebAnalyticsOptions);
   start(): void;
@@ -65,6 +66,8 @@ export declare class WebAnalytics {
   private readonly onPageHide;
   private readonly onPageShow;
   private readonly onResume;
+  private readonly onActivity;
+  private isIdle;
   private leavePage;
   private checkpoint;
   private pauseVisit;

package/dist/index.js

@@ -1,6 +1,6 @@
-import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, r as getPageContext, t as sendData } from "./chunks/send-data-DYZZjeM-.js";
-import { a as touchActivity, i as resetSession, n as getSessionContext, t as createId } from "./chunks/session-manager-CFQEWbgo.js";
-import { n as resetAnonymousId, t as getAnonymousId } from "./chunks/identifiers-CpmDmpDv.js";
+import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, r as getPageContext, t as sendData } from "./chunks/send-data-gBIF6DTb.js";
+import { a as touchActivity, i as resetSession, n as getSessionContext, t as createId } from "./chunks/session-manager-DUpF3mi3.js";
+import { n as resetAnonymousId, t as getAnonymousId } from "./chunks/identifiers-DOtve3E5.js";
 //#region src/extensions.ts
 var ExtensionHost = class {
 	context;
@@ -40,11 +40,8 @@ var ExtensionHost = class {
 				...this.context,
 				on: (hook, handler) => {
 					if (this.stopped) return () => {};
-					let handlers = this.handlers.get(hook);
-					if (!handlers) {
-						handlers = /* @__PURE__ */ new Set();
-						this.handlers.set(hook, handlers);
-					}
+					const handlers = this.handlers.get(hook) ?? /* @__PURE__ */ new Set();
+					this.handlers.set(hook, handlers);
 					handlers.add(handler);
 					const off = () => handlers.delete(handler);
 					subscriptions.push(off);
@@ -132,6 +129,7 @@ const RESERVED_EVENTS = /* @__PURE__ */ new Set([
 	"error",
 	"outbound_link"
 ]);
+const IDLE_MS = 6e4;
 var WebAnalytics = class {
 	options;
 	baseUrl;
@@ -143,6 +141,7 @@ var WebAnalytics = class {
 	pageKey = "";
 	visit = null;
 	pendingPageview = null;
+	lastInputAt = 0;
 	consentMode;
 	constructor(options) {
 		this.options = options;
@@ -170,7 +169,7 @@ var WebAnalytics = class {
 		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 ?? "" });
+			if (this.pageKey) this.extensions?.emit("pageChange", { url: getPageContext(this.options.trackHash).url });
 			this.pageKey = key;
 			this.pendingPageview = null;
 		}
@@ -190,6 +189,7 @@ var WebAnalytics = class {
 			context,
 			duration: 0,
 			startedAt: null,
+			checkedAt: Date.now(),
 			reportedDuration: -1
 		};
 		this.send("pageview", {
@@ -326,12 +326,18 @@ var WebAnalytics = class {
 		this.bind(window, "focus", this.onResume);
 		this.bind(window, "blur", () => this.pauseVisit());
 		this.bind(window, "popstate", this.onNavigate);
+		for (const type of [
+			"pointerdown",
+			"pointermove",
+			"keydown",
+			"scroll"
+		]) this.bind(window, type, this.onActivity, true);
 		if (this.options.trackHash) this.bind(window, "hashchange", this.onNavigate);
 		this.cleanup.push(observeHistory(this.onNavigate), trackOutboundLinks((url) => this.send("outbound_link", { outbound_link: url })));
 	}
-	bind(target, type, listener) {
-		target.addEventListener(type, listener);
-		this.cleanup.push(() => target.removeEventListener(type, listener));
+	bind(target, type, listener, capture = false) {
+		target.addEventListener(type, listener, capture);
+		this.cleanup.push(() => target.removeEventListener(type, listener, capture));
 	}
 	onNavigate = () => this.pageview({ trigger: "navigation" });
 	onVisibilityChange = () => {
@@ -365,6 +371,17 @@ var WebAnalytics = class {
 		this.pageview(this.pendingPageview ?? { trigger: "session" });
 		this.resumeVisit();
 	};
+	onActivity = () => {
+		this.lastInputAt = performance.now();
+		if (this.visit?.startedAt === null && document.hasFocus()) this.onResume();
+	};
+	isIdle() {
+		const now = performance.now();
+		if (now - this.lastInputAt < IDLE_MS) return false;
+		const playing = [...document.querySelectorAll("video,audio")].some((media) => !media.paused && !media.ended);
+		if (playing) this.lastInputAt = now;
+		return !playing;
+	}
 	leavePage() {
 		this.pauseVisit();
 		this.visit = null;
@@ -372,10 +389,16 @@ var WebAnalytics = class {
 	checkpoint() {
 		const visit = this.visit;
 		if (!visit || !this.isActive()) return;
+		let activeAt = visit.checkedAt;
 		if (visit.startedAt !== null) {
 			const now = performance.now();
-			visit.duration += now - visit.startedAt;
+			if (now - visit.startedAt < IDLE_MS) {
+				const active = Math.min(now, this.lastInputAt + IDLE_MS) - visit.startedAt;
+				visit.duration += active;
+				activeAt += active;
+			}
 			visit.startedAt = now;
+			visit.checkedAt = Date.now();
 		}
 		const duration = Math.round(visit.duration);
 		if (duration === visit.reportedDuration) return;
@@ -383,7 +406,7 @@ var WebAnalytics = class {
 		this.send("page_leave", {
 			visit_id: visit.id,
 			time_on_page: duration,
-			session_duration: Math.max(0, Date.now() - visit.session.sessionStart)
+			session_duration: Math.max(0, activeAt - visit.session.sessionStart)
 		}, visit.context);
 	}
 	pauseVisit() {
@@ -394,9 +417,10 @@ var WebAnalytics = class {
 	}
 	resumeVisit() {
 		if (!this.isActive() || !this.visit || this.visit.startedAt !== null || document.visibilityState !== "visible" || !document.hasFocus()) return;
-		this.visit.startedAt = performance.now();
+		this.visit.startedAt = this.lastInputAt = performance.now();
+		this.visit.checkedAt = Date.now();
 		this.heartbeatTimer = setInterval(() => {
-			if (document.visibilityState !== "visible" || !document.hasFocus()) {
+			if (document.visibilityState !== "visible" || !document.hasFocus() || this.isIdle()) {
 				this.pauseVisit();
 				return;
 			}

package/dist/replay.d.ts

@@ -133,4 +133,5 @@ export default class ReplayTracker {
   private retryDelay;
   private sendBatch;
 }
-//#endregion
+//#endregion
+export {};

package/dist/replay.js

@@ -1,6 +1,6 @@
-import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as sendData } from "./chunks/send-data-DYZZjeM-.js";
-import { a as touchActivity, c as setStorageItem, n as getSessionContext, o as getStorageItem, r as onSessionRotated, t as createId } from "./chunks/session-manager-CFQEWbgo.js";
-import { t as getAnonymousId } from "./chunks/identifiers-CpmDmpDv.js";
+import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as sendData } from "./chunks/send-data-gBIF6DTb.js";
+import { a as touchActivity, c as setStorageItem, n as getSessionContext, o as getStorageItem, r as onSessionRotated, t as createId } from "./chunks/session-manager-DUpF3mi3.js";
+import { t as getAnonymousId } from "./chunks/identifiers-DOtve3E5.js";
 import { record } from "@rrweb/record";
 import { getRecordConsolePlugin } from "@rrweb/rrweb-plugin-console-record";
 import { getRecordNetworkPlugin } from "@rrweb/rrweb-plugin-network-record";
@@ -26,7 +26,7 @@ var ReplayMutationThrottler = class {
 		if (data.source !== MUTATION_SOURCE_TYPE || !data.attributes?.length) return event;
 		const attributes = data.attributes.filter(({ id }) => this.consume(id));
 		if (attributes.length === data.attributes.length) return event;
-		if (attributes.length === 0 && (data.adds?.length ?? 0) === 0 && (data.removes?.length ?? 0) === 0 && (data.texts?.length ?? 0) === 0) return;
+		if (!attributes.length && !data.adds?.length && !data.removes?.length && !data.texts?.length) return;
 		return {
 			...event,
 			data: {
@@ -482,12 +482,11 @@ var ReplayTracker = class {
 			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));
+		}, this.minReplayLengthMs - (Date.now() - this.startTime));
 	}
 	enqueueEventsIfReady(context, flushReason, maxBatchSizeBytes = this.maxBatchSizeBytes) {
 		if (this.events.length === 0) return;

package/dist/web-vitals.d.ts

@@ -16,7 +16,8 @@ export default class WebVitalsTracker {
   private sending?;
   private generation;
   private unsubscribe?;
-  private readonly sentMetrics;
+  private unfollowSession?;
+  private sentMetrics;
   private initialUrl;
   private session;
   private cookieless;
@@ -25,6 +26,7 @@ export default class WebVitalsTracker {
   start(): void;
   stop(discard?: boolean): void;
   onPageHidden(persisted?: boolean): void;
+  private followSession;
   private onMetric;
   private discard;
   private flush;

package/dist/web-vitals.js

@@ -1,36 +1,49 @@
-import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as sendData } from "./chunks/send-data-DYZZjeM-.js";
-import { n as getSessionContext } from "./chunks/session-manager-CFQEWbgo.js";
+import { a as sanitizeUrl, i as resolveBaseUrl, n as URLS, t as sendData } from "./chunks/send-data-gBIF6DTb.js";
+import { n as getSessionContext, r as onSessionRotated } from "./chunks/session-manager-DUpF3mi3.js";
 import { onCLS, onFCP, onINP, onLCP, onTTFB } from "web-vitals/attribution";
 //#region src/utils/web-vitals-collector.ts
 const collectors = /* @__PURE__ */ new WeakMap();
+function getCollector() {
+	const existing = collectors.get(document);
+	if (existing) return existing;
+	const collector = {
+		subscribers: /* @__PURE__ */ new Set(),
+		latest: /* @__PURE__ */ new Map(),
+		sent: /* @__PURE__ */ new Map()
+	};
+	collectors.set(document, collector);
+	const report = (metric) => {
+		const snapshot = { ...metric };
+		snapshot.attribution = { ...metric.attribution };
+		collector.latest.set(metric.name, snapshot);
+		for (const listener of collector.subscribers) listener(snapshot);
+	};
+	const changes = { reportAllChanges: true };
+	onCLS(report, changes);
+	onINP(report, changes);
+	onLCP(report, changes);
+	onFCP(report);
+	onTTFB(report);
+	return collector;
+}
 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);
+	const { subscribers, latest } = getCollector();
+	subscribers.add(subscriber);
+	for (const metric of latest.values()) subscriber(metric);
 	return () => {
-		collector.subscribers.delete(subscriber);
+		subscribers.delete(subscriber);
 	};
 }
+/**
+* What `destination` already received from this document. Shared so a
+* re-created tracker does not resend the metrics replayed to it.
+*/
+function sentVitals(destination) {
+	const { sent } = getCollector();
+	const vitals = sent.get(destination) ?? /* @__PURE__ */ new Map();
+	sent.set(destination, vitals);
+	return vitals;
+}
 //#endregion
 //#region src/web-vitals.ts
 function webVitals() {
@@ -51,13 +64,6 @@ function webVitals() {
 		}
 	};
 }
-const METRIC_NAMES = /* @__PURE__ */ new Set([
-	"CLS",
-	"INP",
-	"LCP",
-	"FCP",
-	"TTFB"
-]);
 var WebVitalsTracker = class {
 	options;
 	endpoint;
@@ -66,6 +72,7 @@ var WebVitalsTracker = class {
 	sending;
 	generation = 0;
 	unsubscribe;
+	unfollowSession;
 	sentMetrics = /* @__PURE__ */ new Map();
 	initialUrl = "";
 	session = null;
@@ -78,21 +85,21 @@ var WebVitalsTracker = class {
 	setCookielessMode(cookieless) {
 		if (this.cookieless === cookieless) return;
 		this.cookieless = cookieless;
-		this.discard();
-		this.session = this.started ? getSessionContext(this.options.siteKey, cookieless) : null;
+		if (this.started) this.followSession();
 	}
 	start() {
 		if (this.started || typeof window === "undefined") return;
 		this.started = true;
 		this.initialUrl = sanitizeUrl(window.performance?.getEntriesByType("navigation")[0]?.name || window.location.href, this.options.trackHash ?? false);
-		this.session = getSessionContext(this.options.siteKey, this.cookieless);
+		this.followSession();
+		this.sentMetrics = sentVitals(`${this.endpoint}\0${this.options.siteKey}`);
 		this.unsubscribe = subscribeToVitals(this.onMetric);
 	}
 	stop(discard = false) {
 		if (!this.started) return;
 		this.started = false;
 		this.unsubscribe?.();
-		this.unsubscribe = void 0;
+		this.unfollowSession?.();
 		if (discard) this.discard();
 		else this.flush();
 	}
@@ -103,26 +110,39 @@ var WebVitalsTracker = class {
 			if (generation === this.generation) this.flush();
 		});
 	}
+	followSession() {
+		const { siteKey } = this.options;
+		this.unfollowSession?.();
+		this.session = getSessionContext(siteKey, this.cookieless);
+		this.unfollowSession = onSessionRotated(siteKey, this.cookieless, (_prev, next) => {
+			this.session = next;
+		});
+	}
 	onMetric = (metric) => {
-		if (!this.started || !METRIC_NAMES.has(metric.name) || !Number.isFinite(metric.value) || metric.value < 0) return;
+		if (!this.started || !Number.isFinite(metric.value) || metric.value < 0) return;
 		this.metrics.set(metric.name, metric);
 	};
 	discard() {
 		this.generation++;
 		this.metrics.clear();
-		this.sentMetrics.clear();
 	}
 	async flush() {
 		const generation = this.generation;
 		while (this.sending) await this.sending;
-		if (generation !== this.generation || !this.metrics.size) return;
-		const batch = this.metrics;
-		const session = this.session ?? getSessionContext(this.options.siteKey, this.cookieless);
+		const session = this.session;
+		if (generation !== this.generation || !session) return;
+		const batch = [...this.metrics.values()].filter(({ name, id, value }) => {
+			const sent = this.sentMetrics.get(name);
+			return sent?.id !== id || sent.value !== value;
+		});
+		this.metrics = /* @__PURE__ */ new Map();
+		if (!batch.length) return;
+		const trackHash = this.options.trackHash ?? 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 }) => {
+			vitals: batch.map(({ name, value, id, rating, navigationType, attribution }) => {
 				const previous = this.sentMetrics.get(name);
 				return {
 					metric: name,
@@ -137,8 +157,7 @@ var WebVitalsTracker = class {
 				};
 			}),
 			metadata: { url: this.initialUrl }
-		});
-		this.metrics = /* @__PURE__ */ new Map();
+		}, (_key, value) => typeof value === "string" && /^https?:\/\//.test(value) ? sanitizeUrl(value, trackHash) : value);
 		this.sending = sendData({
 			url: this.endpoint,
 			data,
@@ -147,12 +166,8 @@ var WebVitalsTracker = class {
 		});
 		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);
+		for (const vital of batch) if (sent) this.sentMetrics.set(vital.name, vital);
+		else if (generation === this.generation && !this.metrics.has(vital.name)) this.metrics.set(vital.name, vital);
 	}
 };
 //#endregion

package/package.json

@@ -42,7 +42,7 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "0.12.0",
+	"version": "0.12.1",
 	"scripts": {
 		"build": "tsdown && bun run check-size",
 		"dev": "bun run build",