@mhubcloud/tms_core 3.7.0 → 3.7.1-beta.1

package/dist/index.js

@@ -108,14 +108,24 @@ function logEvent(publisher2, event, region, status, payload, id) {
   if (status || status === 0) {
     if (status >= 200 && status < 300) {
       aiClient?.trackMetric({
-        name: `Dispatched/${publisher2}-${event}-${region}`,
-        value: 1
+        name: `DispatchSuccess`,
+        value: 1,
+        properties: {
+          publisher: publisher2,
+          event,
+          region
+        }
       });
       message = "Event dispatched to platform";
     } else {
       aiClient?.trackMetric({
-        name: `Failed/${publisher2}-${event}-${region}`,
-        value: 1
+        name: `DispatchFail`,
+        value: 1,
+        properties: {
+          publisher: publisher2,
+          event,
+          region
+        }
       });
       message = "Event dispatch failed";
     }
@@ -133,10 +143,14 @@ function logEvent(publisher2, event, region, status, payload, id) {
   properties = removeUndefined(properties);
   logMessage(1, message, properties);
 }
-function logException(exception) {
+function logException(exception, publisher2) {
   aiClient?.trackMetric({
-    name: `Error/${exception.name}`,
-    value: 1
+    name: `Error`,
+    value: 1,
+    properties: {
+      type: exception.name,
+      publisher: publisher2 ?? "Other"
+    }
   });
   aiClient?.trackException({ exception });
 }
@@ -497,7 +511,7 @@ async function logToCosmosDb(message) {
   try {
     await cosmosClient.database(cosmosDatabaseName).container(cosmosContainerName).items.create(message);
   } catch (e) {
-    logException(e);
+    logException(e, "Broker");
   }
 }
 function parseScheduleOptions(options) {
@@ -516,8 +530,9 @@ function parseScheduleOptions(options) {
       0
     );
   } else if ("scheduleInterval" in options && "startHour" in options) {
-    const hour = now.getHours();
-    const nextHour = Math.ceil(hour / options.scheduleInterval) * options.scheduleInterval;
+    const hour = now.getHours() + now.getMinutes() / 60;
+    const offset = options.startHour % options.scheduleInterval;
+    const nextHour = Math.ceil((hour - offset) / options.scheduleInterval) * options.scheduleInterval + offset;
     dispatchTime = new Date(
       now.getFullYear(),
       now.getMonth(),
@@ -529,7 +544,7 @@ function parseScheduleOptions(options) {
     );
     if (nextHour >= 24) {
       dispatchTime.setDate(dispatchTime.getDate() + 1);
-      dispatchTime.setHours(options.startHour, options.startMinute);
+      dispatchTime.setHours(options.startHour, options.startMinute ?? 0);
     }
   } else {
     throw new Error("Invalid scheduling configuration");
@@ -585,13 +600,13 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
     if (result.status === "rejected") {
       if (result.reason instanceof Error) {
         const formattedError = formatError(result.reason);
-        logException(new Error(formattedError.message));
+        logException(new Error(formattedError.message), source);
         throw formattedError;
       } else {
         const formattedError = formatError(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(new Error(formattedError.message));
+        logException(new Error(formattedError.message), source);
         throw formattedError;
       }
     }
@@ -615,13 +630,15 @@ async function processMessage(message, log2, platformPublisher, trigger) {
   const failedToPublishAll = false;
   for (const eventPublisher of publishers) {
     const mapped = await eventPublisher.map(message, log2);
+    const name = message.event.name?.toLowerCase();
+    const code = message.event.code?.toLowerCase();
     const res = await publishMessage(
       log2,
       mapped,
       eventPublisher.config,
       platformPublisher,
       {
-        event: message.event.code + (message.event.name ? "/" + message.event.name : ""),
+        event: name ? name === code ? name : `${code}-${name}` : code,
         region: message.event.region,
         id: message.messageId
       }
@@ -632,7 +649,8 @@ async function processMessage(message, log2, platformPublisher, trigger) {
       logException(
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`
-        )
+        ),
+        platformPublisher.source
       );
     }
   }
@@ -640,7 +658,8 @@ async function processMessage(message, log2, platformPublisher, trigger) {
     logException(
       new Error(
         "The message has not been published to any publisher configuration"
-      )
+      ),
+      platformPublisher.source
     );
     return false;
   }
@@ -806,8 +825,7 @@ var googleAds = {
     const body = {
       conversions: [data],
       partialFailure: true,
-      validateOnly: false,
-      debugEnabled: false
+      validateOnly: false
     };
     const requestOptions = {
       method: "POST",
@@ -819,7 +837,7 @@ var googleAds = {
       },
       body: JSON.stringify(body)
     };
-    const baseUrl = `https://googleads.googleapis.com/v20/customers/${config.customerId}:uploadClickConversions`;
+    const baseUrl = `https://googleads.googleapis.com/v24/customers/${config.customerId}:uploadClickConversions`;
     const response = await fetch(baseUrl, requestOptions);
     const responseJson = await response.json();
     const knownErrors = [
@@ -863,34 +881,37 @@ var googleAds = {
     }
     if (!tokenPromise) {
       tokenPromise = (async () => {
-        const tokenResponse = await fetch(
-          `https://oauth2.googleapis.com/token`,
-          {
-            method: "POST",
-            headers: {
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              "Content-Type": "application/x-www-form-urlencoded"
-            },
-            body: new URLSearchParams({
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              client_id: config.client.id,
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              client_secret: config.client.secret,
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              refreshToken: config.refreshToken,
-              // eslint-disable-next-line @typescript-eslint/naming-convention
-              grant_type: "refresh_token"
-            })
+        try {
+          const tokenResponse = await fetch(
+            `https://oauth2.googleapis.com/token`,
+            {
+              method: "POST",
+              headers: {
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                "Content-Type": "application/x-www-form-urlencoded"
+              },
+              body: new URLSearchParams({
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                client_id: config.client.id,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                client_secret: config.client.secret,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                refreshToken: config.refreshToken,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                grant_type: "refresh_token"
+              })
+            }
+          );
+          if (!tokenResponse.ok) {
+            throw new Error("Access token fetch failed");
           }
-        );
-        if (!tokenResponse.ok) {
-          throw new Error("Access token fetch failed");
+          const parsedTokenResponse = await tokenResponse.json();
+          const createdAt = Date.now();
+          tokenCache = { token: parsedTokenResponse.access_token, createdAt };
+          return tokenCache;
+        } finally {
+          tokenPromise = null;
         }
-        const parsedTokenResponse = await tokenResponse.json();
-        const createdAt = Date.now();
-        tokenCache = { token: parsedTokenResponse.access_token, createdAt };
-        tokenPromise = null;
-        return tokenCache;
       })();
     }
     return tokenPromise;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@mhubcloud/tms_core",
-    "version": "3.7.0",
+    "version": "3.7.1-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/broker.js --local-settings=./local.settings.json --timeout 100000",
+        "test": "mocha ./tests/*.js --local-settings=./local.settings.json --timeout 100000",
         "dev": "ts-node index.ts",
         "build": "tsup ./src/index.ts --format cjs --target node22"
     },