@server/next 0.20.2 → 0.20.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.2",
+  "version": "0.20.4",
   "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/handleRequest.js

@@ -15,7 +15,8 @@ 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) {

package/src/index.js

@@ -17,8 +17,7 @@ export default function server(options = {}) {
     return new server(options);
   }
 
-  this.platform = getMachine();
-
+  // Skip "forbidden methods" https://fetch.spec.whatwg.org/#concept-method
   this.handlers = {
     socket: [],
     get: [],
@@ -30,33 +29,33 @@ export default function server(options = {}) {
     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);
 
@@ -75,8 +74,9 @@ export default function server(options = {}) {
   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);
   };
@@ -86,7 +86,7 @@ export default function server(options = {}) {
 server.prototype.handle = function (method, path, ...middleware) {
   if (method === "*") {
     for (let m in this.handlers) {
-      this.handlers[m].push(["*", path, ...middleware]);
+      this.handlers[m].push([method, path, ...middleware]);
     }
   } else {
     this.handlers[method].push([method, path, ...middleware]);
@@ -137,11 +137,9 @@ server.prototype.use = function (...middleware) {
 server.prototype.router = function (basePath, router) {
   basePath = "/" + basePath.replace(/^\//, "").replace(/\/$/, "") + "/";
   for (const method in router.handlers) {
-    const handlers = router.handlers[method].map(([path, ...callbacks]) => [
-      basePath + path.replace(/^\//, ""),
-      ...callbacks,
-    ]);
-    this.handle(method, ...handlers);
+    router.handlers[method].forEach(([method, path, ...callbacks]) => {
+      this.handle(method, basePath + path.replace(/^\//, ""), ...callbacks);
+    });
   }
   return this;
 };

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/reply.js

@@ -57,9 +57,11 @@ Reply.prototype.json = function (body) {
 };
 
 Reply.prototype.file = async function (path) {
-  const data = await fs.readFile(path, "utf-8");
-  if (data) return this.type(path.split(".").pop()).send(data);
-  return status(404).send();
+  const data = await fs.readFile(path);
+  if (!data) return status(404).send();
+
+  this.type(path.split(".").pop());
+  return new Response(data, { status: 200, headers: this.res.headers });
 };
 
 Reply.prototype.view = async function (path) {

package/src/router.js

@@ -2,46 +2,52 @@ export default function router() {
   if (!(this instanceof router)) {
     return new router();
   }
-  this.handlers = {};
+  this.handlers = {
+    socket: [],
+    get: [],
+    head: [],
+    post: [],
+    put: [],
+    patch: [],
+    delete: [],
+    options: [],
+  };
 }
 
 // INTERNAL
-router.prototype.handle = function (name, middleware) {
-  if (!this.handlers[name]) {
-    this.handlers[name] = [];
-  }
-  this.handlers[name].push(middleware);
+router.prototype.handle = function (method, path, ...middleware) {
+  this.handlers[method].push([method, path, ...middleware]);
   return this;
 };
 
 router.prototype.socket = function (path, ...middleware) {
-  return this.handle("socket", [path, ...middleware]);
+  return this.handle("socket", path, ...middleware);
 };
 
 router.prototype.get = function (path, ...middleware) {
-  return this.handle("get", [path, ...middleware]);
+  return this.handle("get", path, ...middleware);
 };
 
 router.prototype.head = function (path, ...middleware) {
-  return this.handle("head", [path, ...middleware]);
+  return this.handle("head", path, ...middleware);
 };
 
 router.prototype.post = function (path, ...middleware) {
-  return this.handle("post", [path, ...middleware]);
+  return this.handle("post", path, ...middleware);
 };
 
 router.prototype.put = function (path, ...middleware) {
-  return this.handle("put", [path, ...middleware]);
+  return this.handle("put", path, ...middleware);
 };
 
 router.prototype.patch = function (path, ...middleware) {
-  return this.handle("patch", [path, ...middleware]);
+  return this.handle("patch", path, ...middleware);
 };
 
 router.prototype.del = function (path, ...middleware) {
-  return this.handle("del", [path, ...middleware]);
+  return this.handle("del", path, ...middleware);
 };
 
 router.prototype.options = function (path, ...middleware) {
-  return this.handle("options", [path, ...middleware]);
+  return this.handle("options", path, ...middleware);
 };