@xuda.io/drive_module 1.1.1418 → 1.1.1420

package/index.mjs

@@ -476,6 +476,104 @@ const get_folder_files = async function (uid, app_id, drive_type, path) {
   return [...(files_ret.data.children || []), ...(directory_ret.data.children || [])];
 };
 
+// export const delete_drive_files = async (req, job_id, headers) => {
+//   try {
+//     const { drive_type, app_id, files_arr, uid } = req;
+//     validate_drive_type(drive_type);
+
+//     if (!Array.isArray(files_arr)) {
+//       return {
+//         code: -400,
+//         data: 'error - files_arr must be Array',
+//       };
+//     }
+
+//     for await (const file of files_arr) {
+//       let doc = await get_drive_doc(file.type, drive_type, app_id, uid, file.file_path, headers);
+
+//       // if (doc.is_system) {
+//       //   throw new Error(`${doc.type} protected`);
+//       // }
+
+//       if (doc.type === 'directory') {
+//         const files_in_directory = await get_folder_files(uid, app_id, drive_type, path.join(doc.file_path, doc.folder_name));
+//         if (files_in_directory?.length) {
+//           throw new Error(`Directory is not empty`);
+//         }
+//       }
+
+//       let save_ret;
+//       switch (drive_type) {
+//         case 'studio': {
+//           const app_id_reference = await _common.get_project_app_id(app_id);
+//           const target_dir = path.join(_conf[`studio_drive_path`], app_id_reference, file.file_path);
+//           console.log('target_dir', target_dir);
+//           rimraf.sync(target_dir);
+
+//           if (doc.type === 'file') {
+//             doc.ts = Date.now();
+//             doc.stat = 4;
+//             save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+//           }
+
+//           misc_msa.rsync_drive_resources_to_remote_servers('studio', app_id_reference);
+//           break;
+//         }
+
+//         case 'workspace': {
+//           // const app_id_reference = await _common.get_project_app_id(app_id);
+
+//           if (doc.type === 'file') {
+//             try {
+//               if (doc.bucket) {
+//                 await delete_file_from_bucket(doc.bucket);
+//               } else {
+//                 const { data: app_obj } = await db_module.get_app_obj(app_id);
+//                 if (app_obj?.app_type === 'datacenter') {
+//                   const host = `root@${app_obj.app_hosting_server.ip}`;
+//                   await _utils.run_ssh_script(`ssh ${host} "mv /var/xuda/workspace_drive/${doc.server_file_name} /tmp/;" `);
+//                 } else if (app_obj?.is_deployment) {
+//                   const { data: datacenter_obj } = await db_module.get_app_obj(app_obj.app_datacenter_id);
+//                   const host = `root@${datacenter_obj.app_hosting_server.ip}`;
+//                   await _utils.run_ssh_script(`ssh ${host} "mv /var/xuda/workspace_drive/${doc.server_file_name} /tmp/;" `);
+//                 }
+//               }
+//             } catch (error) {}
+//           }
+
+//           doc.ts = Date.now();
+//           doc.stat = 4;
+//           save_ret = await save_drive_doc(drive_type, uid, app_id, doc);
+
+//           break;
+//         }
+
+//         case 'user': {
+//           if (doc.type === 'file') {
+//             try {
+//               await delete_file_from_bucket(doc.bucket);
+//             } catch (error) {}
+//           }
+//           doc.ts = Date.now();
+//           doc.stat = 4;
+//           save_ret = await save_drive_doc(drive_type, uid, app_id, doc);
+
+//           break;
+//         }
+//         default:
+//           break;
+//       }
+//     }
+
+//     return {
+//       code: 200,
+//       data: req.files_arr,
+//     };
+//   } catch (err) {
+//     return { code: -1, data: err.message };
+//   }
+// };
+
 export const delete_drive_files = async (req, job_id, headers) => {
   try {
     const { drive_type, app_id, files_arr, uid } = req;
@@ -488,12 +586,16 @@ export const delete_drive_files = async (req, job_id, headers) => {
       };
     }
 
+    // get docs
+    let docs = [];
     for await (const file of files_arr) {
-      let doc = await get_drive_doc(file.type, drive_type, app_id, uid, file.file_path, headers);
+      try {
+        docs.push(await get_drive_doc(file.type, drive_type, app_id, uid, file.file_path, headers));
+      } catch (error) {}
+    }
 
-      // if (doc.is_system) {
-      //   throw new Error(`${doc.type} protected`);
-      // }
+    for await (const file of files_arr) {
+      let doc = await get_drive_doc(file.type, drive_type, app_id, uid, file.file_path, headers);
 
       if (doc.type === 'directory') {
         const files_in_directory = await get_folder_files(uid, app_id, drive_type, path.join(doc.file_path, doc.folder_name));
@@ -550,7 +652,9 @@ export const delete_drive_files = async (req, job_id, headers) => {
 
         case 'user': {
           if (doc.type === 'file') {
-            await delete_file_from_bucket(doc.bucket);
+            try {
+              await delete_file_from_bucket(doc.bucket);
+            } catch (error) {}
           }
           doc.ts = Date.now();
           doc.stat = 4;

package/package.json

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