@xuda.io/drive_module 1.1.1117 → 1.1.1119

package/index.js

@@ -217,9 +217,8 @@ exports.get_drive_files = async function (req) {
               size: formatBytes(doc.size),
               extension: doc?.file_ext?.substr(1),
               type: doc.type,
-              access_link: `https://${domain}/${drive_type}-drive/${
-                datasource_id || app_id
-              }/${doc._id}`,
+              access_link: `https://${domain}/${drive_type}-drive/${datasource_id || app_id
+                }/${doc._id}`,
               is_archive: doc.is_archive,
               public: doc.public,
               path: doc.file_path,
@@ -653,7 +652,7 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
       );
       try {
         fse.unlinkSync(target_dir);
-      } catch (error) {}
+      } catch (error) { }
 
       fse.copyFileSync(tempPath, target_dir);
     }
@@ -669,9 +668,10 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
     doc = { ...doc, ...(await get_file_info(tempPath)) };
 
     let save_ret;
-
+    let ref
     switch (drive_type) {
       case "studio": {
+        ref = await _common.get_project_app_id(app_id, true);
         const app_id_reference = await _common.get_project_app_id(app_id);
         save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
 
@@ -682,8 +682,10 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
         break;
       }
       case "workspace": {
+
         const app_id_reference = await _common.get_project_app_id(app_id);
         const app_id_master = await _common.get_project_app_id(app_id, true);
+        ref = app_id_master;
 
         doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
           await upload_file_to_spaces(
@@ -701,6 +703,7 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
         break;
       }
       case "user": {
+        ref = uid;
         doc.bucket[`${process.env.XUDA_HOSTNAME}`] =
           await upload_file_to_spaces(tempPath, uid, drive_type, file_name);
         save_ret = await db_module.save_couch_doc("xuda_drive", doc);
@@ -716,11 +719,11 @@ exports.update_drive_file = async function (req, job_id, headers, file_obj) {
     if (save_ret.code < 0) {
       return save_ret;
     }
-    const server_file_name = `https://${
-      process.env.XUDA_HOSTNAME
-    }/${drive_type}-drive${
-      drive_type === "studio" ? `/${master_id}/${target_file}` : file_name
-    }`;
+    const server_file_name = `https://${process.env.XUDA_HOSTNAME
+      }/${drive_type}-drive${drive_type === "studio" ? `/${master_id}/${target_file}` : file_name
+      }`;
+
+    let file_url = get_file_url(drive_type, file_name, ref);
 
     misc_module.purge_cloudflare_cache(false, server_file_name);
     return {
@@ -1108,7 +1111,7 @@ exports.extract_drive_file = async function (req, job_id, headers) {
 
         try {
           await db_module.save_app_couch_doc(app_id_reference, file_doc);
-        } catch (error) {}
+        } catch (error) { }
       })
       .on("close", () => {
         console.log("Extraction complete.");
@@ -1182,7 +1185,7 @@ exports.upload_drive_file = async function (req, job_id, headers, file_obj) {
     let tags_arr = [];
     try {
       if (tags) tags_arr = tags.split(",");
-    } catch (error) {}
+    } catch (error) { }
 
     var doc = {
       docType: `${drive_type}_drive`,
@@ -1870,7 +1873,7 @@ const get_file_info = async function (file_path) {
     const sizeOf = require("image-size");
     const dimensions = sizeOf(file_path);
     doc.dimensions = `${dimensions.width}x${dimensions.height}`;
-  } catch (error) {}
+  } catch (error) { }
   return doc;
 };
 
@@ -1957,11 +1960,9 @@ exports.update_drive_file_tags = async function (req, job_id, headers) {
 };
 
 const get_file_url = function (drive_type, file_name, ref) {
-  let file_url = `https://${
-    process.env.XUDA_HOSTNAME
-  }/${drive_type}-drive/${ref}${
-    file_name?.substr(0, 1) !== "/" ? "/" : ""
-  }${file_name}`;
+  let file_url = `https://${process.env.XUDA_HOSTNAME
+    }/${drive_type}-drive/${ref}${file_name?.substr(0, 1) !== "/" ? "/" : ""
+    }${file_name}`;
   // if (["workspace"].includes(drive_type)) {
   //   file_url = `https://${process.env.XUDA_HOSTNAME}/workspace-drive${
   //     file_name.substr(0, 1) !== "/" ? "/" : ""
@@ -2153,7 +2154,7 @@ exports.compile_javascript_program_in_studio_drive = async function (
       const wrappedCode = [
         ...importLines,
         "",
-        "export default async function (xu, SESSION_ID, SESSION_OBJ, job_id) {",
+        "export default async function (params,xu, SESSION_ID, SESSION_OBJ, job_id) {",
         ...codeLines.map((line) => `  ${line}`), // Indent the code inside the function
         "}",
       ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/drive_module",
-  "version": "1.1.1117",
+  "version": "1.1.1119",
   "description": "Xuda Drive Server Module",
   "main": "index.js",
   "dependencies": {