@server/next 0.21.0 → 0.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "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",
@@ -10,8 +10,9 @@
   "license": "UNLICENSED",
   "documentation": {
     "title": "Server JS - A modern web server for Bun and Node.js",
+    "home": "./docs/index.html",
     "menu": {
-      "About": "/about",
+      "About": "/",
       "Documentation": "/documentation",
       "Github": "https://github.com/franciscop/server-next"
     }

package/src/helpers/handleRequest.js

@@ -1,21 +1,9 @@
-import middle from "../middle/index.js";
 import parseResponse from "../parseResponse.js";
 import pathPattern from "../pathPattern.js";
 import define from "./define.js";
 import validate from "./validate.js";
 
-const extendWithDefaults = (ctx) => {
-  // TODO: find a better way of doing this FFS
-  // Only want to execute it once; it needs to happen on a per-request
-  // basis since we only have full access to the options there
-  if (ctx.app.extended) return;
-  middle(ctx);
-  ctx.app.extended = true;
-};
-
 export default async function handleRequest(handlers, ctx) {
-  extendWithDefaults(ctx);
-
   for (let [method, matcher, ...cbs] of handlers[ctx.method]) {
     const match = pathPattern(matcher, ctx.url.pathname || "/");
     // Skip this whole middleware if there was no match

package/src/index.js

@@ -11,6 +11,8 @@ import {
   parseHeaders,
 } from "./helpers/index.js";
 
+import middle from "./middle/index.js";
+
 // Export the reply helpers
 export * from "./reply.js";
 
@@ -71,6 +73,8 @@ export default function server(options = {}) {
   if (this.platform.runtime === "node") {
     this.node();
   }
+
+  this.use(...middle);
 }
 
 server.prototype.self = function () {
@@ -146,6 +150,8 @@ server.prototype.fetch = async function (request, env) {
 // #region HTTP methods
 // INTERNAL
 server.prototype.handle = function (method, path, ...middleware) {
+  // Do not try to optimize, we NEED the method to remain '*' here so that
+  // it doesn't auto-finish
   if (method === "*") {
     for (let m in this.handlers) {
       this.handlers[m].push([method, path, ...middleware]);
@@ -224,17 +230,17 @@ server.prototype.test = function () {
     );
 
     const headers = parseHeaders(res.headers);
-    let data;
+    let body;
     if (headers["set-cookie"]) {
       // TODO: this should really be a smart merge of the 2
       cookie = headers["set-cookie"];
     }
     if (headers["content-type"]?.includes("application/json")) {
-      data = await res.json();
+      body = await res.json();
     } else {
-      data = await res.text();
+      body = await res.text();
     }
-    return { status: res.status, headers, data };
+    return { status: res.status, headers, body, data: body };
   };
   return {
     app: this,

package/src/middle/assets.js

@@ -1,6 +1,8 @@
 import { type } from "../reply.js";
 
 export default async function assets(ctx) {
+  if (!ctx.options.public) return;
+  if (!ctx.method !== "get") return;
   try {
     // TODO: streaming
     // Read it as buffer (null)

package/src/middle/index.js

@@ -1,12 +1,4 @@
 import auth from "../auth/index.js";
 import assets from "./assets.js";
 
-export default async function middle(ctx) {
-  // Serve assets
-  if (ctx.options.public) {
-    // We need these before other endpoints
-    ctx.app.handlers.get.unshift(["*", "*", assets]);
-  }
-
-  await auth.middle(ctx);
-}
+export default [assets, auth.middle];

package/src/router.test.js

@@ -15,7 +15,7 @@ describe("can route properly", () => {
   // INTERNAL - so this might change in the future
   it("has the correct structure", () => {
     const registeredPaths = app.handlers.get.map((h) => h[1]);
-    expect(registeredPaths).toEqual(["/hello", "/api/hello", "/"]);
+    expect(registeredPaths).toEqual(["*", "/hello", "/api/hello", "/"]);
   });
 
   it("can get fallback when nothing matches", async () => {