@mhubcloud/tms_core 3.4.0 → 3.4.1

package/dist/index.js

@@ -31,23 +31,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   DefaultPublisher: () => defaultPublisher,
-  broker: () => broker_exports,
   publisher: () => publisher,
   testUtils: () => testUtils_exports,
   utils: () => utils_exports
 });
 module.exports = __toCommonJS(index_exports);
 
-// src/broker.ts
-var broker_exports = {};
-__export(broker_exports, {
-  dispatchEvent: () => dispatchEvent,
-  logToCosmosDb: () => logToCosmosDb,
-  resolveEvent: () => resolveEvent
-});
-var import_cosmos = require("@azure/cosmos");
-var import_service_bus = require("@azure/service-bus");
-
 // src/utils/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
@@ -55,19 +44,19 @@ __export(utils_exports, {
   encodeEmail: () => encodeEmail,
   extractAdCode: () => extractAdCode,
   flatten: () => flatten,
-  formatError: () => formatError,
   handlePlatformRequest: () => handlePlatformRequest,
   handleResponse: () => handleResponse,
   logEvent: () => logEvent,
   logException: () => logException,
   logMessage: () => logMessage,
+  parseErrorMessage: () => parseErrorMessage,
   prepareTestRequestHeaders: () => prepareTestRequestHeaders,
   removeUndefined: () => removeUndefined
 });
 var crypto = __toESM(require("crypto"));
 var appInsights = __toESM(require("applicationinsights"));
 var aiClient = null;
-if (process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
+if (process.env.APPLICATIONINSIGHTS_CONNECTION_STRING || process.env.APPINSIGHTS_INSTRUMENTATIONKEY) {
   appInsights.setup().setAutoCollectDependencies(false).setAutoCollectConsole(true, false).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false).setUseDiskRetryCaching(false).start();
   aiClient = appInsights.defaultClient;
 }
@@ -100,17 +89,15 @@ function logMessage(level, message, properties) {
     properties
   });
 }
-function logEvent(publisher2, event, region, status, payload) {
+function logEvent(publisher2, event, region) {
   const properties = {
     publisher: publisher2,
     event,
-    region,
-    status,
-    payload
+    region
   };
   logMessage(1, "Event dispatched to platform", properties);
 }
-function logException(exception) {
+function logException(log2, exception) {
   aiClient?.trackException({ exception });
 }
 function removeUndefined(originalValue) {
@@ -224,10 +211,7 @@ async function handlePlatformRequest({
     // eslint-disable-next-line @typescript-eslint/naming-convention
     headers: { ...requestOptions.headers }
   };
-  const rawPlatformResponse = await fetch(
-    fullUrl,
-    fetchRequestOptions
-  );
+  const rawPlatformResponse = await fetch(fullUrl, fetchRequestOptions);
   if (process.env.PUBLISHER_TESTURL) {
     await handleTestRequest({
       fetchRequestOptions,
@@ -241,22 +225,10 @@ async function handlePlatformRequest({
       rawPlatformResponse,
       event.event
     );
-    logEvent(
-      source,
-      event.event,
-      event.region,
-      rawPlatformResponse.status,
-      requestOptions.body ? JSON.stringify(requestOptions.body) : void 0
-    );
+    logEvent(source, event.event, event.region);
     return processedPlatformResponse;
   } else {
-    logEvent(
-      source,
-      event.event,
-      event.region,
-      rawPlatformResponse.status,
-      requestOptions.body ? JSON.stringify(requestOptions.body) : void 0
-    );
+    logEvent(source, event.event, event.region);
   }
 }
 async function handleTestRequest(params) {
@@ -279,115 +251,18 @@ async function handleTestRequest(params) {
   } catch {
   }
 }
-function formatError(error) {
-  let formattedError;
+function parseErrorMessage(error) {
+  let errorMessage;
   if (error instanceof Error) {
-    formattedError = error;
     if (error.cause) {
-      formattedError.message = `${error.message} Cause: ${error.cause.toString()}`;
+      errorMessage = `${error.message} Cause: ${error.cause.toString()}`;
     } else {
-      formattedError.message = error.message;
+      errorMessage = error.message;
     }
   } else {
-    formattedError = new Error(error);
-  }
-  return formattedError;
-}
-
-// src/broker.ts
-var serviceBusConnectionString = process.env.ServiceBusConnectionString;
-var cosmosConnectionString = process.env.CosmosDbConnectionString;
-var cosmosDatabaseName = process.env.CosmosDbDatabaseName;
-var cosmosContainerName = process.env.CosmosDbEventsContainerName;
-var serviceBusClient;
-var cosmosClient;
-var senders = {};
-function resolveEvent(eventCode, publisherConfig) {
-  if (!publisherConfig) {
-    const envConfig = process.env.Broker_PublisherConfig;
-    publisherConfig = envConfig ? JSON.parse(envConfig) : {};
-  }
-  const publishers = [];
-  for (const publisher2 of Object.keys(publisherConfig)) {
-    const publisherEvents = publisherConfig[publisher2];
-    if (publisherEvents) {
-      if (publisherEvents[0] === "*") {
-        let matchesExcluded = false;
-        if (Array.isArray(publisherEvents[1]) && publisherEvents[1].length > 0) {
-          for (const event of publisherEvents[1]) {
-            if (matchesExcluded) {
-              break;
-            }
-            if (typeof event === "string") {
-              const regex = new RegExp(event);
-              matchesExcluded = regex.test(eventCode);
-            }
-          }
-        }
-        if (!matchesExcluded) {
-          publishers.push(publisher2);
-        }
-      } else {
-        let match = false;
-        for (const event of publisherEvents) {
-          if (typeof event === "string") {
-            const regex = new RegExp(event);
-            match = regex.test(eventCode);
-          }
-          if (match) {
-            publishers.push(publisher2);
-          }
-        }
-      }
-    }
-  }
-  if (publishers.length === 0) {
-    return null;
-  }
-  return publishers;
-}
-async function dispatchEvent(message, queues) {
-  if (!serviceBusClient) {
-    if (!serviceBusConnectionString) {
-      throw new Error("Service Bus connection string is missing.");
-    }
-    serviceBusClient = new import_service_bus.ServiceBusClient(serviceBusConnectionString);
-  }
-  await Promise.all(
-    queues.map(async (queue) => {
-      try {
-        let sender;
-        if (senders[queue]) {
-          sender = senders[queue];
-        } else {
-          senders[queue] = serviceBusClient.createSender(queue);
-          sender = senders[queue];
-        }
-        await sender.sendMessages({ body: message });
-      } catch (e) {
-        console.log(`Sending to queue ${queue} failed`);
-      }
-    })
-  );
-}
-async function logToCosmosDb(message) {
-  if (!cosmosClient) {
-    if (!cosmosConnectionString) {
-      throw new Error("Cosmos DB connection string is missing.");
-    }
-    cosmosClient = new import_cosmos.CosmosClient(cosmosConnectionString);
-  }
-  if (!cosmosDatabaseName) {
-    throw new Error("Cosmos DB database name is missing.");
-  }
-  if (!cosmosContainerName) {
-    throw new Error("Cosmos DB events container name is missing.");
-  }
-  try {
-    await cosmosClient.database(cosmosDatabaseName).container(cosmosContainerName).items.create(message);
-  } catch (e) {
-    logException(e);
+    errorMessage = error;
   }
+  return errorMessage;
 }
 
 // src/defaultPublisher.ts
@@ -408,21 +283,15 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
   for (const result of results) {
     if (result.status === "rejected") {
       if (result.reason instanceof Error) {
-        const formattedError = formatError(result.reason);
-        logException(
-          azureFunctionContext.log,
-          new Error(formattedError.message)
-        );
-        throw formattedError;
+        const errorMessage = parseErrorMessage(result.reason);
+        logException(azureFunctionContext.log, new Error(errorMessage));
+        throw new Error(errorMessage);
       } else {
-        const formattedError = formatError(
+        const errorMessage = parseErrorMessage(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(
-          azureFunctionContext.log,
-          new Error(formattedError.message)
-        );
-        throw formattedError;
+        logException(azureFunctionContext.log, new Error(errorMessage));
+        throw new Error(errorMessage);
       }
     }
   }
@@ -643,7 +512,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 = [
@@ -663,13 +532,7 @@ var googleAds = {
     } else if (responseJson.error) {
       throw new Error(responseJson.error.message);
     } else {
-      logEvent(
-        this.source,
-        event.event,
-        event.region,
-        response.status,
-        requestOptions.body
-      );
+      logEvent(this.source, event.event, event.region);
     }
   },
   async getToken(config) {
@@ -891,7 +754,6 @@ var publisher = {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DefaultPublisher,
-  broker,
   publisher,
   testUtils,
   utils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mhubcloud/tms_core",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "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();