@orpc/standard-server-node 1.2.0 → 1.4.0

package/README.md

@@ -49,6 +49,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
 - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).

package/dist/index.d.mts

@@ -1,28 +1,11 @@
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { Readable } from 'node:stream';
+import { ToEventStreamOptions as ToEventStreamOptions$1 } from '@orpc/standard-server-fetch';
+import Stream, { Readable } from 'node:stream';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 
 declare function toEventIterator(stream: Readable): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
-interface ToEventStreamOptions {
-    /**
-     * If true, a ping comment is sent periodically to keep the connection alive.
-     *
-     * @default true
-     */
-    eventIteratorKeepAliveEnabled?: boolean;
-    /**
-     * Interval (in milliseconds) between ping comments sent after the last event.
-     *
-     * @default 5000
-     */
-    eventIteratorKeepAliveInterval?: number;
-    /**
-     * The content of the ping comment. Must not include newline characters.
-     *
-     * @default ''
-     */
-    eventIteratorKeepAliveComment?: string;
+interface ToEventStreamOptions extends ToEventStreamOptions$1 {
 }
 declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): Readable;
 
@@ -45,13 +28,17 @@ interface ToNodeHttpBodyOptions extends ToEventStreamOptions {
  */
 declare function toNodeHttpBody(body: StandardBody, headers: StandardHeaders, options?: ToNodeHttpBodyOptions): Readable | undefined | string;
 
+declare function toStandardMethod(method: string | undefined): string;
+
 declare function toStandardLazyRequest(req: NodeHttpRequest, res: NodeHttpResponse): StandardLazyRequest;
 
 interface SendStandardResponseOptions extends ToNodeHttpBodyOptions {
 }
 declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(res: NodeHttpResponse): AbortSignal;
+declare function toAbortSignal(stream: Stream.Writable): AbortSignal;
+
+declare function toStandardUrl(req: NodeHttpRequest): URL;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
 export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventStreamOptions, ToNodeHttpBodyOptions };

package/dist/index.d.ts

@@ -1,28 +1,11 @@
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-import { Readable } from 'node:stream';
+import { ToEventStreamOptions as ToEventStreamOptions$1 } from '@orpc/standard-server-fetch';
+import Stream, { Readable } from 'node:stream';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
 
 declare function toEventIterator(stream: Readable): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
-interface ToEventStreamOptions {
-    /**
-     * If true, a ping comment is sent periodically to keep the connection alive.
-     *
-     * @default true
-     */
-    eventIteratorKeepAliveEnabled?: boolean;
-    /**
-     * Interval (in milliseconds) between ping comments sent after the last event.
-     *
-     * @default 5000
-     */
-    eventIteratorKeepAliveInterval?: number;
-    /**
-     * The content of the ping comment. Must not include newline characters.
-     *
-     * @default ''
-     */
-    eventIteratorKeepAliveComment?: string;
+interface ToEventStreamOptions extends ToEventStreamOptions$1 {
 }
 declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): Readable;
 
@@ -45,13 +28,17 @@ interface ToNodeHttpBodyOptions extends ToEventStreamOptions {
  */
 declare function toNodeHttpBody(body: StandardBody, headers: StandardHeaders, options?: ToNodeHttpBodyOptions): Readable | undefined | string;
 
+declare function toStandardMethod(method: string | undefined): string;
+
 declare function toStandardLazyRequest(req: NodeHttpRequest, res: NodeHttpResponse): StandardLazyRequest;
 
 interface SendStandardResponseOptions extends ToNodeHttpBodyOptions {
 }
 declare function sendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(res: NodeHttpResponse): AbortSignal;
+declare function toAbortSignal(stream: Stream.Writable): AbortSignal;
+
+declare function toStandardUrl(req: NodeHttpRequest): URL;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };
 export type { NodeHttpRequest, NodeHttpResponse, SendStandardResponseOptions, ToEventStreamOptions, ToNodeHttpBodyOptions };

package/dist/index.mjs

@@ -1,103 +1,16 @@
 import { Readable } from 'node:stream';
-import { createAsyncIteratorObject, parseEmptyableJSON, isTypescriptObject, stringifyJSON, isAsyncIteratorObject, once } from '@orpc/shared';
-import { EventDecoderStream, withEventMeta, ErrorEvent, encodeEventMessage, getEventMeta, getFilenameFromContentDisposition, flattenHeader, generateContentDisposition } from '@orpc/standard-server';
+import { parseEmptyableJSON, isAsyncIteratorObject, stringifyJSON, once } from '@orpc/shared';
+import { getFilenameFromContentDisposition, flattenHeader, generateContentDisposition } from '@orpc/standard-server';
+import { toEventIterator as toEventIterator$1, toEventStream as toEventStream$1 } from '@orpc/standard-server-fetch';
 
 function toEventIterator(stream) {
-  const eventStream = Readable.toWeb(stream).pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
-  const reader = eventStream.getReader();
-  return createAsyncIteratorObject(async () => {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) {
-        return { done: true, value: void 0 };
-      }
-      switch (value.event) {
-        case "message": {
-          let message = parseEmptyableJSON(value.data);
-          if (isTypescriptObject(message)) {
-            message = withEventMeta(message, value);
-          }
-          return { done: false, value: message };
-        }
-        case "error": {
-          let error = new ErrorEvent({
-            data: parseEmptyableJSON(value.data)
-          });
-          error = withEventMeta(error, value);
-          throw error;
-        }
-        case "done": {
-          let done2 = parseEmptyableJSON(value.data);
-          if (isTypescriptObject(done2)) {
-            done2 = withEventMeta(done2, value);
-          }
-          return { done: true, value: done2 };
-        }
-      }
-    }
-  }, async () => {
-    await reader.cancel();
-  });
+  return toEventIterator$1(Readable.toWeb(stream));
 }
 function toEventStream(iterator, options = {}) {
-  const keepAliveEnabled = options.eventIteratorKeepAliveEnabled ?? true;
-  const keepAliveInterval = options.eventIteratorKeepAliveInterval ?? 5e3;
-  const keepAliveComment = options.eventIteratorKeepAliveComment ?? "";
-  let cancelled = false;
-  let timeout;
-  const stream = new ReadableStream({
-    async pull(controller) {
-      try {
-        if (keepAliveEnabled) {
-          timeout = setInterval(() => {
-            controller.enqueue(encodeEventMessage({
-              comments: [keepAliveComment]
-            }));
-          }, keepAliveInterval);
-        }
-        const value = await iterator.next();
-        clearInterval(timeout);
-        if (cancelled) {
-          return;
-        }
-        const meta = getEventMeta(value.value);
-        if (!value.done || value.value !== void 0 || meta !== void 0) {
-          controller.enqueue(encodeEventMessage({
-            ...meta,
-            event: value.done ? "done" : "message",
-            data: stringifyJSON(value.value)
-          }));
-        }
-        if (value.done) {
-          controller.close();
-        }
-      } catch (err) {
-        clearInterval(timeout);
-        if (cancelled) {
-          return;
-        }
-        controller.enqueue(encodeEventMessage({
-          ...getEventMeta(err),
-          event: "error",
-          data: err instanceof ErrorEvent ? stringifyJSON(err.data) : void 0
-        }));
-        controller.close();
-      }
-    },
-    async cancel() {
-      cancelled = true;
-      clearInterval(timeout);
-      await iterator.return?.();
-    }
-  });
-  return Readable.fromWeb(stream);
+  return Readable.fromWeb(toEventStream$1(iterator, options));
 }
 
 async function toStandardBody(req) {
-  const method = req.method ?? "GET";
-  if (method === "GET" || method === "HEAD") {
-    return void 0;
-  }
   const contentDisposition = req.headers["content-disposition"];
   const contentType = req.headers["content-type"];
   if (typeof contentDisposition === "string") {
@@ -147,8 +60,6 @@ function toNodeHttpBody(body, headers, options = {}) {
   }
   if (isAsyncIteratorObject(body)) {
     headers["content-type"] = "text/event-stream";
-    headers["cache-control"] = "no-cache";
-    headers.connection = "keep-alive";
     return toEventStream(body, options);
   }
   headers["content-type"] = "application/json";
@@ -177,28 +88,32 @@ async function _streamToFile(stream, fileName, contentType) {
   return new File(chunks, fileName, { type: contentType });
 }
 
-function toAbortSignal(res) {
+function toStandardMethod(method) {
+  return method ?? "GET";
+}
+
+function toAbortSignal(stream) {
   const controller = new AbortController();
-  res.on("close", () => {
-    if (res.errored) {
-      controller.abort(res.errored.toString());
-    } else if (!res.writableFinished) {
-      controller.abort("Client connection prematurely closed.");
-    } else {
-      controller.abort("Server closed the connection.");
+  stream.once("error", (error) => controller.abort(error));
+  stream.once("close", () => {
+    if (!stream.writableFinished) {
+      controller.abort(new Error("Writable stream closed before it finished writing"));
     }
   });
   return controller.signal;
 }
 
-function toStandardLazyRequest(req, res) {
-  const method = req.method ?? "GET";
+function toStandardUrl(req) {
   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 url;
+}
+
+function toStandardLazyRequest(req, res) {
   return {
-    method,
-    url,
+    method: toStandardMethod(req.method),
+    url: toStandardUrl(req),
     headers: req.headers,
     body: once(() => toStandardBody(req)),
     signal: toAbortSignal(res)
@@ -207,24 +122,25 @@ function toStandardLazyRequest(req, res) {
 
 function sendStandardResponse(res, standardResponse, options = {}) {
   return new Promise((resolve, reject) => {
-    res.on("error", reject);
-    res.on("finish", resolve);
+    res.once("error", reject);
+    res.once("close", resolve);
     const resHeaders = { ...standardResponse.headers };
     const resBody = toNodeHttpBody(standardResponse.body, resHeaders, options);
     res.writeHead(standardResponse.status, resHeaders);
     if (resBody === void 0) {
-      res.end(resBody);
+      res.end();
     } else if (typeof resBody === "string") {
       res.end(resBody);
     } else {
-      res.on("close", () => {
+      res.once("close", () => {
         if (!resBody.closed) {
           resBody.destroy(res.errored ?? void 0);
         }
       });
+      resBody.once("error", (error) => res.destroy(error));
       resBody.pipe(res);
     }
   });
 }
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest };
+export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toNodeHttpBody, toStandardBody, toStandardLazyRequest, toStandardMethod, toStandardUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-node",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -23,11 +23,12 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.2.0",
-    "@orpc/standard-server": "1.2.0"
+    "@orpc/standard-server-fetch": "1.4.0",
+    "@orpc/standard-server": "1.4.0",
+    "@orpc/shared": "1.4.0"
   },
   "devDependencies": {
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.18",
     "@types/supertest": "^6.0.3",
     "supertest": "^7.1.0"
   },