zet-lib 3.1.3 → 3.1.5

package/lib/zAppRouter.js

@@ -22,8 +22,25 @@ const pm2 = require("pm2");
 const zFunction = require("./zFunction");
 const qs = require("qs");
 const zip = require("express-zip");
-const sharp = require("sharp");
 const path = require("path");
+
+// Lazy load sharp with error handling for cross-platform compatibility
+let sharp = null;
+function getSharp() {
+  if (sharp === null) {
+    try {
+      sharp = require("sharp");
+    } catch (error) {
+      console.warn("Warning: sharp module is not available. Image processing features will be disabled.");
+      console.warn("To enable image processing, install sharp: npm install --include=optional sharp");
+      sharp = false; // Mark as unavailable
+    }
+  }
+  if (sharp === false) {
+    throw new Error("sharp module is not available. Please install it: npm install --include=optional sharp");
+  }
+  return sharp;
+}
 const { Dropbox } = require("dropbox");
 const fetch = require("isomorphic-fetch");
 const JSZip = require("jszip");
@@ -1747,6 +1764,15 @@ router.post("/zcompress-dropzone", async (req, res) => {
       io.to(room).emit("errormessage", message);
       res.json(Util.flashError(message));
     } else {
+      // Check if sharp is available
+      try {
+        getSharp();
+      } catch (error) {
+        const message = "Image compression is not available. Please install sharp: npm install --include=optional sharp";
+        io.to(room).emit("errormessage", message);
+        return res.json(Util.flashError(message));
+      }
+
       const config = {
         jpeg: { quality: 60, compressionLevel: 9 },
         webp: { quality: 60, compressionLevel: 9 },
@@ -1782,7 +1808,8 @@ router.post("/zcompress-dropzone", async (req, res) => {
           await wait(timeExcecute); // Wait for file system
           let image;
           try {
-            image = sharp(tempPath).resize({
+            const sharpLib = getSharp();
+            image = sharpLib(tempPath).resize({
               width: 1024,
               height: null, // Maintain aspect ratio
               fit: "inside",
@@ -2146,6 +2173,15 @@ router.post("/zcompress-dropbox", async (req, res) => {
       io.to(room).emit("errormessage", message);
       res.json(Util.flashError(message));
     } else {
+      // Check if sharp is available
+      try {
+        getSharp();
+      } catch (error) {
+        const message = "Image compression is not available. Please install sharp: npm install --include=optional sharp";
+        io.to(room).emit("errormessage", message);
+        return res.json(Util.flashError(message));
+      }
+
       let arr = [];
       let files = result[field];
       const count = files.length || 0;
@@ -2162,7 +2198,8 @@ router.post("/zcompress-dropbox", async (req, res) => {
             // Get the file name from the path
             const fileName = file;
             // Process the image with sharp
-            const processedImage = await sharp(response.result.fileBinary)
+            const sharpLib = getSharp();
+            const processedImage = await sharpLib(response.result.fileBinary)
                 .resize({
                   width: 1024,
                   height: null, // Maintain aspect ratio
@@ -2173,7 +2210,7 @@ router.post("/zcompress-dropbox", async (req, res) => {
                 .then((buffer) => {
                   // Check if the file is PNG
                   if (fileName.toLowerCase().endsWith(".png")) {
-                    return sharp(buffer)
+                    return sharpLib(buffer)
                         .png({
                           quality: 60,
                           compressionLevel: 9, // Maximum compression for PNG
@@ -2181,7 +2218,7 @@ router.post("/zcompress-dropbox", async (req, res) => {
                         .toBuffer();
                   } else {
                     // For JPEG files
-                    return sharp(buffer)
+                    return sharpLib(buffer)
                         .jpeg({
                           quality: 60,
                           mozjpeg: true, // Better compression

package/lib/zRoute.js

@@ -4167,6 +4167,8 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
   let hasLocation = false;
   let hasDragdrop = false;
   let hasDropbox = false;
+  let hasDropdownMulti = false;
+  let hasSelectize = false;
   let lexicals = [];
   let mapKey = "";
   let hasAttributes = [];
@@ -4182,6 +4184,8 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         hasDatePicker = true;
       } else if (widgets[key].name == "number") {
         hasNumber = true;
+      } else if (widgets[key].name == "dropdown_multi") {
+        hasDropdownMulti = true;
       } else if (widgets[key].name == "money") {
         hasNumber = true;
         moneys.push(key);
@@ -4261,6 +4265,7 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
         //add search on select
         if (widgets[key].isSearch) {
           selectize.push(key);
+          hasSelectize = true;
         }
       }
     }
@@ -4363,12 +4368,15 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
     headObj.datetimepicker = datetimepickerObj.head;
     endObj.datetimepicker = datetimepickerObj.end;
   }
+  if(hasSelectize || hasDropdownMulti) {
+    let selectizeObject = moduleLib.selectize(req, res);
+    headObj.selectize = selectizeObject.head;
+    endObj.selectize = selectizeObject.end;
+  }
   if (selectize.length > 0) {
     selectize.map((item) => {
       let selectizeObj = moduleLib.selectize(req, res, `#${item}`);
       scriptForm += selectizeObj.script;
-      headObj.selectize = selectizeObj.head;
-      endObj.selectize = selectizeObj.end;
     });
   }
   if (hasIde) {
@@ -4643,6 +4651,50 @@ zRoute.generateJS = (req, res, MYMODEL, relations, zForms = "", data = {}) => {
           break;
 
         case "dropdown_multi":
+          scriptForm += `$(document).ready(function () {
+        var $${keys}Select = $('#${keys}');
+        if ($${keys}Select.length && typeof $.fn.selectize !== 'undefined') {
+            if (!$${keys}Select[0].selectize) {
+                var isMultiple = $${keys}Select.hasClass('dropdown-multi');
+                if (isMultiple && !$${keys}Select.attr('multiple')) {
+                    $${keys}Select.attr('multiple', 'multiple');
+                }
+                var selectizeOptions = {
+                    plugins: isMultiple ? ['remove_button'] : [],
+                    delimiter: ',',
+                    persist: false,
+                    create: false,
+                    search: true,
+                    openOnFocus: true,
+                    closeAfterSelect: true,
+                    maxItems: 1,
+                    placeholder: 'Please select ${keys}',
+                    onType: function (str) {
+                        var results = this.search(str);
+                        if (results.length === 1) {
+                            var self = this;
+                            setTimeout(function () {
+                                self.setValue(results[0].value);
+                                self.close();
+                            }, 100);
+                        }
+                    }
+                };
+                $${keys}Select.selectize(selectizeOptions);
+            }
+        }
+        $(document).on('click', '#dropdownadd${keys}', function () {
+            var $select = $('#${keys}');
+            if ($select.length) {
+                var selectize = $select[0].selectize;
+                if (selectize) {
+                    selectize.clear();
+                } else {
+                    $select.val('').trigger('change');
+                }
+            }
+        });
+    });`
           scriptForm += ` $("#dropdownadd${keys}").on("click", function () {
         var val = $("#${keys}").val();
         if(val == ""){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "zet is a library that part of zet generator.",
   "engines": {
     "node": ">=18"
@@ -49,12 +49,14 @@
     "qs": "^6.14.0",
     "randomstring": "^1.3.1",
     "read-excel-file": "^5.8.0",
-    "sharp": "^0.34.1",
     "socket.io": "^4.8.1",
     "uglify-js": "^3.19.3",
     "uuid": "^9.0.1",
     "xlsx": "^0.18.5"
   },
+  "optionalDependencies": {
+    "sharp": "^0.34.1"
+  },
   "overrides": {
     "unzipper": "^0.12.3",
     "rimraf": "^6.1.2",