@mhubcloud/tms_core 3.8.0-beta.7 → 3.8.0-beta.9

package/dist/index.js

@@ -32,7 +32,7 @@ var index_exports = {};
 __export(index_exports, {
   DefaultPublisher: () => defaultPublisher,
   broker: () => broker_exports,
-  getRedisClient: () => getRedisClient,
+  createRedisClient: () => createRedisClient,
   publisher: () => publisher,
   testUtils: () => testUtils_exports,
   utils: () => utils_exports
@@ -77,20 +77,28 @@ var appInsights = __toESM(require("applicationinsights"));
 
 // src/utils/redisClient.ts
 var import_redis = require("redis");
-var client;
-async function getRedisClient() {
-  const redisUrl = process.env["RedisUrl"];
-  if (!redisUrl) {
-    return null;
-  }
-  if (!client) {
+async function createRedisClient(url, password) {
+  let client;
+  if (!url || !password) {
+    if (process.env.RedisUrl && process.env.RedisPassword) {
+      client = (0, import_redis.createClient)({
+        url: `rediss://${process.env.RedisUrl}`,
+        password: process.env.RedisPassword,
+        socket: { tls: true }
+      });
+    } else {
+      throw new Error(
+        "Redis url and password are missing with no fallback available"
+      );
+    }
+  } else {
     client = (0, import_redis.createClient)({
-      url: `rediss://${redisUrl}`,
-      password: process.env["RedisPassword"],
+      url,
+      password,
       socket: { tls: true }
     });
-    await client.connect();
   }
+  await client.connect();
   return client;
 }
 
@@ -122,10 +130,10 @@ var EventPublisherBase = class {
   }
 };
 async function logRedisEvent(key) {
-  const redis = await getRedisClient();
-  if (!redis) {
+  if (!process.env.RedisUrl || !process.env.RedisPassword) {
     return;
   }
+  const redis = await createRedisClient();
   await redis.multi().hIncrBy(key, "count", 1).expire(key, 660).exec();
 }
 var DestinationError = class _DestinationError extends Error {
@@ -150,11 +158,11 @@ function logAggregatedMetric({
   dimensions
 }) {
   const windowStart = Math.floor(Date.now() / 6e4) * 6e4;
-  const key = dimensions ? `${prefix}:${windowStart}:${dimensions}:${name}` : `${prefix}:${windowStart}:${name}`;
+  let key = "tms:";
+  key += dimensions ? `${prefix}:${windowStart}:${dimensions}:${name}` : `${prefix}:${windowStart}:${name}`;
   void logRedisEvent(key).catch((error) => {
-    if (error instanceof Error) {
-      logException(new Error(`Metric log error: ${error.message}`));
-    }
+    const message = error instanceof Error ? error.message : String(error);
+    logMessage(3, `Metric log error: ${message}`);
   });
 }
 function logMetric(name, value, properties) {
@@ -174,15 +182,15 @@ function logMessage(level, message, properties) {
   });
 }
 function logEvent(publisher2, event, region, status, payload, id) {
-  if (!process.env.DisableMetrics && status >= 200 && status < 400) {
-    const metricRegion = process.env.DisableMetricRegionLogging ? "default" : region;
+  if (process.env.DisableMetrics !== "true" && status >= 200 && status < 400) {
+    const metricRegion = process.env.DisableMetricRegionLogging === "true" ? "default" : region;
     logAggregatedMetric({
       prefix: "events",
       dimensions: `${metricRegion}:${publisher2}:${event}`,
       name: "Dispatch"
     });
   }
-  if (!process.env.DisableTraces) {
+  if (process.env.DisableTraces !== "true") {
     let properties = {
       publisher: publisher2,
       event,
@@ -197,14 +205,14 @@ function logEvent(publisher2, event, region, status, payload, id) {
   }
 }
 function logException(exception, publisher2, errorType = "InternalError") {
-  if (!process.env.DisableMetrics) {
+  if (process.env.DisableMetrics !== "true") {
     logAggregatedMetric({
       prefix: "errors",
       dimensions: publisher2 ?? "Other",
       name: errorType
     });
   }
-  if (!process.env.DisableTraces) {
+  if (process.env.DisableTraces !== "true") {
     aiClient?.trackException({
       exception,
       properties: { publisher: publisher2, errorType }
@@ -628,19 +636,6 @@ async function scheduleEvent(message, queue, options) {
   }
 }
 
-// src/utils/testUtils.ts
-var testUtils_exports = {};
-__export(testUtils_exports, {
-  context: () => context
-});
-var context = {};
-context.log = function log(str) {
-  console.log(str);
-};
-context.log.warn = function warn(str) {
-  console.warn(str);
-};
-
 // src/defaultPublisher.ts
 async function defaultPublisher(azureFunctionContext, serviceBusMessage, source, platformPublisher, trigger) {
   if (serviceBusMessage.$schema === "mhub/pingtest") {
@@ -1239,6 +1234,19 @@ var universalAnalytics = {
   }
 };
 
+// src/utils/testUtils.ts
+var testUtils_exports = {};
+__export(testUtils_exports, {
+  context: () => context
+});
+var context = {};
+context.log = function log(str) {
+  console.log(str);
+};
+context.log.warn = function warn(str) {
+  console.warn(str);
+};
+
 // src/index.ts
 var publisher = {
   /* eslint-disable @typescript-eslint/naming-convention */
@@ -1256,7 +1264,7 @@ var publisher = {
 0 && (module.exports = {
   DefaultPublisher,
   broker,
-  getRedisClient,
+  createRedisClient,
   publisher,
   testUtils,
   utils

package/package.json

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