@nattyjs/express 0.0.1-beta.55 → 0.0.1-beta.57

package/dist/index.cjs

@@ -6,6 +6,7 @@ const cors = require('cors');
 const compression = require('compression');
 const core = require('@nattyjs/core');
 const common = require('@nattyjs/common');
+const fs = require('node:fs');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -13,6 +14,7 @@ const express__default = /*#__PURE__*/_interopDefaultCompat(express);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const cors__default = /*#__PURE__*/_interopDefaultCompat(cors);
 const compression__default = /*#__PURE__*/_interopDefaultCompat(compression);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 
 async function getRequestBodyInfo(request) {
   const contentType = request.headers["content-type"];
@@ -83,6 +85,80 @@ function requestHandler(config) {
   };
 }
 
+function hasExtension(p) {
+  return /\.[a-z0-9]+$/i.test(p);
+}
+function acceptsJson(req) {
+  const a = String(req.headers.accept ?? "");
+  return a.includes("application/json") || a.includes("+json");
+}
+function acceptsHtml(req) {
+  const a = String(req.headers.accept ?? "");
+  return a.includes("text/html") || a.includes("application/xhtml+xml");
+}
+function fileExists(p) {
+  try {
+    return fs__default.existsSync(p) && fs__default.statSync(p).isFile();
+  } catch {
+    return false;
+  }
+}
+function dirExists(p) {
+  try {
+    return fs__default.existsSync(p) && fs__default.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function staticPrettyRoutes(options) {
+  const allowExt = new Set(["html", "json"].map((x) => x.toLowerCase()));
+  const absBase = path__default.resolve(options.staticDir);
+  return (req, res, next) => {
+    if (req.method !== "GET" && req.method !== "HEAD")
+      return next();
+    const originalUrl = req.url;
+    const urlPathRaw = req.path || "/";
+    const urlPath = urlPathRaw !== "/" ? urlPathRaw.replace(/\/+$/, "") : "/";
+    if (urlPath.startsWith(options.apiPrefix))
+      return next();
+    if (hasExtension(urlPath))
+      return next();
+    if (urlPath.includes(".."))
+      return res.status(400).send("Bad request");
+    if (/(^|\/)\./.test(urlPath))
+      return res.status(404).end();
+    let rel = urlPath;
+    try {
+      rel = decodeURIComponent(urlPath);
+    } catch {
+    }
+    const absCandidateBase = path__default.resolve(options.staticDir, "." + rel);
+    if (!absCandidateBase.startsWith(absBase))
+      return res.status(400).send("Bad request");
+    const qs = originalUrl.includes("?") ? originalUrl.slice(originalUrl.indexOf("?")) : "";
+    if (dirExists(absCandidateBase)) {
+      const idx = path__default.join(absCandidateBase, "index.html");
+      if (fileExists(idx)) {
+        req.url = rel + "/index.html" + qs;
+        return next();
+      }
+    }
+    const wantJson = acceptsJson(req);
+    const wantHtml = acceptsHtml(req);
+    const extOrder = wantJson && !wantHtml ? ["json", "html"] : ["html", "json"];
+    for (const ext of extOrder) {
+      if (!allowExt.has(ext))
+        continue;
+      const fileAbs = absCandidateBase + "." + ext;
+      if (fileExists(fileAbs)) {
+        req.url = rel + "." + ext + qs;
+        return next();
+      }
+    }
+    return next();
+  };
+}
+
 const app = express__default();
 const ExpressModule = {
   init(config) {
@@ -92,13 +168,13 @@ const ExpressModule = {
     if (config.cors)
       app.use(cors__default(config.cors));
     app.use(express__default.json({ limit: config.payload?.limit || "1mb" }));
-    if (staticCfg?.dir) {
-      const staticDir = path__default.resolve(staticCfg.dir);
+    if (staticCfg.enabled) {
+      const staticDir = path__default.resolve("public");
+      app.use(staticPrettyRoutes({ staticDir, apiPrefix }));
       app.use(
         express__default.static(staticDir, {
           index: false,
-          // we'll control SPA index fallback manually
-          maxAge: staticCfg.maxAge ?? "1d"
+          maxAge: "1d"
         })
       );
       if (staticCfg.spaFallback !== false) {

package/dist/index.mjs

@@ -4,6 +4,7 @@ import cors from 'cors';
 import compression from 'compression';
 import { HttpHandler, HttpContext } from '@nattyjs/core';
 import { GET, commonContainer, FrameworkType, getPort } from '@nattyjs/common';
+import fs from 'node:fs';
 
 async function getRequestBodyInfo(request) {
   const contentType = request.headers["content-type"];
@@ -74,6 +75,80 @@ function requestHandler(config) {
   };
 }
 
+function hasExtension(p) {
+  return /\.[a-z0-9]+$/i.test(p);
+}
+function acceptsJson(req) {
+  const a = String(req.headers.accept ?? "");
+  return a.includes("application/json") || a.includes("+json");
+}
+function acceptsHtml(req) {
+  const a = String(req.headers.accept ?? "");
+  return a.includes("text/html") || a.includes("application/xhtml+xml");
+}
+function fileExists(p) {
+  try {
+    return fs.existsSync(p) && fs.statSync(p).isFile();
+  } catch {
+    return false;
+  }
+}
+function dirExists(p) {
+  try {
+    return fs.existsSync(p) && fs.statSync(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function staticPrettyRoutes(options) {
+  const allowExt = new Set(["html", "json"].map((x) => x.toLowerCase()));
+  const absBase = path.resolve(options.staticDir);
+  return (req, res, next) => {
+    if (req.method !== "GET" && req.method !== "HEAD")
+      return next();
+    const originalUrl = req.url;
+    const urlPathRaw = req.path || "/";
+    const urlPath = urlPathRaw !== "/" ? urlPathRaw.replace(/\/+$/, "") : "/";
+    if (urlPath.startsWith(options.apiPrefix))
+      return next();
+    if (hasExtension(urlPath))
+      return next();
+    if (urlPath.includes(".."))
+      return res.status(400).send("Bad request");
+    if (/(^|\/)\./.test(urlPath))
+      return res.status(404).end();
+    let rel = urlPath;
+    try {
+      rel = decodeURIComponent(urlPath);
+    } catch {
+    }
+    const absCandidateBase = path.resolve(options.staticDir, "." + rel);
+    if (!absCandidateBase.startsWith(absBase))
+      return res.status(400).send("Bad request");
+    const qs = originalUrl.includes("?") ? originalUrl.slice(originalUrl.indexOf("?")) : "";
+    if (dirExists(absCandidateBase)) {
+      const idx = path.join(absCandidateBase, "index.html");
+      if (fileExists(idx)) {
+        req.url = rel + "/index.html" + qs;
+        return next();
+      }
+    }
+    const wantJson = acceptsJson(req);
+    const wantHtml = acceptsHtml(req);
+    const extOrder = wantJson && !wantHtml ? ["json", "html"] : ["html", "json"];
+    for (const ext of extOrder) {
+      if (!allowExt.has(ext))
+        continue;
+      const fileAbs = absCandidateBase + "." + ext;
+      if (fileExists(fileAbs)) {
+        req.url = rel + "." + ext + qs;
+        return next();
+      }
+    }
+    return next();
+  };
+}
+
 const app = express();
 const ExpressModule = {
   init(config) {
@@ -83,13 +158,13 @@ const ExpressModule = {
     if (config.cors)
       app.use(cors(config.cors));
     app.use(express.json({ limit: config.payload?.limit || "1mb" }));
-    if (staticCfg?.dir) {
-      const staticDir = path.resolve(staticCfg.dir);
+    if (staticCfg.enabled) {
+      const staticDir = path.resolve("public");
+      app.use(staticPrettyRoutes({ staticDir, apiPrefix }));
       app.use(
         express.static(staticDir, {
           index: false,
-          // we'll control SPA index fallback manually
-          maxAge: staticCfg.maxAge ?? "1d"
+          maxAge: "1d"
         })
       );
       if (staticCfg.spaFallback !== false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nattyjs/express",
-  "version": "0.0.1-beta.55",
+  "version": "0.0.1-beta.57",
   "description": "",
   "keywords": [],
   "author": "ajayojha <ojhaajay@outlook.com>",
@@ -19,9 +19,9 @@
     "chokidar": "4.0.3",
     "cors": "2.8.5",
     "compression": "1.7.4",
-    "@nattyjs/core": "0.0.1-beta.55",
-    "@nattyjs/common": "0.0.1-beta.55",
-    "@nattyjs/types": "0.0.1-beta.55"
+    "@nattyjs/core": "0.0.1-beta.57",
+    "@nattyjs/common": "0.0.1-beta.57",
+    "@nattyjs/types": "0.0.1-beta.57"
   },
   "devDependencies": {
     "@types/node": "20.3.1",