@mhubcloud/tms_core 3.4.0-beta.4 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mhubcloud/tms_core",
-  "version": "3.4.0-beta.4",
+  "version": "3.4.0",
   "description": "Core function for mHub Cloud TMS publishers",
   "homepage": "https://mhubcloud.com/",
   "license": "Apache 2.0",

package/src/broker.ts

@@ -10,7 +10,16 @@ let serviceBusClient: ServiceBusClient | undefined;
 let cosmosClient: CosmosClient | undefined;
 const senders: Record<string, ServiceBusSender> = {};
 
-export type PublisherConfig = Record<string, string[] | string[][]>;
+type PublisherConfig = Record<
+  string,
+  string | [string, PublisherEvent[]] | PublisherEvent[]
+>;
+
+type PublisherEvent = Record<string, string>;
+interface EventInfo {
+  code: string;
+  [key: string]: string;
+}
 
 /**
  * Evaluates an event against publisher configurations
@@ -19,18 +28,21 @@ export type PublisherConfig = Record<string, string[] | string[][]>;
  * @returns list of publishers for which an event is relevant.
  */
 export function resolveEvent(
-  eventCode: string,
+  event: EventInfo,
   publisherConfig?: PublisherConfig,
 ) {
   if (!publisherConfig) {
     const envConfig = process.env.Broker_PublisherConfig;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     publisherConfig = envConfig ? JSON.parse(envConfig) : {};
   }
 
   const publishers = [];
 
-  for (const publisher of Object.keys(publisherConfig)) {
-    const publisherEvents = publisherConfig[publisher];
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  for (const publisher of Object.keys(publisherConfig!)) {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const publisherEvents = publisherConfig![publisher];
     if (publisherEvents) {
       if (publisherEvents[0] === '*') {
         let matchesExcluded = false;
@@ -39,15 +51,12 @@ export function resolveEvent(
           Array.isArray(publisherEvents[1]) &&
           publisherEvents[1].length > 0
         ) {
-          for (const event of publisherEvents[1]) {
+          for (const publisherEvent of publisherEvents[1]) {
             if (matchesExcluded) {
               break;
             }
 
-            if (typeof event === 'string') {
-              const regex = new RegExp(event);
-              matchesExcluded = regex.test(eventCode);
-            }
+            matchesExcluded = matchEvent(event, publisherEvent);
           }
         }
         if (!matchesExcluded) {
@@ -56,12 +65,11 @@ export function resolveEvent(
       } else {
         let match = false;
 
-        for (const event of publisherEvents) {
-          if (typeof event === 'string') {
-            const regex = new RegExp(event);
-            match = regex.test(eventCode);
+        for (const publisherEvent of publisherEvents) {
+          if (Array.isArray(publisherEvent)) {
+            continue;
           }
-
+          match = matchEvent(event, publisherEvent);
           if (match) {
             publishers.push(publisher);
           }
@@ -77,6 +85,35 @@ export function resolveEvent(
   return publishers;
 }
 
+function matchEvent(event: EventInfo, publisherEvent: string | PublisherEvent) {
+  if (typeof publisherEvent === 'string') {
+    const regex = new RegExp(publisherEvent);
+    const match = regex.test(event.code);
+    return match;
+  } else if (typeof publisherEvent === 'object') {
+    let paramMatch = true;
+    for (const key of Object.keys(publisherEvent)) {
+      const publisherEventParam = publisherEvent[key];
+      const eventParam = event[key];
+      if (
+        typeof publisherEventParam === 'string' &&
+        typeof eventParam === 'string'
+      ) {
+        const regex = new RegExp(publisherEventParam);
+        paramMatch = regex.test(eventParam);
+        if (!paramMatch) {
+          return false;
+        }
+      } else {
+        throw new Error('Unexpected formatting in publisher configuration');
+      }
+    }
+    return true;
+  } else {
+    throw new Error('Unexpected formatting in publisher configuration');
+  }
+}
+
 /**
  * Sends an event to Service Bus
  * @param message event to be sent
@@ -100,6 +137,7 @@ export async function dispatchEvent(
         if (senders[queue]) {
           sender = senders[queue];
         } else {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           senders[queue] = serviceBusClient!.createSender(queue);
           sender = senders[queue];
         }