@mhubcloud/tms_core 3.4.0 → 3.4.2

package/dist/index.js

@@ -302,7 +302,7 @@ var cosmosContainerName = process.env.CosmosDbEventsContainerName;
 var serviceBusClient;
 var cosmosClient;
 var senders = {};
-function resolveEvent(eventCode, publisherConfig) {
+function resolveEvent(event, publisherConfig) {
   if (!publisherConfig) {
     const envConfig = process.env.Broker_PublisherConfig;
     publisherConfig = envConfig ? JSON.parse(envConfig) : {};
@@ -314,14 +314,11 @@ function resolveEvent(eventCode, publisherConfig) {
       if (publisherEvents[0] === "*") {
         let matchesExcluded = false;
         if (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) {
@@ -329,11 +326,11 @@ function resolveEvent(eventCode, publisherConfig) {
         }
       } 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(publisher2);
           }
@@ -346,6 +343,31 @@ function resolveEvent(eventCode, publisherConfig) {
   }
   return publishers;
 }
+function matchEvent(event, 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");
+  }
+}
 async function dispatchEvent(message, queues) {
   if (!serviceBusClient) {
     if (!serviceBusConnectionString) {
@@ -643,7 +665,7 @@ var googleAds = {
       },
       body: JSON.stringify(body)
     };
-    const baseUrl = `https://googleads.googleapis.com/v17/customers/${config.customerId}:uploadClickConversions`;
+    const baseUrl = `https://googleads.googleapis.com/v20/customers/${config.customerId}:uploadClickConversions`;
     const response = await fetch(baseUrl, requestOptions);
     const responseJson = await response.json();
     const knownErrors = [

package/package.json

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

package/src/publishers/googleAds.ts

@@ -101,7 +101,7 @@ export const googleAds: GoogleAdsPlatformPublisher = {
       body: JSON.stringify(body),
     };
 
-    const baseUrl = `https://googleads.googleapis.com/v17/customers/${config.customerId}:uploadClickConversions`;
+    const baseUrl = `https://googleads.googleapis.com/v20/customers/${config.customerId}:uploadClickConversions`;
 
     const response = await fetch(baseUrl, requestOptions);
     const responseJson: GoogleAdsResponse = await response.json();