@mhubcloud/tms_core 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/index.js

@@ -82,11 +82,6 @@ var EventPublisherBase = class {
 };
 function log(log3, level, message, properties) {
   log3.warn(message);
-  aiClient?.trackTrace({
-    message,
-    severity: level,
-    properties
-  });
 }
 function logException(log3, exception) {
   log3.warn(exception);
@@ -257,10 +252,14 @@ async function defaultPublisher(azureFunctionContext, eventHubMessages, source,
   const results = await Promise.allSettled(processMessagePromises);
   for (const result of results) {
     if (result.status === "rejected") {
-      logException(
-        azureFunctionContext.log,
-        new Error(result.reason)
-      );
+      if (result.reason instanceof Error) {
+        logException(azureFunctionContext.log, result.reason);
+      } else {
+        logException(
+          azureFunctionContext.log,
+          new Error(result.reason)
+        );
+      }
     }
   }
 }
@@ -269,7 +268,7 @@ async function processMessage(message, log3, platfromPublisher, trigger) {
     source: platfromPublisher.source,
     data: JSON.stringify(message)
   };
-  const publishers = trigger(message);
+  const publishers = trigger(message, log3);
   if (!publishers.length) {
     log(
       log3,
@@ -282,7 +281,7 @@ async function processMessage(message, log3, platfromPublisher, trigger) {
   let publishedAny = false;
   let failedToPublishAll = false;
   for (const eventPublisher of publishers) {
-    const mapped = await eventPublisher.map(message);
+    const mapped = await eventPublisher.map(message, log3);
     const res = await publishMessage(
       log3,
       mapped,

package/package.json

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

package/releasePlan.md

@@ -1,3 +1,2 @@
 To test after release:
-- Zkontrolovat event_time posílaný do FB, že chodí ve správném formátu a že obsahuje správný údaj.
-- Když použiju utils.log tak to do appinsights zaloguje dvakrát? Máme totiž podezření, že ano. 
+- Zkontrolovat event_time posílaný do FB, že chodí ve správném formátu a že obsahuje správný údaj.

package/src/defaultPublisher.ts

@@ -37,10 +37,14 @@ export async function defaultPublisher(
   // ? musi nahoru probublat, ze aspon neco selhalo a to je to, co bude triggerovat nasledujici error. Error pro konkretniho publishera musi byt primo v processMessage v loopu. Hodnotu pro typ publishera vezmeme z platformBublisher.SOURCE
   for (const result of results) {
     if (result.status === 'rejected') {
-      utils.logException(
-        azureFunctionContext.log,
-        new Error(result.reason as Error['message']),
-      );
+      if (result.reason instanceof Error) {
+        utils.logException(azureFunctionContext.log, result.reason);
+      } else {
+        utils.logException(
+          azureFunctionContext.log,
+          new Error(result.reason as Error['message']),
+        );
+      }
     }
   }
 }
@@ -58,14 +62,14 @@ async function processMessage(
   message: EventHubMessage,
   log: Logger,
   platfromPublisher: PlatformPublisher,
-  trigger: (a: object) => EventPublisher[],
+  trigger: (a: object, log: Logger) => EventPublisher[],
 ) {
   // TODO Je potreba otestovat, ze se to nerozbije, kdyz jsme prestali prepisovat enqueuedAt na Date.now()
   const logProperties: Telemetry['properties'] = {
     source: platfromPublisher.source,
     data: JSON.stringify(message),
   };
-  const publishers = trigger(message);
+  const publishers = trigger(message, log);
   if (!publishers.length) {
     utils.log(
       log,
@@ -78,7 +82,7 @@ async function processMessage(
   let publishedAny = false;
   let failedToPublishAll = false;
   for (const eventPublisher of publishers) {
-    const mapped = await eventPublisher.map(message);
+    const mapped = await eventPublisher.map(message, log);
 
     const res = await publishMessage(
       log,

package/src/types/EventPublisher.ts

@@ -1,3 +1,4 @@
+import { Logger } from '@azure/functions';
 import { EventHubMessage } from './EventHubMessage';
 
 export interface EventPublisherBaseClass {
@@ -5,5 +6,5 @@ export interface EventPublisherBaseClass {
 }
 
 export interface EventPublisher extends EventPublisherBaseClass {
-  map: (data: EventHubMessage) => Promise<Record<string, unknown>>;
+  map: (data: EventHubMessage, log: Logger) => Promise<Record<string, unknown>>;
 }

package/src/types/PlatformPublisher.ts

@@ -3,13 +3,14 @@ import { BodyInit } from 'node-fetch';
 import { TypeSafeObject } from './UtilTypes';
 
 export interface PlatformPublisher {
-  source: string;
+  source: string; // ! ADDED
   publish: (
     log: Logger,
     config: TypeSafeObject,
     data: TypeSafeObject | unknown[],
     event: string,
   ) => Promise<void>;
+  // ! REMOVED parse and validate
 }
 
 export interface PlatformRequestOptions {

package/src/utils/utils.ts

@@ -63,11 +63,11 @@ export function log(
   properties?: Telemetry['properties'],
 ): void {
   log.warn(message);
-  aiClient?.trackTrace({
-    message,
-    severity: level,
-    properties,
-  });
+  // aiClient?.trackTrace({
+  //  message,
+  //  severity: level,
+  //  properties,
+  // });
 }
 
 /**

package/tests/CJ.js

@@ -118,12 +118,12 @@ async function test(eventHubMessages) {
   );
 }
 
-function trigger(data) {
+function trigger(data, log) {
   const publishers = [];
   if (data.event.code === 'purchase') {
     let publisher = CJPurchasePublisher;
 
-    publisher.register(publishers, { cid: 1, type: 1111111 });
+    publisher.register(publishers, { cid: '1', type: '1111111' });
   }
   return publishers;
 }
@@ -134,7 +134,7 @@ class CJPurchasePublisher extends utils.EventPublisherBase {
    * @param {Object} data `purchase` event data
    * @returns {Object} Data mapped from incomming Event Hub message to platform payload
    */
-  map(data) {
+  map(data, log) {
     const ret = {
       cjevent: utils.extractAdCode(data, 'cjaffiliate', 'cjevent')?.code,
       cust_status: data.user?.ts?.indexOf('customer') >= 0 ? 'return' : 'new',