@j0hanz/fetch-url-mcp 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cache.d.ts +9 -3
- package/dist/cache.d.ts.map +1 -0
- package/dist/cache.js +44 -110
- package/dist/cache.js.map +1 -0
- package/dist/cli.d.ts +1 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +9 -4
- package/dist/cli.js.map +1 -0
- package/dist/config.d.ts +2 -3
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +18 -25
- package/dist/config.js.map +1 -0
- package/dist/crypto.d.ts +1 -0
- package/dist/crypto.d.ts.map +1 -0
- package/dist/crypto.js +1 -0
- package/dist/crypto.js.map +1 -0
- package/dist/dom-noise-removal.d.ts +2 -1
- package/dist/dom-noise-removal.d.ts.map +1 -0
- package/dist/dom-noise-removal.js +8 -4
- package/dist/dom-noise-removal.js.map +1 -0
- package/dist/download.d.ts +4 -0
- package/dist/download.d.ts.map +1 -0
- package/dist/download.js +106 -0
- package/dist/download.js.map +1 -0
- package/dist/errors.d.ts +1 -0
- package/dist/errors.d.ts.map +1 -0
- package/dist/errors.js +1 -0
- package/dist/errors.js.map +1 -0
- package/dist/examples/mcp-fetch-url-client.js +19 -3
- package/dist/examples/mcp-fetch-url-client.js.map +1 -1
- package/dist/fetch-content.d.ts +1 -0
- package/dist/fetch-content.d.ts.map +1 -0
- package/dist/fetch-content.js +14 -14
- package/dist/fetch-content.js.map +1 -0
- package/dist/fetch-stream.d.ts +1 -0
- package/dist/fetch-stream.d.ts.map +1 -0
- package/dist/fetch-stream.js +6 -3
- package/dist/fetch-stream.js.map +1 -0
- package/dist/fetch.d.ts +1 -0
- package/dist/fetch.d.ts.map +1 -0
- package/dist/fetch.js +120 -51
- package/dist/fetch.js.map +1 -0
- package/dist/host-normalization.d.ts +1 -0
- package/dist/host-normalization.d.ts.map +1 -0
- package/dist/host-normalization.js +19 -6
- package/dist/host-normalization.js.map +1 -0
- package/dist/http/auth.d.ts +35 -0
- package/dist/http/auth.d.ts.map +1 -0
- package/dist/http/auth.js +283 -0
- package/dist/http/auth.js.map +1 -0
- package/dist/http/health.d.ts +7 -0
- package/dist/http/health.d.ts.map +1 -0
- package/dist/http/health.js +166 -0
- package/dist/http/health.js.map +1 -0
- package/dist/http/helpers.d.ts +58 -0
- package/dist/http/helpers.d.ts.map +1 -0
- package/dist/http/helpers.js +372 -0
- package/dist/http/helpers.js.map +1 -0
- package/dist/{http-native.d.ts → http/native.d.ts} +1 -0
- package/dist/http/native.d.ts.map +1 -0
- package/dist/http/native.js +529 -0
- package/dist/http/native.js.map +1 -0
- package/dist/http/rate-limit.d.ts +13 -0
- package/dist/http/rate-limit.d.ts.map +1 -0
- package/dist/http/rate-limit.js +81 -0
- package/dist/http/rate-limit.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -0
- package/dist/instructions.d.ts +2 -0
- package/dist/instructions.d.ts.map +1 -0
- package/dist/instructions.js +108 -0
- package/dist/instructions.js.map +1 -0
- package/dist/ip-blocklist.d.ts +1 -0
- package/dist/ip-blocklist.d.ts.map +1 -0
- package/dist/ip-blocklist.js +2 -0
- package/dist/ip-blocklist.js.map +1 -0
- package/dist/json.d.ts +2 -1
- package/dist/json.d.ts.map +1 -0
- package/dist/json.js +19 -6
- package/dist/json.js.map +1 -0
- package/dist/language-detection.d.ts +1 -0
- package/dist/language-detection.d.ts.map +1 -0
- package/dist/language-detection.js +1 -0
- package/dist/language-detection.js.map +1 -0
- package/dist/markdown-cleanup.d.ts +2 -1
- package/dist/markdown-cleanup.d.ts.map +1 -0
- package/dist/markdown-cleanup.js +51 -52
- package/dist/markdown-cleanup.js.map +1 -0
- package/dist/mcp-validator.d.ts +1 -0
- package/dist/mcp-validator.d.ts.map +1 -0
- package/dist/mcp-validator.js +16 -8
- package/dist/mcp-validator.js.map +1 -0
- package/dist/mcp.d.ts +2 -2
- package/dist/mcp.d.ts.map +1 -0
- package/dist/mcp.js +17 -333
- package/dist/mcp.js.map +1 -0
- package/dist/observability.d.ts +2 -0
- package/dist/observability.d.ts.map +1 -0
- package/dist/observability.js +30 -5
- package/dist/observability.js.map +1 -0
- package/dist/prompts.d.ts +1 -0
- package/dist/prompts.d.ts.map +1 -0
- package/dist/prompts.js +15 -3
- package/dist/prompts.js.map +1 -0
- package/dist/resources.d.ts +1 -0
- package/dist/resources.d.ts.map +1 -0
- package/dist/resources.js +30 -23
- package/dist/resources.js.map +1 -0
- package/dist/server-tuning.d.ts +1 -0
- package/dist/server-tuning.d.ts.map +1 -0
- package/dist/server-tuning.js +11 -15
- package/dist/server-tuning.js.map +1 -0
- package/dist/server.d.ts +1 -0
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +23 -23
- package/dist/server.js.map +1 -0
- package/dist/session.d.ts +1 -0
- package/dist/session.d.ts.map +1 -0
- package/dist/session.js +55 -28
- package/dist/session.js.map +1 -0
- package/dist/tasks/execution.d.ts +42 -0
- package/dist/tasks/execution.d.ts.map +1 -0
- package/dist/tasks/execution.js +232 -0
- package/dist/tasks/execution.js.map +1 -0
- package/dist/{tasks.d.ts → tasks/manager.d.ts} +6 -0
- package/dist/tasks/manager.d.ts.map +1 -0
- package/dist/{tasks.js → tasks/manager.js} +86 -37
- package/dist/tasks/manager.js.map +1 -0
- package/dist/tasks/owner.d.ts +33 -0
- package/dist/tasks/owner.d.ts.map +1 -0
- package/dist/tasks/owner.js +99 -0
- package/dist/tasks/owner.js.map +1 -0
- package/dist/timer-utils.d.ts +1 -0
- package/dist/timer-utils.d.ts.map +1 -0
- package/dist/timer-utils.js +12 -5
- package/dist/timer-utils.js.map +1 -0
- package/dist/tool-errors.d.ts +12 -0
- package/dist/tool-errors.d.ts.map +1 -0
- package/dist/tool-errors.js +52 -0
- package/dist/tool-errors.js.map +1 -0
- package/dist/tool-pipeline.d.ts +72 -0
- package/dist/tool-pipeline.d.ts.map +1 -0
- package/dist/tool-pipeline.js +407 -0
- package/dist/tool-pipeline.js.map +1 -0
- package/dist/tool-progress.d.ts +32 -0
- package/dist/tool-progress.d.ts.map +1 -0
- package/dist/tool-progress.js +123 -0
- package/dist/tool-progress.js.map +1 -0
- package/dist/tools.d.ts +35 -111
- package/dist/tools.d.ts.map +1 -0
- package/dist/tools.js +93 -566
- package/dist/tools.js.map +1 -0
- package/dist/{transform.d.ts → transform/transform.d.ts} +2 -1
- package/dist/transform/transform.d.ts.map +1 -0
- package/dist/{transform.js → transform/transform.js} +73 -769
- package/dist/transform/transform.js.map +1 -0
- package/dist/{transform-types.d.ts → transform/types.d.ts} +1 -0
- package/dist/transform/types.d.ts.map +1 -0
- package/dist/{transform-types.js → transform/types.js} +1 -0
- package/dist/transform/types.js.map +1 -0
- package/dist/transform/worker-pool.d.ts +93 -0
- package/dist/transform/worker-pool.d.ts.map +1 -0
- package/dist/transform/worker-pool.js +759 -0
- package/dist/transform/worker-pool.js.map +1 -0
- package/dist/transform/workers/transform-child.d.ts +2 -0
- package/dist/transform/workers/transform-child.d.ts.map +1 -0
- package/dist/{workers → transform/workers}/transform-child.js +3 -1
- package/dist/transform/workers/transform-child.js.map +1 -0
- package/dist/transform/workers/transform-worker.d.ts +2 -0
- package/dist/transform/workers/transform-worker.d.ts.map +1 -0
- package/dist/{workers → transform/workers}/transform-worker.js +2 -1
- package/dist/transform/workers/transform-worker.js.map +1 -0
- package/dist/type-guards.d.ts +1 -0
- package/dist/type-guards.d.ts.map +1 -0
- package/dist/type-guards.js +1 -0
- package/dist/type-guards.js.map +1 -0
- package/package.json +6 -7
- package/dist/AGENTS.md +0 -152
- package/dist/http-native.js +0 -1320
- package/dist/instructions.md +0 -113
- package/dist/workers/transform-child.d.ts +0 -1
- package/dist/workers/transform-worker.d.ts +0 -1
|
@@ -0,0 +1,407 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import * as cache from './cache.js';
|
|
3
|
+
import { config } from './config.js';
|
|
4
|
+
import { getErrorMessage } from './errors.js';
|
|
5
|
+
import { fetchNormalizedUrlBuffer, normalizeUrl, transformToRawUrl, } from './fetch.js';
|
|
6
|
+
import { logDebug, logWarn } from './observability.js';
|
|
7
|
+
import { transformBufferToMarkdown } from './transform/transform.js';
|
|
8
|
+
import { isObject } from './type-guards.js';
|
|
9
|
+
function asRecord(value) {
|
|
10
|
+
return isObject(value) ? value : undefined;
|
|
11
|
+
}
|
|
12
|
+
export function readUnknown(obj, key) {
|
|
13
|
+
const record = asRecord(obj);
|
|
14
|
+
return record ? record[key] : undefined;
|
|
15
|
+
}
|
|
16
|
+
export function readString(obj, key) {
|
|
17
|
+
const value = readUnknown(obj, key);
|
|
18
|
+
return typeof value === 'string' ? value : undefined;
|
|
19
|
+
}
|
|
20
|
+
export function readNestedRecord(obj, keys) {
|
|
21
|
+
let current = obj;
|
|
22
|
+
for (const key of keys) {
|
|
23
|
+
current = readUnknown(current, key);
|
|
24
|
+
if (current === undefined)
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
return asRecord(current);
|
|
28
|
+
}
|
|
29
|
+
function safeJsonParse(value) {
|
|
30
|
+
try {
|
|
31
|
+
return JSON.parse(value);
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
export function withSignal(signal) {
|
|
38
|
+
return signal === undefined ? {} : { signal };
|
|
39
|
+
}
|
|
40
|
+
/* -------------------------------------------------------------------------------------------------
|
|
41
|
+
* Inline content limiting
|
|
42
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
43
|
+
export const TRUNCATION_MARKER = '...[truncated]';
|
|
44
|
+
function getOpenCodeFence(content) {
|
|
45
|
+
const FENCE_PATTERN = /^([ \t]*)(`{3,}|~{3,})/gm;
|
|
46
|
+
let match;
|
|
47
|
+
let inFence = false;
|
|
48
|
+
let fenceChar = null;
|
|
49
|
+
let fenceLength = 0;
|
|
50
|
+
while ((match = FENCE_PATTERN.exec(content)) !== null) {
|
|
51
|
+
const marker = match[2];
|
|
52
|
+
if (!marker)
|
|
53
|
+
continue;
|
|
54
|
+
const [char] = marker;
|
|
55
|
+
if (!char)
|
|
56
|
+
continue;
|
|
57
|
+
const { length } = marker;
|
|
58
|
+
if (!inFence) {
|
|
59
|
+
inFence = true;
|
|
60
|
+
fenceChar = char;
|
|
61
|
+
fenceLength = length;
|
|
62
|
+
}
|
|
63
|
+
else if (char === fenceChar && length >= fenceLength) {
|
|
64
|
+
inFence = false;
|
|
65
|
+
fenceChar = null;
|
|
66
|
+
fenceLength = 0;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (inFence && fenceChar) {
|
|
70
|
+
return { fenceChar, fenceLength };
|
|
71
|
+
}
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
74
|
+
function findSafeLinkBoundary(content, limit) {
|
|
75
|
+
const lastBracket = content.lastIndexOf('[', limit);
|
|
76
|
+
if (lastBracket === -1)
|
|
77
|
+
return limit;
|
|
78
|
+
const afterBracket = content.substring(lastBracket, limit);
|
|
79
|
+
const closedPattern = /^\[[^\]]*\]\([^)]*\)/;
|
|
80
|
+
if (closedPattern.test(afterBracket))
|
|
81
|
+
return limit;
|
|
82
|
+
const start = lastBracket > 0 && content[lastBracket - 1] === '!'
|
|
83
|
+
? lastBracket - 1
|
|
84
|
+
: lastBracket;
|
|
85
|
+
return start;
|
|
86
|
+
}
|
|
87
|
+
function truncateWithMarker(content, limit, marker) {
|
|
88
|
+
if (content.length <= limit)
|
|
89
|
+
return content;
|
|
90
|
+
const maxContentLength = Math.max(0, limit - marker.length);
|
|
91
|
+
const tentativeContent = content.substring(0, maxContentLength);
|
|
92
|
+
const openFence = getOpenCodeFence(tentativeContent);
|
|
93
|
+
if (openFence) {
|
|
94
|
+
const fenceCloser = `\n${openFence.fenceChar.repeat(openFence.fenceLength)}\n`;
|
|
95
|
+
const adjustedLength = Math.max(0, limit - marker.length - fenceCloser.length);
|
|
96
|
+
return `${content.substring(0, adjustedLength)}${fenceCloser}${marker}`;
|
|
97
|
+
}
|
|
98
|
+
const safeBoundary = findSafeLinkBoundary(content, maxContentLength);
|
|
99
|
+
if (safeBoundary < maxContentLength) {
|
|
100
|
+
return `${content.substring(0, safeBoundary)}${marker}`.slice(0, limit);
|
|
101
|
+
}
|
|
102
|
+
return `${tentativeContent}${marker}`.slice(0, limit);
|
|
103
|
+
}
|
|
104
|
+
export function appendTruncationMarker(content, marker) {
|
|
105
|
+
if (!content)
|
|
106
|
+
return marker;
|
|
107
|
+
if (content.endsWith(marker))
|
|
108
|
+
return content;
|
|
109
|
+
const openFence = getOpenCodeFence(content);
|
|
110
|
+
const contentWithFence = openFence
|
|
111
|
+
? `${content}\n${openFence.fenceChar.repeat(openFence.fenceLength)}\n`
|
|
112
|
+
: content;
|
|
113
|
+
const safeBoundary = findSafeLinkBoundary(contentWithFence, contentWithFence.length);
|
|
114
|
+
if (safeBoundary < contentWithFence.length) {
|
|
115
|
+
return `${contentWithFence.substring(0, safeBoundary)}${marker}`;
|
|
116
|
+
}
|
|
117
|
+
return `${contentWithFence}${marker}`;
|
|
118
|
+
}
|
|
119
|
+
class InlineContentLimiter {
|
|
120
|
+
apply(content, inlineLimitOverride) {
|
|
121
|
+
const contentSize = content.length;
|
|
122
|
+
const inlineLimit = this.resolveInlineLimit(inlineLimitOverride);
|
|
123
|
+
if (isWithinInlineLimit(contentSize, inlineLimit)) {
|
|
124
|
+
return { content, contentSize };
|
|
125
|
+
}
|
|
126
|
+
const truncatedContent = truncateWithMarker(content, inlineLimit, TRUNCATION_MARKER);
|
|
127
|
+
return {
|
|
128
|
+
content: truncatedContent,
|
|
129
|
+
contentSize,
|
|
130
|
+
truncated: true,
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
resolveInlineLimit(inlineLimitOverride) {
|
|
134
|
+
const globalLimit = config.constants.maxInlineContentChars;
|
|
135
|
+
if (inlineLimitOverride === undefined)
|
|
136
|
+
return globalLimit;
|
|
137
|
+
if (globalLimit > 0 && inlineLimitOverride > 0) {
|
|
138
|
+
return Math.min(inlineLimitOverride, globalLimit);
|
|
139
|
+
}
|
|
140
|
+
return inlineLimitOverride;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
function isWithinInlineLimit(contentSize, inlineLimit) {
|
|
144
|
+
return inlineLimit <= 0 || contentSize <= inlineLimit;
|
|
145
|
+
}
|
|
146
|
+
const inlineLimiter = new InlineContentLimiter();
|
|
147
|
+
function applyInlineContentLimit(content, inlineLimitOverride) {
|
|
148
|
+
return inlineLimiter.apply(content, inlineLimitOverride);
|
|
149
|
+
}
|
|
150
|
+
function createUrlResolution(params) {
|
|
151
|
+
return {
|
|
152
|
+
normalizedUrl: params.normalizedUrl,
|
|
153
|
+
originalUrl: params.originalUrl,
|
|
154
|
+
transformed: params.transformed,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
function resolveNormalizedUrl(url) {
|
|
158
|
+
const { normalizedUrl: validatedUrl } = normalizeUrl(url);
|
|
159
|
+
const transformedResult = transformToRawUrl(validatedUrl);
|
|
160
|
+
if (!transformedResult.transformed) {
|
|
161
|
+
return createUrlResolution({
|
|
162
|
+
normalizedUrl: validatedUrl,
|
|
163
|
+
originalUrl: validatedUrl,
|
|
164
|
+
transformed: false,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
const { normalizedUrl: transformedUrl } = normalizeUrl(transformedResult.url);
|
|
168
|
+
return createUrlResolution({
|
|
169
|
+
normalizedUrl: transformedUrl,
|
|
170
|
+
originalUrl: validatedUrl,
|
|
171
|
+
transformed: true,
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
function logRawUrlTransformation(resolvedUrl) {
|
|
175
|
+
if (!resolvedUrl.transformed)
|
|
176
|
+
return;
|
|
177
|
+
logDebug('Using transformed raw content URL', {
|
|
178
|
+
original: resolvedUrl.originalUrl,
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
/* -------------------------------------------------------------------------------------------------
|
|
182
|
+
* Cache helpers
|
|
183
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
184
|
+
function extractTitle(value) {
|
|
185
|
+
return readString(value, 'title');
|
|
186
|
+
}
|
|
187
|
+
function logCacheMiss(reason, cacheNamespace, normalizedUrl, error) {
|
|
188
|
+
const log = reason.startsWith('deserialize') ? logWarn : logDebug;
|
|
189
|
+
log(`Cache miss due to ${reason}`, {
|
|
190
|
+
namespace: cacheNamespace,
|
|
191
|
+
url: normalizedUrl,
|
|
192
|
+
...(error ? { error: getErrorMessage(error) } : {}),
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
function createCacheHitResult(params) {
|
|
196
|
+
const finalUrl = params.cachedUrl !== params.normalizedUrl ? params.cachedUrl : undefined;
|
|
197
|
+
return {
|
|
198
|
+
data: params.data,
|
|
199
|
+
fromCache: true,
|
|
200
|
+
url: params.normalizedUrl,
|
|
201
|
+
...(finalUrl ? { finalUrl } : {}),
|
|
202
|
+
fetchedAt: params.fetchedAt,
|
|
203
|
+
cacheKey: params.cacheKey,
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
function attemptCacheRetrieval(params) {
|
|
207
|
+
const { cacheKey, deserialize, cacheNamespace, normalizedUrl } = params;
|
|
208
|
+
if (!cacheKey)
|
|
209
|
+
return null;
|
|
210
|
+
const cached = cache.get(cacheKey);
|
|
211
|
+
if (!cached)
|
|
212
|
+
return null;
|
|
213
|
+
if (!deserialize) {
|
|
214
|
+
logCacheMiss('missing deserializer', cacheNamespace, normalizedUrl);
|
|
215
|
+
return null;
|
|
216
|
+
}
|
|
217
|
+
let data;
|
|
218
|
+
try {
|
|
219
|
+
data = deserialize(cached.content);
|
|
220
|
+
}
|
|
221
|
+
catch (error) {
|
|
222
|
+
logCacheMiss('deserialize exception', cacheNamespace, normalizedUrl, error);
|
|
223
|
+
return null;
|
|
224
|
+
}
|
|
225
|
+
if (data === undefined) {
|
|
226
|
+
logCacheMiss('deserialize failure', cacheNamespace, normalizedUrl);
|
|
227
|
+
return null;
|
|
228
|
+
}
|
|
229
|
+
logDebug('Cache hit', { namespace: cacheNamespace, url: normalizedUrl });
|
|
230
|
+
return createCacheHitResult({
|
|
231
|
+
data,
|
|
232
|
+
normalizedUrl,
|
|
233
|
+
cachedUrl: cached.url,
|
|
234
|
+
fetchedAt: cached.fetchedAt,
|
|
235
|
+
cacheKey,
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
function persistCache(params) {
|
|
239
|
+
const { cacheKey, data, serialize, normalizedUrl, cacheNamespace, force } = params;
|
|
240
|
+
if (!cacheKey)
|
|
241
|
+
return;
|
|
242
|
+
const serializer = serialize ?? JSON.stringify;
|
|
243
|
+
const title = extractTitle(data);
|
|
244
|
+
const metadata = {
|
|
245
|
+
url: normalizedUrl,
|
|
246
|
+
...(title === undefined ? {} : { title }),
|
|
247
|
+
};
|
|
248
|
+
try {
|
|
249
|
+
cache.set(cacheKey, serializer(data), metadata, force ? { force: true } : undefined);
|
|
250
|
+
}
|
|
251
|
+
catch (error) {
|
|
252
|
+
logWarn('Failed to persist cache entry', {
|
|
253
|
+
namespace: cacheNamespace,
|
|
254
|
+
url: normalizedUrl,
|
|
255
|
+
error: getErrorMessage(error),
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
/* -------------------------------------------------------------------------------------------------
|
|
260
|
+
* Pipeline executor
|
|
261
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
262
|
+
export async function executeFetchPipeline(options) {
|
|
263
|
+
const resolvedUrl = resolveNormalizedUrl(options.url);
|
|
264
|
+
logRawUrlTransformation(resolvedUrl);
|
|
265
|
+
const cacheKey = cache.createCacheKey(options.cacheNamespace, resolvedUrl.normalizedUrl, options.cacheVary);
|
|
266
|
+
if (!options.forceRefresh) {
|
|
267
|
+
const cachedResult = attemptCacheRetrieval({
|
|
268
|
+
cacheKey,
|
|
269
|
+
deserialize: options.deserialize,
|
|
270
|
+
cacheNamespace: options.cacheNamespace,
|
|
271
|
+
normalizedUrl: resolvedUrl.normalizedUrl,
|
|
272
|
+
});
|
|
273
|
+
if (cachedResult) {
|
|
274
|
+
return { ...cachedResult, originalUrl: resolvedUrl.originalUrl };
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
logDebug('Fetching URL', { url: resolvedUrl.normalizedUrl });
|
|
278
|
+
const { buffer, encoding, truncated, finalUrl } = await fetchNormalizedUrlBuffer(resolvedUrl.normalizedUrl, withSignal(options.signal));
|
|
279
|
+
const transformUrl = finalUrl || resolvedUrl.normalizedUrl;
|
|
280
|
+
const data = await options.transform({ buffer, encoding, ...(truncated ? { truncated: true } : {}) }, transformUrl);
|
|
281
|
+
if (cache.isEnabled()) {
|
|
282
|
+
persistCache({
|
|
283
|
+
cacheKey,
|
|
284
|
+
data,
|
|
285
|
+
serialize: options.serialize,
|
|
286
|
+
normalizedUrl: finalUrl || resolvedUrl.normalizedUrl,
|
|
287
|
+
cacheNamespace: options.cacheNamespace,
|
|
288
|
+
});
|
|
289
|
+
if (finalUrl && finalUrl !== resolvedUrl.normalizedUrl) {
|
|
290
|
+
const finalCacheKey = cache.createCacheKey(options.cacheNamespace, finalUrl, options.cacheVary);
|
|
291
|
+
if (finalCacheKey && finalCacheKey !== cacheKey) {
|
|
292
|
+
persistCache({
|
|
293
|
+
cacheKey: finalCacheKey,
|
|
294
|
+
data,
|
|
295
|
+
serialize: options.serialize,
|
|
296
|
+
normalizedUrl: finalUrl,
|
|
297
|
+
cacheNamespace: options.cacheNamespace,
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
return {
|
|
303
|
+
data,
|
|
304
|
+
fromCache: false,
|
|
305
|
+
url: resolvedUrl.normalizedUrl,
|
|
306
|
+
originalUrl: resolvedUrl.originalUrl,
|
|
307
|
+
finalUrl,
|
|
308
|
+
fetchedAt: new Date().toISOString(),
|
|
309
|
+
cacheKey,
|
|
310
|
+
};
|
|
311
|
+
}
|
|
312
|
+
function normalizeExtractedMetadata(metadata) {
|
|
313
|
+
if (!metadata)
|
|
314
|
+
return undefined;
|
|
315
|
+
const normalized = {
|
|
316
|
+
...(metadata.title ? { title: metadata.title } : {}),
|
|
317
|
+
...(metadata.description ? { description: metadata.description } : {}),
|
|
318
|
+
...(metadata.author ? { author: metadata.author } : {}),
|
|
319
|
+
...(metadata.image ? { image: metadata.image } : {}),
|
|
320
|
+
...(metadata.favicon ? { favicon: metadata.favicon } : {}),
|
|
321
|
+
...(metadata.publishedAt ? { publishedAt: metadata.publishedAt } : {}),
|
|
322
|
+
...(metadata.modifiedAt ? { modifiedAt: metadata.modifiedAt } : {}),
|
|
323
|
+
};
|
|
324
|
+
if (Object.keys(normalized).length === 0)
|
|
325
|
+
return undefined;
|
|
326
|
+
return normalized;
|
|
327
|
+
}
|
|
328
|
+
const cachedMarkdownSchema = z
|
|
329
|
+
.object({
|
|
330
|
+
markdown: z.string().optional(),
|
|
331
|
+
content: z.string().optional(),
|
|
332
|
+
title: z.string().optional(),
|
|
333
|
+
metadata: z
|
|
334
|
+
.strictObject({
|
|
335
|
+
title: z.string().optional(),
|
|
336
|
+
description: z.string().optional(),
|
|
337
|
+
author: z.string().optional(),
|
|
338
|
+
image: z.string().optional(),
|
|
339
|
+
favicon: z.string().optional(),
|
|
340
|
+
publishedAt: z.string().optional(),
|
|
341
|
+
modifiedAt: z.string().optional(),
|
|
342
|
+
})
|
|
343
|
+
.optional(),
|
|
344
|
+
truncated: z.boolean().optional(),
|
|
345
|
+
})
|
|
346
|
+
.catchall(z.unknown())
|
|
347
|
+
.refine((value) => typeof value.markdown === 'string' || typeof value.content === 'string', { message: 'Missing markdown/content' });
|
|
348
|
+
export function parseCachedMarkdownResult(cached) {
|
|
349
|
+
const parsed = safeJsonParse(cached);
|
|
350
|
+
const result = cachedMarkdownSchema.safeParse(parsed);
|
|
351
|
+
if (!result.success)
|
|
352
|
+
return undefined;
|
|
353
|
+
const markdown = result.data.markdown ?? result.data.content;
|
|
354
|
+
if (typeof markdown !== 'string')
|
|
355
|
+
return undefined;
|
|
356
|
+
const metadata = normalizeExtractedMetadata(result.data.metadata);
|
|
357
|
+
const truncated = result.data.truncated ?? false;
|
|
358
|
+
const persistedMarkdown = truncated
|
|
359
|
+
? appendTruncationMarker(markdown, TRUNCATION_MARKER)
|
|
360
|
+
: markdown;
|
|
361
|
+
return {
|
|
362
|
+
content: persistedMarkdown,
|
|
363
|
+
markdown: persistedMarkdown,
|
|
364
|
+
title: result.data.title,
|
|
365
|
+
...(metadata ? { metadata } : {}),
|
|
366
|
+
truncated,
|
|
367
|
+
};
|
|
368
|
+
}
|
|
369
|
+
export const markdownTransform = async (input, url, signal, skipNoiseRemoval) => {
|
|
370
|
+
const result = await transformBufferToMarkdown(input.buffer, url, {
|
|
371
|
+
includeMetadata: true,
|
|
372
|
+
encoding: input.encoding,
|
|
373
|
+
...withSignal(signal),
|
|
374
|
+
...(skipNoiseRemoval ? { skipNoiseRemoval: true } : {}),
|
|
375
|
+
...(input.truncated ? { inputTruncated: true } : {}),
|
|
376
|
+
});
|
|
377
|
+
const truncated = Boolean(result.truncated || input.truncated);
|
|
378
|
+
return { ...result, content: result.markdown, truncated };
|
|
379
|
+
};
|
|
380
|
+
export function serializeMarkdownResult(result) {
|
|
381
|
+
const persistedMarkdown = result.truncated
|
|
382
|
+
? appendTruncationMarker(result.markdown, TRUNCATION_MARKER)
|
|
383
|
+
: result.markdown;
|
|
384
|
+
return JSON.stringify({
|
|
385
|
+
markdown: persistedMarkdown,
|
|
386
|
+
title: result.title,
|
|
387
|
+
metadata: result.metadata,
|
|
388
|
+
truncated: result.truncated,
|
|
389
|
+
});
|
|
390
|
+
}
|
|
391
|
+
export async function performSharedFetch(options, deps = {}) {
|
|
392
|
+
const executePipeline = deps.executeFetchPipeline ?? executeFetchPipeline;
|
|
393
|
+
const pipelineOptions = {
|
|
394
|
+
url: options.url,
|
|
395
|
+
cacheNamespace: 'markdown',
|
|
396
|
+
...withSignal(options.signal),
|
|
397
|
+
...(options.cacheVary ? { cacheVary: options.cacheVary } : {}),
|
|
398
|
+
...(options.forceRefresh ? { forceRefresh: true } : {}),
|
|
399
|
+
transform: options.transform,
|
|
400
|
+
...(options.serialize ? { serialize: options.serialize } : {}),
|
|
401
|
+
...(options.deserialize ? { deserialize: options.deserialize } : {}),
|
|
402
|
+
};
|
|
403
|
+
const pipeline = await executePipeline(pipelineOptions);
|
|
404
|
+
const inlineResult = applyInlineContentLimit(pipeline.data.content, options.maxInlineChars);
|
|
405
|
+
return { pipeline, inlineResult };
|
|
406
|
+
}
|
|
407
|
+
//# sourceMappingURL=tool-pipeline.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-pipeline.js","sourceRoot":"","sources":["../src/tool-pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
type ProgressToken = string | number;
|
|
2
|
+
interface RequestMeta {
|
|
3
|
+
progressToken?: ProgressToken | undefined;
|
|
4
|
+
[key: string]: unknown;
|
|
5
|
+
}
|
|
6
|
+
export interface ProgressNotificationParams {
|
|
7
|
+
progressToken: ProgressToken;
|
|
8
|
+
progress: number;
|
|
9
|
+
total?: number;
|
|
10
|
+
message?: string;
|
|
11
|
+
_meta?: Record<string, unknown>;
|
|
12
|
+
}
|
|
13
|
+
export interface ProgressNotification {
|
|
14
|
+
method: 'notifications/progress';
|
|
15
|
+
params: ProgressNotificationParams;
|
|
16
|
+
}
|
|
17
|
+
export interface ToolHandlerExtra {
|
|
18
|
+
signal?: AbortSignal;
|
|
19
|
+
requestId?: string | number;
|
|
20
|
+
sessionId?: unknown;
|
|
21
|
+
requestInfo?: unknown;
|
|
22
|
+
_meta?: RequestMeta;
|
|
23
|
+
sendNotification?: (notification: ProgressNotification) => Promise<void>;
|
|
24
|
+
onProgress?: (progress: number, message: string) => void;
|
|
25
|
+
}
|
|
26
|
+
export interface ProgressReporter {
|
|
27
|
+
report: (progress: number, message: string) => Promise<void>;
|
|
28
|
+
}
|
|
29
|
+
export declare const FETCH_PROGRESS_TOTAL = 4;
|
|
30
|
+
export declare function createProgressReporter(extra?: ToolHandlerExtra): ProgressReporter;
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=tool-progress.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-progress.d.ts","sourceRoot":"","sources":["../src/tool-progress.ts"],"names":[],"mappings":"AAQA,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,CAAC;AAErC,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IAC1C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,0BAA0B;IACzC,aAAa,EAAE,aAAa,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,wBAAwB,CAAC;IACjC,MAAM,EAAE,0BAA0B,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,oBAAoB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1D;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9D;AAMD,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAgItC,wBAAgB,sBAAsB,CACpC,KAAK,CAAC,EAAE,gBAAgB,GACvB,gBAAgB,CAElB"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import { getErrorMessage } from './errors.js';
|
|
2
|
+
import { logWarn } from './observability.js';
|
|
3
|
+
import { isObject } from './type-guards.js';
|
|
4
|
+
/* -------------------------------------------------------------------------------------------------
|
|
5
|
+
* Constants
|
|
6
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
7
|
+
export const FETCH_PROGRESS_TOTAL = 4;
|
|
8
|
+
const PROGRESS_NOTIFICATION_TIMEOUT_MS = 5000;
|
|
9
|
+
/* -------------------------------------------------------------------------------------------------
|
|
10
|
+
* Helpers
|
|
11
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
12
|
+
function resolveRelatedTaskMeta(meta) {
|
|
13
|
+
if (!meta)
|
|
14
|
+
return undefined;
|
|
15
|
+
const related = meta['io.modelcontextprotocol/related-task'];
|
|
16
|
+
if (!isObject(related))
|
|
17
|
+
return undefined;
|
|
18
|
+
const { taskId } = related;
|
|
19
|
+
return typeof taskId === 'string' ? { taskId } : undefined;
|
|
20
|
+
}
|
|
21
|
+
/* -------------------------------------------------------------------------------------------------
|
|
22
|
+
* Progress reporter
|
|
23
|
+
* ------------------------------------------------------------------------------------------------- */
|
|
24
|
+
class ToolProgressReporter {
|
|
25
|
+
token;
|
|
26
|
+
sendNotification;
|
|
27
|
+
relatedTaskMeta;
|
|
28
|
+
onProgress;
|
|
29
|
+
reportQueue = Promise.resolve();
|
|
30
|
+
isTerminal = false;
|
|
31
|
+
lastProgress = -1;
|
|
32
|
+
constructor(token, sendNotification, relatedTaskMeta, onProgress) {
|
|
33
|
+
this.token = token;
|
|
34
|
+
this.sendNotification = sendNotification;
|
|
35
|
+
this.relatedTaskMeta = relatedTaskMeta;
|
|
36
|
+
this.onProgress = onProgress;
|
|
37
|
+
}
|
|
38
|
+
static create(extra) {
|
|
39
|
+
const token = extra?._meta?.progressToken ?? null;
|
|
40
|
+
const sendNotification = extra?.sendNotification;
|
|
41
|
+
const relatedTaskMeta = resolveRelatedTaskMeta(extra?._meta);
|
|
42
|
+
const onProgress = extra?.onProgress;
|
|
43
|
+
if (token === null && !onProgress) {
|
|
44
|
+
return { report: async () => { } };
|
|
45
|
+
}
|
|
46
|
+
return new ToolProgressReporter(token, sendNotification, relatedTaskMeta, onProgress);
|
|
47
|
+
}
|
|
48
|
+
async report(progress, message) {
|
|
49
|
+
if (this.isTerminal)
|
|
50
|
+
return;
|
|
51
|
+
const effectiveProgress = Math.max(progress, this.lastProgress);
|
|
52
|
+
const isIncreasing = effectiveProgress > this.lastProgress;
|
|
53
|
+
this.lastProgress = effectiveProgress;
|
|
54
|
+
if (effectiveProgress >= FETCH_PROGRESS_TOTAL) {
|
|
55
|
+
this.isTerminal = true;
|
|
56
|
+
}
|
|
57
|
+
if (this.onProgress) {
|
|
58
|
+
try {
|
|
59
|
+
this.onProgress(effectiveProgress, message);
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
logWarn('Progress callback failed', {
|
|
63
|
+
error: getErrorMessage(error),
|
|
64
|
+
progress: effectiveProgress,
|
|
65
|
+
message,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (!isIncreasing || this.token === null || !this.sendNotification)
|
|
70
|
+
return;
|
|
71
|
+
const { sendNotification } = this;
|
|
72
|
+
const notification = {
|
|
73
|
+
method: 'notifications/progress',
|
|
74
|
+
params: {
|
|
75
|
+
progressToken: this.token,
|
|
76
|
+
progress: effectiveProgress,
|
|
77
|
+
total: FETCH_PROGRESS_TOTAL,
|
|
78
|
+
message,
|
|
79
|
+
...(this.relatedTaskMeta
|
|
80
|
+
? {
|
|
81
|
+
_meta: {
|
|
82
|
+
'io.modelcontextprotocol/related-task': this.relatedTaskMeta,
|
|
83
|
+
},
|
|
84
|
+
}
|
|
85
|
+
: {}),
|
|
86
|
+
},
|
|
87
|
+
};
|
|
88
|
+
this.reportQueue = this.reportQueue.then(async () => {
|
|
89
|
+
let timeoutId;
|
|
90
|
+
const timeoutPromise = new Promise((resolve) => {
|
|
91
|
+
timeoutId = setTimeout(() => {
|
|
92
|
+
resolve({ timeout: true });
|
|
93
|
+
}, PROGRESS_NOTIFICATION_TIMEOUT_MS);
|
|
94
|
+
timeoutId.unref();
|
|
95
|
+
});
|
|
96
|
+
try {
|
|
97
|
+
const outcome = await Promise.race([
|
|
98
|
+
sendNotification(notification).then(() => ({ ok: true })),
|
|
99
|
+
timeoutPromise,
|
|
100
|
+
]);
|
|
101
|
+
if ('timeout' in outcome) {
|
|
102
|
+
logWarn('Progress notification timed out', { progress, message });
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
logWarn('Failed to send progress notification', {
|
|
107
|
+
error: getErrorMessage(error),
|
|
108
|
+
progress,
|
|
109
|
+
message,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
if (timeoutId)
|
|
114
|
+
clearTimeout(timeoutId);
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
await this.reportQueue;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
export function createProgressReporter(extra) {
|
|
121
|
+
return ToolProgressReporter.create(extra);
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=tool-progress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-progress.js","sourceRoot":"","sources":["../src/tool-progress.ts"],"names":[],"mappings":"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"}
|