qumra-engine 2.0.163 → 2.0.164

package/dist/middleware.d.ts

@@ -1,4 +1,4 @@
-import { App, CacheGetter, CacheSetter, TMode } from "./types/sharedTypes";
+import { App, CacheGetter, CacheSetter, TMode } from './types/sharedTypes';
 interface IStartEngine {
     renderApi?: string | null;
     mode: TMode;
@@ -10,5 +10,5 @@ interface IStartEngine {
     currentApp?: App;
     market?: string;
 }
-declare const startEngine: ({ renderApi, mode, getRender, setRender, port, themesRepo, themeId, currentApp, market, }: IStartEngine) => Promise<void>;
+declare const startEngine: ({ renderApi, mode, getRender, setRender, port, themesRepo, themeId, currentApp, market }: IStartEngine) => Promise<void>;
 export default startEngine;

package/dist/middleware.js

@@ -22,32 +22,34 @@ const extensions_middleware_1 = require("./middleware/extensions.middleware");
 const locals_middleware_1 = require("./middleware/locals.middleware");
 const setGlobals_middleware_1 = require("./middleware/setGlobals.middleware");
 const locals_1 = require("./store/locals");
-const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000, themesRepo, themeId = null, currentApp, market, }) => {
+const fs_1 = __importDefault(require("fs"));
+const path_2 = __importDefault(require("path"));
+const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000, themesRepo, themeId = null, currentApp, market }) => {
     try {
         const app = (0, express_1.default)();
-        const isProduction = process.env.NODE_ENV === "production";
+        const isProduction = process.env.NODE_ENV === 'production';
         app.use((0, cookie_parser_1.default)());
         app.use(express_1.default.urlencoded({ extended: true }));
         app.use(express_1.default.json());
-        app.use((0, morgan_1.default)("dev"));
-        app.set("view engine", "nunjucks");
-        app.set("trust proxy", 1);
-        app.get("/health", (_, res) => {
-            console.log("🚀 Health check OK");
-            return res.status(200).send("OK");
+        app.use((0, morgan_1.default)('dev'));
+        app.set('view engine', 'nunjucks');
+        app.set('trust proxy', 1);
+        app.get('/health', (_, res) => {
+            console.log('🚀 Health check OK');
+            return res.status(200).send('OK');
         });
         app.use((req, res, next) => {
             res.locals.showDevTools = req.query.showDevTools ?? false;
-            const isIframe = req.query.iframe === "1" || req.headers["sec-fetch-dest"] === "iframe";
+            const isIframe = req.query.iframe === '1' || req.headers['sec-fetch-dest'] === 'iframe';
             res.locals.isIframe = !!isIframe;
             next();
         });
         app.use((0, express_session_1.default)({
-            secret: process.env.SESSION_SECRET || "your-secret-key",
+            secret: process.env.SESSION_SECRET || 'your-secret-key',
             resave: false,
             saveUninitialized: false,
             cookie: {
-                sameSite: "none",
+                sameSite: 'none',
                 secure: isProduction,
                 httpOnly: true,
                 partitioned: true,
@@ -60,7 +62,7 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             }
             if (req.query.theme) {
                 req.session.theme = req.query.theme;
-                const redirectUrl = req.path || "/";
+                const redirectUrl = req.path || '/';
                 if (!req.query.market && !req.query.devMode) {
                     return res.redirect(redirectUrl);
                 }
@@ -68,7 +70,7 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             else if (themeId) {
                 req.session.theme = themeId;
             }
-            (0, locals_1.setLocales)("cookies", req.cookies);
+            (0, locals_1.setLocales)('cookies', req.cookies);
             next();
         });
         app.use((0, init_middleware_1.initMiddleware)({
@@ -80,24 +82,28 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             market,
         }));
         const availablePort = await (0, findAvailablePort_1.findAvailablePort)(port);
-        if (mode === "devlopment") {
-            const staticPath = path_1.default.join(process.cwd(), "assets");
-            app.use("/assets", express_1.default.static(staticPath));
+        if (mode === 'devlopment') {
+            const staticPath = path_1.default.join(process.cwd(), 'assets');
+            app.use('/assets', express_1.default.static(staticPath));
             // app.use("/api", devRouter);
         }
+        const notFoundPagePath = path_2.default.join(__dirname, 'pages', '404.html');
+        const notFoundPage = fs_1.default.readFileSync(notFoundPagePath, 'utf8');
         app.use((req, res, next) => {
             const path = res.locals.parsedUrl?.pathname || req.path;
             const result = (0, isPathAllowedToRender_1.validatePathForRender)(path);
             if (!result.allowed) {
-                return res.status(result.status).json({
-                    success: false,
-                    message: result.reason,
-                });
+                console.log("🚀 ~ startEngine ~ notFoundPagePath:", notFoundPagePath);
+                // return res.status(result.status).json({
+                //   success: false,
+                //   message: result.reason,
+                // });
+                return res.status(result.status).send(notFoundPage);
             }
             next();
         });
         app.use((_, res, next) => {
-            res.locals.themesRepo = path_1.default.join(process.cwd(), themesRepo || "");
+            res.locals.themesRepo = path_1.default.join(process.cwd(), themesRepo || '');
             next();
         });
         app.use(production_1.default);
@@ -112,13 +118,13 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
         app.listen(availablePort, () => {
             (0, printServerLog_1.printServerLog)({
                 port: availablePort,
-                themeId: themeId || "default",
+                themeId: themeId || 'default',
                 app: currentApp,
             });
         });
     }
     catch (err) {
-        console.error("❌ Server failed to start:", err);
+        console.error('❌ Server failed to start:', err);
     }
 };
 exports.default = startEngine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.163",
+  "version": "2.0.164",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {