@orpc/server 0.38.0 → 0.39.0

package/dist/{chunk-GIXDBJGV.js → chunk-DAUWED3D.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-XP6YRLY2.js";
 import {
   CompositePlugin
-} from "./chunk-XFBAK67J.js";
+} from "./chunk-XI6WGCB3.js";
 
 // src/adapters/standard/handler.ts
 import { toORPCError } from "@orpc/contract";
@@ -316,4 +316,4 @@ export {
   RPCCodec,
   RPCMatcher
 };
-//# sourceMappingURL=chunk-GIXDBJGV.js.map
+//# sourceMappingURL=chunk-DAUWED3D.js.map

package/dist/chunk-N2FJGXSJ.js

@@ -0,0 +1,32 @@
+import {
+  RPCCodec,
+  RPCMatcher,
+  StandardHandler
+} from "./chunk-DAUWED3D.js";
+
+// src/adapters/fetch/rpc-handler.ts
+import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
+var RPCHandler = class {
+  standardHandler;
+  constructor(router, options) {
+    const matcher = options?.matcher ?? new RPCMatcher();
+    const codec = options?.codec ?? new RPCCodec();
+    this.standardHandler = new StandardHandler(router, matcher, codec, options);
+  }
+  async handle(request, ...rest) {
+    const standardRequest = toStandardRequest(request);
+    const result = await this.standardHandler.handle(standardRequest, ...rest);
+    if (!result.matched) {
+      return result;
+    }
+    return {
+      matched: true,
+      response: toFetchResponse(result.response)
+    };
+  }
+};
+
+export {
+  RPCHandler
+};
+//# sourceMappingURL=chunk-N2FJGXSJ.js.map

package/dist/{chunk-XFBAK67J.js → chunk-XI6WGCB3.js}

@@ -21,12 +21,9 @@ var CORSPlugin = class {
   options;
   constructor(options) {
     const defaults = {
-      origin: "*",
+      origin: (origin) => origin,
       allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"]
     };
-    if (options?.credentials) {
-      defaults.origin = (origin) => origin;
-    }
     this.options = {
       ...defaults,
       ...options
@@ -125,4 +122,4 @@ export {
   CORSPlugin,
   ResponseHeadersPlugin
 };
-//# sourceMappingURL=chunk-XFBAK67J.js.map
+//# sourceMappingURL=chunk-XI6WGCB3.js.map

package/dist/fetch.js

@@ -1,16 +1,10 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-WJ2G7572.js";
-import "./chunk-GIXDBJGV.js";
+  RPCHandler
+} from "./chunk-N2FJGXSJ.js";
+import "./chunk-DAUWED3D.js";
 import "./chunk-XP6YRLY2.js";
-import "./chunk-XFBAK67J.js";
+import "./chunk-XI6WGCB3.js";
 export {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
+  RPCHandler
 };
 //# sourceMappingURL=fetch.js.map

package/dist/hono.js

@@ -1,12 +1,9 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-WJ2G7572.js";
-import "./chunk-GIXDBJGV.js";
+  RPCHandler
+} from "./chunk-N2FJGXSJ.js";
+import "./chunk-DAUWED3D.js";
 import "./chunk-XP6YRLY2.js";
-import "./chunk-XFBAK67J.js";
+import "./chunk-XI6WGCB3.js";
 
 // src/adapters/hono/middleware.ts
 import { value } from "@orpc/shared";
@@ -32,9 +29,6 @@ function createMiddleware(handler, ...[options]) {
 }
 export {
   RPCHandler,
-  createMiddleware,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
+  createMiddleware
 };
 //# sourceMappingURL=hono.js.map

package/dist/next.js

@@ -1,12 +1,9 @@
 import {
-  RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse
-} from "./chunk-WJ2G7572.js";
-import "./chunk-GIXDBJGV.js";
+  RPCHandler
+} from "./chunk-N2FJGXSJ.js";
+import "./chunk-DAUWED3D.js";
 import "./chunk-XP6YRLY2.js";
-import "./chunk-XFBAK67J.js";
+import "./chunk-XI6WGCB3.js";
 
 // src/adapters/next/serve.ts
 import { value } from "@orpc/shared";
@@ -29,9 +26,6 @@ function serve(handler, ...[options]) {
 }
 export {
   RPCHandler,
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  serve,
-  standardResponseToFetchResponse
+  serve
 };
 //# sourceMappingURL=next.js.map

package/dist/node.js

@@ -2,149 +2,12 @@ import {
   RPCCodec,
   RPCMatcher,
   StandardHandler
-} from "./chunk-GIXDBJGV.js";
+} from "./chunk-DAUWED3D.js";
 import "./chunk-XP6YRLY2.js";
-import "./chunk-XFBAK67J.js";
-
-// 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 protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
-  const host = req.headers.host ?? "localhost";
-  const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
-  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 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 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");
-    }
-  }
-  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);
-  }
-  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;
-}
+import "./chunk-XI6WGCB3.js";
 
 // src/adapters/node/rpc-handler.ts
+import { sendStandardResponse, toStandardRequest } from "@orpc/server-standard-node";
 var RPCHandler = class {
   standardHandler;
   constructor(router, options) {
@@ -153,18 +16,16 @@ var RPCHandler = class {
     this.standardHandler = new StandardHandler(router, matcher, codec, options);
   }
   async handle(req, res, ...rest) {
-    const standardRequest = nodeHttpToStandardRequest(req, res);
+    const standardRequest = toStandardRequest(req, res);
     const result = await this.standardHandler.handle(standardRequest, ...rest);
     if (!result.matched) {
       return { matched: false };
     }
-    await nodeHttpResponseSendStandardResponse(res, result.response);
+    await sendStandardResponse(res, result.response);
     return { matched: true };
   }
 };
 export {
-  RPCHandler,
-  nodeHttpResponseSendStandardResponse,
-  nodeHttpToStandardRequest
+  RPCHandler
 };
 //# sourceMappingURL=node.js.map

package/dist/plugins.js

@@ -2,7 +2,7 @@ import {
   CORSPlugin,
   CompositePlugin,
   ResponseHeadersPlugin
-} from "./chunk-XFBAK67J.js";
+} from "./chunk-XI6WGCB3.js";
 export {
   CORSPlugin,
   CompositePlugin,

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

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

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

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

package/dist/src/adapters/standard/handler.d.ts

@@ -1,10 +1,11 @@
 import type { ErrorMap, HTTPPath, Meta, Schema } from '@orpc/contract';
+import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
 import type { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
 import type { Context } from '../../context';
 import type { Plugin } from '../../plugins';
 import type { CreateProcedureClientOptions } from '../../procedure-client';
 import type { Router } from '../../router';
-import type { StandardCodec, StandardMatcher, StandardRequest, StandardResponse } from './types';
+import type { StandardCodec, StandardMatcher } from './types';
 export type StandardHandleOptions<T extends Context> = {
     prefix?: HTTPPath;
 } & (Record<never, never> extends T ? {

package/dist/src/adapters/standard/rpc-codec.d.ts

@@ -1,6 +1,7 @@
 import type { ORPCError } from '@orpc/contract';
+import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
 import type { AnyProcedure } from '../../procedure';
-import type { StandardCodec, StandardParams, StandardRequest, StandardResponse } from './types';
+import type { StandardCodec, StandardParams } from './types';
 import { RPCSerializer } from './rpc-serializer';
 export interface StandardCodecOptions {
     serializer?: RPCSerializer;

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

@@ -1,31 +1,7 @@
 import type { HTTPPath, ORPCError } from '@orpc/contract';
-import type { JsonValue } from '@orpc/shared';
+import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
 import type { AnyProcedure } from '../../procedure';
 import type { AnyRouter } from '../../router';
-export interface StandardHeaders {
-    [key: string]: string | string[] | undefined;
-}
-export type StandardBody = undefined | JsonValue | Blob | URLSearchParams | FormData;
-export interface StandardRequest {
-    /**
-     * Can be { request: Request } or { request: IncomingMessage, response: ServerResponse } based on the adapter.
-     */
-    raw: Record<string, unknown>;
-    method: string;
-    url: URL;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed base on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body(): Promise<StandardBody>;
-    signal?: AbortSignal;
-}
-export interface StandardResponse {
-    status: number;
-    headers: StandardHeaders;
-    body: StandardBody;
-}
 export type StandardParams = Record<string, string>;
 export type StandardMatchResult = {
     path: string[];

package/dist/standard.js

@@ -4,9 +4,9 @@ import {
   RPCSerializer,
   StandardHandler,
   serializeRPCJson
-} from "./chunk-GIXDBJGV.js";
+} from "./chunk-DAUWED3D.js";
 import "./chunk-XP6YRLY2.js";
-import "./chunk-XFBAK67J.js";
+import "./chunk-XI6WGCB3.js";
 export {
   RPCCodec,
   RPCMatcher,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -63,9 +63,12 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
+    "@orpc/server-standard": "^0.0.0",
+    "@orpc/server-standard-fetch": "^0.0.0",
+    "@orpc/server-standard-node": "^0.0.0",
     "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/contract": "0.38.0",
-    "@orpc/shared": "0.38.0"
+    "@orpc/contract": "0.39.0",
+    "@orpc/shared": "0.39.0"
   },
   "devDependencies": {
     "light-my-request": "^6.5.1"

package/dist/chunk-WJ2G7572.js

@@ -1,145 +0,0 @@
-import {
-  RPCCodec,
-  RPCMatcher,
-  StandardHandler
-} from "./chunk-GIXDBJGV.js";
-
-// src/adapters/fetch/utils.ts
-import { once } from "@orpc/shared";
-import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
-function fetchHeadersToStandardHeaders(headers) {
-  const standardHeaders = {};
-  for (const [key, value] of headers) {
-    if (Array.isArray(standardHeaders[key])) {
-      standardHeaders[key].push(value);
-    } else if (standardHeaders[key] !== void 0) {
-      standardHeaders[key] = [standardHeaders[key], value];
-    } else {
-      standardHeaders[key] = value;
-    }
-  }
-  return standardHeaders;
-}
-async function fetchReToStandardBody(re) {
-  if (!re.body) {
-    return void 0;
-  }
-  const contentDisposition2 = re.headers.get("content-disposition");
-  if (contentDisposition2) {
-    const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
-    if (typeof fileName === "string") {
-      const blob2 = await re.blob();
-      return new File([blob2], fileName, {
-        type: blob2.type
-      });
-    }
-  }
-  const contentType = re.headers.get("content-type");
-  if (!contentType || contentType.startsWith("application/json")) {
-    const text = await re.text();
-    if (!text) {
-      return void 0;
-    }
-    return JSON.parse(text);
-  }
-  if (contentType.startsWith("multipart/form-data")) {
-    return await re.formData();
-  }
-  if (contentType.startsWith("application/x-www-form-urlencoded")) {
-    return new URLSearchParams(await re.text());
-  }
-  if (contentType.startsWith("text/")) {
-    return await re.text();
-  }
-  const blob = await re.blob();
-  return new File([blob], "blob", {
-    type: blob.type
-  });
-}
-function fetchRequestToStandardRequest(request) {
-  const url = new URL(request.url);
-  return {
-    raw: { request },
-    url,
-    signal: request.signal,
-    method: request.method,
-    body: once(() => {
-      return fetchReToStandardBody(request);
-    }),
-    get headers() {
-      const headers = fetchHeadersToStandardHeaders(request.headers);
-      Object.defineProperty(this, "headers", { value: headers, writable: true });
-      return headers;
-    },
-    set headers(value) {
-      Object.defineProperty(this, "headers", { value, writable: true });
-    }
-  };
-}
-function standardResponseToFetchHeaders(response) {
-  const fetchHeaders = new Headers();
-  for (const [key, value] of Object.entries(response.headers)) {
-    if (Array.isArray(value)) {
-      for (const v of value) {
-        fetchHeaders.append(key, v);
-      }
-    } else if (value !== void 0) {
-      fetchHeaders.append(key, value);
-    }
-  }
-  return fetchHeaders;
-}
-function standardResponseToFetchResponse(response) {
-  const resHeaders = standardResponseToFetchHeaders(response);
-  resHeaders.delete("content-type");
-  resHeaders.delete("content-disposition");
-  if (response.body === void 0) {
-    return new Response(void 0, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof Blob) {
-    resHeaders.set("content-type", response.body.type);
-    resHeaders.set("content-length", response.body.size.toString());
-    resHeaders.set(
-      "content-disposition",
-      contentDisposition(response.body instanceof File ? response.body.name : "blob", { type: "inline" })
-    );
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof FormData) {
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  if (response.body instanceof URLSearchParams) {
-    return new Response(response.body, { headers: resHeaders, status: response.status });
-  }
-  resHeaders.set("content-type", "application/json");
-  return new Response(JSON.stringify(response.body), { headers: resHeaders, status: response.status });
-}
-
-// src/adapters/fetch/rpc-handler.ts
-var RPCHandler = class {
-  standardHandler;
-  constructor(router, options) {
-    const matcher = options?.matcher ?? new RPCMatcher();
-    const codec = options?.codec ?? new RPCCodec();
-    this.standardHandler = new StandardHandler(router, matcher, codec, options);
-  }
-  async handle(request, ...rest) {
-    const standardRequest = fetchRequestToStandardRequest(request);
-    const result = await this.standardHandler.handle(standardRequest, ...rest);
-    if (!result.matched) {
-      return result;
-    }
-    return {
-      matched: true,
-      response: standardResponseToFetchResponse(result.response)
-    };
-  }
-};
-
-export {
-  fetchReToStandardBody,
-  fetchRequestToStandardRequest,
-  standardResponseToFetchResponse,
-  RPCHandler
-};
-//# sourceMappingURL=chunk-WJ2G7572.js.map

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

@@ -1,5 +0,0 @@
-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/node/utils.d.ts

@@ -1,5 +0,0 @@
-import type { StandardRequest, StandardResponse } from '../standard';
-import type { NodeHttpRequest, NodeHttpResponse } from './types';
-export declare function nodeHttpToStandardRequest(req: NodeHttpRequest, res: NodeHttpResponse): StandardRequest;
-export declare function nodeHttpResponseSendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse): Promise<void>;
-//# sourceMappingURL=utils.d.ts.map