@stainlessdev/xray-core 0.6.0 → 0.7.0-dev.588fa57

package/README.md

@@ -0,0 +1,67 @@
+# @stainlessdev/xray-core
+
+Core instrumentation for Stainless X-ray request logging. This package is runtime-agnostic and only provides the emitter, config, and types. Use it directly if you need a custom runtime or a custom OpenTelemetry exporter; otherwise prefer `@stainlessdev/xray-node` or `@stainlessdev/xray-fetch`.
+
+## Install
+
+```sh
+pnpm add @stainlessdev/xray-core @opentelemetry/sdk-trace-base @opentelemetry/exporter-trace-otlp-proto
+```
+
+## Basic usage
+
+```ts
+import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
+import { createEmitter } from '@stainlessdev/xray-core';
+
+const endpointUrl = 'http://localhost:4318';
+const exporter = new OTLPTraceExporter({
+  url: `${endpointUrl}/v1/traces`,
+});
+
+const xray = createEmitter(
+  {
+    serviceName: 'my-service',
+    endpointUrl,
+  },
+  exporter,
+);
+
+const ctx = xray.startRequest({
+  method: 'GET',
+  url: 'https://example.com/hello',
+  headers: { 'user-agent': 'curl/8.0' },
+  startTimeMs: Date.now(),
+});
+
+const log = xray.endRequest(ctx, {
+  statusCode: 200,
+  headers: { 'request-id': 'req_123' },
+  endTimeMs: Date.now(),
+});
+
+await xray.flush();
+```
+
+## Request IDs
+
+X-ray always produces a request ID for each request. If you do not provide one, it resolves the ID in this order: explicit `requestId`, configured response header name (`requestId.header`, default: `request-id`), then an auto-generated UUIDv7-based ID. Runtime adapters inject the header automatically when missing; if you use `@stainlessdev/xray-core` directly, you are responsible for writing the response header yourself.
+
+## Configuration (high-level)
+
+`XrayConfig` lives in `packages/core/src/config.ts`. Common knobs:
+
+- `serviceName` (required) and `endpointUrl` (falls back to `STAINLESS_XRAY_ENDPOINT_URL`).
+- `exporter` overrides for OTLP headers, timeout, and span processor.
+- `capture` and `redaction` toggles for headers/body logging.
+- `requestId.header` for the response header name.
+- `route` normalization options.
+
+Notes:
+
+- `endpointUrl` is required; `/v1/traces` is appended if missing. If both are set, `endpointUrl` wins over `STAINLESS_XRAY_ENDPOINT_URL`.
+- If `endpointUrl` includes basic auth credentials, they are moved to the `Authorization` header automatically.
+
+## When to use this package
+
+Use `@stainlessdev/xray-core` only if you need to integrate with a custom runtime or supply your own `SpanExporter`. For Node and fetch-based runtimes, use `@stainlessdev/xray-node` or `@stainlessdev/xray-fetch` for a ready-to-go emitter and request/response adapters.

package/dist/chunk-3ILKJJIG.js

@@ -0,0 +1,304 @@
+// src/logger.ts
+var logLevelOrder = {
+  debug: 10,
+  info: 20,
+  warn: 30,
+  error: 40
+};
+function logWithLevel(logger, level, threshold, message, fields) {
+  if (logLevelOrder[level] < logLevelOrder[threshold]) {
+    return;
+  }
+  const fn = logger[level] ?? logger.warn ?? logger.info ?? logger.debug ?? logger.error ?? console.log;
+  try {
+    fn.call(logger, message, fields);
+  } catch {
+  }
+}
+
+// src/encoding.ts
+var utf8Decoder = typeof TextDecoder !== "undefined" ? new TextDecoder("utf-8", { fatal: true }) : null;
+var utf8DecoderLenient = typeof TextDecoder !== "undefined" ? new TextDecoder("utf-8") : null;
+var maybeBuffer = globalThis.Buffer;
+function encodeBase64(bytes) {
+  if (maybeBuffer) {
+    return maybeBuffer.from(bytes).toString("base64");
+  }
+  let binary = "";
+  for (let i = 0; i < bytes.length; i += 1) {
+    const byte = bytes[i];
+    if (byte === void 0) {
+      continue;
+    }
+    binary += String.fromCharCode(byte);
+  }
+  if (typeof btoa !== "undefined") {
+    return btoa(binary);
+  }
+  return "";
+}
+function isValidUtf8(bytes) {
+  if (!utf8Decoder) {
+    return false;
+  }
+  try {
+    utf8Decoder.decode(bytes);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function decodeUtf8(bytes) {
+  if (utf8DecoderLenient) {
+    return utf8DecoderLenient.decode(bytes);
+  }
+  if (maybeBuffer) {
+    return maybeBuffer.from(bytes).toString("utf8");
+  }
+  return "";
+}
+
+// src/request_log.ts
+var controlChars = /[\x00-\x1F\x7F]/g;
+function sanitizeLogString(value) {
+  if (!value) {
+    return value;
+  }
+  return value.replace(controlChars, "");
+}
+function sanitizeHeaderValues(headers) {
+  if (!headers) {
+    return void 0;
+  }
+  const sanitized = {};
+  for (const [key, value] of Object.entries(headers)) {
+    const name = sanitizeLogString(key);
+    if (Array.isArray(value)) {
+      sanitized[name] = value.map((entry) => sanitizeLogString(entry));
+    } else {
+      sanitized[name] = sanitizeLogString(value);
+    }
+  }
+  return sanitized;
+}
+function makeCapturedBody(bytes, totalBytes, truncated, mode) {
+  if (!bytes) {
+    return void 0;
+  }
+  if (mode === "base64") {
+    return {
+      bytes: totalBytes,
+      encoding: "base64",
+      truncated,
+      value: encodeBase64(bytes)
+    };
+  }
+  if (isValidUtf8(bytes)) {
+    return {
+      bytes: totalBytes,
+      encoding: "utf8",
+      truncated,
+      value: decodeUtf8(bytes)
+    };
+  }
+  return {
+    bytes: totalBytes,
+    encoding: "base64",
+    truncated,
+    value: encodeBase64(bytes)
+  };
+}
+
+// src/uuid/base48.ts
+var base48AlphabetLex = "256789BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
+var base48Zero = base48AlphabetLex.charAt(0);
+var maxChunkBytes = 32;
+var chunkToEncodedLength = /* @__PURE__ */ new Map();
+var encodedLengthToChunk = /* @__PURE__ */ new Map();
+for (let size = 1; size <= maxChunkBytes; size += 1) {
+  const encodedLength = Math.ceil(size * 8 / Math.log2(48));
+  chunkToEncodedLength.set(size, encodedLength);
+  encodedLengthToChunk.set(encodedLength, size);
+}
+var maxEncodedChunk = chunkToEncodedLength.get(maxChunkBytes);
+function encodeChunk(bytes, size) {
+  let value = 0n;
+  for (const byte of bytes) {
+    value = value << 8n | BigInt(byte);
+  }
+  let encoded = "";
+  if (value === 0n) {
+    encoded = base48Zero;
+  } else {
+    while (value > 0n) {
+      const mod = value % 48n;
+      encoded = base48AlphabetLex[Number(mod)] + encoded;
+      value /= 48n;
+    }
+  }
+  const targetLength = chunkToEncodedLength.get(size);
+  if (!targetLength) {
+    throw new Error(`base48: unsupported chunk size ${size}`);
+  }
+  return encoded.padStart(targetLength, base48Zero);
+}
+function encodeBase48Lex(buffer) {
+  if (buffer.length === 0) {
+    return "";
+  }
+  let result = "";
+  for (let offset = 0; offset < buffer.length; ) {
+    const remaining = buffer.length - offset;
+    const size = remaining >= maxChunkBytes ? maxChunkBytes : remaining;
+    result += encodeChunk(buffer.slice(offset, offset + size), size);
+    offset += size;
+  }
+  return result;
+}
+
+// src/uuid/base62.ts
+var base62AlphabetLex = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var base62Zero = base62AlphabetLex.charAt(0);
+var maxChunkBytes2 = 32;
+var chunkToEncodedLength2 = /* @__PURE__ */ new Map();
+var encodedLengthToChunk2 = /* @__PURE__ */ new Map();
+for (let size = 1; size <= maxChunkBytes2; size += 1) {
+  const encodedLength = Math.ceil(size * 8 / Math.log2(62));
+  chunkToEncodedLength2.set(size, encodedLength);
+  encodedLengthToChunk2.set(encodedLength, size);
+}
+var maxEncodedChunk2 = chunkToEncodedLength2.get(maxChunkBytes2);
+function encodeChunk2(bytes, size) {
+  let value = 0n;
+  for (const byte of bytes) {
+    value = value << 8n | BigInt(byte);
+  }
+  let encoded = "";
+  if (value === 0n) {
+    encoded = base62Zero;
+  } else {
+    while (value > 0n) {
+      const mod = value % 62n;
+      encoded = base62AlphabetLex[Number(mod)] + encoded;
+      value /= 62n;
+    }
+  }
+  const targetLength = chunkToEncodedLength2.get(size);
+  if (!targetLength) {
+    throw new Error(`base62: unsupported chunk size ${size}`);
+  }
+  return encoded.padStart(targetLength, base62Zero);
+}
+function encodeBase62Lex(buffer) {
+  if (buffer.length === 0) {
+    return "";
+  }
+  let result = "";
+  for (let offset = 0; offset < buffer.length; ) {
+    const remaining = buffer.length - offset;
+    const size = remaining >= maxChunkBytes2 ? maxChunkBytes2 : remaining;
+    result += encodeChunk2(buffer.slice(offset, offset + size), size);
+    offset += size;
+  }
+  return result;
+}
+
+// src/uuid/index.ts
+var requestIdPrefix = "req_";
+function uuidv7Bytes() {
+  const bytes = new Uint8Array(16);
+  crypto.getRandomValues(bytes);
+  const timestamp = BigInt(Date.now());
+  bytes[0] = Number(timestamp >> 40n & 0xffn);
+  bytes[1] = Number(timestamp >> 32n & 0xffn);
+  bytes[2] = Number(timestamp >> 24n & 0xffn);
+  bytes[3] = Number(timestamp >> 16n & 0xffn);
+  bytes[4] = Number(timestamp >> 8n & 0xffn);
+  bytes[5] = Number(timestamp & 0xffn);
+  const byte6 = bytes[6] ?? 0;
+  const byte8 = bytes[8] ?? 0;
+  bytes[6] = byte6 & 15 | 112;
+  bytes[8] = byte8 & 63 | 128;
+  return bytes;
+}
+function uuidv7() {
+  const bytes = uuidv7Bytes();
+  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
+  return `${hex.slice(0, 4).join("")}-${hex.slice(4, 6).join("")}-${hex.slice(6, 8).join("")}-${hex.slice(8, 10).join("")}-${hex.slice(10).join("")}`;
+}
+function uuidv7base62() {
+  return encodeBase62Lex(uuidv7Bytes());
+}
+function uuidv7base48() {
+  return encodeBase48Lex(uuidv7Bytes());
+}
+function generateRequestId() {
+  return `${requestIdPrefix}${uuidv7base48()}`;
+}
+
+// src/state.ts
+var contextMap = /* @__PURE__ */ new WeakMap();
+var objectMap = /* @__PURE__ */ new WeakMap();
+function bindContext(ctx, state) {
+  contextMap.set(ctx, state);
+}
+function getContextState(ctx) {
+  return contextMap.get(ctx);
+}
+function bindObject(target, state) {
+  objectMap.set(target, state);
+}
+function getContextFromObject(target) {
+  const state = getStateFromObject(target);
+  return state?.context;
+}
+function getStateFromObject(target) {
+  if (!target || typeof target !== "object") {
+    return void 0;
+  }
+  if (objectMap.has(target)) {
+    return objectMap.get(target);
+  }
+  const fallback = findNestedTarget(target);
+  if (fallback && objectMap.has(fallback)) {
+    return objectMap.get(fallback);
+  }
+  return void 0;
+}
+function findNestedTarget(obj) {
+  if (obj.raw && typeof obj.raw === "object") {
+    return obj.raw;
+  }
+  if (obj.req && typeof obj.req === "object") {
+    const req = obj.req;
+    if (req.raw && typeof req.raw === "object") {
+      return req.raw;
+    }
+    return req;
+  }
+  if (obj.request && typeof obj.request === "object") {
+    const request = obj.request;
+    if (request.raw && typeof request.raw === "object") {
+      return request.raw;
+    }
+    return request;
+  }
+  return null;
+}
+
+export {
+  encodeBase64,
+  logWithLevel,
+  sanitizeLogString,
+  sanitizeHeaderValues,
+  makeCapturedBody,
+  uuidv7,
+  uuidv7base62,
+  uuidv7base48,
+  generateRequestId,
+  bindContext,
+  getContextState,
+  bindObject,
+  getContextFromObject
+};
+//# sourceMappingURL=chunk-3ILKJJIG.js.map

package/dist/chunk-3ILKJJIG.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/logger.ts","../src/encoding.ts","../src/request_log.ts","../src/uuid/base48.ts","../src/uuid/base62.ts","../src/uuid/index.ts","../src/state.ts"],"sourcesContent":["import type { Logger, LogLevel } from './types';\n\nconst logLevelOrder: Record<LogLevel, number> = {\n  debug: 10,\n  info: 20,\n  warn: 30,\n  error: 40,\n};\n\nexport function logWithLevel(\n  logger: Logger,\n  level: LogLevel,\n  threshold: LogLevel,\n  message: string,\n  fields?: Record<string, unknown>,\n): void {\n  if (logLevelOrder[level] < logLevelOrder[threshold]) {\n    return;\n  }\n\n  const fn =\n    logger[level] ?? logger.warn ?? logger.info ?? logger.debug ?? logger.error ?? console.log;\n\n  try {\n    fn.call(logger, message, fields);\n  } catch {\n    // Logging should never disrupt instrumentation.\n  }\n}\n","const utf8Decoder =\n  typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { fatal: true }) : null;\nconst utf8DecoderLenient = typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8') : null;\nconst maybeBuffer = (\n  globalThis as typeof globalThis & {\n    Buffer?: { from(data: Uint8Array): { toString(encoding?: string): string } };\n  }\n).Buffer;\n\nexport function encodeBase64(bytes: Uint8Array): string {\n  if (maybeBuffer) {\n    return maybeBuffer.from(bytes).toString('base64');\n  }\n  let binary = '';\n  for (let i = 0; i < bytes.length; i += 1) {\n    const byte = bytes[i];\n    if (byte === undefined) {\n      continue;\n    }\n    binary += String.fromCharCode(byte);\n  }\n  if (typeof btoa !== 'undefined') {\n    return btoa(binary);\n  }\n  return '';\n}\n\nexport function isValidUtf8(bytes: Uint8Array): boolean {\n  if (!utf8Decoder) {\n    return false;\n  }\n  try {\n    utf8Decoder.decode(bytes);\n    return true;\n  } catch {\n    return false;\n  }\n}\n\nexport function decodeUtf8(bytes: Uint8Array): string {\n  if (utf8DecoderLenient) {\n    return utf8DecoderLenient.decode(bytes);\n  }\n  if (maybeBuffer) {\n    return maybeBuffer.from(bytes).toString('utf8');\n  }\n  return '';\n}\n","import type { CapturedBody } from './types';\nimport { decodeUtf8, encodeBase64, isValidUtf8 } from './encoding';\n\n// eslint-disable-next-line no-control-regex\nconst controlChars = /[\\x00-\\x1F\\x7F]/g;\n\nexport function sanitizeLogString(value: string): string {\n  if (!value) {\n    return value;\n  }\n  return value.replace(controlChars, '');\n}\n\nexport function sanitizeHeaderValues(\n  headers: Record<string, string | string[]> | undefined,\n): Record<string, string | string[]> | undefined {\n  if (!headers) {\n    return undefined;\n  }\n\n  const sanitized: Record<string, string | string[]> = {};\n  for (const [key, value] of Object.entries(headers)) {\n    const name = sanitizeLogString(key);\n    if (Array.isArray(value)) {\n      sanitized[name] = value.map((entry) => sanitizeLogString(entry));\n    } else {\n      sanitized[name] = sanitizeLogString(value);\n    }\n  }\n  return sanitized;\n}\n\nexport function makeCapturedBody(\n  bytes: Uint8Array | undefined,\n  totalBytes: number,\n  truncated: boolean,\n  mode: 'text' | 'base64',\n): CapturedBody | undefined {\n  if (!bytes) {\n    return undefined;\n  }\n\n  if (mode === 'base64') {\n    return {\n      bytes: totalBytes,\n      encoding: 'base64',\n      truncated,\n      value: encodeBase64(bytes),\n    };\n  }\n\n  if (isValidUtf8(bytes)) {\n    return {\n      bytes: totalBytes,\n      encoding: 'utf8',\n      truncated,\n      value: decodeUtf8(bytes),\n    };\n  }\n\n  return {\n    bytes: totalBytes,\n    encoding: 'base64',\n    truncated,\n    value: encodeBase64(bytes),\n  };\n}\n","/**\n * Base48 encoding with a vowel-free alphabet to reduce the risk of generating\n * profanity-like substrings in time-ordered identifiers while staying compact.\n * Digits that are commonly read as vowels (0, 1, 3, 4) are excluded to avoid\n * leetspeak-style false positives. The alphabet is ordered by ASCII to preserve\n * lexicographic ordering of fixed-length encodings.\n */\nconst base48AlphabetLex = '256789BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz';\nconst base48Zero = base48AlphabetLex.charAt(0);\nconst base48Regex = /^[256789BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz]*$/;\n\nconst maxChunkBytes = 32;\nconst chunkToEncodedLength = new Map<number, number>();\nconst encodedLengthToChunk = new Map<number, number>();\n\nfor (let size = 1; size <= maxChunkBytes; size += 1) {\n  const encodedLength = Math.ceil((size * 8) / Math.log2(48));\n  chunkToEncodedLength.set(size, encodedLength);\n  encodedLengthToChunk.set(encodedLength, size);\n}\n\nconst maxEncodedChunk = chunkToEncodedLength.get(maxChunkBytes)!;\n\nfunction encodeChunk(bytes: Uint8Array, size: number): string {\n  let value = 0n;\n  for (const byte of bytes) {\n    value = (value << 8n) | BigInt(byte);\n  }\n\n  let encoded = '';\n  if (value === 0n) {\n    encoded = base48Zero;\n  } else {\n    while (value > 0n) {\n      const mod = value % 48n;\n      encoded = base48AlphabetLex[Number(mod)] + encoded;\n      value /= 48n;\n    }\n  }\n\n  const targetLength = chunkToEncodedLength.get(size);\n  if (!targetLength) {\n    throw new Error(`base48: unsupported chunk size ${size}`);\n  }\n  return encoded.padStart(targetLength, base48Zero);\n}\n\nfunction decodeChunk(value: string, size: number): Uint8Array {\n  let n = 0n;\n  for (const char of value) {\n    const index = base48AlphabetLex.indexOf(char);\n    if (index === -1) {\n      throw new Error('base48: invalid character');\n    }\n    n = n * 48n + BigInt(index);\n  }\n\n  const maxValue = 2n ** BigInt(size * 8) - 1n;\n  if (n > maxValue) {\n    throw new Error('base48: invalid length');\n  }\n\n  const buffer = new Uint8Array(size);\n  for (let i = size - 1; i >= 0; i -= 1) {\n    buffer[i] = Number(n & 0xffn);\n    n >>= 8n;\n  }\n  return buffer;\n}\n\nexport function encodeBase48Lex(buffer: Uint8Array): string {\n  if (buffer.length === 0) {\n    return '';\n  }\n\n  let result = '';\n  for (let offset = 0; offset < buffer.length; ) {\n    const remaining = buffer.length - offset;\n    const size = remaining >= maxChunkBytes ? maxChunkBytes : remaining;\n    result += encodeChunk(buffer.slice(offset, offset + size), size);\n    offset += size;\n  }\n  return result;\n}\n\nexport function decodeBase48Lex(value: string): Uint8Array {\n  if (!value) {\n    return new Uint8Array();\n  }\n  if (!base48Regex.test(value)) {\n    throw new Error('base48: invalid string');\n  }\n\n  let totalBytes = 0;\n  for (let offset = 0; offset < value.length; ) {\n    const remaining = value.length - offset;\n    const chunkLength = remaining >= maxEncodedChunk ? maxEncodedChunk : remaining;\n    const size = encodedLengthToChunk.get(chunkLength);\n    if (!size) {\n      throw new Error('base48: invalid length');\n    }\n    totalBytes += size;\n    offset += chunkLength;\n  }\n\n  const result = new Uint8Array(totalBytes);\n  let cursor = 0;\n  for (let offset = 0; offset < value.length; ) {\n    const remaining = value.length - offset;\n    const chunkLength = remaining >= maxEncodedChunk ? maxEncodedChunk : remaining;\n    const size = encodedLengthToChunk.get(chunkLength);\n    if (!size) {\n      throw new Error('base48: invalid length');\n    }\n    const chunk = decodeChunk(value.slice(offset, offset + chunkLength), size);\n    result.set(chunk, cursor);\n    cursor += size;\n    offset += chunkLength;\n  }\n  return result;\n}\n","const base62AlphabetLex = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';\nconst base62Zero = base62AlphabetLex.charAt(0);\nconst base62Regex = /^[0-9A-Za-z]*$/;\n\nconst maxChunkBytes = 32;\nconst chunkToEncodedLength = new Map<number, number>();\nconst encodedLengthToChunk = new Map<number, number>();\n\nfor (let size = 1; size <= maxChunkBytes; size += 1) {\n  const encodedLength = Math.ceil((size * 8) / Math.log2(62));\n  chunkToEncodedLength.set(size, encodedLength);\n  encodedLengthToChunk.set(encodedLength, size);\n}\n\nconst maxEncodedChunk = chunkToEncodedLength.get(maxChunkBytes)!;\n\nfunction encodeChunk(bytes: Uint8Array, size: number): string {\n  let value = 0n;\n  for (const byte of bytes) {\n    value = (value << 8n) | BigInt(byte);\n  }\n\n  let encoded = '';\n  if (value === 0n) {\n    encoded = base62Zero;\n  } else {\n    while (value > 0n) {\n      const mod = value % 62n;\n      encoded = base62AlphabetLex[Number(mod)] + encoded;\n      value /= 62n;\n    }\n  }\n\n  const targetLength = chunkToEncodedLength.get(size);\n  if (!targetLength) {\n    throw new Error(`base62: unsupported chunk size ${size}`);\n  }\n  return encoded.padStart(targetLength, base62Zero);\n}\n\nfunction decodeChunk(value: string, size: number): Uint8Array {\n  let n = 0n;\n  for (const char of value) {\n    const index = base62AlphabetLex.indexOf(char);\n    if (index === -1) {\n      throw new Error('base62: invalid character');\n    }\n    n = n * 62n + BigInt(index);\n  }\n\n  const maxValue = 2n ** BigInt(size * 8) - 1n;\n  if (n > maxValue) {\n    throw new Error('base62: invalid length');\n  }\n\n  const buffer = new Uint8Array(size);\n  for (let i = size - 1; i >= 0; i -= 1) {\n    buffer[i] = Number(n & 0xffn);\n    n >>= 8n;\n  }\n  return buffer;\n}\n\nexport function encodeBase62Lex(buffer: Uint8Array): string {\n  if (buffer.length === 0) {\n    return '';\n  }\n\n  let result = '';\n  for (let offset = 0; offset < buffer.length; ) {\n    const remaining = buffer.length - offset;\n    const size = remaining >= maxChunkBytes ? maxChunkBytes : remaining;\n    result += encodeChunk(buffer.slice(offset, offset + size), size);\n    offset += size;\n  }\n  return result;\n}\n\nexport function decodeBase62Lex(value: string): Uint8Array {\n  if (!value) {\n    return new Uint8Array();\n  }\n  if (!base62Regex.test(value)) {\n    throw new Error('base62: invalid string');\n  }\n\n  let totalBytes = 0;\n  for (let offset = 0; offset < value.length; ) {\n    const remaining = value.length - offset;\n    const chunkLength = remaining >= maxEncodedChunk ? maxEncodedChunk : remaining;\n    const size = encodedLengthToChunk.get(chunkLength);\n    if (!size) {\n      throw new Error('base62: invalid length');\n    }\n    totalBytes += size;\n    offset += chunkLength;\n  }\n\n  const result = new Uint8Array(totalBytes);\n  let cursor = 0;\n  for (let offset = 0; offset < value.length; ) {\n    const remaining = value.length - offset;\n    const chunkLength = remaining >= maxEncodedChunk ? maxEncodedChunk : remaining;\n    const size = encodedLengthToChunk.get(chunkLength);\n    if (!size) {\n      throw new Error('base62: invalid length');\n    }\n    const chunk = decodeChunk(value.slice(offset, offset + chunkLength), size);\n    result.set(chunk, cursor);\n    cursor += size;\n    offset += chunkLength;\n  }\n  return result;\n}\n","import { encodeBase48Lex } from './base48';\nimport { encodeBase62Lex } from './base62';\n\nconst requestIdPrefix = 'req_';\n\nfunction uuidv7Bytes(): Uint8Array {\n  const bytes = new Uint8Array(16);\n  crypto.getRandomValues(bytes);\n\n  // Encode timestamp in first 48 bits\n  const timestamp = BigInt(Date.now());\n  bytes[0] = Number((timestamp >> 40n) & 0xffn);\n  bytes[1] = Number((timestamp >> 32n) & 0xffn);\n  bytes[2] = Number((timestamp >> 24n) & 0xffn);\n  bytes[3] = Number((timestamp >> 16n) & 0xffn);\n  bytes[4] = Number((timestamp >> 8n) & 0xffn);\n  bytes[5] = Number(timestamp & 0xffn);\n\n  // Set version (7) and variant (RFC 4122)\n  const byte6 = bytes[6] ?? 0;\n  const byte8 = bytes[8] ?? 0;\n  bytes[6] = (byte6 & 0x0f) | 0x70;\n  bytes[8] = (byte8 & 0x3f) | 0x80;\n\n  return bytes;\n}\n\n/**\n * Generates a UUIDv7 string.\n * Uses crypto.getRandomValues which is available in all modern JS runtimes\n * (browsers, Node.js 15+, Deno, Bun, Cloudflare Workers, Vercel Edge, etc.)\n */\nexport function uuidv7(): string {\n  const bytes = uuidv7Bytes();\n  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, '0'));\n  return `${hex.slice(0, 4).join('')}-${hex.slice(4, 6).join('')}-${hex.slice(6, 8).join('')}-${hex.slice(8, 10).join('')}-${hex.slice(10).join('')}`;\n}\n\nexport function uuidv7base62(): string {\n  return encodeBase62Lex(uuidv7Bytes());\n}\n\nexport function uuidv7base48(): string {\n  return encodeBase48Lex(uuidv7Bytes());\n}\n\nexport function generateRequestId(): string {\n  return `${requestIdPrefix}${uuidv7base48()}`;\n}\n","import type { Span } from '@opentelemetry/api';\nimport type { AttributeValue, NormalizedRequest, XrayContext } from './types';\nimport type { CaptureConfig, RedactionConfig, ResolvedXrayConfig } from './config';\n\nexport type RequestState = {\n  request: NormalizedRequest;\n  config: ResolvedXrayConfig;\n  span?: Span;\n  context: XrayContext;\n  attributes: Record<string, AttributeValue>;\n  events: Array<{ name: string; attributes?: Record<string, AttributeValue> }>;\n  userId?: string;\n  sessionId?: string;\n  error?: unknown;\n  captureOverride?: Partial<CaptureConfig>;\n  redactionOverride?: Partial<RedactionConfig>;\n};\n\nconst contextMap = new WeakMap<XrayContext, RequestState>();\nconst objectMap = new WeakMap<object, RequestState>();\n\nexport function bindContext(ctx: XrayContext, state: RequestState): void {\n  contextMap.set(ctx, state);\n}\n\nexport function getContextState(ctx: XrayContext): RequestState | undefined {\n  return contextMap.get(ctx);\n}\n\nexport function bindObject(target: object, state: RequestState): void {\n  objectMap.set(target, state);\n}\n\nexport function getContextFromObject(target: unknown): XrayContext | undefined {\n  const state = getStateFromObject(target);\n  return state?.context;\n}\n\nexport function getStateFromObject(target: unknown): RequestState | undefined {\n  if (!target || typeof target !== 'object') {\n    return undefined;\n  }\n  if (objectMap.has(target)) {\n    return objectMap.get(target);\n  }\n\n  const fallback = findNestedTarget(target as Record<string, unknown>);\n  if (fallback && objectMap.has(fallback)) {\n    return objectMap.get(fallback);\n  }\n  return undefined;\n}\n\nfunction findNestedTarget(obj: Record<string, unknown>): object | null {\n  if (obj.raw && typeof obj.raw === 'object') {\n    return obj.raw as object;\n  }\n  if (obj.req && typeof obj.req === 'object') {\n    const req = obj.req as Record<string, unknown>;\n    if (req.raw && typeof req.raw === 'object') {\n      return req.raw as object;\n    }\n    return req as object;\n  }\n  if (obj.request && typeof obj.request === 'object') {\n    const request = obj.request as Record<string, unknown>;\n    if (request.raw && typeof request.raw === 'object') {\n      return request.raw as object;\n    }\n    return request as object;\n  }\n  return null;\n}\n"],"mappings":"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","names":["maxChunkBytes","chunkToEncodedLength","encodedLengthToChunk","maxEncodedChunk","encodeChunk","maxChunkBytes","encodeChunk"]}

package/dist/index.cjs

@@ -141,8 +141,8 @@ function extractParamName(value) {
 var defaultCapture = {
   requestHeaders: true,
   responseHeaders: true,
-  requestBody: "none",
-  responseBody: "none",
+  requestBody: "text",
+  responseBody: "text",
   maxBodyBytes: 65536
 };
 var defaultRedaction = {
@@ -152,8 +152,7 @@ var defaultRedaction = {
   replacement: "[REDACTED]"
 };
 var defaultRequestId = {
-  header: "x-request-id",
-  generate: true
+  header: "request-id"
 };
 var defaultRoute = {
   normalize: true,
@@ -1062,7 +1061,7 @@ function createSpanProcessor(mode, exporter) {
 }
 function sdkVersion() {
   if (true) {
-    return "0.5.1";
+    return "0.7.0";
   }
   return "unknown";
 }
@@ -1071,8 +1070,69 @@ function isNodeRuntime() {
   return !!maybeProcess?.versions?.node;
 }
 
-// src/uuid.ts
-function uuidv7() {
+// src/uuid/base48.ts
+var base48AlphabetLex = "256789BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz";
+var base48Zero = base48AlphabetLex.charAt(0);
+var maxChunkBytes = 32;
+var chunkToEncodedLength = /* @__PURE__ */ new Map();
+var encodedLengthToChunk = /* @__PURE__ */ new Map();
+for (let size = 1; size <= maxChunkBytes; size += 1) {
+  const encodedLength = Math.ceil(size * 8 / Math.log2(48));
+  chunkToEncodedLength.set(size, encodedLength);
+  encodedLengthToChunk.set(encodedLength, size);
+}
+var maxEncodedChunk = chunkToEncodedLength.get(maxChunkBytes);
+function encodeChunk(bytes, size) {
+  let value = 0n;
+  for (const byte of bytes) {
+    value = value << 8n | BigInt(byte);
+  }
+  let encoded = "";
+  if (value === 0n) {
+    encoded = base48Zero;
+  } else {
+    while (value > 0n) {
+      const mod = value % 48n;
+      encoded = base48AlphabetLex[Number(mod)] + encoded;
+      value /= 48n;
+    }
+  }
+  const targetLength = chunkToEncodedLength.get(size);
+  if (!targetLength) {
+    throw new Error(`base48: unsupported chunk size ${size}`);
+  }
+  return encoded.padStart(targetLength, base48Zero);
+}
+function encodeBase48Lex(buffer) {
+  if (buffer.length === 0) {
+    return "";
+  }
+  let result = "";
+  for (let offset = 0; offset < buffer.length; ) {
+    const remaining = buffer.length - offset;
+    const size = remaining >= maxChunkBytes ? maxChunkBytes : remaining;
+    result += encodeChunk(buffer.slice(offset, offset + size), size);
+    offset += size;
+  }
+  return result;
+}
+
+// src/uuid/base62.ts
+var base62AlphabetLex = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+var base62Zero = base62AlphabetLex.charAt(0);
+var maxChunkBytes2 = 32;
+var chunkToEncodedLength2 = /* @__PURE__ */ new Map();
+var encodedLengthToChunk2 = /* @__PURE__ */ new Map();
+for (let size = 1; size <= maxChunkBytes2; size += 1) {
+  const encodedLength = Math.ceil(size * 8 / Math.log2(62));
+  chunkToEncodedLength2.set(size, encodedLength);
+  encodedLengthToChunk2.set(encodedLength, size);
+}
+var maxEncodedChunk2 = chunkToEncodedLength2.get(maxChunkBytes2);
+
+// src/uuid/index.ts
+var requestIdPrefix = "req_";
+function uuidv7Bytes() {
   const bytes = new Uint8Array(16);
   crypto.getRandomValues(bytes);
   const timestamp = BigInt(Date.now());
@@ -1086,8 +1146,13 @@ function uuidv7() {
   const byte8 = bytes[8] ?? 0;
   bytes[6] = byte6 & 15 | 112;
   bytes[8] = byte8 & 63 | 128;
-  const hex = Array.from(bytes, (b) => b.toString(16).padStart(2, "0"));
-  return `${hex.slice(0, 4).join("")}-${hex.slice(4, 6).join("")}-${hex.slice(6, 8).join("")}-${hex.slice(8, 10).join("")}-${hex.slice(10).join("")}`;
+  return bytes;
+}
+function uuidv7base48() {
+  return encodeBase48Lex(uuidv7Bytes());
+}
+function generateRequestId() {
+  return `${requestIdPrefix}${uuidv7base48()}`;
 }
 
 // src/state.ts
@@ -1128,14 +1193,14 @@ function createEmitter(config, exporter) {
 function startRequest(config, tracer, req) {
   const startTimeMs = Number.isFinite(req.startTimeMs) ? req.startTimeMs : Date.now();
   req.startTimeMs = startTimeMs;
-  const requestId = resolveRequestId(config, req.requestId, req.headers);
-  req.requestId = requestId;
+  const explicitRequestId = normalizeRequestIdCandidate(req.requestId);
+  req.requestId = explicitRequestId;
   if (req.route && config.route.normalize) {
     req.route = config.route.normalizer ? config.route.normalizer(req.route) : normalizeRoutePattern(req.route);
   }
   const span = spanFromTracer(tracer, spanNameFromRequest(req));
   const context = {
-    requestId,
+    requestId: explicitRequestId ?? "",
     traceId: span?.spanContext().traceId,
     spanId: span?.spanContext().spanId,
     setUserId: (id) => {
@@ -1214,8 +1279,10 @@ function endRequest(config, ctx, res, err) {
   const endTimeMs = Number.isFinite(res.endTimeMs) ? res.endTimeMs : Date.now();
   res.endTimeMs = endTimeMs;
   if (!state) {
+    const resolvedRequestId2 = resolveFinalRequestId(config, ctx.requestId, res.headers);
+    ctx.requestId = resolvedRequestId2;
     const fallbackLog = {
-      requestId: ctx.requestId,
+      requestId: resolvedRequestId2,
       serviceName: config.serviceName,
       method: res.statusCode ? "UNKNOWN" : "UNKNOWN",
       url: "",
@@ -1226,12 +1293,19 @@ function endRequest(config, ctx, res, err) {
     return fallbackLog;
   }
   const request = state.request;
+  const resolvedRequestId = resolveFinalRequestId(
+    config,
+    request.requestId || ctx.requestId,
+    res.headers
+  );
+  request.requestId = resolvedRequestId;
+  ctx.requestId = resolvedRequestId;
   const capture = resolveCapture(config.capture, state.captureOverride);
   const redaction = resolveRedaction(config.redaction, state.redactionOverride);
   const route = request.route;
   const url = sanitizeLogString(request.url);
   const log = {
-    requestId: request.requestId ?? ctx.requestId,
+    requestId: resolvedRequestId,
     traceId: state.span?.spanContext().traceId,
     spanId: state.span?.spanContext().spanId,
     serviceName: config.serviceName,
@@ -1308,22 +1382,40 @@ function endRequest(config, ctx, res, err) {
   }
   return redacted;
 }
-function resolveRequestId(config, requestId, headers) {
-  if (requestId) {
-    return requestId;
+function resolveFinalRequestId(config, explicitRequestId, responseHeaders) {
+  const explicit = normalizeRequestIdCandidate(explicitRequestId);
+  if (explicit) {
+    return explicit;
   }
-  const headerName = config.requestId.header.toLowerCase();
-  const headerValue = headers[headerName];
+  const headerValue = resolveHeaderRequestId(config.requestId.header, responseHeaders);
   if (headerValue) {
-    const value = Array.isArray(headerValue) ? headerValue[0] : headerValue;
-    if (value && value.trim()) {
-      return value.trim();
+    return headerValue;
+  }
+  return generateRequestId();
+}
+function resolveHeaderRequestId(headerName, headers) {
+  if (!headers) {
+    return void 0;
+  }
+  const target = headerName.toLowerCase();
+  for (const [name, value] of Object.entries(headers)) {
+    if (name.toLowerCase() !== target) {
+      continue;
+    }
+    const entry = Array.isArray(value) ? value[0] : value;
+    const normalized = normalizeRequestIdCandidate(entry);
+    if (normalized) {
+      return normalized;
     }
   }
-  if (!config.requestId.generate) {
-    return "";
+  return void 0;
+}
+function normalizeRequestIdCandidate(value) {
+  if (!value) {
+    return void 0;
   }
-  return uuidv7();
+  const trimmed = value.trim();
+  return trimmed ? trimmed : void 0;
 }
 function resolveCapture(base, override) {
   if (!override) {