@orpc/server 0.26.0 → 0.27.0

package/dist/{chunk-6BY63WA5.js → chunk-3BAPJGK6.js}

@@ -236,28 +236,24 @@ var ORPCProcedureMatcher = class {
 };
 
 // src/adapters/fetch/orpc-handler.ts
-import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
+import { executeWithHooks, trim as trim2 } from "@orpc/shared";
 import { ORPCError as ORPCError2 } from "@orpc/shared/error";
 var ORPCHandler = class {
   constructor(router, options) {
-    this.router = router;
     this.options = options;
     this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
     this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
   }
   procedureMatcher;
   payloadCodec;
-  condition(request) {
-    return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
-  }
-  async fetch(request, ...[options]) {
+  async handle(request, ...[options]) {
     const context = options?.context;
     const execute = async () => {
       const url = new URL(request.url);
       const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
       const match = await this.procedureMatcher.match(pathname);
       if (!match) {
-        throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
+        return { matched: false, response: void 0 };
       }
       const input = await this.payloadCodec.decode(request);
       const client = createProcedureClient({
@@ -265,20 +261,22 @@ var ORPCHandler = class {
         procedure: match.procedure,
         path: match.path
       });
-      const output = await client(input, { signal: options?.signal });
+      const output = await client(input, { signal: request.signal });
       const { body, headers } = this.payloadCodec.encode(output);
-      return new Response(body, { headers });
+      const response = new Response(body, { headers });
+      return { matched: true, response };
     };
     try {
-      return await executeWithHooks({
+      const result = await executeWithHooks({
         context,
         execute,
         input: request,
         hooks: this.options,
         meta: {
-          signal: options?.signal
+          signal: request.signal
         }
       });
+      return result;
     } catch (e) {
       const error = e instanceof ORPCError2 ? e : new ORPCError2({
         code: "INTERNAL_SERVER_ERROR",
@@ -286,10 +284,11 @@ var ORPCHandler = class {
         cause: e
       });
       const { body, headers } = this.payloadCodec.encode(error.toJSON());
-      return new Response(body, {
+      const response = new Response(body, {
         headers,
         status: error.status
       });
+      return { matched: true, response };
     }
   }
 };
@@ -300,4 +299,4 @@ export {
   ORPCProcedureMatcher,
   ORPCHandler
 };
-//# sourceMappingURL=chunk-6BY63WA5.js.map
+//# sourceMappingURL=chunk-3BAPJGK6.js.map

package/dist/chunk-WUOGVGWG.js

@@ -0,0 +1 @@
+//# sourceMappingURL=chunk-WUOGVGWG.js.map

package/dist/fetch.js

@@ -1,29 +1,12 @@
+import "./chunk-WUOGVGWG.js";
 import {
   ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,
   super_json_exports
-} from "./chunk-6BY63WA5.js";
+} from "./chunk-3BAPJGK6.js";
 import "./chunk-E7GUWVR4.js";
-
-// src/adapters/fetch/composite-handler.ts
-var CompositeHandler = class {
-  constructor(handlers) {
-    this.handlers = handlers;
-  }
-  async fetch(request, ...opt) {
-    for (const handler of this.handlers) {
-      if (handler.condition(request)) {
-        return handler.fetch(request, ...opt);
-      }
-    }
-    return new Response("None of the handlers can handle the request.", {
-      status: 404
-    });
-  }
-};
 export {
-  CompositeHandler,
   ORPCHandler,
   ORPCPayloadCodec,
   ORPCProcedureMatcher,

package/dist/hono.js

@@ -0,0 +1,30 @@
+import "./chunk-WUOGVGWG.js";
+import {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports
+} from "./chunk-3BAPJGK6.js";
+import "./chunk-E7GUWVR4.js";
+
+// src/adapters/hono/middleware.ts
+import { value } from "@orpc/shared";
+function createMiddleware(handler, ...[options]) {
+  return async (c, next) => {
+    const context = await value(options?.context, c);
+    const { matched, response } = await handler.handle(c.req.raw, { ...options, context });
+    if (matched) {
+      c.res = response;
+      return;
+    }
+    await next();
+  };
+}
+export {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports as SuperJSON,
+  createMiddleware
+};
+//# sourceMappingURL=hono.js.map

package/dist/next.js

@@ -0,0 +1,36 @@
+import "./chunk-WUOGVGWG.js";
+import {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports
+} from "./chunk-3BAPJGK6.js";
+import "./chunk-E7GUWVR4.js";
+
+// src/adapters/next/serve.ts
+import { value } from "@orpc/shared";
+function serve(handler, ...[options]) {
+  const main = async (req) => {
+    const context = await value(options?.context, req);
+    const { matched, response } = await handler.handle(req, { ...options, context });
+    if (matched) {
+      return response;
+    }
+    return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 });
+  };
+  return {
+    GET: main,
+    POST: main,
+    PUT: main,
+    PATCH: main,
+    DELETE: main
+  };
+}
+export {
+  ORPCHandler,
+  ORPCPayloadCodec,
+  ORPCProcedureMatcher,
+  super_json_exports as SuperJSON,
+  serve
+};
+//# sourceMappingURL=next.js.map

package/dist/node.js

@@ -1,45 +1,87 @@
 import {
   ORPCHandler
-} from "./chunk-6BY63WA5.js";
+} from "./chunk-3BAPJGK6.js";
 import "./chunk-E7GUWVR4.js";
 
-// src/adapters/node/composite-handler.ts
-var CompositeHandler = class {
-  constructor(handlers) {
-    this.handlers = handlers;
+// src/adapters/node/request-listener.ts
+function createRequest(req, res) {
+  const controller = new AbortController();
+  res.on("close", () => {
+    controller.abort();
+  });
+  const method = req.method ?? "GET";
+  const headers = createHeaders(req);
+  const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
+  const host = headers.get("Host") ?? "localhost";
+  const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
+  const init = { method, headers, signal: controller.signal };
+  if (method !== "GET" && method !== "HEAD") {
+    init.body = new ReadableStream({
+      start(controller2) {
+        req.on("data", (chunk) => {
+          controller2.enqueue(new Uint8Array(chunk.buffer, chunk.byteOffset, chunk.byteLength));
+        });
+        req.on("end", () => {
+          controller2.close();
+        });
+      }
+    });
+    init.duplex = "half";
+  }
+  return new Request(url, init);
+}
+function createHeaders(req) {
+  const headers = new Headers();
+  const rawHeaders = req.rawHeaders;
+  for (let i = 0; i < rawHeaders.length; i += 2) {
+    headers.append(rawHeaders[i], rawHeaders[i + 1]);
   }
-  async handle(req, res, ...opt) {
-    for (const handler of this.handlers) {
-      if (handler.condition(req)) {
-        return handler.handle(req, res, ...opt);
+  return headers;
+}
+async function sendResponse(res, response) {
+  const headers = {};
+  for (const [key, value] of response.headers) {
+    if (key in headers) {
+      if (Array.isArray(headers[key])) {
+        headers[key].push(value);
+      } else {
+        headers[key] = [headers[key], value];
       }
+    } else {
+      headers[key] = value;
     }
-    res.statusCode = 404;
-    res.end("None of the handlers can handle the request.");
   }
-};
+  res.writeHead(response.status, headers);
+  if (response.body != null && res.req.method !== "HEAD") {
+    for await (const chunk of response.body) {
+      res.write(chunk);
+    }
+  }
+  res.end();
+}
 
 // src/adapters/node/orpc-handler.ts
-import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
-import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE } from "@orpc/shared";
 var ORPCHandler2 = class {
   orpcFetchHandler;
   constructor(router, options) {
     this.orpcFetchHandler = new ORPCHandler(router, options);
   }
-  condition(request) {
-    return Boolean(request.headers[ORPC_HANDLER_HEADER]?.includes(ORPC_HANDLER_VALUE));
-  }
   async handle(req, res, ...[options]) {
-    const request = createRequest(req, res, options);
+    const request = createRequest(req, res);
     const castedOptions = options ?? {};
-    const response = await this.orpcFetchHandler.fetch(request, castedOptions);
-    await options?.beforeSend?.(response, castedOptions.context);
-    return await sendResponse(res, response);
+    const result = await this.orpcFetchHandler.handle(request, castedOptions);
+    if (result.matched === false) {
+      return { matched: false };
+    }
+    await options?.beforeSend?.(result.response, castedOptions.context);
+    await sendResponse(res, result.response);
+    return { matched: true };
   }
 };
 export {
-  CompositeHandler,
-  ORPCHandler2 as ORPCHandler
+  ORPCHandler2 as ORPCHandler,
+  createHeaders,
+  createRequest,
+  sendResponse
 };
 //# sourceMappingURL=node.js.map

package/dist/src/adapters/fetch/index.d.ts

@@ -1,4 +1,3 @@
-export * from './composite-handler';
 export * from './orpc-handler';
 export * from './orpc-payload-codec';
 export * from './orpc-procedure-matcher';

package/dist/src/adapters/fetch/orpc-handler.d.ts

@@ -1,20 +1,20 @@
 import type { Hooks } from '@orpc/shared';
 import type { Router } from '../../router';
-import type { Context, WithSignal } from '../../types';
-import type { ConditionalFetchHandler, FetchOptions } from './types';
+import type { Context } from '../../types';
+import type { FetchHandler, FetchHandleRest, FetchHandleResult } from './types';
 import { type PublicORPCPayloadCodec } from './orpc-payload-codec';
 import { type PublicORPCProcedureMatcher } from './orpc-procedure-matcher';
-export type ORPCHandlerOptions<T extends Context> = Hooks<Request, Response, T, WithSignal> & {
+export type ORPCHandlerOptions<T extends Context> = Hooks<Request, FetchHandleResult, T, {
+    signal?: AbortSignal;
+}> & {
     procedureMatcher?: PublicORPCProcedureMatcher;
     payloadCodec?: PublicORPCPayloadCodec;
 };
-export declare class ORPCHandler<T extends Context> implements ConditionalFetchHandler<T> {
-    readonly router: Router<T, any>;
-    readonly options?: NoInfer<ORPCHandlerOptions<T>> | undefined;
+export declare class ORPCHandler<T extends Context> implements FetchHandler<T> {
+    private readonly options?;
     private readonly procedureMatcher;
     private readonly payloadCodec;
     constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>> | undefined);
-    condition(request: Request): boolean;
-    fetch(request: Request, ...[options]: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
+    handle(request: Request, ...[options]: FetchHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/fetch/types.d.ts

@@ -1,16 +1,21 @@
 import type { HTTPPath } from '@orpc/contract';
-import type { Context, WithSignal } from '../../types';
-export type FetchOptions<T extends Context> = WithSignal & {
+import type { Context } from '../../types';
+export type FetchHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
 } & (undefined extends T ? {
     context?: T;
 } : {
     context: T;
 });
+export type FetchHandleRest<T extends Context> = [options: FetchHandleOptions<T>] | (undefined extends T ? [] : never);
+export type FetchHandleResult = {
+    matched: true;
+    response: Response;
+} | {
+    matched: false;
+    response: undefined;
+};
 export interface FetchHandler<T extends Context> {
-    fetch: (request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)) => Promise<Response>;
-}
-export interface ConditionalFetchHandler<T extends Context> extends FetchHandler<T> {
-    condition: (request: Request) => boolean;
+    handle: (request: Request, ...rest: FetchHandleRest<T>) => Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/src/adapters/hono/index.d.ts

@@ -0,0 +1,3 @@
+export * from '../fetch';
+export * from './middleware';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/hono/middleware.d.ts

@@ -0,0 +1,12 @@
+import type { Context as HonoContext, MiddlewareHandler } from 'hono';
+import type { Context } from '../../types';
+import type { FetchHandleOptions, FetchHandler } from '../fetch';
+import { type Value } from '@orpc/shared';
+export type CreateMiddlewareOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (undefined extends T ? {
+    context?: Value<T, [HonoContext]>;
+} : {
+    context: Value<T, [HonoContext]>;
+});
+export type CreateMiddlewareRest<T extends Context> = [options: CreateMiddlewareOptions<T>] | (undefined extends T ? [] : never);
+export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: CreateMiddlewareRest<T>): MiddlewareHandler;
+//# sourceMappingURL=middleware.d.ts.map

package/dist/src/adapters/next/index.d.ts

@@ -0,0 +1,3 @@
+export * from '../fetch';
+export * from './serve';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/next/serve.d.ts

@@ -0,0 +1,19 @@
+import type { NextRequest } from 'next/server';
+import type { Context } from '../../types';
+import type { FetchHandleOptions, FetchHandler } from '../fetch';
+import { type Value } from '@orpc/shared';
+export type ServeOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (undefined extends T ? {
+    context?: Value<T, [NextRequest]>;
+} : {
+    context: Value<T, [NextRequest]>;
+});
+export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (undefined extends T ? [] : never);
+export interface ServeResult {
+    GET: (req: NextRequest) => Promise<Response>;
+    POST: (req: NextRequest) => Promise<Response>;
+    PUT: (req: NextRequest) => Promise<Response>;
+    PATCH: (req: NextRequest) => Promise<Response>;
+    DELETE: (req: NextRequest) => Promise<Response>;
+}
+export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: ServeRest<T>): ServeResult;
+//# sourceMappingURL=serve.d.ts.map

package/dist/src/adapters/node/index.d.ts

@@ -1,5 +1,5 @@
-export * from './composite-handler';
 export * from './orpc-handler';
 export * from './orpc-handler';
+export * from './request-listener';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/adapters/node/orpc-handler.d.ts

@@ -1,12 +1,12 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { ServerResponse } from 'node:http';
 import type { Router } from '../../router';
 import type { Context } from '../../types';
 import type { ORPCHandlerOptions } from '../fetch/orpc-handler';
-import type { ConditionalRequestHandler, RequestOptions } from './types';
-export declare class ORPCHandler<T extends Context> implements ConditionalRequestHandler<T> {
+import type { RequestHandler, RequestHandleRest, RequestHandleResult } from './types';
+import { type ExpressableIncomingMessage } from './request-listener';
+export declare class ORPCHandler<T extends Context> implements RequestHandler<T> {
     private readonly orpcFetchHandler;
     constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>>);
-    condition(request: IncomingMessage): boolean;
-    handle(req: IncomingMessage, res: ServerResponse, ...[options]: [options: RequestOptions<T>] | (undefined extends T ? [] : never)): Promise<void>;
+    handle(req: ExpressableIncomingMessage, res: ServerResponse, ...[options]: RequestHandleRest<T>): Promise<RequestHandleResult>;
 }
 //# sourceMappingURL=orpc-handler.d.ts.map

package/dist/src/adapters/node/request-listener.d.ts

@@ -0,0 +1,28 @@
+import type { IncomingMessage, ServerResponse } from 'node:http';
+export interface ExpressableIncomingMessage extends IncomingMessage {
+    originalUrl?: string;
+}
+/**
+ * Creates a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) object from a Node.js
+ * [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage) and
+ * [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) pair.
+ *
+ */
+export declare function createRequest(req: ExpressableIncomingMessage, res: ServerResponse): Request;
+/**
+ * Creates a [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object from the headers
+ * in a Node.js [`IncomingMessage`](https://nodejs.org/api/http.html#class-httpincomingmessage).
+ *
+ * @param req The incoming request object.
+ * @returns A headers object.
+ */
+export declare function createHeaders(req: IncomingMessage): Headers;
+/**
+ * Sends a [`Response`](https://developer.mozilla.org/en-US/docs/Web/API/Response) to the client using the
+ * Node.js [`http.ServerResponse`](https://nodejs.org/api/http.html#class-httpserverresponse) object.
+ *
+ * @param res The server response object.
+ * @param response The response to send.
+ */
+export declare function sendResponse(res: ServerResponse, response: Response): Promise<void>;
+//# sourceMappingURL=request-listener.d.ts.map

package/dist/src/adapters/node/types.d.ts

@@ -1,21 +1,22 @@
-import type { RequestOptions as BaseRequestOptions } from '@mjackson/node-fetch-server';
 import type { HTTPPath } from '@orpc/contract';
 import type { Promisable } from '@orpc/shared';
 import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Context, WithSignal } from '../../types';
-export type RequestOptions<T extends Context> = BaseRequestOptions & WithSignal & {
+import type { Context } from '../../types';
+export type RequestHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
+    beforeSend?: (response: Response, context: T) => Promisable<void>;
 } & (undefined extends T ? {
     context?: T;
 } : {
     context: T;
-}) & {
-    beforeSend?: (response: Response, context: T) => Promisable<void>;
+});
+export type RequestHandleRest<T extends Context> = [options: RequestHandleOptions<T>] | (undefined extends T ? [] : never);
+export type RequestHandleResult = {
+    matched: true;
+} | {
+    matched: false;
 };
 export interface RequestHandler<T extends Context> {
-    handle: (req: IncomingMessage, res: ServerResponse, ...opt: [options: RequestOptions<T>] | (undefined extends T ? [] : never)) => void;
-}
-export interface ConditionalRequestHandler<T extends Context> extends RequestHandler<T> {
-    condition: (request: IncomingMessage) => boolean;
+    handle: (req: IncomingMessage, res: ServerResponse, ...rest: RequestHandleRest<T>) => Promise<RequestHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -24,6 +24,16 @@
       "import": "./dist/fetch.js",
       "default": "./dist/fetch.js"
     },
+    "./hono": {
+      "types": "./dist/src/adapters/hono/index.d.ts",
+      "import": "./dist/hono.js",
+      "default": "./dist/hono.js"
+    },
+    "./next": {
+      "types": "./dist/src/adapters/next/index.d.ts",
+      "import": "./dist/next.js",
+      "default": "./dist/next.js"
+    },
     "./node": {
       "types": "./dist/src/adapters/node/index.d.ts",
       "import": "./dist/node.js",
@@ -38,16 +48,16 @@
     "!**/*.tsbuildinfo",
     "dist"
   ],
-  "dependencies": {
-    "@mjackson/node-fetch-server": "^0.5.0",
-    "@orpc/contract": "0.26.0",
-    "@orpc/shared": "0.26.0"
+  "peerDependencies": {
+    "hono": ">=4.6.0",
+    "next": ">=14.0.0"
   },
-  "devDependencies": {
-    "zod": "^3.24.1"
+  "dependencies": {
+    "@orpc/contract": "0.27.0",
+    "@orpc/shared": "0.27.0"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --entry.node=src/adapters/node/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "tsup --onSuccess='tsc -b --noCheck'",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/src/adapters/fetch/composite-handler.d.ts

@@ -1,8 +0,0 @@
-import type { Context } from '../../types';
-import type { ConditionalFetchHandler, FetchHandler, FetchOptions } from './types';
-export declare class CompositeHandler<T extends Context> implements FetchHandler<T> {
-    private readonly handlers;
-    constructor(handlers: ConditionalFetchHandler<T>[]);
-    fetch(request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
-}
-//# sourceMappingURL=composite-handler.d.ts.map

package/dist/src/adapters/node/composite-handler.d.ts

@@ -1,9 +0,0 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Context } from '../../types';
-import type { ConditionalRequestHandler, RequestHandler, RequestOptions } from './types';
-export declare class CompositeHandler<T extends Context> implements RequestHandler<T> {
-    private readonly handlers;
-    constructor(handlers: ConditionalRequestHandler<T>[]);
-    handle(req: IncomingMessage, res: ServerResponse, ...opt: [options: RequestOptions<T>] | (undefined extends T ? [] : never)): Promise<void>;
-}
-//# sourceMappingURL=composite-handler.d.ts.map