@server/next 0.20.4 → 0.20.6

package/package.json

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

@@ -135,7 +135,7 @@ server.prototype.use = function (...middleware) {
 };
 
 server.prototype.router = function (basePath, router) {
-  basePath = "/" + basePath.replace(/^\//, "").replace(/\/$/, "") + "/";
+  basePath = ("/" + basePath + "/").replace(/^\/+/, "/").replace(/\/+$/, "/");
   for (const method in router.handlers) {
     router.handlers[method].forEach(([method, path, ...callbacks]) => {
       this.handle(method, basePath + path.replace(/^\//, ""), ...callbacks);

package/src/reply.js

@@ -57,11 +57,16 @@ Reply.prototype.json = function (body) {
 };
 
 Reply.prototype.file = async function (path) {
-  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 });
+  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) {
@@ -89,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.test.js

@@ -0,0 +1,47 @@
+import server, { router } from "./index.js";
+
+const url = (path, options = {}) =>
+  new Request("http://localhost:3000" + path, options);
+
+describe("can route properly", () => {
+  const api = router()
+    .get("/hello", (ctx) => "Hello " + ctx.url.pathname)
+    .put("/hello", (ctx) => "Hello " + ctx.url.pathname)
+    .post("/hello", (ctx) => "Hello " + ctx.url.pathname);
+
+  const app = server()
+    .router("/", api)
+    .router("/api/", api)
+    .get("/", () => "Fallback");
+
+  // 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", "/"]);
+  });
+
+  it("can get fallback when nothing matches", async () => {
+    const res = await app.fetch(url("/"));
+    expect(await res.text()).toBe("Fallback");
+  });
+
+  it("can get the base get", async () => {
+    const res = await app.fetch(url("/hello"));
+    expect(await res.text()).toBe("Hello /hello");
+  });
+
+  it("can get the nested get", async () => {
+    const res = await app.fetch(url("/api/hello"));
+    expect(await res.text()).toBe("Hello /api/hello");
+  });
+
+  it("can post to the base get", async () => {
+    const res = await app.fetch(url("/hello", { method: "POST" }));
+    expect(await res.text()).toBe("Hello /hello");
+  });
+
+  it("can post to the nested get", async () => {
+    const res = await app.fetch(url("/api/hello", { method: "POST" }));
+    expect(await res.text()).toBe("Hello /api/hello");
+  });
+});