@oconde/radar 0.1.0 → 0.2.0

package/dist/index.js

@@ -5,29 +5,13 @@ import { performance as performance3 } from "perf_hooks";
 
 // src/context.ts
 import { AsyncLocalStorage } from "async_hooks";
-var STATE_KEY = /* @__PURE__ */ Symbol.for("@oconde/radar");
-function globalState() {
-  const holder = globalThis;
-  let state2 = holder[STATE_KEY];
-  if (!state2) {
-    state2 = { storage: new AsyncLocalStorage() };
-    holder[STATE_KEY] = state2;
-  }
-  return state2;
-}
-function currentContext() {
-  return globalState().storage.getStore();
-}
-function runWithContext(context, fn) {
-  return globalState().storage.run(context, fn);
-}
-
-// src/express.ts
 import { randomUUID } from "crypto";
-import { performance } from "perf_hooks";
 
 // src/protocol/index.ts
 var INGEST_PATH = "/api/v1/events";
+var CHECKIN_PATH = "/api/v1/checkins/";
+var CHECKIN_SLUG = /^[a-z0-9][a-z0-9-]{0,63}$/;
+var CHECKIN_STATUSES = ["in_progress", "ok", "error"];
 var LIMITS = {
   batchBytes: 1e6,
   batchEvents: 500,
@@ -43,9 +27,36 @@ var LIMITS = {
   causeDepth: 5,
   depth: 6,
   arrayItems: 50,
-  requestIdLength: 128
+  requestIdLength: 128,
+  checkInIdLength: 64
 };
 
+// src/context.ts
+var STATE_KEY = /* @__PURE__ */ Symbol.for("@oconde/radar");
+function globalState() {
+  const holder = globalThis;
+  let state2 = holder[STATE_KEY];
+  if (!state2) {
+    state2 = { storage: new AsyncLocalStorage() };
+    holder[STATE_KEY] = state2;
+  }
+  return state2;
+}
+function currentContext() {
+  return globalState().storage.getStore();
+}
+function runWithContext(context, fn) {
+  return globalState().storage.run(context, fn);
+}
+var SAFE_REQUEST_ID = /^[\x21-\x7e]+$/;
+function requestIdFrom(incoming) {
+  const value = incoming?.trim();
+  return value && value.length <= LIMITS.requestIdLength && SAFE_REQUEST_ID.test(value) ? value : randomUUID();
+}
+
+// src/express.ts
+import { performance } from "perf_hooks";
+
 // src/redact.ts
 import { createHash, createHmac, randomBytes } from "crypto";
 var SECRET_WORDS = /* @__PURE__ */ new Set([
@@ -246,6 +257,40 @@ function requestRoute(req, route) {
   if (route) return route;
   return typeof req.route?.path === "string" ? req.route.path : void 0;
 }
+var ROUTE_PARAM = /^:([A-Za-z_$][\w$]*)/;
+function pathSegments(value) {
+  const segments = value.split("/");
+  while (segments.length > 1 && segments[segments.length - 1] === "") segments.pop();
+  return segments;
+}
+function decodeSegment(value) {
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return value;
+  }
+}
+function routeParams(req, path) {
+  if (typeof req.route?.path !== "string") return {};
+  const pattern = pathSegments(`${typeof req.baseUrl === "string" ? req.baseUrl : ""}${req.route.path}`).filter((segment, index) => index > 0 || segment !== "");
+  const values = pathSegments(path);
+  if (pattern.length > values.length) return {};
+  const offset = values.length - pattern.length;
+  const result = {};
+  for (let index = 0; index < pattern.length; index++) {
+    const value = values[offset + index];
+    const param = ROUTE_PARAM.exec(pattern[index]);
+    if (!param) {
+      if (pattern[index] !== value) return {};
+      continue;
+    }
+    if (value) result[param[1]] = decodeSegment(value);
+  }
+  return result;
+}
+function pathParams(req, path) {
+  return { ...routeParams(req, path), ...req.params ?? {} };
+}
 function redactPath(path, params, mode) {
   if (mode === "none" || !params) return path;
   let result = path;
@@ -261,7 +306,7 @@ function safeUrl(req, mode) {
   const queryStart = url.indexOf("?");
   const path = queryStart >= 0 ? url.slice(0, queryStart) : url;
   const query = queryStart >= 0 ? url.slice(queryStart) : "";
-  return redactUrl(redactPath(path, req.params, mode) + query, mode);
+  return redactUrl(redactPath(path, pathParams(req, path), mode) + query, mode);
 }
 function redactUrl(url, mode) {
   const queryStart = url.indexOf("?");
@@ -329,8 +374,7 @@ function createMiddleware(logger) {
   return (req, res, next) => {
     let context;
     try {
-      const incoming = headerValue(req.headers["x-request-id"])?.trim();
-      const requestId = incoming && incoming.length <= LIMITS.requestIdLength ? incoming : randomUUID();
+      const requestId = requestIdFrom(headerValue(req.headers["x-request-id"]));
       context = { requestId, startedAt: performance.now(), req };
       res.setHeader("x-request-id", requestId);
       if (logger.shouldLogRequest(req)) res.once("finish", () => logger.logHttpRequest(context, res.statusCode));
@@ -421,16 +465,92 @@ import { readFile, stat } from "fs/promises";
 import { SourceMap } from "module";
 import { dirname, isAbsolute, relative, resolve, sep } from "path";
 import { fileURLToPath } from "url";
+
+// src/function-name.ts
+var IDENTIFIER = "[A-Za-z_$][\\w$]*";
+var MAX_LINES_UP = 400;
+var MAX_HEADER_LINES = 6;
+var MAX_NAME_LENGTH = 100;
+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;
+var KEYWORDS = /* @__PURE__ */ new Set(["if", "for", "while", "switch", "catch", "function", "return", "new", "typeof", "await", "else", "do", "try"]);
+var NAME_PATTERNS = [
+  new RegExp(`\\bfunction\\s*\\*?\\s*(${IDENTIFIER})\\s*\\(`),
+  new RegExp(`(${IDENTIFIER})\\s*[:=]\\s*(?:async\\s+)?function\\b`),
+  new RegExp(`(${IDENTIFIER})\\s*(?::\\s*[^=]+)?=\\s*(?:async\\s+)?(?:\\([^]*\\)|${IDENTIFIER})\\s*(?::\\s*[^=]+)?=>\\s*$`),
+  new RegExp(`(?:^|[{,(]\\s*)(${IDENTIFIER})\\s*:\\s*(?:async\\s+)?(?:\\([^]*\\)|${IDENTIFIER})\\s*(?::\\s*[^=]+)?=>\\s*$`)
+];
+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");
+}
+function parenBalance(text) {
+  let balance = 0;
+  for (const char of text) {
+    if (char === "(") balance += 1;
+    else if (char === ")") balance -= 1;
+  }
+  return balance;
+}
+function headerOf(lines, 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}`;
+  }
+  return header;
+}
+function nameIn(header) {
+  const patterns = ANONYMOUS_FUNCTION.test(header) ? NAME_PATTERNS : [...NAME_PATTERNS, METHOD_PATTERN];
+  for (const pattern of patterns) {
+    const name = pattern.exec(header)?.[1];
+    if (name && !KEYWORDS.has(name)) return name.slice(0, MAX_NAME_LENGTH);
+  }
+  return void 0;
+}
+function enclosingFunctionName(lines, line, column) {
+  const start = line - 1;
+  if (start < 0 || start >= lines.length) return void 0;
+  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);
+    for (let position = code.length - 1; position >= 0; position--) {
+      const char = code[position];
+      if (char === "}") {
+        depth += 1;
+      } else if (char === "{") {
+        if (depth > 0) {
+          depth -= 1;
+          continue;
+        }
+        const header = headerOf(lines, index, code.slice(0, position));
+        if (CLASS_BODY.test(header)) return void 0;
+        if (CONTROL_BLOCK.test(header)) continue;
+        const name = nameIn(header);
+        if (name) return name;
+      }
+    }
+  }
+  return void 0;
+}
+
+// src/source.ts
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
 var MAX_CACHED_FILES = 50;
 var MAPPING_URL = /\/\/[#@]\s*sourceMappingURL=(\S+)\s*$/;
 var cache = /* @__PURE__ */ new Map();
-async function enrichFrames(frames, cwd = process.cwd()) {
+async function enrichFrames(frames, cwd = process.cwd(), options = {}) {
   const result = [];
   let withContext = 0;
   for (const frame of frames) {
     try {
-      const { frame: mapped, lines } = await mapFrame(frame);
+      const { frame: located, lines, original } = await mapFrame(frame, options.mapLocator);
+      const named = options.inferFunctionNames && original && !located.fn && lines && located.line ? withInferredName(located, lines) : located;
+      const mapped = named.inApp && isLibraryPath(named.file) ? { ...named, inApp: false } : named;
       let next = mapped;
       if (mapped.inApp && lines && mapped.line && withContext < LIMITS.contextFrames) {
         const context = contextFor(lines, mapped.line);
@@ -446,29 +566,36 @@ async function enrichFrames(frames, cwd = process.cwd()) {
   }
   return result;
 }
-async function enrichException(exception, cwd = process.cwd()) {
-  const frames = await enrichFrames(exception.frames, cwd);
+async function enrichException(exception, cwd = process.cwd(), options = {}) {
+  const frames = await enrichFrames(exception.frames, cwd, options);
   if (!exception.cause) return { ...exception, frames };
-  return { ...exception, frames, cause: await enrichException(exception.cause, cwd) };
+  return { ...exception, frames, cause: await enrichException(exception.cause, cwd, options) };
+}
+function withInferredName(frame, lines) {
+  const fn = enclosingFunctionName(lines, frame.line ?? 0, frame.col);
+  return fn ? { ...frame, fn } : frame;
+}
+function isLibraryPath(file) {
+  return file.includes("/node_modules/") || file.includes("\\node_modules\\");
 }
 function relativize(file, cwd) {
   if (!isAbsolute(file)) return file;
   const path = relative(cwd, file);
   return path.startsWith("..") || isAbsolute(path) ? file : path.split(sep).join("/");
 }
-async function mapFrame(frame) {
-  if (!frame.line || !isAbsolute(frame.file)) return { frame, lines: null };
-  const file = await loadFile(frame.file);
-  if (!file) return { frame, lines: null };
-  if (!file.map) return { frame, lines: file.lines };
+async function mapFrame(frame, locator) {
+  if (!frame.line || !isAbsolute(frame.file)) return { frame, lines: null, original: false };
+  const file = await loadFile(frame.file, locator);
+  if (!file) return { frame, lines: null, original: false };
+  if (!file.map) return { frame, lines: file.lines, original: false };
   const entry = file.map.map.findEntry(frame.line - 1, (frame.col ?? 1) - 1);
-  if (typeof entry.originalSource !== "string" || typeof entry.originalLine !== "number") return { frame, lines: file.lines };
+  if (typeof entry.originalSource !== "string" || typeof entry.originalLine !== "number") return { frame, lines: file.lines, original: false };
   const originalPath = resolveSource(file.map, entry.originalSource);
   const mapped = { ...frame, file: originalPath, line: entry.originalLine + 1, col: (entry.originalColumn ?? 0) + 1 };
   const lines = embeddedLines(file.map, file.map.sources.indexOf(entry.originalSource));
-  if (lines) return { frame: mapped, lines };
+  if (lines) return { frame: mapped, lines, original: true };
   const original = await loadFile(originalPath);
-  return { frame: mapped, lines: original?.lines ?? null };
+  return { frame: mapped, lines: original?.lines ?? null, original: true };
 }
 function embeddedLines(map, index) {
   if (index < 0) return null;
@@ -500,26 +627,27 @@ function resolveSource(map, source) {
   }
   return isAbsolute(source) ? source : resolve(map.baseDir, source);
 }
-function loadFile(path) {
-  const cached = cache.get(path);
+function loadFile(path, locator) {
+  const key = locator ? `${path}\0located` : path;
+  const cached = cache.get(key);
   if (cached) {
-    cache.delete(path);
-    cache.set(path, cached);
+    cache.delete(key);
+    cache.set(key, cached);
     return cached;
   }
-  const pending = readSource(path).catch(() => null);
-  cache.set(path, pending);
+  const pending = readSource(path, locator).catch(() => null);
+  cache.set(key, pending);
   if (cache.size > MAX_CACHED_FILES) {
     const oldest = cache.keys().next().value;
     if (oldest !== void 0) cache.delete(oldest);
   }
   return pending;
 }
-async function readSource(path) {
+async function readSource(path, locator) {
   const text = await readText(path);
   if (text === null) return null;
   const lines = text.split(/\r?\n/);
-  return { lines, map: await loadMap(path, lines) };
+  return { lines, map: await loadMap(path, lines, locator) };
 }
 async function readText(path) {
   try {
@@ -530,7 +658,7 @@ async function readText(path) {
     return null;
   }
 }
-async function loadMap(path, lines) {
+async function loadMap(path, lines, locator) {
   let url;
   for (let index = lines.length - 1; index >= 0 && index >= lines.length - 5; index--) {
     const match = MAPPING_URL.exec(lines[index] ?? "");
@@ -539,10 +667,15 @@ async function loadMap(path, lines) {
       break;
     }
   }
-  if (!url) return null;
   let raw;
   let mapDir;
-  if (url.startsWith("data:")) {
+  const located = url ? null : locator ? locator(path) : `${path}.map`;
+  if (located) {
+    raw = await readText(located);
+    mapDir = dirname(located);
+  } else if (!url) {
+    return null;
+  } else if (url.startsWith("data:")) {
     const comma = url.indexOf(",");
     const encoded = url.slice(comma + 1);
     raw = url.slice(0, comma).endsWith(";base64") ? Buffer.from(encoded, "base64").toString("utf8") : decodeURIComponent(encoded);
@@ -571,12 +704,13 @@ async function loadMap(path, lines) {
 import { fileURLToPath as fileURLToPath2 } from "url";
 var WITH_FUNCTION = /^at (?:async )?(.+?) \((.+)\)$/;
 var LOCATION = /^(.+):(\d+):(\d+)$/;
+var MAX_FRAME_LINE = 1e3;
 function parseStack(stack) {
   if (!stack) return [];
   const frames = [];
   for (const raw of stack.split("\n")) {
     const line = raw.trim();
-    if (!line.startsWith("at ")) continue;
+    if (line.length > MAX_FRAME_LINE || !line.startsWith("at ")) continue;
     const withFunction = WITH_FUNCTION.exec(line);
     const fn = withFunction?.[1];
     const location = withFunction ? withFunction[2] ?? "" : line.replace(/^at (?:async )?/, "");
@@ -671,6 +805,7 @@ var Transport = class {
   inFlight = null;
   nextAttemptAt = 0;
   backoffMs = 0;
+  unauthorizedUntil = 0;
   stopped = false;
   warned = /* @__PURE__ */ new Set();
   timer;
@@ -760,10 +895,8 @@ var Transport = class {
         this.nextAttemptAt = Date.now() + Math.max(this.backoffMs, outcome.retryAfterMs ?? 0);
         return false;
       case "unauthorized":
-        this.droppedCount += events.length + this.queue.length;
-        this.queue = [];
-        this.nextAttemptAt = Date.now() + UNAUTHORIZED_PAUSE_MS;
-        this.warn("unauthorized", `chave do Radar recusada (${outcome.status}); envios pausados por 10 minutos`, true);
+        this.droppedCount += events.length;
+        this.pauseUnauthorized(outcome.status);
         return false;
       case "rejected":
         this.droppedCount += events.length;
@@ -771,6 +904,47 @@ var Transport = class {
         return true;
     }
   }
+  async checkIn(slug, payload) {
+    if (this.stopped || !this.config.checkInBaseUrl || Date.now() < this.unauthorizedUntil) return;
+    let response;
+    try {
+      response = await fetch(this.config.checkInBaseUrl + encodeURIComponent(slug), {
+        method: "POST",
+        headers: this.headers(),
+        body: JSON.stringify(payload),
+        redirect: "error",
+        signal: AbortSignal.timeout(this.config.requestTimeoutMs ?? 5e3)
+      });
+    } catch (error) {
+      this.warn("checkin_network", `check-in no Radar falhou: ${describeError(error)}`, false);
+      return;
+    }
+    await response.arrayBuffer().catch(() => void 0);
+    if (response.ok) return;
+    if (response.status === 401 || response.status === 403) {
+      this.pauseUnauthorized(response.status);
+      return;
+    }
+    if (response.status === 404) {
+      this.warn(`checkin_unknown_${slug}`, `tarefa agendada "${slug}" n\xE3o existe no projeto da chave; crie o monitor com esse slug no Radar`, true);
+      return;
+    }
+    this.warn(`checkin_rejected_${response.status}`, `check-in recusado pelo Radar (${response.status})`, false);
+  }
+  pauseUnauthorized(status) {
+    this.droppedCount += this.queue.length;
+    this.queue = [];
+    this.unauthorizedUntil = Date.now() + UNAUTHORIZED_PAUSE_MS;
+    this.nextAttemptAt = Math.max(this.nextAttemptAt, this.unauthorizedUntil);
+    this.warn("unauthorized", `chave do Radar recusada (${status}); envios pausados por 10 minutos`, true);
+  }
+  headers() {
+    return {
+      "content-type": "application/json",
+      authorization: `Bearer ${this.config.key}`,
+      "user-agent": `${this.config.sdk.name}/${this.config.sdk.version}`
+    };
+  }
   requeue(events) {
     this.queue.unshift(...events);
     const overflow = this.queue.length - this.maxQueue;
@@ -782,11 +956,7 @@ var Transport = class {
   async post(batch) {
     const json = JSON.stringify(batch);
     const compress = Buffer.byteLength(json) > GZIP_THRESHOLD_BYTES;
-    const headers = {
-      "content-type": "application/json",
-      authorization: `Bearer ${this.config.key}`,
-      "user-agent": `${this.config.sdk.name}/${this.config.sdk.version}`
-    };
+    const headers = this.headers();
     if (compress) headers["content-encoding"] = "gzip";
     let response;
     try {
@@ -840,9 +1010,12 @@ function withTimeout(promise, ms) {
 
 // src/version.ts
 var SDK_NAME = "@oconde/radar";
-var SDK_VERSION = true ? "0.1.0" : "0.0.0-dev";
+var SDK_VERSION = true ? "0.2.0" : "0.0.0-dev";
 
 // src/client.ts
+var MAX_CHECK_IN_DURATION_MS = 7 * 864e5;
+var MAX_CHECK_IN_ENVIRONMENT = 64;
+var MAX_CHECK_IN_RELEASE = 128;
 var RadarClient = class {
   options = resolveOptions({}, {});
   transport = null;
@@ -871,6 +1044,7 @@ var RadarClient = class {
           sdk: { name: SDK_NAME, version: SDK_VERSION },
           environment: this.options.environment,
           ...this.options.release ? { release: this.options.release } : {},
+          checkInBaseUrl: this.options.endpoint + CHECKIN_PATH,
           onWarning: (message, always) => always ? this.writeWarning(message) : this.debugWarn(message)
         });
       }
@@ -932,6 +1106,51 @@ var RadarClient = class {
     if (currentContext()) return execute();
     return runWithContext({ requestId: randomUUID2(), startedAt: performance3.now() }, execute);
   }
+  withContext(fn, options = {}) {
+    return runWithContext({ requestId: requestIdFrom(options.requestId), startedAt: performance3.now() }, fn);
+  }
+  async checkIn(slug, status, options = {}) {
+    try {
+      if (!this.transport || this.closed) return;
+      if (typeof slug !== "string" || !CHECKIN_SLUG.test(slug)) {
+        this.debugWarn(`slug de tarefa agendada inv\xE1lido: ${String(slug).slice(0, 80)}`);
+        return;
+      }
+      if (!CHECKIN_STATUSES.includes(status)) return;
+      const checkInId = typeof options.checkInId === "string" && options.checkInId ? options.checkInId.slice(0, LIMITS.checkInIdLength) : void 0;
+      const durationMs = typeof options.durationMs === "number" && Number.isFinite(options.durationMs) && options.durationMs >= 0 ? Math.min(Math.round(options.durationMs), MAX_CHECK_IN_DURATION_MS) : void 0;
+      const environment = this.options.environment.slice(0, MAX_CHECK_IN_ENVIRONMENT) || "production";
+      const release = this.options.release?.slice(0, MAX_CHECK_IN_RELEASE);
+      const payload = {
+        status,
+        ...checkInId ? { checkInId } : {},
+        ...durationMs !== void 0 ? { durationMs } : {},
+        environment,
+        ...release ? { release } : {}
+      };
+      await this.transport.checkIn(slug, payload);
+    } catch (error) {
+      this.debugWarn(`check-in falhou: ${describeError(error)}`);
+    }
+  }
+  async cron(slug, fn) {
+    const checkInId = randomUUID2();
+    const started = performance3.now();
+    const execute = async () => {
+      await this.checkIn(slug, "in_progress", { checkInId });
+      try {
+        const result = await fn();
+        await this.checkIn(slug, "ok", { checkInId, durationMs: elapsedSince(started) });
+        return result;
+      } catch (error) {
+        this.captureError(error, { cron: slug });
+        await this.checkIn(slug, "error", { checkInId, durationMs: elapsedSince(started) });
+        throw error;
+      }
+    };
+    if (currentContext()) return execute();
+    return this.withContext(execute);
+  }
   middleware() {
     return createMiddleware(this);
   }
@@ -949,7 +1168,7 @@ var RadarClient = class {
         () => this.emitLog(level, "http.request", {
           method: (req.method ?? "GET").toUpperCase(),
           ...route ? { route } : {},
-          ...this.options.requestDetail === "full" ? { path: redactPath(requestPath(req), req.params, this.options.redact) } : {},
+          ...this.options.requestDetail === "full" ? { path: redactPath(requestPath(req), pathParams(req, requestPath(req)), this.options.redact) } : {},
           status,
           durationMs: elapsedSince(context.startedAt)
         })
@@ -986,31 +1205,40 @@ var RadarClient = class {
     this.print(event);
     this.transport?.enqueue(event);
   }
+  captureException(exception, options = {}) {
+    this.safely(() => this.emitException(exception, options));
+  }
   emitError(error, data, level, handled) {
     if (this.closed) return;
     if (typeof error === "object" && error !== null) {
       if (this.captured.has(error)) return;
       this.captured.add(error);
     }
+    this.emitException(exceptionInfo(error), { level, handled, ...data !== void 0 ? { attrs: data } : {} }, error instanceof Error ? error.stack : void 0);
+  }
+  emitException(exception, options, stack) {
+    if (this.closed) return;
     const context = currentContext();
     const mode = this.options.redact;
+    const request = options.request === null ? void 0 : options.request ?? (context?.req ? requestInfo(context.req, mode, { route: context.route }, this.options.requestDetail) : void 0);
+    const runtime = options.runtime === void 0 ? runtimeInfo() : options.runtime;
     const event = {
       type: "error",
       ts: Date.now(),
-      level,
-      handled,
-      exception: exceptionInfo(error),
+      level: options.level ?? "error",
+      handled: options.handled ?? true,
+      exception,
       ...context ? { requestId: context.requestId } : {},
-      ...context?.req ? { request: requestInfo(context.req, mode, { route: context.route }, this.options.requestDetail) } : {},
+      ...request ? { request } : {},
       ...context?.user ? { user: context.user } : {},
-      runtime: runtimeInfo(),
-      ...data !== void 0 ? { attrs: prepareAttrs(data, mode) } : {}
+      ...runtime ? { runtime } : {},
+      ...options.attrs !== void 0 ? { attrs: prepareAttrs(options.attrs, mode) } : {}
     };
-    this.print(event, error instanceof Error ? error.stack : void 0);
+    this.print(event, stack);
     if (!this.transport) return;
     this.transport.enqueue(
-      () => enrichException(event.exception).then(
-        (exception) => ({ ...event, exception }),
+      () => enrichException(event.exception, process.cwd(), options.enrich).then(
+        (enriched) => ({ ...event, exception: enriched }),
         () => event
       )
     );