@j0hanz/fetch-url-mcp 1.11.4 → 1.11.5

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

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/lib/http.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAQhD,OAAO,EAAE,KAAK,EAAmB,MAAM,QAAQ,CAAC;AAehD,OAAO,EAOL,KAAK,eAAe,EAGrB,MAAM,UAAU,CAAC;AAsElB,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,SAAQ,GAChB,MAAM,CAIR;AAkBD,wBAAgB,cAAc,CAC5B,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,IAAI,CA6CN;AA8yCD,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AA4JD,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA6ND,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AACD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAEA;AACD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AACD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AACD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AACD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,qBAAqB,CAEvB;AACD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAEN;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAEN;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAE7D;AACD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASzC;AACD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,CAEjB;AACD,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAED"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/lib/http.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAQhD,OAAO,EAAE,KAAK,EAAmB,MAAM,QAAQ,CAAC;AAehD,OAAO,EAOL,KAAK,eAAe,EAGrB,MAAM,UAAU,CAAC;AAsElB,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,KAAK,CAAC,EAAE,MAAM,EACd,YAAY,CAAC,EAAE,MAAM,EACrB,SAAS,SAAQ,GAChB,MAAM,CAIR;AAkBD,wBAAgB,cAAc,CAC5B,GAAG,EAAE,cAAc,EACnB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,IAAI,CA6CN;AAkvCD,UAAU,qBAAqB;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAoKD,UAAU,YAAY;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA6ND,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAE/C;AACD,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAEA;AACD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AACD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAE9D;AACD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAExD;AACD,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,qBAAqB,CAEvB;AACD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,IAAI,CAEN;AACD,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,MAAM,GACd,IAAI,CAEN;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,EACjB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAE7D;AACD,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,WAAW,EACpB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CASzC;AACD,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,MAAM,CAAC,CAEjB;AACD,wBAAsB,wBAAwB,CAC5C,aAAa,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC;IACT,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAED"}

package/dist/lib/http.js

@@ -3,7 +3,7 @@ import { hash, randomUUID } from 'node:crypto';
 import diagnosticsChannel from 'node:diagnostics_channel';
 import {} from 'node:http';
 import { posix as pathPosix } from 'node:path';
-import { PassThrough, Readable, Transform } from 'node:stream';
+import { PassThrough, Readable } from 'node:stream';
 import { finished, pipeline } from 'node:stream/promises';
 import {} from 'node:stream/web';
 import tls from 'node:tls';
@@ -671,13 +671,14 @@ function createUnsupportedContentEncodingError(url, encodingHeader) {
     });
 }
 function createDecompressor(encoding) {
+    const options = { chunkSize: 64 * 1024 };
     switch (encoding) {
         case 'gzip':
-            return createGunzip();
+            return createGunzip(options);
         case 'deflate':
-            return createInflate();
+            return createInflate(options);
         case 'br':
-            return createBrotliDecompress();
+            return createBrotliDecompress(options);
     }
 }
 function createPumpedStream(initialChunk, reader) {
@@ -800,86 +801,6 @@ async function decodeResponseIfNeeded(response, url, signal) {
 // ═══════════════════════════════════════════════════════════════════
 // RESPONSE READING
 // ═══════════════════════════════════════════════════════════════════
-function concatUint8Arrays(chunks, totalLength) {
-    const result = new Uint8Array(totalLength);
-    let offset = 0;
-    for (const chunk of chunks) {
-        result.set(chunk, offset);
-        offset += chunk.byteLength;
-    }
-    return result;
-}
-class BoundedBufferTransform extends Transform {
-    byteLimit;
-    captureChunks;
-    url;
-    declaredEncoding;
-    total = 0;
-    chunks = [];
-    effectiveEncoding;
-    encodingResolved = false;
-    firstChunk = true;
-    constructor(byteLimit, captureChunks, url, declaredEncoding) {
-        super();
-        this.byteLimit = byteLimit;
-        this.captureChunks = captureChunks;
-        this.url = url;
-        this.declaredEncoding = declaredEncoding;
-        this.effectiveEncoding = declaredEncoding ?? 'utf-8';
-    }
-    _transform(chunk, _encoding, callback) {
-        try {
-            const buf = chunk instanceof Uint8Array
-                ? chunk
-                : new Uint8Array(chunk);
-            this.resolveChunkEncoding(buf);
-            const binaryError = this.detectBinaryContent(buf);
-            if (binaryError) {
-                callback(binaryError);
-                return;
-            }
-            this.enforceByteLimit(buf, callback);
-        }
-        catch (error) {
-            callback(toError(error));
-        }
-    }
-    resolveChunkEncoding(buf) {
-        if (this.encodingResolved)
-            return;
-        this.encodingResolved = true;
-        this.effectiveEncoding = resolveEncoding(this.declaredEncoding, buf);
-    }
-    detectBinaryContent(buf) {
-        const isFirst = this.firstChunk;
-        this.firstChunk = false;
-        if ((isFirst && hasBinarySignature(buf)) ||
-            (!isUnicodeWideEncoding(this.effectiveEncoding) &&
-                hasNullByte(buf, BINARY_NULL_CHECK_LIMIT))) {
-            return createBinaryContentError(this.url);
-        }
-        return null;
-    }
-    enforceByteLimit(buf, callback) {
-        const newTotal = this.total + buf.length;
-        if (newTotal > this.byteLimit) {
-            const remaining = this.byteLimit - this.total;
-            if (remaining > 0) {
-                const slice = buf.subarray(0, remaining);
-                this.total += remaining;
-                if (this.captureChunks)
-                    this.chunks.push(slice);
-                this.push(slice);
-            }
-            callback(new MaxBytesError());
-            return;
-        }
-        this.total = newTotal;
-        if (this.captureChunks)
-            this.chunks.push(buf);
-        callback(null, buf);
-    }
-}
 function assertNonBinaryContent(buffer, encoding, url) {
     if (isBinaryContent(buffer, encoding)) {
         throw createBinaryContentError(url);
@@ -935,20 +856,53 @@ class ResponseTextReader {
         const byteLimit = maxBytes <= 0 ? Number.POSITIVE_INFINITY : maxBytes;
         const captureChunks = byteLimit !== Number.POSITIVE_INFINITY;
         const source = Readable.fromWeb(toNodeReadableStream(stream, url, 'response:read-stream-buffer'));
-        const guard = new BoundedBufferTransform(byteLimit, captureChunks, url, encoding);
         const chunks = [];
+        let total = 0;
+        let effectiveEncoding = encoding ?? 'utf-8';
+        let encodingResolved = false;
+        let firstChunk = true;
+        async function* guard(sourceIterable) {
+            for await (const chunk of sourceIterable) {
+                const buf = chunk instanceof Uint8Array
+                    ? chunk
+                    : new Uint8Array(chunk);
+                if (!encodingResolved) {
+                    encodingResolved = true;
+                    effectiveEncoding = resolveEncoding(encoding, buf);
+                }
+                if ((firstChunk && hasBinarySignature(buf)) ||
+                    (!isUnicodeWideEncoding(effectiveEncoding) &&
+                        hasNullByte(buf, BINARY_NULL_CHECK_LIMIT))) {
+                    throw createBinaryContentError(url);
+                }
+                firstChunk = false;
+                const newTotal = total + buf.length;
+                if (newTotal > byteLimit) {
+                    const remaining = byteLimit - total;
+                    if (remaining > 0) {
+                        const slice = buf.subarray(0, remaining);
+                        total += remaining;
+                        yield slice;
+                    }
+                    throw new MaxBytesError();
+                }
+                total = newTotal;
+                yield buf;
+            }
+        }
         try {
             await pipeline(source, guard, async (iterable) => {
                 for await (const chunk of iterable) {
-                    chunks.push(chunk);
+                    if (captureChunks)
+                        chunks.push(chunk);
                 }
             }, 
             // Only pass `{ signal }` if signal exists to avoid type errors with exactOptionalPropertyTypes
             ...(signal ? [{ signal }] : []));
             return {
-                buffer: concatUint8Arrays(chunks, guard.total),
-                encoding: guard.effectiveEncoding,
-                size: guard.total,
+                buffer: Buffer.concat(chunks, total),
+                encoding: effectiveEncoding,
+                size: total,
                 truncated: false,
             };
         }
@@ -960,9 +914,9 @@ class ResponseTextReader {
                 throw error;
             if (error instanceof MaxBytesError) {
                 return {
-                    buffer: concatUint8Arrays(guard.chunks, guard.total),
-                    encoding: guard.effectiveEncoding,
-                    size: guard.total,
+                    buffer: Buffer.concat(chunks, total),
+                    encoding: effectiveEncoding,
+                    size: total,
                     truncated: true,
                 };
             }
@@ -1024,7 +978,7 @@ function toWebReadableStream(stream, url, stage) {
     assertReadableStreamLike(converted, url, stage);
     return converted;
 }
-const fetchChannel = diagnosticsChannel.channel('fetch-url-mcp.fetch');
+const fetchChannels = diagnosticsChannel.tracingChannel('fetch-url-mcp.fetch');
 const SLOW_REQUEST_THRESHOLD_MS = 5000;
 class FetchTelemetry {
     logger;
@@ -1061,14 +1015,21 @@ class FetchTelemetry {
         if (operationId)
             ctx.operationId = operationId;
         const fields = this.contextFields(ctx);
-        this.publish({
+        const event = {
             v: 1,
-            type: 'start',
             requestId: ctx.requestId,
             method: ctx.method,
             url: ctx.url,
             ...fields,
-        });
+        };
+        if (fetchChannels.hasSubscribers) {
+            try {
+                fetchChannels.start.publish(event);
+            }
+            catch {
+                // Best-effort telemetry; never crash request path.
+            }
+        }
         this.logger.debug('HTTP Request', {
             requestId: ctx.requestId,
             method: ctx.method,
@@ -1081,14 +1042,21 @@ class FetchTelemetry {
         const duration = performance.now() - context.startTime;
         const durationLabel = `${Math.round(duration)}ms`;
         const fields = this.contextFields(context);
-        this.publish({
+        const event = {
             v: 1,
-            type: 'end',
             requestId: context.requestId,
             status: response.status,
             duration,
             ...fields,
-        });
+        };
+        if (fetchChannels.hasSubscribers) {
+            try {
+                fetchChannels.end.publish(event);
+            }
+            catch {
+                // Best-effort telemetry; never crash request path.
+            }
+        }
         const contentType = response.headers.get('content-type') ?? undefined;
         const contentLengthHeader = response.headers.get('content-length');
         const size = contentLengthHeader ??
@@ -1116,9 +1084,8 @@ class FetchTelemetry {
         const err = toError(error);
         const code = isSystemError(err) ? err.code : undefined;
         const fields = this.contextFields(context);
-        this.publish({
+        const event = {
             v: 1,
-            type: 'error',
             requestId: context.requestId,
             url: context.url,
             error: err.message,
@@ -1126,7 +1093,15 @@ class FetchTelemetry {
             ...(code !== undefined ? { code } : {}),
             ...(status !== undefined ? { status } : {}),
             ...fields,
-        });
+        };
+        if (fetchChannels.hasSubscribers) {
+            try {
+                fetchChannels.error.publish(event);
+            }
+            catch {
+                // Best-effort telemetry; never crash request path.
+            }
+        }
         const logData = {
             requestId: context.requestId,
             url: context.url,
@@ -1141,16 +1116,6 @@ class FetchTelemetry {
         }
         this.logger.error('HTTP Request Error', logData);
     }
-    publish(event) {
-        if (!fetchChannel.hasSubscribers)
-            return;
-        try {
-            fetchChannel.publish(event);
-        }
-        catch {
-            // Best-effort telemetry; never crash request path.
-        }
-    }
 }
 const defaultLogger = {
     debug: logDebug,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@j0hanz/fetch-url-mcp",
-  "version": "1.11.4",
+  "version": "1.11.5",
   "mcpName": "io.github.j0hanz/fetch-url-mcp",
   "description": "A web content fetcher MCP server that converts HTML to clean, AI and human readable markdown.",
   "type": "module",