qumra-engine 2.0.68 → 2.0.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,7 +7,6 @@ exports.prepareDataMiddleware = void 0;
|
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
8
|
const prepareDataMiddleware = (req, res, next) => {
|
|
9
9
|
const parsedUrl = res.locals.parsedUrl;
|
|
10
|
-
console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl:", parsedUrl);
|
|
11
10
|
// ✅ تخطي الرندر في production لبعض المسارات
|
|
12
11
|
// if (res.locals.mode === "production") {
|
|
13
12
|
// if (isPathAllowedToRender(parsedUrl.pathname)) {
|
|
@@ -59,12 +58,7 @@ const prepareDataMiddleware = (req, res, next) => {
|
|
|
59
58
|
const expectedHost = typeof backendUrl === "string"
|
|
60
59
|
? new URL(backendUrl).host
|
|
61
60
|
: backendUrl?.host;
|
|
62
|
-
console.log("🚀 ~ prepareDataMiddleware ~ expectedHost:", expectedHost);
|
|
63
|
-
console.log("🚀 ~ prepareDataMiddleware ~ data.globals?.app.url:", data.globals?.app.url);
|
|
64
|
-
console.log("🚀 ~ prepareDataMiddleware ~ data.globals?.app.url:", parsedUrl);
|
|
65
|
-
console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl.host:", parsedUrl.host);
|
|
66
61
|
if (parsedUrl.host !== expectedHost) {
|
|
67
|
-
console.log("🚀 ~ prepareDataMiddleware ~ parsedUrl.host:", parsedUrl.host);
|
|
68
62
|
//redirect to expected host
|
|
69
63
|
return res.redirect(301, `${data.globals?.app?.url}${parsedUrl.pathname}`);
|
|
70
64
|
}
|
|
@@ -75,7 +69,7 @@ const prepareDataMiddleware = (req, res, next) => {
|
|
|
75
69
|
.catch((err) => {
|
|
76
70
|
console.log("🚀 ~ prepareDataMiddleware ~ err:", err);
|
|
77
71
|
console.log("❌ prepareDataMiddleware error:", err.message);
|
|
78
|
-
|
|
72
|
+
next(err);
|
|
79
73
|
});
|
|
80
74
|
};
|
|
81
75
|
exports.prepareDataMiddleware = prepareDataMiddleware;
|
package/dist/middleware.js
CHANGED
|
@@ -27,6 +27,11 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
|
|
|
27
27
|
app.use((0, cookie_parser_1.default)());
|
|
28
28
|
app.set("view engine", "nunjucks");
|
|
29
29
|
app.use((0, morgan_1.default)("dev"));
|
|
30
|
+
app.use("health", (req, res) => {
|
|
31
|
+
console.log("🚀 Health check OK");
|
|
32
|
+
res.status(200).send("OK");
|
|
33
|
+
return;
|
|
34
|
+
});
|
|
30
35
|
app.use((req, res, next) => {
|
|
31
36
|
const isIframe = req.query.iframe === "1" || req.headers["sec-fetch-dest"] === "iframe";
|
|
32
37
|
if (isIframe) {
|
|
@@ -41,11 +46,11 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
|
|
|
41
46
|
resave: false,
|
|
42
47
|
saveUninitialized: false,
|
|
43
48
|
cookie: {
|
|
44
|
-
sameSite:
|
|
49
|
+
sameSite: "none", // مطلوب للـ cross-site
|
|
45
50
|
secure: true, // لازم مع 'none'
|
|
46
51
|
httpOnly: true,
|
|
47
52
|
partitioned: true, // علشان تشتغل داخل iframe بعد حجب 3rd-party cookies
|
|
48
|
-
maxAge: 1000 * 60 * 5
|
|
53
|
+
maxAge: 1000 * 60 * 5,
|
|
49
54
|
},
|
|
50
55
|
}));
|
|
51
56
|
app.use((req, res, next) => {
|
|
@@ -68,7 +73,7 @@ const startEngine = async ({ mode, getRender, setRender, port = 3000, themesRepo
|
|
|
68
73
|
if (mode === "devlopment") {
|
|
69
74
|
const staticPath = path_1.default.join(process.cwd(), "assets");
|
|
70
75
|
app.use("/assets", express_1.default.static(staticPath));
|
|
71
|
-
app.use(
|
|
76
|
+
app.use("api", routers_1.default);
|
|
72
77
|
}
|
|
73
78
|
app.use((req, res, next) => {
|
|
74
79
|
if (!(0, isPathAllowedToRender_1.isPathAllowedToRender)(res.locals.parsedUrl.pathname)) {
|