@richie-rpc/server 1.2.0 → 1.2.1

package/README.md

@@ -36,6 +36,32 @@ const router = createRouter(contract, {
 });
 ```
 
+### Router with basePath
+
+You can serve your API under a path prefix (e.g., `/api`) using the `basePath` option:
+
+```typescript
+const router = createRouter(contract, handlers, { 
+  basePath: '/api' 
+});
+
+Bun.serve({
+  port: 3000,
+  fetch(request) {
+    const url = new URL(request.url);
+    
+    // Route all /api/* requests to the router
+    if (url.pathname.startsWith('/api/')) {
+      return router.fetch(request);
+    }
+    
+    return new Response('Not Found', { status: 404 });
+  }
+});
+```
+
+The router will automatically strip the basePath prefix before matching routes. For example, if your contract defines a route at `/users`, and you set `basePath: '/api'`, the actual URL will be `/api/users`.
+
 ### Using with Bun.serve
 
 ```typescript
@@ -72,6 +98,7 @@ Bun.serve({
 - ✅ Query parameter parsing
 - ✅ JSON body parsing
 - ✅ Form data support
+- ✅ BasePath support for serving APIs under path prefixes
 - ✅ Detailed validation errors
 - ✅ 404 handling for unknown routes
 - ✅ Error handling and reporting

package/dist/cjs/index.cjs

@@ -59,7 +59,7 @@ class RouteNotFoundError extends Error {
     this.name = "RouteNotFoundError";
   }
 }
-async function parseRequest(request, endpoint, pathParams) {
+async function parseRequest(request, endpoint, pathParams, context) {
   const url = new URL(request.url);
   let params = pathParams;
   if (endpoint.params) {
@@ -111,7 +111,7 @@ async function parseRequest(request, endpoint, pathParams) {
     }
     body = result.data;
   }
-  return { params, query, headers, body, request };
+  return { params, query, headers, body, request, context };
 }
 function createResponse(endpoint, handlerResponse) {
   const { status, body, headers: customHeaders } = handlerResponse;
@@ -156,6 +156,7 @@ class Router {
   contract;
   handlers;
   basePath;
+  contextFactory;
   constructor(contract, handlers, options) {
     this.contract = contract;
     this.handlers = handlers;
@@ -166,6 +167,7 @@ class Router {
     } else {
       this.basePath = "";
     }
+    this.contextFactory = options?.context;
   }
   findEndpoint(method, path) {
     for (const [name, endpoint] of Object.entries(this.contract)) {
@@ -192,7 +194,8 @@ class Router {
       }
       const { name, endpoint, params } = match;
       const handler = this.handlers[name];
-      const input = await parseRequest(request, endpoint, params);
+      const context = this.contextFactory ? await this.contextFactory(request, String(name), endpoint) : undefined;
+      const input = await parseRequest(request, endpoint, params, context);
       const handlerResponse = await handler(input);
       return createResponse(endpoint, handlerResponse);
     } catch (error) {
@@ -208,4 +211,4 @@ function createRouter(contract, handlers, options) {
 }
 })
 
-//# debugId=40B7D7B6952E66ED64756E2164756E21
+//# debugId=A1548B7B621C054764756E2164756E21

package/dist/cjs/index.cjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../index.ts"],
   "sourcesContent": [
-    "import type {\n  Contract,\n  EndpointDefinition,\n  ExtractBody,\n  ExtractHeaders,\n  ExtractParams,\n  ExtractQuery,\n} from '@richie-rpc/core';\nimport { matchPath, parseQuery, Status } from '@richie-rpc/core';\nimport type { z } from 'zod';\n\n// Re-export Status for convenience\nexport { Status };\n\n// Handler input types\nexport type HandlerInput<T extends EndpointDefinition> = {\n  params: ExtractParams<T>;\n  query: ExtractQuery<T>;\n  headers: ExtractHeaders<T>;\n  body: ExtractBody<T>;\n  request: Request;\n};\n\n// Handler response type\nexport type HandlerResponse<T extends EndpointDefinition> = {\n  [Status in keyof T['responses']]: {\n    status: Status;\n    body: T['responses'][Status] extends z.ZodTypeAny ? z.infer<T['responses'][Status]> : never;\n    headers?: Record<string, string>;\n  };\n}[keyof T['responses']];\n\n// Handler function type\nexport type Handler<T extends EndpointDefinition> = (\n  input: HandlerInput<T>,\n) => Promise<HandlerResponse<T>> | HandlerResponse<T>;\n\n// Contract handlers mapping\nexport type ContractHandlers<T extends Contract> = {\n  [K in keyof T]: Handler<T[K]>;\n};\n\n// Error classes\nexport class ValidationError extends Error {\n  constructor(\n    public field: string,\n    public issues: z.ZodIssue[],\n    message?: string,\n  ) {\n    super(message || `Validation failed for ${field}`);\n    this.name = 'ValidationError';\n  }\n}\n\nexport class RouteNotFoundError extends Error {\n  constructor(\n    public path: string,\n    public method: string,\n  ) {\n    super(`Route not found: ${method} ${path}`);\n    this.name = 'RouteNotFoundError';\n  }\n}\n\n/**\n * Parse and validate request data\n */\nasync function parseRequest<T extends EndpointDefinition>(\n  request: Request,\n  endpoint: T,\n  pathParams: Record<string, string>,\n): Promise<HandlerInput<T>> {\n  const url = new URL(request.url);\n\n  // Parse path params\n  let params: any = pathParams;\n  if (endpoint.params) {\n    const result = endpoint.params.safeParse(pathParams);\n    if (!result.success) {\n      throw new ValidationError('params', result.error.issues);\n    }\n    params = result.data;\n  }\n\n  // Parse query params\n  let query: any = {};\n  if (endpoint.query) {\n    const queryData = parseQuery(url.searchParams);\n    const result = endpoint.query.safeParse(queryData);\n    if (!result.success) {\n      throw new ValidationError('query', result.error.issues);\n    }\n    query = result.data;\n  }\n\n  // Parse headers\n  let headers: any = {};\n  if (endpoint.headers) {\n    const headersObj: Record<string, string> = {};\n    request.headers.forEach((value, key) => {\n      headersObj[key] = value;\n    });\n    const result = endpoint.headers.safeParse(headersObj);\n    if (!result.success) {\n      throw new ValidationError('headers', result.error.issues);\n    }\n    headers = result.data;\n  }\n\n  // Parse body\n  let body: any;\n  if (endpoint.body) {\n    const contentType = request.headers.get('content-type') || '';\n    let bodyData: any;\n\n    if (contentType.includes('application/json')) {\n      bodyData = await request.json();\n    } else if (contentType.includes('application/x-www-form-urlencoded')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else if (contentType.includes('multipart/form-data')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else {\n      bodyData = await request.text();\n    }\n\n    const result = endpoint.body.safeParse(bodyData);\n    if (!result.success) {\n      throw new ValidationError('body', result.error.issues);\n    }\n    body = result.data;\n  }\n\n  return { params, query, headers, body, request } as HandlerInput<T>;\n}\n\n/**\n * Validate and create response\n */\nfunction createResponse<T extends EndpointDefinition>(\n  endpoint: T,\n  handlerResponse: HandlerResponse<T>,\n): Response {\n  const { status, body, headers: customHeaders } = handlerResponse;\n\n  // Validate response body\n  const responseSchema = endpoint.responses[status as keyof typeof endpoint.responses];\n  if (responseSchema) {\n    const result = responseSchema.safeParse(body);\n    if (!result.success) {\n      throw new ValidationError(`response[${String(status)}]`, result.error.issues);\n    }\n  }\n\n  // Create response headers\n  const responseHeaders = new Headers(customHeaders);\n\n  // Handle 204 No Content - must have no body\n  if (status === 204) {\n    return new Response(null, {\n      status: 204,\n      headers: responseHeaders,\n    });\n  }\n\n  // For all other responses, return JSON\n  if (!responseHeaders.has('content-type')) {\n    responseHeaders.set('content-type', 'application/json');\n  }\n\n  return new Response(JSON.stringify(body), {\n    status: status as number,\n    headers: responseHeaders,\n  });\n}\n\n/**\n * Create error response\n */\nfunction createErrorResponse(error: unknown): Response {\n  if (error instanceof ValidationError) {\n    return Response.json(\n      {\n        error: 'Validation Error',\n        field: error.field,\n        issues: error.issues,\n      },\n      { status: 400 },\n    );\n  }\n\n  if (error instanceof RouteNotFoundError) {\n    return Response.json({ error: 'Not Found', message: error.message }, { status: 404 });\n  }\n\n  console.error('Internal server error:', error);\n  return Response.json({ error: 'Internal Server Error' }, { status: 500 });\n}\n\n/**\n * Router configuration options\n */\nexport interface RouterOptions {\n  basePath?: string;\n}\n\n/**\n * Router class that manages contract endpoints\n */\nexport class Router<T extends Contract> {\n  private basePath: string;\n\n  constructor(\n    private contract: T,\n    private handlers: ContractHandlers<T>,\n    options?: RouterOptions,\n  ) {\n    // Normalize basePath: ensure it starts with / and doesn't end with /\n    const bp = options?.basePath || '';\n    if (bp) {\n      this.basePath = bp.startsWith('/') ? bp : `/${bp}`;\n      this.basePath = this.basePath.endsWith('/') ? this.basePath.slice(0, -1) : this.basePath;\n    } else {\n      this.basePath = '';\n    }\n  }\n\n  /**\n   * Find matching endpoint for a request\n   */\n  private findEndpoint(\n    method: string,\n    path: string,\n  ): { name: keyof T; endpoint: EndpointDefinition; params: Record<string, string> } | null {\n    for (const [name, endpoint] of Object.entries(this.contract)) {\n      if (endpoint.method === method) {\n        const params = matchPath(endpoint.path, path);\n        if (params !== null) {\n          return { name, endpoint, params };\n        }\n      }\n    }\n    return null;\n  }\n\n  /**\n   * Handle a request\n   */\n  async handle(request: Request): Promise<Response> {\n    try {\n      const url = new URL(request.url);\n      const method = request.method;\n      let path = url.pathname;\n\n      // Strip basePath if configured\n      if (this.basePath && path.startsWith(this.basePath)) {\n        path = path.slice(this.basePath.length) || '/';\n      }\n\n      const match = this.findEndpoint(method, path);\n      if (!match) {\n        throw new RouteNotFoundError(path, method);\n      }\n\n      const { name, endpoint, params } = match;\n      const handler = this.handlers[name];\n\n      // Parse and validate request\n      const input = await parseRequest(request, endpoint, params);\n\n      // Call handler\n      const handlerResponse = await handler(input as any);\n\n      // Create and validate response\n      return createResponse(endpoint as T[keyof T], handlerResponse);\n    } catch (error) {\n      return createErrorResponse(error);\n    }\n  }\n\n  /**\n   * Get fetch handler compatible with Bun.serve\n   */\n  get fetch() {\n    return (request: Request) => this.handle(request);\n  }\n}\n\n/**\n * Create a router from a contract and handlers\n */\nexport function createRouter<T extends Contract>(\n  contract: T,\n  handlers: ContractHandlers<T>,\n  options?: RouterOptions,\n): Router<T> {\n  return new Router(contract, handlers, options);\n}\n"
+    "import type {\n  Contract,\n  EndpointDefinition,\n  ExtractBody,\n  ExtractHeaders,\n  ExtractParams,\n  ExtractQuery,\n} from '@richie-rpc/core';\nimport { matchPath, parseQuery, Status } from '@richie-rpc/core';\nimport type { z } from 'zod';\n\n// Re-export Status for convenience\nexport { Status };\n\n// Handler input types\nexport type HandlerInput<T extends EndpointDefinition, C = unknown> = {\n  params: ExtractParams<T>;\n  query: ExtractQuery<T>;\n  headers: ExtractHeaders<T>;\n  body: ExtractBody<T>;\n  request: Request;\n  context: C;\n};\n\n// Handler response type\nexport type HandlerResponse<T extends EndpointDefinition> = {\n  [Status in keyof T['responses']]: {\n    status: Status;\n    body: T['responses'][Status] extends z.ZodTypeAny ? z.infer<T['responses'][Status]> : never;\n    headers?: Record<string, string>;\n  };\n}[keyof T['responses']];\n\n// Handler function type\nexport type Handler<T extends EndpointDefinition, C = unknown> = (\n  input: HandlerInput<T, C>,\n) => Promise<HandlerResponse<T>> | HandlerResponse<T>;\n\n// Contract handlers mapping\nexport type ContractHandlers<T extends Contract, C = unknown> = {\n  [K in keyof T]: Handler<T[K], C>;\n};\n\n// Error classes\nexport class ValidationError extends Error {\n  constructor(\n    public field: string,\n    public issues: z.ZodIssue[],\n    message?: string,\n  ) {\n    super(message || `Validation failed for ${field}`);\n    this.name = 'ValidationError';\n  }\n}\n\nexport class RouteNotFoundError extends Error {\n  constructor(\n    public path: string,\n    public method: string,\n  ) {\n    super(`Route not found: ${method} ${path}`);\n    this.name = 'RouteNotFoundError';\n  }\n}\n\n/**\n * Parse and validate request data\n */\nasync function parseRequest<T extends EndpointDefinition, C = unknown>(\n  request: Request,\n  endpoint: T,\n  pathParams: Record<string, string>,\n  context: C,\n): Promise<HandlerInput<T, C>> {\n  const url = new URL(request.url);\n\n  // Parse path params\n  let params: any = pathParams;\n  if (endpoint.params) {\n    const result = endpoint.params.safeParse(pathParams);\n    if (!result.success) {\n      throw new ValidationError('params', result.error.issues);\n    }\n    params = result.data;\n  }\n\n  // Parse query params\n  let query: any = {};\n  if (endpoint.query) {\n    const queryData = parseQuery(url.searchParams);\n    const result = endpoint.query.safeParse(queryData);\n    if (!result.success) {\n      throw new ValidationError('query', result.error.issues);\n    }\n    query = result.data;\n  }\n\n  // Parse headers\n  let headers: any = {};\n  if (endpoint.headers) {\n    const headersObj: Record<string, string> = {};\n    request.headers.forEach((value, key) => {\n      headersObj[key] = value;\n    });\n    const result = endpoint.headers.safeParse(headersObj);\n    if (!result.success) {\n      throw new ValidationError('headers', result.error.issues);\n    }\n    headers = result.data;\n  }\n\n  // Parse body\n  let body: any;\n  if (endpoint.body) {\n    const contentType = request.headers.get('content-type') || '';\n    let bodyData: any;\n\n    if (contentType.includes('application/json')) {\n      bodyData = await request.json();\n    } else if (contentType.includes('application/x-www-form-urlencoded')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else if (contentType.includes('multipart/form-data')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else {\n      bodyData = await request.text();\n    }\n\n    const result = endpoint.body.safeParse(bodyData);\n    if (!result.success) {\n      throw new ValidationError('body', result.error.issues);\n    }\n    body = result.data;\n  }\n\n  return { params, query, headers, body, request, context } as HandlerInput<T, C>;\n}\n\n/**\n * Validate and create response\n */\nfunction createResponse<T extends EndpointDefinition>(\n  endpoint: T,\n  handlerResponse: HandlerResponse<T>,\n): Response {\n  const { status, body, headers: customHeaders } = handlerResponse;\n\n  // Validate response body\n  const responseSchema = endpoint.responses[status as keyof typeof endpoint.responses];\n  if (responseSchema) {\n    const result = responseSchema.safeParse(body);\n    if (!result.success) {\n      throw new ValidationError(`response[${String(status)}]`, result.error.issues);\n    }\n  }\n\n  // Create response headers\n  const responseHeaders = new Headers(customHeaders);\n\n  // Handle 204 No Content - must have no body\n  if (status === 204) {\n    return new Response(null, {\n      status: 204,\n      headers: responseHeaders,\n    });\n  }\n\n  // For all other responses, return JSON\n  if (!responseHeaders.has('content-type')) {\n    responseHeaders.set('content-type', 'application/json');\n  }\n\n  return new Response(JSON.stringify(body), {\n    status: status as number,\n    headers: responseHeaders,\n  });\n}\n\n/**\n * Create error response\n */\nfunction createErrorResponse(error: unknown): Response {\n  if (error instanceof ValidationError) {\n    return Response.json(\n      {\n        error: 'Validation Error',\n        field: error.field,\n        issues: error.issues,\n      },\n      { status: 400 },\n    );\n  }\n\n  if (error instanceof RouteNotFoundError) {\n    return Response.json({ error: 'Not Found', message: error.message }, { status: 404 });\n  }\n\n  console.error('Internal server error:', error);\n  return Response.json({ error: 'Internal Server Error' }, { status: 500 });\n}\n\n/**\n * Router configuration options\n */\nexport interface RouterOptions<C = unknown> {\n  basePath?: string;\n  context?: (request: Request, routeName?: string, endpoint?: EndpointDefinition) => C | Promise<C>;\n}\n\n/**\n * Router class that manages contract endpoints\n */\nexport class Router<T extends Contract, C = unknown> {\n  private basePath: string;\n  private contextFactory?: (\n    request: Request,\n    routeName?: string,\n    endpoint?: EndpointDefinition,\n  ) => C | Promise<C>;\n\n  constructor(\n    private contract: T,\n    private handlers: ContractHandlers<T, C>,\n    options?: RouterOptions<C>,\n  ) {\n    // Normalize basePath: ensure it starts with / and doesn't end with /\n    const bp = options?.basePath || '';\n    if (bp) {\n      this.basePath = bp.startsWith('/') ? bp : `/${bp}`;\n      this.basePath = this.basePath.endsWith('/') ? this.basePath.slice(0, -1) : this.basePath;\n    } else {\n      this.basePath = '';\n    }\n    this.contextFactory = options?.context;\n  }\n\n  /**\n   * Find matching endpoint for a request\n   */\n  private findEndpoint(\n    method: string,\n    path: string,\n  ): { name: keyof T; endpoint: EndpointDefinition; params: Record<string, string> } | null {\n    for (const [name, endpoint] of Object.entries(this.contract)) {\n      if (endpoint.method === method) {\n        const params = matchPath(endpoint.path, path);\n        if (params !== null) {\n          return { name, endpoint, params };\n        }\n      }\n    }\n    return null;\n  }\n\n  /**\n   * Handle a request\n   */\n  async handle(request: Request): Promise<Response> {\n    try {\n      const url = new URL(request.url);\n      const method = request.method;\n      let path = url.pathname;\n\n      // Strip basePath if configured\n      if (this.basePath && path.startsWith(this.basePath)) {\n        path = path.slice(this.basePath.length) || '/';\n      }\n\n      const match = this.findEndpoint(method, path);\n      if (!match) {\n        throw new RouteNotFoundError(path, method);\n      }\n\n      const { name, endpoint, params } = match;\n      const handler = this.handlers[name];\n\n      // Create context if factory is provided\n      const context = this.contextFactory\n        ? await this.contextFactory(request, String(name), endpoint)\n        : (undefined as C);\n\n      // Parse and validate request\n      const input = await parseRequest(request, endpoint, params, context);\n\n      // Call handler\n      const handlerResponse = await handler(input as any);\n\n      // Create and validate response\n      return createResponse(endpoint as T[keyof T], handlerResponse);\n    } catch (error) {\n      return createErrorResponse(error);\n    }\n  }\n\n  /**\n   * Get fetch handler compatible with Bun.serve\n   */\n  get fetch() {\n    return (request: Request) => this.handle(request);\n  }\n}\n\n/**\n * Create a router from a contract and handlers\n */\nexport function createRouter<T extends Contract, C = unknown>(\n  contract: T,\n  handlers: ContractHandlers<T, C>,\n  options?: RouterOptions<C>,\n): Router<T, C> {\n  return new Router(contract, handlers, options);\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "40B7D7B6952E66ED64756E2164756E21",
+  "mappings": "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",
+  "debugId": "A1548B7B621C054764756E2164756E21",
   "names": []
 }

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@richie-rpc/server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "commonjs"
 }

package/dist/mjs/index.mjs

@@ -22,7 +22,7 @@ class RouteNotFoundError extends Error {
     this.name = "RouteNotFoundError";
   }
 }
-async function parseRequest(request, endpoint, pathParams) {
+async function parseRequest(request, endpoint, pathParams, context) {
   const url = new URL(request.url);
   let params = pathParams;
   if (endpoint.params) {
@@ -74,7 +74,7 @@ async function parseRequest(request, endpoint, pathParams) {
     }
     body = result.data;
   }
-  return { params, query, headers, body, request };
+  return { params, query, headers, body, request, context };
 }
 function createResponse(endpoint, handlerResponse) {
   const { status, body, headers: customHeaders } = handlerResponse;
@@ -119,6 +119,7 @@ class Router {
   contract;
   handlers;
   basePath;
+  contextFactory;
   constructor(contract, handlers, options) {
     this.contract = contract;
     this.handlers = handlers;
@@ -129,6 +130,7 @@ class Router {
     } else {
       this.basePath = "";
     }
+    this.contextFactory = options?.context;
   }
   findEndpoint(method, path) {
     for (const [name, endpoint] of Object.entries(this.contract)) {
@@ -155,7 +157,8 @@ class Router {
       }
       const { name, endpoint, params } = match;
       const handler = this.handlers[name];
-      const input = await parseRequest(request, endpoint, params);
+      const context = this.contextFactory ? await this.contextFactory(request, String(name), endpoint) : undefined;
+      const input = await parseRequest(request, endpoint, params, context);
       const handlerResponse = await handler(input);
       return createResponse(endpoint, handlerResponse);
     } catch (error) {
@@ -177,4 +180,4 @@ export {
   RouteNotFoundError
 };
 
-//# debugId=F3FA981C312BCBC564756E2164756E21
+//# debugId=F0AAA49C7D648D7164756E2164756E21

package/dist/mjs/index.mjs.map

@@ -2,9 +2,9 @@
   "version": 3,
   "sources": ["../../index.ts"],
   "sourcesContent": [
-    "import type {\n  Contract,\n  EndpointDefinition,\n  ExtractBody,\n  ExtractHeaders,\n  ExtractParams,\n  ExtractQuery,\n} from '@richie-rpc/core';\nimport { matchPath, parseQuery, Status } from '@richie-rpc/core';\nimport type { z } from 'zod';\n\n// Re-export Status for convenience\nexport { Status };\n\n// Handler input types\nexport type HandlerInput<T extends EndpointDefinition> = {\n  params: ExtractParams<T>;\n  query: ExtractQuery<T>;\n  headers: ExtractHeaders<T>;\n  body: ExtractBody<T>;\n  request: Request;\n};\n\n// Handler response type\nexport type HandlerResponse<T extends EndpointDefinition> = {\n  [Status in keyof T['responses']]: {\n    status: Status;\n    body: T['responses'][Status] extends z.ZodTypeAny ? z.infer<T['responses'][Status]> : never;\n    headers?: Record<string, string>;\n  };\n}[keyof T['responses']];\n\n// Handler function type\nexport type Handler<T extends EndpointDefinition> = (\n  input: HandlerInput<T>,\n) => Promise<HandlerResponse<T>> | HandlerResponse<T>;\n\n// Contract handlers mapping\nexport type ContractHandlers<T extends Contract> = {\n  [K in keyof T]: Handler<T[K]>;\n};\n\n// Error classes\nexport class ValidationError extends Error {\n  constructor(\n    public field: string,\n    public issues: z.ZodIssue[],\n    message?: string,\n  ) {\n    super(message || `Validation failed for ${field}`);\n    this.name = 'ValidationError';\n  }\n}\n\nexport class RouteNotFoundError extends Error {\n  constructor(\n    public path: string,\n    public method: string,\n  ) {\n    super(`Route not found: ${method} ${path}`);\n    this.name = 'RouteNotFoundError';\n  }\n}\n\n/**\n * Parse and validate request data\n */\nasync function parseRequest<T extends EndpointDefinition>(\n  request: Request,\n  endpoint: T,\n  pathParams: Record<string, string>,\n): Promise<HandlerInput<T>> {\n  const url = new URL(request.url);\n\n  // Parse path params\n  let params: any = pathParams;\n  if (endpoint.params) {\n    const result = endpoint.params.safeParse(pathParams);\n    if (!result.success) {\n      throw new ValidationError('params', result.error.issues);\n    }\n    params = result.data;\n  }\n\n  // Parse query params\n  let query: any = {};\n  if (endpoint.query) {\n    const queryData = parseQuery(url.searchParams);\n    const result = endpoint.query.safeParse(queryData);\n    if (!result.success) {\n      throw new ValidationError('query', result.error.issues);\n    }\n    query = result.data;\n  }\n\n  // Parse headers\n  let headers: any = {};\n  if (endpoint.headers) {\n    const headersObj: Record<string, string> = {};\n    request.headers.forEach((value, key) => {\n      headersObj[key] = value;\n    });\n    const result = endpoint.headers.safeParse(headersObj);\n    if (!result.success) {\n      throw new ValidationError('headers', result.error.issues);\n    }\n    headers = result.data;\n  }\n\n  // Parse body\n  let body: any;\n  if (endpoint.body) {\n    const contentType = request.headers.get('content-type') || '';\n    let bodyData: any;\n\n    if (contentType.includes('application/json')) {\n      bodyData = await request.json();\n    } else if (contentType.includes('application/x-www-form-urlencoded')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else if (contentType.includes('multipart/form-data')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else {\n      bodyData = await request.text();\n    }\n\n    const result = endpoint.body.safeParse(bodyData);\n    if (!result.success) {\n      throw new ValidationError('body', result.error.issues);\n    }\n    body = result.data;\n  }\n\n  return { params, query, headers, body, request } as HandlerInput<T>;\n}\n\n/**\n * Validate and create response\n */\nfunction createResponse<T extends EndpointDefinition>(\n  endpoint: T,\n  handlerResponse: HandlerResponse<T>,\n): Response {\n  const { status, body, headers: customHeaders } = handlerResponse;\n\n  // Validate response body\n  const responseSchema = endpoint.responses[status as keyof typeof endpoint.responses];\n  if (responseSchema) {\n    const result = responseSchema.safeParse(body);\n    if (!result.success) {\n      throw new ValidationError(`response[${String(status)}]`, result.error.issues);\n    }\n  }\n\n  // Create response headers\n  const responseHeaders = new Headers(customHeaders);\n\n  // Handle 204 No Content - must have no body\n  if (status === 204) {\n    return new Response(null, {\n      status: 204,\n      headers: responseHeaders,\n    });\n  }\n\n  // For all other responses, return JSON\n  if (!responseHeaders.has('content-type')) {\n    responseHeaders.set('content-type', 'application/json');\n  }\n\n  return new Response(JSON.stringify(body), {\n    status: status as number,\n    headers: responseHeaders,\n  });\n}\n\n/**\n * Create error response\n */\nfunction createErrorResponse(error: unknown): Response {\n  if (error instanceof ValidationError) {\n    return Response.json(\n      {\n        error: 'Validation Error',\n        field: error.field,\n        issues: error.issues,\n      },\n      { status: 400 },\n    );\n  }\n\n  if (error instanceof RouteNotFoundError) {\n    return Response.json({ error: 'Not Found', message: error.message }, { status: 404 });\n  }\n\n  console.error('Internal server error:', error);\n  return Response.json({ error: 'Internal Server Error' }, { status: 500 });\n}\n\n/**\n * Router configuration options\n */\nexport interface RouterOptions {\n  basePath?: string;\n}\n\n/**\n * Router class that manages contract endpoints\n */\nexport class Router<T extends Contract> {\n  private basePath: string;\n\n  constructor(\n    private contract: T,\n    private handlers: ContractHandlers<T>,\n    options?: RouterOptions,\n  ) {\n    // Normalize basePath: ensure it starts with / and doesn't end with /\n    const bp = options?.basePath || '';\n    if (bp) {\n      this.basePath = bp.startsWith('/') ? bp : `/${bp}`;\n      this.basePath = this.basePath.endsWith('/') ? this.basePath.slice(0, -1) : this.basePath;\n    } else {\n      this.basePath = '';\n    }\n  }\n\n  /**\n   * Find matching endpoint for a request\n   */\n  private findEndpoint(\n    method: string,\n    path: string,\n  ): { name: keyof T; endpoint: EndpointDefinition; params: Record<string, string> } | null {\n    for (const [name, endpoint] of Object.entries(this.contract)) {\n      if (endpoint.method === method) {\n        const params = matchPath(endpoint.path, path);\n        if (params !== null) {\n          return { name, endpoint, params };\n        }\n      }\n    }\n    return null;\n  }\n\n  /**\n   * Handle a request\n   */\n  async handle(request: Request): Promise<Response> {\n    try {\n      const url = new URL(request.url);\n      const method = request.method;\n      let path = url.pathname;\n\n      // Strip basePath if configured\n      if (this.basePath && path.startsWith(this.basePath)) {\n        path = path.slice(this.basePath.length) || '/';\n      }\n\n      const match = this.findEndpoint(method, path);\n      if (!match) {\n        throw new RouteNotFoundError(path, method);\n      }\n\n      const { name, endpoint, params } = match;\n      const handler = this.handlers[name];\n\n      // Parse and validate request\n      const input = await parseRequest(request, endpoint, params);\n\n      // Call handler\n      const handlerResponse = await handler(input as any);\n\n      // Create and validate response\n      return createResponse(endpoint as T[keyof T], handlerResponse);\n    } catch (error) {\n      return createErrorResponse(error);\n    }\n  }\n\n  /**\n   * Get fetch handler compatible with Bun.serve\n   */\n  get fetch() {\n    return (request: Request) => this.handle(request);\n  }\n}\n\n/**\n * Create a router from a contract and handlers\n */\nexport function createRouter<T extends Contract>(\n  contract: T,\n  handlers: ContractHandlers<T>,\n  options?: RouterOptions,\n): Router<T> {\n  return new Router(contract, handlers, options);\n}\n"
+    "import type {\n  Contract,\n  EndpointDefinition,\n  ExtractBody,\n  ExtractHeaders,\n  ExtractParams,\n  ExtractQuery,\n} from '@richie-rpc/core';\nimport { matchPath, parseQuery, Status } from '@richie-rpc/core';\nimport type { z } from 'zod';\n\n// Re-export Status for convenience\nexport { Status };\n\n// Handler input types\nexport type HandlerInput<T extends EndpointDefinition, C = unknown> = {\n  params: ExtractParams<T>;\n  query: ExtractQuery<T>;\n  headers: ExtractHeaders<T>;\n  body: ExtractBody<T>;\n  request: Request;\n  context: C;\n};\n\n// Handler response type\nexport type HandlerResponse<T extends EndpointDefinition> = {\n  [Status in keyof T['responses']]: {\n    status: Status;\n    body: T['responses'][Status] extends z.ZodTypeAny ? z.infer<T['responses'][Status]> : never;\n    headers?: Record<string, string>;\n  };\n}[keyof T['responses']];\n\n// Handler function type\nexport type Handler<T extends EndpointDefinition, C = unknown> = (\n  input: HandlerInput<T, C>,\n) => Promise<HandlerResponse<T>> | HandlerResponse<T>;\n\n// Contract handlers mapping\nexport type ContractHandlers<T extends Contract, C = unknown> = {\n  [K in keyof T]: Handler<T[K], C>;\n};\n\n// Error classes\nexport class ValidationError extends Error {\n  constructor(\n    public field: string,\n    public issues: z.ZodIssue[],\n    message?: string,\n  ) {\n    super(message || `Validation failed for ${field}`);\n    this.name = 'ValidationError';\n  }\n}\n\nexport class RouteNotFoundError extends Error {\n  constructor(\n    public path: string,\n    public method: string,\n  ) {\n    super(`Route not found: ${method} ${path}`);\n    this.name = 'RouteNotFoundError';\n  }\n}\n\n/**\n * Parse and validate request data\n */\nasync function parseRequest<T extends EndpointDefinition, C = unknown>(\n  request: Request,\n  endpoint: T,\n  pathParams: Record<string, string>,\n  context: C,\n): Promise<HandlerInput<T, C>> {\n  const url = new URL(request.url);\n\n  // Parse path params\n  let params: any = pathParams;\n  if (endpoint.params) {\n    const result = endpoint.params.safeParse(pathParams);\n    if (!result.success) {\n      throw new ValidationError('params', result.error.issues);\n    }\n    params = result.data;\n  }\n\n  // Parse query params\n  let query: any = {};\n  if (endpoint.query) {\n    const queryData = parseQuery(url.searchParams);\n    const result = endpoint.query.safeParse(queryData);\n    if (!result.success) {\n      throw new ValidationError('query', result.error.issues);\n    }\n    query = result.data;\n  }\n\n  // Parse headers\n  let headers: any = {};\n  if (endpoint.headers) {\n    const headersObj: Record<string, string> = {};\n    request.headers.forEach((value, key) => {\n      headersObj[key] = value;\n    });\n    const result = endpoint.headers.safeParse(headersObj);\n    if (!result.success) {\n      throw new ValidationError('headers', result.error.issues);\n    }\n    headers = result.data;\n  }\n\n  // Parse body\n  let body: any;\n  if (endpoint.body) {\n    const contentType = request.headers.get('content-type') || '';\n    let bodyData: any;\n\n    if (contentType.includes('application/json')) {\n      bodyData = await request.json();\n    } else if (contentType.includes('application/x-www-form-urlencoded')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else if (contentType.includes('multipart/form-data')) {\n      const formData = await request.formData();\n      bodyData = Object.fromEntries(formData.entries());\n    } else {\n      bodyData = await request.text();\n    }\n\n    const result = endpoint.body.safeParse(bodyData);\n    if (!result.success) {\n      throw new ValidationError('body', result.error.issues);\n    }\n    body = result.data;\n  }\n\n  return { params, query, headers, body, request, context } as HandlerInput<T, C>;\n}\n\n/**\n * Validate and create response\n */\nfunction createResponse<T extends EndpointDefinition>(\n  endpoint: T,\n  handlerResponse: HandlerResponse<T>,\n): Response {\n  const { status, body, headers: customHeaders } = handlerResponse;\n\n  // Validate response body\n  const responseSchema = endpoint.responses[status as keyof typeof endpoint.responses];\n  if (responseSchema) {\n    const result = responseSchema.safeParse(body);\n    if (!result.success) {\n      throw new ValidationError(`response[${String(status)}]`, result.error.issues);\n    }\n  }\n\n  // Create response headers\n  const responseHeaders = new Headers(customHeaders);\n\n  // Handle 204 No Content - must have no body\n  if (status === 204) {\n    return new Response(null, {\n      status: 204,\n      headers: responseHeaders,\n    });\n  }\n\n  // For all other responses, return JSON\n  if (!responseHeaders.has('content-type')) {\n    responseHeaders.set('content-type', 'application/json');\n  }\n\n  return new Response(JSON.stringify(body), {\n    status: status as number,\n    headers: responseHeaders,\n  });\n}\n\n/**\n * Create error response\n */\nfunction createErrorResponse(error: unknown): Response {\n  if (error instanceof ValidationError) {\n    return Response.json(\n      {\n        error: 'Validation Error',\n        field: error.field,\n        issues: error.issues,\n      },\n      { status: 400 },\n    );\n  }\n\n  if (error instanceof RouteNotFoundError) {\n    return Response.json({ error: 'Not Found', message: error.message }, { status: 404 });\n  }\n\n  console.error('Internal server error:', error);\n  return Response.json({ error: 'Internal Server Error' }, { status: 500 });\n}\n\n/**\n * Router configuration options\n */\nexport interface RouterOptions<C = unknown> {\n  basePath?: string;\n  context?: (request: Request, routeName?: string, endpoint?: EndpointDefinition) => C | Promise<C>;\n}\n\n/**\n * Router class that manages contract endpoints\n */\nexport class Router<T extends Contract, C = unknown> {\n  private basePath: string;\n  private contextFactory?: (\n    request: Request,\n    routeName?: string,\n    endpoint?: EndpointDefinition,\n  ) => C | Promise<C>;\n\n  constructor(\n    private contract: T,\n    private handlers: ContractHandlers<T, C>,\n    options?: RouterOptions<C>,\n  ) {\n    // Normalize basePath: ensure it starts with / and doesn't end with /\n    const bp = options?.basePath || '';\n    if (bp) {\n      this.basePath = bp.startsWith('/') ? bp : `/${bp}`;\n      this.basePath = this.basePath.endsWith('/') ? this.basePath.slice(0, -1) : this.basePath;\n    } else {\n      this.basePath = '';\n    }\n    this.contextFactory = options?.context;\n  }\n\n  /**\n   * Find matching endpoint for a request\n   */\n  private findEndpoint(\n    method: string,\n    path: string,\n  ): { name: keyof T; endpoint: EndpointDefinition; params: Record<string, string> } | null {\n    for (const [name, endpoint] of Object.entries(this.contract)) {\n      if (endpoint.method === method) {\n        const params = matchPath(endpoint.path, path);\n        if (params !== null) {\n          return { name, endpoint, params };\n        }\n      }\n    }\n    return null;\n  }\n\n  /**\n   * Handle a request\n   */\n  async handle(request: Request): Promise<Response> {\n    try {\n      const url = new URL(request.url);\n      const method = request.method;\n      let path = url.pathname;\n\n      // Strip basePath if configured\n      if (this.basePath && path.startsWith(this.basePath)) {\n        path = path.slice(this.basePath.length) || '/';\n      }\n\n      const match = this.findEndpoint(method, path);\n      if (!match) {\n        throw new RouteNotFoundError(path, method);\n      }\n\n      const { name, endpoint, params } = match;\n      const handler = this.handlers[name];\n\n      // Create context if factory is provided\n      const context = this.contextFactory\n        ? await this.contextFactory(request, String(name), endpoint)\n        : (undefined as C);\n\n      // Parse and validate request\n      const input = await parseRequest(request, endpoint, params, context);\n\n      // Call handler\n      const handlerResponse = await handler(input as any);\n\n      // Create and validate response\n      return createResponse(endpoint as T[keyof T], handlerResponse);\n    } catch (error) {\n      return createErrorResponse(error);\n    }\n  }\n\n  /**\n   * Get fetch handler compatible with Bun.serve\n   */\n  get fetch() {\n    return (request: Request) => this.handle(request);\n  }\n}\n\n/**\n * Create a router from a contract and handlers\n */\nexport function createRouter<T extends Contract, C = unknown>(\n  contract: T,\n  handlers: ContractHandlers<T, C>,\n  options?: RouterOptions<C>,\n): Router<T, C> {\n  return new Router(contract, handlers, options);\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "F3FA981C312BCBC564756E2164756E21",
+  "mappings": "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",
+  "debugId": "F0AAA49C7D648D7164756E2164756E21",
   "names": []
 }

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@richie-rpc/server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module"
 }

package/dist/types/index.d.ts

@@ -2,12 +2,13 @@ import type { Contract, EndpointDefinition, ExtractBody, ExtractHeaders, Extract
 import { Status } from '@richie-rpc/core';
 import type { z } from 'zod';
 export { Status };
-export type HandlerInput<T extends EndpointDefinition> = {
+export type HandlerInput<T extends EndpointDefinition, C = unknown> = {
     params: ExtractParams<T>;
     query: ExtractQuery<T>;
     headers: ExtractHeaders<T>;
     body: ExtractBody<T>;
     request: Request;
+    context: C;
 };
 export type HandlerResponse<T extends EndpointDefinition> = {
     [Status in keyof T['responses']]: {
@@ -16,9 +17,9 @@ export type HandlerResponse<T extends EndpointDefinition> = {
         headers?: Record<string, string>;
     };
 }[keyof T['responses']];
-export type Handler<T extends EndpointDefinition> = (input: HandlerInput<T>) => Promise<HandlerResponse<T>> | HandlerResponse<T>;
-export type ContractHandlers<T extends Contract> = {
-    [K in keyof T]: Handler<T[K]>;
+export type Handler<T extends EndpointDefinition, C = unknown> = (input: HandlerInput<T, C>) => Promise<HandlerResponse<T>> | HandlerResponse<T>;
+export type ContractHandlers<T extends Contract, C = unknown> = {
+    [K in keyof T]: Handler<T[K], C>;
 };
 export declare class ValidationError extends Error {
     field: string;
@@ -33,17 +34,19 @@ export declare class RouteNotFoundError extends Error {
 /**
  * Router configuration options
  */
-export interface RouterOptions {
+export interface RouterOptions<C = unknown> {
     basePath?: string;
+    context?: (request: Request, routeName?: string, endpoint?: EndpointDefinition) => C | Promise<C>;
 }
 /**
  * Router class that manages contract endpoints
  */
-export declare class Router<T extends Contract> {
+export declare class Router<T extends Contract, C = unknown> {
     private contract;
     private handlers;
     private basePath;
-    constructor(contract: T, handlers: ContractHandlers<T>, options?: RouterOptions);
+    private contextFactory?;
+    constructor(contract: T, handlers: ContractHandlers<T, C>, options?: RouterOptions<C>);
     /**
      * Find matching endpoint for a request
      */
@@ -60,4 +63,4 @@ export declare class Router<T extends Contract> {
 /**
  * Create a router from a contract and handlers
  */
-export declare function createRouter<T extends Contract>(contract: T, handlers: ContractHandlers<T>, options?: RouterOptions): Router<T>;
+export declare function createRouter<T extends Contract, C = unknown>(contract: T, handlers: ContractHandlers<T, C>, options?: RouterOptions<C>): Router<T, C>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@richie-rpc/server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "./dist/cjs/index.cjs",
   "exports": {
     ".": {
@@ -10,7 +10,7 @@
     }
   },
   "peerDependencies": {
-    "@richie-rpc/core": "^1.2.0",
+    "@richie-rpc/core": "^1.2.1",
     "typescript": "^5",
     "zod": "^4.1.12"
   },