@mhubcloud/tms_core 3.1.6-beta.1 → 3.1.6-beta.3

package/dist/index.js

@@ -56,10 +56,10 @@ __export(utils_exports, {
 var crypto = __toESM(require("crypto"));
 var appInsights = __toESM(require("applicationinsights"));
 var aiClient = null;
-appInsights.setup(
-  "InstrumentationKey=92a12588-b5e9-4949-aa42-e1669194e06c;IngestionEndpoint=https://westeurope-5.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/;ApplicationId=36b1a240-a54c-45e2-8f9b-ba9d26e9bce8"
-).setAutoCollectDependencies(false).setAutoCollectConsole(true, true).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false).setUseDiskRetryCaching(false).start();
-aiClient = appInsights.defaultClient;
+if (process.env.APPLICATIONINSIGHTS_CONNECTION_STRING || process.env.APPINSIGHTS_INSTRUMENTATIONKEY) {
+  appInsights.setup("92a12588-b5e9-4949-aa42-e1669194e06c").setAutoCollectDependencies(false).setAutoCollectConsole(true, true).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false).setUseDiskRetryCaching(false).start();
+  aiClient = appInsights.defaultClient;
+}
 var EventPublisherBase = class {
   config;
   constructor(config) {
@@ -81,12 +81,8 @@ var EventPublisherBase = class {
     );
   }
 };
-function logMessage(level, message, properties) {
-  aiClient?.trackTrace({
-    message,
-    severity: level,
-    properties
-  });
+function logMessage(log2, level, message, properties) {
+  log2.warn(message, properties);
 }
 function logEvent(publisher2, event, region) {
   const properties = {
@@ -94,13 +90,15 @@ function logEvent(publisher2, event, region) {
     event,
     region
   };
-  logMessage(1, "Event dispatched to platform", properties);
-}
-function logException(exception) {
-  aiClient?.trackException({
-    exception
+  aiClient?.trackTrace({
+    message: "Event dispatched to platform",
+    severity: 1,
+    properties
   });
 }
+function logException(log2, exception) {
+  log2.warn(exception.message);
+}
 function removeUndefined(originalValue) {
   if (originalValue instanceof Array) {
     return removeUndefinedFromArray(originalValue);
@@ -274,7 +272,6 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
       serviceBusMessage,
       azureFunctionContext.log,
       platformPublisher,
-      source,
       trigger
     )
   );
@@ -283,26 +280,25 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
     if (result.status === "rejected") {
       if (result.reason instanceof Error) {
         const errorMessage = parseErrorMessage(result.reason);
-        logException(new Error(errorMessage));
         throw new Error(errorMessage);
       } else {
         const errorMessage = parseErrorMessage(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(new Error(errorMessage));
         throw new Error(errorMessage);
       }
     }
   }
 }
-async function processMessage(message, log3, platformPublisher, source, trigger) {
+async function processMessage(message, log2, platformPublisher, trigger) {
   const logProperties = {
     source: platformPublisher.source,
     data: JSON.stringify(message)
   };
-  const publishers = trigger(message, log3);
+  const publishers = trigger(message, log2);
   if (!publishers.length) {
     logMessage(
+      log2,
       1,
       "Message excluded by filter (no publishers determined)",
       logProperties
@@ -312,9 +308,9 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
   let publishedAny = false;
   const failedToPublishAll = false;
   for (const eventPublisher of publishers) {
-    const mapped = await eventPublisher.map(message, log3);
+    const mapped = await eventPublisher.map(message, log2);
     const res = await publishMessage(
-      log3,
+      log2,
       mapped,
       eventPublisher.config,
       platformPublisher,
@@ -327,6 +323,7 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
       publishedAny = true;
     } else {
       logException(
+        log2,
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`
         )
@@ -335,6 +332,7 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
   }
   if (!publishedAny) {
     logException(
+      log2,
       new Error(
         "The message has not been published to any publisher configuration"
       )
@@ -343,8 +341,8 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
   }
   return !failedToPublishAll;
 }
-async function publishMessage(log3, mapped, config, platformPublisher, event) {
-  await platformPublisher.publish(log3, config, mapped, event);
+async function publishMessage(log2, mapped, config, platformPublisher, event) {
+  await platformPublisher.publish(log2, config, mapped, event);
   return true;
 }
 
@@ -358,7 +356,7 @@ var affiliatePort = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (data.products instanceof Array && (typeof config.offerId === "string" || typeof config.offerId === "number")) {
       const affiliatePortData = removeUndefined(
         data
@@ -377,7 +375,7 @@ var affiliatePort = {
           query,
           requestOptions,
           event,
-          logger: log3
+          logger: log2
         });
       }
     } else {
@@ -396,9 +394,13 @@ var cj = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (!data.cjevent) {
-      (void 0)(log3, 1, `CJ - ${event} - skipped because CJEVENT is missing`);
+      logMessage(
+        log2,
+        1,
+        `CJ - ${event.event} - skipped because CJEVENT is missing`
+      );
     } else {
       if (typeof config.cid === "string" && typeof config.type === "string") {
         const cjData = removeUndefined(data);
@@ -418,13 +420,14 @@ var cj = {
         const requestOptions = {
           method: "GET"
         };
+        logException(log2, new Error("BOGER"));
         await handlePlatformRequest({
           source: this.source,
           baseUrl,
           query,
           requestOptions,
           event,
-          logger: log3
+          logger: log2
         });
       } else {
         throw new Error("Invalid config for platform " + this.source);
@@ -443,7 +446,7 @@ var facebook = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (typeof config.id === "string" && typeof config.access_token === "string") {
       const requestOptions = {
         method: "POST",
@@ -463,7 +466,7 @@ var facebook = {
         query,
         requestOptions,
         event,
-        logger: log3
+        logger: log2
       });
     } else {
       throw new Error("Invalid config for platform " + this.source);
@@ -481,7 +484,7 @@ var googleAnalytics4 = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (config.trackingId) {
       const ga4Data = removeUndefined(data);
       ga4Data.v = 2;
@@ -512,7 +515,7 @@ var googleAnalytics4 = {
         query,
         requestOptions,
         event,
-        logger: log3
+        logger: log2
       });
     } else {
       throw new Error("Invalid config for platform " + this.source);
@@ -530,7 +533,7 @@ var piano = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (typeof config.siteId === "string" && typeof config.collectionDomain === "string") {
       const pianoData = removeUndefined(data);
       let query = "";
@@ -557,7 +560,7 @@ var piano = {
         query,
         requestOptions,
         event,
-        logger: log3
+        logger: log2
       });
     } else {
       throw new Error("Invalid config for platform " + this.source);
@@ -575,7 +578,7 @@ var universalAnalytics = {
    * @param data Data in publisher-friendly format to be published
    * @param event Event for which the function is triggered
    */
-  async publish(log3, config, data, event) {
+  async publish(log2, config, data, event) {
     if (config.trackingId) {
       const uaData = removeUndefined(data);
       uaData.v = 1;
@@ -609,7 +612,7 @@ var universalAnalytics = {
         query,
         requestOptions,
         event,
-        logger: log3
+        logger: log2
       });
     } else {
       throw new Error("Invalid config for platform " + this.source);
@@ -623,7 +626,7 @@ __export(testUtils_exports, {
   context: () => context
 });
 var context = {};
-context.log = function log2(str) {
+context.log = function log(str) {
   console.log(str);
 };
 context.log.warn = function warn(str) {

package/package.json

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

package/src/defaultPublisher.ts

@@ -29,7 +29,6 @@ export async function defaultPublisher(
       serviceBusMessage,
       azureFunctionContext.log,
       platformPublisher,
-      source,
       trigger,
     ),
   );
@@ -39,7 +38,7 @@ export async function defaultPublisher(
     if (result.status === 'rejected') {
       if (result.reason instanceof Error) {
         const errorMessage = utils.parseErrorMessage(result.reason);
-        // utils.logException(azureFunctionContext.log, new Error(errorMessage));
+        utils.logException(azureFunctionContext.log, new Error(errorMessage));
         throw new Error(errorMessage);
       } else {
         const errorMessage = utils.parseErrorMessage(
@@ -47,7 +46,7 @@ export async function defaultPublisher(
             ? JSON.stringify(result.reason)
             : (result.reason as Error['message']),
         );
-        // utils.logException(azureFunctionContext.log, new Error(errorMessage));
+        utils.logException(azureFunctionContext.log, new Error(errorMessage));
         throw new Error(errorMessage);
       }
     }
@@ -67,7 +66,6 @@ async function processMessage(
   message: ServiceBusMessage,
   log: Logger,
   platformPublisher: PlatformPublisher,
-  source: string,
   trigger: (a: object, log: Logger) => EventPublisher[],
 ) {
   // TODO Je potreba otestovat, ze se to nerozbije, kdyz jsme prestali prepisovat enqueuedAt na Date.now()
@@ -78,6 +76,7 @@ async function processMessage(
   const publishers = trigger(message, log);
   if (!publishers.length) {
     utils.logMessage(
+      log,
       1,
       'Message excluded by filter (no publishers determined)',
       logProperties,

package/src/publishers/cj.ts

@@ -21,7 +21,11 @@ export const cj: PlatformPublisher = {
    */
   async publish(log, config, data, event) {
     if (!(data as CjData).cjevent) {
-      utils.log(log, 1, `CJ - ${event} - skipped because CJEVENT is missing`);
+      utils.logMessage(
+        log,
+        1,
+        `CJ - ${event.event} - skipped because CJEVENT is missing`,
+      );
       // ? Tady se returnoval false, ale nemyslim, ze to neco pouzivalo
     } else {
       if (typeof config.cid === 'string' && typeof config.type === 'string') {
@@ -51,6 +55,8 @@ export const cj: PlatformPublisher = {
           method: 'GET',
         };
 
+        utils.logException(log, new Error('BOGER'));
+
         await utils.handlePlatformRequest({
           source: this.source,
           baseUrl,

package/src/utils/utils.ts

@@ -60,15 +60,12 @@ export class EventPublisherBase implements EventPublisherBaseClass {
  * Logs message to Azure Function context and to Application Insights (if configured)
  */
 export function logMessage(
+  log: Logger,
   level: SeverityLevel,
   message: string,
   properties?: Telemetry['properties'],
 ): void {
-  aiClient?.trackTrace({
-    message,
-    severity: level,
-    properties,
-  });
+  log.warn(message, properties);
 }
 
 export function logEvent(
@@ -81,14 +78,18 @@ export function logEvent(
     event: event,
     region: region,
   };
-  logMessage(1, 'Event dispatched to platform', properties);
+  aiClient?.trackTrace({
+    message: 'Event dispatched to platform',
+    severity: 1,
+    properties,
+  });
 }
 
 /**
  * Logs exception to Azure Function context and to Application Insights (if configured)
  */
 export function logException(log: Logger, exception: Error) {
-  log.warn(exception);
+  log.warn(exception.message);
 }
 
 /**