@orpc/server 0.0.0-next.bc564a6 → 0.0.0-next.bc9d3dd

package/dist/chunk-XFBAK67J.js

@@ -0,0 +1,128 @@
+// src/plugins/base.ts
+var CompositePlugin = class {
+  constructor(plugins = []) {
+    this.plugins = plugins;
+  }
+  init(options) {
+    for (const plugin of this.plugins) {
+      plugin.init?.(options);
+    }
+  }
+  beforeCreateProcedureClient(clientOptions, interceptorOptions) {
+    for (const plugin of this.plugins) {
+      plugin.beforeCreateProcedureClient?.(clientOptions, interceptorOptions);
+    }
+  }
+};
+
+// src/plugins/cors.ts
+import { value } from "@orpc/shared";
+var CORSPlugin = class {
+  options;
+  constructor(options) {
+    const defaults = {
+      origin: "*",
+      allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"]
+    };
+    if (options?.credentials) {
+      defaults.origin = (origin) => origin;
+    }
+    this.options = {
+      ...defaults,
+      ...options
+    };
+  }
+  init(options) {
+    options.interceptorsRoot ??= [];
+    options.interceptorsRoot.unshift(async (interceptorOptions) => {
+      if (interceptorOptions.request.method === "OPTIONS") {
+        const resHeaders = {};
+        if (this.options.maxAge !== void 0) {
+          resHeaders["access-control-max-age"] = this.options.maxAge.toString();
+        }
+        if (this.options.allowMethods?.length) {
+          resHeaders["access-control-allow-methods"] = this.options.allowMethods.join(",");
+        }
+        const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers["access-control-request-headers"];
+        if (Array.isArray(allowHeaders) && allowHeaders.length) {
+          resHeaders["access-control-allow-headers"] = allowHeaders.join(",");
+        } else if (typeof allowHeaders === "string") {
+          resHeaders["access-control-allow-headers"] = allowHeaders;
+        }
+        return {
+          matched: true,
+          response: {
+            status: 204,
+            headers: resHeaders,
+            body: void 0
+          }
+        };
+      }
+      return interceptorOptions.next();
+    });
+    options.interceptorsRoot.unshift(async (interceptorOptions) => {
+      const result = await interceptorOptions.next();
+      if (!result.matched) {
+        return result;
+      }
+      const origin = Array.isArray(interceptorOptions.request.headers.origin) ? interceptorOptions.request.headers.origin.join(",") : interceptorOptions.request.headers.origin || "";
+      const allowedOrigin = await value(this.options.origin, origin, interceptorOptions);
+      const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin];
+      if (allowedOriginArr.includes("*")) {
+        result.response.headers["access-control-allow-origin"] = "*";
+      } else {
+        if (allowedOriginArr.includes(origin)) {
+          result.response.headers["access-control-allow-origin"] = origin;
+        }
+        result.response.headers.vary = interceptorOptions.request.headers.vary ?? "origin";
+      }
+      const allowedTimingOrigin = await value(this.options.timingOrigin, origin, interceptorOptions);
+      const allowedTimingOriginArr = Array.isArray(allowedTimingOrigin) ? allowedTimingOrigin : [allowedTimingOrigin];
+      if (allowedTimingOriginArr.includes("*")) {
+        result.response.headers["timing-allow-origin"] = "*";
+      } else if (allowedTimingOriginArr.includes(origin)) {
+        result.response.headers["timing-allow-origin"] = origin;
+      }
+      if (this.options.credentials) {
+        result.response.headers["access-control-allow-credentials"] = "true";
+      }
+      if (this.options.exposeHeaders?.length) {
+        result.response.headers["access-control-expose-headers"] = this.options.exposeHeaders.join(",");
+      }
+      return result;
+    });
+  }
+};
+
+// src/plugins/response-headers.ts
+var ResponseHeadersPlugin = class {
+  init(options) {
+    options.interceptorsRoot ??= [];
+    options.interceptorsRoot.push(async (interceptorOptions) => {
+      const headers = new Headers();
+      interceptorOptions.context.resHeaders = headers;
+      const result = await interceptorOptions.next();
+      if (!result.matched) {
+        return result;
+      }
+      const responseHeaders = result.response.headers;
+      for (const [key, value2] of headers) {
+        if (Array.isArray(responseHeaders[key])) {
+          responseHeaders[key].push(value2);
+        } else if (responseHeaders[key] !== void 0) {
+          responseHeaders[key] = [responseHeaders[key], value2];
+        } else {
+          responseHeaders[key] = value2;
+        }
+      }
+      return result;
+    });
+  }
+};
+
+export {
+  CompositePlugin,
+  CORSPlugin,
+  ResponseHeadersPlugin
+};
+//# sourceMappingURL=chunk-XFBAK67J.js.map

package/dist/fetch.js

@@ -1,15 +1,16 @@
-import "./chunk-WUOGVGWG.js";
 import {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports
-} from "./chunk-ESTRJAOX.js";
-import "./chunk-KK4SDLC7.js";
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  standardResponseToFetchResponse
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 export {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports as SuperJSON
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  standardResponseToFetchResponse
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,30 +1,40 @@
-import "./chunk-WUOGVGWG.js";
 import {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports
-} from "./chunk-ESTRJAOX.js";
-import "./chunk-KK4SDLC7.js";
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  standardResponseToFetchResponse
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";
 function createMiddleware(handler, ...[options]) {
   return async (c, next) => {
+    const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
+    const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
+      // https://github.com/honojs/middleware/blob/main/packages/trpc-server/src/index.ts#L39
+      get(target, prop) {
+        if (bodyProps.has(prop)) {
+          return () => c.req[prop]();
+        }
+        return Reflect.get(target, prop, target);
+      }
+    });
     const context = await value(options?.context ?? {}, c);
-    const { matched, response } = await handler.handle(c.req.raw, { ...options, context });
+    const { matched, response } = await handler.handle(request, { ...options, context });
     if (matched) {
-      c.res = response;
-      return;
+      return c.newResponse(response.body, response);
     }
     await next();
   };
 }
 export {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports as SuperJSON,
-  createMiddleware
+  createMiddleware,
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  standardResponseToFetchResponse
 };
 //# sourceMappingURL=hono.js.map

package/dist/index.js

@@ -3,10 +3,14 @@ import {
   Procedure,
   adaptRouter,
   addMiddleware,
+  convertPathToHttpPath,
   createAccessibleLazyRouter,
+  createContractedProcedure,
   createLazyProcedureFormAnyLazy,
   createProcedureClient,
   deepSetLazyRouterPrefix,
+  eachAllContractProcedure,
+  eachContractProcedure,
   flatLazy,
   getLazyRouterPrefix,
   getRouterChild,
@@ -17,7 +21,7 @@ import {
   middlewareOutputFn,
   setRouterContract,
   unlazy
-} from "./chunk-KK4SDLC7.js";
+} from "./chunk-SV6DBVXJ.js";
 
 // src/builder.ts
 import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
@@ -354,6 +358,7 @@ function createRouterClient(router, ...rest) {
 
 // src/index.ts
 import { isDefinedError, ORPCError, safe, type, ValidationError } from "@orpc/contract";
+import { onError, onFinish, onStart, onSuccess } from "@orpc/shared";
 export {
   Builder,
   DecoratedProcedure,
@@ -363,12 +368,16 @@ export {
   ValidationError,
   adaptRouter,
   call,
+  convertPathToHttpPath,
   createAccessibleLazyRouter,
+  createContractedProcedure,
   createLazyProcedureFormAnyLazy,
   createProcedureClient,
   createRouterClient,
   decorateMiddleware,
   deepSetLazyRouterPrefix,
+  eachAllContractProcedure,
+  eachContractProcedure,
   fallbackConfig,
   flatLazy,
   getLazyRouterPrefix,
@@ -382,6 +391,10 @@ export {
   lazy,
   mergeContext,
   middlewareOutputFn,
+  onError,
+  onFinish,
+  onStart,
+  onSuccess,
   os,
   safe,
   setRouterContract,

package/dist/next.js

@@ -1,11 +1,12 @@
-import "./chunk-WUOGVGWG.js";
 import {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports
-} from "./chunk-ESTRJAOX.js";
-import "./chunk-KK4SDLC7.js";
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  standardResponseToFetchResponse
+} from "./chunk-4IQKTPXM.js";
+import "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -27,10 +28,10 @@ function serve(handler, ...[options]) {
   };
 }
 export {
-  ORPCPayloadCodec,
-  ORPCProcedureMatcher,
   RPCHandler,
-  super_json_exports as SuperJSON,
-  serve
+  fetchReToStandardBody,
+  fetchRequestToStandardRequest,
+  serve,
+  standardResponseToFetchResponse
 };
 //# sourceMappingURL=next.js.map

package/dist/node.js

@@ -1,87 +1,170 @@
 import {
-  RPCHandler
-} from "./chunk-ESTRJAOX.js";
-import "./chunk-KK4SDLC7.js";
+  RPCCodec,
+  RPCMatcher,
+  StandardHandler
+} from "./chunk-SD2T3J2Z.js";
+import "./chunk-SV6DBVXJ.js";
+import "./chunk-XFBAK67J.js";
 
-// src/adapters/node/request-listener.ts
-function createRequest(req, res) {
-  const controller = new AbortController();
-  res.on("close", () => {
-    controller.abort();
-  });
+// src/adapters/node/utils.ts
+import { Buffer, File } from "node:buffer";
+import { Readable } from "node:stream";
+import { once } from "@orpc/shared";
+import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
+function nodeHttpToStandardRequest(req, res) {
   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 host = req.headers.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);
+  return {
+    raw: { request: req, response: res },
+    method,
+    url,
+    headers: req.headers,
+    body: once(() => {
+      return nodeHttpRequestToStandardBody(req);
+    }),
+    get signal() {
+      const signal = nodeHttpResponseToAbortSignal(res);
+      Object.defineProperty(this, "signal", { value: signal, writable: true });
+      return signal;
+    },
+    set signal(value) {
+      Object.defineProperty(this, "signal", { value, writable: true });
+    }
+  };
 }
-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]);
-  }
-  return headers;
+function nodeHttpResponseSendStandardResponse(res, standardResponse) {
+  return new Promise((resolve, reject) => {
+    res.on("error", reject);
+    res.on("finish", resolve);
+    const resHeaders = standardResponse.headers;
+    delete resHeaders["content-type"];
+    delete resHeaders["content-disposition"];
+    if (standardResponse.body === void 0) {
+      res.writeHead(standardResponse.status, standardResponse.headers);
+      res.end();
+      return;
+    }
+    if (standardResponse.body instanceof Blob) {
+      resHeaders["content-type"] = standardResponse.body.type;
+      resHeaders["content-length"] = standardResponse.body.size.toString();
+      resHeaders["content-disposition"] = contentDisposition(
+        standardResponse.body instanceof File ? standardResponse.body.name : "blob",
+        { type: "inline" }
+      );
+      res.writeHead(standardResponse.status, resHeaders);
+      Readable.fromWeb(
+        standardResponse.body.stream()
+        // Conflict between types=node and lib=dom so we need to cast it
+      ).pipe(res);
+      return;
+    }
+    if (standardResponse.body instanceof FormData) {
+      const response = new Response(standardResponse.body);
+      resHeaders["content-type"] = response.headers.get("content-type");
+      res.writeHead(standardResponse.status, resHeaders);
+      Readable.fromWeb(
+        response.body
+        // Conflict between types=node and lib=dom so we need to cast it
+      ).pipe(res);
+      return;
+    }
+    if (standardResponse.body instanceof URLSearchParams) {
+      resHeaders["content-type"] = "application/x-www-form-urlencoded";
+      res.writeHead(standardResponse.status, resHeaders);
+      res.end(standardResponse.body.toString());
+      return;
+    }
+    resHeaders["content-type"] = "application/json";
+    res.writeHead(standardResponse.status, resHeaders);
+    res.end(JSON.stringify(standardResponse.body));
+  });
 }
-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;
+async function nodeHttpRequestToStandardBody(req) {
+  const method = req.method ?? "GET";
+  if (method === "GET" || method === "HEAD") {
+    return void 0;
+  }
+  const contentDisposition2 = req.headers["content-disposition"];
+  const contentType = req.headers["content-type"];
+  if (contentDisposition2) {
+    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
+    if (typeof fileName === "string") {
+      return await streamToFile(req, fileName, contentType || "application/octet-stream");
     }
   }
-  res.writeHead(response.status, headers);
-  if (response.body != null && res.req.method !== "HEAD") {
-    for await (const chunk of response.body) {
-      res.write(chunk);
+  if (!contentType || contentType.startsWith("application/json")) {
+    const text = await streamToString(req);
+    if (!text) {
+      return void 0;
     }
+    return JSON.parse(text);
+  }
+  if (contentType.startsWith("multipart/form-data")) {
+    return await streamToFormData(req, contentType);
   }
-  res.end();
+  if (contentType.startsWith("application/x-www-form-urlencoded")) {
+    const text = await streamToString(req);
+    return new URLSearchParams(text);
+  }
+  if (contentType.startsWith("text/")) {
+    return await streamToString(req);
+  }
+  return streamToFile(req, "blob", contentType);
+}
+function streamToFormData(stream, contentType) {
+  const response = new Response(stream, {
+    // Conflict between types=node and lib=dom so we need to cast it
+    headers: {
+      "content-type": contentType
+    }
+  });
+  return response.formData();
+}
+async function streamToString(stream) {
+  let string = "";
+  for await (const chunk of stream) {
+    string += chunk.toString();
+  }
+  return string;
+}
+async function streamToFile(stream, fileName, contentType) {
+  const chunks = [];
+  for await (const chunk of stream) {
+    chunks.push(chunk);
+  }
+  return new File([Buffer.concat(chunks)], fileName, { type: contentType });
+}
+function nodeHttpResponseToAbortSignal(res) {
+  const controller = new AbortController();
+  res.on("close", () => {
+    controller.abort();
+  });
+  return controller.signal;
 }
 
-// src/adapters/node/orpc-handler.ts
-var RPCHandler2 = class {
-  orpcFetchHandler;
+// src/adapters/node/rpc-handler.ts
+var RPCHandler = class {
+  standardHandler;
   constructor(router, options) {
-    this.orpcFetchHandler = new RPCHandler(router, options);
+    const codec = options?.codec ?? new RPCCodec();
+    const matcher = options?.matcher ?? new RPCMatcher();
+    this.standardHandler = new StandardHandler(router, matcher, codec, options);
   }
   async handle(req, res, ...rest) {
-    const request = createRequest(req, res);
-    const result = await this.orpcFetchHandler.handle(request, ...rest);
-    if (result.matched === false) {
+    const standardRequest = nodeHttpToStandardRequest(req, res);
+    const result = await this.standardHandler.handle(standardRequest, ...rest);
+    if (!result.matched) {
       return { matched: false };
     }
-    const context = rest[0]?.context ?? {};
-    await rest[0]?.beforeSend?.(result.response, context);
-    await sendResponse(res, result.response);
+    await nodeHttpResponseSendStandardResponse(res, result.response);
     return { matched: true };
   }
 };
 export {
-  RPCHandler2 as RPCHandler,
-  createHeaders,
-  createRequest,
-  sendResponse
+  RPCHandler,
+  nodeHttpResponseSendStandardResponse,
+  nodeHttpToStandardRequest
 };
 //# sourceMappingURL=node.js.map

package/dist/plugins.js

@@ -0,0 +1,11 @@
+import {
+  CORSPlugin,
+  CompositePlugin,
+  ResponseHeadersPlugin
+} from "./chunk-XFBAK67J.js";
+export {
+  CORSPlugin,
+  CompositePlugin,
+  ResponseHeadersPlugin
+};
+//# sourceMappingURL=plugins.js.map

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

@@ -1,6 +1,4 @@
-export * from './orpc-handler';
-export * from './orpc-payload-codec';
-export * from './orpc-procedure-matcher';
-export * as SuperJSON from './super-json';
+export * from './rpc-handler';
 export * from './types';
+export * from './utils';
 //# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,10 @@
+import type { Context } from '../../context';
+import type { Router } from '../../router';
+import type { RPCHandlerOptions, StandardHandleRest } from '../standard';
+import type { FetchHandler, FetchHandleResult } from './types';
+export declare class RPCHandler<T extends Context> implements FetchHandler<T> {
+    private readonly standardHandler;
+    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
+    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
+}
+//# sourceMappingURL=rpc-handler.d.ts.map

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

@@ -1,13 +1,5 @@
-import type { HTTPPath } from '@orpc/contract';
 import type { Context } from '../../context';
-export type FetchHandleOptions<T extends Context> = {
-    prefix?: HTTPPath;
-} & (Record<never, never> extends T ? {
-    context?: T;
-} : {
-    context: T;
-});
-export type FetchHandleRest<T extends Context> = [options: FetchHandleOptions<T>] | (Record<never, never> extends T ? [] : never);
+import type { StandardHandleRest } from '../standard';
 export type FetchHandleResult = {
     matched: true;
     response: Response;
@@ -16,6 +8,6 @@ export type FetchHandleResult = {
     response: undefined;
 };
 export interface FetchHandler<T extends Context> {
-    handle(request: Request, ...rest: FetchHandleRest<T>): Promise<FetchHandleResult>;
+    handle(request: Request, ...rest: StandardHandleRest<T>): Promise<FetchHandleResult>;
 }
 //# sourceMappingURL=types.d.ts.map

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

@@ -0,0 +1,5 @@
+import type { StandardBody, StandardRequest, StandardResponse } from '../standard';
+export declare function fetchReToStandardBody(re: Request | Response): Promise<StandardBody>;
+export declare function fetchRequestToStandardRequest(request: Request): StandardRequest;
+export declare function standardResponseToFetchResponse(response: StandardResponse): Response;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -1,8 +1,9 @@
 import type { Context as HonoContext, MiddlewareHandler } from 'hono';
 import type { Context } from '../../context';
-import type { FetchHandleOptions, FetchHandler } from '../fetch';
+import type { FetchHandler } from '../fetch';
+import type { StandardHandleOptions } from '../standard';
 import { type Value } from '@orpc/shared';
-export type CreateMiddlewareOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+export type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [HonoContext]>;
 } : {
     context: Value<T, [HonoContext]>;

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

@@ -1,8 +1,9 @@
 import type { NextRequest } from 'next/server';
 import type { Context } from '../../context';
-import type { FetchHandleOptions, FetchHandler } from '../fetch';
+import type { FetchHandler } from '../fetch';
+import type { StandardHandleOptions } from '../standard';
 import { type Value } from '@orpc/shared';
-export type ServeOptions<T extends Context> = Omit<FetchHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
+export type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: Value<T, [NextRequest]>;
 } : {
     context: Value<T, [NextRequest]>;

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

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

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

@@ -0,0 +1,10 @@
+import type { Context } from '../../context';
+import type { Router } from '../../router';
+import type { RPCHandlerOptions, StandardHandleRest } from '../standard';
+import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from './types';
+export declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
+    private readonly standardHandler;
+    constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
+    handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: StandardHandleRest<T>): Promise<NodeHttpHandleResult>;
+}
+//# sourceMappingURL=rpc-handler.d.ts.map