diff --git a/deno.json b/deno.json index 270fa1b..2d59005 100644 --- a/deno.json +++ b/deno.json @@ -25,7 +25,13 @@ "imports": { "std/": "https://deno.land/std@0.224.0/", "node/": "https://deno.land/std@0.224.0/node/", - "@modelcontextprotocol/sdk/": "npm:@modelcontextprotocol/sdk/" + "@modelcontextprotocol/sdk/client/auth.js": "npm:@modelcontextprotocol/sdk@1.10.2/client/auth.js", + "@modelcontextprotocol/sdk/client/index.js": "npm:@modelcontextprotocol/sdk@1.10.2/client/index.js", + "@modelcontextprotocol/sdk/client/sse.js": "npm:@modelcontextprotocol/sdk@1.10.2/client/sse.js", + "@modelcontextprotocol/sdk/server/stdio.js": "npm:@modelcontextprotocol/sdk@1.10.2/server/stdio.js", + "@modelcontextprotocol/sdk/shared/auth.js": "npm:@modelcontextprotocol/sdk@1.10.2/shared/auth.js", + "@modelcontextprotocol/sdk/shared/transport.js": "npm:@modelcontextprotocol/sdk@1.10.2/shared/transport.js", + "@modelcontextprotocol/sdk/types.js": "npm:@modelcontextprotocol/sdk@1.10.2/types.js" }, "compilerOptions": { "strict": true, diff --git a/deno.lock b/deno.lock index b2579b4..659bcba 100644 --- a/deno.lock +++ b/deno.lock @@ -2,6 +2,7 @@ "version": "4", "specifiers": { "npm:@modelcontextprotocol/sdk@*": "1.10.2_express@5.1.0_zod@3.24.3", + "npm:@modelcontextprotocol/sdk@1.10.2": "1.10.2_express@5.1.0_zod@3.24.3", "npm:@modelcontextprotocol/sdk@^1.9.0": "1.10.2_express@5.1.0_zod@3.24.3", "npm:@types/express@5": "5.0.1", "npm:@types/node@*": "22.12.0", @@ -1408,7 +1409,7 @@ }, "workspace": { "dependencies": [ - "npm:@modelcontextprotocol/sdk@*" + "npm:@modelcontextprotocol/sdk@1.10.2" ] } } diff --git a/src/client.ts b/src/client.ts index 362e292..4519418 100644 --- a/src/client.ts +++ b/src/client.ts @@ -11,13 +11,13 @@ */ import { EventEmitter } from "node:events"; -import { Client } from "npm:@modelcontextprotocol/sdk/client/index.js"; -import { SSEClientTransport } from "npm:@modelcontextprotocol/sdk/client/sse.js"; +import { Client } from "@modelcontextprotocol/sdk/client/index.js"; +import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; import { ListResourcesResultSchema, ListToolsResultSchema, -} from "npm:@modelcontextprotocol/sdk/types.js"; -import { UnauthorizedError } from "npm:@modelcontextprotocol/sdk/client/auth.js"; +} from "@modelcontextprotocol/sdk/types.js"; +import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js"; import { NodeOAuthClientProvider } from "./lib/node-oauth-client-provider.ts"; import { getServerUrlHash, diff --git a/src/lib/node-oauth-client-provider.ts b/src/lib/node-oauth-client-provider.ts index 03db482..69580c0 100644 --- a/src/lib/node-oauth-client-provider.ts +++ b/src/lib/node-oauth-client-provider.ts @@ -1,14 +1,14 @@ -import type { OAuthClientProvider } from "npm:@modelcontextprotocol/sdk/client/auth.js"; -import "npm:@modelcontextprotocol/sdk/client/auth.js"; +import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js"; +import "@modelcontextprotocol/sdk/client/auth.js"; import { OAuthClientInformationSchema, OAuthTokensSchema, -} from "npm:@modelcontextprotocol/sdk/shared/auth.js"; +} from "@modelcontextprotocol/sdk/shared/auth.js"; import type { OAuthClientInformation, OAuthClientInformationFull, OAuthTokens, -} from "npm:@modelcontextprotocol/sdk/shared/auth.js"; +} from "@modelcontextprotocol/sdk/shared/auth.js"; import type { OAuthProviderOptions } from "./types.ts"; import { readJsonFile, diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 075219b..3bce245 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,9 +1,9 @@ import { type OAuthClientProvider, UnauthorizedError, -} from "npm:@modelcontextprotocol/sdk/client/auth.js"; -import { SSEClientTransport } from "npm:@modelcontextprotocol/sdk/client/sse.js"; -import type { Transport } from "npm:@modelcontextprotocol/sdk/shared/transport.js"; +} from "@modelcontextprotocol/sdk/client/auth.js"; +import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; +import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; import type { OAuthCallbackServerOptions } from "./types.ts"; import net from "node:net"; import crypto from "node:crypto"; diff --git a/src/proxy.ts b/src/proxy.ts index 60fbb28..4e8bf22 100644 --- a/src/proxy.ts +++ b/src/proxy.ts @@ -11,7 +11,7 @@ */ import { EventEmitter } from "node:events"; -import { StdioServerTransport } from "npm:@modelcontextprotocol/sdk/server/stdio.js"; +import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; import { connectToRemoteServer, getServerUrlHash, diff --git a/tests/integration_test.ts b/tests/integration_test.ts index 2e49b7d..f218615 100644 --- a/tests/integration_test.ts +++ b/tests/integration_test.ts @@ -1,7 +1,7 @@ import { assertEquals, assertExists } from "std/assert/mod.ts"; import { describe, it, beforeEach } from "std/testing/bdd.ts"; import { mcpProxy } from "../src/lib/utils.ts"; -import type { Transport } from "npm:@modelcontextprotocol/sdk/shared/transport.js"; +import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; // Mock Transport implementation for testing class MockTransport implements Transport { diff --git a/tests/test-utils.ts b/tests/test-utils.ts deleted file mode 100644 index 568cb6a..0000000 --- a/tests/test-utils.ts +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Test utilities for mcp-remote-deno tests - */ - -import type { Server } from "node:http"; -import type { AddressInfo } from "node:net"; - -/** - * A mock server for testing - */ -export class MockServer { - /** - * The HTTP server instance - */ - server: Partial; - - /** - * A function that returns the auth code - */ - waitForAuthCode: () => Promise; - - /** - * Creates a new MockServer - * @param port The port the server is listening on - */ - constructor(port = 8000) { - this.server = { - address: () => ({ - port, - address: "127.0.0.1", - family: "IPv4" - } as AddressInfo), - // Add other server properties as needed - }; - this.waitForAuthCode = () => Promise.resolve("mock-auth-code"); - } -}