@j0hanz/fetch-url-mcp 1.12.9 → 1.12.11

package/dist/http/rate-limit.d.ts

@@ -1,19 +1,22 @@
-import type { ServerResponse } from 'node:http';
+import type { RequestContext } from './native.js';
 interface RateLimitConfig {
     maxRequests: number;
     windowMs: number;
     cleanupIntervalMs: number;
     enabled: boolean;
 }
-interface RequestContextLike {
-    readonly method: string | undefined;
-    readonly ip: string | null;
-    readonly res: ServerResponse;
-}
-export interface RateLimitManagerImpl {
-    check(ctx: RequestContextLike): boolean;
+export declare class RateLimiter {
+    private readonly options;
+    private readonly store;
+    private readonly cleanup;
+    constructor(options: RateLimitConfig);
+    private startCleanupLoop;
+    private cleanupEntries;
+    private resetEntry;
+    private incrementEntry;
+    private createEntry;
+    check(ctx: RequestContext): boolean;
     stop(): void;
 }
-export declare function createRateLimitManagerImpl(options: RateLimitConfig): RateLimitManagerImpl;
 export {};
 //# sourceMappingURL=rate-limit.d.ts.map

package/dist/http/rate-limit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../src/http/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAgBhD,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,UAAU,kBAAkB;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;CAC9B;AAUD,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC;IACxC,IAAI,IAAI,IAAI,CAAC;CACd;AA+FD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,GACvB,oBAAoB,CAGtB"}
+{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../src/http/rate-limit.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAYlD,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CAClB;AAcD,qBAAa,WAAW;IAIV,OAAO,CAAC,QAAQ,CAAC,OAAO;IAHpC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqC;IAC3D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyB;gBAEpB,OAAO,EAAE,eAAe;IAIrD,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;IAQnB,KAAK,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO;IAyCnC,IAAI,IAAI,IAAI;CAGb"}

package/dist/http/rate-limit.js

@@ -1,5 +1,7 @@
+import { ErrorCode } from '@modelcontextprotocol/sdk/types.js';
 import { Loggers, logWarn } from '../lib/core.js';
 import { isAbortError } from '../lib/error/index.js';
+import { sendJsonRpcError } from '../lib/mcp-interop.js';
 import { startAbortableIntervalLoop } from '../lib/utils.js';
 function sendJson(res, status, body) {
     res.statusCode = status;
@@ -8,10 +10,10 @@ function sendJson(res, status, body) {
     res.setHeader('Cache-Control', 'no-store');
     res.end(JSON.stringify(body));
 }
-// ---------------------------------------------------------------------------
-// Rate limiter
-// ---------------------------------------------------------------------------
-class RateLimiter {
+function isMcpEndpoint(pathname) {
+    return pathname === '/mcp' || pathname === '/mcp/';
+}
+export class RateLimiter {
     options;
     store = new Map();
     cleanup = new AbortController();
@@ -80,7 +82,12 @@ class RateLimiter {
             logWarn('Rate limit exceeded', { ip: key }, Loggers.LOG_RATE_LIMIT);
             const retryAfter = Math.max(1, Math.ceil((entry.resetTime - now) / 1000));
             ctx.res.setHeader('Retry-After', String(retryAfter));
-            sendJson(ctx.res, 429, { error: 'Rate limit exceeded', retryAfter });
+            if (isMcpEndpoint(ctx.url.pathname)) {
+                sendJsonRpcError(ctx.res, 429, ErrorCode.InvalidRequest, 'Rate limit exceeded', null, { retryAfter });
+            }
+            else {
+                sendJson(ctx.res, 429, { error: 'Rate limit exceeded', retryAfter });
+            }
             return false;
         }
         return true;
@@ -89,7 +96,3 @@ class RateLimiter {
         this.cleanup.abort();
     }
 }
-export function createRateLimitManagerImpl(options) {
-    const limiter = new RateLimiter(options);
-    return limiter;
-}

package/dist/lib/config.d.ts

@@ -16,6 +16,7 @@ interface AuthConfig {
     revocationUrl: URL | undefined;
     registrationUrl: URL | undefined;
     introspectionUrl: URL | undefined;
+    publicBaseUrl: URL | undefined;
     resourceUrl: URL;
     requiredScopes: string[];
     clientId: string | undefined;

package/dist/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AA4CA,eAAO,MAAM,aAAa,EAAE,MAA2C,CAAC;AAIxE,MAAM,MAAM,QAAQ,GAChB,OAAO,GACP,MAAM,GACN,QAAQ,GACR,MAAM,GACN,OAAO,GACP,UAAU,CAAC;AAkCf,KAAK,mBAAmB,GAAG,SAAS,GAAG,SAAS,CAAC;AACjD,KAAK,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;AAqQnC,UAAU,oBAAoB;IAC5B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAyCD,UAAU,UAAU;IAClB,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,GAAG,GAAG,SAAS,CAAC;IAC3B,gBAAgB,EAAE,GAAG,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC;IAC1B,aAAa,EAAE,GAAG,GAAG,SAAS,CAAC;IAC/B,eAAe,EAAE,GAAG,GAAG,SAAS,CAAC;IACjC,gBAAgB,EAAE,GAAG,GAAG,SAAS,CAAC;IAClC,WAAW,EAAE,GAAG,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAqGD,UAAU,YAAY;IACpB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAQD,UAAU,mBAAmB;IAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,kBAAkB,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,4BAA4B,EAAE,OAAO,CAAC;IACtC,2BAA2B,EAAE,OAAO,CAAC;CACtC;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,mBAAmB,CAAC;CAC3B;AAuCD,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAWD,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,mBAAmB,CAAC;IAChC,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,CAAC;CACxD;AAkBD,UAAU,cAAc;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB,EAAE,OAAO,CAAC;IACjC,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAmBD,UAAU,qBAAqB;IAC7B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AA2BD,UAAU,wBAAwB;IAChC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B;AAiBD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8ClB,CAAC;AAEF,wBAAgB,cAAc,IAAI,IAAI,CAErC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}

package/dist/lib/config.js

@@ -4,7 +4,7 @@ import { isIP } from 'node:net';
 import process from 'node:process';
 import { domainToASCII } from 'node:url';
 import { z } from 'zod';
-import { getErrorMessage } from './error/index.js';
+import { getErrorMessage } from './error/classes.js';
 // ── Version ─────────────────────────────────────────────────────────
 function getObjectProperty(value, key) {
     return value[key];
@@ -297,7 +297,8 @@ function buildAuthConfig(baseUrl) {
     const revocationUrl = parseUrl('OAUTH_REVOCATION_URL');
     const registrationUrl = parseUrl('OAUTH_REGISTRATION_URL');
     const introspectionUrl = parseUrl('OAUTH_INTROSPECTION_URL');
-    const resourceUrl = new URL('/mcp', baseUrl);
+    const publicBaseUrl = parseUrl('PUBLIC_BASE_URL');
+    const resourceUrl = new URL('/mcp', publicBaseUrl ?? baseUrl);
     const oauthConfigured = issuerUrl !== undefined ||
         authorizationUrl !== undefined ||
         tokenUrl !== undefined ||
@@ -313,6 +314,7 @@ function buildAuthConfig(baseUrl) {
         revocationUrl,
         registrationUrl,
         introspectionUrl,
+        publicBaseUrl,
         resourceUrl,
         requiredScopes: EnvParser.list(env['OAUTH_REQUIRED_SCOPES']),
         clientId: env['OAUTH_CLIENT_ID'],

package/dist/lib/core.d.ts

@@ -1,10 +1,18 @@
 import { type McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import type { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 type LogMetadata = Record<string, unknown>;
+export interface TraceContext {
+    readonly traceparent?: string;
+    readonly tracestate?: string;
+    readonly baggage?: string;
+}
 interface RequestContext {
     readonly requestId: string;
     readonly sessionId?: string;
     readonly operationId?: string;
+    readonly traceparent?: string;
+    readonly tracestate?: string;
+    readonly baggage?: string;
 }
 export declare function setMcpServer(server: McpServer): void;
 export declare function registerMcpSessionServer(sessionId: string, server: McpServer): void;
@@ -14,15 +22,17 @@ export declare function unregisterMcpSessionServerByServer(server: McpServer): v
 export declare function resolveMcpSessionOwnerKey(sessionId: string): string | undefined;
 export declare function resolveMcpSessionIdByServer(server: McpServer): string | undefined;
 export declare function runWithRequestContext<T>(context: RequestContext, fn: () => T): T;
+export declare function extractTraceContext(meta: unknown): TraceContext | undefined;
+export declare function runWithTraceContext<T>(meta: unknown, fn: () => T): T;
 export declare function getRequestId(): string | undefined;
 export declare function getSessionId(): string | undefined;
 export declare function getOperationId(): string | undefined;
+export declare function getTraceContext(): TraceContext | undefined;
 export declare function logInfo(message: string, meta?: LogMetadata, logger?: string): void;
 export declare function logDebug(message: string, meta?: LogMetadata, logger?: string): void;
 export declare function logNotice(message: string, meta?: LogMetadata, logger?: string): void;
 export declare function logWarn(message: string, meta?: LogMetadata, logger?: string): void;
 export declare function logError(message: string, error?: Error | LogMetadata, logger?: string): void;
-export declare function logCritical(message: string, error?: Error | LogMetadata, logger?: string): void;
 export declare function setLogLevel(level: string, sessionId?: string): void;
 export declare function redactUrl(rawUrl: string): string;
 export declare function startSessionCleanupLoop(store: SessionStore, sessionTtlMs: number, options?: {

package/dist/lib/core.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/lib/core.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../src/lib/core.ts"],"names":[],"mappings":"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"}

package/dist/lib/core.js

@@ -1,9 +1,10 @@
 import {} from '@modelcontextprotocol/sdk/server/mcp.js';
 import { AsyncLocalStorage } from 'node:async_hooks';
+import { randomUUID } from 'node:crypto';
 import process from 'node:process';
 import { getSystemErrorMessage, inspect, stripVTControlCharacters, } from 'node:util';
 import { config } from './config.js';
-import { getErrorMessage, isAbortError } from './error/index.js';
+import { getErrorMessage, isAbortError } from './error/classes.js';
 import { startAbortableIntervalLoop } from './utils.js';
 const requestContext = new AsyncLocalStorage({
     name: 'requestContext',
@@ -33,6 +34,18 @@ process.stderr.on('error', () => {
         }
     }, 5_000).unref();
 });
+function clearSessionTracking(sessionId) {
+    sessionServers.delete(sessionId);
+    sessionOwnerKeys.delete(sessionId);
+    sessionMcpLogLevels.delete(sessionId);
+}
+function findSessionIdByServer(server) {
+    for (const [sessionId, mappedServer] of sessionServers.entries()) {
+        if (mappedServer === server)
+            return sessionId;
+    }
+    return undefined;
+}
 export function setMcpServer(server) {
     if (mcpServer) {
         logWarn('setMcpServer called when server already set — overwriting');
@@ -52,32 +65,61 @@ export function registerMcpSessionOwnerKey(sessionId, ownerKey) {
 export function unregisterMcpSessionServer(sessionId) {
     if (!sessionId)
         return;
-    sessionServers.delete(sessionId);
-    sessionOwnerKeys.delete(sessionId);
-    sessionMcpLogLevels.delete(sessionId);
+    clearSessionTracking(sessionId);
 }
 export function unregisterMcpSessionServerByServer(server) {
     for (const [sessionId, mappedServer] of sessionServers.entries()) {
         if (mappedServer !== server)
             continue;
-        sessionServers.delete(sessionId);
-        sessionOwnerKeys.delete(sessionId);
-        sessionMcpLogLevels.delete(sessionId);
+        clearSessionTracking(sessionId);
     }
 }
 export function resolveMcpSessionOwnerKey(sessionId) {
     return sessionOwnerKeys.get(sessionId);
 }
 export function resolveMcpSessionIdByServer(server) {
-    for (const [sessionId, mappedServer] of sessionServers.entries()) {
-        if (mappedServer === server)
-            return sessionId;
-    }
-    return undefined;
+    return findSessionIdByServer(server);
 }
 export function runWithRequestContext(context, fn) {
     return requestContext.run(context, fn);
 }
+function isTraceContextValue(value) {
+    return typeof value === 'string' && value.trim().length > 0;
+}
+export function extractTraceContext(meta) {
+    if (meta === null || typeof meta !== 'object' || Array.isArray(meta)) {
+        return undefined;
+    }
+    const traceMeta = meta;
+    const traceparent = isTraceContextValue(traceMeta['traceparent'])
+        ? traceMeta['traceparent']
+        : undefined;
+    const tracestate = isTraceContextValue(traceMeta['tracestate'])
+        ? traceMeta['tracestate']
+        : undefined;
+    const baggage = isTraceContextValue(traceMeta['baggage'])
+        ? traceMeta['baggage']
+        : undefined;
+    if (!traceparent && !tracestate && !baggage)
+        return undefined;
+    return {
+        ...(traceparent ? { traceparent } : {}),
+        ...(tracestate ? { tracestate } : {}),
+        ...(baggage ? { baggage } : {}),
+    };
+}
+export function runWithTraceContext(meta, fn) {
+    const traceContext = extractTraceContext(meta);
+    if (!traceContext)
+        return fn();
+    const existing = getRequestContext();
+    return runWithRequestContext({
+        requestId: existing?.requestId ?? randomUUID(),
+        ...(existing?.sessionId ? { sessionId: existing.sessionId } : {}),
+        ...(existing?.operationId ? { operationId: existing.operationId } : {}),
+        ...traceContext,
+    }, fn);
+}
 function getRequestContext() {
     return requestContext.getStore();
 }
@@ -91,18 +133,29 @@ export function getSessionId() {
 export function getOperationId() {
     return getRequestContext()?.operationId;
 }
+export function getTraceContext() {
+    const context = getRequestContext();
+    if (!context)
+        return undefined;
+    const { traceparent, tracestate, baggage } = context;
+    if (!traceparent && !tracestate && !baggage)
+        return undefined;
+    return {
+        ...(traceparent ? { traceparent } : {}),
+        ...(tracestate ? { tracestate } : {}),
+        ...(baggage ? { baggage } : {}),
+    };
+}
 function isDebugEnabled() {
     return config.logging.level === 'debug';
 }
-function mergeMetadata(meta) {
-    const ctx = requestContext.getStore();
-    const hasMeta = meta && Object.keys(meta).length > 0;
+function buildContextMetadata(ctx) {
     if (!ctx)
-        return hasMeta ? meta : undefined;
+        return undefined;
     const { requestId, operationId, sessionId } = ctx;
     const includeSession = sessionId && isDebugEnabled();
     if (!requestId && !operationId && !includeSession)
-        return hasMeta ? meta : undefined;
+        return undefined;
     const contextMeta = {};
     if (requestId)
         contextMeta['requestId'] = requestId;
@@ -110,7 +163,16 @@ function mergeMetadata(meta) {
         contextMeta['operationId'] = operationId;
     if (includeSession)
         contextMeta['sessionId'] = sessionId;
-    return hasMeta ? { ...contextMeta, ...meta } : contextMeta;
+    return contextMeta;
+}
+function mergeMetadata(meta) {
+    const ctxMeta = buildContextMetadata(getRequestContext());
+    const hasMeta = meta && Object.keys(meta).length > 0;
+    if (!ctxMeta)
+        return hasMeta ? meta : undefined;
+    if (!hasMeta)
+        return ctxMeta;
+    return { ...ctxMeta, ...meta };
 }
 function isUrlLikeKey(key) {
     const normalized = key
@@ -134,11 +196,61 @@ function redactUrlValue(value) {
     }
     return redactUrl(value);
 }
-function sanitizeLogValue(value, options) {
-    const { includeStack, depth = 0, seen = new WeakSet(), key, } = options;
-    if (depth >= LOG_METADATA_MAX_DEPTH) {
-        return '[truncated]';
+function extractErrorCode(value, sanitized) {
+    if (!('code' in value))
+        return;
+    const errorCode = value.code;
+    if (typeof errorCode === 'string' || typeof errorCode === 'number') {
+        sanitized['code'] = errorCode;
+    }
+}
+function extractSysError(value, sanitized) {
+    if (!('errno' in value) || typeof value.errno !== 'number')
+        return;
+    try {
+        const sysMsg = getSystemErrorMessage(value.errno);
+        if (sysMsg)
+            sanitized['sysError'] = sysMsg;
+    }
+    catch {
+        // ignore
+    }
+}
+function sanitizeErrorForLog(value, includeStack) {
+    const sanitized = {
+        error: value.message,
+        ...(value.name && value.name !== 'Error' ? { errorName: value.name } : {}),
+    };
+    extractErrorCode(value, sanitized);
+    extractSysError(value, sanitized);
+    if (includeStack && value.stack) {
+        sanitized['stack'] = value.stack;
+    }
+    return sanitized;
+}
+function sanitizeObjectForLog(value, options) {
+    if (options.seen.has(value))
+        return '[circular]';
+    options.seen.add(value);
+    const sanitized = {};
+    for (const [entryKey, entryValue] of Object.entries(value)) {
+        if (isSensitiveKey(entryKey) &&
+            (!options.includeStack || entryKey.toLowerCase() !== 'stack')) {
+            continue;
+        }
+        const normalized = sanitizeLogValue(entryValue, {
+            includeStack: options.includeStack,
+            depth: options.depth + 1,
+            seen: options.seen,
+            key: entryKey,
+        });
+        if (normalized !== undefined) {
+            sanitized[entryKey] = normalized;
+        }
     }
+    return sanitized;
+}
+function sanitizePrimitiveOrString(value, key) {
     if (value === null ||
         typeof value === 'number' ||
         typeof value === 'boolean') {
@@ -147,37 +259,16 @@ function sanitizeLogValue(value, options) {
     if (typeof value === 'string') {
         return key && isUrlLikeKey(key) ? redactUrlValue(value) : value;
     }
+    return undefined; // Not a primitive/string we handle directly here
+}
+function sanitizeComplexValue(value, options) {
+    const { includeStack, depth = 0, seen = new WeakSet() } = options;
     if (typeof value === 'bigint')
         return value.toString();
     if (value instanceof URL)
         return redactUrl(value.toString());
     if (value instanceof Error) {
-        const sanitized = {
-            error: value.message,
-            ...(value.name && value.name !== 'Error'
-                ? { errorName: value.name }
-                : {}),
-        };
-        if ('code' in value) {
-            const errorCode = value.code;
-            if (typeof errorCode === 'string' || typeof errorCode === 'number') {
-                sanitized['code'] = errorCode;
-            }
-        }
-        if ('errno' in value && typeof value.errno === 'number') {
-            try {
-                const sysMsg = getSystemErrorMessage(value.errno);
-                if (sysMsg)
-                    sanitized['sysError'] = sysMsg;
-            }
-            catch {
-                // ignore
-            }
-        }
-        if (includeStack && value.stack) {
-            sanitized['stack'] = value.stack;
-        }
-        return sanitized;
+        return sanitizeErrorForLog(value, includeStack);
     }
     if (Array.isArray(value)) {
         return value
@@ -185,29 +276,22 @@ function sanitizeLogValue(value, options) {
             .filter((entry) => entry !== undefined);
     }
     if (isPlainLogObject(value)) {
-        if (seen.has(value))
-            return '[circular]';
-        seen.add(value);
-        const sanitized = {};
-        for (const [entryKey, entryValue] of Object.entries(value)) {
-            if (isSensitiveKey(entryKey) &&
-                (!includeStack || entryKey.toLowerCase() !== 'stack')) {
-                continue;
-            }
-            const normalized = sanitizeLogValue(entryValue, {
-                includeStack,
-                depth: depth + 1,
-                seen,
-                key: entryKey,
-            });
-            if (normalized !== undefined) {
-                sanitized[entryKey] = normalized;
-            }
-        }
-        return sanitized;
+        return sanitizeObjectForLog(value, { includeStack, depth, seen });
     }
     return undefined;
 }
+function sanitizeLogValue(value, options) {
+    const { depth = 0, key } = options;
+    if (depth >= LOG_METADATA_MAX_DEPTH) {
+        return '[truncated]';
+    }
+    const primitive = sanitizePrimitiveOrString(value, key);
+    if (primitive !== undefined || value === undefined)
+        return primitive;
+    if (value === null)
+        return null;
+    return sanitizeComplexValue(value, options);
+}
 function sanitizeLogMetadata(meta, options) {
     if (!meta || Object.keys(meta).length === 0)
         return undefined;
@@ -297,23 +381,23 @@ function shouldForwardMcpLog(level, sessionId) {
     return (MCP_LOG_LEVEL_PRIORITY[emittedLevel] <=
         MCP_LOG_LEVEL_PRIORITY[configuredLevel]);
 }
-function resolveErrorText(err) {
-    if (err instanceof Error) {
-        if ('errno' in err && typeof err.errno === 'number') {
-            try {
-                const sysMsg = getSystemErrorMessage(err.errno);
-                if (sysMsg)
-                    return `${err.message} (${sysMsg})`;
-            }
-            catch {
-                // ignore
-            }
-        }
-        return err.message;
+function resolveErrorSysMsg(err) {
+    if (!('errno' in err) || typeof err.errno !== 'number')
+        return undefined;
+    try {
+        return getSystemErrorMessage(err.errno);
     }
+    catch {
+        return undefined;
+    }
+}
+function resolveErrorText(err) {
     if (typeof err === 'string')
         return err;
-    return 'unknown error';
+    if (!(err instanceof Error))
+        return 'unknown error';
+    const sysMsg = resolveErrorSysMsg(err);
+    return sysMsg ? `${err.message} (${sysMsg})` : err.message;
 }
 const MCP_LOG_SENSITIVE_PATTERNS = [
     'password',
@@ -477,10 +561,6 @@ export function logError(message, error, logger) {
     const errorMeta = error instanceof Error ? formatErrorMeta(error) : (error ?? {});
     writeLog('error', message, errorMeta, logger);
 }
-export function logCritical(message, error, logger) {
-    const errorMeta = error instanceof Error ? formatErrorMeta(error) : (error ?? {});
-    writeLog('critical', message, errorMeta, logger);
-}
 export function setLogLevel(level, sessionId) {
     const normalized = normalizeLogLevel(level);
     if (!normalized)

package/dist/lib/error/classes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classes.d.ts","sourceRoot":"","sources":["../../../src/lib/error/classes.ts"],"names":[],"mappings":"AAWA,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,KAAK,CAQtD;AAMD,qBAAa,UAAW,SAAQ,KAAK;IAOjC,QAAQ,CAAC,GAAG,EAAE,MAAM;IANtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAGlD,OAAO,EAAE,MAAM,EACN,GAAG,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,OAAO,CAAC,EAAE,YAAY;CAezB;AAED,qBAAa,UAAW,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACV,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAKlE;AAID,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,cAAc,CAK5E;AAMD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAsBtD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAE7C;AAID,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ,IAAI,CAYN;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,CAMvE"}
+{"version":3,"file":"classes.d.ts","sourceRoot":"","sources":["../../../src/lib/error/classes.ts"],"names":[],"mappings":"AAcA,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,KAAK,CAQtD;AAMD,qBAAa,UAAW,SAAQ,KAAK;IAOjC,QAAQ,CAAC,GAAG,EAAE,MAAM;IANtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;gBAGlD,OAAO,EAAE,MAAM,EACN,GAAG,EAAE,MAAM,EACpB,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,OAAO,CAAC,EAAE,YAAY;CAezB;AAED,qBAAa,UAAW,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACV,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAKlE;AAID,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAEpD;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,cAAc,CAK5E;AAMD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAsBtD;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAE7C;AAID,wBAAgB,cAAc,CAC5B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ,IAAI,CAYN;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,CAMvE"}

package/dist/lib/error/classes.js

@@ -1,6 +1,8 @@
 import { inspect } from 'node:util';
-import { isObject } from '../utils.js';
 import { SystemErrors } from './codes.js';
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
 export function isError(value) {
     const maybeIsError = Error.isError;
     if (typeof maybeIsError === 'function') {
@@ -62,7 +64,7 @@ export function getErrorMessage(error) {
         return error.message;
     if (typeof error === 'string' && error.length > 0)
         return error;
-    if (isObject(error) &&
+    if (isRecord(error) &&
         typeof error['message'] === 'string' &&
         error['message'].length > 0) {
         return error['message'];

package/dist/lib/error/classify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/lib/error/classify.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AA4JtB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,MAAM,EACX,eAAe,SAAqB,GACnC,iBAAiB,CAInB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,iBAAiB,CAuCnB"}
+{"version":3,"file":"classify.d.ts","sourceRoot":"","sources":["../../../src/lib/error/classify.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,KAAK,gBAAgB,EAErB,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AA+JtB,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,EACd,GAAG,EAAE,MAAM,EACX,eAAe,SAAqB,GACnC,iBAAiB,CAInB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,EACd,IAAI,EAAE,gBAAgB,EACtB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,GACtB,iBAAiB,CAuCnB"}

package/dist/lib/error/classify.js

@@ -18,17 +18,20 @@ function buildUpstreamHttpMessage(error) {
     }
     return `An error occurred when communicating with the target URL.`;
 }
-function mapFetchToolError(error, fallbackUrl) {
+function resolveFetchErrorCode(error) {
     const { code: detailsCode, reason } = error.details;
-    let { code } = error;
-    if (typeof detailsCode === 'string') {
-        code = detailsCode;
-    }
-    else if (reason === SystemErrors.QUEUE_FULL) {
-        code = SystemErrors.QUEUE_FULL;
-    }
+    if (typeof detailsCode === 'string')
+        return detailsCode;
+    if (reason === SystemErrors.QUEUE_FULL)
+        return SystemErrors.QUEUE_FULL;
+    return error.code;
+}
+function mapFetchToolError(error, fallbackUrl) {
+    const { reason } = error.details;
+    const code = resolveFetchErrorCode(error);
     const url = error.url || fallbackUrl;
     const details = sanitizeToolErrorDetails(error.details);
+    const detailsSpread = details ? { details } : {};
     if (reason === 'timeout') {
         return {
             error: 'The request to the target timed out.',
@@ -37,7 +40,7 @@ function mapFetchToolError(error, fallbackUrl) {
             code,
             statusCode: error.statusCode,
             upstreamMessage: error.message,
-            ...(details ? { details } : {}),
+            ...detailsSpread,
         };
     }
     if (reason === 'aborted') {
@@ -48,7 +51,7 @@ function mapFetchToolError(error, fallbackUrl) {
             code,
             statusCode: error.statusCode,
             upstreamMessage: error.message,
-            ...(details ? { details } : {}),
+            ...detailsSpread,
         };
     }
     if (reason === SystemErrors.QUEUE_FULL) {
@@ -58,21 +61,22 @@ function mapFetchToolError(error, fallbackUrl) {
             category: ErrorCategory.QUEUE_FULL,
             code,
             statusCode: error.statusCode,
-            ...(details ? { details } : {}),
+            ...detailsSpread,
         };
     }
     const isRealHttpError = typeof error.details['httpStatus'] === 'number';
     if (isRealHttpError && error.statusCode >= 400) {
+        const category = error.statusCode === 429
+            ? ErrorCategory.UPSTREAM_RATE_LIMITED
+            : ErrorCategory.UPSTREAM_HTTP_ERROR;
         return {
             error: buildUpstreamHttpMessage(error),
             url,
-            category: error.statusCode === 429
-                ? ErrorCategory.UPSTREAM_RATE_LIMITED
-                : ErrorCategory.UPSTREAM_HTTP_ERROR,
+            category,
             code,
             statusCode: error.statusCode,
             upstreamMessage: error.message,
-            ...(details ? { details } : {}),
+            ...detailsSpread,
         };
     }
     return {
@@ -81,7 +85,7 @@ function mapFetchToolError(error, fallbackUrl) {
         category: ErrorCategory.FETCH_ERROR,
         code,
         statusCode: error.statusCode,
-        ...(details ? { details } : {}),
+        ...detailsSpread,
     };
 }
 function mapGenericToolError(error, url, fallbackMessage) {