@mhubcloud/tms_core 3.0.2 → 3.0.3-beta.1

package/dist/index.js

@@ -46,8 +46,9 @@ __export(utils_exports, {
   flatten: () => flatten,
   handlePlatformRequest: () => handlePlatformRequest,
   handleResponse: () => handleResponse,
-  log: () => log,
+  logEvent: () => logEvent,
   logException: () => logException,
+  logMessage: () => logMessage,
   prepareTestRequestHeaders: () => prepareTestRequestHeaders,
   removeUndefined: () => removeUndefined
 });
@@ -79,9 +80,17 @@ var EventPublisherBase = class {
     );
   }
 };
-function log(log3, level, message, properties) {
+function logMessage(log3, level, message, properties) {
   log3.warn(message);
 }
+function logEvent(message, level, properties, log3) {
+  log3.warn(message, properties);
+  aiClient?.trackTrace({
+    message,
+    severity: level,
+    properties
+  });
+}
 function logException(log3, exception) {
   log3.warn(exception);
   aiClient?.trackException({
@@ -209,9 +218,9 @@ async function handlePlatformRequest({
   }
   const processedPlatfromResponse = await handleResponse(
     rawPlatformResponse,
-    event
+    event.properties.event
   );
-  log(logger, 1, `${source} - ${event} - sent`);
+  logEvent(event.message, event.severity, event.properties, logger);
   return processedPlatfromResponse;
 }
 async function handleTestRequest(params) {
@@ -269,7 +278,7 @@ async function processMessage(message, log3, platformPublisher, trigger) {
   };
   const publishers = trigger(message, log3);
   if (!publishers.length) {
-    log(
+    logMessage(
       log3,
       1,
       "Message excluded by filter (no publishers determined)",
@@ -286,7 +295,15 @@ async function processMessage(message, log3, platformPublisher, trigger) {
       mapped,
       eventPublisher.config,
       platformPublisher,
-      message.event.code + (message.event.name ? "/" + message.event.name : "")
+      {
+        message: `event`,
+        severity: 1,
+        properties: {
+          publisher: platformPublisher.source,
+          event: message.event.code + (message.event.name ? "/" + message.event.name : ""),
+          region: message.event.region
+        }
+      }
     );
     if (res) {
       publishedAny = true;
@@ -366,7 +383,7 @@ var cj = {
    */
   async publish(log3, config, data, event) {
     if (!data.cjevent) {
-      log(log3, 1, `CJ - ${event} - skipped because CJEVENT is missing`);
+      (void 0)(log3, 1, `CJ - ${event} - skipped because CJEVENT is missing`);
     } else {
       if (typeof config.cid === "string" && typeof config.type === "string") {
         const cjData = removeUndefined(data);

package/package.json

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

package/src/defaultPublisher.ts

@@ -1,6 +1,7 @@
 import { Context, Logger } from '@azure/functions';
 import { Telemetry } from 'applicationinsights/out/Declarations/Contracts';
 import { EventPublisher } from './types/EventPublisher';
+import { EventToLog } from './types/EventToLog';
 import { PlatformPublisher } from './types/PlatformPublisher';
 import { ServiceBusMessage } from './types/ServiceBusMessage';
 import { TypeSafeObject } from './types/UtilTypes';
@@ -71,7 +72,7 @@ async function processMessage(
   };
   const publishers = trigger(message, log);
   if (!publishers.length) {
-    utils.log(
+    utils.logMessage(
       log,
       1,
       'Message excluded by filter (no publishers determined)',
@@ -89,7 +90,17 @@ async function processMessage(
       mapped,
       eventPublisher.config,
       platformPublisher,
-      message.event.code + (message.event.name ? '/' + message.event.name : ''),
+      {
+        message: `event`,
+        severity: 1,
+        properties: {
+          publisher: platformPublisher.source,
+          event:
+            message.event.code +
+            (message.event.name ? '/' + message.event.name : ''),
+          region: message.event.region,
+        },
+      },
     );
     if (res) {
       publishedAny = true;
@@ -129,7 +140,7 @@ async function publishMessage(
   mapped: TypeSafeObject,
   config: TypeSafeObject,
   platformPublisher: PlatformPublisher,
-  event: string,
+  event: EventToLog,
 ) {
   await platformPublisher.publish(log, config, mapped, event);
   return true;

package/src/types/EventToLog.ts

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

package/src/types/PlatformPublisher.ts

@@ -1,4 +1,5 @@
 import { HttpMethod, Logger } from '@azure/functions';
+import { EventToLog } from './EventToLog';
 import { TypeSafeObject } from './UtilTypes';
 
 export interface PlatformPublisher {
@@ -7,7 +8,7 @@ export interface PlatformPublisher {
     log: Logger,
     config: TypeSafeObject,
     data: TypeSafeObject | unknown[],
-    event: string,
+    event: EventToLog,
   ) => Promise<void>;
   // ! REMOVED parse and validate
 }

package/src/types/ServiceBusMessage.ts

@@ -3,6 +3,7 @@ export interface ServiceBusMessage {
   event: {
     code: string;
     name?: string;
+    region: string;
   };
   [x: string]: unknown;
 }

package/src/utils/utils.ts

@@ -6,6 +6,7 @@ import {
   Telemetry,
 } from 'applicationinsights/out/Declarations/Contracts';
 import { EventPublisherBaseClass } from '../types/EventPublisher';
+import { EventToLog } from '../types/EventToLog';
 import { PlatformRequestOptions } from '../types/PlatformPublisher';
 import { TypeSafeObject } from '../types/UtilTypes';
 
@@ -55,7 +56,7 @@ export class EventPublisherBase implements EventPublisherBaseClass {
 /**
  * Logs message to Azure Function context and to Application Insights (if configured)
  */
-export function log(
+export function logMessage(
   log: Logger,
   level: SeverityLevel,
   message: string,
@@ -69,6 +70,20 @@ export function log(
   // });
 }
 
+export function logEvent(
+  message: string,
+  level: SeverityLevel,
+  properties: Telemetry['properties'],
+  log: Logger,
+): void {
+  log.warn(message, properties);
+  aiClient?.trackTrace({
+    message: message,
+    severity: level,
+    properties: properties,
+  });
+}
+
 /**
  * Logs exception to Azure Function context and to Application Insights (if configured)
  */
@@ -275,7 +290,7 @@ interface HandleRequestParams {
   baseUrl: string;
   requestOptions: PlatformRequestOptions;
   query?: string;
-  event: string;
+  event: EventToLog;
   logger: Logger;
 }
 
@@ -318,10 +333,10 @@ export async function handlePlatformRequest({
   }
   const processedPlatfromResponse = await handleResponse(
     rawPlatformResponse,
-    event,
+    event.properties.event,
   );
 
-  log(logger, 1, `${source} - ${event} - sent`);
+  logEvent(event.message, event.severity, event.properties, logger);
 
   return processedPlatfromResponse;
 }