@geostrategists/react-router-aws 2.1.0 → 2.1.1

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
-* @geostrategists/react-router-aws v2.1.0
+* @geostrategists/react-router-aws v2.1.1
 *
 * Copyright (c) Geostrategists Consulting GmbH
 *
@@ -9,11 +9,9 @@
 * @license MIT
 */
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -27,14 +25,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -149,28 +139,29 @@ function createReactRouterHeadersAPIGatewayV2(requestHeaders, requestCookies) {
   }
   return headers;
 }
-async function sendReactRouterResponseAPIGatewayV2(nodeResponse) {
+function extractAPIGatewayV2ResponseMetadata(nodeResponse) {
   const cookies = nodeResponse.headers.getSetCookie();
   if (cookies.length) {
     nodeResponse.headers.delete("Set-Cookie");
   }
+  return {
+    statusCode: nodeResponse.status,
+    headers: Object.fromEntries(nodeResponse.headers.entries()),
+    cookies
+  };
+}
+async function sendReactRouterResponseAPIGatewayV2(nodeResponse) {
+  const result = extractAPIGatewayV2ResponseMetadata(nodeResponse);
   const contentType = nodeResponse.headers.get("Content-Type");
-  const isBase64Encoded = isBinaryType(contentType);
-  let body;
+  result.isBase64Encoded = isBinaryType(contentType);
   if (nodeResponse.body) {
-    if (isBase64Encoded) {
-      body = await (0, import_node.readableStreamToString)(nodeResponse.body, "base64");
+    if (result.isBase64Encoded) {
+      result.body = await (0, import_node.readableStreamToString)(nodeResponse.body, "base64");
     } else {
-      body = await nodeResponse.text();
+      result.body = await nodeResponse.text();
     }
   }
-  return {
-    statusCode: nodeResponse.status,
-    headers: Object.fromEntries(nodeResponse.headers.entries()),
-    cookies,
-    body,
-    isBase64Encoded
-  };
+  return result;
 }
 var apiGatewayV2Adapter = {
   wrapHandler: (handler) => (e) => handler(e),
@@ -283,21 +274,24 @@ var applicationLoadBalancerAdapter = {
 
 // src/adapters/function-url-streaming.ts
 var import_node4 = require("@react-router/node");
-var import_promises = __toESM(require("stream/promises"));
+var emptyStream = () => new ReadableStream({
+  start(controller) {
+    controller.enqueue("");
+    controller.close();
+  }
+});
 var sendReactRouterResponseFunctionUrlStreaming = async (response, responseStream) => {
-  const httpResponseStream = awslambda.HttpResponseStream.from(responseStream, {
-    statusCode: response.status,
-    headers: Object.fromEntries(response.headers.entries())
-  });
-  if (response.body) {
-    await (0, import_node4.writeReadableStreamToWritable)(response.body, httpResponseStream);
-  } else {
-    await import_promises.default.finished(httpResponseStream);
+  const metadata = extractAPIGatewayV2ResponseMetadata(response);
+  let body = response.body;
+  if (!body) {
+    body = emptyStream();
   }
+  const httpResponseStream = awslambda.HttpResponseStream.from(responseStream, metadata);
+  await (0, import_node4.writeReadableStreamToWritable)(body, httpResponseStream);
 };
 var functionUrlStreamingAdapter = {
   wrapHandler: awslambda.streamifyResponse,
-  createReactRouterRequest: apiGatewayV2Adapter.createReactRouterRequest,
+  createReactRouterRequest: createReactRouterRequestAPIGateywayV2,
   sendReactRouterResponse: sendReactRouterResponseFunctionUrlStreaming
 };
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
-* @geostrategists/react-router-aws v2.1.0
+* @geostrategists/react-router-aws v2.1.1
 *
 * Copyright (c) Geostrategists Consulting GmbH
 *
@@ -110,28 +110,29 @@ function createReactRouterHeadersAPIGatewayV2(requestHeaders, requestCookies) {
   }
   return headers;
 }
-async function sendReactRouterResponseAPIGatewayV2(nodeResponse) {
+function extractAPIGatewayV2ResponseMetadata(nodeResponse) {
   const cookies = nodeResponse.headers.getSetCookie();
   if (cookies.length) {
     nodeResponse.headers.delete("Set-Cookie");
   }
+  return {
+    statusCode: nodeResponse.status,
+    headers: Object.fromEntries(nodeResponse.headers.entries()),
+    cookies
+  };
+}
+async function sendReactRouterResponseAPIGatewayV2(nodeResponse) {
+  const result = extractAPIGatewayV2ResponseMetadata(nodeResponse);
   const contentType = nodeResponse.headers.get("Content-Type");
-  const isBase64Encoded = isBinaryType(contentType);
-  let body;
+  result.isBase64Encoded = isBinaryType(contentType);
   if (nodeResponse.body) {
-    if (isBase64Encoded) {
-      body = await readableStreamToString(nodeResponse.body, "base64");
+    if (result.isBase64Encoded) {
+      result.body = await readableStreamToString(nodeResponse.body, "base64");
     } else {
-      body = await nodeResponse.text();
+      result.body = await nodeResponse.text();
     }
   }
-  return {
-    statusCode: nodeResponse.status,
-    headers: Object.fromEntries(nodeResponse.headers.entries()),
-    cookies,
-    body,
-    isBase64Encoded
-  };
+  return result;
 }
 var apiGatewayV2Adapter = {
   wrapHandler: (handler) => (e) => handler(e),
@@ -244,21 +245,24 @@ var applicationLoadBalancerAdapter = {
 
 // src/adapters/function-url-streaming.ts
 import { writeReadableStreamToWritable } from "@react-router/node";
-import stream from "node:stream/promises";
+var emptyStream = () => new ReadableStream({
+  start(controller) {
+    controller.enqueue("");
+    controller.close();
+  }
+});
 var sendReactRouterResponseFunctionUrlStreaming = async (response, responseStream) => {
-  const httpResponseStream = awslambda.HttpResponseStream.from(responseStream, {
-    statusCode: response.status,
-    headers: Object.fromEntries(response.headers.entries())
-  });
-  if (response.body) {
-    await writeReadableStreamToWritable(response.body, httpResponseStream);
-  } else {
-    await stream.finished(httpResponseStream);
+  const metadata = extractAPIGatewayV2ResponseMetadata(response);
+  let body = response.body;
+  if (!body) {
+    body = emptyStream();
   }
+  const httpResponseStream = awslambda.HttpResponseStream.from(responseStream, metadata);
+  await writeReadableStreamToWritable(body, httpResponseStream);
 };
 var functionUrlStreamingAdapter = {
   wrapHandler: awslambda.streamifyResponse,
-  createReactRouterRequest: apiGatewayV2Adapter.createReactRouterRequest,
+  createReactRouterRequest: createReactRouterRequestAPIGateywayV2,
   sendReactRouterResponse: sendReactRouterResponseFunctionUrlStreaming
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geostrategists/react-router-aws",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "AWS adapter for React Router v7",
   "license": "MIT",
   "bugs": {