@xuda.io/account_module 1.2.2052 → 1.2.2054

package/index_ms.mjs

@@ -3,373 +3,305 @@
 //   Queue target : account_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(`_account_module-${global.module_in}_ch`, { durable: false });
-
-channel.consume(`_account_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(
-        'account_module',
-        Buffer.from(
-          JSON.stringify({
-            ms_method,
-            data: args,
-            cb: `_account_module-${global.module_in}_ch`,
-            queue_id,
-          }),
-        ),
-      );
-    } catch (err) {
-      debugger;
-    }
-  });
-};
-
-// You must define this somewhere before using these wrappers:
-const module_name = 'account_module';
+import path from 'node:path';
+
+// global.queueName="account_module";
+const _ms_broker = await import(path.join(process.env.XUDA_HOME, 'common', 'ms_broker.mjs'));
+
+_ms_broker.init({ queueName });
 
 export const update_account_info = async function (...args) {
-  return await send_to_queue('update_account_info', ...args);
+  return await _ms_broker.send_to_queue('update_account_info', ...args);
 };
 
 export const update_account_preferences = async function (...args) {
-  return await send_to_queue('update_account_preferences', ...args);
+  return await _ms_broker.send_to_queue('update_account_preferences', ...args);
 };
 
 export const save_admin_presets = async function (...args) {
-  return await send_to_queue('save_admin_presets', ...args);
+  return await _ms_broker.send_to_queue('save_admin_presets', ...args);
 };
 
 export const increment_account_usage = async function (...args) {
-  return await send_to_queue('increment_account_usage', ...args);
+  return await _ms_broker.send_to_queue('increment_account_usage', ...args);
 };
 
 export const get_account_data = async function (...args) {
-  return await send_to_queue('get_account_data', ...args);
+  return await _ms_broker.send_to_queue('get_account_data', ...args);
 };
 
 export const get_account_projects = async function (...args) {
-  return await send_to_queue('get_account_projects', ...args);
+  return await _ms_broker.send_to_queue('get_account_projects', ...args);
 };
 
 export const get_account_datacenters = async function (...args) {
-  return await send_to_queue('get_account_datacenters', ...args);
+  return await _ms_broker.send_to_queue('get_account_datacenters', ...args);
 };
 
 export const get_account_deployments = async function (...args) {
-  return await send_to_queue('get_account_deployments', ...args);
+  return await _ms_broker.send_to_queue('get_account_deployments', ...args);
 };
 
 export const get_account_instances = async function (...args) {
-  return await send_to_queue('get_account_instances', ...args);
+  return await _ms_broker.send_to_queue('get_account_instances', ...args);
 };
 
 export const get_account_info = async function (...args) {
-  return await send_to_queue('get_account_info', ...args);
+  return await _ms_broker.send_to_queue('get_account_info', ...args);
 };
 
 export const get_active_account_profile_info = async function (...args) {
-  return await send_to_queue('get_active_account_profile_info', ...args);
+  return await _ms_broker.send_to_queue('get_active_account_profile_info', ...args);
 };
 
 export const get_account_name = async function (...args) {
-  return await send_to_queue('get_account_name', ...args);
+  return await _ms_broker.send_to_queue('get_account_name', ...args);
 };
 
 export const account_validate_username = async function (...args) {
-  return await send_to_queue('account_validate_username', ...args);
+  return await _ms_broker.send_to_queue('account_validate_username', ...args);
 };
 
 export const verify_account = async function (...args) {
-  return await send_to_queue('verify_account', ...args);
+  return await _ms_broker.send_to_queue('verify_account', ...args);
 };
 
 export const validate_user_plan = async function (...args) {
-  return await send_to_queue('validate_user_plan', ...args);
+  return await _ms_broker.send_to_queue('validate_user_plan', ...args);
 };
 
 export const get_hosting_plan = async function (...args) {
-  return await send_to_queue('get_hosting_plan', ...args);
+  return await _ms_broker.send_to_queue('get_hosting_plan', ...args);
 };
 
 export const get_cpu = async function (...args) {
-  return await send_to_queue('get_cpu', ...args);
+  return await _ms_broker.send_to_queue('get_cpu', ...args);
 };
 
 export const add_account_log_util = async function (...args) {
-  return await send_to_queue('add_account_log_util', ...args);
+  return await _ms_broker.send_to_queue('add_account_log_util', ...args);
 };
 
 export const save_ssh_key = async function (...args) {
-  return await send_to_queue('save_ssh_key', ...args);
+  return await _ms_broker.send_to_queue('save_ssh_key', ...args);
 };
 
 export const delete_ssh_key = async function (...args) {
-  return await send_to_queue('delete_ssh_key', ...args);
+  return await _ms_broker.send_to_queue('delete_ssh_key', ...args);
 };
 
 export const get_ssh_keys = async function (...args) {
-  return await send_to_queue('get_ssh_keys', ...args);
+  return await _ms_broker.send_to_queue('get_ssh_keys', ...args);
 };
 
 export const search_users = async function (...args) {
-  return await send_to_queue('search_users', ...args);
+  return await _ms_broker.send_to_queue('search_users', ...args);
 };
 
 export const find_contact_duplicates = async function (...args) {
-  return await send_to_queue('find_contact_duplicates', ...args);
+  return await _ms_broker.send_to_queue('find_contact_duplicates', ...args);
 };
 
 export const merge_contact = async function (...args) {
-  return await send_to_queue('merge_contact', ...args);
+  return await _ms_broker.send_to_queue('merge_contact', ...args);
 };
 
 export const get_contact_info = async function (...args) {
-  return await send_to_queue('get_contact_info', ...args);
+  return await _ms_broker.send_to_queue('get_contact_info', ...args);
 };
 
 export const get_pending_contact_out = async function (...args) {
-  return await send_to_queue('get_pending_contact_out', ...args);
+  return await _ms_broker.send_to_queue('get_pending_contact_out', ...args);
 };
 
 export const get_pending_contact_in = async function (...args) {
-  return await send_to_queue('get_pending_contact_in', ...args);
+  return await _ms_broker.send_to_queue('get_pending_contact_in', ...args);
 };
 
 export const get_pending_share_contact_in = async function (...args) {
-  return await send_to_queue('get_pending_share_contact_in', ...args);
+  return await _ms_broker.send_to_queue('get_pending_share_contact_in', ...args);
 };
 
 export const update_contact = async function (...args) {
-  return await send_to_queue('update_contact', ...args);
+  return await _ms_broker.send_to_queue('update_contact', ...args);
 };
 
 export const get_account_rt_info = async function (...args) {
-  return await send_to_queue('get_account_rt_info', ...args);
+  return await _ms_broker.send_to_queue('get_account_rt_info', ...args);
 };
 
 export const validate_account_topup = async function (...args) {
-  return await send_to_queue('validate_account_topup', ...args);
+  return await _ms_broker.send_to_queue('validate_account_topup', ...args);
 };
 
 export const create_account_oauth_link = async function (...args) {
-  return await send_to_queue('create_account_oauth_link', ...args);
+  return await _ms_broker.send_to_queue('create_account_oauth_link', ...args);
 };
 
 export const get_default_project_account_doc = async function (...args) {
-  return await send_to_queue('get_default_project_account_doc', ...args);
+  return await _ms_broker.send_to_queue('get_default_project_account_doc', ...args);
 };
 
 export const get_account_default_project_id = async function (...args) {
-  return await send_to_queue('get_account_default_project_id', ...args);
+  return await _ms_broker.send_to_queue('get_account_default_project_id', ...args);
 };
 
 export const get_user_name = async function (...args) {
-  return await send_to_queue('get_user_name', ...args);
+  return await _ms_broker.send_to_queue('get_user_name', ...args);
 };
 
 export const get_user_card = async function (...args) {
-  return await send_to_queue('get_user_card', ...args);
+  return await _ms_broker.send_to_queue('get_user_card', ...args);
 };
 
 export const onboarding_completed = async function (...args) {
-  return await send_to_queue('onboarding_completed', ...args);
+  return await _ms_broker.send_to_queue('onboarding_completed', ...args);
 };
 
 export const ts_contact = async function (...args) {
-  return await send_to_queue('ts_contact', ...args);
+  return await _ms_broker.send_to_queue('ts_contact', ...args);
 };
 
 export const get_account_ai_usage = async function (...args) {
-  return await send_to_queue('get_account_ai_usage', ...args);
+  return await _ms_broker.send_to_queue('get_account_ai_usage', ...args);
 };
 
 export const add_contact = async function (...args) {
-  return await send_to_queue('add_contact', ...args);
+  return await _ms_broker.send_to_queue('add_contact', ...args);
 };
 
 export const get_contacts = async function (...args) {
-  return await send_to_queue('get_contacts', ...args);
+  return await _ms_broker.send_to_queue('get_contacts', ...args);
 };
 
 export const archive_contact = async function (...args) {
-  return await send_to_queue('archive_contact', ...args);
+  return await _ms_broker.send_to_queue('archive_contact', ...args);
 };
 
 export const delete_contact = async function (...args) {
-  return await send_to_queue('delete_contact', ...args);
+  return await _ms_broker.send_to_queue('delete_contact', ...args);
 };
 
 export const unarchive_contact = async function (...args) {
-  return await send_to_queue('unarchive_contact', ...args);
+  return await _ms_broker.send_to_queue('unarchive_contact', ...args);
 };
 
 export const unfriend_contact = async function (...args) {
-  return await send_to_queue('unfriend_contact', ...args);
+  return await _ms_broker.send_to_queue('unfriend_contact', ...args);
 };
 
 export const pin_contact = async function (...args) {
-  return await send_to_queue('pin_contact', ...args);
+  return await _ms_broker.send_to_queue('pin_contact', ...args);
 };
 
 export const set_contact_deep_research = async function (...args) {
-  return await send_to_queue('set_contact_deep_research', ...args);
+  return await _ms_broker.send_to_queue('set_contact_deep_research', ...args);
 };
 
 export const unpin_contact = async function (...args) {
-  return await send_to_queue('unpin_contact', ...args);
+  return await _ms_broker.send_to_queue('unpin_contact', ...args);
 };
 
 export const not_spam_contact = async function (...args) {
-  return await send_to_queue('not_spam_contact', ...args);
+  return await _ms_broker.send_to_queue('not_spam_contact', ...args);
 };
 
 export const generate_contact_avatar = async function (...args) {
-  return await send_to_queue('generate_contact_avatar', ...args);
+  return await _ms_broker.send_to_queue('generate_contact_avatar', ...args);
 };
 
 export const set_deep_research_contact = async function (...args) {
-  return await send_to_queue('set_deep_research_contact', ...args);
+  return await _ms_broker.send_to_queue('set_deep_research_contact', ...args);
 };
 
 export const unset_deep_research_contact = async function (...args) {
-  return await send_to_queue('unset_deep_research_contact', ...args);
+  return await _ms_broker.send_to_queue('unset_deep_research_contact', ...args);
 };
 
 export const get_pending_share_profile_in = async function (...args) {
-  return await send_to_queue('get_pending_share_profile_in', ...args);
+  return await _ms_broker.send_to_queue('get_pending_share_profile_in', ...args);
 };
 
 export const get_account_profile_info = async function (...args) {
-  return await send_to_queue('get_account_profile_info', ...args);
+  return await _ms_broker.send_to_queue('get_account_profile_info', ...args);
 };
 
 export const get_account_profiles = async function (...args) {
-  return await send_to_queue('get_account_profiles', ...args);
+  return await _ms_broker.send_to_queue('get_account_profiles', ...args);
 };
 
 export const archive_account_profile = async function (...args) {
-  return await send_to_queue('archive_account_profile', ...args);
+  return await _ms_broker.send_to_queue('archive_account_profile', ...args);
 };
 
 export const delete_account_profile = async function (...args) {
-  return await send_to_queue('delete_account_profile', ...args);
+  return await _ms_broker.send_to_queue('delete_account_profile', ...args);
 };
 
 export const unarchive_account_profile = async function (...args) {
-  return await send_to_queue('unarchive_account_profile', ...args);
+  return await _ms_broker.send_to_queue('unarchive_account_profile', ...args);
 };
 
 export const create_account_profile = async function (...args) {
-  return await send_to_queue('create_account_profile', ...args);
+  return await _ms_broker.send_to_queue('create_account_profile', ...args);
 };
 
 export const update_account_profile = async function (...args) {
-  return await send_to_queue('update_account_profile', ...args);
+  return await _ms_broker.send_to_queue('update_account_profile', ...args);
 };
 
 export const update_entity_account_profiles = async function (...args) {
-  return await send_to_queue('update_entity_account_profiles', ...args);
+  return await _ms_broker.send_to_queue('update_entity_account_profiles', ...args);
 };
 
 export const get_contact = async function (...args) {
-  return await send_to_queue('get_contact', ...args);
+  return await _ms_broker.send_to_queue('get_contact', ...args);
 };
 
 export const save_contact = async function (...args) {
-  return await send_to_queue('save_contact', ...args);
+  return await _ms_broker.send_to_queue('save_contact', ...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 delete_xuda_cache = async function (...args) {
-  return await send_to_queue('delete_xuda_cache', ...args);
+  return await _ms_broker.send_to_queue('delete_xuda_cache', ...args);
 };
 
 export const save_xuda_cache = async function (...args) {
-  return await send_to_queue('save_xuda_cache', ...args);
+  return await _ms_broker.send_to_queue('save_xuda_cache', ...args);
 };
 
 export const get_xuda_cache = async function (...args) {
-  return await send_to_queue('get_xuda_cache', ...args);
+  return await _ms_broker.send_to_queue('get_xuda_cache', ...args);
 };
 
 export const save_cache_hit = async function (...args) {
-  return await send_to_queue('save_cache_hit', ...args);
+  return await _ms_broker.send_to_queue('save_cache_hit', ...args);
 };
 
 export const record_ai_usage = async function (...args) {
-  return await send_to_queue('record_ai_usage', ...args);
+  return await _ms_broker.send_to_queue('record_ai_usage', ...args);
 };
 
 export const record_ai_credit = async function (...args) {
-  return await send_to_queue('record_ai_credit', ...args);
+  return await _ms_broker.send_to_queue('record_ai_credit', ...args);
 };
 
 export const add_ai_credits_to_active_accounts = async function (...args) {
-  return await send_to_queue('add_ai_credits_to_active_accounts', ...args);
+  return await _ms_broker.send_to_queue('add_ai_credits_to_active_accounts', ...args);
 };
 
 export const archive_expire_ai_credits = async function (...args) {
-  return await send_to_queue('archive_expire_ai_credits', ...args);
+  return await _ms_broker.send_to_queue('archive_expire_ai_credits', ...args);
 };
 
 export const read_accounts_emails = async function (...args) {
-  return await send_to_queue('read_accounts_emails', ...args);
+  return await _ms_broker.send_to_queue('read_accounts_emails', ...args);
 };
 
 export const process_accounts_emails = async function (...args) {
-  return await send_to_queue('process_accounts_emails', ...args);
+  return await _ms_broker.send_to_queue('process_accounts_emails', ...args);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.2052",
+  "version": "1.2.2054",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {