@orpc/standard-server-aws-lambda 0.0.0-next.d9485b0 → 0.0.0-next.fd6982a

package/dist/index.d.mts

@@ -1,28 +1,7 @@
 import Stream, { Readable } from 'node:stream';
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-
-declare function toEventIterator(body: string | undefined): 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;
-}
-declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): Readable;
+import { ToNodeHttpBodyOptions } from '@orpc/standard-server-node';
+export { ToEventStreamOptions, toAbortSignal, toEventStream } from '@orpc/standard-server-node';
 
 interface APIGatewayProxyEventHeaders {
     [name: string]: string | undefined;
@@ -59,9 +38,11 @@ interface APIGatewayProxyEventV2 {
 }
 
 declare function toStandardBody(event: APIGatewayProxyEventV2): Promise<StandardBody>;
-interface ToLambdaBodyOptions extends ToEventStreamOptions {
+interface ToLambdaBodyOptions extends ToNodeHttpBodyOptions {
 }
-declare function toLambdaBody(body: StandardBody, headers: StandardHeaders, options?: ToLambdaBodyOptions): [body: undefined | string | Readable, headers: StandardHeaders];
+declare function toLambdaBody(standardBody: StandardBody, standardHeaders: StandardHeaders, options?: ToLambdaBodyOptions): [body: undefined | string | Readable, headers: StandardHeaders];
+
+declare function toEventIterator(body: string | undefined): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
 
 declare function toStandardHeaders(headers: APIGatewayProxyEventHeaders, cookies: string[] | undefined): StandardHeaders;
 declare function toLambdaHeaders(standard: StandardHeaders): [headers: APIGatewayProxyEventHeaders, setCookies: string[]];
@@ -72,11 +53,9 @@ interface SendStandardResponseOptions extends ToLambdaBodyOptions {
 }
 declare function sendStandardResponse(responseStream: Stream.Writable, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(responseStream: Stream.Writable): AbortSignal;
-
 declare function toStandardUrl(event: APIGatewayProxyEventV2): URL;
 
 type ResponseStream = Stream.Writable;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };
-export type { APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventStageVariables, APIGatewayProxyEventV2, ResponseStream, SendStandardResponseOptions, ToEventStreamOptions, ToLambdaBodyOptions };
+export { sendStandardResponse, toEventIterator, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };
+export type { APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventStageVariables, APIGatewayProxyEventV2, ResponseStream, SendStandardResponseOptions, ToLambdaBodyOptions };

package/dist/index.d.ts

@@ -1,28 +1,7 @@
 import Stream, { Readable } from 'node:stream';
 import { StandardBody, StandardHeaders, StandardLazyRequest, StandardResponse } from '@orpc/standard-server';
-
-declare function toEventIterator(body: string | undefined): 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;
-}
-declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): Readable;
+import { ToNodeHttpBodyOptions } from '@orpc/standard-server-node';
+export { ToEventStreamOptions, toAbortSignal, toEventStream } from '@orpc/standard-server-node';
 
 interface APIGatewayProxyEventHeaders {
     [name: string]: string | undefined;
@@ -59,9 +38,11 @@ interface APIGatewayProxyEventV2 {
 }
 
 declare function toStandardBody(event: APIGatewayProxyEventV2): Promise<StandardBody>;
-interface ToLambdaBodyOptions extends ToEventStreamOptions {
+interface ToLambdaBodyOptions extends ToNodeHttpBodyOptions {
 }
-declare function toLambdaBody(body: StandardBody, headers: StandardHeaders, options?: ToLambdaBodyOptions): [body: undefined | string | Readable, headers: StandardHeaders];
+declare function toLambdaBody(standardBody: StandardBody, standardHeaders: StandardHeaders, options?: ToLambdaBodyOptions): [body: undefined | string | Readable, headers: StandardHeaders];
+
+declare function toEventIterator(body: string | undefined): AsyncIteratorObject<unknown | void, unknown | void, void> & AsyncGenerator<unknown | void, unknown | void, void>;
 
 declare function toStandardHeaders(headers: APIGatewayProxyEventHeaders, cookies: string[] | undefined): StandardHeaders;
 declare function toLambdaHeaders(standard: StandardHeaders): [headers: APIGatewayProxyEventHeaders, setCookies: string[]];
@@ -72,11 +53,9 @@ interface SendStandardResponseOptions extends ToLambdaBodyOptions {
 }
 declare function sendStandardResponse(responseStream: Stream.Writable, standardResponse: StandardResponse, options?: SendStandardResponseOptions): Promise<void>;
 
-declare function toAbortSignal(responseStream: Stream.Writable): AbortSignal;
-
 declare function toStandardUrl(event: APIGatewayProxyEventV2): URL;
 
 type ResponseStream = Stream.Writable;
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };
-export type { APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventStageVariables, APIGatewayProxyEventV2, ResponseStream, SendStandardResponseOptions, ToEventStreamOptions, ToLambdaBodyOptions };
+export { sendStandardResponse, toEventIterator, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };
+export type { APIGatewayProxyEventHeaders, APIGatewayProxyEventPathParameters, APIGatewayProxyEventQueryStringParameters, APIGatewayProxyEventStageVariables, APIGatewayProxyEventV2, ResponseStream, SendStandardResponseOptions, ToLambdaBodyOptions };

package/dist/index.mjs

@@ -1,104 +1,22 @@
 import { Buffer } from 'node:buffer';
-import { Readable } from 'node:stream';
-import { createAsyncIteratorObject, parseEmptyableJSON, isTypescriptObject, stringifyJSON, isAsyncIteratorObject, toArray, once } from '@orpc/shared';
-import { EventDecoderStream, withEventMeta, ErrorEvent, encodeEventMessage, getEventMeta, getFilenameFromContentDisposition, flattenHeader, generateContentDisposition } from '@orpc/standard-server';
+import { parseEmptyableJSON, toArray, once } from '@orpc/shared';
+import { getFilenameFromContentDisposition, flattenHeader } from '@orpc/standard-server';
+import { toNodeHttpBody, toAbortSignal } from '@orpc/standard-server-node';
+export { toAbortSignal, toEventStream } from '@orpc/standard-server-node';
+import { toEventIterator as toEventIterator$1 } from '@orpc/standard-server-fetch';
 
 function toEventIterator(body) {
-  const eventStream = new ReadableStream({
-    pull(controller) {
-      if (typeof body === "string") {
+  if (body === void 0) {
+    return toEventIterator$1(null);
+  }
+  return toEventIterator$1(
+    new ReadableStream({
+      pull(controller) {
         controller.enqueue(body);
-      }
-      controller.close();
-    }
-  }).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();
-  });
-}
-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);
+    }).pipeThrough(new TextEncoderStream())
+  );
 }
 
 async function toStandardBody(event) {
@@ -126,35 +44,10 @@ async function toStandardBody(event) {
   }
   return _parseAsFile(event.body, event.isBase64Encoded, "blob", contentType);
 }
-function toLambdaBody(body, headers, options = {}) {
-  const currentContentDisposition = flattenHeader(headers["content-disposition"]);
-  headers = { ...headers, "content-type": void 0, "content-disposition": void 0 };
-  if (body === void 0) {
-    return [void 0, headers];
-  }
-  if (body instanceof Blob) {
-    headers["content-type"] = body.type;
-    headers["content-length"] = body.size.toString();
-    headers["content-disposition"] = currentContentDisposition ?? generateContentDisposition(body instanceof File ? body.name : "blob");
-    return [Readable.fromWeb(body.stream()), headers];
-  }
-  if (body instanceof FormData) {
-    const response = new Response(body);
-    headers["content-type"] = response.headers.get("content-type");
-    return [Readable.fromWeb(response.body), headers];
-  }
-  if (body instanceof URLSearchParams) {
-    headers["content-type"] = "application/x-www-form-urlencoded";
-    return [body.toString(), headers];
-  }
-  if (isAsyncIteratorObject(body)) {
-    headers["content-type"] = "text/event-stream";
-    headers["cache-control"] = "no-cache";
-    headers.connection = "keep-alive";
-    return [toEventStream(body, options), headers];
-  }
-  headers["content-type"] = "application/json";
-  return [stringifyJSON(body), headers];
+function toLambdaBody(standardBody, standardHeaders, options = {}) {
+  standardHeaders = { ...standardHeaders };
+  const body = toNodeHttpBody(standardBody, standardHeaders, options);
+  return [body, standardHeaders];
 }
 function _parseAsFile(body, isBase64Encoded, fileName, contentType) {
   return new File(
@@ -199,17 +92,6 @@ function toLambdaHeaders(standard) {
   return [headers, setCookies];
 }
 
-function toAbortSignal(responseStream) {
-  const controller = new AbortController();
-  responseStream.once("error", (error) => controller.abort(error));
-  responseStream.once("close", () => {
-    if (!responseStream.writableFinished) {
-      controller.abort(new Error("Writable stream closed before it finished writing"));
-    }
-  });
-  return controller.signal;
-}
-
 function toStandardUrl(event) {
   return new URL(`https://${event.requestContext.domainName}${event.rawPath}?${event.rawQueryString}`);
 }
@@ -218,14 +100,7 @@ function toStandardLazyRequest(event, responseStream) {
   return {
     url: toStandardUrl(event),
     method: event.requestContext.http.method,
-    get headers() {
-      const headers = toStandardHeaders(event.headers, event.cookies);
-      Object.defineProperty(this, "headers", { value: headers, writable: true });
-      return headers;
-    },
-    set headers(value) {
-      Object.defineProperty(this, "headers", { value, writable: true });
-    },
+    headers: toStandardHeaders(event.headers, event.cookies),
     signal: toAbortSignal(responseStream),
     body: once(() => toStandardBody(event))
   };
@@ -259,4 +134,4 @@ function sendStandardResponse(responseStream, standardResponse, options = {}) {
   });
 }
 
-export { sendStandardResponse, toAbortSignal, toEventIterator, toEventStream, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };
+export { sendStandardResponse, toEventIterator, toLambdaBody, toLambdaHeaders, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardUrl };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server-aws-lambda",
   "type": "module",
-  "version": "0.0.0-next.d9485b0",
+  "version": "0.0.0-next.fd6982a",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -23,8 +23,10 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.d9485b0",
-    "@orpc/standard-server": "0.0.0-next.d9485b0"
+    "@orpc/shared": "0.0.0-next.fd6982a",
+    "@orpc/standard-server": "0.0.0-next.fd6982a",
+    "@orpc/standard-server-fetch": "0.0.0-next.fd6982a",
+    "@orpc/standard-server-node": "0.0.0-next.fd6982a"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.149",