@server/next 0.21.0 → 0.21.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.21.0",
+  "version": "0.21.2",
   "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/auth/auth.js

@@ -48,8 +48,8 @@ export default async function auth(ctx) {
 
   const auth = await options.session.get(sessionId);
   // Mmh, which one to do...
-  if (!auth) throw ServerError.AUTH_NO_SESSION();
-  // if (!auth) return; // SESSION ALREADY INVALID; no auth
+  // if (!auth) throw ServerError.AUTH_NO_SESSION();
+  if (!auth) return; // SESSION ALREADY INVALID; no auth
 
   if (!auth.provider) throw ServerError.AUTH_NO_PROVIDER();
   if (!options.provider.includes(auth.provider)) {

package/src/auth/index.js

@@ -12,16 +12,16 @@ const load = async (ctx) => {
 
 const middle = async (ctx) => {
   if (ctx.options.auth) {
-    ctx.app.post("/auth/logout", logout);
-
     if (ctx.options.auth.provider.includes("github")) {
       if (!env.GITHUB_ID) throw new Error("GITHUB_ID not defined");
       if (!env.GITHUB_SECRET) throw new Error("GITHUB_SECRET not defined");
+      ctx.app.get("/auth/logout", logout);
       ctx.app.get("/auth/login/github", providers.github.login);
       ctx.app.get("/auth/callback/github", providers.github.callback);
     }
 
     if (ctx.options.auth.provider.includes("email")) {
+      ctx.app.post("/auth/logout", logout);
       ctx.app.post("/auth/register/email", providers.email.register);
       ctx.app.post("/auth/login/email", providers.email.login);
       ctx.app.put("/auth/password/email", providers.email.password);

package/src/auth/index.test.js

@@ -61,7 +61,8 @@ describe("token", () => {
   it("cannot get the session", async () => {
     const authorization = "Bearer REqA2l022l8Q0tuI";
     const req = await api.get("/", { headers: { authorization } });
-    expect(req).not.toSucceed("Invalid session");
+    expect(req.status).toBe(404);
+    // expect(req).not.toSucceed("Invalid session");
   });
 
   it("cannot get the user", async () => {
@@ -112,7 +113,8 @@ describe("cookie", () => {
   it("can get the proper session", async () => {
     const cookie = "authentication=REqA2l022l8Q0tuI";
     const req = await api.get("/", { headers: { cookie } });
-    expect(req).not.toSucceed("Invalid session");
+    expect(req.status).toBe(404);
+    // expect(req).not.toSucceed("Invalid session");
   });
 
   it("can get the proper session", async () => {

package/src/auth/logout.js

@@ -7,7 +7,7 @@ export default async function logout(ctx) {
   if (type === "token") {
     return { token: null };
   } else if (type === "cookie") {
-    return cookies({ authorization: null }).send({});
+    return cookies({ authorization: null }).redirect("/");
   } else if (type === "jwt") {
     throw new Error("JWT auth not supported yet");
   } else if (type === "key") {

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 { assets, auth } from "./middle/index.js";
+
 // Export the reply helpers
 export * from "./reply.js";
 
@@ -27,7 +29,7 @@ export default function server(options = {}) {
   }
 
   // Keep a copy of the options in the instance
-  this.opts = options;
+  this.opts = config(options);
   this.platform = getMachine();
 
   // TODO: find a way to remove this hack
@@ -71,6 +73,11 @@ export default function server(options = {}) {
   if (this.platform.runtime === "node") {
     this.node();
   }
+
+  this.use(assets);
+  if (this.opts.auth) {
+    this.use(auth({ options: this.opts, app: this }));
+  }
 }
 
 server.prototype.self = function () {
@@ -89,12 +96,11 @@ server.prototype.self = function () {
 // #region Runtimes
 // Node.js
 server.prototype.node = async function () {
-  const options = config(this.opts);
   const http = await import("http");
   http
     .createServer(async (request, response) => {
       try {
-        const ctx = await createNodeContext(request, options, this);
+        const ctx = await createNodeContext(request, this.opts, this);
         const out = await handleRequest(this.handlers, ctx);
 
         response.writeHead(out.status || 200, parseHeaders(out.headers));
@@ -121,8 +127,7 @@ server.prototype.callback = async function (request, context) {
     if (typeof Netlify === "undefined") {
       throw new Error("Netlify doesn't exist");
     }
-    const options = config(this.opts);
-    const ctx = await createWinterContext(request, options, this);
+    const ctx = await createWinterContext(request, this.opts, this);
     return await handleRequest(this.handlers, ctx);
   } catch (error) {
     return new Response(error.message, { status: error.status || 500 });
@@ -135,8 +140,7 @@ server.prototype.fetch = async function (request, env) {
   Object.assign(globalThis.env, env); // Extend env with the passed vars
 
   try {
-    const options = config(this.opts);
-    const ctx = await createWinterContext(request, options, this);
+    const ctx = await createWinterContext(request, this.opts, this);
     return await handleRequest(this.handlers, ctx);
   } catch (error) {
     return new Response(error.message, { status: error.status || 500 });
@@ -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,5 @@
-import auth from "../auth/index.js";
+import authMod 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);
-}
+const auth = authMod.middle;
+export { assets, auth };

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 () => {