@server/next 0.20.1 → 0.20.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "description": "An experimental reimplementation of server.js focused on the DX",
   "homepage": "https://node-server.com/",
   "repository": "https://github.com/franciscop/server-next.git",
@@ -11,7 +11,8 @@
   "scripts": {
     "demo": "nodemon ./demo/app.js",
     "start": "bun test --watch",
-    "test": "bun test"
+    "test": "bun test",
+    "test:jest": "node --experimental-vm-modules node_modules/jest/bin/jest.js"
   },
   "keywords": [
     "server",
@@ -31,8 +32,7 @@
   "engineStrict": true,
   "dependencies": {},
   "devDependencies": {
-    "jest": "^26.0.1",
-    "prettier": "^2.7.0"
+    "jest": "^29.7.0"
   },
   "jest": {
     "testEnvironment": "jest-environment-node",

package/src/helpers/define.js

@@ -8,8 +8,8 @@ export default function define(obj, key, cb) {
     get() {
       const value = cb(obj);
       Object.defineProperty(obj, key, {
-        configurable: false,
-        writable: false,
+        configurable: true,
+        writable: true,
         value,
       });
       return obj[key];

package/src/helpers/handleRequest.js

@@ -4,7 +4,7 @@ import define from "./define.js";
 import validate from "./validate.js";
 
 export default async function handleRequest(handlers, ctx) {
-  for (let [matcher, ...cbs] of handlers[ctx.method]) {
+  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
     if (!match) continue;
@@ -15,13 +15,17 @@ export default async function handleRequest(handlers, ctx) {
       try {
         validate(ctx, cb);
         if (typeof cb === "function") {
-          const out = await parseResponse(cb, ctx);
+          const res = await cb(ctx);
+          const out = await parseResponse(res, ctx);
           if (out) return out;
         }
       } catch (error) {
         return new Response(error.message, { status: error.status || 500 });
       }
     }
+
+    // When it's an HTTP method, break free after it's done (which will 404)
+    if (method !== "*") break;
   }
 
   return new Response("Not Found", { status: 404 });

package/src/index.js

@@ -17,37 +17,45 @@ export default function server(options = {}) {
     return new server(options);
   }
 
-  this.platform = getMachine();
-
-  this.handlers = {};
+  // Skip "forbidden methods" https://fetch.spec.whatwg.org/#concept-method
+  this.handlers = {
+    socket: [],
+    get: [],
+    head: [],
+    post: [],
+    put: [],
+    patch: [],
+    delete: [],
+    options: [],
+  };
 
+  const platform = getMachine();
   options.port = options.port || process.env.PORT || 3000;
 
   options.views = options.views ? Bucket(options.views) : null;
   options.public = options.public ? Bucket(options.public) : null;
   options.uploads = options.uploads ? Bucket(options.uploads) : null;
 
-  this.options = options;
-
   // WEBSOCKETS stuff
-  this.sockets = [];
+  const sockets = [];
   this.websocket = {
-    message: async (ws, body) => {
+    message: async (socket, body) => {
       this.handlers.socket
         ?.filter((s) => s[0] === "message")
-        ?.map((s) => s[1]({ socket: ws, sockets: this.sockets, body }));
+        ?.map((s) => s[1]({ socket, sockets, body }));
     },
-    open: (ws) => this.sockets.push(ws),
-    close: (ws) => this.sockets.splice(this.sockets.indexOf(ws), 1),
+    open: (ws) => sockets.push(ws),
+    close: (ws) => sockets.splice(sockets.indexOf(ws), 1),
   };
 
-  if (this.platform.runtime === "node") {
+  if (platform.runtime === "node") {
     (async () => {
       const http = await import("http");
       http
         .createServer(async (request, response) => {
           const ctx = await createNodeContext(request, options);
-          ctx.platform = this.platform;
+          ctx.app = this;
+          ctx.platform = platform;
 
           const out = await handleRequest(this.handlers, ctx);
 
@@ -59,77 +67,71 @@ export default function server(options = {}) {
           }
           response.end();
         })
-        .listen(options.port || 3000);
+        .listen(options.port);
     })();
   }
 
   this.fetch = async (request, env, fetchCtx) => {
     if (env?.upgrade(request)) return;
 
-    const ctx = await createWinterContext(request, options, this.platform);
-    ctx.platform = this.platform;
+    const ctx = await createWinterContext(request, options);
+    ctx.app = this;
+    ctx.platform = platform;
 
     return await handleRequest(this.handlers, ctx);
   };
 }
 
 // INTERNAL
-server.prototype.handle = function (name, ...middleware) {
-  if (!this.handlers[name]) {
-    this.handlers[name] = [];
+server.prototype.handle = function (method, path, ...middleware) {
+  if (method === "*") {
+    for (let m in this.handlers) {
+      this.handlers[m].push([method, path, ...middleware]);
+    }
+  } else {
+    this.handlers[method].push([method, path, ...middleware]);
   }
-  this.handlers[name].push(...middleware);
+
   return this;
 };
 
 server.prototype.socket = function (path, ...middleware) {
-  return this.handle("socket", [path, ...middleware]);
+  return this.handle("socket", path, ...middleware);
 };
 
 server.prototype.get = function (path, ...middleware) {
-  return this.handle("get", [path, ...middleware]);
+  return this.handle("get", path, ...middleware);
 };
 
 server.prototype.head = function (path, ...middleware) {
-  return this.handle("head", [path, ...middleware]);
+  return this.handle("head", path, ...middleware);
 };
 
 server.prototype.post = function (path, ...middleware) {
-  return this.handle("post", [path, ...middleware]);
+  return this.handle("post", path, ...middleware);
 };
 
 server.prototype.put = function (path, ...middleware) {
-  return this.handle("put", [path, ...middleware]);
+  return this.handle("put", path, ...middleware);
 };
 
 server.prototype.patch = function (path, ...middleware) {
-  return this.handle("patch", [path, ...middleware]);
+  return this.handle("patch", path, ...middleware);
 };
 
 server.prototype.del = function (path, ...middleware) {
-  return this.handle("del", [path, ...middleware]);
+  return this.handle("del", path, ...middleware);
 };
 
 server.prototype.options = function (path, ...middleware) {
-  return this.handle("options", [path, ...middleware]);
+  return this.handle("options", path, ...middleware);
 };
 
 server.prototype.use = function (...middleware) {
-  let path = "*";
-  if (typeof middleware[0] === "string" || middleware[0] instanceof RegExp) {
-    path = middleware.shift();
+  if (typeof middleware[0] === "string") {
+    return this.handle("*", ...middleware);
   }
-
-  this.handle("socket", [path, ...middleware]);
-  this.handle("get", [path, ...middleware]);
-  this.handle("head", [path, ...middleware]);
-  this.handle("post", [path, ...middleware]);
-  this.handle("put", [path, ...middleware]);
-  this.handle("patch", [path, ...middleware]);
-  this.handle("del", [path, ...middleware]);
-  this.handle("options", [path, ...middleware]);
-
-  return this;
+  return this.handle("*", "*", ...middleware);
 };
 
 server.prototype.router = function (basePath, router) {

package/src/parseResponse.js

@@ -2,9 +2,7 @@
 
 import { json } from "./reply.js";
 
-export default async function parseResponse(handler, ctx) {
-  let out = await handler(ctx);
-
+export default async function parseResponse(out, ctx) {
   // undefined || null || 0 || false || ~""~ -> empty string is still 200
   if (!out && typeof out !== "string") return null;
 

package/src/pathPattern.js

@@ -1,4 +1,5 @@
 export default function pathPattern(pattern, path) {
+  pattern = "/" + pattern.replace(/^\//, "");
   pattern = pattern.replace(/\/$/, "") || "/";
   path = path.replace(/\/$/, "") || "/";
 

package/src/url.test.js

@@ -0,0 +1,24 @@
+import server from "./index.js";
+
+describe("can match the url", () => {
+  it("stops at the first matching route", async () => {
+    const app = server()
+      .get("/:id", (ctx) => ctx.url.params)
+      .get("/*", (ctx) => ctx.url.params);
+
+    const res = await app.fetch(new Request("http://localhost:3000/hello"));
+    expect(await res.json()).toEqual({ id: "hello" });
+  });
+
+  it("but it doesn't if it's a use", async () => {
+    const app = server()
+      .use(() => {
+        // No-op
+      })
+      .get("/:id", (ctx) => ctx.url.params)
+      .get("/*", (ctx) => ctx.url.params);
+
+    const res = await app.fetch(new Request("http://localhost:3000/hello"));
+    expect(await res.json()).toEqual({ id: "hello" });
+  });
+});