@xuda.io/drive_module 1.1.1406 → 1.1.1408

package/index.mjs

@@ -31,7 +31,7 @@ const { get_account_default_project_id } = await import(path.join(process.env.XU
 
 const module_path = path.join(process.env.XUDA_HOME, 'cpi') + (!_conf.is_debug ? '/node_modules/@xuda.io' : '');
 const fs_module = await import(`${module_path}/fs_module/index.mjs`);
-const db_module = await import(`${module_path}/db_module/index.mjs`);
+const db_ms = await import(`${module_path}/db_module/index_ms.mjs`);
 
 const account_ms = await import(`${module_path}/account_module/index_ms.mjs`);
 
@@ -266,11 +266,11 @@ export const get_drive_files = async (req) => {
       const app_id_reference = await _common.get_project_app_id(app_id);
       opt.selector.docType = 'workspace_drive';
 
-      const ret = await db_module.find_app_couch_query(app_id, opt);
+      const ret = await db_ms.find_app_couch_query(app_id, opt);
 
-      const file_doc = await db_module.get_app_couch_doc(app_id, path.basename(file_path) || '/');
+      const file_doc = await db_ms.get_app_couch_doc(app_id, path.basename(file_path) || '/');
 
-      const { data: app_obj } = await db_module.get_app_obj(app_id);
+      const { data: app_obj } = await db_ms.get_app_obj(app_id);
 
       const ret_fetch_drive_files = await fetch_drive_files(ret, file_doc, app_id_reference, null, app_obj.app_datacenter_id, app_obj.is_deployment ? app_obj.app_access_url : undefined, app_obj);
       return {
@@ -292,9 +292,9 @@ export const get_drive_files = async (req) => {
       if (search_string) {
         const app_id_reference = await _common.get_project_app_id(app_id);
         opt.selector.docType = 'studio_drive';
-        const ret = await db_module.find_app_couch_query(app_id, opt);
+        const ret = await db_ms.find_app_couch_query(app_id, opt);
 
-        const file_doc = await db_module.get_app_couch_doc(app_id, path.basename(file_path) || '/');
+        const file_doc = await db_ms.get_app_couch_doc(app_id, path.basename(file_path) || '/');
 
         return {
           code: 1,
@@ -344,7 +344,7 @@ export const get_drive_files = async (req) => {
           const directory_path = get_studio_path(val.path, app_id_master, val.relativePath);
           const file_path = path.join(directory_path, val.name);
 
-          let ret = await db_module.get_app_couch_doc(app_id_master, file_path);
+          let ret = await db_ms.get_app_couch_doc(app_id_master, file_path);
 
           if (ret.code > -1) {
             if (val.type === 'file') {
@@ -439,12 +439,12 @@ export const get_drive_file_info = async (req, job_id, headers) => {
     delete doc.bucket;
 
     if (doc.uid) {
-      let ret = await db_module.get_couch_doc('xuda_accounts', doc.uid);
+      let ret = await db_ms.get_couch_doc('xuda_accounts', doc.uid);
       doc.account_info = ret.data.account_info;
     }
     if (req.drive_type === 'workspace') {
       const app_id_master = await _common.get_project_app_id(app_id, true);
-      const ret = await db_module.get_app_obj(app_id_master);
+      const ret = await db_ms.get_app_obj(app_id_master);
 
       if (ret.code < 0) {
         return ret;
@@ -513,7 +513,7 @@ export const delete_drive_files = async (req, job_id, headers) => {
           if (doc.type === 'file') {
             doc.ts = Date.now();
             doc.stat = 4;
-            save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+            save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
           }
 
           misc_ms.rsync_drive_resources_to_remote_servers('studio', app_id_reference);
@@ -527,12 +527,12 @@ export const delete_drive_files = async (req, job_id, headers) => {
             if (doc.bucket) {
               await delete_file_from_bucket(doc.bucket);
             } else {
-              const { data: app_obj } = await db_module.get_app_obj(app_id);
+              const { data: app_obj } = await db_ms.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} "rm /var/xuda/workspace_drive/${doc.server_file_name};" `);
               } else if (app_obj?.is_deployment) {
-                const { data: datacenter_obj } = await db_module.get_app_obj(app_obj.app_datacenter_id);
+                const { data: datacenter_obj } = await db_ms.get_app_obj(app_obj.app_datacenter_id);
                 const host = `root@${datacenter_obj.app_hosting_server.ip}`;
                 await _utils.run_ssh_script(`ssh ${host} "rm /var/xuda/workspace_drive/${doc.server_file_name};" `);
               }
@@ -613,7 +613,7 @@ export const update_drive_file = async (req, job_id, headers, file_obj) => {
       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);
+        save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
 
         misc_ms.rsync_drive_resources_to_remote_servers('studio', app_id_reference);
         break;
@@ -623,19 +623,19 @@ export const update_drive_file = async (req, job_id, headers, file_obj) => {
         const app_id_master = await _common.get_project_app_id(app_id, true);
         ref = app_id_master;
 
-        const { data: app_obj } = await db_module.get_app_obj(app_id);
+        const { data: app_obj } = await db_ms.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(`scp ${tempPath} ${host}:/var/xuda/workspace_drive/${doc.server_file_name}; `);
         } else if (app_obj?.is_deployment) {
-          const { data: datacenter_obj } = await db_module.get_app_obj(app_obj.app_datacenter_id);
+          const { data: datacenter_obj } = await db_ms.get_app_obj(app_obj.app_datacenter_id);
           const host = `root@${datacenter_obj.app_hosting_server.ip}`;
           await _utils.run_ssh_script(`scp ${tempPath} ${host}:/var/xuda/workspace_drive/${doc.server_file_name}; `);
         } else {
           doc.bucket[`${process.env.XUDA_HOSTNAME}`] = await upload_file_to_spaces(tempPath, app_id_master, drive_type, doc.server_file_name);
         }
 
-        save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+        save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
         break;
       }
       case 'user': {
@@ -741,7 +741,7 @@ export const create_drive_folder = async (req, job_id, headers) => {
         }
         await create_directory(fs_target_dir, 0o775, true);
         doc._id = target_dir;
-        save_ret = await db_module.save_app_couch_doc(app_id_master, doc);
+        save_ret = await db_ms.save_app_couch_doc(app_id_master, doc);
         misc_ms.rsync_drive_resources_to_remote_servers('studio', app_id_master);
         break;
       }
@@ -750,7 +750,7 @@ export const create_drive_folder = async (req, job_id, headers) => {
         folder_id = 'drive_folder_' + _utils.UUID();
         let app_id_reference = await _common.get_project_app_id(app_id);
         doc._id = folder_id;
-        save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+        save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
         break;
       }
 
@@ -792,7 +792,7 @@ export const rename_drive_file = async (req, job_id, headers) => {
       let app_id_master = await _common.get_project_app_id(app_id, true);
 
       doc._delete = true;
-      await db_module.save_app_couch_doc(app_id_master, doc);
+      await db_ms.save_app_couch_doc(app_id_master, doc);
 
       doc._id = file_name_to;
       delete doc._rev;
@@ -806,7 +806,7 @@ export const rename_drive_file = async (req, job_id, headers) => {
       case 'workspace':
       case 'studio':
         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);
+        save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
         break;
 
       case 'user':
@@ -853,10 +853,10 @@ export const rename_drive_folder = async (req) => {
           throw new Error('error - new_path unauthorized');
         }
 
-        doc_ret = await db_module.get_app_couch_doc(app_id_reference, curr_path);
+        doc_ret = await db_ms.get_app_couch_doc(app_id_reference, curr_path);
         await fs_module.rename(curr_path, new_path);
         doc_ret.data._delete = true;
-        await db_module.save_app_couch_doc(app_id_reference, doc_ret.data);
+        await db_ms.save_app_couch_doc(app_id_reference, doc_ret.data);
 
         doc_ret.data._id = new_path;
         delete doc_ret.data._rev;
@@ -866,7 +866,7 @@ export const rename_drive_folder = async (req) => {
       }
       case 'workspace': {
         const app_id_reference = await _common.get_project_app_id(app_id);
-        doc_ret = await db_module.get_app_couch_doc(app_id_reference, curr_path);
+        doc_ret = await db_ms.get_app_couch_doc(app_id_reference, curr_path);
         if (doc_ret.code < 0) {
           throw new Error(doc_ret.data);
         }
@@ -896,7 +896,7 @@ export const rename_drive_folder = async (req) => {
         case 'workspace':
         case 'studio':
           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);
+          save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
           break;
 
         case 'user':
@@ -1026,7 +1026,7 @@ export const extract_drive_file = async (req, job_id, headers) => {
         }
 
         try {
-          await db_module.save_app_couch_doc(app_id_reference, file_doc);
+          await db_ms.save_app_couch_doc(app_id_reference, file_doc);
         } catch (error) {}
       })
       .on('close', () => {
@@ -1196,7 +1196,7 @@ export const upload_drive_file = async (req, job_id, headers = {}, file_obj) =>
 
         doc._id = file_name;
 
-        save_ret = await db_module.save_app_couch_doc(ref, doc);
+        save_ret = await db_ms.save_app_couch_doc(ref, doc);
         misc_ms.rsync_drive_resources_to_remote_servers('studio', app_id);
         break;
       }
@@ -1213,12 +1213,12 @@ export const upload_drive_file = async (req, job_id, headers = {}, file_obj) =>
         doc.app_id = app_id;
         doc.app_id_reference = ref;
 
-        const { data: app_obj } = await db_module.get_app_obj(app_id);
+        const { data: app_obj } = await db_ms.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(`scp ${tempPath} ${host}:/var/xuda/workspace_drive/${file_name}; `);
         } else if (app_obj?.is_deployment) {
-          const { data: datacenter_obj } = await db_module.get_app_obj(app_obj.app_datacenter_id);
+          const { data: datacenter_obj } = await db_ms.get_app_obj(app_obj.app_datacenter_id);
           const host = `root@${datacenter_obj.app_hosting_server.ip}`;
           await _utils.run_ssh_script(`scp ${tempPath} ${host}:/var/xuda/workspace_drive/${file_name}; `);
         } else {
@@ -1227,7 +1227,7 @@ export const upload_drive_file = async (req, job_id, headers = {}, file_obj) =>
           };
         }
         doc._id = file_name;
-        save_ret = await db_module.save_app_couch_doc(await _common.get_project_app_id(req.app_id), doc);
+        save_ret = await db_ms.save_app_couch_doc(await _common.get_project_app_id(req.app_id), doc);
         break;
       }
       case 'user': {
@@ -1310,7 +1310,7 @@ export const check_drive_file = async (req, job_id, headers, file_obj) => {
     }
     case 'workspace': {
       selector.docType = 'workspace_drive';
-      const workspace_drive_res = await db_module.find_app_couch_query(app_id, {
+      const workspace_drive_res = await db_ms.find_app_couch_query(app_id, {
         selector,
         limit: 99,
       });
@@ -1470,6 +1470,7 @@ const validate_drive_type = (drive_type) => {
 };
 
 export const run_drive_pending_ocr = async () => {
+  debugger;
   // const { uid } = req;
   try {
     // let opt = {
@@ -1505,7 +1506,7 @@ export const run_drive_pending_ocr = async () => {
       limit: 99999,
     };
 
-    let app_res = await db_module.find_couch_query('xuda_master', app_opt);
+    let app_res = await db_ms.find_couch_query('xuda_master', app_opt);
 
     for (let app of app_res.docs) {
       let opt = {
@@ -1513,13 +1514,13 @@ export const run_drive_pending_ocr = async () => {
         limit: 1,
       };
 
-      const user_drive_res = await db_module.find_app_couch_query(app._id, opt);
+      const user_drive_res = await db_ms.find_app_couch_query(app._id, opt);
       for await (let doc of user_drive_res.docs) {
         await ocr_drive_file(null, doc);
       }
 
       opt.selector.docType = 'workspace_drive';
-      const app_drive_res = await db_module.find_app_couch_query(app._id, opt);
+      const app_drive_res = await db_ms.find_app_couch_query(app._id, opt);
       for await (let doc of app_drive_res.docs) {
         await ocr_drive_file(app._id, doc);
       }
@@ -1688,9 +1689,9 @@ const get_folder_size = async (dir, drive_type, app_id, uid) => {
       // opt.selector.uid = uid;
 
       const app_id = await get_account_default_project_id(uid);
-      ret = await db_module.find_app_couch_query(app_id, opt);
+      ret = await db_ms.find_app_couch_query(app_id, opt);
     } else {
-      ret = await db_module.find_app_couch_query(app_id, opt);
+      ret = await db_ms.find_app_couch_query(app_id, opt);
     }
 
     for await (let doc of ret.docs) {
@@ -1785,7 +1786,7 @@ const get_drive_doc = async (type, drive_type, app_id, uid, file_path, headers)
   switch (drive_type) {
     case 'studio': {
       const app_id_reference = await _common.get_project_app_id(app_id);
-      doc_ret = await db_module.get_app_couch_doc(app_id_reference, file_path);
+      doc_ret = await db_ms.get_app_couch_doc(app_id_reference, file_path);
       break;
     }
     case 'user':
@@ -1796,7 +1797,7 @@ const get_drive_doc = async (type, drive_type, app_id, uid, file_path, headers)
       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);
 
-      doc_ret = await db_module.get_app_couch_doc(app_id_reference, check_existing_file_ret.duplicates[0]._id);
+      doc_ret = await db_ms.get_app_couch_doc(app_id_reference, check_existing_file_ret.duplicates[0]._id);
 
       if (doc_ret?.data?.type === 'file' && !doc_ret?.data?._id.includes(app_id) && !doc_ret?.data?._id.includes(app_id_master)) {
         throw new Error('file_path unauthorized');
@@ -1834,7 +1835,7 @@ const get_drive_doc = async (type, drive_type, app_id, uid, file_path, headers)
         app_id_reference: await _common.get_project_app_id(app_id, true),
         uid,
       };
-      const save_ret = await db_module.save_app_couch_doc(app_id_reference, doc);
+      const save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
       if (save_ret.code < 0) {
         throw new Error('studio file doc save error');
       }
@@ -1856,7 +1857,7 @@ const save_drive_doc = async (drive_type, uid, app_id, doc) => {
     case 'workspace':
     case 'studio':
       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);
+      save_ret = await db_ms.save_app_couch_doc(app_id_reference, doc);
       break;
 
     case 'user':
@@ -2044,7 +2045,7 @@ export default {
     doc.vite_build_res = vite_build_res;
     doc.scriptData.dependencies = devDependencies;
 
-    db_module.save_app_couch_doc(app_id, doc);
+    db_ms.save_app_couch_doc(app_id, doc);
   } catch (err) {
     doc.vite_build_res = {
       code: -1,
@@ -2054,7 +2055,7 @@ export default {
     if (job_id) {
       return doc.vite_build_res;
     }
-    db_module.save_app_couch_doc(app_id, doc);
+    db_ms.save_app_couch_doc(app_id, doc);
   }
 };
 
@@ -2087,21 +2088,21 @@ export const update_drive_addons = async (req, job_id) => {
   let save_ret;
   if (drive_type === 'workspace' || drive_type === 'studio') {
     const master_id = await _common.get_project_app_id(app_id, true);
-    let app_obj_ret = await db_module.get_app_obj(master_id);
+    let app_obj_ret = await db_ms.get_app_obj(master_id);
     if (app_obj_ret.data.drive_addons) {
       drive_addons = app_obj_ret.data.drive_addons;
     }
     set_drive_addons(drive_addons);
-    save_ret = await db_module.save_app_couch_doc2(master_id, app_obj_ret.data);
+    save_ret = await db_ms.save_app_couch_doc2(master_id, app_obj_ret.data);
   }
   if (drive_type === 'user') {
-    let account_ret = await db_module.get_couch_doc('xuda_accounts', uid);
+    let account_ret = await db_ms.get_couch_doc('xuda_accounts', uid);
 
     if (account_ret.data.drive_addons) {
       drive_addons = account_ret.data.drive_addons;
     }
     set_drive_addons(drive_addons);
-    save_ret = await db_module.save_couch_doc('xuda_accounts', account_ret.data);
+    save_ret = await db_ms.save_couch_doc('xuda_accounts', account_ret.data);
   }
   return save_ret;
 };
@@ -2125,19 +2126,19 @@ export const getExtensionFromUrl = function (imageUrl) {
 
 export const get_user_drive_file = async function (uid, filename) {
   const app_id = await get_account_default_project_id(uid);
-  const drive_ret = await db_module.get_app_couch_doc(app_id, filename);
+  const drive_ret = await db_ms.get_app_couch_doc(app_id, filename);
   return drive_ret;
 };
 
 export const save_user_drive_file = async function (uid, drive_doc) {
   const app_id = await get_account_default_project_id(uid);
-  const save_ret = await db_module.save_app_couch_doc(app_id, drive_doc);
+  const save_ret = await db_ms.save_app_couch_doc(app_id, drive_doc);
   return save_ret;
 };
 
 export const find_contact_query = async function (uid, opt) {
   const app_id = await get_account_default_project_id(uid);
-  const ret = await db_module.find_app_couch_query(app_id, opt);
+  const ret = await db_ms.find_app_couch_query(app_id, opt);
   return ret;
 };
 

package/package.json

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