Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 78 additions & 16 deletions biome.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"$schema": "https://biomejs.dev/schemas/2.4.15/schema.json",
"vcs": { "enabled": true, "clientKind": "git", "useIgnoreFile": true },
"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
"vcs": {
"enabled": true,
"clientKind": "git",
"useIgnoreFile": true
},
"files": {
"ignoreUnknown": false,
"includes": [
Expand All @@ -25,12 +29,7 @@
"indentWidth": 2,
"lineEnding": "lf",
"lineWidth": 100,
"attributePosition": "auto",
"bracketSameLine": false,
"bracketSpacing": true,
"expand": "auto",
"useEditorconfig": true,
"includes": ["**", "!**/package.json", "!**/lib/", "!**/node_modules/"]
"attributePosition": "auto"
},
"linter": {
"enabled": true,
Expand Down Expand Up @@ -88,33 +87,96 @@
"trailingCommas": "all",
"semicolons": "asNeeded",
"arrowParentheses": "always",
"bracketSpacing": true,
"bracketSameLine": false,
"quoteStyle": "single",
"attributePosition": "auto",
"bracketSpacing": true
"attributePosition": "auto"
}
},
"assist": {
"enabled": true,
"actions": { "source": { "organizeImports": "on" } }
"actions": {
"source": {
"organizeImports": {
"level": "on",
"options": {
"groups": [
{
"type": true,
"source": [":NODE:"]
},
":BLANK_LINE:",
{
"type": true,
"source": [":PACKAGE:"]
},
":BLANK_LINE:",
{
"type": true,
"source": [":ALIAS:", ":/**", "\\{*\\}/**"]
},
":BLANK_LINE:",
{
"type": true,
"source": [":PATH:"]
},
":BLANK_LINE:",
{
"type": false,
"source": [":NODE:"]
},
":BLANK_LINE:",
{
"type": false,
"source": [":PACKAGE:"]
},
":BLANK_LINE:",
{
"type": false,
"source": [":ALIAS:", ":/**", "\\{*\\}/**"]
},
":BLANK_LINE:",
{
"type": false,
"source": [":PATH:"]
}
]
}
}
}
}
},
"overrides": [
{
"includes": ["**/package.json"],
"formatter": { "expand": "always" }
"formatter": {
"expand": "always"
}
},
{
"includes": ["docs/fingerprint/*.package.json"],
"formatter": { "expand": "always" }
"formatter": {
"expand": "always"
}
},
{
"includes": ["*.html"],
"javascript": { "formatter": { "quoteStyle": "double" } }
"javascript": {
"formatter": {
"quoteStyle": "double"
}
}
},
{
"includes": ["*.scss", "*.css"],
"javascript": { "formatter": { "quoteStyle": "double" } },
"formatter": { "lineWidth": 80 }
"javascript": {
"formatter": {
"quoteStyle": "double"
}
},
"formatter": {
"lineWidth": 80
}
}
]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"tsc:zod": "yarn workspace @transloadit/zod sync && node ./node_modules/typescript/bin/tsc -b packages/zod/tsconfig.build.json"
},
"devDependencies": {
"@biomejs/biome": "^2.4.15",
"@biomejs/biome": "2.4.16",
"@changesets/cli": "^2.31.0",
"@types/node": "^25.8.0",
"@vitest/coverage-v8": "^4.1.6",
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import { readFile } from 'node:fs/promises'
import { createServer } from 'node:http'

import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'

import { createTransloaditMcpHttpHandler, createTransloaditMcpServer } from './index.ts'
import { buildRedactor, getLogger } from './logger.ts'

Expand Down
4 changes: 3 additions & 1 deletion packages/mcp-server/src/express.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { TransloaditMcpHttpOptions } from './http.ts'

import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'
import express from 'express'
import type { TransloaditMcpHttpOptions } from './http.ts'

import { isBasicAuthorized } from './http-helpers.ts'
import { getMetrics, getMetricsContentType } from './metrics.ts'
import { createTransloaditMcpServer } from './server.ts'
Expand Down
3 changes: 2 additions & 1 deletion packages/mcp-server/src/http-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { timingSafeEqual } from 'node:crypto'
import type { IncomingMessage, ServerResponse } from 'node:http'

import { timingSafeEqual } from 'node:crypto'

export const parsePathname = (url: string | undefined, fallback: string): string => {
try {
return new URL(url ?? fallback, 'http://localhost').pathname
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/src/http-request-handler.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { IncomingMessage, ServerResponse } from 'node:http'

import type { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'
import type { SevLogger } from '@transloadit/sev-logger'

import { applyCorsHeaders, isAuthorized, normalizePath, parsePathname } from './http-helpers.ts'
import { buildRedactor, getLogger } from './logger.ts'

Expand Down
8 changes: 6 additions & 2 deletions packages/mcp-server/src/http.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import type { IncomingMessage, ServerResponse } from 'node:http'
import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'

import type { SevLogger } from '@transloadit/sev-logger'

import type { TransloaditMcpServerOptions } from './server.ts'

import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js'

import {
applyCorsHeaders,
isAuthorized,
Expand All @@ -9,7 +14,6 @@ import {
parsePathname,
} from './http-helpers.ts'
import { getMetrics, getMetricsContentType } from './metrics.ts'
import type { TransloaditMcpServerOptions } from './server.ts'
import { createTransloaditMcpServer } from './server.ts'
import { buildServerCard, serverCardPath } from './server-card.ts'

Expand Down
5 changes: 3 additions & 2 deletions packages/mcp-server/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export type { TransloaditMcpExpressOptions } from './express.ts'
export { createTransloaditMcpExpressRouter } from './express.ts'
export type { TransloaditMcpHttpHandler, TransloaditMcpHttpOptions } from './http.ts'
export { createTransloaditMcpHttpHandler } from './http.ts'
export type { TransloaditMcpServerOptions } from './server.ts'

export { createTransloaditMcpExpressRouter } from './express.ts'
export { createTransloaditMcpHttpHandler } from './http.ts'
export { createTransloaditMcpServer } from './server.ts'
1 change: 1 addition & 0 deletions packages/mcp-server/src/server-card.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { LATEST_PROTOCOL_VERSION } from '@modelcontextprotocol/sdk/types.js'

import packageJson from '../package.json' with { type: 'json' }

export const serverCardPath = '/.well-known/mcp/server-card.json'
Expand Down
4 changes: 3 additions & 1 deletion packages/mcp-server/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
import type { CallToolResult, TextContent } from '@modelcontextprotocol/sdk/types.js'
import type {
AssemblyInstructionsInput,
CreateAssemblyParams,
LintAssemblyInstructionsResult,
} from '@transloadit/node'

import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
import {
ApiError,
extractFieldNamesFromTemplate,
Expand All @@ -16,6 +17,7 @@ import {
Transloadit,
} from '@transloadit/node'
import { z } from 'zod'

import packageJson from '../package.json' with { type: 'json' }
import { extractBearerToken } from './http-helpers.ts'

Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/base64-limit.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/bearer-auth.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createHttpClient, startHttpServer } from './http-server.ts'
import { parseToolPayload } from './mcp-client.ts'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/builtin-templates.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/concurrent-sessions.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect, test } from 'vitest'

import { createHttpClient, startHttpServer } from './http-server.ts'
import { parseToolPayload } from './mcp-client.ts'

Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/create-assembly.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
5 changes: 4 additions & 1 deletion packages/mcp-server/test/e2e/http-server.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { createServer } from 'node:http'
import type { AddressInfo } from 'node:net'

import { createServer } from 'node:http'

import { Client } from '@modelcontextprotocol/sdk/client'
import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'

import { createTransloaditMcpHttpHandler } from '../../src/index.ts'

type HeadersInit = Record<string, string>
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/lint-assembly.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { lintAssemblyInstructions } from '../../../node/src/lintAssemblyInstructions.ts'
import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/list-templates.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { Transloadit } from '@transloadit/node'
import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const authKey = process.env.TRANSLOADIT_KEY
Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/mcp-client.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { fileURLToPath } from 'node:url'

import { Client } from '@modelcontextprotocol/sdk/client'
import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'

Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/metrics.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { describe, expect, it } from 'vitest'

import { startHttpServer } from './http-server.ts'

describe('metrics', () => {
Expand Down
5 changes: 4 additions & 1 deletion packages/mcp-server/test/e2e/non-sticky-routing.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { createServer, request as httpRequest } from 'node:http'
import type { AddressInfo } from 'node:net'

import { createServer, request as httpRequest } from 'node:http'

import { expect, test } from 'vitest'

import { createHttpClient, startHttpServer } from './http-server.ts'
import { parseToolPayload } from './mcp-client.ts'

Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/resume-assembly.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/robots.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

describe('mcp-server robots (stdio)', { timeout: 20000 }, () => {
Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/server-card.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { describe, expect, it } from 'vitest'

import { startHttpServer } from './http-server.ts'

describe('server card', () => {
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/stdio.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, parseToolPayload } from './mcp-client.ts'

describe('mcp-server stdio', { timeout: 20000 }, () => {
Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/streamable-http-auth.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect, test } from 'vitest'

import { createHttpClient, startHttpServer } from './http-server.ts'
import { parseToolPayload } from './mcp-client.ts'

Expand Down
1 change: 1 addition & 0 deletions packages/mcp-server/test/e2e/streamable-http.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect, test } from 'vitest'

import { createHttpClient, startHttpServer } from './http-server.ts'
import { parseToolPayload } from './mcp-client.ts'

Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/template-inputs.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { Transloadit } from '@transloadit/node'
import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const authKey = process.env.TRANSLOADIT_KEY
Expand Down
2 changes: 2 additions & 0 deletions packages/mcp-server/test/e2e/url-import.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { Client } from '@modelcontextprotocol/sdk/client'

import { afterAll, beforeAll, describe, expect, it } from 'vitest'

import { createMcpClient, isRecord, parseToolPayload } from './mcp-client.ts'

const shouldRun = process.env.TRANSLOADIT_KEY != null && process.env.TRANSLOADIT_SECRET != null
Expand Down
Loading