@server/next 0.21.3 → 0.21.5

package/package.json

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

package/src/context/node.js

@@ -17,6 +17,17 @@ export default async (request, options = {}, app) => {
   ctx.res = { status: null, headers: {}, cookies: {} };
   ctx.method = request.method.toLowerCase();
 
+  // Private
+  const events = {};
+  ctx.unstableOn = (name, callback) => {
+    events[name] = events[name] || [];
+    events[name].push(callback);
+  };
+  ctx.unstableFire = (name, data) => {
+    if (!events[name]) return;
+    events[name].forEach((cb) => cb(data));
+  };
+
   ctx.headers = parseHeaders(new Headers(chunkArray(request.rawHeaders, 2)));
   ctx.cookies = parseCookies(ctx.headers.cookie);
   await auth.load(ctx);
@@ -26,7 +37,7 @@ export default async (request, options = {}, app) => {
   const path = request.url.replace(/\/$/, "") || "/";
   ctx.url = new URL(path, `${https}://${host}`);
   define(ctx.url, "query", (url) =>
-    Object.fromEntries(url.searchParams.entries())
+    Object.fromEntries(url.searchParams.entries()),
   );
 
   await new Promise((resolve, reject) => {
@@ -40,7 +51,7 @@ export default async (request, options = {}, app) => {
         ctx.body = await parseBody(
           Buffer.concat(body).toString(),
           type,
-          options.uploads
+          options.uploads,
         );
         resolve();
       })

package/src/context/winter.js

@@ -5,18 +5,30 @@ import parseCookies from "./parseCookies.js";
 
 export default async (request, options = {}, app) => {
   const ctx = {};
+  ctx.init = performance.now();
   ctx.options = options;
   ctx.req = request;
   ctx.res = { status: null, headers: {}, cookies: {} };
   ctx.method = request.method.toLowerCase();
 
+  // Private
+  const events = {};
+  ctx.unstableOn = (name, callback) => {
+    events[name] = events[name] || [];
+    events[name].push(callback);
+  };
+  ctx.unstableFire = (name, data) => {
+    if (!events[name]) return;
+    events[name].forEach((cb) => cb(data));
+  };
+
   ctx.headers = parseHeaders(request.headers);
   ctx.cookies = parseCookies(ctx.headers.cookie);
   await auth.load(ctx);
 
   ctx.url = new URL(request.url.replace(/\/$/, ""));
   define(ctx.url, "query", (url) =>
-    Object.fromEntries(url.searchParams.entries())
+    Object.fromEntries(url.searchParams.entries()),
   );
 
   if (request.body) {

package/src/helpers/config.js

@@ -3,7 +3,7 @@ import createId from "./createId.js";
 
 // Big mess; parse all of the options for server, which can be at launch time
 // or dynamically per-request for the functions (so have to read ENV inside)
-export default function config(options) {
+export default function config(options = {}) {
   const env = globalThis.env;
 
   // Basic options

package/src/helpers/jsx.js

@@ -13,9 +13,35 @@ const altAttrs = {
   classname: "class",
 };
 
+const minifyCss = (str) =>
+  str
+    .replace(/\s+/g, " ")
+    .replace(/(?!<\")\/\*[^\*]+\*\/(?!\")/g, "")
+    .replace(/(\w|\*) (\{)/g, "$1$2")
+    .replace(/(\}) (\w|\*)/g, "$1$2")
+    .replace(/(\{) (\w)/g, "$1$2")
+    .replace(/(\w)(\:) /g, "$1$2")
+    .replace(/(\;) (\})/g, "$1$2")
+    .replace(/(\;) (\w)/g, "$1$2")
+    .replace(/\;(\})/g, "$1")
+    .replace(/(\w), (\w)/g, "$1,$2")
+    .replace(/(\w), (\w)/g, "$1,$2")
+    .replace(/(\{) (\w)/g, "$1$2")
+    .trim();
+
 export const jsx = (tag, { children, ...props }) => {
   if (typeof tag === "function") return tag({ children, ...props });
 
+  // If they include an explicit <script>, let them be, just render it
+  // without escaping
+  if (tag === "script" && children) {
+    const src = children;
+    children = () => src;
+  }
+  if (tag === "style" && children) {
+    const src = minifyCss(children);
+    children = () => src;
+  }
   if (props.dangerouslySetInnerHTML)
     children = () => props.dangerouslySetInnerHTML.__html;
   if (!children) children = [];

package/src/index.js

@@ -116,7 +116,7 @@ server.prototype.node = async function () {
         response.end();
       }
     })
-    .listen(options.port);
+    .listen(this.opts.port);
 };
 
 // Netlify
@@ -139,12 +139,16 @@ server.prototype.fetch = async function (request, env) {
   if (env?.upgrade(request)) return;
   Object.assign(globalThis.env, env); // Extend env with the passed vars
 
+  let ctx, res, error;
   try {
-    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 });
+    ctx = await createWinterContext(request, this.opts, this);
+    res = await handleRequest(this.handlers, ctx);
+  } catch (err) {
+    error = err;
+    res = new Response(error.message, { status: error.status || 500 });
   }
+  ctx?.unstableFire("finish", { ...ctx, error, res, end: performance.now() });
+  return res;
 };
 
 // #region HTTP methods