@server/next 0.20.3 → 0.20.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.20.3",
+  "version": "0.20.5",
   "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/index.js

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

@@ -57,9 +57,16 @@ 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();
+  try {
+    const data = await fs.readFile(path);
+    const ext = path.split(".").pop();
+    return this.type(ext).send(data);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return status(404).send();
+    }
+    throw error;
+  }
 };
 
 Reply.prototype.view = async function (path) {
@@ -87,6 +94,11 @@ Reply.prototype.send = function (body = "") {
     return new Response(body, { status, headers });
   }
 
+  if (body?.constructor?.name === "Buffer") {
+    const headers = this.generateHeaders();
+    return new Response(body, { status, headers });
+  }
+
   // This is a bit loopy, send({}) => json({}) => send('{}')
   return this.json(body);
 };

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);
 };