@faststats/nitro 0.5.0 → 0.7.0

package/dist/{plugin-hook-BMw88N35.mjs → plugin-hook-4hE4T3qk.mjs}

@@ -1,6 +1,3 @@
-import { createRequire } from "node:module";
-import { readFileSync } from "node:fs";
-import { version } from "node:os";
 //#region src/options.ts
 const DEFAULT_ENDPOINT = "https://metrics.faststats.dev/v1/error";
 const envInt = (key, fallback) => {
@@ -23,18 +20,9 @@ function resolveFaststatsNitroOptions(overrides = {}) {
 	};
 }
 const SDK_NAME = "@faststats/nitro";
-const SDK_VERSION = "0.5.0";
+const SDK_VERSION = "0.7.0";
 //#endregion
 //#region src/context.ts
-function readPackageVersion(name) {
-	try {
-		const raw = readFileSync(createRequire(import.meta.url).resolve(`${name}/package.json`), "utf8");
-		const pkg = JSON.parse(raw);
-		return typeof pkg.version === "string" ? pkg.version : void 0;
-	} catch {
-		return;
-	}
-}
 function detectRuntime() {
 	if (typeof Bun !== "undefined" && Bun.version !== void 0) return {
 		runtime: "bun",
@@ -67,15 +55,11 @@ function buildServerReportContext(extra = {}) {
 	return {
 		source: "@faststats/nitro",
 		...extra,
-		nitroVersion: readPackageVersion("nitropack") ?? readPackageVersion("nitro"),
 		nitroPreset: process?.env?.NITRO_PRESET,
 		runtime,
 		runtimeVersion,
-		os: process?.release?.name ?? "unknown",
-		osVersion: version() || "unknown",
 		platform: process?.platform ?? "unknown",
-		arch: process?.arch ?? "unknown",
-		...process?.cwd?.() ? { cwd: process.cwd() } : {}
+		arch: process?.arch ?? "unknown"
 	};
 }
 //#endregion
@@ -97,39 +81,19 @@ function serializeCause(cause) {
 		message: cause
 	};
 }
-function causeFingerprint(cause) {
-	if (!cause) return "";
-	return `${cause.error}\0${cause.message ?? ""}\0${causeFingerprint(cause.cause)}`;
-}
-function hashMessage(message, cause) {
-	const key = [
-		"error",
-		message,
-		"",
-		"",
-		causeFingerprint(cause)
-	].join("\0");
-	let a = 2166136261;
-	let b = 3598710387;
-	for (let i = 0; i < key.length; i++) {
-		const c = key.charCodeAt(i);
-		a = Math.imul(a ^ c, 16777619);
-		b = Math.imul(b ^ c, 2246822519);
-	}
-	return `err_${(a >>> 0).toString(16).padStart(8, "0")}${(b >>> 0).toString(16).padStart(8, "0")}`;
-}
-function hashServerError(error) {
+function normalizeServerError(error) {
 	const err = error instanceof Error ? error : new Error(String(error));
 	const name = err.name?.trim() || "Error";
 	const cause = serializeCause(err.cause);
+	const entry = {
+		error: name,
+		message: err.message,
+		stack: parseStack(err.stack),
+		...cause ? { cause } : {}
+	};
 	return {
-		hash: hashMessage(err.message, cause),
-		entry: {
-			error: name,
-			message: err.message,
-			stack: parseStack(err.stack),
-			...cause ? { cause } : {}
-		}
+		key: JSON.stringify(entry),
+		entry
 	};
 }
 //#endregion
@@ -139,55 +103,40 @@ const defaultRuntime = {
 	setTimeout: (callback, delay) => setTimeout(callback, delay),
 	clearTimeout: (timer) => clearTimeout(timer),
 	now: () => Date.now(),
-	randomUUID: () => crypto.randomUUID?.() ?? `sess-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`,
 	warn: (...args) => console.warn(...args)
 };
 function definedStrings(context) {
 	return Object.fromEntries(Object.entries(context).filter(([, value]) => value !== void 0 && value !== ""));
 }
+function mergeBucket(target, incoming) {
+	target.count += incoming.count;
+}
 function mergeBuckets(target, incoming) {
 	for (const [hash, bucket] of incoming) {
 		const existing = target.get(hash);
-		if (!existing) {
-			target.set(hash, { ...bucket });
-			continue;
-		}
-		existing.count += bucket.count;
-		if (bucket.path !== void 0) existing.path = bucket.path;
-		if (bucket.tags.length > 0) existing.tags = bucket.tags;
+		if (existing) mergeBucket(existing, bucket);
+		else target.set(hash, { ...bucket });
 	}
 }
-function buildPayload(buckets, options, sessionId) {
-	const errors = [...buckets.entries()].map(([hash, bucket]) => ({
+function buildPayload(buckets, options) {
+	const errors = [];
+	for (const bucket of buckets.values()) errors.push({
 		...bucket.entry,
-		hash,
-		count: bucket.count
-	}));
-	const tags = [...new Set([...buckets.values()].flatMap((b) => b.tags))];
-	let route;
-	let routeCount = -1;
-	const custom = {};
-	for (const bucket of buckets.values()) {
-		if (bucket.path !== void 0 && bucket.count > routeCount) {
-			routeCount = bucket.count;
-			route = bucket.path;
+		count: bucket.count,
+		context: {
+			...bucket.path ? { route: bucket.path } : {},
+			...bucket.tags.length ? { tags: bucket.tags.join(",") } : {},
+			...bucket.custom
 		}
-		for (const [key, value] of Object.entries(bucket.custom)) if (!(key in custom)) custom[key] = value;
-	}
+	});
 	return {
 		errors,
-		sessionId,
+		language: "javascript",
+		...options.sessionId ? { sessionId: options.sessionId } : {},
 		...options.buildId ? { buildId: options.buildId } : {},
 		sdkName: SDK_NAME,
 		sdkVersion: SDK_VERSION,
-		context: {
-			...definedStrings(buildServerReportContext({
-				route,
-				plugin: options.pluginId,
-				tags: tags.length > 0 ? tags.join(",") : void 0
-			})),
-			...custom
-		}
+		context: definedStrings(buildServerReportContext({ plugin: options.pluginId }))
 	};
 }
 function createNitroErrorReporter(options, runtime) {
@@ -196,16 +145,10 @@ function createNitroErrorReporter(options, runtime) {
 	let flushing = false;
 	let consecutiveFailures = 0;
 	let pausedUntil = 0;
-	let sessionId = options.sessionId;
-	const getSessionId = () => {
-		sessionId ??= runtime.randomUUID();
-		return sessionId;
-	};
 	const clearTimer = () => {
-		if (timer !== null) {
-			runtime.clearTimeout(timer);
-			timer = null;
-		}
+		if (timer === null) return;
+		runtime.clearTimeout(timer);
+		timer = null;
 	};
 	const scheduleFlush = () => {
 		if (timer !== null) return;
@@ -222,7 +165,7 @@ function createNitroErrorReporter(options, runtime) {
 					"Content-Type": "application/json",
 					Authorization: `Bearer ${options.token}`
 				},
-				body: JSON.stringify(buildPayload(snapshot, options, getSessionId()))
+				body: JSON.stringify(buildPayload(snapshot, options))
 			});
 			if (response.ok) return true;
 			if (options.debug) runtime.warn("[faststats nitro] report failed", response.status, await response.text());
@@ -263,31 +206,30 @@ function createNitroErrorReporter(options, runtime) {
 			if (options.debug) runtime.warn("[faststats nitro] FASTSTATS_TOKEN not set; skipping error report");
 			return;
 		}
-		if (runtime.now() < pausedUntil) return;
-		const { hash, entry } = hashServerError(error);
-		const existing = buckets.get(hash);
-		if (existing) {
-			existing.count += 1;
-			if (args.path !== void 0) existing.path = args.path;
-			if (args.tags.length > 0) existing.tags = args.tags;
-		} else {
-			let custom = {};
-			if (options.getContext) try {
-				custom = await options.getContext({
-					error,
-					...args
-				}) ?? {};
-			} catch {
-				custom = {};
-			}
-			buckets.set(hash, {
-				entry,
-				count: 1,
-				path: args.path,
-				tags: args.tags,
-				custom
-			});
+		const { key, entry } = normalizeServerError(error);
+		let custom = {};
+		if (options.getContext) try {
+			custom = await options.getContext({
+				error,
+				...args
+			}) ?? {};
+		} catch {}
+		let customKey = "";
+		try {
+			customKey = JSON.stringify(custom);
+		} catch {
+			custom = {};
 		}
+		const bucketKey = `${key}\0${args.path ?? ""}\0${args.tags.join("\0")}\0${customKey}`;
+		const existing = buckets.get(bucketKey);
+		if (existing) mergeBucket(existing, { count: 1 });
+		else buckets.set(bucketKey, {
+			entry,
+			count: 1,
+			path: args.path,
+			tags: args.tags,
+			custom
+		});
 		if (buckets.size >= options.maxBatchHashes) {
 			clearTimer();
 			await flush();
@@ -299,18 +241,22 @@ function createNitroErrorReporter(options, runtime) {
 //#endregion
 //#region src/plugin-hook.ts
 function extractPath(event) {
-	if (!event || typeof event !== "object") return;
+	if (!event || typeof event !== "object") return void 0;
 	const e = event;
-	if (e.path) return e.path;
-	const url = e.node?.req?.url;
-	return url !== void 0 ? String(url) : void 0;
+	const value = e.path ?? e.node?.req?.url;
+	if (value === void 0) return void 0;
+	try {
+		return new URL(String(value), "http://faststats.local").pathname;
+	} catch {
+		return String(value).split(/[?#]/, 1)[0];
+	}
 }
 function createNitroErrorHook(resolved) {
 	const reporter = createNitroErrorReporter(resolved, defaultRuntime);
 	return (error, context) => {
 		reporter.report(error, {
 			path: extractPath(context.event),
-			tags: Array.isArray(context.tags) ? context.tags : []
+			tags: Array.isArray(context.tags) ? context.tags.filter((tag) => typeof tag === "string") : []
 		});
 	};
 }

package/dist/v2.mjs

@@ -1,4 +1,4 @@
-import { n as resolveFaststatsNitroOptions, t as createNitroErrorHook } from "./plugin-hook-BMw88N35.mjs";
+import { n as resolveFaststatsNitroOptions, t as createNitroErrorHook } from "./plugin-hook-4hE4T3qk.mjs";
 import { defineNitroPlugin } from "nitropack/runtime";
 //#region src/v2.ts
 function createFaststatsNitroPluginV2(options) {

package/dist/v3.mjs

@@ -1,4 +1,4 @@
-import { n as resolveFaststatsNitroOptions, t as createNitroErrorHook } from "./plugin-hook-BMw88N35.mjs";
+import { n as resolveFaststatsNitroOptions, t as createNitroErrorHook } from "./plugin-hook-4hE4T3qk.mjs";
 import { definePlugin } from "nitro";
 //#region src/v3.ts
 function createFaststatsNitroPluginV3(options) {

package/package.json

@@ -4,7 +4,7 @@
 		"type": "git",
 		"url": "https://github.com/faststats-dev/faststats-javascript.git"
 	},
-	"version": "0.5.0",
+	"version": "0.7.0",
 	"type": "module",
 	"main": "./dist/v2.mjs",
 	"module": "./dist/v2.mjs",