@xuda.io/notification_module 1.1.102 → 1.1.104

package/index.mjs

@@ -12,7 +12,7 @@ global._conf = (
 
 const _common = await import(path.join(process.env.XUDA_HOME, 'common', 'xuda_node_common.mjs'));
 const module_path = path.join(process.env.XUDA_HOME, 'cpi') + (!_conf.is_debug ? '/node_modules/@xuda.io' : '');
-const db_module = await import(`${module_path}/db_module/index.mjs`);
+const db_ms = await import(`${module_path}/db_module/index_ms.mjs`);
 const email_ms = await import(`${module_path}/email_module/index_ms.mjs`);
 const ws_dashboard_ms = await import(`${module_path}/ws_dashboard_module/index_ms.mjs`);
 
@@ -26,7 +26,7 @@ const messaging = admin.messaging();
 //////////////////////////////////////////////
 
 export const get_new_notification_count = async (req) => {
-  return await db_module.get_couch_view('xuda_notification', 'new_notifications_count', {
+  return await db_ms.get_couch_view('xuda_notification', 'new_notifications_count', {
     key: [req.uid],
     reduce: true,
     group_level: 1,
@@ -34,7 +34,7 @@ export const get_new_notification_count = async (req) => {
 };
 
 export const set_notification_read = async (req, job_id, header) => {
-  const ret = await db_module.get_couch_doc('xuda_notification', req.notification_id);
+  const ret = await db_ms.get_couch_doc('xuda_notification', req.notification_id);
   let notification_doc = ret.data;
 
   if (notification_doc.system) {
@@ -44,12 +44,12 @@ export const set_notification_read = async (req, job_id, header) => {
   notification_doc.read_date = Date.now();
   notification_doc.read = true;
   notification_doc.read_header = header;
-  return await db_module.save_couch_doc('xuda_notification', notification_doc);
+  return await db_ms.save_couch_doc('xuda_notification', notification_doc);
 };
 
 export const update_notification_status = async (req) => {
   const { notification_id, stat, uid } = req;
-  const ret = await db_module.get_couch_doc('xuda_notification', notification_id);
+  const ret = await db_ms.get_couch_doc('xuda_notification', notification_id);
   let notification_doc = ret.data;
   notification_doc.stat_ts = Date.now();
   notification_doc.stat = stat;
@@ -58,7 +58,7 @@ export const update_notification_status = async (req) => {
     to: notification_doc.system ? uid : notification_doc.uid,
     data: notification_doc,
   });
-  return await db_module.save_couch_doc('xuda_notification', notification_doc);
+  return await db_ms.save_couch_doc('xuda_notification', notification_doc);
 };
 
 export const submit_notification = async (req, _ch = global[`_notification_module_ch`]) => {
@@ -69,7 +69,7 @@ export const submit_notification = async (req, _ch = global[`_notification_modul
   let icon = 'https://dev.xuda.io/dist/images/xuda_ico.png';
   if (app_id) {
     const app_id_reference = await _common.get_project_app_id(app_id, true);
-    const app_ret = await db_module.get_couch_doc('xuda_master', app_id_reference);
+    const app_ret = await db_ms.get_couch_doc('xuda_master', app_id_reference);
     if (app_ret.code > -1) {
       icon = app_ret.data.app_pic;
     }
@@ -105,7 +105,7 @@ export const submit_notification = async (req, _ch = global[`_notification_modul
     for await (let delivery_method_item of delivery_method) {
       let account_ret;
       if (!system) {
-        account_ret = await db_module.get_couch_doc('xuda_accounts', uid);
+        account_ret = await db_ms.get_couch_doc('xuda_accounts', uid);
         if (account_ret.code < 0) {
           throw new Error(`user ${uid} not found`);
         }
@@ -162,7 +162,7 @@ export const submit_notification = async (req, _ch = global[`_notification_modul
           break;
         case 'push':
           try {
-            const ret = await db_module.find_couch_query('xuda_sessions', {
+            const ret = await db_ms.find_couch_query('xuda_sessions', {
               selector: {
                 docType: 'gtp_session',
                 stat: { $lt: 3 },
@@ -232,7 +232,7 @@ export const submit_notification = async (req, _ch = global[`_notification_modul
           break;
       }
       obj.sent = send_result[uid];
-      const ret = await db_module.save_couch_doc('xuda_notification', obj);
+      const ret = await db_ms.save_couch_doc('xuda_notification', obj);
     }
   }
   return { code: 1, data: obj };
@@ -355,7 +355,7 @@ export const get_notifications = async (req) => {
   }
 
   try {
-    let ret = await db_module.find_couch_query('xuda_notification', opt);
+    let ret = await db_ms.find_couch_query('xuda_notification', opt);
     let data = { docs: [] };
     if (ret.docs) {
       for await (let doc of ret.docs) {
@@ -390,7 +390,7 @@ export const submit_superuser_notification = async (req) => {
 
     if (_.isEmpty(to_uid)) {
       if (!system) {
-        const all_users = await db_module.find_couch_query('xuda_accounts', {
+        const all_users = await db_ms.find_couch_query('xuda_accounts', {
           selector: {
             docType: 'account',
             stat: { $lt: 4 },
@@ -472,7 +472,7 @@ export const submit_app_notification = async (req) => {
 
 export const update_system_notification = async (req) => {
   const { display_type, subject, body, delivery_method, uid, type } = req;
-  const ret = await db_module.get_couch_doc('xuda_notification', req._id);
+  const ret = await db_ms.get_couch_doc('xuda_notification', req._id);
   let notification_doc = ret.data;
 
   if (!notification_doc.system) {
@@ -500,7 +500,7 @@ export const update_system_notification = async (req) => {
     data: notification_doc,
   });
 
-  return await db_module.save_couch_doc('xuda_notification', notification_doc);
+  return await db_ms.save_couch_doc('xuda_notification', notification_doc);
 };
 
 export const submit_topic_app_notification = async (req, _ch) => {
@@ -554,16 +554,16 @@ export const get_system_notifications = async (req) => {
 };
 
 export const notifications_validation_fx = async (notification_id) => {
-  let { code, data: doc } = await db_module.get_couch_doc('xuda_notification', notification_id);
+  let { code, data: doc } = await db_ms.get_couch_doc('xuda_notification', notification_id);
   const delete_notification = async () => {
     doc.stat = 4;
-    await db_module.save_couch_doc('xuda_notification', doc);
+    await db_ms.save_couch_doc('xuda_notification', doc);
   };
   const read_notification = async () => {
     doc.read = true;
     doc.read_ts = Date.now();
     doc.read_note = 'read by notifications_validation_fx';
-    await db_module.save_couch_doc('xuda_notification', doc);
+    await db_ms.save_couch_doc('xuda_notification', doc);
   };
 
   if (code < 0) return false;
@@ -574,7 +574,7 @@ export const notifications_validation_fx = async (notification_id) => {
   }
   const fx = {
     new_version_available: async () => {
-      const { code, data: app_doc } = await db_module.get_app_obj(doc.app_id);
+      const { code, data: app_doc } = await db_ms.get_app_obj(doc.app_id);
       if (app_doc.app_build_id >= doc.params.build) {
         await read_notification();
         return false;

package/index_ms.mjs

@@ -3,121 +3,60 @@
 //   Queue target : notification_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(`_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;
-    }
+
+  import path from 'node:path'; 
+
+  const { MessageBroker } = await import(path.join(process.env.XUDA_HOME, 'common', 'ms_broker.mjs'));
+
+  const broker = new MessageBroker();
+ 
+  await broker.init({
+    queueName: 'notification_module', 
+    module_in: global.module_in 
   });
-};
 
-// You must define this somewhere before using these wrappers:
-const module_name = 'notification_module';
+ 
 
 export const get_new_notification_count = async function (...args) {
-  return await send_to_queue('get_new_notification_count', ...args);
+  return await 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 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 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 broker.send_to_queue("submit_notification", ...args);
 };
 
 export const get_notifications = async function (...args) {
-  return await send_to_queue('get_notifications', ...args);
+  return await 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 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 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 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 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 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 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.104",
   "description": "Xuda Notification Server Module",
   "main": "index.mjs",
   "dependencies": {