@server/next 0.20.38 → 0.20.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.38",
+  "version": "0.20.40",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/helpers/getMachine.js

@@ -1,29 +1,26 @@
 function getProvider() {
-  if ("Netlify" in globalThis) return "netlify";
-  return null;
-}
-
-function getService() {
+  if (typeof Netlify !== "undefined") return "netlify";
   return null;
 }
 
 function getRuntime() {
-  if ("Bun" in globalThis) return "bun";
-  if ("Deno" in globalThis) return "deno";
+  if (typeof Bun !== "undefined") return "bun";
+  if (typeof Deno !== "undefined") return "deno";
   if (globalThis.process?.versions?.node) return "node";
   return null;
 }
 
+function getProduction() {
+  // Can I cry now?
+  if (typeof Netlify !== "undefined")
+    return Netlify.env.get("NETLIFY_DEV") !== "true";
+  return process.env.NODE_ENV === "production";
+}
+
 export default function getMachine() {
-  const provider = getProvider();
   return {
-    provider,
-    service: getService(),
+    provider: getProvider(),
     runtime: getRuntime(),
-    // Can I cry now?
-    production:
-      provider === "netlify"
-        ? Netlify.env.get("NETLIFY_DEV") !== "true"
-        : process.env.NODE_ENV === "production",
+    production: getProduction(),
   };
 }

package/src/helpers/handleRequest.js

@@ -38,8 +38,11 @@ export default async function handleRequest(handlers, ctx) {
   }
 
   // In Netlify, a non-response is perfectly valid, which would indicate
-  // the edge function to just go ahead and consume the original resource
-  if (ctx.machine.provider === "netlify") return;
+  // the edge function to just go ahead and consume the original resource. But
+  // we have already "consumed" the resource, so we can only return the next one
+  if (ctx.machine.provider === "netlify") {
+    return await ctx.req.context.next();
+  }
 
   // In other environments, a non-response is wrong and we should 404 then
   return new Response("Not Found", { status: 404 });

package/src/index.js

@@ -105,6 +105,7 @@ server.prototype.node = async function () {
 
 // Netlify
 server.prototype.callback = async function (request, context) {
+  // Consider simply renaming to "ctx.next()"
   request.context = context;
   try {
     if (typeof Netlify === "undefined") {