qumra-engine 2.0.145 → 2.0.146

package/dist/middleware.js

@@ -4,61 +4,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
-const render_middleware_1 = require("./middleware/render.middleware");
-const prepareData_middleware_1 = require("./middleware/prepareData.middleware");
 const morgan_1 = __importDefault(require("morgan"));
 const path_1 = __importDefault(require("path"));
+const express_session_1 = __importDefault(require("express-session"));
+const cookie_parser_1 = __importDefault(require("cookie-parser"));
+const printServerLog_1 = require("./utils/printServerLog");
 const findAvailablePort_1 = require("./utils/findAvailablePort");
+const isPathAllowedToRender_1 = require("./utils/isPathAllowedToRender");
+const production_1 = __importDefault(require("./routers/production"));
 const init_middleware_1 = require("./middleware/init.middleware");
+const prepareData_middleware_1 = require("./middleware/prepareData.middleware");
+const render_middleware_1 = require("./middleware/render.middleware");
 const nunjucks_middleware_1 = require("./middleware/nunjucks.middleware");
 const filters_middleware_1 = require("./middleware/filters.middleware");
-const locals_middleware_1 = require("./middleware/locals.middleware");
 const globals_middleware_1 = require("./middleware/globals.middleware");
 const extensions_middleware_1 = require("./middleware/extensions.middleware");
-const isPathAllowedToRender_1 = require("./utils/isPathAllowedToRender");
+const locals_middleware_1 = require("./middleware/locals.middleware");
 const setGlobals_middleware_1 = require("./middleware/setGlobals.middleware");
-const express_session_1 = __importDefault(require("express-session"));
-const printServerLog_1 = require("./utils/printServerLog");
-const cookie_parser_1 = __importDefault(require("cookie-parser"));
-const routers_1 = __importDefault(require("./routers"));
+const locals_1 = require("./store/locals");
 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";
         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.use(
-        //   cors({
-        //     origin: "*",
-        //   })
-        // );
         app.set("view engine", "nunjucks");
-        // لازم ترد على preflight OPTIONS request
-        // app.options("*", cors());
-        app.get("/health", (req, res) => {
+        app.set("trust proxy", 1);
+        app.get("/health", (_, res) => {
             console.log("🚀 Health check OK");
-            res.status(200).send("OK");
-            return;
+            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";
-            if (isIframe) {
-                res.locals.isIframe = true;
-            }
+            res.locals.isIframe = !!isIframe;
             next();
         });
-        app.set("trust proxy", 1); // لو ورا Nginx/Proxy/Cloud
-        const isProduction = process.env.NODE_ENV === "production";
         app.use((0, express_session_1.default)({
             secret: process.env.SESSION_SECRET || "your-secret-key",
             resave: false,
             saveUninitialized: false,
             cookie: {
-                sameSite: "none", // يدعم داخل وخارج iframe
-                secure: isProduction, // لازم يكون true في production مع HTTPS
+                sameSite: "none",
+                secure: isProduction,
                 httpOnly: true,
-                partitioned: true, // يخليها شغالة في iframe (Chrome 115+)
-                maxAge: 1000 * 60 * 5, // 5 دقائق
+                partitioned: true,
+                maxAge: 1000 * 60 * 5,
             },
         }));
         app.use((req, res, next) => {
@@ -67,19 +60,18 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             }
             if (req.query.theme) {
                 req.session.theme = req.query.theme;
-                // إعادة توجيه لنفس المسار بدون الـ query string
                 const redirectUrl = req.path || "/";
                 if (!req.query.market && !req.query.devMode) {
                     return res.redirect(redirectUrl);
                 }
             }
-            else {
-                if (themeId) {
-                    req.session.theme = themeId;
-                }
+            else if (themeId) {
+                req.session.theme = themeId;
             }
+            (0, locals_1.setLocales)("cookies", req.cookies);
             next();
         });
+        console.log("🚀 ~ startEngine ~ currentApp:", currentApp);
         app.use((0, init_middleware_1.initMiddleware)({
             mode,
             getRender,
@@ -88,31 +80,23 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
             renderApi,
             market,
         }));
-        const avilablePort = await (0, findAvailablePort_1.findAvailablePort)(port);
+        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));
-            app.use("api", routers_1.default);
+            // app.use("/api", devRouter);
         }
         app.use((req, res, next) => {
-            if (!(0, isPathAllowedToRender_1.isPathAllowedToRender)(res.locals.parsedUrl.pathname)) {
+            if (!(0, isPathAllowedToRender_1.isPathAllowedToRender)(res.locals.parsedUrl?.pathname || req.path)) {
                 return res.status(404).end();
             }
-            else {
-                next();
-            }
+            next();
         });
         app.use((_, res, next) => {
-            var themesRepoPath;
-            if (themesRepo) {
-                themesRepoPath = path_1.default.join(process.cwd(), themesRepo);
-            }
-            else {
-                themesRepoPath = process.cwd();
-            }
-            res.locals.themesRepo = themesRepoPath;
+            res.locals.themesRepo = path_1.default.join(process.cwd(), themesRepo || "");
             next();
         });
+        app.use(production_1.default);
         app.use(prepareData_middleware_1.prepareDataMiddleware);
         app.use(nunjucks_middleware_1.nunjucksMiddleWare);
         app.use(setGlobals_middleware_1.mergeDataMiddleware);
@@ -121,16 +105,16 @@ const startEngine = async ({ renderApi, mode, getRender, setRender, port = 3000,
         app.use(globals_middleware_1.nunjucksGlobalsMiddleWare);
         app.use(extensions_middleware_1.nunjucksExtensionsMiddleWare);
         app.use(render_middleware_1.renderMiddleware);
-        app.listen(avilablePort, () => {
+        app.listen(availablePort, () => {
             (0, printServerLog_1.printServerLog)({
-                port: avilablePort,
+                port: availablePort,
                 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/dist/routers/dev/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const router = (0, express_1.Router)();
+exports.default = router;

package/dist/routers/production/auth/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/auth/index.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const login_1 = __importDefault(require("./login"));
+const logout_1 = __importDefault(require("./logout"));
+const verify_1 = __importDefault(require("./verify"));
+const signup_1 = __importDefault(require("./signup"));
+const router = (0, express_1.Router)();
+router.use('/login', login_1.default);
+router.use('/logout', logout_1.default);
+router.use('/verify', verify_1.default);
+router.use('/signup', signup_1.default);
+exports.default = router;

package/dist/routers/production/auth/login/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/auth/login/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const customer_login_controller_1 = require("../../../../controllers/auth/customer-login.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(customer_login_controller_1.customerLoginController);
+exports.default = router;

package/dist/routers/production/auth/logout/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/auth/logout/index.js

@@ -0,0 +1,8 @@
+"use strict";
+// src/routes/app.routes.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const logout_controller_1 = require("../../../../controllers/auth/logout.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(logout_controller_1.logoutController);
+exports.default = router;

package/dist/routers/production/auth/signup/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/auth/signup/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const create_customer_controller_1 = require("../../../../controllers/auth/create-customer.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(create_customer_controller_1.createCustomerController);
+exports.default = router;

package/dist/routers/production/auth/verify/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/auth/verify/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const customer_login_verify_controller_1 = require("../../../../controllers/auth/customer-login-verify.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(customer_login_verify_controller_1.customerLoginVerifyController);
+exports.default = router;

package/dist/routers/production/cart/add/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/cart/add/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const add_to_cart_controller_1 = require("../../../../controllers/cart/add-to-cart.controller");
+const router = (0, express_1.Router)();
+router.route('/add').post(add_to_cart_controller_1.addToCartController);
+exports.default = router;

package/dist/routers/production/cart/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/cart/index.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const add_1 = __importDefault(require("./add"));
+const update_1 = __importDefault(require("./update"));
+const router = (0, express_1.Router)();
+router.use('/cart', add_1.default);
+router.use('/cart', update_1.default);
+exports.default = router;

package/dist/routers/production/cart/update/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/cart/update/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const update_cart_controller_1 = require("../../../../controllers/cart/update-cart.controller");
+const router = (0, express_1.Router)();
+router.route('/update').post(update_cart_controller_1.updateCartController);
+exports.default = router;

package/dist/routers/production/checkout/buy-now/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/checkout/buy-now/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const checkout_controller_1 = require("../../../../controllers/checkout/checkout.controller");
+const router = (0, express_1.Router)();
+router.route('/buyNow').post(checkout_controller_1.checkoutController);
+exports.default = router;

package/dist/routers/production/checkout/create-order/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/checkout/create-order/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const checkout_controller_1 = require("../../../../controllers/checkout/checkout.controller");
+const router = (0, express_1.Router)();
+router.route('/create').post(checkout_controller_1.checkoutController);
+exports.default = router;

package/dist/routers/production/checkout/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/checkout/index.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const buy_now_1 = __importDefault(require("./buy-now"));
+const create_order_1 = __importDefault(require("./create-order"));
+const router = (0, express_1.Router)();
+router.use('/order', buy_now_1.default);
+router.use('/order', create_order_1.default);
+exports.default = router;

package/dist/routers/production/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const localize_1 = __importDefault(require("./localize"));
+const auth_1 = __importDefault(require("./auth"));
+const checkout_1 = __importDefault(require("./checkout"));
+const router = (0, express_1.Router)();
+router.use('/auth', auth_1.default);
+router.use("/localize", localize_1.default);
+router.use("/checkout", checkout_1.default);
+exports.default = router;

package/dist/routers/production/localize/currency/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/localize/currency/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const currency_controller_1 = require("../../../../controllers/localize/currency.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(currency_controller_1.currencyController);
+exports.default = router;

package/dist/routers/production/localize/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/localize/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const currency_1 = __importDefault(require("./currency"));
+const market_1 = __importDefault(require("./market"));
+const lang_1 = __importDefault(require("./lang"));
+const router = (0, express_1.Router)();
+router.use('/lang', lang_1.default);
+router.use('/market', market_1.default);
+router.use('/currency', currency_1.default);
+exports.default = router;

package/dist/routers/production/localize/lang/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/localize/lang/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const lang_controller_1 = require("../../../../controllers/localize/lang.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(lang_controller_1.langController);
+exports.default = router;

package/dist/routers/production/localize/market/index.d.ts

@@ -0,0 +1,2 @@
+declare const router: import("express-serve-static-core").Router;
+export default router;

package/dist/routers/production/localize/market/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = require("express");
+const market_controller_1 = require("../../../../controllers/localize/market.controller");
+const router = (0, express_1.Router)();
+router.route('/').post(market_controller_1.marketController);
+exports.default = router;

package/dist/utils/axios.d.ts

@@ -0,0 +1,10 @@
+interface SendRequestOptions {
+    renderApi: string;
+    fullUrl?: string;
+    appId?: string;
+    qdid?: string;
+    authorization?: string;
+    body?: Record<string, any>;
+}
+export declare const sendRequest: ({ renderApi, fullUrl, appId, qdid, authorization, body, }: SendRequestOptions) => Promise<any>;
+export {};

package/dist/utils/axios.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendRequest = void 0;
+const axios_1 = __importDefault(require("axios"));
+const sendRequest = async ({ renderApi, fullUrl = "", appId = "", qdid = "", authorization = "", body = {}, }) => {
+    try {
+        const response = await axios_1.default.post(renderApi, { url: fullUrl, appId, ...body }, {
+            headers: {
+                "Content-Type": "application/json",
+                Authorization: authorization,
+                qdid,
+            },
+        });
+        console.log("✅ Axios Response:", response.status, response.data);
+        return response.data;
+    }
+    catch (error) {
+        console.error("❌ Axios Error:", error.message || error, renderApi, fullUrl);
+        throw error;
+    }
+};
+exports.sendRequest = sendRequest;

package/dist/utils/client.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLClient } from 'graphql-request';
+export declare function getGqlClient(): GraphQLClient;

package/dist/utils/client.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGqlClient = getGqlClient;
+const graphql_request_1 = require("graphql-request");
+const locals_1 = require("../store/locals");
+const globals_1 = require("../store/globals");
+function getGqlClient() {
+    const cookies = (0, locals_1.getLocales)("cookies");
+    const authorization = cookies.authorization;
+    const qdid = cookies.qdid;
+    const app = (0, globals_1.getGlobal)('app');
+    const rawBaseUrl = app?.url;
+    console.log("🚀 ~ getGqlClient ~ app:", app);
+    // نشيل أي / في آخر الرابط
+    const baseUrl = rawBaseUrl?.replace(/\/+$/, '');
+    const endpoint = `${baseUrl}/api/graphql`;
+    return new graphql_request_1.GraphQLClient(endpoint, {
+        headers: {
+            ...(authorization ? { Authorization: authorization } : {}),
+            ...(qdid ? { qdid } : {}),
+        },
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qumra-engine",
-  "version": "2.0.145",
+  "version": "2.0.146",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -13,9 +13,12 @@
     "colord": "^2.9.3",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
+    "date-fns": "^4.1.0",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
+    "graphql-request": "^7.3.1",
     "morgan": "^1.10.0",
+    "natural-sort": "^1.0.0",
     "nunjucks": "^3.2.4",
     "pino": "^9.7.0",
     "pino-pretty": "^13.0.0",
@@ -28,8 +31,10 @@
     "@types/express": "^4.17.21",
     "@types/express-session": "^1.18.2",
     "@types/morgan": "^1.9.10",
+    "@types/natural-sort": "^1.0.0",
     "@types/node": "^20.4.2",
     "@types/nunjucks": "^3.2.6",
+    "@types/strftime": "^0.9.8",
     "nodemon": "^3.1.10",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"

package/dist/controllers/auth/login.d.ts

@@ -1,2 +0,0 @@
-import { Request, Response } from "express";
-export declare const loginController: (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;

package/dist/controllers/auth/login.js

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loginController = void 0;
-const loginController = async (req, res) => {
-    const { redirect_url, token } = req.query;
-    if (!redirect_url || !token) {
-        return res.status(400).send("Missing redirect_url or token");
-    }
-    res.cookie("authrization", token, {
-        httpOnly: false,
-        secure: process.env.NODE_ENV === "production",
-        expires: new Date(9999, 0, 1),
-    });
-    if (redirect_url) {
-        res.redirect(redirect_url);
-    }
-    else {
-        res.redirect("/");
-    }
-};
-exports.loginController = loginController;

package/dist/extensions/logic/form.js

@@ -1,41 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const nunjucks_1 = __importDefault(require("nunjucks"));
-exports.default = new (class FormExtension {
-    constructor() {
-        this.tags = ['form'];
-    }
-    parse(parser, nodes) {
-        const tok = parser.nextToken();
-        const args = parser.parseSignature(true, true);
-        parser.advanceAfterBlockEnd(tok.value);
-        const body = parser.parseUntilBlocks('endform');
-        parser.advanceAfterBlockEnd();
-        return new nodes.CallExtension(this, 'run', args, [body]);
-    }
-    run(context, type, options = {}, body) {
-        const method = options.method || 'POST';
-        const action = options.action || this.getDefaultAction(type);
-        return new nunjucks_1.default.runtime.SafeString(`
-      <form method="${method}" action="${action}">
-        ${body()}
-      </form>
-    `);
-    }
-    // 🟢 خلتها public بدون أي كلمة
-    getDefaultAction(type) {
-        switch (type) {
-            case 'search':
-                return '/search';
-            case 'customer_login':
-                return '/account/login';
-            case 'product':
-                return '/cart/add';
-            default:
-                return '/';
-        }
-    }
-})();

package/dist/routers/index.js

@@ -1,10 +0,0 @@
-"use strict";
-// src/routes/app.routes.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = require("express");
-const login_1 = require("../controllers/auth/login");
-const logout_1 = require("../controllers/auth/logout");
-const router = (0, express_1.Router)();
-router.post("/auth/login", login_1.loginController);
-router.post("/auth/logout", logout_1.logoutController);
-exports.default = router;