@mhubcloud/tms_core 3.1.5 → 3.1.6-beta.0

package/dist/index.js

@@ -81,18 +81,25 @@ var EventPublisherBase = class {
     );
   }
 };
-function logMessage(log3, level, message, properties) {
-  log3.warn(message);
-}
-function logEvent(message, level, properties) {
+function logMessage(level, message, properties) {
+  console.log(message);
   aiClient?.trackTrace({
     message,
     severity: level,
     properties
   });
 }
-function logException(log3, exception) {
-  log3.warn(exception);
+function logEvent(publisher2, event, region) {
+  const message = "Event dispatched to platform";
+  const properties = {
+    publisher: publisher2,
+    event,
+    region
+  };
+  logMessage(1, message, properties);
+}
+function logException(exception) {
+  console.log(exception);
   aiClient?.trackException({
     exception
   });
@@ -220,12 +227,12 @@ async function handlePlatformRequest({
   if (handlePlatformResponse) {
     const processedPlatformResponse = await handleResponse(
       rawPlatformResponse,
-      event.properties.event
+      event.event
     );
-    logEvent(event.message, event.severity, event.properties);
+    logEvent(source, event.event, event.region);
     return processedPlatformResponse;
   } else {
-    logEvent(event.message, event.severity, event.properties);
+    logEvent(source, event.event, event.region);
   }
 }
 async function handleTestRequest(params) {
@@ -279,13 +286,13 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
     if (result.status === "rejected") {
       if (result.reason instanceof Error) {
         const errorMessage = parseErrorMessage(result.reason);
-        logException(azureFunctionContext.log, new Error(errorMessage));
+        logException(new Error(errorMessage));
         throw new Error(errorMessage);
       } else {
         const errorMessage = parseErrorMessage(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(azureFunctionContext.log, new Error(errorMessage));
+        logException(new Error(errorMessage));
         throw new Error(errorMessage);
       }
     }
@@ -299,7 +306,6 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
   const publishers = trigger(message, log3);
   if (!publishers.length) {
     logMessage(
-      log3,
       1,
       "Message excluded by filter (no publishers determined)",
       logProperties
@@ -307,7 +313,7 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
     return false;
   }
   let publishedAny = false;
-  let failedToPublishAll = false;
+  const failedToPublishAll = false;
   for (const eventPublisher of publishers) {
     const mapped = await eventPublisher.map(message, log3);
     const res = await publishMessage(
@@ -316,30 +322,22 @@ async function processMessage(message, log3, platformPublisher, source, trigger)
       eventPublisher.config,
       platformPublisher,
       {
-        message: `Event dispatched to platform`,
-        severity: 1,
-        properties: {
-          publisher: platformPublisher.source ? platformPublisher.source : source,
-          event: message.event.code + (message.event.name ? "/" + message.event.name : ""),
-          region: message.event.region
-        }
+        event: message.event.code + (message.event.name ? "/" + message.event.name : ""),
+        region: message.event.region
       }
     );
     if (res) {
       publishedAny = true;
     } else {
-      (void 0)(
-        log3,
+      logException(
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`
         )
       );
-      failedToPublishAll = true;
     }
   }
   if (!publishedAny) {
-    (void 0)(
-      log3,
+    logException(
       new Error(
         "The message has not been published to any publisher configuration"
       )

package/package.json

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

package/src/defaultPublisher.ts

@@ -39,7 +39,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(new Error(errorMessage));
         throw new Error(errorMessage);
       } else {
         const errorMessage = utils.parseErrorMessage(
@@ -47,7 +47,7 @@ export async function defaultPublisher(
             ? JSON.stringify(result.reason)
             : (result.reason as Error['message']),
         );
-        utils.logException(azureFunctionContext.log, new Error(errorMessage));
+        utils.logException(new Error(errorMessage));
         throw new Error(errorMessage);
       }
     }
@@ -78,7 +78,6 @@ async function processMessage(
   const publishers = trigger(message, log);
   if (!publishers.length) {
     utils.logMessage(
-      log,
       1,
       'Message excluded by filter (no publishers determined)',
       logProperties,
@@ -86,7 +85,7 @@ async function processMessage(
     return false;
   }
   let publishedAny = false;
-  let failedToPublishAll = false;
+  const failedToPublishAll = false;
   for (const eventPublisher of publishers) {
     const mapped = await eventPublisher.map(message, log);
 
@@ -96,34 +95,24 @@ async function processMessage(
       eventPublisher.config,
       platformPublisher,
       {
-        message: `Event dispatched to platform`,
-        severity: 1,
-        properties: {
-          publisher: platformPublisher.source
-            ? platformPublisher.source
-            : source,
-          event:
-            message.event.code +
-            (message.event.name ? '/' + message.event.name : ''),
-          region: message.event.region,
-        },
+        event:
+          message.event.code +
+          (message.event.name ? '/' + message.event.name : ''),
+        region: message.event.region,
       },
     );
     if (res) {
       publishedAny = true;
     } else {
-      utils.handleError(
-        log,
+      utils.logException(
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`,
         ),
       );
-      failedToPublishAll = true;
     }
   }
   if (!publishedAny) {
-    utils.handleError(
-      log,
+    utils.logException(
       new Error(
         'The message has not been published to any publisher configuration',
       ),

package/src/types/EventToLog.ts

@@ -1,9 +1,4 @@
 export interface EventToLog {
-  message: string;
-  severity: number;
-  properties: {
-    publisher: string;
-    event: string;
-    region: string;
-  };
+  event: string;
+  region: string;
 }

package/src/utils/utils.ts

@@ -60,36 +60,38 @@ 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 {
-  log.warn(message);
-  // aiClient?.trackTrace({
-  //  message,
-  //  severity: level,
-  //  properties,
-  // });
+  console.log(message);
+  aiClient?.trackTrace({
+    message,
+    severity: level,
+    properties,
+  });
 }
 
 export function logEvent(
-  message: string,
-  level: SeverityLevel,
-  properties: Telemetry['properties'],
+  publisher: string,
+  event: string,
+  region: string,
 ): void {
-  aiClient?.trackTrace({
-    message: message,
-    severity: level,
-    properties: properties,
-  });
+  const message = 'Event dispatched to platform';
+  const properties: Telemetry['properties'] = {
+    publisher: publisher,
+    event: event,
+    region: region,
+  };
+  logMessage(1, message, properties);
 }
 
 /**
  * Logs exception to Azure Function context and to Application Insights (if configured)
  */
-export function logException(log: Logger, exception: Error) {
-  log.warn(exception);
+export function logException(exception: Error) {
+  // log.warn(exception);
+  console.log(exception);
   aiClient?.trackException({
     exception,
   });
@@ -338,14 +340,14 @@ export async function handlePlatformRequest({
   if (handlePlatformResponse) {
     const processedPlatformResponse = await handleResponse(
       rawPlatformResponse,
-      event.properties.event,
+      event.event,
     );
 
-    logEvent(event.message, event.severity, event.properties);
+    logEvent(source, event.event, event.region);
 
     return processedPlatformResponse;
   } else {
-    logEvent(event.message, event.severity, event.properties);
+    logEvent(source, event.event, event.region);
   }
 }
 

package/tests/Piano.js

@@ -62,9 +62,10 @@ async function test(serviceBusMessage) {
       trigger,
     );
   } catch (err) {
+    console.log(err.message);
     assert.equal(
-      err.cause.toString(),
-      'Error: getaddrinfo ENOTFOUND xxxxx.xiti.com',
+      err.message,
+      'fetch failed Cause: Error: getaddrinfo ENOTFOUND xxxxx.xiti.com',
     );
   }
 }