zet-lib 3.1.2 → 3.1.4

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/zdataTable.js

@@ -20,10 +20,23 @@ class dataTable {
     this.types = {}
     this.roles = myCache.get('ROLES')[datas.zuser.role_id] || {}
     this.level_approval = this.roles.approvals && this.roles.approvals[datas.routeName] ? this.roles.approvals[datas.routeName] : {}
-    this.hasLevels = Object.keys(this.level_approval).length == 0 ? false : true
+    this.hasLevels = Object.keys(this.level_approval).length > 0
     this.visiblesKey = this.visibles.map((item) => item.key)
     this.gridType = datas.gridType || 1
     this.additionalCss = ''
+    this.moneyAttributes = {}
+    this.hasMoney = false
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      const widgets = this.MYMODEL.widgets
+      for (let i = 0; i < this.visiblesKey.length; i++) {
+        const item = this.visiblesKey[i]
+        const widget = widgets[item]
+        if (widget && widget.name == 'money') {
+          this.moneyAttributes[item] = widget
+          this.hasMoney = true
+        }
+      }
+    }
     if (this.gridType == 1) {
       this.dataTableScript = '/modules/datatable/normal.js'
     } else if (this.gridType == 2) {
@@ -54,7 +67,26 @@ class dataTable {
     this.relations = obj.relations
     this.routeName = this.MYMODEL.routeName
     this.types = obj.TYPES
-    this.totalFields = this.visiblesKey.filter((item) => this.MYMODEL.widgets[item] && this.MYMODEL.widgets[item].name == 'number')
+    this.totalFields = []
+    this.moneyAttributes = {}
+    this.hasMoney = false
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      const widgets = this.MYMODEL.widgets
+      for (let i = 0; i < this.visiblesKey.length; i++) {
+        const item = this.visiblesKey[i]
+        const widget = widgets[item]
+        if (widget) {
+          const widgetName = widget.name
+          if (widgetName == 'number' || widgetName == 'money') {
+            this.totalFields.push(item)
+          }
+          if (widgetName == 'money') {
+            this.moneyAttributes[item] = widget
+            this.hasMoney = true
+          }
+        }
+      }
+    }
     delete obj.MYMODEL
     delete obj.relations
     delete obj.TYPES
@@ -72,9 +104,10 @@ class dataTable {
     if (this.setColumns) return this.setColumns
     let html = ''
     if (Array.isArray(this.visibles)) {
-      this.visibles.map((item) => {
+      for (let i = 0; i < this.visibles.length; i++) {
+        const item = this.visibles[i]
         html += `<th id="data_${item.key}_label">${item.name || ''}</th>`
-      })
+      }
     } else {
       for (const key in this.visibles) {
         html += `<th id="data_${key}_label">${this.visibles[key]}</th>`
@@ -87,9 +120,10 @@ class dataTable {
   get columnsFilter() {
     let html = '<tr class="filters">'
     if (Array.isArray(this.visibles)) {
-      this.visibles.map((item) => {
+      for (let i = 0; i < this.visibles.length; i++) {
+        const item = this.visibles[i]
         html += `<th id="data_${item.key}_label">${this.searchColumns[item.key]}</th>`
-      })
+      }
     } else {
       for (const key in this.visibles) {
         html += `<th id="data_${key}">${this.searchColumns[key]}</th>`
@@ -193,6 +227,9 @@ class dataTable {
     script += `var dataTableTypes = ${JSON.stringify(this.types, null, 2)};${Util.newLine}`
     script += `var dataTableRoute = "${this.routeName}";${Util.newLine}`
     script += `var dataTableHasTotalFields = ${JSON.stringify(this.totalFields)};${Util.newLine}`
+    if(this.hasMoney) {
+      script += `var dataTableMoneyAttributes = ${JSON.stringify(this.moneyAttributes, null, 2)};${Util.newLine}`
+    }
     script += `</script>${Util.newLine}`
     script += `<script type="text/javascript" src="${this.dataTableScript}"></script>${Util.newLine}`
     if (this.searchColumns.FILTERKEY) {
@@ -202,9 +239,10 @@ class dataTable {
 
     //additional script for typeahead in grid
     let typeaheadScript = ''
-    for (let key in this.MYMODEL.widgets) {
-      if (this.MYMODEL.widgets[key].name == 'typeahead') {
-        typeaheadScript += `if($("#${key}").val()){
+    if (this.MYMODEL && this.MYMODEL.widgets) {
+      for (let key in this.MYMODEL.widgets) {
+        if (this.MYMODEL.widgets[key].name == 'typeahead') {
+          typeaheadScript += `if($("#${key}").val()){
         setTimeout(()=>{
           ajaxPost('/ztypeaheadpost/${this.MYMODEL.table}/${key}', {
             id: $("#${key}").val()
@@ -217,11 +255,13 @@ class dataTable {
           },1500)
           };
           `
+        }
       }
     }
     if (typeaheadScript) {
       script += `<script type="text/javascript">$(function () {${typeaheadScript}})</script>${Util.newLine}`
     }
+
     if (this.hasLevels) {
       //modal-body-approval
       let APPROVAL_LEVELS = myCache.get('APPROVAL_LEVELS')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zet-lib",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "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",