@mhubcloud/tms_core 3.4.3 → 3.4.5

package/dist/index.js

@@ -359,6 +359,8 @@ function matchEvent(event, publisherEvent) {
         if (!paramMatch) {
           return false;
         }
+      } else if (publisherEventParam && !eventParam) {
+        return false;
       } else {
         throw new Error("Unexpected formatting in publisher configuration");
       }
@@ -431,13 +433,19 @@ async function defaultPublisher(azureFunctionContext, serviceBusMessage, source,
     if (result.status === "rejected") {
       if (result.reason instanceof Error) {
         const formattedError = formatError(result.reason);
-        logException(new Error(formattedError.message));
+        logException(
+          azureFunctionContext.log,
+          new Error(formattedError.message)
+        );
         throw formattedError;
       } else {
         const formattedError = formatError(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(new Error(formattedError.message));
+        logException(
+          azureFunctionContext.log,
+          new Error(formattedError.message)
+        );
         throw formattedError;
       }
     }
@@ -475,6 +483,7 @@ async function processMessage(message, log2, platformPublisher, trigger) {
       publishedAny = true;
     } else {
       logException(
+        log2,
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`
         )
@@ -483,6 +492,7 @@ async function processMessage(message, log2, platformPublisher, trigger) {
   }
   if (!publishedAny) {
     logException(
+      log2,
       new Error(
         "The message has not been published to any publisher configuration"
       )
@@ -891,7 +901,7 @@ var publisher = {
   Facebook: facebook,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   CJ: cj,
-  // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unnecessary-type-assertion
+  // eslint-disable-next-line @typescript-eslint/naming-convention
   GoogleAds: googleAds,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   GoogleAnalytics4: googleAnalytics4,

package/package.json

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

package/src/broker.ts

@@ -104,6 +104,8 @@ function matchEvent(event: EventInfo, publisherEvent: string | PublisherEvent) {
         if (!paramMatch) {
           return false;
         }
+      } else if (publisherEventParam && !eventParam) {
+        return false;
       } else {
         throw new Error('Unexpected formatting in publisher configuration');
       }

package/src/defaultPublisher.ts

@@ -41,7 +41,10 @@ export async function defaultPublisher(
     if (result.status === 'rejected') {
       if (result.reason instanceof Error) {
         const formattedError = utils.formatError(result.reason);
-        utils.logException(new Error(formattedError.message));
+        utils.logException(
+          azureFunctionContext.log,
+          new Error(formattedError.message),
+        );
         throw formattedError;
       } else {
         const formattedError = utils.formatError(
@@ -49,7 +52,10 @@ export async function defaultPublisher(
             ? JSON.stringify(result.reason)
             : (result.reason as Error['message']),
         );
-        utils.logException(new Error(formattedError.message));
+        utils.logException(
+          azureFunctionContext.log,
+          new Error(formattedError.message),
+        );
         throw formattedError;
       }
     }
@@ -106,6 +112,7 @@ async function processMessage(
       publishedAny = true;
     } else {
       utils.logException(
+        log,
         new Error(
           `The message has not been published. Source: ${platformPublisher.source}`,
         ),
@@ -114,6 +121,7 @@ async function processMessage(
   }
   if (!publishedAny) {
     utils.logException(
+      log,
       new Error(
         'The message has not been published to any publisher configuration',
       ),

package/src/index.ts

@@ -3,7 +3,7 @@ import { defaultPublisher } from './defaultPublisher';
 import { affiliatePort } from './publishers/affiliatePort';
 import { cj } from './publishers/cj';
 import { facebook } from './publishers/facebook';
-import { googleAds, GoogleAdsPlatformPublisher } from './publishers/googleAds';
+import { googleAds } from './publishers/googleAds';
 import { googleAnalytics4 } from './publishers/googleAnalytics4';
 import { piano } from './publishers/piano';
 import { universalAnalytics } from './publishers/universalAnalytics';
@@ -15,8 +15,8 @@ export const publisher = {
   Facebook: facebook,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   CJ: cj,
-  // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/no-unnecessary-type-assertion
-  GoogleAds: googleAds as GoogleAdsPlatformPublisher,
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  GoogleAds: googleAds,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   GoogleAnalytics4: googleAnalytics4,
   // eslint-disable-next-line @typescript-eslint/naming-convention

package/src/publishers/googleAds.ts

@@ -3,7 +3,7 @@ import * as utils from './../utils/utils';
 import { EventToLog } from '../types/EventToLog';
 import { TypeSafeObject } from '../types/UtilTypes';
 
-export interface GoogleAdsPlatformPublisher {
+interface GoogleAdsPlatformPublisher {
   source: string;
   publish: (
     log: Logger,

package/publishers/TableStorage.js

@@ -1,46 +0,0 @@
-const { TableClient } = require("@azure/data-tables");
-const utils = require("../lib/utils");
-const SOURCE = "f_TableStorage";
-
-module.exports = {
-    /**
-     * Processed data coming from EventHub to data for further processing
-     * @param {Object} data The data coming from EventHub
-     * @returns {Object} Data for further processing
-     */
-    parse: function parse(data, context) {
-        //ConsumerBase.cs:ConsumeOneEventAsync
-        data.enqueuedAt = context.test ? 1600000000000 : Date.now();
-        return data;
-    },
-
-    /**
-     * Publishes data to TableStorage
-     * https://www.npmjs.com/package/@azure/data-tables
-     * @param {{id: string, access_token: string}} config Publisher configuration
-     * @param {Object} data Data in publisher-friendly format to be published
-     * @param {string} event for which is it triggered
-     */
-    publish: async function publish(config, data, event) {
-        data = utils.removeUndefined(data);
-
-        const client = new TableClient(config.connectionString, config.tableName);
-
-        await client.createEntity(data);
-
-        console.log(`TableStorage - ${event} - sent`);
-    },
-
-    /**
-    * Validates an object against given schema
-    * @param {Object} data An object to validate.
-    * @param {string} schema Name of the schema. That's name of a file with `.schema.json` extension in `customizable/schemas` subfolder of current publisher folder
-    * @returns {boolean} Validation result, true if successful, false if unsuccessfull (in which case more info is written to console)
-    */
-    validate: function validate(data, schema) {
-        if (!schema) throw new Error("Schema parameters not provided");
-        if (schema.indexOf("/") >= 0) throw new Error("Schema must be provided as schema name, not schema path");
-        //More validation done by utils.validate
-        return utils.validate(data, SOURCE, schema);
-    }
-};