@xuda.io/drive_module 1.1.1403 → 1.1.1405

package/index_ms.mjs

@@ -3,341 +3,271 @@
 //   Queue target : drive_module
 // =====================================================
 
-import amqplib from 'amqplib';
-import { randomUUID } from 'crypto';
-
-let queue = {};
-
-// --- AMQP Connection & Channel ---
-const conn = await amqplib.connect('amqp://localhost');
-const channel = await conn.createChannel();
-await channel.assertQueue(`_drive_module-${global.module_in}_ch`, { durable: false });
-
-channel.consume(`_drive_module-${global.module_in}_ch`, async (msg) => {
-  try {
-    if (msg === null) {
-      console.log('Consumer cancelled by server');
-      return;
-    }
-
-    const content = JSON.parse(msg.content.toString());
-
-    queue[content.queue_id].resolve(content.ret);
-
-    channel.ack(msg);
-  } catch (err) {
-    channel.ack(msg); // Acknowledge to prevent requeue loops on error
-    console.error(module_in, content.method, err.message, err);
-    // debugger;
-  }
-});
-
-const send_to_queue = async function (ms_method, ...args) {
-  const queue_id = randomUUID();
-  return new Promise((resolve, reject) => {
-    queue[queue_id] = { resolve, reject };
-
-    // Set timeout to prevent hanging
-    const timeout = setTimeout(() => {
-      delete queue[queue_id];
-      reject(new Error(`Queue timeout for ${ms_method}`));
-    }, 300000); // 300 second timeout
-
-    // Wrap resolve to clean up
-    queue[queue_id].resolve = (value) => {
-      clearTimeout(timeout);
-      delete queue[queue_id];
-      resolve(value);
-    };
-
-    // Wrap reject to clean up
-    queue[queue_id].reject = (error) => {
-      clearTimeout(timeout);
-      delete queue[queue_id];
-      reject(error);
-    };
-
-    try {
-      global[`_${global.module_in}_ch`].sendToQueue(
-        'drive_module',
-        Buffer.from(
-          JSON.stringify({
-            ms_method,
-            data: args,
-            cb: `_drive_module-${global.module_in}_ch`,
-            queue_id,
-          }),
-        ),
-      );
-    } catch (err) {
-      debugger;
-    }
-  });
-};
-
-// You must define this somewhere before using these wrappers:
-const module_name = 'drive_module';
+import path from 'node:path';
+
+global.queueName = 'drive_module';
+const _ms_broker = await import(path.join(process.env.XUDA_HOME, 'common', 'ms_broker.mjs'));
 
 export const get_drive_files = async function (...args) {
-  return await send_to_queue('get_drive_files', ...args);
+  return await _ms_broker.send_to_queue('get_drive_files', ...args);
 };
 
 export const get_drive_file_info = async function (...args) {
-  return await send_to_queue('get_drive_file_info', ...args);
+  return await _ms_broker.send_to_queue('get_drive_file_info', ...args);
 };
 
 export const delete_drive_files = async function (...args) {
-  return await send_to_queue('delete_drive_files', ...args);
+  return await _ms_broker.send_to_queue('delete_drive_files', ...args);
 };
 
 export const update_drive_file = async function (...args) {
-  return await send_to_queue('update_drive_file', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file', ...args);
 };
 
 export const create_drive_folder = async function (...args) {
-  return await send_to_queue('create_drive_folder', ...args);
+  return await _ms_broker.send_to_queue('create_drive_folder', ...args);
 };
 
 export const rename_drive_file = async function (...args) {
-  return await send_to_queue('rename_drive_file', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_file', ...args);
 };
 
 export const rename_drive_folder = async function (...args) {
-  return await send_to_queue('rename_drive_folder', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_folder', ...args);
 };
 
 export const update_drive_file_sharing_mode = async function (...args) {
-  return await send_to_queue('update_drive_file_sharing_mode', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_sharing_mode', ...args);
 };
 
 export const extract_drive_file = async function (...args) {
-  return await send_to_queue('extract_drive_file', ...args);
+  return await _ms_broker.send_to_queue('extract_drive_file', ...args);
 };
 
 export const delete_file_bulk = async function (...args) {
-  return await send_to_queue('delete_file_bulk', ...args);
+  return await _ms_broker.send_to_queue('delete_file_bulk', ...args);
 };
 
 export const upload_drive_file = async function (...args) {
-  return await send_to_queue('upload_drive_file', ...args);
+  return await _ms_broker.send_to_queue('upload_drive_file', ...args);
 };
 
 export const check_drive_file = async function (...args) {
-  return await send_to_queue('check_drive_file', ...args);
+  return await _ms_broker.send_to_queue('check_drive_file', ...args);
 };
 
 export const run_drive_pending_ocr = async function (...args) {
-  return await send_to_queue('run_drive_pending_ocr', ...args);
+  return await _ms_broker.send_to_queue('run_drive_pending_ocr', ...args);
 };
 
 export const get_drive_size = async function (...args) {
-  return await send_to_queue('get_drive_size', ...args);
+  return await _ms_broker.send_to_queue('get_drive_size', ...args);
 };
 
 export const copy_file_to_another_bucket = async function (...args) {
-  return await send_to_queue('copy_file_to_another_bucket', ...args);
+  return await _ms_broker.send_to_queue('copy_file_to_another_bucket', ...args);
 };
 
 export const delete_file_from_bucket = async function (...args) {
-  return await send_to_queue('delete_file_from_bucket', ...args);
+  return await _ms_broker.send_to_queue('delete_file_from_bucket', ...args);
 };
 
 export const update_drive_file_tags = async function (...args) {
-  return await send_to_queue('update_drive_file_tags', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_tags', ...args);
 };
 
 export const compile_javascript_program_in_studio_drive = async function (...args) {
-  return await send_to_queue('compile_javascript_program_in_studio_drive', ...args);
+  return await _ms_broker.send_to_queue('compile_javascript_program_in_studio_drive', ...args);
 };
 
 export const update_drive_addons = async function (...args) {
-  return await send_to_queue('update_drive_addons', ...args);
+  return await _ms_broker.send_to_queue('update_drive_addons', ...args);
 };
 
 export const get_drive_files_workspace = async function (...args) {
-  return await send_to_queue('get_drive_files_workspace', ...args);
+  return await _ms_broker.send_to_queue('get_drive_files_workspace', ...args);
 };
 
 export const get_drive_files_studio = async function (...args) {
-  return await send_to_queue('get_drive_files_studio', ...args);
+  return await _ms_broker.send_to_queue('get_drive_files_studio', ...args);
 };
 
 export const get_drive_files_user = async function (...args) {
-  return await send_to_queue('get_drive_files_user', ...args);
+  return await _ms_broker.send_to_queue('get_drive_files_user', ...args);
 };
 
 export const get_drive_file_info_workspace = async function (...args) {
-  return await send_to_queue('get_drive_file_info_workspace', ...args);
+  return await _ms_broker.send_to_queue('get_drive_file_info_workspace', ...args);
 };
 
 export const get_drive_file_info_studio = async function (...args) {
-  return await send_to_queue('get_drive_file_info_studio', ...args);
+  return await _ms_broker.send_to_queue('get_drive_file_info_studio', ...args);
 };
 
 export const get_drive_file_info_user = async function (...args) {
-  return await send_to_queue('get_drive_file_info_user', ...args);
+  return await _ms_broker.send_to_queue('get_drive_file_info_user', ...args);
 };
 
 export const delete_drive_files_workspace = async function (...args) {
-  return await send_to_queue('delete_drive_files_workspace', ...args);
+  return await _ms_broker.send_to_queue('delete_drive_files_workspace', ...args);
 };
 
 export const delete_drive_files_studio = async function (...args) {
-  return await send_to_queue('delete_drive_files_studio', ...args);
+  return await _ms_broker.send_to_queue('delete_drive_files_studio', ...args);
 };
 
 export const delete_drive_files_user = async function (...args) {
-  return await send_to_queue('delete_drive_files_user', ...args);
+  return await _ms_broker.send_to_queue('delete_drive_files_user', ...args);
 };
 
 export const extract_drive_file_workspace = async function (...args) {
-  return await send_to_queue('extract_drive_file_workspace', ...args);
+  return await _ms_broker.send_to_queue('extract_drive_file_workspace', ...args);
 };
 
 export const extract_drive_file_studio = async function (...args) {
-  return await send_to_queue('extract_drive_file_studio', ...args);
+  return await _ms_broker.send_to_queue('extract_drive_file_studio', ...args);
 };
 
 export const extract_drive_file_user = async function (...args) {
-  return await send_to_queue('extract_drive_file_user', ...args);
+  return await _ms_broker.send_to_queue('extract_drive_file_user', ...args);
 };
 
 export const upload_drive_file_workspace = async function (...args) {
-  return await send_to_queue('upload_drive_file_workspace', ...args);
+  return await _ms_broker.send_to_queue('upload_drive_file_workspace', ...args);
 };
 
 export const upload_drive_file_studio = async function (...args) {
-  return await send_to_queue('upload_drive_file_studio', ...args);
+  return await _ms_broker.send_to_queue('upload_drive_file_studio', ...args);
 };
 
 export const upload_drive_file_user = async function (...args) {
-  return await send_to_queue('upload_drive_file_user', ...args);
+  return await _ms_broker.send_to_queue('upload_drive_file_user', ...args);
 };
 
 export const update_drive_file_workspace = async function (...args) {
-  return await send_to_queue('update_drive_file_workspace', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_workspace', ...args);
 };
 
 export const update_drive_file_studio = async function (...args) {
-  return await send_to_queue('update_drive_file_studio', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_studio', ...args);
 };
 
 export const update_drive_file_user = async function (...args) {
-  return await send_to_queue('update_drive_file_user', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_user', ...args);
 };
 
 export const create_drive_folder_workspace = async function (...args) {
-  return await send_to_queue('create_drive_folder_workspace', ...args);
+  return await _ms_broker.send_to_queue('create_drive_folder_workspace', ...args);
 };
 
 export const create_drive_folder_studio = async function (...args) {
-  return await send_to_queue('create_drive_folder_studio', ...args);
+  return await _ms_broker.send_to_queue('create_drive_folder_studio', ...args);
 };
 
 export const create_drive_folder_user = async function (...args) {
-  return await send_to_queue('create_drive_folder_user', ...args);
+  return await _ms_broker.send_to_queue('create_drive_folder_user', ...args);
 };
 
 export const rename_drive_file_workspace = async function (...args) {
-  return await send_to_queue('rename_drive_file_workspace', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_file_workspace', ...args);
 };
 
 export const rename_drive_file_studio = async function (...args) {
-  return await send_to_queue('rename_drive_file_studio', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_file_studio', ...args);
 };
 
 export const rename_drive_file_user = async function (...args) {
-  return await send_to_queue('rename_drive_file_user', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_file_user', ...args);
 };
 
 export const rename_drive_folder_workspace = async function (...args) {
-  return await send_to_queue('rename_drive_folder_workspace', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_folder_workspace', ...args);
 };
 
 export const rename_drive_folder_studio = async function (...args) {
-  return await send_to_queue('rename_drive_folder_studio', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_folder_studio', ...args);
 };
 
 export const rename_drive_folder_user = async function (...args) {
-  return await send_to_queue('rename_drive_folder_user', ...args);
+  return await _ms_broker.send_to_queue('rename_drive_folder_user', ...args);
 };
 
 export const update_drive_file_sharing_mode_workspace = async function (...args) {
-  return await send_to_queue('update_drive_file_sharing_mode_workspace', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_sharing_mode_workspace', ...args);
 };
 
 export const update_drive_file_sharing_mode_studio = async function (...args) {
-  return await send_to_queue('update_drive_file_sharing_mode_studio', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_sharing_mode_studio', ...args);
 };
 
 export const update_drive_file_sharing_mode_user = async function (...args) {
-  return await send_to_queue('update_drive_file_sharing_mode_user', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_sharing_mode_user', ...args);
 };
 
 export const delete_file_bulk_workspace = async function (...args) {
-  return await send_to_queue('delete_file_bulk_workspace', ...args);
+  return await _ms_broker.send_to_queue('delete_file_bulk_workspace', ...args);
 };
 
 export const delete_file_bulk_studio = async function (...args) {
-  return await send_to_queue('delete_file_bulk_studio', ...args);
+  return await _ms_broker.send_to_queue('delete_file_bulk_studio', ...args);
 };
 
 export const delete_file_bulk_user = async function (...args) {
-  return await send_to_queue('delete_file_bulk_user', ...args);
+  return await _ms_broker.send_to_queue('delete_file_bulk_user', ...args);
 };
 
 export const check_drive_file_workspace = async function (...args) {
-  return await send_to_queue('check_drive_file_workspace', ...args);
+  return await _ms_broker.send_to_queue('check_drive_file_workspace', ...args);
 };
 
 export const check_drive_file_studio = async function (...args) {
-  return await send_to_queue('check_drive_file_studio', ...args);
+  return await _ms_broker.send_to_queue('check_drive_file_studio', ...args);
 };
 
 export const check_drive_file_user = async function (...args) {
-  return await send_to_queue('check_drive_file_user', ...args);
+  return await _ms_broker.send_to_queue('check_drive_file_user', ...args);
 };
 
 export const update_drive_file_tags_workspace = async function (...args) {
-  return await send_to_queue('update_drive_file_tags_workspace', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_tags_workspace', ...args);
 };
 
 export const update_drive_file_tags_studio = async function (...args) {
-  return await send_to_queue('update_drive_file_tags_studio', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_tags_studio', ...args);
 };
 
 export const update_drive_file_tags_user = async function (...args) {
-  return await send_to_queue('update_drive_file_tags_user', ...args);
+  return await _ms_broker.send_to_queue('update_drive_file_tags_user', ...args);
 };
 
 export const update_drive_addons_workspace = async function (...args) {
-  return await send_to_queue('update_drive_addons_workspace', ...args);
+  return await _ms_broker.send_to_queue('update_drive_addons_workspace', ...args);
 };
 
 export const update_drive_addons_studio = async function (...args) {
-  return await send_to_queue('update_drive_addons_studio', ...args);
+  return await _ms_broker.send_to_queue('update_drive_addons_studio', ...args);
 };
 
 export const update_drive_addons_user = async function (...args) {
-  return await send_to_queue('update_drive_addons_user', ...args);
+  return await _ms_broker.send_to_queue('update_drive_addons_user', ...args);
 };
 
 export const getExtensionFromUrl = async function (...args) {
-  return await send_to_queue('getExtensionFromUrl', ...args);
+  return await _ms_broker.send_to_queue('getExtensionFromUrl', ...args);
 };
 
 export const get_user_drive_file = async function (...args) {
-  return await send_to_queue('get_user_drive_file', ...args);
+  return await _ms_broker.send_to_queue('get_user_drive_file', ...args);
 };
 
 export const save_user_drive_file = async function (...args) {
-  return await send_to_queue('save_user_drive_file', ...args);
+  return await _ms_broker.send_to_queue('save_user_drive_file', ...args);
 };
 
 export const find_contact_query = async function (...args) {
-  return await send_to_queue('find_contact_query', ...args);
+  return await _ms_broker.send_to_queue('find_contact_query', ...args);
 };
 
 export const file_upload_validator = async function (...args) {
-  return await send_to_queue('file_upload_validator', ...args);
+  return await _ms_broker.send_to_queue('file_upload_validator', ...args);
 };

package/package.json

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