nukejs 0.0.21 → 0.0.22

package/dist/build-cloudflare.js

@@ -133,7 +133,13 @@ class __NodeResponse__ {
 }
 `
 );
-function makeApiDispatcherSource(routes) {
+function makeApiDispatcherSource(routes, middlewarePath) {
+  const middlewareImport = middlewarePath ? `import __userMiddleware__ from ${JSON.stringify(middlewarePath)};` : "";
+  const middlewareRun = middlewarePath ? `
+  // Run user middleware before routing.  If it ends the response, bail out.
+  await __userMiddleware__(req, res);
+  if ((res as any).writableEnded || (res as any).headersSent) return true;
+` : "";
   const imports = routes.map((r, i) => `import * as __api_${i}__ from ${JSON.stringify(r.absPath)};`).join("\n");
   const routeEntries = routes.map(
     (r, i) => `  { regex: ${JSON.stringify(r.srcRegex)}, params: ${JSON.stringify(r.paramNames)}, mod: __api_${i}__ },`
@@ -142,6 +148,7 @@ function makeApiDispatcherSource(routes) {
     /* ts */
     `import type { IncomingMessage, ServerResponse } from 'http';
 ${imports}
+${middlewareImport}
 
 const __CF_API_ROUTES__ = [
 ${routeEntries}
@@ -154,7 +161,7 @@ ${routeEntries}
 export async function __dispatchApi__(req: IncomingMessage, res: ServerResponse): Promise<boolean> {
   const url      = new URL((req as any).url || '/', 'http://localhost');
   const pathname = url.pathname;
-
+${middlewareRun}
   for (const route of __CF_API_ROUTES__) {
     const m = pathname.match(new RegExp(route.regex));
     if (!m) continue;
@@ -194,7 +201,13 @@ export async function __dispatchApi__(req: IncomingMessage, res: ServerResponse)
 `
   );
 }
-function makePagesDispatcherSource(routes, errorAdapters2 = {}) {
+function makePagesDispatcherSource(routes, errorAdapters2 = {}, middlewarePath) {
+  const middlewareImport = middlewarePath ? `import __userMiddleware__ from ${JSON.stringify(middlewarePath)};` : "";
+  const middlewareRun = middlewarePath ? `
+  // Run user middleware before routing.  If it ends the response, bail out.
+  await __userMiddleware__(req, res);
+  if ((res as any).writableEnded || (res as any).headersSent) return true;
+` : "";
   const imports = routes.map((r, i) => `import __page_${i}__ from ${JSON.stringify(r.adapterPath)};`).join("\n");
   const routeEntries = routes.map(
     (r, i) => `  { regex: ${JSON.stringify(r.srcRegex)}, params: ${JSON.stringify(r.paramNames)}, catchAll: ${JSON.stringify(r.catchAllNames)}, handler: __page_${i}__ },`
@@ -235,6 +248,7 @@ function makePagesDispatcherSource(routes, errorAdapters2 = {}) {
 ${imports}
 ${error404Import}
 ${error500Import}
+${middlewareImport}
 
 const __CF_PAGE_ROUTES__: Array<{
   regex:    string;
@@ -252,7 +266,7 @@ ${routeEntries}
 export async function __dispatchPages__(req: IncomingMessage, res: ServerResponse): Promise<boolean> {
   const url      = new URL((req as any).url || '/', 'http://localhost');
   const pathname = url.pathname;
-
+${middlewareRun}
   // Client-side error \u2014 forward to _500 page if available.
   if (url.searchParams.has('__clientError')) {
 ${clientErrHandler}
@@ -289,9 +303,14 @@ ${notFoundFallback}
 `
   );
 }
-function makeWorkerEntrySource(hasApi2, hasPages2, inlineStaticMap2) {
+function makeWorkerEntrySource(hasApi2, hasPages2, inlineStaticMap2, middlewarePath) {
   const apiImport = hasApi2 ? `import { __dispatchApi__   } from "./cf-api-dispatcher.js";` : "";
   const pagesImport = hasPages2 ? `import { __dispatchPages__ } from "./cf-pages-dispatcher.js";` : "";
+  const middlewareImport = middlewarePath ? `import __userMiddleware__ from ${JSON.stringify(middlewarePath)};` : "";
+  const middlewareRun = middlewarePath ? `
+      await __userMiddleware__(nodeReq as any, nodeRes as any);
+      if ((nodeRes as any).writableEnded || (nodeRes as any).headersSent) return nodeRes.toResponse();
+` : "";
   const apiDispatch = hasApi2 ? `if (await __dispatchApi__(nodeReq as any, nodeRes as any))   return nodeRes.toResponse();` : "";
   const pagesDispatch = hasPages2 ? `if (await __dispatchPages__(nodeReq as any, nodeRes as any)) return nodeRes.toResponse();` : "";
   return (
@@ -300,6 +319,7 @@ function makeWorkerEntrySource(hasApi2, hasPages2, inlineStaticMap2) {
 
 ${apiImport}
 ${pagesImport}
+${middlewareImport}
 
 /**
  * Pre-buffer the request body into a Uint8Array so we can both:
@@ -392,6 +412,8 @@ export default {
     const nodeRes         = new ((__NodeResponse__ as any))();
 
     try {
+      // \u2500\u2500 User middleware \u2014 runs once, before any routing \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+${middlewareRun}
       // \u2500\u2500 4. API routes \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
       ${apiDispatch}
 
@@ -505,6 +527,9 @@ function walkStaticDir(dir, base = dir) {
   }
   return results;
 }
+const cfUserMiddlewareSrc = path.resolve("middleware.ts");
+const cfMiddlewarePath = fs.existsSync(cfUserMiddlewareSrc) ? cfUserMiddlewareSrc : void 0;
+if (cfMiddlewarePath) console.log("  found     middleware.ts  (will be bundled into worker)");
 let hasApi = false;
 let hasPages = false;
 if (apiRoutes.length > 0) {
@@ -625,7 +650,7 @@ const inlineStaticMap = staticEntries.map(({ rel, abs }) => {
     return `  [${JSON.stringify(rel)}, { ct: ${JSON.stringify(contentType)}, body: ${JSON.stringify(b64)}, text: false }],`;
   }
 }).join("\n");
-const workerSrc = makeWorkerEntrySource(hasApi, hasPages, inlineStaticMap);
+const workerSrc = makeWorkerEntrySource(hasApi, hasPages, inlineStaticMap, cfMiddlewarePath);
 const workerSrcPath = path.join(
   OUTPUT_DIR,
   `_cf_worker_entry_${randomBytes(4).toString("hex")}.ts`

package/dist/build-node.js

@@ -1,5 +1,6 @@
 import fs from "fs";
 import path from "path";
+import { build } from "esbuild";
 import { loadConfig } from "./config.js";
 import {
   analyzeFile,
@@ -27,6 +28,21 @@ const manifest = [];
 function funcPathToFilename(funcPath, prefix) {
   return funcPath.replace(new RegExp(`^\\/${prefix}\\/`), "") + ".mjs";
 }
+const userMiddlewareSrc = path.resolve("middleware.ts");
+const hasUserMiddleware = fs.existsSync(userMiddlewareSrc);
+if (hasUserMiddleware) {
+  const result = await build({
+    entryPoints: [userMiddlewareSrc],
+    bundle: true,
+    format: "esm",
+    platform: "node",
+    target: "node20",
+    packages: "external",
+    write: false
+  });
+  fs.writeFileSync(path.join(OUT_DIR, "middleware.mjs"), result.outputFiles[0].text);
+  console.log("  built     middleware.ts  \u2192  dist/middleware.mjs");
+}
 const apiFiles = walkFiles(SERVER_DIR);
 if (apiFiles.length === 0) console.warn(`\u26A0  No server files found in ${SERVER_DIR}`);
 const apiRoutes = apiFiles.map((relPath) => ({ ...analyzeFile(relPath, "api"), absPath: path.join(SERVER_DIR, relPath) })).sort((a, b) => b.specificity - a.specificity);
@@ -100,7 +116,44 @@ const compiled   = routes.map(r => ({ ...r, regex: new RegExp(r.srcRegex) }));
 const STATIC_DIR = path.join(__dirname, 'static');
 const MIME_MAP   = { ${MIME_MAP_ENTRIES} };
 
+// \u2500\u2500 Middleware \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
+// Load user middleware (compiled from middleware.ts at build time) once at
+// startup.  The variable stays null if no middleware was built.
+let __middleware__ = null;
+{
+  const mwPath = path.join(__dirname, 'middleware.mjs');
+  if (fs.existsSync(mwPath)) {
+    try {
+      const mod = await import(pathToFileURL(mwPath).href);
+      if (typeof mod.default === 'function') {
+        __middleware__ = mod.default;
+        console.log('nukejs: middleware loaded');
+      } else {
+        console.warn('nukejs: middleware.mjs does not export a default function, skipping');
+      }
+    } catch(e) { console.error('[middleware load error]', e); }
+  }
+}
+
 const server = http.createServer(async (req, res) => {
+  // 0. User middleware \u2014 runs before every request (static files included).
+  //    May mutate req.url (e.g. locale rewrites) \u2014 read it AFTER this runs.
+  //    If it ends the response, skip all framework handling.
+  if (__middleware__) {
+    try {
+      await __middleware__(req, res);
+      if (res.writableEnded || res.headersSent) return;
+    } catch(e) {
+      console.error('[middleware error]', e);
+      if (!res.headersSent) {
+        res.statusCode = 500;
+        res.setHeader('Content-Type', 'text/plain');
+        res.end('Internal Server Error');
+      }
+      return;
+    }
+  }
+
   const url   = req.url || '/';
   const clean = url.split('?')[0];
 

package/dist/build-vercel.js

@@ -72,13 +72,20 @@ function emitVercelFunction(name, bundleText) {
     JSON.stringify({ runtime: "nodejs20.x", handler: "index.mjs", launcherType: "Nodejs" }, null, 2)
   );
 }
-function makeApiDispatcherSource(routes) {
+function makeApiDispatcherSource(routes, middlewarePath) {
+  const middlewareImport = middlewarePath ? `import __userMiddleware__ from ${JSON.stringify(middlewarePath)};` : "";
+  const middlewareRun = middlewarePath ? `
+  // Run user middleware before routing.  If it ends the response, bail out.
+  await __userMiddleware__(req, res);
+  if ((res as any).writableEnded || (res as any).headersSent) return;
+` : "";
   const imports = routes.map((r, i) => `import * as __api_${i}__ from ${JSON.stringify(r.absPath)};`).join("\n");
   const routeEntries = routes.map(
     (r, i) => `  { regex: ${JSON.stringify(r.srcRegex)}, params: ${JSON.stringify(r.paramNames)}, mod: __api_${i}__ },`
   ).join("\n");
   return `import type { IncomingMessage, ServerResponse } from 'http';
 ${imports}
+${middlewareImport}
 
 function enhance(res: ServerResponse) {
   (res as any).json = function(data: any, status = 200) {
@@ -112,6 +119,7 @@ ${routeEntries}
 ];
 
 export default async function handler(req: IncomingMessage, res: ServerResponse) {
+${middlewareRun}
   const url      = new URL(req.url || '/', 'http://localhost');
   const pathname = url.pathname;
 
@@ -143,7 +151,13 @@ export default async function handler(req: IncomingMessage, res: ServerResponse)
 }
 `;
 }
-function makePagesDispatcherSource(routes, errorAdapters = {}) {
+function makePagesDispatcherSource(routes, errorAdapters = {}, middlewarePath) {
+  const middlewareImport = middlewarePath ? `import __userMiddleware__ from ${JSON.stringify(middlewarePath)};` : "";
+  const middlewareRun = middlewarePath ? `
+  // Run user middleware before routing.  If it ends the response, bail out.
+  await __userMiddleware__(req, res);
+  if ((res as any).writableEnded || (res as any).headersSent) return;
+` : "";
   const imports = routes.map((r, i) => `import __page_${i}__ from ${JSON.stringify(r.adapterPath)};`).join("\n");
   const routeEntries = routes.map(
     (r, i) => `  { regex: ${JSON.stringify(r.srcRegex)}, params: ${JSON.stringify(r.paramNames)}, catchAll: ${JSON.stringify(r.catchAllNames)}, handler: __page_${i}__ },`
@@ -180,6 +194,7 @@ function makePagesDispatcherSource(routes, errorAdapters = {}) {
 ${imports}
 ${error404Import}
 ${error500Import}
+${middlewareImport}
 
 const ROUTES: Array<{
   regex:    string;
@@ -191,6 +206,7 @@ ${routeEntries}
 ];
 
 export default async function handler(req: IncomingMessage, res: ServerResponse) {
+${middlewareRun}
   const url      = new URL(req.url || '/', 'http://localhost');
   const pathname = url.pathname;
 
@@ -227,13 +243,16 @@ ${notFoundHandler}
 }
 `;
 }
+const userMiddlewareSrc = path.resolve("middleware.ts");
+const vercelMiddlewarePath = fs.existsSync(userMiddlewareSrc) ? userMiddlewareSrc : void 0;
+if (vercelMiddlewarePath) console.log("  found     middleware.ts  (will be bundled into functions)");
 const vercelRoutes = [];
 const apiFiles = walkFiles(SERVER_DIR);
 if (apiFiles.length === 0) console.warn(`\u26A0  No server files found in ${SERVER_DIR}`);
 const apiRoutes = apiFiles.map((relPath) => ({ ...analyzeFile(relPath, "api"), absPath: path.join(SERVER_DIR, relPath) })).sort((a, b) => b.specificity - a.specificity);
 if (apiRoutes.length > 0) {
   const dispatcherPath = path.join(SERVER_DIR, `_api_dispatcher_${randomBytes(4).toString("hex")}.ts`);
-  fs.writeFileSync(dispatcherPath, makeApiDispatcherSource(apiRoutes));
+  fs.writeFileSync(dispatcherPath, makeApiDispatcherSource(apiRoutes, vercelMiddlewarePath));
   try {
     const result = await build({
       entryPoints: [dispatcherPath],
@@ -320,7 +339,7 @@ if (serverPages.length > 0 || hasErrorPages) {
     errorAdapterPaths.push(adapterPath);
   }
   const dispatcherPath = path.join(PAGES_DIR, `_pages_dispatcher_${randomBytes(4).toString("hex")}.ts`);
-  fs.writeFileSync(dispatcherPath, makePagesDispatcherSource(dispatcherRoutes, errorAdapters));
+  fs.writeFileSync(dispatcherPath, makePagesDispatcherSource(dispatcherRoutes, errorAdapters, vercelMiddlewarePath));
   try {
     const result = await build({
       entryPoints: [dispatcherPath],

package/dist/middleware-loader.js

@@ -26,7 +26,12 @@ async function loadMiddleware() {
     appDir,
     `middleware.${appDir.endsWith("dist") ? "js" : "ts"}`
   );
-  const userPath = path.join(process.cwd(), "middleware.ts");
+  const userCandidates = [
+    path.join(process.cwd(), "middleware.ts"),
+    path.join(process.cwd(), "middleware.js"),
+    path.join(process.cwd(), "middleware.mjs")
+  ];
+  const userPath = userCandidates.find((p) => fs.existsSync(p)) ?? userCandidates[0];
   const paths = [.../* @__PURE__ */ new Set([builtinPath, userPath])];
   for (const middlewarePath of paths) {
     await loadMiddlewareFromPath(middlewarePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukejs",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "A minimal, opinionated full-stack React framework on Node.js that server-renders everything and hydrates only interactive parts.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",