@nattyjs/express 0.0.1-beta.6 → 0.0.1-beta.60

package/dist/index.cjs

@@ -1,32 +1,36 @@
 'use strict';
 
 const express = require('express');
+const path = require('node:path');
 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; }
 
 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"];
   const bodyInfo = {};
-  if (request.method !== common.GET)
-    switch (contentType) {
-      case "application/json":
-        bodyInfo.json = request.body;
-        break;
-    }
+  if (request.method !== common.GET) {
+    if (contentType && contentType.toLowerCase().indexOf("application/json") > -1)
+      bodyInfo.json = request.body;
+  }
   return bodyInfo;
 }
 
 function getResponse(expressResponse, responseInfo) {
   if (responseInfo.headers)
-    Object.keys(responseInfo.headers).forEach((key) => expressResponse.set(key, responseInfo.headers[key]));
+    for (const pair of responseInfo.headers.entries()) {
+      expressResponse.setHeader(pair[0], pair[1]);
+    }
   if (responseInfo.cookies)
     responseInfo.cookies.forEach((cookie) => {
       const name = cookie.name;
@@ -38,7 +42,9 @@ function getResponse(expressResponse, responseInfo) {
   expressResponse.statusCode = responseInfo.status;
   if (responseInfo.body && responseInfo.body.json) {
     expressResponse.send(responseInfo.body.json);
-  } else
+  } else if (responseInfo.body && responseInfo.body.buffer)
+    expressResponse.send(responseInfo.body.buffer);
+  else
     expressResponse.send();
   return expressResponse;
 }
@@ -49,7 +55,8 @@ function parseCookies(value) {
     const cookies = value.split(";");
     for (const cookie of cookies) {
       const splitCookie = cookie.split("=");
-      jsonCookies.push({ name: splitCookie[0].trim(), value: splitCookie[1].trim() });
+      if (splitCookie.length > 1)
+        jsonCookies.push({ name: splitCookie[0].trim(), value: splitCookie[1].trim() });
     }
   }
   return jsonCookies;
@@ -58,7 +65,8 @@ function parseCookies(value) {
 function requestHandler(config) {
   return async (request, response) => {
     const httpHandler = new core.HttpHandler();
-    const url = config.framework == common.FrameworkType.Firebase ? `http://localhost:3000/api${request.url}` : `http://localhost:3000${request.url}`;
+    const apiPrefix = `/${common.commonContainer.nattyConfig.api?.rootPath}`;
+    const url = config.framework == common.FrameworkType.Firebase ? `http://localhost:3000/api${request.url}` : `http://localhost:3000${apiPrefix}${request.url}`;
     const httpContext = new core.HttpContext(
       {
         url,
@@ -72,27 +80,123 @@ function requestHandler(config) {
     return httpHandler.processRequest(httpContext).then((httpResponse) => {
       return getResponse(response, httpResponse);
     }).catch((t) => {
-      response.send();
+      return getResponse(response, t.httpResponse);
     });
   };
 }
 
+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) {
+    const apiPrefix = `/${common.commonContainer.nattyConfig.api?.rootPath}`;
+    const staticCfg = common.commonContainer.nattyConfig.static;
     app.use(compression__default());
-    app.use(cors__default({
-      "origin": ["http://localhost:5173", "http://localhost:5174"],
-      "methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
-      "preflightContinue": false,
-      "optionsSuccessStatus": 204,
-      "credentials": true
-    }));
-    app.use(express__default.json());
-    app.all("*", requestHandler(config));
-    if (config.autoGeneratePort == true)
-      app.listen(3e3, () => {
-        console.log("Server is running on port 3000 ");
+    if (config.cors)
+      app.use(cors__default(config.cors));
+    app.use(express__default.json({ limit: config.payload?.limit || "1mb" }));
+    if (staticCfg.enabled) {
+      const staticDir = path__default.resolve("public");
+      app.use(staticPrettyRoutes({ staticDir, apiPrefix }));
+      app.use(
+        express__default.static(staticDir, {
+          index: false,
+          maxAge: "1d"
+        })
+      );
+      if (staticCfg.spaFallback !== false) {
+        app.get("*", (req, res, next) => {
+          const url = req.originalUrl || req.url;
+          if (url.startsWith(apiPrefix))
+            return next();
+          if (req.method !== "GET")
+            return next();
+          const acceptsHtml = req.headers.accept?.includes("text/html");
+          if (!acceptsHtml)
+            return next();
+          return res.sendFile(path__default.join(staticDir, staticCfg.indexFile ?? "index.html"));
+        });
+      }
+    }
+    app.use(apiPrefix, requestHandler(config));
+    if (config.autoGeneratePort == true || config.autoGeneratePort == void 0)
+      common.getPort().then((port) => {
+        app.listen(port, () => {
+          console.log(`[NATTYJS]:Server is running on port ${port}`);
+        });
       });
     return app;
   }

package/dist/index.mjs

@@ -1,24 +1,26 @@
 import express from 'express';
+import path from 'node:path';
 import cors from 'cors';
 import compression from 'compression';
 import { HttpHandler, HttpContext } from '@nattyjs/core';
-import { GET, FrameworkType } from '@nattyjs/common';
+import { GET, commonContainer, FrameworkType, getPort } from '@nattyjs/common';
+import fs from 'node:fs';
 
 async function getRequestBodyInfo(request) {
   const contentType = request.headers["content-type"];
   const bodyInfo = {};
-  if (request.method !== GET)
-    switch (contentType) {
-      case "application/json":
-        bodyInfo.json = request.body;
-        break;
-    }
+  if (request.method !== GET) {
+    if (contentType && contentType.toLowerCase().indexOf("application/json") > -1)
+      bodyInfo.json = request.body;
+  }
   return bodyInfo;
 }
 
 function getResponse(expressResponse, responseInfo) {
   if (responseInfo.headers)
-    Object.keys(responseInfo.headers).forEach((key) => expressResponse.set(key, responseInfo.headers[key]));
+    for (const pair of responseInfo.headers.entries()) {
+      expressResponse.setHeader(pair[0], pair[1]);
+    }
   if (responseInfo.cookies)
     responseInfo.cookies.forEach((cookie) => {
       const name = cookie.name;
@@ -30,7 +32,9 @@ function getResponse(expressResponse, responseInfo) {
   expressResponse.statusCode = responseInfo.status;
   if (responseInfo.body && responseInfo.body.json) {
     expressResponse.send(responseInfo.body.json);
-  } else
+  } else if (responseInfo.body && responseInfo.body.buffer)
+    expressResponse.send(responseInfo.body.buffer);
+  else
     expressResponse.send();
   return expressResponse;
 }
@@ -41,7 +45,8 @@ function parseCookies(value) {
     const cookies = value.split(";");
     for (const cookie of cookies) {
       const splitCookie = cookie.split("=");
-      jsonCookies.push({ name: splitCookie[0].trim(), value: splitCookie[1].trim() });
+      if (splitCookie.length > 1)
+        jsonCookies.push({ name: splitCookie[0].trim(), value: splitCookie[1].trim() });
     }
   }
   return jsonCookies;
@@ -50,7 +55,8 @@ function parseCookies(value) {
 function requestHandler(config) {
   return async (request, response) => {
     const httpHandler = new HttpHandler();
-    const url = config.framework == FrameworkType.Firebase ? `http://localhost:3000/api${request.url}` : `http://localhost:3000${request.url}`;
+    const apiPrefix = `/${commonContainer.nattyConfig.api?.rootPath}`;
+    const url = config.framework == FrameworkType.Firebase ? `http://localhost:3000/api${request.url}` : `http://localhost:3000${apiPrefix}${request.url}`;
     const httpContext = new HttpContext(
       {
         url,
@@ -64,27 +70,123 @@ function requestHandler(config) {
     return httpHandler.processRequest(httpContext).then((httpResponse) => {
       return getResponse(response, httpResponse);
     }).catch((t) => {
-      response.send();
+      return getResponse(response, t.httpResponse);
     });
   };
 }
 
+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) {
+    const apiPrefix = `/${commonContainer.nattyConfig.api?.rootPath}`;
+    const staticCfg = commonContainer.nattyConfig.static;
     app.use(compression());
-    app.use(cors({
-      "origin": ["http://localhost:5173", "http://localhost:5174"],
-      "methods": "GET,HEAD,PUT,PATCH,POST,DELETE",
-      "preflightContinue": false,
-      "optionsSuccessStatus": 204,
-      "credentials": true
-    }));
-    app.use(express.json());
-    app.all("*", requestHandler(config));
-    if (config.autoGeneratePort == true)
-      app.listen(3e3, () => {
-        console.log("Server is running on port 3000 ");
+    if (config.cors)
+      app.use(cors(config.cors));
+    app.use(express.json({ limit: config.payload?.limit || "1mb" }));
+    if (staticCfg.enabled) {
+      const staticDir = path.resolve("public");
+      app.use(staticPrettyRoutes({ staticDir, apiPrefix }));
+      app.use(
+        express.static(staticDir, {
+          index: false,
+          maxAge: "1d"
+        })
+      );
+      if (staticCfg.spaFallback !== false) {
+        app.get("*", (req, res, next) => {
+          const url = req.originalUrl || req.url;
+          if (url.startsWith(apiPrefix))
+            return next();
+          if (req.method !== "GET")
+            return next();
+          const acceptsHtml = req.headers.accept?.includes("text/html");
+          if (!acceptsHtml)
+            return next();
+          return res.sendFile(path.join(staticDir, staticCfg.indexFile ?? "index.html"));
+        });
+      }
+    }
+    app.use(apiPrefix, requestHandler(config));
+    if (config.autoGeneratePort == true || config.autoGeneratePort == void 0)
+      getPort().then((port) => {
+        app.listen(port, () => {
+          console.log(`[NATTYJS]:Server is running on port ${port}`);
+        });
       });
     return app;
   }

package/package.json

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