zet-lib 1.4.20 → 1.4.22

package/lib/zAppRouter.js

@@ -1765,16 +1765,15 @@ router.post("/zcompress-dropzone", async (req, res) => {
       },
     });
     //check for temp dir
-
     if (result.lock == 1) {
       let message = `Data has been locked, please unlock first to compress images `;
       io.to(room).emit("errormessage", message);
       res.json(Util.flashError(message));
     } else {
       const config = {
-        jpeg: { quality: 50, compressionLevel: 5 },
-        webp: { quality: 50, compressionLevel: 5 },
-        png: { quality: 50, compressionLevel: 5 },
+        jpeg: { quality: 60, compressionLevel: 9 },
+        webp: { quality: 60, compressionLevel: 9 },
+        png: { quality: 60, compressionLevel: 9 },
       };
       const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
       const timeExcecute = 200;
@@ -1806,7 +1805,12 @@ router.post("/zcompress-dropzone", async (req, res) => {
           await wait(timeExcecute); // Wait for file system
           let image;
           try {
-            image = sharp(tempPath);
+            image = sharp(tempPath).resize({
+              width: 1024,
+              height: null, // Maintain aspect ratio
+              fit: "inside",
+              withoutEnlargement: true, // Don't enlarge if image is smaller than 1024px
+            });
           } catch (error) {
             console.log(`Skipping ${filename} - not a valid image file`);
             io.to(room).emit(
@@ -1971,7 +1975,6 @@ router.post("/zdropbox/:table/:field", handleTokenRefresh, async (req, res) => {
     if (!req.files || !req.files.file) {
       return res.status(400).json({ error: "No file uploaded" });
     }
-
     const userId = res.locals.userId;
     const table = req.params.table;
     const field = req.params.field;
@@ -1981,10 +1984,9 @@ router.post("/zdropbox/:table/:field", handleTokenRefresh, async (req, res) => {
     const dir = `/temps/${table}/${field}/${userId}`;
     await ensureFolder(dir);
     const filePath = `${dir}/${fileName}`;
-
-    console.log("Uploading file to path:", filePath);
+    /*console.log("Uploading file to path:", filePath);
     console.log("File size:", file.size);
-    console.log("File name:", fileName);
+    console.log("File name:", fileName);*/
 
     const response = await dbx.filesUpload({
       path: filePath,
@@ -1994,7 +1996,6 @@ router.post("/zdropbox/:table/:field", handleTokenRefresh, async (req, res) => {
     });
     res.json("ok");
   } catch (error) {
-    console.error("Upload error:", error);
     console.error("Error details:", {
       message: error.message,
       stack: error.stack,
@@ -2268,4 +2269,110 @@ router.get("/zdownloads-dropbox/:table/:field/:id", async (req, res) => {
   }
 });
 
+//compress image di dropzone
+router.post("/zcompress-dropbox", async (req, res) => {
+  let table = req.body.table;
+  let field = req.body.field;
+  let id = req.body.id;
+  const room = res.locals.token;
+  let userId = res.locals.userId;
+  try {
+    let result = await connection.result({
+      table: table,
+      where: {
+        id: id,
+      },
+    });
+    //check for temp dir
+    if (result.lock == 1) {
+      let message = `Data has been locked, please unlock first to compress images `;
+      io.to(room).emit("errormessage", message);
+      res.json(Util.flashError(message));
+    } else {
+      let arr = [];
+      let files = result[field];
+      const count = files.length || 0;
+      let i = 0;
+      for (const file of files) {
+        const filePath = `/${table}/${field}/${file}`;
+        let ext = file.toLowerCase().split(".").pop();
+        if (ext == "png" || ext == "jpg" || ext == "jpeg") {
+          try {
+            // Download the file from Dropbox
+            const response = await dbx.filesDownload({
+              path: filePath,
+            });
+            // Get the file name from the path
+            const fileName = file;
+            // Process the image with sharp
+            const processedImage = await sharp(response.result.fileBinary)
+              .resize({
+                width: 1024,
+                height: null, // Maintain aspect ratio
+                fit: "inside",
+                withoutEnlargement: true, // Don't enlarge if image is smaller than 1024px
+              })
+              .toBuffer()
+              .then((buffer) => {
+                // Check if the file is PNG
+                if (fileName.toLowerCase().endsWith(".png")) {
+                  return sharp(buffer)
+                    .png({
+                      quality: 60,
+                      compressionLevel: 9, // Maximum compression for PNG
+                    })
+                    .toBuffer();
+                } else {
+                  // For JPEG files
+                  return sharp(buffer)
+                    .jpeg({
+                      quality: 60,
+                      mozjpeg: true, // Better compression
+                    })
+                    .toBuffer();
+                }
+              });
+
+            // Upload the compressed image back to Dropbox
+            await dbx.filesUpload({
+              path: filePath,
+              contents: processedImage,
+              mode: { ".tag": "overwrite" }, // This will replace the existing file
+            });
+            io.to(room).emit("progress", {
+              value: Math.round(((i + 1) / count) * 100),
+              style: `progress-bar progress-bar-striped bg-success`,
+              data: `Compress ${fileName} Successfully..`,
+            });
+          } catch (error) {
+            console.error(`Error processing file ${filePath}:`, error);
+            io.to(room).emit("progress", {
+              value: Math.round(((i + 1) / count) * 100),
+              style: `progress-bar progress-bar-striped bg-danger`,
+              data: `Error Compress ${fileName} ${error.message}..`,
+            });
+            continue;
+          }
+        } else {
+          io.to(room).emit("progress", {
+            value: Math.round(((i + 1) / count) * 100),
+            style: `progress-bar progress-bar-striped bg-danger`,
+            data: `Skip Compress ${fileName} skip..`,
+          });
+        }
+        i++;
+      }
+    }
+  } catch (e) {
+    console.log(e);
+    res.json(e + "");
+  }
+  io.to(room).emit("progress", {
+    value: 100,
+    style: `progress-bar progress-bar-striped bg-success`,
+    data: `Compress all images complete...`,
+  });
+  res.json(Util.jsonSuccess("Compress all images completed..."));
+});
+
 module.exports = router;

package/lib/zRoute.js

@@ -4335,7 +4335,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         });
         if(dropbox_${item}_data.length > 0) {
             ajaxPost('/zdropbox-files',{files:dropbox_${item}_data,table:"${MYMODEL.table}",field:"${item}"}, function(datas) {
-                datas.map((mockFile) => {
+                datas.map((mockFile, index) => {
                     dz.options.addedfile.call(dz, mockFile);
                     dz.options.thumbnail.call(dz, mockFile, mockFile.link);
                     const imageElement = mockFile.previewElement.querySelector('.dz-image');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "1.4.20",
+  "version": "1.4.22",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"