@oconde/radar 0.3.0 → 0.4.2

package/dist/sveltekit/index.d.cts

@@ -1,5 +1,5 @@
 import { RequestEvent, RequestHandler, Handle, HandleServerError } from '@sveltejs/kit';
-import { R as RadarClient } from '../client-BB-to8cr.cjs';
+import { R as RadarClient } from '../client-DRZ7htMJ.cjs';
 import '../protocol/index.cjs';
 
 declare function moveClientSourceMaps(buildDir?: string): number;

package/dist/sveltekit/index.d.ts

@@ -1,5 +1,5 @@
 import { RequestEvent, RequestHandler, Handle, HandleServerError } from '@sveltejs/kit';
-import { R as RadarClient } from '../client-BS798K3S.js';
+import { R as RadarClient } from '../client-FkXWx8sJ.js';
 import '../protocol/index.js';
 
 declare function moveClientSourceMaps(buildDir?: string): number;

package/dist/sveltekit/index.js

@@ -258,6 +258,12 @@ function requestPath(req) {
   const end = url.indexOf("?");
   return end >= 0 ? url.slice(0, end) : url;
 }
+function matchesRequest(pattern, path, route) {
+  const candidates = route === void 0 ? [path] : [path, route];
+  if (pattern instanceof RegExp) return candidates.some((value) => value.search(pattern) !== -1);
+  const prefix = pattern.endsWith("/") ? pattern : `${pattern}/`;
+  return candidates.some((value) => value === pattern || value.startsWith(prefix));
+}
 function requestRoute(req, route) {
   if (route) return route;
   if (typeof req.route?.path !== "string") return void 0;
@@ -397,11 +403,24 @@ function createMiddleware(logger) {
 // src/options.ts
 var DEFAULT_ENDPOINT = "https://radar-ingest.oconde.dev";
 var LEVELS = ["debug", "info", "warn", "error"];
+function patterns(value) {
+  if (!Array.isArray(value)) return [];
+  return value.flatMap((item) => {
+    if (item instanceof RegExp) return [item];
+    if (typeof item === "string" && item.trim() !== "") return [item.trim()];
+    return [];
+  });
+}
 function resolveTraceFetch(value) {
-  if (!value) return { enabled: false, propagateTo: [] };
-  if (value === true) return { enabled: true, propagateTo: [] };
-  const targets2 = Array.isArray(value.propagateTo) ? value.propagateTo : [];
-  return { enabled: true, propagateTo: targets2.filter((target) => typeof target === "string" ? target.trim() !== "" : target instanceof RegExp) };
+  if (!value) return { enabled: false, propagateTo: [], ignore: [] };
+  if (value === true) return { enabled: true, propagateTo: [], ignore: [] };
+  return { enabled: true, propagateTo: patterns(value.propagateTo), ignore: patterns(value.ignore) };
+}
+function resolveLogRequests(value) {
+  if (value === false) return { enabled: false, include: [], exclude: [], sample: 1 };
+  if (value === void 0 || value === true || typeof value !== "object" || value === null) return { enabled: true, include: [], exclude: [], sample: 1 };
+  const sample = typeof value.sample === "number" && Number.isFinite(value.sample) && value.sample >= 0 && value.sample <= 1 ? value.sample : 1;
+  return { enabled: true, include: patterns(value.include), exclude: patterns(value.exclude), sample };
 }
 function resolveOptions(options = {}, env = process.env) {
   const key = options.key?.trim() || void 0;
@@ -415,7 +434,7 @@ function resolveOptions(options = {}, env = process.env) {
     minLevel: options.minLevel && LEVELS.includes(options.minLevel) ? options.minLevel : "info",
     redact: options.redact === "none" ? "none" : "mask",
     requestDetail: options.requestDetail === "route" ? "route" : "full",
-    logRequests: options.logRequests ?? true,
+    logRequests: resolveLogRequests(options.logRequests),
     ignorePaths: options.ignorePaths ?? ["/healthz", "/health"],
     captureUnhandled: options.captureUnhandled ?? true,
     traceFetch: resolveTraceFetch(options.traceFetch),
@@ -569,8 +588,8 @@ function headerOf(code, index, prefix) {
   return header;
 }
 function nameIn(header) {
-  const patterns = ANONYMOUS_FUNCTION.test(header) ? NAME_PATTERNS : [...NAME_PATTERNS, METHOD_PATTERN];
-  for (const pattern of patterns) {
+  const patterns2 = ANONYMOUS_FUNCTION.test(header) ? NAME_PATTERNS : [...NAME_PATTERNS, METHOD_PATTERN];
+  for (const pattern of patterns2) {
     const name = pattern.exec(header)?.[1];
     if (name && !KEYWORDS.has(name)) return name.slice(0, MAX_NAME_LENGTH);
   }
@@ -913,12 +932,19 @@ function originOf(value) {
     return null;
   }
 }
-function targets(url, target) {
-  if (target instanceof RegExp) return target.test(url.host);
-  const wanted = target.trim().toLowerCase();
+function hostMatches(url, host) {
+  const wanted = host.trim().toLowerCase();
   if (wanted.startsWith(".")) return url.hostname.toLowerCase().endsWith(wanted);
   return url.host.toLowerCase() === wanted || url.hostname.toLowerCase() === wanted;
 }
+function targets(url, target) {
+  if (target instanceof RegExp) return url.host.search(target) !== -1;
+  return hostMatches(url, target);
+}
+function ignored(url, target) {
+  if (target instanceof RegExp) return `${url.host}${url.pathname}`.search(target) !== -1;
+  return hostMatches(url, target);
+}
 function isPlainObject(value) {
   if (value === null || typeof value !== "object") return false;
   const prototype = Object.getPrototypeOf(value);
@@ -942,6 +968,7 @@ function traceFetch(config) {
     const method = (init?.method ?? (input instanceof Request ? input.method : "GET")).toUpperCase();
     const context = currentContext();
     const [nextInput, nextInit] = context && config.propagateTo.some((target) => targets(url, target)) ? withRequestId(input, init, context.requestId) : [input, init];
+    if (config.ignore?.some((target) => ignored(url, target))) return original(nextInput, nextInit);
     const attrs = { method, host: url.host, path: outboundPath(url.pathname, config.redact) };
     const started = performance.now();
     try {
@@ -1190,7 +1217,7 @@ function withTimeout(promise, ms) {
 
 // src/version.ts
 var SDK_NAME = "@oconde/radar";
-var SDK_VERSION = true ? "0.3.0" : "0.0.0-dev";
+var SDK_VERSION = true ? "0.4.2" : "0.0.0-dev";
 
 // src/client.ts
 var MAX_CHECK_IN_DURATION_MS = 7 * 864e5;
@@ -1234,6 +1261,7 @@ var RadarClient = class {
         this.restoreFetch = traceFetch({
           endpoint: this.options.endpoint,
           propagateTo: this.options.traceFetch.propagateTo,
+          ignore: this.options.traceFetch.ignore,
           redact: this.options.redact,
           record: (level, attrs) => this.safely(() => this.emitLog(level, "http.client", attrs))
         });
@@ -1344,22 +1372,28 @@ var RadarClient = class {
     return createMiddleware(this);
   }
   shouldLogRequest(req) {
-    return this.options.logRequests && !this.options.ignorePaths.includes(requestPath(req));
+    return this.options.logRequests.enabled && !this.options.ignorePaths.includes(requestPath(req));
   }
   logHttpRequest(context, status) {
     this.safely(() => {
       const req = context.req;
       if (!req) return;
-      const level = status >= 500 ? "error" : status >= 400 ? "warn" : "info";
       const route = requestRoute(req, context.route);
+      const path = requestPath(req);
+      const { include, exclude, sample } = this.options.logRequests;
+      if (include.length > 0 && !include.some((pattern) => matchesRequest(pattern, path, route))) return;
+      if (exclude.some((pattern) => matchesRequest(pattern, path, route))) return;
+      if (sample < 1 && Math.random() >= sample) return;
+      const level = status >= 500 ? "error" : status >= 400 ? "warn" : "info";
       runWithContext(
         context,
         () => this.emitLog(level, "http.request", {
           method: (req.method ?? "GET").toUpperCase(),
           ...route ? { route } : {},
-          ...this.options.requestDetail === "full" ? { path: redactPath(requestPath(req), pathParams(req, requestPath(req)), this.options.redact) } : {},
+          ...this.options.requestDetail === "full" ? { path: redactPath(path, pathParams(req, path), this.options.redact) } : {},
           status,
-          durationMs: elapsedSince(context.startedAt)
+          durationMs: elapsedSince(context.startedAt),
+          ...sample < 1 ? { sampleRate: sample } : {}
         })
       );
     });
@@ -1773,6 +1807,12 @@ function withRequestId2(response, requestId) {
     }
   }
 }
+function thrownStatus(error) {
+  if (typeof error !== "object" || error === null) return 500;
+  const status = error.status;
+  const fromKit = "location" in error || "body" in error;
+  return fromKit && typeof status === "number" && Number.isInteger(status) && status >= 300 && status <= 599 ? status : 500;
+}
 function radarHandle(options = {}) {
   const client = options.client ?? radar;
   return async ({ event, resolve: resolveEvent }) => {
@@ -1788,7 +1828,7 @@ function radarHandle(options = {}) {
       try {
         response = await resolveEvent(event);
       } catch (error) {
-        if (client.shouldLogRequest(req)) client.logHttpRequest(context, 500);
+        if (client.shouldLogRequest(req)) client.logHttpRequest(context, thrownStatus(error));
         throw error;
       }
       const tagged = withRequestId2(response, context.requestId);