@oconde/radar 0.2.0 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.3.0
+
+### Novo
+
+- `traceFetch`: cada `fetch` de saída vira um log `http.client` com método, host, caminho (sem a query, com trechos que parecem segredo mascarados), status e duração, ou o erro com a causa (`fetch failed (ECONNREFUSED)`). Para os hosts de `propagateTo`, o SDK manda o `x-request-id` da requisição atual, sem trocar um que o app já tenha posto. Chamadas para o próprio Radar ficam de fora. Desligado por padrão.
+
+### Correções
+
+- O nome da função inferido do código original não se confunde mais com chaves e com a palavra `function` dentro de comentários de várias linhas (como os de JSDoc).
+
 ## 0.2.0
 
 ### Novo

package/README.md

@@ -98,6 +98,14 @@ await radar.cron('nightly-report', () => buildReport());
 
 `radar.cron` avisa o Radar no início, no fim e na falha, e o Radar alerta se a tarefa atrasar ou falhar. Em scripts sem o SDK, o check-in é um `POST` (veja o [PROTOCOL.md](PROTOCOL.md)). Para jobs e workers, `radar.withContext(fn)` dá a cada execução o próprio `requestId`. Detalhes em [Tarefas agendadas](https://radar.oconde.dev/docs/sdk/cron/).
 
+## Chamadas para outros serviços
+
+```ts
+radar.init({ key: process.env.RADAR_KEY, traceFetch: { propagateTo: ['api.spinlab.dev', '.oconde.dev'] } });
+```
+
+Com `traceFetch`, cada `fetch` que o app faz vira um log `http.client` com método, host, caminho (sem a query, e com trechos que parecem token mascarados), status e duração, ou o erro quando a chamada nem chega a responder. Dentro de uma requisição, o log entra na linha do tempo dela. Para os hosts de `propagateTo` (o nome exato, `.dominio` para os subdomínios ou uma RegExp), o SDK manda o `x-request-id` da requisição atual, e o Radar mostra a mesma requisição nos dois projetos. `traceFetch: true` registra as chamadas sem mandar o id para ninguém. Chamadas para o próprio Radar ficam de fora.
+
 ## Erros com o seu código
 
 Ligue no `tsconfig` para os erros mostrarem as linhas do TypeScript:

package/dist/{client-CZHtsQAd.d.cts → client-BB-to8cr.d.cts}

@@ -35,6 +35,14 @@ type RadarMiddleware = (req: RequestLike, res: ResponseLike, next: (error?: unkn
 
 type RedactMode = 'mask' | 'none';
 type RequestDetail = 'full' | 'route';
+type FetchTraceTarget = string | RegExp;
+type TraceFetchOption = boolean | {
+    propagateTo?: FetchTraceTarget[];
+};
+type ResolvedTraceFetch = {
+    enabled: boolean;
+    propagateTo: FetchTraceTarget[];
+};
 type RadarOptions = {
     key?: string;
     endpoint?: string;
@@ -48,6 +56,7 @@ type RadarOptions = {
     logRequests?: boolean;
     ignorePaths?: string[];
     captureUnhandled?: boolean;
+    traceFetch?: TraceFetchOption;
     debug?: boolean;
 };
 type ResolvedOptions = {
@@ -63,6 +72,7 @@ type ResolvedOptions = {
     logRequests: boolean;
     ignorePaths: string[];
     captureUnhandled: boolean;
+    traceFetch: ResolvedTraceFetch;
     debug: boolean;
 };
 
@@ -95,6 +105,7 @@ declare class RadarClient {
     private initialized;
     private closed;
     private readonly captured;
+    private restoreFetch;
     get isEnabled(): boolean;
     get settings(): Readonly<ResolvedOptions>;
     init(options?: RadarOptions): void;

package/dist/{client-DbBsXgpj.d.ts → client-BS798K3S.d.ts}

@@ -35,6 +35,14 @@ type RadarMiddleware = (req: RequestLike, res: ResponseLike, next: (error?: unkn
 
 type RedactMode = 'mask' | 'none';
 type RequestDetail = 'full' | 'route';
+type FetchTraceTarget = string | RegExp;
+type TraceFetchOption = boolean | {
+    propagateTo?: FetchTraceTarget[];
+};
+type ResolvedTraceFetch = {
+    enabled: boolean;
+    propagateTo: FetchTraceTarget[];
+};
 type RadarOptions = {
     key?: string;
     endpoint?: string;
@@ -48,6 +56,7 @@ type RadarOptions = {
     logRequests?: boolean;
     ignorePaths?: string[];
     captureUnhandled?: boolean;
+    traceFetch?: TraceFetchOption;
     debug?: boolean;
 };
 type ResolvedOptions = {
@@ -63,6 +72,7 @@ type ResolvedOptions = {
     logRequests: boolean;
     ignorePaths: string[];
     captureUnhandled: boolean;
+    traceFetch: ResolvedTraceFetch;
     debug: boolean;
 };
 
@@ -95,6 +105,7 @@ declare class RadarClient {
     private initialized;
     private closed;
     private readonly captured;
+    private restoreFetch;
     get isEnabled(): boolean;
     get settings(): Readonly<ResolvedOptions>;
     init(options?: RadarOptions): void;

package/dist/index.cjs

@@ -282,7 +282,10 @@ function requestPath(req) {
 }
 function requestRoute(req, route) {
   if (route) return route;
-  return typeof req.route?.path === "string" ? req.route.path : void 0;
+  if (typeof req.route?.path !== "string") return void 0;
+  const base = typeof req.baseUrl === "string" ? req.baseUrl.replace(/\/+$/, "") : "";
+  if (!base) return req.route.path;
+  return req.route.path === "/" ? base : `${base}${req.route.path}`;
 }
 var ROUTE_PARAM = /^:([A-Za-z_$][\w$]*)/;
 function pathSegments(value) {
@@ -416,6 +419,12 @@ function createMiddleware(logger) {
 // src/options.ts
 var DEFAULT_ENDPOINT = "https://radar-ingest.oconde.dev";
 var LEVELS = ["debug", "info", "warn", "error"];
+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) };
+}
 function resolveOptions(options = {}, env = process.env) {
   const key = options.key?.trim() || void 0;
   return {
@@ -431,6 +440,7 @@ function resolveOptions(options = {}, env = process.env) {
     logRequests: options.logRequests ?? true,
     ignorePaths: options.ignorePaths ?? ["/healthz", "/health"],
     captureUnhandled: options.captureUnhandled ?? true,
+    traceFetch: resolveTraceFetch(options.traceFetch),
     debug: options.debug ?? false
   };
 }
@@ -498,6 +508,7 @@ var IDENTIFIER = "[A-Za-z_$][\\w$]*";
 var MAX_LINES_UP = 400;
 var MAX_HEADER_LINES = 6;
 var MAX_NAME_LENGTH = 100;
+var MAX_COMMENT_LINES = 40;
 var CONTROL_BLOCK = /^\s*(?:\}\s*)?(?:if|else|for|while|do|switch|try|catch|finally|with)\b/;
 var CLASS_BODY = new RegExp(`\\bclass\\s+${IDENTIFIER}`);
 var MARKUP_BOUNDARY = /<\/?(?:script|style|template)\b/i;
@@ -510,8 +521,58 @@ var NAME_PATTERNS = [
 ];
 var METHOD_PATTERN = new RegExp(`^\\s*(?:(?:export|default|public|private|protected|static|async|override|readonly|get|set)\\s+)*\\*?\\s*(${IDENTIFIER})\\s*(?:<[^>]*>)?\\s*\\([^]*\\)\\s*(?::\\s*[^{]+)?$`);
 var ANONYMOUS_FUNCTION = /\bfunction\b|=>/;
-function codeOnly(text) {
-  return text.replace(/(["'`])(?:\\.|(?!\1)[^\\])*\1/g, '""').replace(/\/\*.*?\*\//g, "").replace(/(^|[^:])\/\/.*$/, "$1");
+var STRING_LITERAL = /(["'`])(?:\\.|(?!\1)[^\\])*\1/g;
+function lineCommentAt(text, from) {
+  for (let index = text.indexOf("//", from); index >= 0; index = text.indexOf("//", index + 1)) {
+    if (index === 0 || text[index - 1] !== ":") return index;
+  }
+  return -1;
+}
+function blockCommentAt(text, from) {
+  for (let index = text.indexOf("/*", from); index >= 0; index = text.indexOf("/*", index + 1)) {
+    if (index === 0 || text[index - 1] !== "\\") return index;
+  }
+  return -1;
+}
+function stripComments(text, insideComment, closesLater) {
+  let code = "";
+  let position = 0;
+  let inside = insideComment;
+  while (position < text.length) {
+    if (inside) {
+      const end = text.indexOf("*/", position);
+      if (end < 0) return { code, insideComment: true };
+      inside = false;
+      position = end + 2;
+      continue;
+    }
+    const block = blockCommentAt(text, position);
+    const line = lineCommentAt(text, position);
+    if (line >= 0 && (block < 0 || line < block)) return { code: code + text.slice(position, line), insideComment: false };
+    if (block < 0) return { code: code + text.slice(position), insideComment: false };
+    if (text.indexOf("*/", block + 2) < 0 && !closesLater()) {
+      code += text.slice(position, block + 2);
+      position = block + 2;
+      continue;
+    }
+    code += text.slice(position, block);
+    inside = true;
+    position = block + 2;
+  }
+  return { code, insideComment: inside };
+}
+function codeLines(lines, from, start, column) {
+  const plain = lines.slice(from, start + 1).map((line) => line.replace(STRING_LITERAL, '""'));
+  const closesWithin = (index) => plain.slice(index + 1, index + 1 + MAX_COMMENT_LINES).some((line) => line.includes("*/"));
+  const result = [];
+  let insideComment = false;
+  for (let index = 0; index < plain.length; index++) {
+    const text = index === plain.length - 1 && column ? (lines[start] ?? "").slice(0, Math.max(0, column - 1)).replace(STRING_LITERAL, '""') : plain[index] ?? "";
+    const stripped = stripComments(text, insideComment, () => closesWithin(index));
+    insideComment = stripped.insideComment;
+    result.push(stripped.code);
+  }
+  return result;
 }
 function parenBalance(text) {
   let balance = 0;
@@ -521,11 +582,11 @@ function parenBalance(text) {
   }
   return balance;
 }
-function headerOf(lines, index, prefix) {
+function headerOf(code, index, prefix) {
   let header = prefix;
   for (let previous = index - 1; previous >= 0 && previous >= index - MAX_HEADER_LINES; previous--) {
     if (header.trim() !== "" && parenBalance(header) >= 0) break;
-    header = `${codeOnly(lines[previous] ?? "")} ${header}`;
+    header = `${code[previous] ?? ""} ${header}`;
   }
   return header;
 }
@@ -540,11 +601,12 @@ function nameIn(header) {
 function enclosingFunctionName(lines, line, column) {
   const start = line - 1;
   if (start < 0 || start >= lines.length) return void 0;
+  const from = Math.max(0, start - MAX_LINES_UP - MAX_HEADER_LINES);
+  const cleaned = codeLines(lines, from, start, column);
   let depth = 0;
   for (let index = start; index >= 0 && index >= start - MAX_LINES_UP; index--) {
-    const raw = lines[index] ?? "";
-    if (index < start && MARKUP_BOUNDARY.test(raw)) return void 0;
-    const code = codeOnly(index === start && column ? raw.slice(0, Math.max(0, column - 1)) : raw);
+    if (index < start && MARKUP_BOUNDARY.test(lines[index] ?? "")) return void 0;
+    const code = cleaned[index - from] ?? "";
     for (let position = code.length - 1; position >= 0; position--) {
       const char = code[position];
       if (char === "}") {
@@ -554,7 +616,7 @@ function enclosingFunctionName(lines, line, column) {
           depth -= 1;
           continue;
         }
-        const header = headerOf(lines, index, code.slice(0, position));
+        const header = headerOf(cleaned, index - from, code.slice(0, position));
         if (CLASS_BODY.test(header)) return void 0;
         if (CONTROL_BLOCK.test(header)) continue;
         const name = nameIn(header);
@@ -796,10 +858,6 @@ function safeStringify(value) {
   }
 }
 
-// src/transport.ts
-var import_node_util2 = require("util");
-var import_node_zlib = require("zlib");
-
 // src/util.ts
 var import_node_perf_hooks2 = require("perf_hooks");
 function describeError(error) {
@@ -809,7 +867,101 @@ function elapsedSince(startedAt) {
   return Math.round(import_node_perf_hooks2.performance.now() - startedAt);
 }
 
+// src/trace-fetch.ts
+var WRAPPED = /* @__PURE__ */ Symbol.for("@oconde/radar.fetch");
+var REQUEST_ID_HEADER = "x-request-id";
+var UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var TELEGRAM_BOT = /^bot\d{5,}:[\w-]{20,}$/;
+var TOKEN_LIKE = /^[\w\-.~+=]{20,}$/;
+function secretSegment(segment) {
+  if (UUID.test(segment)) return false;
+  if (TELEGRAM_BOT.test(segment) || looksLikeCredential(segment)) return true;
+  return TOKEN_LIKE.test(segment) && /[A-Za-z]/.test(segment) && /\d/.test(segment);
+}
+function outboundPath(pathname, mode) {
+  if (mode === "none") return pathname;
+  return pathname.split("/").map((segment) => {
+    let decoded = segment;
+    try {
+      decoded = decodeURIComponent(segment);
+    } catch {
+      decoded = segment;
+    }
+    return secretSegment(decoded) ? maskValue(decoded, false) : segment;
+  }).join("/");
+}
+function failureOf(error) {
+  const message = describeError(error);
+  const cause = error instanceof Error ? error.cause : void 0;
+  const detail = typeof cause?.code === "string" ? cause.code : typeof cause?.message === "string" ? cause.message : "";
+  return detail && !message.includes(detail) ? `${message} (${detail})` : message;
+}
+function urlOf(input) {
+  try {
+    if (typeof input === "string") return new URL(input);
+    if (input instanceof URL) return input;
+    return new URL(input.url);
+  } catch {
+    return null;
+  }
+}
+function originOf(value) {
+  try {
+    return new URL(value).origin;
+  } catch {
+    return null;
+  }
+}
+function targets(url, target) {
+  if (target instanceof RegExp) return target.test(url.host);
+  const wanted = target.trim().toLowerCase();
+  if (wanted.startsWith(".")) return url.hostname.toLowerCase().endsWith(wanted);
+  return url.host.toLowerCase() === wanted || url.hostname.toLowerCase() === wanted;
+}
+function isPlainObject(value) {
+  if (value === null || typeof value !== "object") return false;
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function withRequestId(input, init, requestId) {
+  const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : void 0));
+  if (headers.has(REQUEST_ID_HEADER)) return [input, init];
+  headers.set(REQUEST_ID_HEADER, requestId);
+  if (init === void 0 || isPlainObject(init)) return [input, { ...init, headers }];
+  return [new Request(input, init), { headers }];
+}
+function traceFetch(config) {
+  const current = globalThis.fetch;
+  if (typeof current !== "function" || current[WRAPPED]) return () => void 0;
+  const original = current;
+  const radarOrigin = originOf(config.endpoint);
+  const traced = async (input, init) => {
+    const url = urlOf(input);
+    if (!url || url.origin === radarOrigin || url.protocol !== "http:" && url.protocol !== "https:") return original(input, init);
+    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];
+    const attrs = { method, host: url.host, path: outboundPath(url.pathname, config.redact) };
+    const started = performance.now();
+    try {
+      const response = await original(nextInput, nextInit);
+      config.record(response.status >= 500 ? "error" : response.status >= 400 ? "warn" : "info", { ...attrs, status: response.status, durationMs: elapsedSince(started) });
+      return response;
+    } catch (error) {
+      config.record("error", { ...attrs, error: failureOf(error), durationMs: elapsedSince(started) });
+      throw error;
+    }
+  };
+  Object.defineProperty(traced, WRAPPED, { value: original });
+  globalThis.fetch = traced;
+  return () => {
+    if (globalThis.fetch === traced) globalThis.fetch = original;
+  };
+}
+
 // src/transport.ts
+var import_node_util2 = require("util");
+var import_node_zlib = require("zlib");
 var gzipAsync = (0, import_node_util2.promisify)(import_node_zlib.gzip);
 var MAX_BATCH_BYTES = 9e5;
 var GZIP_THRESHOLD_BYTES = 8192;
@@ -1037,7 +1189,7 @@ function withTimeout(promise, ms) {
 
 // src/version.ts
 var SDK_NAME = "@oconde/radar";
-var SDK_VERSION = true ? "0.2.0" : "0.0.0-dev";
+var SDK_VERSION = true ? "0.3.0" : "0.0.0-dev";
 
 // src/client.ts
 var MAX_CHECK_IN_DURATION_MS = 7 * 864e5;
@@ -1049,6 +1201,7 @@ var RadarClient = class {
   initialized = false;
   closed = false;
   captured = /* @__PURE__ */ new WeakSet();
+  restoreFetch = null;
   get isEnabled() {
     return this.transport !== null && !this.closed;
   }
@@ -1076,6 +1229,14 @@ var RadarClient = class {
         });
       }
       if (this.options.captureUnhandled && (this.transport || this.options.console)) installProcessHandlers(this);
+      if (this.options.traceFetch.enabled && (this.transport || this.options.console)) {
+        this.restoreFetch = traceFetch({
+          endpoint: this.options.endpoint,
+          propagateTo: this.options.traceFetch.propagateTo,
+          redact: this.options.redact,
+          record: (level, attrs) => this.safely(() => this.emitLog(level, "http.client", attrs))
+        });
+      }
     } catch (error) {
       this.debugWarn(`radar.init falhou: ${describeError(error)}`);
     }
@@ -1212,6 +1373,8 @@ var RadarClient = class {
   async close(timeoutMs = 2e3) {
     if (this.closed) return;
     await this.flush(timeoutMs);
+    this.restoreFetch?.();
+    this.restoreFetch = null;
     this.closed = true;
     this.transport?.stop();
   }