@j0hanz/superfetch 2.0.1 → 2.1.0

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { parseArgs } from 'node:util';
-import { logError } from './services/logger.js';
-import { startHttpServer } from './http/server.js';
-import { startStdioServer } from './server.js';
+import { startHttpServer } from './http.js';
+import { startStdioServer } from './mcp.js';
+import { logError } from './observability.js';
 const { values } = parseArgs({
     options: {
         stdio: { type: 'boolean', default: false },

package/dist/mcp.d.ts

@@ -0,0 +1,3 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export declare function createMcpServer(): McpServer;
+export declare function startStdioServer(): Promise<void>;

package/dist/mcp.js

@@ -0,0 +1,94 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { registerCachedContentResource } from './cache.js';
+import { config } from './config.js';
+import { destroyAgents } from './fetch.js';
+import { logError, logInfo } from './observability.js';
+import { registerTools } from './tools.js';
+import { shutdownTransformWorkerPool } from './transform.js';
+function createServerInfo() {
+    return {
+        name: config.server.name,
+        version: config.server.version,
+    };
+}
+function createServerCapabilities() {
+    return {
+        tools: { listChanged: false },
+        resources: { listChanged: true, subscribe: true },
+        logging: {},
+    };
+}
+function createServerInstructions(serverVersion) {
+    return `superFetch MCP server |${serverVersion}| A high-performance web content fetching and processing server.`;
+}
+export function createMcpServer() {
+    const server = new McpServer(createServerInfo(), {
+        capabilities: createServerCapabilities(),
+        instructions: createServerInstructions(config.server.version),
+    });
+    registerTools(server);
+    registerCachedContentResource(server);
+    return server;
+}
+function attachServerErrorHandler(server) {
+    server.server.onerror = (error) => {
+        logError('[MCP Error]', error instanceof Error ? error : { error });
+    };
+}
+function handleShutdownSignal(server, signal) {
+    process.stderr.write(`\n${signal} received, shutting down superFetch MCP server...\n`);
+    Promise.resolve()
+        .then(async () => {
+        destroyAgents();
+        await shutdownTransformWorkerPool();
+        await server.close();
+    })
+        .catch((err) => {
+        logError('Error during shutdown', err instanceof Error ? err : undefined);
+    })
+        .finally(() => {
+        process.exit(0);
+    });
+}
+function createShutdownHandler(server) {
+    let shuttingDown = false;
+    let initialSignal = null;
+    return (signal) => {
+        if (shuttingDown) {
+            logInfo('Shutdown already in progress; ignoring signal', {
+                signal,
+                initialSignal,
+            });
+            return;
+        }
+        shuttingDown = true;
+        initialSignal = signal;
+        handleShutdownSignal(server, signal);
+    };
+}
+function registerSignalHandlers(handler) {
+    process.once('SIGINT', () => {
+        handler('SIGINT');
+    });
+    process.once('SIGTERM', () => {
+        handler('SIGTERM');
+    });
+}
+async function connectStdioServer(server, transport) {
+    try {
+        await server.connect(transport);
+        logInfo('superFetch MCP server running on stdio');
+    }
+    catch (error) {
+        logError('Failed to start stdio server', error instanceof Error ? error : undefined);
+        process.exit(1);
+    }
+}
+export async function startStdioServer() {
+    const server = createMcpServer();
+    const transport = new StdioServerTransport();
+    attachServerErrorHandler(server);
+    registerSignalHandlers(createShutdownHandler(server));
+    await connectStdioServer(server, transport);
+}

package/dist/observability.d.ts

@@ -0,0 +1,16 @@
+export type LogMetadata = Record<string, unknown>;
+interface RequestContext {
+    readonly requestId: string;
+    readonly sessionId?: string;
+    readonly operationId?: string;
+}
+export declare function runWithRequestContext<T>(context: RequestContext, fn: () => T): T;
+export declare function getRequestId(): string | undefined;
+export declare function getSessionId(): string | undefined;
+export declare function getOperationId(): string | undefined;
+export declare function logInfo(message: string, meta?: LogMetadata): void;
+export declare function logDebug(message: string, meta?: LogMetadata): void;
+export declare function logWarn(message: string, meta?: LogMetadata): void;
+export declare function logError(message: string, error?: Error | LogMetadata): void;
+export declare function redactUrl(rawUrl: string): string;
+export {};

package/dist/observability.js

@@ -0,0 +1,78 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { config } from './config.js';
+const requestContext = new AsyncLocalStorage();
+export function runWithRequestContext(context, fn) {
+    return requestContext.run(context, fn);
+}
+export function getRequestId() {
+    return requestContext.getStore()?.requestId;
+}
+export function getSessionId() {
+    return requestContext.getStore()?.sessionId;
+}
+export function getOperationId() {
+    return requestContext.getStore()?.operationId;
+}
+function formatMetadata(meta) {
+    const requestId = getRequestId();
+    const sessionId = getSessionId();
+    const operationId = getOperationId();
+    const contextMeta = {};
+    if (requestId)
+        contextMeta.requestId = requestId;
+    if (sessionId)
+        contextMeta.sessionId = sessionId;
+    if (operationId)
+        contextMeta.operationId = operationId;
+    const merged = { ...contextMeta, ...meta };
+    return Object.keys(merged).length > 0 ? ` ${JSON.stringify(merged)}` : '';
+}
+function createTimestamp() {
+    return new Date().toISOString();
+}
+function formatLogEntry(level, message, meta) {
+    return `[${createTimestamp()}] ${level.toUpperCase()}: ${message}${formatMetadata(meta)}`;
+}
+function shouldLog(level) {
+    // Debug logs only when LOG_LEVEL=debug
+    if (level === 'debug')
+        return config.logging.level === 'debug';
+    // All other levels always log
+    return true;
+}
+export function logInfo(message, meta) {
+    if (shouldLog('info')) {
+        process.stderr.write(`${formatLogEntry('info', message, meta)}\n`);
+    }
+}
+export function logDebug(message, meta) {
+    if (shouldLog('debug')) {
+        process.stderr.write(`${formatLogEntry('debug', message, meta)}\n`);
+    }
+}
+export function logWarn(message, meta) {
+    if (shouldLog('warn')) {
+        process.stderr.write(`${formatLogEntry('warn', message, meta)}\n`);
+    }
+}
+export function logError(message, error) {
+    if (!shouldLog('error'))
+        return;
+    const errorMeta = error instanceof Error
+        ? { error: error.message, stack: error.stack }
+        : (error ?? {});
+    process.stderr.write(`${formatLogEntry('error', message, errorMeta)}\n`);
+}
+export function redactUrl(rawUrl) {
+    try {
+        const url = new URL(rawUrl);
+        url.username = '';
+        url.password = '';
+        url.hash = '';
+        url.search = '';
+        return url.toString();
+    }
+    catch {
+        return rawUrl;
+    }
+}

package/dist/server.js

@@ -3,6 +3,7 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { config } from './config/index.js';
 import { destroyAgents } from './services/fetcher.js';
 import { logError, logInfo } from './services/logger.js';
+import { shutdownTransformWorkerPool } from './services/transform-worker-pool.js';
 import { registerTools } from './tools/index.js';
 import { registerCachedContentResource } from './resources/cached-content.js';
 function createServerInfo() {
@@ -37,9 +38,12 @@ function attachServerErrorHandler(server) {
 }
 function handleShutdownSignal(server, signal) {
     process.stderr.write(`\n${signal} received, shutting down superFetch MCP server...\n`);
-    destroyAgents();
-    server
-        .close()
+    Promise.resolve()
+        .then(async () => {
+        destroyAgents();
+        await shutdownTransformWorkerPool();
+        await server.close();
+    })
         .catch((err) => {
         logError('Error during shutdown', err instanceof Error ? err : undefined);
     })
@@ -48,15 +52,26 @@ function handleShutdownSignal(server, signal) {
     });
 }
 function createShutdownHandler(server) {
+    let shuttingDown = false;
+    let initialSignal = null;
     return (signal) => {
+        if (shuttingDown) {
+            logInfo('Shutdown already in progress; ignoring signal', {
+                signal,
+                initialSignal,
+            });
+            return;
+        }
+        shuttingDown = true;
+        initialSignal = signal;
         handleShutdownSignal(server, signal);
     };
 }
 function registerSignalHandlers(handler) {
-    process.on('SIGINT', () => {
+    process.once('SIGINT', () => {
         handler('SIGINT');
     });
-    process.on('SIGTERM', () => {
+    process.once('SIGTERM', () => {
         handler('SIGTERM');
     });
 }

package/dist/services/cache.d.ts

@@ -1,5 +1,5 @@
 import type { CacheEntry } from '../config/types/content.js';
-export interface CacheUpdateEvent {
+interface CacheUpdateEvent {
     cacheKey: string;
     namespace: string;
     urlHash: string;

package/dist/services/context.d.ts

@@ -1,8 +1,10 @@
 interface RequestContext {
     readonly requestId: string;
     readonly sessionId?: string;
+    readonly operationId?: string;
 }
 export declare function runWithRequestContext<T>(context: RequestContext, fn: () => T): T;
 export declare function getRequestId(): string | undefined;
 export declare function getSessionId(): string | undefined;
+export declare function getOperationId(): string | undefined;
 export {};

package/dist/services/context.js

@@ -9,3 +9,6 @@ export function getRequestId() {
 export function getSessionId() {
     return requestContext.getStore()?.sessionId;
 }
+export function getOperationId() {
+    return requestContext.getStore()?.operationId;
+}

package/dist/services/extractor.d.ts

@@ -1,4 +1,5 @@
 import type { ExtractionResult } from '../config/types/content.js';
 export declare function extractContent(html: string, url: string, options?: {
     extractArticle?: boolean;
+    signal?: AbortSignal;
 }): ExtractionResult;

package/dist/services/extractor.js

@@ -1,10 +1,13 @@
 import { parseHTML } from 'linkedom';
 import { Readability } from '@mozilla/readability';
+import { FetchError } from '../errors/app-error.js';
+import { throwIfAborted } from '../utils/cancellation.js';
 import { getErrorMessage } from '../utils/error-details.js';
 import { isRecord } from '../utils/guards.js';
 import { truncateHtml } from '../utils/html-truncator.js';
 import { logError, logInfo, logWarn } from './logger.js';
 import { extractMetadata } from './metadata-collector.js';
+import { endTransformStage, startTransformStage } from './telemetry.js';
 function isReadabilityCompatible(doc) {
     if (!isRecord(doc))
         return false;
@@ -64,7 +67,9 @@ function addOptionalField(target, key, value) {
         return;
     target[key] = value;
 }
-export function extractContent(html, url, options = { extractArticle: true }) {
+export function extractContent(html, url, options = {
+    extractArticle: true,
+}) {
     if (!isValidInput(html, url)) {
         return { article: null, metadata: {} };
     }
@@ -72,15 +77,36 @@ export function extractContent(html, url, options = { extractArticle: true }) {
 }
 function tryExtractContent(html, url, options) {
     try {
+        throwIfAborted(options.signal, url, 'extract:begin');
+        const parseStage = startTransformStage(url, 'extract:parse');
         const { document } = parseHTML(truncateHtml(html));
+        endTransformStage(parseStage);
+        throwIfAborted(options.signal, url, 'extract:parsed');
         applyBaseUri(document, url);
+        const metadataStage = startTransformStage(url, 'extract:metadata');
         const metadata = extractMetadata(document);
+        endTransformStage(metadataStage);
+        throwIfAborted(options.signal, url, 'extract:metadata');
+        let article;
+        if (options.extractArticle) {
+            const articleStage = startTransformStage(url, 'extract:article');
+            article = resolveArticleExtraction(document, options.extractArticle);
+            endTransformStage(articleStage);
+        }
+        else {
+            article = null;
+        }
+        throwIfAborted(options.signal, url, 'extract:article');
         return {
-            article: resolveArticleExtraction(document, options.extractArticle),
+            article,
             metadata,
         };
     }
     catch (error) {
+        if (error instanceof FetchError) {
+            throw error;
+        }
+        throwIfAborted(options.signal, url, 'extract:error');
         logError('Failed to extract content', error instanceof Error ? error : undefined);
         return { article: null, metadata: {} };
     }

package/dist/services/fetcher.d.ts

@@ -7,6 +7,8 @@ interface FetchTelemetryContext {
     startTime: number;
     url: string;
     method: string;
+    contextRequestId?: string;
+    operationId?: string;
 }
 export declare function startFetchTelemetry(url: string, method: string): FetchTelemetryContext;
 export declare function recordFetchResponse(context: FetchTelemetryContext, response: Response, contentSize?: number): void;

package/dist/services/fetcher.js

@@ -8,7 +8,9 @@ import { config } from '../config/index.js';
 import { FetchError } from '../errors/app-error.js';
 import { createErrorWithCode, isSystemError } from '../utils/error-details.js';
 import { isRecord } from '../utils/guards.js';
+import { redactUrl } from '../utils/url-redactor.js';
 import { isBlockedIp, validateAndNormalizeUrl, } from '../utils/url-validator.js';
+import { getOperationId, getRequestId } from './context.js';
 import { logDebug, logError, logWarn } from './logger.js';
 const DNS_LOOKUP_TIMEOUT_MS = 5000;
 function normalizeLookupResults(addresses, family) {
@@ -241,19 +243,6 @@ function mapFetchError(error, fallbackUrl, timeoutMs) {
     return createUnknownError(url, 'Unexpected error');
 }
 const fetchChannel = diagnosticsChannel.channel('superfetch.fetch');
-function redactUrl(rawUrl) {
-    try {
-        const url = new URL(rawUrl);
-        url.username = '';
-        url.password = '';
-        url.hash = '';
-        url.search = '';
-        return url.toString();
-    }
-    catch {
-        return rawUrl;
-    }
-}
 function publishFetchEvent(event) {
     if (!fetchChannel.hasSubscribers)
         return;
@@ -266,11 +255,15 @@ function publishFetchEvent(event) {
 }
 export function startFetchTelemetry(url, method) {
     const safeUrl = redactUrl(url);
+    const contextRequestId = getRequestId();
+    const operationId = getOperationId();
     const context = {
         requestId: randomUUID(),
         startTime: performance.now(),
         url: safeUrl,
         method: method.toUpperCase(),
+        ...(contextRequestId ? { contextRequestId } : {}),
+        ...(operationId ? { operationId } : {}),
     };
     publishFetchEvent({
         v: 1,
@@ -278,11 +271,19 @@ export function startFetchTelemetry(url, method) {
         requestId: context.requestId,
         method: context.method,
         url: context.url,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
     });
     logDebug('HTTP Request', {
         requestId: context.requestId,
         method: context.method,
         url: context.url,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
     });
     return context;
 }
@@ -295,6 +296,10 @@ export function recordFetchResponse(context, response, contentSize) {
         requestId: context.requestId,
         status: response.status,
         duration,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
     });
     const contentType = response.headers.get('content-type');
     const contentLength = response.headers.get('content-length') ??
@@ -304,6 +309,10 @@ export function recordFetchResponse(context, response, contentSize) {
         status: response.status,
         url: context.url,
         duration: durationLabel,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
         ...(contentType ? { contentType } : {}),
         ...(contentLength ? { size: contentLength } : {}),
     });
@@ -312,6 +321,10 @@ export function recordFetchResponse(context, response, contentSize) {
             requestId: context.requestId,
             url: context.url,
             duration: durationLabel,
+            ...(context.contextRequestId
+                ? { contextRequestId: context.contextRequestId }
+                : {}),
+            ...(context.operationId ? { operationId: context.operationId } : {}),
         });
     }
 }
@@ -325,6 +338,10 @@ export function recordFetchError(context, error, status) {
         url: context.url,
         error: err.message,
         duration,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
     };
     const code = isSystemError(err) ? err.code : undefined;
     if (code !== undefined) {
@@ -341,6 +358,10 @@ export function recordFetchError(context, error, status) {
         status,
         code,
         error: err.message,
+        ...(context.contextRequestId
+            ? { contextRequestId: context.contextRequestId }
+            : {}),
+        ...(context.operationId ? { operationId: context.operationId } : {}),
     });
 }
 const REDIRECT_STATUSES = new Set([301, 302, 303, 307, 308]);
@@ -520,7 +541,7 @@ const DEFAULT_HEADERS = {
     Connection: 'keep-alive',
 };
 function buildHeaders() {
-    return DEFAULT_HEADERS;
+    return { ...DEFAULT_HEADERS };
 }
 function buildRequestSignal(timeoutMs, external) {
     const timeoutSignal = AbortSignal.timeout(timeoutMs);

package/dist/services/logger.js

@@ -1,13 +1,16 @@
 import { config } from '../config/index.js';
-import { getRequestId, getSessionId } from './context.js';
+import { getOperationId, getRequestId, getSessionId } from './context.js';
 function formatMetadata(meta) {
     const requestId = getRequestId();
     const sessionId = getSessionId();
+    const operationId = getOperationId();
     const contextMeta = {};
     if (requestId)
         contextMeta.requestId = requestId;
     if (sessionId)
         contextMeta.sessionId = sessionId;
+    if (operationId)
+        contextMeta.operationId = operationId;
     const merged = { ...contextMeta, ...meta };
     return Object.keys(merged).length > 0 ? ` ${JSON.stringify(merged)}` : '';
 }

package/dist/services/telemetry.d.ts

@@ -0,0 +1,19 @@
+export interface TransformStageEvent {
+    v: 1;
+    type: 'stage';
+    stage: string;
+    durationMs: number;
+    url: string;
+    requestId?: string;
+    operationId?: string;
+    truncated?: boolean;
+}
+export interface TransformStageContext {
+    readonly stage: string;
+    readonly startTime: number;
+    readonly url: string;
+}
+export declare function startTransformStage(url: string, stage: string): TransformStageContext | null;
+export declare function endTransformStage(context: TransformStageContext | null, options?: {
+    truncated?: boolean;
+}): void;

package/dist/services/telemetry.js

@@ -0,0 +1,43 @@
+import diagnosticsChannel from 'node:diagnostics_channel';
+import { performance } from 'node:perf_hooks';
+import { redactUrl } from '../utils/url-redactor.js';
+import { getOperationId, getRequestId } from './context.js';
+const transformChannel = diagnosticsChannel.channel('superfetch.transform');
+function publishTransformEvent(event) {
+    if (!transformChannel.hasSubscribers)
+        return;
+    try {
+        transformChannel.publish(event);
+    }
+    catch {
+        // Avoid crashing the publisher if a subscriber throws.
+    }
+}
+export function startTransformStage(url, stage) {
+    if (!transformChannel.hasSubscribers)
+        return null;
+    return {
+        stage,
+        startTime: performance.now(),
+        url: redactUrl(url),
+    };
+}
+export function endTransformStage(context, options) {
+    if (!context)
+        return;
+    const requestId = getRequestId();
+    const operationId = getOperationId();
+    const event = {
+        v: 1,
+        type: 'stage',
+        stage: context.stage,
+        durationMs: performance.now() - context.startTime,
+        url: context.url,
+        ...(requestId ? { requestId } : {}),
+        ...(operationId ? { operationId } : {}),
+        ...(options?.truncated !== undefined
+            ? { truncated: options.truncated }
+            : {}),
+    };
+    publishTransformEvent(event);
+}

package/dist/services/transform-worker-pool.d.ts

@@ -1,4 +1,11 @@
 import type { MarkdownTransformResult } from '../config/types/content.js';
-import type { WorkerTransformRequest } from './transform-worker-types.js';
-export declare function transformInWorker(request: Omit<WorkerTransformRequest, 'id'>, signal?: AbortSignal): Promise<MarkdownTransformResult>;
-export declare function destroyTransformWorkers(): Promise<void>;
+interface TransformWorkerPool {
+    transform(html: string, url: string, options: {
+        includeMetadata: boolean;
+        signal?: AbortSignal;
+    }): Promise<MarkdownTransformResult>;
+    close(): Promise<void>;
+}
+export declare function getOrCreateTransformWorkerPool(): TransformWorkerPool;
+export declare function shutdownTransformWorkerPool(): Promise<void>;
+export {};