@xuda.io/drive_module 1.1.1468 → 1.1.1470

package/index.mjs

@@ -1288,7 +1288,7 @@ export const upload_drive_file = async (req, job_id, headers = {}, file_obj) =>
     return { code: -400, data: err.message };
   }
 };
-export const check_drive_file = async (req, job_id, headers, file_obj) => {
+const check_single_drive_file = async (req, job_id, headers, file_obj) => {
   const { type = 'file', drive_type, app_id, uid, file_path, folder_name } = req;
 
   let master_app_id;
@@ -1382,6 +1382,59 @@ export const check_drive_file = async (req, job_id, headers, file_obj) => {
   };
 };
 
+export const check_drive_files = async (req, job_id, headers, file_obj) => {
+  const files = req.files ||
+    req.file_paths?.map((curr_file_path) => ({
+      file_path: curr_file_path,
+    })) || [
+      {
+        file_path: req.file_path,
+        folder_name: req.folder_name,
+        type: req.type,
+      },
+    ];
+
+  const results = [];
+
+  for (const item of files) {
+    results.push(
+      await check_single_drive_file(
+        {
+          ...req,
+          ...item,
+        },
+        job_id,
+        headers,
+        file_obj,
+      ),
+    );
+  }
+
+  const duplicates = results.flatMap((item) => item?.duplicates || []);
+  const has_duplicates = results.some((item) => item?.code < 0);
+
+  return {
+    code: has_duplicates ? -764 : 764,
+    data: has_duplicates ? 'one or more files exist' : 'ok',
+    files: results,
+    duplicates,
+  };
+};
+
+export const check_drive_file = async (req, job_id, headers, file_obj) => {
+  const ret = await check_drive_files(req, job_id, headers, file_obj);
+
+  if (!ret.files?.length) {
+    return {
+      code: -764,
+      data: 'no files to check',
+      duplicates: [],
+    };
+  }
+
+  return ret.files[0];
+};
+
 const ocr_drive_file = async (app_id, doc) => {
   const { drive_type, uid, file_path, originalname } = doc;
 
@@ -1546,35 +1599,40 @@ export const run_drive_pending_ocr = async () => {
   }
 };
 
+const _drive_size_cache = new Map();
+const _DRIVE_SIZE_TTL_MS = 30 * 60 * 1000;
+
 export const get_drive_size = async (req) => {
   try {
     const { drive_type, app_id, uid } = req;
-    let size = 0;
+    const cache_key = `${drive_type}|${app_id || ''}|${uid || ''}`;
+    const cached = _drive_size_cache.get(cache_key);
+    if (cached && Date.now() - cached.ts < _DRIVE_SIZE_TTL_MS) {
+      return { code: 200, data: cached.size };
+    }
 
+    let size = 0;
     let app_id_master, directoryPath;
     switch (drive_type) {
       case 'user':
         directoryPath = '';
-
         break;
       case 'workspace':
         directoryPath = '';
         app_id_master = await _common.get_project_app_id(app_id, true);
         break;
-
       default:
         app_id_master = await _common.get_project_app_id(app_id, true);
         directoryPath = path.join(_conf[`${drive_type}_drive_path`], app_id_master, '/');
-
         break;
     }
 
     size = await get_folder_size(directoryPath, drive_type, app_id_master, uid);
     if (drive_type === 'workspace') {
-      // calc datacenter
       size += await get_folder_size(directoryPath, drive_type, app_id);
     }
 
+    _drive_size_cache.set(cache_key, { size, ts: Date.now() });
     return { code: 200, data: size };
   } catch (err) {
     return { code: -200, data: err.message };
@@ -1678,17 +1736,31 @@ const get_folder_size = async (dir, drive_type, app_id, uid) => {
   let totalSize = 0;
 
   const calculateSizeFs = async (dirPath) => {
-    const fsPromises = fs.promises;
-    const files = await fsPromises.readdir(dirPath);
-    for (let file of files) {
-      const filePath = path.join(dirPath, file);
-      const stat = await fsPromises.stat(filePath);
-      if (stat.isFile()) {
-        totalSize += stat.size;
-      } else if (stat.isDirectory()) {
-        await calculateSizeFs(filePath);
+    let entries;
+    try {
+      entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
+    } catch (err) {
+      return;
+    }
+    const subdirs = [];
+    const file_stats = [];
+    for (const entry of entries) {
+      const childPath = path.join(dirPath, entry.name);
+      if (entry.isDirectory()) {
+        subdirs.push(childPath);
+      } else if (entry.isFile()) {
+        file_stats.push(
+          fs.promises
+            .stat(childPath)
+            .then((s) => {
+              totalSize += s.size;
+            })
+            .catch(() => {}),
+        );
       }
     }
+    await Promise.all(file_stats);
+    await Promise.all(subdirs.map((d) => calculateSizeFs(d)));
   };
 
   const calculateSizeDocs = async (dirPath) => {
@@ -1938,11 +2010,22 @@ export const compile_javascript_program_in_studio_drive = async (req, job_id) =>
       content = ` export const css = true  \n` + content;
     }
 
+    const getLocalPackageName = (doc) => {
+      const rawName = doc?._id || doc?.properties?.menuName || 'program';
+      const safeName = String(rawName)
+        .toLowerCase()
+        .replace(/[^a-z0-9._-]+/g, '-')
+        .replace(/^[._-]+|[._-]+$/g, '');
+      const packageName = `xuda-js-program-${safeName || 'program'}`.slice(0, 214);
+
+      return packageName.replace(/[._-]+$/g, '') || 'xuda-js-program';
+    };
+
     const index_js = path.join(src, 'index.mjs');
     await fs_module.save_file(index_js, content);
 
     let packageJSON = {
-      name: doc.properties?.menuName || doc._id,
+      name: getLocalPackageName(doc),
       version: '1.0.0',
       description: '',
       main: 'index.js',
@@ -1959,15 +2042,39 @@ export const compile_javascript_program_in_studio_drive = async (req, job_id) =>
 
     let devDependencies = packageJSON.devDependencies || {};
     let allDependencies = new Set();
+    let externalImports = new Set();
+
+    const isUrlSpecifier = (specifier) => /^[a-z][a-z0-9+.-]*:/i.test(specifier) || specifier.startsWith('//');
+
+    const getPackageDependencyName = (specifier) => {
+      if (!specifier) {
+        return;
+      }
+
+      if (isUrlSpecifier(specifier)) {
+        externalImports.add(specifier);
+        return;
+      }
+
+      if (specifier.startsWith('.') || specifier.startsWith('/') || specifier.startsWith('#') || specifier.endsWith('.css')) {
+        return;
+      }
+
+      if (specifier.startsWith('@')) {
+        const [scope, packageName] = specifier.split('/');
+        return scope && packageName ? `${scope}/${packageName}` : undefined;
+      }
+
+      return specifier.split('/')[0];
+    };
 
     const extractDependencies = (fileContent, regex) => {
       const matches = [];
       let match;
+      regex.lastIndex = 0;
       while ((match = regex.exec(fileContent)) !== null) {
-        let dep = match[1];
-        if (!dep.startsWith('.') && !dep.startsWith('/') && !dep.endsWith('.css')) {
-          if (dep.includes('/')) dep = dep.split('/')[0];
-
+        const dep = getPackageDependencyName(match[1]);
+        if (dep) {
           matches.push(dep);
         }
       }
@@ -2009,6 +2116,7 @@ export default {
       name: "MyLibrary", // Global variable for UMD/IIFE formats
     },
     rollupOptions: {
+      external: ${JSON.stringify(Array.from(externalImports))},
       output: {
         manualChunks(id) {
           if (id.includes("node_modules")) {
@@ -2168,10 +2276,10 @@ export const get_drive_files_workspace = async (req, job_id, headers, file_obj)
   req.drive_type = 'workspace';
   return await get_drive_files(req, job_id, headers, file_obj);
 };
-export const get_drive_files_studio = async (req, job_id, headers, file_obj) => {
+export const get_drive_files_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await get_drive_files(req, job_id, headers, file_obj);
-};
+});
 export const get_drive_files_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await get_drive_files(req, job_id, headers, file_obj);
@@ -2181,10 +2289,10 @@ export const get_drive_file_info_workspace = async (req, job_id, headers, file_o
   req.drive_type = 'workspace';
   return await get_drive_file_info(req, job_id, headers, file_obj);
 };
-export const get_drive_file_info_studio = async (req, job_id, headers, file_obj) => {
+export const get_drive_file_info_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await get_drive_file_info(req, job_id, headers, file_obj);
-};
+});
 export const get_drive_file_info_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await get_drive_file_info(req, job_id, headers, file_obj);
@@ -2194,10 +2302,10 @@ export const delete_drive_files_workspace = async (req, job_id, headers, file_ob
   req.drive_type = 'workspace';
   return await delete_drive_files(req, job_id, headers, file_obj);
 };
-export const delete_drive_files_studio = async (req, job_id, headers, file_obj) => {
+export const delete_drive_files_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await delete_drive_files(req, job_id, headers, file_obj);
-};
+});
 export const delete_drive_files_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await delete_drive_files(req, job_id, headers, file_obj);
@@ -2207,10 +2315,10 @@ export const extract_drive_file_workspace = async (req, job_id, headers, file_ob
   req.drive_type = 'workspace';
   return await extract_drive_file(req, job_id, headers, file_obj);
 };
-export const extract_drive_file_studio = async (req, job_id, headers, file_obj) => {
+export const extract_drive_file_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await extract_drive_file(req, job_id, headers, file_obj);
-};
+});
 export const extract_drive_file_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await extract_drive_file(req, job_id, headers, file_obj);
@@ -2220,10 +2328,10 @@ export const upload_drive_file_workspace = async (req, job_id, headers, file_obj
   req.drive_type = 'workspace';
   return await upload_drive_file(req, job_id, headers, file_obj);
 };
-export const upload_drive_file_studio = async (req, job_id, headers, file_obj) => {
+export const upload_drive_file_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await upload_drive_file(req, job_id, headers, file_obj);
-};
+});
 export const upload_drive_file_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await upload_drive_file(req, job_id, headers, file_obj);
@@ -2233,10 +2341,10 @@ export const update_drive_file_workspace = async (req, job_id, headers, file_obj
   req.drive_type = 'workspace';
   return await update_drive_file(req, job_id, headers, file_obj);
 };
-export const update_drive_file_studio = async (req, job_id, headers, file_obj) => {
+export const update_drive_file_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await update_drive_file(req, job_id, headers, file_obj);
-};
+});
 export const update_drive_file_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await update_drive_file(req, job_id, headers, file_obj);
@@ -2246,10 +2354,10 @@ export const create_drive_folder_workspace = async (req, job_id, headers, file_o
   req.drive_type = 'workspace';
   return await create_drive_folder(req, job_id, headers, file_obj);
 };
-export const create_drive_folder_studio = async (req, job_id, headers, file_obj) => {
+export const create_drive_folder_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await create_drive_folder(req, job_id, headers, file_obj);
-};
+});
 export const create_drive_folder_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await create_drive_folder(req, job_id, headers, file_obj);
@@ -2259,10 +2367,10 @@ export const rename_drive_file_workspace = async (req, job_id, headers, file_obj
   req.drive_type = 'workspace';
   return await rename_drive_file(req, job_id, headers, file_obj);
 };
-export const rename_drive_file_studio = async (req, job_id, headers, file_obj) => {
+export const rename_drive_file_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await rename_drive_file(req, job_id, headers, file_obj);
-};
+});
 export const rename_drive_file_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await rename_drive_file(req, job_id, headers, file_obj);
@@ -2272,10 +2380,10 @@ export const rename_drive_folder_workspace = async (req, job_id, headers, file_o
   req.drive_type = 'workspace';
   return await rename_drive_folder(req, job_id, headers, file_obj);
 };
-export const rename_drive_folder_studio = async (req, job_id, headers, file_obj) => {
+export const rename_drive_folder_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await rename_drive_folder(req, job_id, headers, file_obj);
-};
+});
 export const rename_drive_folder_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await rename_drive_folder(req, job_id, headers, file_obj);
@@ -2285,10 +2393,10 @@ export const update_drive_file_sharing_mode_workspace = async (req, job_id, head
   req.drive_type = 'workspace';
   return await update_drive_file_sharing_mode(req, job_id, headers, file_obj);
 };
-export const update_drive_file_sharing_mode_studio = async (req, job_id, headers, file_obj) => {
+export const update_drive_file_sharing_mode_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await update_drive_file_sharing_mode(req, job_id, headers, file_obj);
-};
+});
 export const update_drive_file_sharing_mode_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await update_drive_file_sharing_mode(req, job_id, headers, file_obj);
@@ -2298,10 +2406,10 @@ export const delete_file_bulk_workspace = async (req, job_id, headers, file_obj)
   req.drive_type = 'workspace';
   return await delete_file_bulk(req, job_id, headers, file_obj);
 };
-export const delete_file_bulk_studio = async (req, job_id, headers, file_obj) => {
+export const delete_file_bulk_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await delete_file_bulk(req, job_id, headers, file_obj);
-};
+});
 export const delete_file_bulk_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await delete_file_bulk(req, job_id, headers, file_obj);
@@ -2311,23 +2419,35 @@ export const check_drive_file_workspace = async (req, job_id, headers, file_obj)
   req.drive_type = 'workspace';
   return await check_drive_file(req, job_id, headers, file_obj);
 };
-export const check_drive_file_studio = async (req, job_id, headers, file_obj) => {
+export const check_drive_files_workspace = async (req, job_id, headers, file_obj) => {
+  req.drive_type = 'workspace';
+  return await check_drive_files(req, job_id, headers, file_obj);
+};
+export const check_drive_file_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await check_drive_file(req, job_id, headers, file_obj);
-};
+});
+export const check_drive_files_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
+  req.drive_type = 'studio';
+  return await check_drive_files(req, job_id, headers, file_obj);
+});
 export const check_drive_file_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await check_drive_file(req, job_id, headers, file_obj);
 };
+export const check_drive_files_user = async (req, job_id, headers, file_obj) => {
+  req.drive_type = 'user';
+  return await check_drive_files(req, job_id, headers, file_obj);
+};
 
 export const update_drive_file_tags_workspace = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'workspace';
   return await update_drive_file_tags(req, job_id, headers, file_obj);
 };
-export const update_drive_file_tags_studio = async (req, job_id, headers, file_obj) => {
+export const update_drive_file_tags_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await update_drive_file_tags(req, job_id, headers, file_obj);
-};
+});
 export const update_drive_file_tags_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await update_drive_file_tags(req, job_id, headers, file_obj);
@@ -2337,10 +2457,10 @@ export const update_drive_addons_workspace = async (req, job_id, headers, file_o
   req.drive_type = 'workspace';
   return await update_drive_addons(req, job_id, headers, file_obj);
 };
-export const update_drive_addons_studio = async (req, job_id, headers, file_obj) => {
+export const update_drive_addons_studio = _common.location_sensitive(async (req, job_id, headers, file_obj) => {
   req.drive_type = 'studio';
   return await update_drive_addons(req, job_id, headers, file_obj);
-};
+});
 export const update_drive_addons_user = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'user';
   return await update_drive_addons(req, job_id, headers, file_obj);

package/index_ms.mjs

@@ -61,6 +61,10 @@ export const upload_drive_file = async function (...args) {
   return await broker.send_to_queue("upload_drive_file", ...args);
 };
 
+export const check_drive_files = async function (...args) {
+  return await broker.send_to_queue("check_drive_files", ...args);
+};
+
 export const check_drive_file = async function (...args) {
   return await broker.send_to_queue("check_drive_file", ...args);
 };
@@ -229,14 +233,26 @@ export const check_drive_file_workspace = async function (...args) {
   return await broker.send_to_queue("check_drive_file_workspace", ...args);
 };
 
+export const check_drive_files_workspace = async function (...args) {
+  return await broker.send_to_queue("check_drive_files_workspace", ...args);
+};
+
 export const check_drive_file_studio = async function (...args) {
   return await broker.send_to_queue("check_drive_file_studio", ...args);
 };
 
+export const check_drive_files_studio = async function (...args) {
+  return await broker.send_to_queue("check_drive_files_studio", ...args);
+};
+
 export const check_drive_file_user = async function (...args) {
   return await broker.send_to_queue("check_drive_file_user", ...args);
 };
 
+export const check_drive_files_user = async function (...args) {
+  return await broker.send_to_queue("check_drive_files_user", ...args);
+};
+
 export const update_drive_file_tags_workspace = async function (...args) {
   return await broker.send_to_queue("update_drive_file_tags_workspace", ...args);
 };

package/index_msa.mjs

@@ -61,6 +61,10 @@ export const upload_drive_file =  function (...args) {
    broker.send_to_queue_async("upload_drive_file", ...args);
 };
 
+export const check_drive_files =  function (...args) {
+   broker.send_to_queue_async("check_drive_files", ...args);
+};
+
 export const check_drive_file =  function (...args) {
    broker.send_to_queue_async("check_drive_file", ...args);
 };
@@ -229,14 +233,26 @@ export const check_drive_file_workspace =  function (...args) {
    broker.send_to_queue_async("check_drive_file_workspace", ...args);
 };
 
+export const check_drive_files_workspace =  function (...args) {
+   broker.send_to_queue_async("check_drive_files_workspace", ...args);
+};
+
 export const check_drive_file_studio =  function (...args) {
    broker.send_to_queue_async("check_drive_file_studio", ...args);
 };
 
+export const check_drive_files_studio =  function (...args) {
+   broker.send_to_queue_async("check_drive_files_studio", ...args);
+};
+
 export const check_drive_file_user =  function (...args) {
    broker.send_to_queue_async("check_drive_file_user", ...args);
 };
 
+export const check_drive_files_user =  function (...args) {
+   broker.send_to_queue_async("check_drive_files_user", ...args);
+};
+
 export const update_drive_file_tags_workspace =  function (...args) {
    broker.send_to_queue_async("update_drive_file_tags_workspace", ...args);
 };

package/package.json

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