@j0hanz/superfetch 1.1.2 → 1.1.3

package/dist/tools/handlers/fetch-links/link-extractor.js

@@ -0,0 +1,163 @@
+import * as cheerio from 'cheerio';
+import safeRegex from 'safe-regex';
+import { createToolErrorResponse } from '../../../utils/tool-error-handler.js';
+import { isInternalUrl } from '../../../utils/url-validator.js';
+function isLinkAllowed(type, options) {
+    const allowed = {
+        internal: options.includeInternal,
+        external: options.includeExternal,
+        image: options.includeImages,
+    };
+    return allowed[type];
+}
+function matchesFilter(url, filterPattern) {
+    if (!filterPattern)
+        return true;
+    return filterPattern.test(url);
+}
+function evaluateLink(link, options, seen) {
+    if (seen.has(link.href)) {
+        return { accepted: false, filtered: false };
+    }
+    if (!matchesFilter(link.href, options.filterPattern)) {
+        return { accepted: false, filtered: true };
+    }
+    if (!isLinkAllowed(link.type, options)) {
+        return { accepted: false, filtered: true };
+    }
+    return { accepted: true, filtered: false };
+}
+export function resolveFilterPattern(pattern, url) {
+    if (!pattern)
+        return undefined;
+    const lengthError = validatePatternLength(pattern, url);
+    if (lengthError)
+        return lengthError;
+    const filterPattern = buildFilterRegex(pattern, url);
+    if (isToolResponseBase(filterPattern))
+        return filterPattern;
+    const safetyError = validatePatternSafety(filterPattern, url);
+    if (safetyError)
+        return safetyError;
+    return filterPattern;
+}
+function validatePatternLength(pattern, url) {
+    if (pattern.length <= 200)
+        return null;
+    return createToolErrorResponse('Filter pattern too long (max 200 characters)', url, 'VALIDATION_ERROR');
+}
+function buildFilterRegex(pattern, url) {
+    try {
+        return new RegExp(pattern, 'i');
+    }
+    catch {
+        return createToolErrorResponse(`Invalid filter pattern: ${pattern}`, url, 'VALIDATION_ERROR');
+    }
+}
+function validatePatternSafety(pattern, url) {
+    if (safeRegex(pattern))
+        return null;
+    return createToolErrorResponse('Filter pattern is unsafe (potential catastrophic backtracking)', url, 'VALIDATION_ERROR');
+}
+function isToolResponseBase(value) {
+    return (value !== null &&
+        typeof value === 'object' &&
+        'content' in value &&
+        Array.isArray(value.content));
+}
+function tryResolveUrl(href, baseUrl) {
+    if (!URL.canParse(href, baseUrl)) {
+        return null;
+    }
+    return new URL(href, baseUrl).href;
+}
+function buildLinkType(url, baseUrl) {
+    return isInternalUrl(url, baseUrl) ? 'internal' : 'external';
+}
+function isSkippableHref(href) {
+    return href.startsWith('#') || href.startsWith('javascript:');
+}
+function getAnchorHref($, el) {
+    const href = $(el).attr('href');
+    if (!href)
+        return null;
+    if (isSkippableHref(href))
+        return null;
+    return href;
+}
+function resolveAnchorLink($, el, baseUrl) {
+    const href = getAnchorHref($, el);
+    if (!href)
+        return null;
+    const url = tryResolveUrl(href, baseUrl);
+    if (!url)
+        return null;
+    return {
+        href: url,
+        text: $(el).text().trim() || url,
+        type: buildLinkType(url, baseUrl),
+    };
+}
+function resolveImageLink($, el, baseUrl) {
+    const src = $(el).attr('src');
+    if (!src || src.startsWith('data:'))
+        return null;
+    const url = tryResolveUrl(src, baseUrl);
+    if (!url)
+        return null;
+    return {
+        href: url,
+        text: $(el).attr('alt')?.trim() ?? url,
+        type: 'image',
+    };
+}
+function collectAnchorLinks($, baseUrl, options, seen, links) {
+    let filtered = 0;
+    $('a[href]').each((_, el) => {
+        const link = resolveAnchorLink($, el, baseUrl);
+        if (!link)
+            return;
+        const result = evaluateLink(link, options, seen);
+        if (result.filtered)
+            filtered += 1;
+        if (!result.accepted)
+            return;
+        seen.add(link.href);
+        links.push(link);
+    });
+    return filtered;
+}
+function collectImageLinks($, baseUrl, options, seen, links) {
+    if (!options.includeImages)
+        return 0;
+    let filtered = 0;
+    $('img[src]').each((_, el) => {
+        const link = resolveImageLink($, el, baseUrl);
+        if (!link)
+            return;
+        const result = evaluateLink(link, options, seen);
+        if (result.filtered)
+            filtered += 1;
+        if (!result.accepted)
+            return;
+        seen.add(link.href);
+        links.push(link);
+    });
+    return filtered;
+}
+export function extractLinks(html, baseUrl, options) {
+    const $ = cheerio.load(html);
+    const links = [];
+    const seen = new Set();
+    let filtered = collectAnchorLinks($, baseUrl, options, seen, links);
+    filtered += collectImageLinks($, baseUrl, options, seen, links);
+    const truncated = options.maxLinks ? links.length > options.maxLinks : false;
+    const resultLinks = truncated ? links.slice(0, options.maxLinks) : links;
+    return {
+        links: resultLinks,
+        linkCount: resultLinks.length,
+        filtered,
+        truncated,
+    };
+}
+//# sourceMappingURL=link-extractor.js.map

package/dist/tools/handlers/fetch-links/link-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"link-extractor.js","sourceRoot":"","sources":["../../../../src/tools/handlers/fetch-links/link-extractor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,SAAS,MAAM,YAAY,CAAC;AAUnC,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE,SAAS,aAAa,CAAC,IAAc,EAAE,OAA4B;IACjE,MAAM,OAAO,GAA8B;QACzC,QAAQ,EAAE,OAAO,CAAC,eAAe;QACjC,QAAQ,EAAE,OAAO,CAAC,eAAe;QACjC,KAAK,EAAE,OAAO,CAAC,aAAa;KAC7B,CAAC;IACF,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,aAAa,CACpB,GAAW,EACX,aAAiC;IAEjC,IAAI,CAAC,aAAa;QAAE,OAAO,IAAI,CAAC;IAChC,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,YAAY,CACnB,IAAmB,EACnB,OAA4B,EAC5B,IAAiB;IAEjB,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QACvC,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,OAA2B,EAC3B,GAAW;IAEX,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAC;IAE/B,MAAM,WAAW,GAAG,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACxD,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IAEpC,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACrD,IAAI,kBAAkB,CAAC,aAAa,CAAC;QAAE,OAAO,aAAa,CAAC;IAE5D,MAAM,WAAW,GAAG,qBAAqB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC9D,IAAI,WAAW;QAAE,OAAO,WAAW,CAAC;IAEpC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAe,EACf,GAAW;IAEX,IAAI,OAAO,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,uBAAuB,CAC5B,8CAA8C,EAC9C,GAAG,EACH,kBAAkB,CACnB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,OAAe,EACf,GAAW;IAEX,IAAI,CAAC;QACH,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,uBAAuB,CAC5B,2BAA2B,OAAO,EAAE,EACpC,GAAG,EACH,kBAAkB,CACnB,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAC5B,OAAe,EACf,GAAW;IAEX,IAAI,SAAS,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,OAAO,uBAAuB,CAC5B,gEAAgE,EAChE,GAAG,EACH,kBAAkB,CACnB,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,CACL,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,SAAS,IAAI,KAAK;QAClB,KAAK,CAAC,OAAO,CAAE,KAA0B,CAAC,OAAO,CAAC,CACnD,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,OAAe;IAClD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;AACrC,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,OAAe;IACjD,OAAO,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC;AAC/D,CAAC;AAED,SAAS,eAAe,CAAC,IAAY;IACnC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AAChE,CAAC;AAED,SAAS,aAAa,CAAC,CAAqB,EAAE,EAAW;IACvD,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,eAAe,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CACxB,CAAqB,EACrB,EAAW,EACX,OAAe;IAEf,MAAM,IAAI,GAAG,aAAa,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,MAAM,GAAG,GAAG,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAEtB,OAAO;QACL,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG;QAChC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,CAAqB,EACrB,EAAW,EACX,OAAe;IAEf,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjD,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAEtB,OAAO;QACL,IAAI,EAAE,GAAG;QACT,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG;QACtC,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,CAAqB,EACrB,OAAe,EACf,OAA4B,EAC5B,IAAiB,EACjB,KAAsB;IAEtB,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;QAC1B,MAAM,IAAI,GAAG,iBAAiB,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,QAAQ;YAAE,QAAQ,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO;QAE7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,iBAAiB,CACxB,CAAqB,EACrB,OAAe,EACf,OAA4B,EAC5B,IAAiB,EACjB,KAAsB;IAEtB,IAAI,CAAC,OAAO,CAAC,aAAa;QAAE,OAAO,CAAC,CAAC;IAErC,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;QAC3B,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,MAAM,CAAC,QAAQ;YAAE,QAAQ,IAAI,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO;QAE7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAY,EACZ,OAAe,EACf,OAA4B;IAE5B,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,IAAI,QAAQ,GAAG,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IACpE,QAAQ,IAAI,iBAAiB,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAEhE,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;IAC7E,MAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAEzE,OAAO;QACL,KAAK,EAAE,WAAW;QAClB,SAAS,EAAE,WAAW,CAAC,MAAM;QAC7B,QAAQ;QACR,SAAS;KACV,CAAC;AACJ,CAAC"}

package/dist/tools/handlers/fetch-links.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-links.tool.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-links.tool.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAGV,eAAe,EAGf,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAW/B,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,4BAA4B,uIAC6F,CAAC;AAqFvI,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,CAwE3B"}
+{"version":3,"file":"fetch-links.tool.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-links.tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,eAAe,EAGf,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAgB/B,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,4BAA4B,uIAC6F,CAAC;AAiEvI,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,GACrB,OAAO,CAAC,gBAAgB,CAAC,CAU3B"}

package/dist/tools/handlers/fetch-links.tool.js

@@ -1,138 +1,100 @@
-import * as cheerio from 'cheerio';
 import { logDebug, logError } from '../../services/logger.js';
 import { createToolErrorResponse, handleToolError, } from '../../utils/tool-error-handler.js';
-import { isInternalUrl } from '../../utils/url-validator.js';
+import { appendHeaderVary } from '../utils/cache-vary.js';
 import { executeFetchPipeline } from '../utils/fetch-pipeline.js';
+import { extractLinks, resolveFilterPattern, } from './fetch-links/link-extractor.js';
 export const FETCH_LINKS_TOOL_NAME = 'fetch-links';
 export const FETCH_LINKS_TOOL_DESCRIPTION = 'Extracts all hyperlinks from a webpage with anchor text and type classification. Supports filtering, image links, and link limits.';
-function tryResolveUrl(href, baseUrl) {
-    try {
-        return new URL(href, baseUrl).href;
-    }
-    catch {
-        return null;
-    }
+function isRecord(value) {
+    return value !== null && typeof value === 'object';
 }
-function shouldIncludeLink(type, url, options, seen) {
-    if (seen.has(url))
+function isToolResponseBase(value) {
+    if (!isRecord(value))
         return false;
-    if (options.filterPattern && !options.filterPattern.test(url))
+    if (!('content' in value))
         return false;
-    if (type === 'internal' && !options.includeInternal)
-        return false;
-    if (type === 'external' && !options.includeExternal)
-        return false;
-    return true;
+    return Array.isArray(value.content);
 }
-function extractLinks(html, baseUrl, options) {
-    const $ = cheerio.load(html);
-    const links = [];
-    const seen = new Set();
-    let filtered = 0;
-    $('a[href]').each((_, el) => {
-        const href = $(el).attr('href');
-        if (!href || href.startsWith('#') || href.startsWith('javascript:'))
-            return;
-        const url = tryResolveUrl(href, baseUrl);
-        if (!url)
-            return;
-        const type = isInternalUrl(url, baseUrl)
-            ? 'internal'
-            : 'external';
-        if (!shouldIncludeLink(type, url, options, seen)) {
-            if (!seen.has(url))
-                filtered++;
-            return;
-        }
-        seen.add(url);
-        links.push({ href: url, text: $(el).text().trim() || url, type });
+function logFetchLinksStart(url, options, filterPattern) {
+    logDebug('Extracting links', {
+        url,
+        ...options,
+        filterPattern,
     });
-    if (options.includeImages) {
-        $('img[src]').each((_, el) => {
-            const src = $(el).attr('src');
-            if (!src || src.startsWith('data:'))
-                return;
-            const url = tryResolveUrl(src, baseUrl);
-            if (!url)
-                return;
-            if (!shouldIncludeLink('image', url, options, seen)) {
-                if (!seen.has(url))
-                    filtered++;
-                return;
-            }
-            seen.add(url);
-            links.push({
-                href: url,
-                text: $(el).attr('alt')?.trim() ?? url,
-                type: 'image',
-            });
-        });
-    }
-    const truncated = options.maxLinks ? links.length > options.maxLinks : false;
-    const resultLinks = truncated ? links.slice(0, options.maxLinks) : links;
+}
+async function fetchLinksPipeline(url, input, options) {
+    return executeFetchPipeline({
+        url,
+        cacheNamespace: 'links',
+        customHeaders: input.customHeaders,
+        retries: input.retries,
+        timeout: input.timeout,
+        cacheVary: appendHeaderVary({
+            includeInternal: options.includeInternal,
+            includeExternal: options.includeExternal,
+            includeImages: options.includeImages,
+            maxLinks: options.maxLinks,
+            filterPattern: input.filterPattern ?? null,
+        }, input.customHeaders),
+        transform: (html, normalizedUrl) => extractLinks(html, normalizedUrl, options),
+    });
+}
+function buildLinksResponse(result) {
+    const structuredContent = buildLinksStructuredContent(result);
     return {
-        links: resultLinks,
-        linkCount: resultLinks.length,
-        filtered,
-        truncated,
+        content: [
+            {
+                type: 'text',
+                text: JSON.stringify(structuredContent, null, 2),
+            },
+        ],
+        structuredContent,
     };
 }
 export async function fetchLinksToolHandler(input) {
-    if (!input.url) {
-        return createToolErrorResponse('URL is required', '', 'VALIDATION_ERROR');
-    }
-    let filterPattern;
-    if (input.filterPattern) {
-        if (input.filterPattern.length > 200) {
-            return createToolErrorResponse('Filter pattern too long (max 200 characters)', input.url, 'VALIDATION_ERROR');
-        }
-        try {
-            filterPattern = new RegExp(input.filterPattern, 'i');
-        }
-        catch {
-            return createToolErrorResponse(`Invalid filter pattern: ${input.filterPattern}`, input.url, 'VALIDATION_ERROR');
-        }
-    }
     try {
-        const options = {
-            includeInternal: input.includeInternal ?? true,
-            includeExternal: input.includeExternal ?? true,
-            includeImages: input.includeImages ?? false,
-            maxLinks: input.maxLinks,
-            filterPattern,
-        };
-        logDebug('Extracting links', {
-            url: input.url,
-            ...options,
-            filterPattern: input.filterPattern,
-        });
-        const result = await executeFetchPipeline({
-            url: input.url,
-            cacheNamespace: 'links',
-            customHeaders: input.customHeaders,
-            retries: input.retries,
-            transform: (html, url) => extractLinks(html, url, options),
-        });
-        const structuredContent = {
-            url: result.url,
-            linkCount: result.data.linkCount,
-            links: result.data.links,
-            ...(result.data.filtered > 0 && { filtered: result.data.filtered }),
-            ...(result.data.truncated && { truncated: result.data.truncated }),
-        };
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: JSON.stringify(structuredContent, null, 2),
-                },
-            ],
-            structuredContent,
-        };
+        return await executeFetchLinks(input);
     }
     catch (error) {
         logError('fetch-links tool error', error instanceof Error ? error : undefined);
         return handleToolError(error, input.url, 'Failed to extract links');
     }
 }
+async function executeFetchLinks(input) {
+    const { url } = input;
+    if (!url) {
+        return createToolErrorResponse('URL is required', '', 'VALIDATION_ERROR');
+    }
+    const filterPattern = resolveFilterPattern(input.filterPattern, url);
+    if (isToolResponseBase(filterPattern)) {
+        return filterPattern;
+    }
+    const options = buildExtractOptions(input, filterPattern);
+    logFetchLinksStart(url, options, input.filterPattern);
+    const result = await fetchLinksPipeline(url, input, options);
+    return buildLinksResponse(result);
+}
+function buildExtractOptions(input, filterPattern) {
+    return {
+        includeInternal: input.includeInternal ?? true,
+        includeExternal: input.includeExternal ?? true,
+        includeImages: input.includeImages ?? false,
+        maxLinks: input.maxLinks,
+        filterPattern,
+    };
+}
+function buildLinksStructuredContent(result) {
+    const structuredContent = {
+        url: result.url,
+        linkCount: result.data.linkCount,
+        links: result.data.links,
+    };
+    if (result.data.filtered > 0) {
+        structuredContent.filtered = result.data.filtered;
+    }
+    if (result.data.truncated) {
+        structuredContent.truncated = result.data.truncated;
+    }
+    return structuredContent;
+}
 //# sourceMappingURL=fetch-links.tool.js.map

package/dist/tools/handlers/fetch-links.tool.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-links.tool.js","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-links.tool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch-links.tool.js","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-links.tool.ts"],"names":[],"mappings":"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"}

package/dist/tools/handlers/fetch-markdown.tool.d.ts

@@ -1,15 +1,5 @@
-import type { FetchMarkdownInput } from '../../config/types.js';
+import type { FetchMarkdownInput, ToolResponseBase } from '../../config/types.js';
 export declare const FETCH_MARKDOWN_TOOL_NAME = "fetch-markdown";
-export declare const FETCH_MARKDOWN_TOOL_DESCRIPTION = "Fetches a webpage and converts it to clean Markdown format with optional frontmatter, table of contents, and content length limits";
-interface FetchMarkdownToolResponse {
-    [x: string]: unknown;
-    content: {
-        type: 'text';
-        text: string;
-    }[];
-    structuredContent?: Record<string, unknown>;
-    isError?: boolean;
-}
-export declare function fetchMarkdownToolHandler(input: FetchMarkdownInput): Promise<FetchMarkdownToolResponse>;
-export {};
+export declare const FETCH_MARKDOWN_TOOL_DESCRIPTION = "Fetches a webpage and converts it to clean Markdown format with optional frontmatter and content length limits";
+export declare function fetchMarkdownToolHandler(input: FetchMarkdownInput): Promise<ToolResponseBase>;
 //# sourceMappingURL=fetch-markdown.tool.d.ts.map

package/dist/tools/handlers/fetch-markdown.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-markdown.tool.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-markdown.tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAInB,MAAM,uBAAuB,CAAC;AAkB/B,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,+BAA+B,uIAC0F,CAAC;AAEvI,UAAU,yBAAyB;IACjC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACrB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC1C,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAwED,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,yBAAyB,CAAC,CAyDpC"}
+{"version":3,"file":"fetch-markdown.tool.d.ts","sourceRoot":"","sources":["../../../src/tools/handlers/fetch-markdown.tool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAGlB,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAoB/B,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AACzD,eAAO,MAAM,+BAA+B,mHACsE,CAAC;AAyGnH,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAU3B"}

package/dist/tools/handlers/fetch-markdown.tool.js

@@ -1,100 +1,91 @@
-import { extractContent } from '../../services/extractor.js';
 import { logDebug, logError } from '../../services/logger.js';
-import { stripMarkdownLinks } from '../../utils/content-cleaner.js';
 import { createToolErrorResponse, handleToolError, } from '../../utils/tool-error-handler.js';
-import { createContentMetadataBlock, determineContentExtractionSource, } from '../utils/common.js';
-import { executeFetchPipeline } from '../utils/fetch-pipeline.js';
-import { htmlToMarkdown } from '../../transformers/markdown.transformer.js';
+import { transformHtmlToMarkdown } from '../utils/content-transform.js';
+import { buildToolContentBlocks, performSharedFetch, } from './fetch-single.shared.js';
 export const FETCH_MARKDOWN_TOOL_NAME = 'fetch-markdown';
-export const FETCH_MARKDOWN_TOOL_DESCRIPTION = 'Fetches a webpage and converts it to clean Markdown format with optional frontmatter, table of contents, and content length limits';
-function slugify(text) {
-    const cleanText = stripMarkdownLinks(text);
-    return cleanText
-        .toLowerCase()
-        .replace(/[^\w\s-]/g, '')
-        .replace(/\s+/g, '-')
-        .replace(/--+/g, '-')
-        .trim();
+export const FETCH_MARKDOWN_TOOL_DESCRIPTION = 'Fetches a webpage and converts it to clean Markdown format with optional frontmatter and content length limits';
+function resolveMarkdownOptions(input) {
+    return {
+        extractMainContent: input.extractMainContent ?? true,
+        includeMetadata: input.includeMetadata ?? true,
+        maxContentLength: input.maxContentLength,
+    };
 }
-function extractToc(markdown) {
-    const headingRegex = /^(#{1,6})\s+(.+)$/gm;
-    const toc = [];
-    let match;
-    while ((match = headingRegex.exec(markdown)) !== null) {
-        const hashMarks = match[1];
-        const rawText = match[2];
-        if (!hashMarks || !rawText)
-            continue;
-        const text = stripMarkdownLinks(rawText.trim());
-        toc.push({
-            level: hashMarks.length,
-            text,
-            slug: slugify(rawText),
-        });
+function buildMarkdownStructuredContent(pipeline, inlineResult) {
+    const structuredContent = {
+        url: pipeline.url,
+        title: pipeline.data.title,
+        fetchedAt: pipeline.fetchedAt,
+        contentSize: inlineResult.contentSize,
+        cached: pipeline.fromCache,
+    };
+    if (pipeline.data.truncated || inlineResult.truncated) {
+        structuredContent.truncated = true;
+    }
+    if (typeof inlineResult.content === 'string') {
+        structuredContent.markdown = inlineResult.content;
     }
-    return toc;
+    if (inlineResult.resourceUri) {
+        structuredContent.resourceUri = inlineResult.resourceUri;
+        structuredContent.resourceMimeType = inlineResult.resourceMimeType;
+    }
+    return structuredContent;
+}
+function getInlineErrorResponse(inlineResult, url) {
+    if (!inlineResult.error)
+        return null;
+    return createToolErrorResponse(inlineResult.error, url, 'INTERNAL_ERROR');
+}
+function logFetchMarkdownStart(url, options) {
+    logDebug('Fetching markdown', { url, ...options });
 }
-function transformToMarkdown(html, url, options) {
-    const { article, metadata: extractedMeta } = extractContent(html, url, {
-        extractArticle: options.extractMainContent,
+function buildMarkdownTransform(options) {
+    return (html, url) => {
+        const markdownResult = transformHtmlToMarkdown(html, url, options);
+        return { ...markdownResult, content: markdownResult.markdown };
+    };
+}
+async function fetchMarkdownPipeline(url, input, options, transformOptions) {
+    return performSharedFetch({
+        url,
+        format: 'markdown',
+        extractMainContent: options.extractMainContent,
+        includeMetadata: options.includeMetadata,
+        maxContentLength: options.maxContentLength,
+        customHeaders: input.customHeaders,
+        retries: input.retries,
+        timeout: input.timeout,
+        transform: buildMarkdownTransform(transformOptions),
     });
-    const shouldExtractFromArticle = determineContentExtractionSource(options.extractMainContent, article);
-    const metadata = createContentMetadataBlock(url, article, extractedMeta, shouldExtractFromArticle, options.includeMetadata);
-    const sourceHtml = shouldExtractFromArticle ? article.content : html;
-    const title = shouldExtractFromArticle ? article.title : extractedMeta.title;
-    let markdown = htmlToMarkdown(sourceHtml, metadata);
-    const toc = options.generateToc ? extractToc(markdown) : undefined;
-    let truncated = false;
-    if (options.maxContentLength && markdown.length > options.maxContentLength) {
-        markdown = `${markdown.substring(0, options.maxContentLength)}\n\n...[truncated]`;
-        truncated = true;
-    }
-    return { markdown, title, toc, truncated };
 }
-export async function fetchMarkdownToolHandler(input) {
-    if (!input.url) {
-        return createToolErrorResponse('URL is required', '', 'VALIDATION_ERROR');
-    }
-    const options = {
-        extractMainContent: input.extractMainContent ?? true,
-        includeMetadata: input.includeMetadata ?? true,
-        generateToc: input.generateToc ?? false,
-        maxContentLength: input.maxContentLength,
+function buildMarkdownResponse(pipeline, inlineResult) {
+    const structuredContent = buildMarkdownStructuredContent(pipeline, inlineResult);
+    return {
+        content: buildToolContentBlocks(structuredContent, pipeline.fromCache, inlineResult, 'Fetched markdown'),
+        structuredContent,
     };
-    logDebug('Fetching markdown', { url: input.url, ...options });
+}
+export async function fetchMarkdownToolHandler(input) {
     try {
-        const result = await executeFetchPipeline({
-            url: input.url,
-            cacheNamespace: 'markdown',
-            customHeaders: input.customHeaders,
-            retries: input.retries,
-            transform: (html, url) => transformToMarkdown(html, url, options),
-            serialize: (data) => data.markdown,
-            deserialize: (cached) => ({
-                markdown: cached,
-                title: undefined,
-                toc: undefined,
-                truncated: false,
-            }),
-        });
-        const structuredContent = {
-            url: result.url,
-            title: result.data.title,
-            fetchedAt: result.fetchedAt,
-            markdown: result.data.markdown,
-            ...(result.data.toc && { toc: result.data.toc }),
-            cached: result.fromCache,
-            ...(result.data.truncated && { truncated: result.data.truncated }),
-        };
-        const jsonOutput = JSON.stringify(structuredContent, result.fromCache ? undefined : null, result.fromCache ? undefined : 2);
-        return {
-            content: [{ type: 'text', text: jsonOutput }],
-            structuredContent,
-        };
+        return await executeFetchMarkdown(input);
     }
     catch (error) {
         logError('fetch-markdown tool error', error instanceof Error ? error : undefined);
         return handleToolError(error, input.url, 'Failed to fetch markdown');
     }
 }
+async function executeFetchMarkdown(input) {
+    const { url } = input;
+    if (!url) {
+        return createToolErrorResponse('URL is required', '', 'VALIDATION_ERROR');
+    }
+    const options = resolveMarkdownOptions(input);
+    const transformOptions = { ...options };
+    logFetchMarkdownStart(url, transformOptions);
+    const { pipeline, inlineResult } = await fetchMarkdownPipeline(url, input, options, transformOptions);
+    const inlineError = getInlineErrorResponse(inlineResult, url);
+    if (inlineError)
+        return inlineError;
+    return buildMarkdownResponse(pipeline, inlineResult);
+}
 //# sourceMappingURL=fetch-markdown.tool.js.map