@xuda.io/drive_module 1.1.492 → 1.1.494

package/index.js

@@ -1503,8 +1503,9 @@ exports.upload_drive_file = async function (req, job_id, headers, file_obj) {
     return {
       code: 760,
       data: {
-        server_file_name: file_url,
+        server_file_name: file_name,
         filename: file_obj.originalname,
+        file_url,
       },
     };
   } catch (err) {
@@ -1965,10 +1966,6 @@ exports.copy_file_to_another_bucket = async function (
       })
       .promise();
 
-    // console.log(
-    //   `File copied successfully from ${source_region}/${file_name} to ${target_region}/${file_name}`,
-    //   ret
-    // );
     ret.Location = `${_conf.storage_bucket[target_region].endpoint}/${target_region}/${file_name}`;
     ret.key = file_name;
     ret.Key = file_name;
@@ -2094,157 +2091,4 @@ const get_folder_docs = async function (dir, drive_type, app_id) {
   return docs;
 };
 
-// exports.delete_folder_from_bucket = async function (folder_name) {
-//   // Import required libraries
-//   const {
-//     S3Client,
-//     ListObjectsV2Command,
-//     DeleteObjectsCommand,
-//   } = require("@aws-sdk/client-s3");
-
-//   // Configure your DigitalOcean Spaces or S3 details
-
-//   const SPACE_NAME = "dev.xuda.io";
-//   const FOLDER_PATH = "/workspace/prj3937cb6f9a31c8c7dea25055bba845b1"; // The key of the file you want to delete
-
-//   const s3Client = new S3Client({
-//     region: _conf.storage_bucket[process.env.XUDA_HOSTNAME].region,
-//     endpoint: _conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint,
-//     credentials: {
-//       accessKeyId: _conf.digitalocean.spaces_access_key,
-//       secretAccessKey: _conf.digitalocean.spaces_secret_key,
-//     },
-//   });
-
-//   // Function to delete a folder
-//   async function deleteFolder() {
-//     try {
-//       // List all objects in the folder
-//       const listedObjects = await s3Client.send(
-//         new ListObjectsV2Command({
-//           Bucket: SPACE_NAME,
-//           // Prefix: FOLDER_PATH,
-//         })
-//       );
-//       debugger;
-//       if (listedObjects.Contents.length === 0) return;
-
-//       // Prepare a list of objects to delete
-//       const deleteParams = {
-//         Bucket: SPACE_NAME,
-//         Delete: { Objects: [] },
-//       };
-
-//       listedObjects.Contents.forEach(({ Key }) => {
-//         deleteParams.Delete.Objects.push({ Key });
-//       });
-
-//       // Delete the objects
-//       await s3Client.send(new DeleteObjectsCommand(deleteParams));
-
-//       // Check if there are more objects to delete (pagination)
-//       if (listedObjects.IsTruncated) await deleteFolder();
-//     } catch (err) {
-//       console.log("Error", err);
-//     }
-//   }
-
-//   // Call the function to delete the folder
-//   deleteFolder();
-
-//   // return
-//   // const { S3Client, DeleteObjectCommand } = require("@aws-sdk/client-s3");
-
-//   // // Configure your DigitalOcean Spaces details
-
-//   // const SPACE_NAME = "dev.xuda.io";
-//   // const FILE_KEY = "workspace/prj3937cb6f9a31c8c7dea25055bba845b1/"; // The key of the file you want to delete
-
-//   // // Create an S3 client
-//   // const s3Client = new S3Client({
-//   //   region: _conf.storage_bucket[process.env.XUDA_HOSTNAME].region,
-//   //   endpoint: _conf.storage_bucket[process.env.XUDA_HOSTNAME].endpoint,
-//   //   credentials: {
-//   //     accessKeyId: _conf.digitalocean.spaces_access_key,
-//   //     secretAccessKey: _conf.digitalocean.spaces_secret_key,
-//   //   },
-//   // });
-
-//   // // Function to delete an object
-//   // async function deleteObjectFromSpaces() {
-//   //   try {
-//   //     const data = await s3Client.send(
-//   //       new DeleteObjectCommand({
-//   //         Bucket: SPACE_NAME,
-//   //         Key: FILE_KEY,
-//   //       })
-//   //     );
-//   //     console.log("Success", data);
-//   //   } catch (err) {
-//   //     console.log("Error", err);
-//   //   }
-//   // }
-
-//   // // Call the function to delete the object
-//   // deleteObjectFromSpaces();
-
-//   // return;
-//   // const AWS = require("aws-sdk");
-
-//   // // Configure the AWS SDK to use DigitalOcean Spaces
-//   // 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,
-//   //   region: _conf.storage_bucket[process.env.XUDA_HOSTNAME].region,
-//   // });
-
-//   // try {
-//   //   debugger;
-
-//   //   // const params = {
-//   //   //   Bucket: "dev.xuda.io",
-//   //   // };
-
-//   //   // s3.listObjectsV2(params, function (err, data) {
-//   //   //   if (err) console.log(err, err.stack); // an error occurred
-//   //   //   else console.log(data); // successful response
-//   //   // });
-
-//   //   const ret = await s3
-//   //     .listObjectsV2({
-//   //       Bucket: "dev.xuda.io",
-//   //       // Prefix: "",
-//   //     })
-//   //     .promise();
-
-//   //   // const ret = await s3.send(
-//   //   //   new ListObjectsV2Command({
-//   //   //     Bucket: "dev.xuda.io",
-//   //   //     Prefix: "workspace/",
-//   //   //     // ContinuationToken: continuationToken,
-//   //   //   })
-//   //   // );
-
-//   //   console.log(ret);
-
-//   //   // for await (let [key, val] of Object.entries(_conf.storage_bucket)) {
-//   //   //   const ret = await s3
-//   //   //     .listObjectsV2({
-//   //   //       Bucket: key,
-//   //   //       Prefix: "/",
-//   //   //     })
-//   //   //     .promise();
-//   //   //   console.log(ret);
-//   //   // }
-//   //   // return data;
-//   // } catch (err) {
-//   //   console.error("Error", err);
-//   // }
-// };
-setTimeout(function () {
-  // exports.delete_folder_from_bucket();
-}, 2000);
+setTimeout(function () {}, 2000);

package/package.json

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