modelcontextprotocol/typescript-sdk
Watch
1
0
Fork
You've already forked typescript-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: switch to module ESNext + moduleResolution bundler (#2095)

Browse source
This commit is contained in:
Matt 2026-06-25 12:49:17 +02:00 • committed by GitHub
commit ee732d64b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 668 additions and 863 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/server-legacy/src/auth/handlers/authorize.ts
View file

@ -4,9 +4,9 @@ import type { Options as RateLimitOptions } from 'express-rate-limit';
import { rateLimit } from 'express-rate-limit';
import * as z from 'zod/v4';
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
import { allowedMethods } from '../middleware/allowedMethods.js';
import type { OAuthServerProvider } from '../provider.js';
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
import { allowedMethods } from '../middleware/allowedMethods';
import type { OAuthServerProvider } from '../provider';
export type AuthorizationHandlerOptions = {
provider: OAuthServerProvider;

2
packages/server-legacy/src/auth/handlers/metadata.ts
View file

@ -3,7 +3,7 @@ import cors from 'cors';
import type { RequestHandler } from 'express';
import express from 'express';
import { allowedMethods } from '../middleware/allowedMethods.js';
import { allowedMethods } from '../middleware/allowedMethods';
export function metadataHandler(metadata: OAuthMetadata | OAuthProtectedResourceMetadata): RequestHandler {
// Nested router so we can configure middleware and restrict HTTP method

6
packages/server-legacy/src/auth/handlers/register.ts
View file

@ -8,9 +8,9 @@ import express from 'express';
import type { Options as RateLimitOptions } from 'express-rate-limit';
import { rateLimit } from 'express-rate-limit';
import type { OAuthRegisteredClientsStore } from '../clients.js';
import { InvalidClientMetadataError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
import { allowedMethods } from '../middleware/allowedMethods.js';
import type { OAuthRegisteredClientsStore } from '../clients';
import { InvalidClientMetadataError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
import { allowedMethods } from '../middleware/allowedMethods';
export type ClientRegistrationHandlerOptions = {
/**

8
packages/server-legacy/src/auth/handlers/revoke.ts
View file

@ -5,10 +5,10 @@ import express from 'express';
import type { Options as RateLimitOptions } from 'express-rate-limit';
import { rateLimit } from 'express-rate-limit';
import { InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors.js';
import { allowedMethods } from '../middleware/allowedMethods.js';
import { authenticateClient } from '../middleware/clientAuth.js';
import type { OAuthServerProvider } from '../provider.js';
import { InvalidRequestError, OAuthError, ServerError, TooManyRequestsError } from '../errors';
import { allowedMethods } from '../middleware/allowedMethods';
import { authenticateClient } from '../middleware/clientAuth';
import type { OAuthServerProvider } from '../provider';
export type RevocationHandlerOptions = {
provider: OAuthServerProvider;

8
packages/server-legacy/src/auth/handlers/token.ts
View file

@ -13,10 +13,10 @@ import {
ServerError,
TooManyRequestsError,
UnsupportedGrantTypeError
} from '../errors.js';
import { allowedMethods } from '../middleware/allowedMethods.js';
import { authenticateClient } from '../middleware/clientAuth.js';
import type { OAuthServerProvider } from '../provider.js';
} from '../errors';
import { allowedMethods } from '../middleware/allowedMethods';
import { authenticateClient } from '../middleware/clientAuth';
import type { OAuthServerProvider } from '../provider';
export type TokenHandlerOptions = {
provider: OAuthServerProvider;

44
packages/server-legacy/src/auth/index.ts
View file

@ -1,37 +1,37 @@
// Core router
export type { AuthMetadataOptions, AuthRouterOptions } from './router.js';
export { createOAuthMetadata, getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, mcpAuthRouter } from './router.js';
export type { AuthMetadataOptions, AuthRouterOptions } from './router';
export { createOAuthMetadata, getOAuthProtectedResourceMetadataUrl, mcpAuthMetadataRouter, mcpAuthRouter } from './router';
// Provider interfaces
export type { AuthorizationParams, OAuthServerProvider, OAuthTokenVerifier } from './provider.js';
export type { AuthorizationParams, OAuthServerProvider, OAuthTokenVerifier } from './provider';
// Proxy provider
export type { ProxyEndpoints, ProxyOptions } from './providers/proxyProvider.js';
export { ProxyOAuthServerProvider } from './providers/proxyProvider.js';
export type { ProxyEndpoints, ProxyOptions } from './providers/proxyProvider';
export { ProxyOAuthServerProvider } from './providers/proxyProvider';
// Client store
export type { OAuthRegisteredClientsStore } from './clients.js';
export type { OAuthRegisteredClientsStore } from './clients';
// Handlers
export type { AuthorizationHandlerOptions } from './handlers/authorize.js';
export { authorizationHandler, redirectUriMatches } from './handlers/authorize.js';
export { metadataHandler } from './handlers/metadata.js';
export type { ClientRegistrationHandlerOptions } from './handlers/register.js';
export { clientRegistrationHandler } from './handlers/register.js';
export type { RevocationHandlerOptions } from './handlers/revoke.js';
export { revocationHandler } from './handlers/revoke.js';
export type { TokenHandlerOptions } from './handlers/token.js';
export { tokenHandler } from './handlers/token.js';
export type { AuthorizationHandlerOptions } from './handlers/authorize';
export { authorizationHandler, redirectUriMatches } from './handlers/authorize';
export { metadataHandler } from './handlers/metadata';
export type { ClientRegistrationHandlerOptions } from './handlers/register';
export { clientRegistrationHandler } from './handlers/register';
export type { RevocationHandlerOptions } from './handlers/revoke';
export { revocationHandler } from './handlers/revoke';
export type { TokenHandlerOptions } from './handlers/token';
export { tokenHandler } from './handlers/token';
// Middleware
export { allowedMethods } from './middleware/allowedMethods.js';
export type { BearerAuthMiddlewareOptions } from './middleware/bearerAuth.js';
export { requireBearerAuth } from './middleware/bearerAuth.js';
export type { ClientAuthenticationMiddlewareOptions } from './middleware/clientAuth.js';
export { authenticateClient } from './middleware/clientAuth.js';
export { allowedMethods } from './middleware/allowedMethods';
export type { BearerAuthMiddlewareOptions } from './middleware/bearerAuth';
export { requireBearerAuth } from './middleware/bearerAuth';
export type { ClientAuthenticationMiddlewareOptions } from './middleware/clientAuth';
export { authenticateClient } from './middleware/clientAuth';
// Error classes
export * from './errors.js';
export * from './errors';
// Types
export type { AuthInfo } from './types.js';
export type { AuthInfo } from './types';

2
packages/server-legacy/src/auth/middleware/allowedMethods.ts
View file

@ -1,6 +1,6 @@
import type { RequestHandler } from 'express';
import { MethodNotAllowedError } from '../errors.js';
import { MethodNotAllowedError } from '../errors';
/**
* Middleware to handle unsupported HTTP methods with a 405 Method Not Allowed response.

6
packages/server-legacy/src/auth/middleware/bearerAuth.ts
View file

@ -1,8 +1,8 @@
import type { RequestHandler } from 'express';
import { InsufficientScopeError, InvalidTokenError, OAuthError, ServerError } from '../errors.js';
import type { OAuthTokenVerifier } from '../provider.js';
import type { AuthInfo } from '../types.js';
import { InsufficientScopeError, InvalidTokenError, OAuthError, ServerError } from '../errors';
import type { OAuthTokenVerifier } from '../provider';
import type { AuthInfo } from '../types';
export type BearerAuthMiddlewareOptions = {
/**

4
packages/server-legacy/src/auth/middleware/clientAuth.ts
View file

@ -2,8 +2,8 @@ import type { OAuthClientInformationFull } from '@modelcontextprotocol/core';
import type { RequestHandler } from 'express';
import * as z from 'zod/v4';
import type { OAuthRegisteredClientsStore } from '../clients.js';
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError } from '../errors.js';
import type { OAuthRegisteredClientsStore } from '../clients';
import { InvalidClientError, InvalidRequestError, OAuthError, ServerError } from '../errors';
export type ClientAuthenticationMiddlewareOptions = {
/**

4
packages/server-legacy/src/auth/provider.ts
View file

@ -1,8 +1,8 @@
import type { OAuthClientInformationFull, OAuthTokenRevocationRequest, OAuthTokens } from '@modelcontextprotocol/core';
import type { Response } from 'express';
import type { OAuthRegisteredClientsStore } from './clients.js';
import type { AuthInfo } from './types.js';
import type { OAuthRegisteredClientsStore } from './clients';
import type { AuthInfo } from './types';
export type AuthorizationParams = {
state?: string;

8
packages/server-legacy/src/auth/providers/proxyProvider.ts
View file

@ -2,10 +2,10 @@ import type { FetchLike, OAuthClientInformationFull, OAuthTokenRevocationRequest
import { OAuthClientInformationFullSchema, OAuthTokensSchema } from '@modelcontextprotocol/core';
import type { Response } from 'express';
import type { OAuthRegisteredClientsStore } from '../clients.js';
import { ServerError } from '../errors.js';
import type { AuthorizationParams, OAuthServerProvider } from '../provider.js';
import type { AuthInfo } from '../types.js';
import type { OAuthRegisteredClientsStore } from '../clients';
import { ServerError } from '../errors';
import type { AuthorizationParams, OAuthServerProvider } from '../provider';
import type { AuthInfo } from '../types';
export type ProxyEndpoints = {
authorizationUrl: string;

20
packages/server-legacy/src/auth/router.ts
View file

@ -2,16 +2,16 @@ import type { OAuthMetadata, OAuthProtectedResourceMetadata } from '@modelcontex
import type { RequestHandler } from 'express';
import express from 'express';
import type { AuthorizationHandlerOptions } from './handlers/authorize.js';
import { authorizationHandler } from './handlers/authorize.js';
import { metadataHandler } from './handlers/metadata.js';
import type { ClientRegistrationHandlerOptions } from './handlers/register.js';
import { clientRegistrationHandler } from './handlers/register.js';
import type { RevocationHandlerOptions } from './handlers/revoke.js';
import { revocationHandler } from './handlers/revoke.js';
import type { TokenHandlerOptions } from './handlers/token.js';
import { tokenHandler } from './handlers/token.js';
import type { OAuthServerProvider } from './provider.js';
import type { AuthorizationHandlerOptions } from './handlers/authorize';
import { authorizationHandler } from './handlers/authorize';
import { metadataHandler } from './handlers/metadata';
import type { ClientRegistrationHandlerOptions } from './handlers/register';
import { clientRegistrationHandler } from './handlers/register';
import type { RevocationHandlerOptions } from './handlers/revoke';
import { revocationHandler } from './handlers/revoke';
import type { TokenHandlerOptions } from './handlers/token';
import { tokenHandler } from './handlers/token';
import type { OAuthServerProvider } from './provider';
// Check for dev mode flag that allows HTTP issuer URLs (for development/testing only)
const allowInsecureIssuerUrl =

4
packages/server-legacy/src/index.ts
View file

@ -1,2 +1,2 @@
export * from './auth/index.js';
export * from './sse/index.js';
export * from './auth/index';
export * from './sse/index';

2
packages/server-legacy/src/sse/index.ts
View file

@ -1 +1 @@
export { SSEServerTransport, type SSEServerTransportOptions } from './sse.js';
export { SSEServerTransport, type SSEServerTransportOptions } from './sse';

10
packages/server-legacy/test/auth/handlers/authorize.test.ts
View file

@ -1,11 +1,11 @@
import { authorizationHandler, AuthorizationHandlerOptions, redirectUriMatches } from '../../../src/auth/handlers/authorize.js';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider.js';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients.js';
import { authorizationHandler, AuthorizationHandlerOptions, redirectUriMatches } from '../../../src/auth/handlers/authorize';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients';
import { OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/core';
import express, { Response } from 'express';
import supertest from 'supertest';
import { AuthInfo } from '../../../src/auth/types.js';
import { InvalidTokenError } from '../../../src/auth/errors.js';
import { AuthInfo } from '../../../src/auth/types';
import { InvalidTokenError } from '../../../src/auth/errors';
describe('Authorization Handler', () => {
// Mock client data

2
packages/server-legacy/test/auth/handlers/metadata.test.ts
View file

@ -1,4 +1,4 @@
import { metadataHandler } from '../../../src/auth/handlers/metadata.js';
import { metadataHandler } from '../../../src/auth/handlers/metadata';
import { OAuthMetadata } from '@modelcontextprotocol/core';
import express from 'express';
import supertest from 'supertest';

4
packages/server-legacy/test/auth/handlers/register.test.ts
View file

@ -1,5 +1,5 @@
import { clientRegistrationHandler, ClientRegistrationHandlerOptions } from '../../../src/auth/handlers/register.js';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients.js';
import { clientRegistrationHandler, ClientRegistrationHandlerOptions } from '../../../src/auth/handlers/register';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients';
import { OAuthClientInformationFull, OAuthClientMetadata } from '@modelcontextprotocol/core';
import express from 'express';
import supertest from 'supertest';

10
packages/server-legacy/test/auth/handlers/revoke.test.ts
View file

@ -1,11 +1,11 @@
import { revocationHandler, RevocationHandlerOptions } from '../../../src/auth/handlers/revoke.js';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider.js';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients.js';
import { revocationHandler, RevocationHandlerOptions } from '../../../src/auth/handlers/revoke';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients';
import { OAuthClientInformationFull, OAuthTokenRevocationRequest, OAuthTokens } from '@modelcontextprotocol/core';
import express, { Response } from 'express';
import supertest from 'supertest';
import { AuthInfo } from '../../../src/auth/types.js';
import { InvalidTokenError } from '../../../src/auth/errors.js';
import { AuthInfo } from '../../../src/auth/types';
import { InvalidTokenError } from '../../../src/auth/errors';
import { MockInstance } from 'vitest';
describe('Revocation Handler', () => {

12
packages/server-legacy/test/auth/handlers/token.test.ts
View file

@ -1,13 +1,13 @@
import { tokenHandler, TokenHandlerOptions } from '../../../src/auth/handlers/token.js';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider.js';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients.js';
import { tokenHandler, TokenHandlerOptions } from '../../../src/auth/handlers/token';
import { OAuthServerProvider, AuthorizationParams } from '../../../src/auth/provider';
import { OAuthRegisteredClientsStore } from '../../../src/auth/clients';
import { OAuthClientInformationFull, OAuthTokenRevocationRequest, OAuthTokens } from '@modelcontextprotocol/core';
import express, { Response } from 'express';
import supertest from 'supertest';
import * as pkceChallenge from 'pkce-challenge';
import { InvalidGrantError, InvalidTokenError } from '../../../src/auth/errors.js';
import { AuthInfo } from '../../../src/auth/types.js';
import { ProxyOAuthServerProvider } from '../../../src/auth/providers/proxyProvider.js';
import { InvalidGrantError, InvalidTokenError } from '../../../src/auth/errors';
import { AuthInfo } from '../../../src/auth/types';
import { ProxyOAuthServerProvider } from '../../../src/auth/providers/proxyProvider';
import { type Mock } from 'vitest';
// Mock pkce-challenge

2
packages/server-legacy/test/auth/middleware/allowedMethods.test.ts
View file

@ -1,4 +1,4 @@
import { allowedMethods } from '../../../src/auth/middleware/allowedMethods.js';
import { allowedMethods } from '../../../src/auth/middleware/allowedMethods';
import express, { Request, Response } from 'express';
import request from 'supertest';

Some files were not shown because too many files have changed in this diff Show more