@server/next 0.20.13 → 0.20.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.13",
+  "version": "0.20.15",
   "description": "An experimental reimplementation of server.js focused on the DX",
   "homepage": "https://node-server.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/helpers/index.js

@@ -1,8 +1,9 @@
-export { default as createId } from "./createId.js";
 export { default as createCookies } from "./createCookies.js";
+export { default as createId } from "./createId.js";
 export { default as define } from "./define.js";
 export { default as getMachine } from "./getMachine.js";
 export { default as handleRequest } from "./handleRequest.js";
 export { default as iterate } from "./iterate.js";
 export { default as parseHeaders } from "./parseHeaders.js";
+export { default as toWeb } from "./toWeb.js";
 export { default as types } from "./types.js";

package/src/helpers/toWeb.js

@@ -0,0 +1,15 @@
+export default function toWeb(nodeStream) {
+  if (typeof ReadableStream === "undefined") {
+    throw new Error("Environment not supported, please report this as a bug");
+  }
+  return new ReadableStream({
+    start(controller) {
+      nodeStream.on("data", (chunk) => controller.enqueue(chunk));
+      nodeStream.on("end", () => controller.close());
+      nodeStream.on("error", (err) => controller.error(err));
+    },
+    cancel() {
+      nodeStream.destroy();
+    },
+  });
+}

package/src/index.js

@@ -51,6 +51,15 @@ const validateOptions = (options, env = {}) => {
   options.port = options.port || env.PORT || 3000;
   options.secret = options.secret || env.SECRET || "unsafe-" + createId();
   options.cors = options.cors || env.CORS || null;
+  if (options.cors === true) {
+    options.cors = { origin: options.domain || "*" };
+  }
+  if (typeof options.cors === "string") {
+    options.cors = { origin: options.cors };
+  }
+  if (options.cors && !options.cors.methods) {
+    options.cors.methods = "GET,HEAD,POST,PUT,PATCH";
+  }
 
   options.views = options.views ? Bucket(options.views) : null;
   options.public = options.public ? Bucket(options.public) : null;

package/src/parseResponse.js

@@ -40,9 +40,8 @@ export default async function parseResponse(out, ctx) {
   // Here it should be a Response
 
   // If we have CORS, set it up
-  if (typeof ctx.options.cors === "string") {
-    const origin = ctx.options.cors || ctx.options.domain || "*";
-    const methods = "GET,HEAD,POST,PUT,PATCH";
+  if (ctx.options.cors) {
+    const { origin, methods } = ctx.options.cors;
     out.headers.set("Access-Control-Allow-Origin", origin);
     out.headers.set("Access-Control-Allow-Methods", methods);
   }

package/src/reply.js

@@ -1,6 +1,6 @@
 import fs from "fs/promises";
 
-import { createCookies, types } from "./helpers/index.js";
+import { createCookies, toWeb, types } from "./helpers/index.js";
 
 function Reply() {
   this.res = {
@@ -98,11 +98,22 @@ Reply.prototype.send = function (body = "") {
     return new Response(body, { status, headers });
   }
 
-  if (body?.constructor?.name === "Buffer") {
+  const name = body?.constructor?.name;
+  if (name === "Buffer") {
     const headers = this.generateHeaders();
     return new Response(body, { status, headers });
   }
 
+  // WebStream already, just pass it through
+  if (name === "ReadableStream") {
+    return new Response(body, { status, headers });
+  }
+
+  // Node stream, convert it to web stream
+  if (name === "PassThrough" || name === "Readable") {
+    return new Response(toWeb(body), { status, headers });
+  }
+
   // This is a bit loopy, send({}) => json({}) => send('{}')
   return this.json(body);
 };