zet-lib 5.0.2 → 6.0.0

package/lib/views/generatorjs.ejs

@@ -516,18 +516,6 @@
             }
         })
 
-        $('.btn-minify').on('click', function () {
-            if (window.confirm('Minify all views in one line make your website faster ?')) {
-                ajaxPost('/<%- routeName%>/minify', {}, function (data) {
-                    if (data.status == 0) {
-                        toastr.error(data.message, data.title)
-                    } else {
-                        toastr.success(data.title, data.message)
-                    }
-                })
-            }
-        })
-
         $('.btn-generate-assets').on('click', function () {
             if (window.confirm('Replace javascript assets with this one ?')) {
                 ajaxPost('/<%- routeName%>/generate-assets', {}, function (data) {

package/lib/zAppRouter.js

@@ -1609,24 +1609,34 @@ router.get("/addapproval-models", async (req, res) => {
 //post dropzone widget
 router.post("/zdropzone", async (req, res) => {
   try {
-    let userId = res.locals.userId;
-    if (userId) {
-      let dir = path.join(dirRoot, "public", "zdropzone", userId);
-      if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-      }
-      let filename = req.files.file.name;
-      req.files.file.mv(path.join(dir, filename), function (err) {
-        if (err) {
-          return res.status(500).send(err + "");
-        }
-      });
+    const userId = res.locals.userId;
+    if (!userId) {
+      return res.status(401).send("Unauthorized");
     }
-    res.json("ok");
+
+    const file = req?.files?.file;
+    if (!file || !file.name) {
+      return res.status(400).send("No file uploaded");
+    }
+
+    const dir = path.join(dirRoot, "public", "zdropzone", `${userId}`);
+    await fs.promises.mkdir(dir, { recursive: true });
+
+    // Prevent path traversal; keep only the base name.
+    const originalName = path.basename(file.name);
+    const uniquePrefix = `${Date.now()}_${Math.random().toString(16).slice(2, 10)}_`;
+    const savedName = `${uniquePrefix}${originalName}`;
+    const destPath = path.join(dir, savedName);
+
+    await new Promise((resolve, reject) => {
+      file.mv(destPath, (err) => (err ? reject(err) : resolve()));
+    });
+
+    // Return the stored filename so client can reference it uniquely
+    res.json({ ok: true, fileName: savedName, originalName });
   } catch (e) {
     console.log(e);
-    res.status(500);
-    res.send(e + "");
+    res.status(500).send(e + "");
   }
 });
 

package/lib/zGeneratorRouter.js

@@ -5,8 +5,6 @@ const csrfProtection = csrf({ cookie: true });
 const fs = require("fs-extra");
 const axios = require("axios");
 const getPm2 = require("./optionalPm2");
-const uglifyJS = require("uglify-js");
-const { minify } = require("html-minifier-terser");
 const zRoute = require("./zRoute");
 const connection = require("./connection");
 const Util = require("./Util");
@@ -614,22 +612,10 @@ const generate = async (req, res) => {
       if (!fs.existsSync(DIR_VIEW)) {
         fs.mkdirSync(DIR_VIEW);
       }
-      let compilesJS = ["createjs.ejs", "updatejs.ejs", "importjs.ejs"];
       if (!dummy) {
         for (const q in filesKey) {
           console.log(q);
-          if (Util.in_array(q, compilesJS)) {
-            fs.writeFileSync(path.join(DIR_VIEW, q), filesKey[q]);
-          } else {
-            fs.writeFileSync(
-                path.join(DIR_VIEW, q),
-                await minify(filesKey[q], {
-                  minifyJS: true,
-                  minifyCSS: true,
-                  collapseWhitespace: true,
-                })
-            );
-          }
+          fs.writeFileSync(path.join(DIR_VIEW, q), filesKey[q]);
           console.log(`The files views of ${q} is saved!`);
         }
       }
@@ -657,17 +643,11 @@ const generate = async (req, res) => {
     let relations = await zRoute.relations(req, res, MYMODEL.table);
     //add script
     let jsObj = zRoute.generateJS(req, res, MYMODEL, relations);
-    //minify script
-    let script = uglifyJS.minify(jsObj.script);
-    if (script.error) {
-      console.log(jsObj.script);
-      throw script.error;
-    }
     let time = new Date().getTime();
     Util.deleteAllFiles(path_script);
     Util.deleteAllFiles(path_head);
     Util.deleteAllFiles(path_end);
-    Util.writeFile(path.join(path_script, `${time}.js`), script.code);
+    Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
     Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
     Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
   }
@@ -1589,10 +1569,7 @@ router.post("/generate-assets", async (req, res) => {
       Util.deleteAllFiles(path_end);
       Util.deleteAllFiles(path_script);
 
-      //minify script
-      let script = uglifyJS.minify(jsObj.script);
-      if (script.error) throw script.error;
-      Util.writeFile(path.join(path_script, `${time}.js`), script.code);
+      Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
       Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
       Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
     }
@@ -1602,63 +1579,6 @@ router.post("/generate-assets", async (req, res) => {
   res.json(notifObj);
 });
 
-router.post("/minify", async (req, res) => {
-  let notifyObj = Util.jsonSuccess("Success to cached");
-  try {
-    notifyObj = await viewsMini();
-  } catch (e) {
-    console.log(e);
-    notifyObj = Util.flashError(e.toString());
-  }
-  res.json(notifyObj);
-});
-
-const viewsMini = async () => {
-  let notifyObj = Util.jsonSuccess("Success");
-  const viewDir = path.join(dirRoot, "views");
-  const layoutsDir = path.join(dirRoot, "views", "layouts");
-  let item;
-  try {
-    let views = Util.getAllFiles(viewDir);
-    let options = {
-      minifyJS: true,
-      minifyCSS: true,
-      collapseWhitespace: true,
-    };
-    const notViewDir = ["zgenerator", "layouts", "index", "zindex"];
-    for (const dir of views) {
-      console.log("dir :", dir);
-      if (!Util.in_array(dir, notViewDir)) {
-        let files = Util.getAllFiles(path.join(viewDir, dir));
-        //console.log(files);
-        for (item of files) {
-          if (item.includes(".ejs")) {
-            let filename = path.join(viewDir, dir, item);
-            let content = Util.readFile(filename);
-            let contentChange = await minify(content, options);
-            fs.writeFileSync(filename, contentChange);
-          }
-        }
-      }
-    }
-
-    let layouts = Util.getAllFiles(layoutsDir);
-    for (item of layouts) {
-      if (item.includes(".ejs")) {
-        let filename = path.join(layoutsDir, item);
-        let content = Util.readFile(filename);
-        let contentChange = await minify(content, options);
-        fs.writeFileSync(filename, contentChange);
-      }
-    }
-  } catch (e) {
-    notifyObj = Util.flashError(
-        `error in item : ${item} , error str :${e.toString()}`
-    );
-  }
-  return notifyObj;
-};
-
 router.post("/load-joins", async (req, res) => {
   let jsonNotif = Util.jsonSuccess("Success");
   let html = "";

package/lib/zPage.js

@@ -8,7 +8,6 @@ const nodemailer = require('nodemailer');
 const qs = require('qs');
 const moment = require('moment');
 const getPm2 = require('./optionalPm2');
-const { minify } = require('html-minifier-terser');
 const connection = require('./connection');
 const Util = require('./Util');
 const myCache = require('./cache');
@@ -159,14 +158,7 @@ zpage.createRoute = (obj, token, layoutObj) => {
 zpage.buildLayout = async (obj) => {
     let name = Util.toName(obj.name);
     if (obj.active) {
-        let html = await minify(obj.code,{
-            removeComments:true,
-            minifyJS:true,
-            minifyCSS:true,
-            collapseWhitespace: true
-        });
-        console.log(path.join(dirRoot, "views", "layouts", name + ".ejs"));
-        fs.writeFileSync(path.join(dirRoot, "views", "layouts", name + ".ejs"), html, 'utf-8');
+        fs.writeFileSync(path.join(dirRoot, "views", "layouts", name + ".ejs"), obj.code, 'utf-8');
         if (process.env.NODE_ENV  === "production") {
             setTimeout(function () {
                 const pm2 = getPm2()

package/lib/zRoute.js

@@ -8,7 +8,6 @@ const qs = require("qs");
 //for generate PDF
 const puppeteer = require("puppeteer");
 const ejs = require("ejs");
-const uglifyJS = require("uglify-js");
 const Excel = require("exceljsremake");
 const fs = require("fs-extra");
 const Util = require("./Util");
@@ -4123,8 +4122,7 @@ zRoute.moduleLib = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         let time = new Date().getTime();
         Util.deleteAllFiles(path_head);
         Util.deleteAllFiles(path_end);
-        //minify js
-        Util.writeFile(path.join(path_script, `${time}.js`), uglifyJS.minify(jsObj.script));
+        Util.writeFile(path.join(path_script, `${time}.js`), jsObj.script);
         Util.writeFile(path.join(path_head, "head.txt"), jsObj.head);
         Util.writeFile(path.join(path_end, "end.txt"), jsObj.end);
         end += `<script src="/runtime/script/${table}/${time}.js"></script>`;
@@ -4538,6 +4536,18 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     addRemoveLinks: !0,
     maxFilesize: 30,
     headers: {"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content")},
+    success: function(file, response) {
+        const type = window.location.href.split("/").pop();
+        if(response && response.fileName) {
+            // Persist server-side unique name on the file object so remove uses it too
+            file.name = response.fileName;
+            if(file.upload) file.upload.filename = response.fileName;
+            ajaxPost("/zdropzone-attributes",{file:response.fileName,'category':'add',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
+        } else {
+            // fallback to original
+            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'add',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
+        }
+    },
     removedfile: function(file) {
         const type = window.location.href.split("/").pop();
         ajaxPost("/zdropzone-remove",{file:file.name, cname:"dropzone__ZUSER___ID__${MYMODEL.table}__${item}__"+type},(data) => {
@@ -4547,9 +4557,6 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     init: function() {
         let dz = this;
         const type = window.location.href.split("/").pop();
-        dz.on("addedfile", function(file) {
-            ajaxPost("/zdropzone-attributes",{file:file.name,'category':'add',field:"${item}",table:"${MYMODEL.table}", type:type},() => {})
-        });
         dz.on("removedfile", function(file) {
             ajaxPost("/zdropzone-attributes",{file:file.name,'category':'remove',field:"${item}",table:"${MYMODEL.table}", type:type},() => {});
             $("div#${item}").find(".dz-message").remove();
@@ -6715,4 +6722,4 @@ zRoute.tableBody = (
     }
     return html;
 };
-module.exports = zRoute;
+module.exports = zRoute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -32,10 +32,9 @@
     "dotenv": "^16.5.0",
     "dropbox": "^10.34.0",
     "ejs": "^3.1.10",
-    "exceljsremake": "^0.1.3",
+    "exceljsremake": "^0.1.4",
     "express-zip": "^3.0.0",
     "fs-extra": "^11.3.4",
-    "html-minifier-terser": "^7.2.0",
     "isomorphic-fetch": "^3.0.0",
     "js-sha256": "^0.11.1",
     "jszip": "^3.10.1",
@@ -43,12 +42,11 @@
     "node-cache": "^5.1.2",
     "nodemailer": "^8.0.5",
     "pg": "^8.16.3",
-    "puppeteer": "^24.40.0",
+    "puppeteer": "^25.1.0",
     "qs": "^6.14.0",
     "randomstring": "^1.3.1",
     "read-excel-file": "^5.8.0",
-    "socket.io": "^4.8.3",
-    "uglify-js": "^3.19.3"
+    "socket.io": "^4.8.3"
   },
   "optionalDependencies": {
     "sharp": "^0.34.1"