qumra-engine 2.0.30 → 2.0.32

package/dist/middleware/init.middleware.d.ts

@@ -1,9 +1,10 @@
 import { NextFunction, Response, Request } from "express";
-import { CacheGetter, CacheSetter, TMode } from "../types/sharedTypes";
+import { App, CacheGetter, CacheSetter, TMode } from "../types/sharedTypes";
 interface Options {
     mode: TMode;
     getRender?: CacheGetter;
     setRender?: CacheSetter;
+    app?: App;
 }
-export declare const initMiddleware: ({ mode, getRender, setRender }: Options) => (req: Request, res: Response, next: NextFunction) => void;
+export declare const initMiddleware: ({ mode, getRender, setRender, app, }: Options) => (req: Request, res: Response, next: NextFunction) => void;
 export {};

package/dist/middleware/init.middleware.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initMiddleware = void 0;
 const qumra_utils_1 = require("qumra-utils");
-const initMiddleware = ({ mode, getRender, setRender }) => {
+const initMiddleware = ({ mode, getRender, setRender, app, }) => {
     return (req, res, next) => {
         res.locals.mode = mode;
         res.locals.cache = {};
         const fullUrl = mode === "production"
             ? req.protocol + "://" + req.get("host") + req.originalUrl
-            : "https://qumra-electronics.qumra.onlone" + req.originalUrl;
+            : app?.url + req.originalUrl;
         const parsedUrl = (0, qumra_utils_1.parseUrlString)(fullUrl);
         res.locals.parsedUrl = parsedUrl;
         if (typeof getRender === "function") {

package/dist/middleware/locals.middleware.js

@@ -9,7 +9,6 @@ const fs_1 = __importDefault(require("fs"));
 const locals_1 = require("../store/locals");
 const localesMiddleware = (req, res, next) => {
     const localesDirectory = res.locals.localesPath;
-    console.log("🚀 ~ localesDirectory:", localesDirectory);
     const lang = res.locals.parsedUrl.language;
     if (!lang)
         return next();

package/dist/middleware/mergeData.middleware.js

@@ -12,7 +12,6 @@ const mergeDataMiddleware = async (req, res, next) => {
             handle: res.locals.render.engine?.page?.handle,
         });
         const settingsData = res.locals.render.engine?.settings;
-        console.log("🚀 ~ settingsData:", settingsData);
         res.locals.env.addGlobal("settings", settingsData);
         next();
     }

package/dist/middleware/prepareData.middleware.js

@@ -16,11 +16,12 @@ const prepareDataMiddleware = (req, res, next) => {
     }
     const api = true
         ? `https://store-gate.qumra-dev.site/render${themePath}`
-        : "http://192.168.1.5:4019/v1/render${themePath}";
+        : `http://192.168.1.8:4019/v1/render${themePath}`;
     fetch(api, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ url: parsedUrl.fullUrl }),
+        credentials: 'include'
     })
         .then((engineResponse) => {
         if (!engineResponse.ok) {
@@ -30,8 +31,7 @@ const prepareDataMiddleware = (req, res, next) => {
     })
         .then((data) => {
         // تم تخزين النتيجة داخل res.locals.render
-        res.locals.render = data;
-        console.log("✅ Rendering data prepared");
+        res.locals.render = data.data;
         next();
     })
         .catch((err) => {

package/dist/middleware.d.ts

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

package/dist/middleware.js

@@ -18,11 +18,12 @@ const extensions_middleware_1 = require("./middleware/extensions.middleware");
 const isPathAllowedToRender_1 = require("./utils/isPathAllowedToRender");
 const mergeData_middleware_1 = require("./middleware/mergeData.middleware");
 const express_session_1 = __importDefault(require("express-session"));
-const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo, }) => {
+const printServerLog_1 = require("./utils/printServerLog");
+const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo, themeId = null, currentApp }) => {
     try {
         const app = (0, express_1.default)();
         app.use((0, express_session_1.default)({
-            secret: 'your-secret-key',
+            secret: "your-secret-key",
             resave: false,
             saveUninitialized: false,
             cookie: {
@@ -31,17 +32,21 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
             },
         }));
         app.use((req, res, next) => {
-            const themeId = req.query.theme;
-            if (themeId) {
-                req.session.themeId = themeId;
+            if (req.query.theme) {
+                req.session.themeId = req.query.theme;
                 console.log(`✅ Theme ID set in session: ${themeId}`);
-                return res.redirect('/');
+                return res.redirect("/");
+            }
+            else {
+                if (themeId) {
+                    req.session.themeId = themeId;
+                }
             }
             next();
         });
         app.set("view engine", "nunjucks");
         app.use((0, morgan_1.default)("dev"));
-        app.use((0, init_middleware_1.initMiddleware)({ mode, getRender, setRender }));
+        app.use((0, init_middleware_1.initMiddleware)({ mode, getRender, setRender, app: currentApp }));
         const avilablePort = await (0, findAvailablePort_1.findAvailablePort)(port);
         if (mode === "devlopment") {
             const staticPath = path_1.default.join(process.cwd(), "assets");
@@ -75,7 +80,7 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
         app.use(extensions_middleware_1.nunjucksExtensionsMiddleWare);
         app.use(render_middleware_1.renderMiddleware);
         app.listen(avilablePort, () => {
-            console.log(`Theme dev server started at http://localhost:${avilablePort}`);
+            (0, printServerLog_1.printServerLog)({ port: avilablePort, themeId: themeId || "default", app: currentApp });
         });
     }
     catch (err) {

package/dist/services/findAllApps.js

@@ -0,0 +1 @@
+"use strict";

package/dist/types/sharedTypes.d.ts

@@ -41,3 +41,9 @@ export interface Page {
 }
 export type CacheGetter = <T = any>(app: string, path: string) => Promise<T | null>;
 export type CacheSetter = (app: string, path: string, value: any, ttlInSec?: number) => Promise<void> | undefined;
+export type App = {
+    name: string;
+    subdomain: string;
+    url: string;
+    id: string;
+};

package/dist/utils/printServerLog.d.ts

@@ -0,0 +1,6 @@
+import { App } from "../types/sharedTypes";
+export declare function printServerLog({ port, themeId, app }: {
+    port: number;
+    themeId: string;
+    app?: App;
+}): void;

package/dist/utils/printServerLog.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.printServerLog = printServerLog;
+function printServerLog({ port, themeId, app }) {
+    const cyan = (text) => `\x1b[36m${text}\x1b[0m`; // cyan
+    const green = (text) => `\x1b[32m${text}\x1b[0m`; // green
+    const yellow = (text) => `\x1b[33m${text}\x1b[0m`; // yellow
+    const bold = (text) => `\x1b[1m${text}\x1b[0m`; // bold
+    console.log('\n' + bold('🚀 Server started successfully!'));
+    console.log('📡 Localhost  =>', green(`http://localhost:${port}`));
+    if (app) {
+        console.log('🌍 Theme URL  =>', cyan(`${app?.url}?theme=${themeId}`));
+    }
+    // console.log('📦 Builder ID   =>', yellow(`https://qumra.cloud/store/test/themes/${themeId}`));
+    console.log('');
+}

package/dist/utils/serverStartLog.d.ts

@@ -0,0 +1,5 @@
+declare function printServerLog({ port, themeId, url }: {
+    port: number;
+    themeId: string;
+    url: string;
+}): void;

package/dist/utils/serverStartLog.js

@@ -0,0 +1,12 @@
+"use strict";
+function printServerLog({ port, themeId, url }) {
+    const cyan = (text) => `\x1b[36m${text}\x1b[0m`; // cyan
+    const green = (text) => `\x1b[32m${text}\x1b[0m`; // green
+    const yellow = (text) => `\x1b[33m${text}\x1b[0m`; // yellow
+    const bold = (text) => `\x1b[1m${text}\x1b[0m`; // bold
+    console.log('\n' + bold('🚀 Server started successfully!'));
+    console.log('📡 Localhost  =>', green(`http://localhost:${port}`));
+    console.log('🌍 Theme URL  =>', cyan(`${url}?theme=${themeId}`));
+    console.log('📦 Theme ID   =>', yellow(themeId));
+    console.log('');
+}

package/package.json

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