diff --git a/package-lock.json b/package-lock.json index 143dab7f..0f706418 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2158,12 +2158,6 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "license": "MIT" - }, "node_modules/cors": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", @@ -2920,12 +2914,6 @@ "node": ">=0.10.0" } }, - "node_modules/immediate": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", - "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", - "license": "MIT" - }, "node_modules/import-local": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", @@ -3056,12 +3044,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "license": "MIT" - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -4183,18 +4165,6 @@ "node": ">=6" } }, - "node_modules/jszip": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", - "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", - "license": "(MIT OR GPL-3.0-or-later)", - "dependencies": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "setimmediate": "^1.0.5" - } - }, "node_modules/kleur": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", @@ -4215,15 +4185,6 @@ "node": ">=6" } }, - "node_modules/lie": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", - "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "license": "MIT", - "dependencies": { - "immediate": "~3.0.5" - } - }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -4540,12 +4501,6 @@ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "license": "BlueOak-1.0.0" }, - "node_modules/pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "license": "(MIT AND Zlib)" - }, "node_modules/parse-json": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", @@ -4704,12 +4659,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "license": "MIT" - }, "node_modules/prompts": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", @@ -4816,27 +4765,6 @@ "dev": true, "license": "MIT" }, - "node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/readable-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, "node_modules/rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -5041,12 +4969,6 @@ "node": ">= 0.8.0" } }, - "node_modules/setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", - "license": "MIT" - }, "node_modules/setprototypeof": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", @@ -5248,21 +5170,6 @@ "node": ">= 0.8" } }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "license": "MIT" - }, "node_modules/string-length": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", @@ -5654,12 +5561,6 @@ "punycode": "^2.1.0" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", @@ -5930,7 +5831,6 @@ "@modelcontextprotocol/sdk": "^1.18.0", "cors": "^2.8.5", "express": "^4.21.1", - "jszip": "^3.10.1", "zod": "^3.23.8", "zod-to-json-schema": "^3.23.5" }, diff --git a/src/everything/everything.ts b/src/everything/everything.ts index 7ff36b8a..5d3f540d 100644 --- a/src/everything/everything.ts +++ b/src/everything/everything.ts @@ -30,7 +30,7 @@ import { zodToJsonSchema } from "zod-to-json-schema"; import { readFileSync } from "fs"; import { fileURLToPath } from "url"; import { dirname, join } from "path"; -import JSZip from "jszip"; +import { gzipSync } from "node:zlib"; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -130,14 +130,13 @@ const StructuredContentSchema = { }) }; -const ZipResourcesInputSchema = z.object({ - files: z.record(z.string().url().describe("URL of the file to include in the zip")).describe("Mapping of file names to URLs to include in the zip").default({ - "README.md": "https://raw.githubusercontent.com/modelcontextprotocol/servers/refs/heads/main/README.md", - }), +const GzipResourceInputSchema = z.object({ + name: z.string().describe("Name of the file to compress"), + data: z.string().url().describe("URL or data URI of the file content to compress"), outputType: z.enum([ 'resourceLink', 'resource' - ]).default('resource').describe("How the resulting zip file should be returned. 'resourceLink' returns a link to a resource that can be read later, 'resource' returns a full resource object."), + ]).default('resource').describe("How the resulting gzipped file should be returned. 'resourceLink' returns a link to a resource that can be read later, 'resource' returns a full resource object."), }); enum ToolName { @@ -152,7 +151,7 @@ enum ToolName { ELICITATION = "startElicitation", GET_RESOURCE_LINKS = "getResourceLinks", STRUCTURED_CONTENT = "structuredContent", - ZIP_RESOURCES = "zip", + GZIP_RESOURCE = "gzip", LIST_ROOTS = "listRoots" } @@ -545,9 +544,9 @@ export const createServer = () => { outputSchema: zodToJsonSchema(StructuredContentSchema.output) as ToolOutput, }, { - name: ToolName.ZIP_RESOURCES, - description: "Compresses the provided resource files (mapping of name to URI, which can be a data URI) to a zip file, which it returns as a data URI resource link.", - inputSchema: zodToJsonSchema(ZipResourcesInputSchema) as ToolInput, + name: ToolName.GZIP_RESOURCE, + description: "Compresses a single file using gzip compression. Takes a file name and data URI, returns the compressed data as a gzipped resource.", + inputSchema: zodToJsonSchema(GzipResourceInputSchema) as ToolInput, } ]; if (clientCapabilities!.roots) tools.push ({ @@ -861,75 +860,67 @@ export const createServer = () => { }; } - if (name === ToolName.ZIP_RESOURCES) { - const ZIP_MAX_FETCH_SIZE = Number(process.env.ZIP_MAX_FETCH_SIZE ?? String(10 * 1024 * 1024)); // 10 MB default - const ZIP_MAX_FETCH_TIME_MILLIS = Number(process.env.ZIP_MAX_FETCH_TIME_MILLIS ?? String(30 * 1000)); // 30 seconds default. + if (name === ToolName.GZIP_RESOURCE) { + const GZIP_MAX_FETCH_SIZE = Number(process.env.GZIP_MAX_FETCH_SIZE ?? String(10 * 1024 * 1024)); // 10 MB default + const GZIP_MAX_FETCH_TIME_MILLIS = Number(process.env.GZIP_MAX_FETCH_TIME_MILLIS ?? String(30 * 1000)); // 30 seconds default. // Comma-separated list of allowed domains. Empty means all domains are allowed. - const ZIP_ALLOWED_DOMAINS = (process.env.ZIP_ALLOWED_DOMAINS ?? "raw.githubusercontent.com").split(",").map(d => d.trim().toLowerCase()).filter(d => d.length > 0); + const GZIP_ALLOWED_DOMAINS = (process.env.GZIP_ALLOWED_DOMAINS ?? "raw.githubusercontent.com").split(",").map(d => d.trim().toLowerCase()).filter(d => d.length > 0); - const { files, outputType } = ZipResourcesInputSchema.parse(args); - const zip = new JSZip(); + const { name: fileName, data: dataUri, outputType } = GzipResourceInputSchema.parse(args); - let remainingUploadBytes = ZIP_MAX_FETCH_SIZE; - const uploadEndTime = Date.now() + ZIP_MAX_FETCH_TIME_MILLIS; - - for (const [fileName, urlString] of Object.entries(files)) { - try { - if (remainingUploadBytes <= 0) { - throw new Error(`Max upload size of ${ZIP_MAX_FETCH_SIZE} bytes exceeded`); - } - - const url = new URL(urlString); - if (url.protocol !== 'http:' && url.protocol !== 'https:' && url.protocol !== 'data:') { - throw new Error(`Unsupported URL protocol for ${urlString}. Only http, https, and data URLs are supported.`); - } - if (ZIP_ALLOWED_DOMAINS.length > 0 && (url.protocol === 'http:' || url.protocol === 'https:')) { - const domain = url.hostname; - const domainAllowed = ZIP_ALLOWED_DOMAINS.some(allowedDomain => { - return domain === allowedDomain || domain.endsWith(`.${allowedDomain}`); - }); - if (!domainAllowed) { - throw new Error(`Domain ${domain} is not in the allowed domains list.`); - } - } - - const response = await fetchSafely(url, { - maxBytes: remainingUploadBytes, - timeoutMillis: uploadEndTime - Date.now() - }); - remainingUploadBytes -= response.byteLength; - - zip.file(fileName, response); - } catch (error) { - throw new Error( - `Error fetching file ${urlString}: ${error instanceof Error ? error.message : String(error)}` - ); + try { + const url = new URL(dataUri); + if (url.protocol !== 'http:' && url.protocol !== 'https:' && url.protocol !== 'data:') { + throw new Error(`Unsupported URL protocol for ${dataUri}. Only http, https, and data URLs are supported.`); + } + if (GZIP_ALLOWED_DOMAINS.length > 0 && (url.protocol === 'http:' || url.protocol === 'https:')) { + const domain = url.hostname; + const domainAllowed = GZIP_ALLOWED_DOMAINS.some(allowedDomain => { + return domain === allowedDomain || domain.endsWith(`.${allowedDomain}`); + }); + if (!domainAllowed) { + throw new Error(`Domain ${domain} is not in the allowed domains list.`); + } } - } - const blob = await zip.generateAsync({ type: "base64" }); - const mimeType = "application/zip"; - const name = `out_${Date.now()}.zip`; - const uri = `test://static/resource/${ALL_RESOURCES.length + 1}`; - const resource = {uri, name, mimeType, blob}; - if (outputType === 'resource') { - return { - content: [{ - type: "resource", - resource - }] - }; - } else if (outputType === 'resourceLink') { - ALL_RESOURCES.push(resource); - return { - content: [{ - type: "resource_link", - mimeType, - uri - }] - }; - } else { - throw new Error(`Unknown outputType: ${outputType}`); + const response = await fetchSafely(url, { + maxBytes: GZIP_MAX_FETCH_SIZE, + timeoutMillis: GZIP_MAX_FETCH_TIME_MILLIS + }); + + // Compress the data using gzip + const inputBuffer = Buffer.from(response); + const compressedBuffer = gzipSync(inputBuffer); + const blob = compressedBuffer.toString("base64"); + + const mimeType = "application/gzip"; + const gzipName = `${fileName}.gz`; + const uri = `test://static/resource/${ALL_RESOURCES.length + 1}`; + const resource = {uri, name: gzipName, mimeType, blob}; + + if (outputType === 'resource') { + return { + content: [{ + type: "resource", + resource + }] + }; + } else if (outputType === 'resourceLink') { + ALL_RESOURCES.push(resource); + return { + content: [{ + type: "resource_link", + mimeType, + uri + }] + }; + } else { + throw new Error(`Unknown outputType: ${outputType}`); + } + } catch (error) { + throw new Error( + `Error processing file ${dataUri}: ${error instanceof Error ? error.message : String(error)}` + ); } } diff --git a/src/everything/package.json b/src/everything/package.json index ca5964f9..e388922d 100644 --- a/src/everything/package.json +++ b/src/everything/package.json @@ -25,7 +25,6 @@ "@modelcontextprotocol/sdk": "^1.18.0", "cors": "^2.8.5", "express": "^4.21.1", - "jszip": "^3.10.1", "zod": "^3.23.8", "zod-to-json-schema": "^3.23.5" },