@xuda.io/drive_module 1.1.1230 → 1.1.1232

package/index.mjs

@@ -8,13 +8,16 @@ import fs from 'fs';
 import tesseract from 'node-tesseract-ocr';
 import countryLanguage from 'country-language';
 import url from 'url';
-import AWS from 'aws-sdk';
 import { convertPDF } from 'pdf2image';
 import mammoth from 'mammoth';
 import xlsx from 'node-xlsx';
 import sizeOf from 'image-size';
 import { getPackageManifest } from 'query-registry';
 
+// AWS SDK v3 Imports
+import { S3Client, GetObjectCommand, DeleteObjectCommand } from '@aws-sdk/client-s3';
+import { Upload } from '@aws-sdk/lib-storage';
+
 console.log('Drive Module loaded...');
 
 // Initialize require for dynamic paths
@@ -37,6 +40,23 @@ const get_studio_path = (raw_path, ref, file_name) => {
   return raw_path.replaceAll(path.join(_conf.studio_drive_path, ref), '').replaceAll('/' + file_name, '') || '/';
 };
 
+// Helper to get S3 Client
+const getS3Client = (region) => {
+  const endpoint = _conf.storage_bucket[region || process.env.XUDA_HOSTNAME].endpoint;
+  // AWS SDK v3 requires protocol in endpoint, v2 didn't always strict check
+  const formattedEndpoint = endpoint.startsWith('http') ? endpoint : `https://${endpoint}`;
+
+  return new S3Client({
+    endpoint: formattedEndpoint,
+    region: _conf.storage_bucket[region || process.env.XUDA_HOSTNAME].region,
+    credentials: {
+      accessKeyId: _conf.digitalocean.spaces_access_key,
+      secretAccessKey: _conf.digitalocean.spaces_secret_key,
+    },
+    forcePathStyle: false, // DigitalOcean Spaces supports virtual-hosted style
+  });
+};
+
 export const get_drive_files = async (req) => {
   try {
     const { from = 0, to = 99999, drive_type, app_id, uid, type, date, search_string, sort_by = 'name', sort_dir = 'desc' } = req;
@@ -280,7 +300,6 @@ export const get_drive_files = async (req) => {
 
       const options = {
         stat: true,
-
         symbolicLinks: false,
         size: true,
         hash: false,
@@ -322,7 +341,6 @@ export const get_drive_files = async (req) => {
           if (ret.code > -1) {
             if (val.type === 'file') {
               val.cy_data = ret.data;
-
               val.access_link = await rep(internal_path, drive_type);
             }
             if (val.type === 'directory') {
@@ -332,14 +350,12 @@ export const get_drive_files = async (req) => {
 
             delete ret.data._id;
             delete ret.data._rev;
-
             delete ret.data.docType;
             delete ret.data.stat;
           } else {
             if (val.type === 'directory') {
               val.sizeInBytes = await get_folder_size(internal_path, drive_type, app_id_master);
             }
-            //  supports file uploaded directly to the server
             val.access_link = await rep(val.path, 'studio');
           }
           val.date_created = new Date(val.stat.birthtime).valueOf();
@@ -1448,17 +1464,19 @@ export const get_drive_size = async (req) => {
 };
 
 const upload_file_to_spaces = async (tempPath, ref, drive_type, file_name) => {
-  const spacesEndpoint = new AWS.Endpoint(_conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint);
-  const s3 = new AWS.S3({
-    endpoint: spacesEndpoint,
-    accessKeyId: _conf.digitalocean.spaces_access_key,
-    secretAccessKey: _conf.digitalocean.spaces_secret_key,
+  const spacesEndpoint = new S3Client({
+    endpoint: _conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint,
     region: _conf.storage_bucket[process.env.XUDA_HOSTNAME].region,
+    credentials: {
+      accessKeyId: _conf.digitalocean.spaces_access_key,
+      secretAccessKey: _conf.digitalocean.spaces_secret_key,
+    },
+    forcePathStyle: false,
   });
 
-  const fileContent = fs.readFileSync(tempPath);
+  const fileContent = fs.createReadStream(tempPath);
 
-  const params = {
+  const uploadParams = {
     Bucket: `${process.env.XUDA_HOSTNAME}/${drive_type}`,
     Key: path.join(ref, _utils.UUID() + '_' + file_name),
     Body: fileContent,
@@ -1466,8 +1484,12 @@ const upload_file_to_spaces = async (tempPath, ref, drive_type, file_name) => {
   };
 
   try {
-    const data = await s3.upload(params).promise();
+    const upload = new Upload({
+      client: spacesEndpoint,
+      params: uploadParams,
+    });
 
+    const data = await upload.done();
     return data;
   } catch (err) {
     console.error('Error', err);
@@ -1475,38 +1497,45 @@ const upload_file_to_spaces = async (tempPath, ref, drive_type, file_name) => {
 };
 
 export const copy_file_to_another_bucket = async (source_region, target_region, file_name) => {
-  const sourceEndpoint = new AWS.Endpoint(_conf.storage_bucket[source_region].endpoint);
-  const sourceS3 = new AWS.S3({
-    endpoint: sourceEndpoint,
-    accessKeyId: _conf.digitalocean.spaces_access_key,
-    secretAccessKey: _conf.digitalocean.spaces_secret_key,
+  const sourceS3 = new S3Client({
+    endpoint: _conf.storage_bucket[source_region].endpoint,
     region: _conf.storage_bucket[source_region].region,
+    credentials: {
+      accessKeyId: _conf.digitalocean.spaces_access_key,
+      secretAccessKey: _conf.digitalocean.spaces_secret_key,
+    },
+    forcePathStyle: false,
   });
 
-  const targetEndpoint = new AWS.Endpoint(_conf.storage_bucket[target_region].endpoint);
-  const targetS3 = new AWS.S3({
-    endpoint: targetEndpoint,
-    accessKeyId: _conf.digitalocean.spaces_access_key,
-    secretAccessKey: _conf.digitalocean.spaces_secret_key,
+  const targetS3 = new S3Client({
+    endpoint: _conf.storage_bucket[target_region].endpoint,
     region: _conf.storage_bucket[target_region].region,
+    credentials: {
+      accessKeyId: _conf.digitalocean.spaces_access_key,
+      secretAccessKey: _conf.digitalocean.spaces_secret_key,
+    },
+    forcePathStyle: false,
   });
 
   try {
-    const { Body } = await sourceS3
-      .getObject({
+    const { Body } = await sourceS3.send(
+      new GetObjectCommand({
         Bucket: source_region,
         Key: file_name,
-      })
-      .promise();
+      }),
+    );
 
-    let ret = await targetS3
-      .putObject({
+    const upload = new Upload({
+      client: targetS3,
+      params: {
         Bucket: target_region,
         Key: file_name,
         Body,
         ACL: 'public-read',
-      })
-      .promise();
+      },
+    });
+
+    const ret = await upload.done();
 
     ret.Location = `${_conf.storage_bucket[target_region].endpoint}/${target_region}/${file_name}`;
     ret.key = file_name;
@@ -1582,17 +1611,19 @@ const get_file_info = async (file_path) => {
 };
 
 export const delete_file_from_bucket = async (bucket) => {
-  const spacesEndpoint = new AWS.Endpoint(_conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint);
-  const s3 = new AWS.S3({
-    endpoint: spacesEndpoint,
-    accessKeyId: _conf.digitalocean.spaces_access_key,
-    secretAccessKey: _conf.digitalocean.spaces_secret_key,
+  const s3 = new S3Client({
+    endpoint: _conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint,
     region: _conf.storage_bucket[process.env.XUDA_HOSTNAME].region,
+    credentials: {
+      accessKeyId: _conf.digitalocean.spaces_access_key,
+      secretAccessKey: _conf.digitalocean.spaces_secret_key,
+    },
+    forcePathStyle: false,
   });
 
   try {
     for await (let [key, val] of Object.entries(bucket)) {
-      const data = await s3.deleteObject({ Bucket: key, Key: val.key }).promise();
+      await s3.send(new DeleteObjectCommand({ Bucket: key, Key: val.key }));
     }
   } catch (err) {
     console.error('Error', err);
@@ -1959,39 +1990,6 @@ export const update_drive_addons = async (req, job_id) => {
   return save_ret;
 };
 
-// Meta-programming to export functions dynamically
-const methods = [
-  'get_drive_files',
-  'get_drive_file_info',
-  'delete_drive_files',
-  'extract_drive_file',
-  'upload_drive_file',
-  'update_drive_file',
-  'create_drive_folder',
-  'rename_drive_file',
-  'rename_drive_folder',
-  'update_drive_file_sharing_mode',
-  'delete_file_bulk',
-  'check_drive_file',
-  'update_drive_file_tags',
-  'update_drive_addons',
-];
-
-const exportedFunctions = {};
-
-methods.forEach((method) => {
-  ['workspace', 'studio', 'user'].forEach((type) => {
-    const funcName = method + '_' + type;
-    // Dynamically creating named exports isn't straightforward in ESM like CJS.
-    // We attach them to an object and export them individually if needed or export the object.
-    // For true ESM named exports, we must declare them statically.
-    // Since the dynamic generation is a pattern here, we'll export them explicitly if known,
-    // or export an object containing them.
-    // However, the request implies converting the file content.
-    // I will map the dynamic exports to explicit named exports below for clarity and ESM compliance.
-  });
-});
-
 // Explicitly exporting dynamic functions for ESM compatibility
 export const get_drive_files_workspace = async (req, job_id, headers, file_obj) => {
   req.drive_type = 'workspace';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/drive_module",
-  "version": "1.1.1230",
+  "version": "1.1.1232",
   "description": "Xuda Drive Server Module",
   "main": "index.mjs",
   "dependencies": {
@@ -15,7 +15,7 @@
     "mammoth": "^1.6.0",
     "node-xlsx": "^0.23.0",
     "aws-sdk": "^2.1563.0",
-    "query-registry": "^2.6.0"
+    "query-registry": "^4.2.0"
   },
   "devDependencies": {},
   "scripts": {