@xuda.io/notification_module 1.1.102 → 1.1.103

package/index_ms.mjs

@@ -3,121 +3,51 @@
 //   Queue target : notification_module
 // =====================================================
 
-import amqplib from 'amqplib';
-import { randomUUID } from 'crypto';
+import path from 'node:path';
 
-let queue = {};
-
-// --- AMQP Connection & Channel ---
-const conn = await amqplib.connect('amqp://localhost');
-const channel = await conn.createChannel();
-await channel.assertQueue(`_notification_module-${global.module_in}_ch`, { durable: false });
-
-channel.consume(`_notification_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(
-        'notification_module',
-        Buffer.from(
-          JSON.stringify({
-            ms_method,
-            data: args,
-            cb: `_notification_module-${global.module_in}_ch`,
-            queue_id,
-          }),
-        ),
-      );
-    } catch (err) {
-      debugger;
-    }
-  });
-};
-
-// You must define this somewhere before using these wrappers:
-const module_name = 'notification_module';
+global.queueName = 'notification_module';
+const _ms_broker = await import(path.join(process.env.XUDA_HOME, 'common', 'ms_broker.mjs'));
 
 export const get_new_notification_count = async function (...args) {
-  return await send_to_queue('get_new_notification_count', ...args);
+  return await _ms_broker.send_to_queue('get_new_notification_count', ...args);
 };
 
 export const set_notification_read = async function (...args) {
-  return await send_to_queue('set_notification_read', ...args);
+  return await _ms_broker.send_to_queue('set_notification_read', ...args);
 };
 
 export const update_notification_status = async function (...args) {
-  return await send_to_queue('update_notification_status', ...args);
+  return await _ms_broker.send_to_queue('update_notification_status', ...args);
 };
 
 export const submit_notification = async function (...args) {
-  return await send_to_queue('submit_notification', ...args);
+  return await _ms_broker.send_to_queue('submit_notification', ...args);
 };
 
 export const get_notifications = async function (...args) {
-  return await send_to_queue('get_notifications', ...args);
+  return await _ms_broker.send_to_queue('get_notifications', ...args);
 };
 
 export const submit_superuser_notification = async function (...args) {
-  return await send_to_queue('submit_superuser_notification', ...args);
+  return await _ms_broker.send_to_queue('submit_superuser_notification', ...args);
 };
 
 export const submit_app_notification = async function (...args) {
-  return await send_to_queue('submit_app_notification', ...args);
+  return await _ms_broker.send_to_queue('submit_app_notification', ...args);
 };
 
 export const update_system_notification = async function (...args) {
-  return await send_to_queue('update_system_notification', ...args);
+  return await _ms_broker.send_to_queue('update_system_notification', ...args);
 };
 
 export const submit_topic_app_notification = async function (...args) {
-  return await send_to_queue('submit_topic_app_notification', ...args);
+  return await _ms_broker.send_to_queue('submit_topic_app_notification', ...args);
 };
 
 export const get_system_notifications = async function (...args) {
-  return await send_to_queue('get_system_notifications', ...args);
+  return await _ms_broker.send_to_queue('get_system_notifications', ...args);
 };
 
 export const notifications_validation_fx = async function (...args) {
-  return await send_to_queue('notifications_validation_fx', ...args);
+  return await _ms_broker.send_to_queue('notifications_validation_fx', ...args);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/notification_module",
-  "version": "1.1.102",
+  "version": "1.1.103",
   "description": "Xuda Notification Server Module",
   "main": "index.mjs",
   "dependencies": {