zet-lib 1.4.28 → 1.5.1

package/lib/zAppRouter.js

@@ -1769,75 +1769,67 @@ const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 let dbx = zDropbox.dbx;
 // Upload endpoint
-router.post(
-  "/zdropbox/:table/:field",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      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;
-      const file = req.files.file;
-      const fileName = file.name;
-      //ensure folder
-      const dir = `/temps/${table}/${field}/${userId}`;
-      await zDropbox.ensureFolder(dir);
-      const filePath = `${dir}/${fileName}`;
-      /*console.log("Uploading file to path:", filePath);
+router.post("/zdropbox/:table/:field", async (req, res) => {
+  try {
+    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;
+    const file = req.files.file;
+    const fileName = file.name;
+    //ensure folder
+    const dir = `/temps/${table}/${field}/${userId}`;
+    await zDropbox.ensureFolder(dir);
+    const filePath = `${dir}/${fileName}`;
+    /*console.log("Uploading file to path:", filePath);
     console.log("File size:", file.size);
     console.log("File name:", fileName);*/
 
-      const response = await dbx.filesUpload({
-        path: filePath,
-        contents: file.data,
-        mode: { ".tag": "add" },
-        autorename: true,
-      });
-      res.json("ok");
-    } catch (error) {
-      console.error("Error details:", {
-        message: error.message,
-        stack: error.stack,
-        response: error.response,
-      });
-      res.status(500).json({
-        error: "Failed to upload file",
-        details: error.message,
-      });
-    }
+    const response = await dbx.filesUpload({
+      path: filePath,
+      contents: file.data,
+      mode: { ".tag": "add" },
+      autorename: true,
+    });
+    res.json("ok");
+  } catch (error) {
+    console.error("Error details:", {
+      message: error.message,
+      stack: error.stack,
+      response: error.response,
+    });
+    res.status(500).json({
+      error: "Failed to upload file",
+      details: error.message,
+    });
   }
-);
+});
 
-router.post(
-  "/zdropbox-attributes",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      let userId = res.locals.userId;
-      let body = req.body;
-      console.log(body);
-      let category = body.category;
-      let name = `dropbox__${userId}__${body.table}__${body.field}__${body.type}`;
-      let arr = myCache.has(name) ? myCache.get(name) : [];
-      if (category === "add") {
-        arr.push(body.file);
-      } else {
-        if (myCache.has(name)) {
-          arr = myCache.get(name);
-        }
-        arr = Util.arrayDelete(arr, body.file);
+router.post("/zdropbox-attributes", async (req, res) => {
+  try {
+    let userId = res.locals.userId;
+    let body = req.body;
+    console.log(body);
+    let category = body.category;
+    let name = `dropbox__${userId}__${body.table}__${body.field}__${body.type}`;
+    let arr = myCache.has(name) ? myCache.get(name) : [];
+    if (category === "add") {
+      arr.push(body.file);
+    } else {
+      if (myCache.has(name)) {
+        arr = myCache.get(name);
       }
-      myCache.set(name, arr);
-      res.json("ok");
-    } catch (e) {
-      console.log(e);
-      res.status(500).send(e + "");
+      arr = Util.arrayDelete(arr, body.file);
     }
+    myCache.set(name, arr);
+    res.json("ok");
+  } catch (e) {
+    console.log(e);
+    res.status(500).send(e + "");
   }
-);
+});
 
 //get all files and meta in dropbox
 router.post("/zdropbox-files", async (req, res) => {
@@ -1868,179 +1860,120 @@ router.post("/zdropbox-files", async (req, res) => {
   res.json(datas);
 });
 
-router.post(
-  "/zdropbox-file/:index",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    let datas = {};
+router.post("/zdropbox-file/:index", async (req, res) => {
+  let datas = {};
+  try {
     const room = res.locals.token;
+    const index = req.params.index;
     const { fileName, table, field } = req.body;
     let dir = `/${table}/${field}`;
     let pathFile = `${dir}/${fileName}`;
     console.log(pathFile);
-    try {
-      const metadata = await dbx.filesGetMetadata({
-        path: pathFile,
-      });
-      let link = ``;
-      try {
-        const response = await dbx.filesGetTemporaryLink({
-          path: pathFile,
-        });
-        link = response.result.link;
-      } catch (error) {
-        setTimeout(async () => {
-          try {
-            const response = await dbx.filesGetTemporaryLink({
-              path: pathFile,
-            });
-            link = response.result.link;
-            const mockFile = {
-              name: metadata.result.name,
-              id: metadata.result,
-              path: metadata.result.path_display,
-              link: link,
-              isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
-              size: metadata.result.size,
-              modified: metadata.result.server_modified,
-              accepted: true,
-              index: req.params.index,
-            };
-            //console.log(mockFile)
-            datas = mockFile;
-            res.json(datas);
-          } catch (e) {
-            console.error("Error getting temporary link:", error);
-            io.to(room).emit(
-              "errormessage",
-              `Please reload your browser, Error getting temporary link:  ${error.message}`
-            );
-          }
-        }, 2000);
-      }
-      const mockFile = {
-        name: metadata.result.name,
-        id: metadata.result,
-        path: metadata.result.path_display,
-        link: link,
-        isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
-        size: metadata.result.size,
-        modified: metadata.result.server_modified,
-        accepted: true,
-        index: req.params.index,
-      };
-      //console.log(mockFile)
-      datas = mockFile;
-    } catch (e) {
-      console.log(e);
-      io.to(room).emit(
-        "errormessage",
-        `${e.message} Error ${pathFile} not exist in dropbox, Please reload your browser !!`
-      );
+    let jsonMessage = await zDropbox.file(fileName, table, field, index);
+    if (jsonMessage.status == 1) {
+      res.json(jsonMessage.datas);
+    } else {
+      setTimeout(async () => {
+        jsonMessage = await zDropbox.file(fileName, table, field, index);
+        if (jsonMessage.status == 1) {
+          res.json(jsonMessage.datas);
+        } else {
+          io.to(room).emit(
+            "errormessage",
+            `Please reload your browser !! Error ${pathFile} not exist in dropbox, `
+          );
+        }
+      }, 4000);
     }
+  } catch (e) {
+    console.log(e);
     res.json(datas);
   }
-);
+});
 
 // Delete file dicache dulu kemudian submit delete dropbox file
-router.post(
-  "/zdropbox-remove/",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      let body = req.body;
-      //console.log(body);
-      const userId = res.locals.userId;
-      const fileName = body.file;
-      let cname = body.cname.replace("ZUSER___ID", userId);
-      let cacheName = cname;
-      //console.log(cacheName);
-      let splits = cname.split("__");
-      let table = splits[2];
-      let field = splits[3];
-      let type = splits[4];
-      const dir = `/temps/${table}/${field}/${userId}`;
-      await zDropbox.ensureFolder(dir);
-      const filePath = `${dir}/${fileName}`;
-      let arr = [];
-      if (type != "create") {
-        cacheName = cacheName + "__remove";
-      }
-      if (myCache.has(cacheName)) {
-        arr = myCache.get(cacheName);
-      }
-      //console.log(cacheName)
-      if (type == "create") {
-        try {
-          await dbx.filesDeleteV2({
-            path: filePath,
-          });
-          arr = Util.arrayDelete(arr, body.file);
-          myCache.set(cacheName, arr);
-        } catch (e) {
-          console.log(e);
-        }
-      } else {
-        arr.push(body.file);
+router.post("/zdropbox-remove/", async (req, res) => {
+  try {
+    let body = req.body;
+    //console.log(body);
+    const userId = res.locals.userId;
+    const fileName = body.file;
+    let cname = body.cname.replace("ZUSER___ID", userId);
+    let cacheName = cname;
+    //console.log(cacheName);
+    let splits = cname.split("__");
+    let table = splits[2];
+    let field = splits[3];
+    let type = splits[4];
+    const dir = `/temps/${table}/${field}/${userId}`;
+    await zDropbox.ensureFolder(dir);
+    const filePath = `${dir}/${fileName}`;
+    let arr = [];
+    if (type != "create") {
+      cacheName = cacheName + "__remove";
+    }
+    if (myCache.has(cacheName)) {
+      arr = myCache.get(cacheName);
+    }
+    //console.log(cacheName)
+    if (type == "create") {
+      try {
+        await dbx.filesDeleteV2({
+          path: filePath,
+        });
+        arr = Util.arrayDelete(arr, body.file);
         myCache.set(cacheName, arr);
+      } catch (e) {
+        console.log(e);
       }
-      res.json({ success: true });
-    } catch (error) {
-      console.error("Error deleting file:", error);
-      res.status(500).json({ error: "Error deleting file" });
+    } else {
+      arr.push(body.file);
+      myCache.set(cacheName, arr);
     }
+    res.json({ success: true });
+  } catch (error) {
+    console.error("Error deleting file:", error);
+    res.status(500).json({ error: "Error deleting file" });
   }
-);
+});
 
 // Endpoint to check token status
-router.get(
-  "/zdropbox-check-token",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      await dbx.usersGetCurrentAccount();
-      res.json({ status: "valid" });
-    } catch (error) {
-      res.status(401).json({ status: "invalid" });
-    }
+router.get("/zdropbox-check-token", async (req, res) => {
+  try {
+    await dbx.usersGetCurrentAccount();
+    res.json({ status: "valid" });
+  } catch (error) {
+    res.status(401).json({ status: "invalid" });
   }
-);
+});
 
 // Get temporary link for a file
-router.post(
-  "/zdropbox-get-temp-link",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      const response = await dbx.filesGetTemporaryLink({
-        path: req.body.path,
-      });
-      res.json({ link: response.result.link });
-    } catch (error) {
-      console.error("Error getting temporary link:", error);
-      res.status(500).json({ error: "Error getting temporary link" });
-    }
+router.post("/zdropbox-get-temp-link", async (req, res) => {
+  try {
+    const response = await dbx.filesGetTemporaryLink({
+      path: req.body.path,
+    });
+    res.json({ link: response.result.link });
+  } catch (error) {
+    console.error("Error getting temporary link:", error);
+    res.status(500).json({ error: "Error getting temporary link" });
   }
-);
+});
 
-router.get(
-  "/zdropbox-view/:table/:field/:item",
-  zDropbox.handleTokenRefresh,
-  async (req, res) => {
-    try {
-      let item = req.params.item;
-      item = item.substring(13);
-      let filePath = `/${req.params.table}/${req.params.field}/${req.params.item}`;
-      const response = await dbx.filesGetTemporaryLink({
-        path: filePath,
-      });
-      res.send(`<img src="${response.result.link}">`);
-    } catch (e) {
-      console.log(e);
-      res.send(e);
-    }
+router.get("/zdropbox-view/:table/:field/:item", async (req, res) => {
+  try {
+    let item = req.params.item;
+    item = item.substring(13);
+    let filePath = `/${req.params.table}/${req.params.field}/${req.params.item}`;
+    const response = await dbx.filesGetTemporaryLink({
+      path: filePath,
+    });
+    res.send(`<img src="${response.result.link}">`);
+  } catch (e) {
+    console.log(e);
+    res.send(e);
   }
-);
+});
 
 // Download and zip files endpoint
 router.get("/zdownloads-dropbox/:table/:field/:id", async (req, res) => {

package/lib/zDropbox.js

@@ -131,4 +131,43 @@ zDropbox.deleteFolder = async (dir) => {
   }
 };
 
+zDropbox.file = async (fileName, table, field, index) => {
+  let jsonMessage = Util.flashError("Error");
+  let datas = {};
+  jsonMessage.datas = datas;
+  let dir = `/${table}/${field}`;
+  let pathFile = `${dir}/${fileName}`;
+  try {
+    const metadata = await dbx.filesGetMetadata({
+      path: pathFile,
+    });
+    let link = ``;
+    try {
+      const response = await dbx.filesGetTemporaryLink({
+        path: pathFile,
+      });
+      link = response.result.link;
+      const mockFile = {
+        name: metadata.result.name,
+        id: metadata.result,
+        path: metadata.result.path_display,
+        link: link,
+        isImage: metadata.result.name.match(/\.(jpg|jpeg|png|gif)$/i),
+        size: metadata.result.size,
+        modified: metadata.result.server_modified,
+        accepted: true,
+        index: index,
+      };
+      //console.log(mockFile)
+      jsonMessage = Util.jsonSuccess("Success");
+      jsonMessage.datas = mockFile;
+    } catch (error) {
+      console.log(error);
+    }
+  } catch (e) {
+    console.log(e);
+  }
+
+  return jsonMessage;
+};
 module.exports = zDropbox;

package/package.json

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