@mhubcloud/tms_core 3.7.0-beta.0 → 3.7.0-beta.1

package/dist/index.js

@@ -390,7 +390,15 @@ function resolveEvent(event, publisherConfig) {
           }
           match = matchEvent(event, publisherEvent);
           if (match) {
-            publishers.push(publisher2);
+            if (typeof publisherEvent === "object" && publisherEvent.schedule) {
+              publishers.push({
+                queueName: publisher2,
+                schedule: publisherEvent.schedule
+              });
+            } else {
+              publishers.push(publisher2);
+            }
+            break;
           }
         }
       }
@@ -403,16 +411,17 @@ function resolveEvent(event, publisherConfig) {
 }
 function matchEvent(event, publisherEvent) {
   if (typeof publisherEvent === "string") {
-    const regex = new RegExp(publisherEvent);
+    const regex = new RegExp(`^(?:${publisherEvent})$`);
     const match = regex.test(event.code);
     return match;
   } else if (typeof publisherEvent === "object") {
+    const eventParams = publisherEvent.event;
     let paramMatch = true;
-    for (const key of Object.keys(publisherEvent)) {
-      const publisherEventParam = publisherEvent[key];
+    for (const key of Object.keys(eventParams)) {
+      const publisherEventParam = eventParams[key];
       const eventParam = event[key];
       if (typeof publisherEventParam === "string" && typeof eventParam === "string") {
-        const regex = new RegExp(publisherEventParam);
+        const regex = new RegExp(`^(?:${publisherEventParam})$`);
         paramMatch = regex.test(eventParam);
         if (!paramMatch) {
           return false;
@@ -437,17 +446,37 @@ async function dispatchEvent(message, queues) {
   }
   await Promise.all(
     queues.map(async (queue) => {
+      let queueName;
       try {
         let sender;
-        if (senders[queue]) {
-          sender = senders[queue];
+        let serviceBusMessage;
+        if (typeof queue === "string") {
+          queueName = queue;
+          serviceBusMessage = { body: message };
+        } else if (typeof queue === "object") {
+          queueName = queue.queueName;
+          serviceBusMessage = {
+            body: message,
+            scheduledEnqueueTimeUtc: parseScheduleOptions(queue.schedule)
+          };
         } else {
-          senders[queue] = serviceBusClient.createSender(queue);
-          sender = senders[queue];
+          console.log(`Invalid queue name format`);
+        }
+        if (queueName && serviceBusMessage) {
+          if (senders[queueName]) {
+            sender = senders[queueName];
+          } else {
+            senders[queueName] = serviceBusClient.createSender(queueName);
+            sender = senders[queueName];
+          }
+          if (sender) {
+            await sender.sendMessages(serviceBusMessage);
+          }
         }
-        await sender.sendMessages({ body: message });
       } catch (e) {
-        console.log(`Sending to queue ${queue} failed`);
+        console.log(
+          `Sending to queue ${queueName ?? "unknown"} failed. Cause: ${e instanceof Error ? e.message : ""}`
+        );
       }
     })
   );
@@ -471,6 +500,42 @@ async function logToCosmosDb(message) {
     logException(e);
   }
 }
+function parseScheduleOptions(options) {
+  let dispatchTime;
+  const now = /* @__PURE__ */ new Date();
+  if ("timestamp" in options) {
+    dispatchTime = new Date(options.timestamp);
+  } else if ("scheduleHour" in options) {
+    dispatchTime = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate() + (options.dayOffset ?? 0),
+      options.scheduleHour,
+      options.scheduleMinute ?? 0,
+      0,
+      0
+    );
+  } else if ("scheduleInterval" in options && "startHour" in options) {
+    const hour = now.getHours();
+    const nextHour = Math.ceil(hour / options.scheduleInterval) * options.scheduleInterval;
+    dispatchTime = new Date(
+      now.getFullYear(),
+      now.getMonth(),
+      now.getDate() + (options.dayOffset ?? 0),
+      nextHour,
+      options.startMinute ?? 0,
+      0,
+      0
+    );
+    if (nextHour >= 24) {
+      dispatchTime.setDate(dispatchTime.getDate() + 1);
+      dispatchTime.setHours(options.startHour, options.startMinute);
+    }
+  } else {
+    throw new Error("Invalid scheduling configuration");
+  }
+  return dispatchTime;
+}
 async function scheduleEvent(message, queue, options) {
   if (!serviceBusClient) {
     if (!serviceBusConnectionString) {
@@ -486,39 +551,7 @@ async function scheduleEvent(message, queue, options) {
       senders[queue] = serviceBusClient.createSender(queue);
       sender = senders[queue];
     }
-    let dispatchTime;
-    const now = /* @__PURE__ */ new Date();
-    if ("timestamp" in options) {
-      dispatchTime = new Date(options.timestamp);
-    } else if ("scheduleHour" in options) {
-      dispatchTime = new Date(
-        now.getFullYear(),
-        now.getMonth(),
-        now.getDate() + (options.dayOffset ?? 0),
-        options.scheduleHour,
-        options.scheduleMinute ?? 0,
-        0,
-        0
-      );
-    } else if ("scheduleInterval" in options && "startHour" in options) {
-      const hour = now.getHours();
-      const nextHour = Math.ceil(hour / options.scheduleInterval) * options.scheduleInterval;
-      dispatchTime = new Date(
-        now.getFullYear(),
-        now.getMonth(),
-        now.getDate() + (options.dayOffset ?? 0),
-        nextHour,
-        options.startMinute ?? 0,
-        0,
-        0
-      );
-      if (nextHour >= 24) {
-        dispatchTime.setDate(dispatchTime.getDate() + 1);
-        dispatchTime.setHours(options.startHour, options.startMinute);
-      }
-    } else {
-      throw new Error("Invalid scheduling configuration");
-    }
+    const dispatchTime = parseScheduleOptions(options);
     const serviceBusMessage = {
       body: message,
       scheduledEnqueueTimeUtc: dispatchTime
@@ -529,6 +562,7 @@ async function scheduleEvent(message, queue, options) {
     console.log(
       `Scheduling message to queue ${queue} failed. Cause: ${e instanceof Error ? e.message : ""}`
     );
+    return null;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mhubcloud/tms_core",
-    "version": "3.7.0-beta.0",
+    "version": "3.7.0-beta.1",
     "description": "Core function for mHub Cloud TMS publishers",
     "homepage": "https://mhubcloud.com/",
     "license": "Apache 2.0",
@@ -16,7 +16,7 @@
         "conversion API"
     ],
     "scripts": {
-        "test": "mocha ./tests/*.js --local-settings=./local.settings.json --timeout 100000",
+        "test": "mocha ./tests/broker.js --local-settings=./local.settings.json --timeout 100000",
         "dev": "ts-node index.ts",
         "build": "tsup ./src/index.ts --format cjs --target node22"
     },