@mhubcloud/tms_core 3.8.0-beta.0 → 3.8.0-beta.10

package/dist/index.js

@@ -32,6 +32,8 @@ var index_exports = {};
 __export(index_exports, {
   DefaultPublisher: () => defaultPublisher,
   broker: () => broker_exports,
+  createAppInsightsClient: () => createAppInsightsClient,
+  createRedisClient: () => createRedisClient,
   publisher: () => publisher,
   testUtils: () => testUtils_exports,
   utils: () => utils_exports
@@ -52,8 +54,8 @@ var import_service_bus = require("@azure/service-bus");
 // src/utils/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  DestinationError: () => DestinationError,
   EventPublisherBase: () => EventPublisherBase,
-  aiClient: () => aiClient,
   encodeEmail: () => encodeEmail,
   extractAdCode: () => extractAdCode,
   extractClickId: () => extractClickId,
@@ -66,35 +68,99 @@ __export(utils_exports, {
   logEvent: () => logEvent,
   logException: () => logException,
   logMessage: () => logMessage,
+  logMetric: () => logMetric,
   logMilestone: () => logMilestone,
   prepareTestRequestHeaders: () => prepareTestRequestHeaders,
   removeUndefined: () => removeUndefined
 });
 var crypto = __toESM(require("crypto"));
+
+// src/utils/appInsightsClient.ts
 var appInsights = __toESM(require("applicationinsights"));
+var import_applicationinsights = require("applicationinsights");
+var defaultClient2;
+var settings = {
+  collectDependencies: false,
+  collectExternalLoggers: true,
+  collectConsole: false,
+  sendLiveMetrics: false,
+  collectRequests: false,
+  collectPerformance: false,
+  collectExtendedMetrics: false,
+  useDiskRetryCaching: false
+};
+function configureIndependentClient(client) {
+  client.config.enableAutoCollectExceptions ??= true;
+  client.config.enableAutoCollectPreAggregatedMetrics ??= true;
+  client.config.enableAutoCollectHeartbeat ??= true;
+  client.config.enableAutoDependencyCorrelation ??= true;
+  client.config.enableWebInstrumentation ??= false;
+  client.config.enableAutoCollectIncomingRequestAzureFunctions ??= false;
+  client.config.enableAutoCollectDependencies = settings.collectDependencies;
+  client.config.enableAutoCollectExternalLoggers = settings.collectExternalLoggers;
+  client.config.enableAutoCollectConsole = settings.collectConsole;
+  client.config.enableSendLiveMetrics = settings.sendLiveMetrics;
+  client.config.enableAutoCollectRequests = settings.collectRequests;
+  client.config.enableAutoCollectPerformance = settings.collectPerformance;
+  client.config.enableAutoCollectExtendedMetrics = settings.collectExtendedMetrics;
+  client.config.enableUseDiskRetryCaching = settings.useDiskRetryCaching;
+  client.channel.setUseDiskRetryCaching(settings.useDiskRetryCaching);
+  return client;
+}
+function createAppInsightsClient(connectionString) {
+  if (connectionString !== void 0) {
+    if (!connectionString.trim()) {
+      throw new Error("Application Insights connection string is empty");
+    }
+    return configureIndependentClient(new import_applicationinsights.TelemetryClient(connectionString));
+  }
+  if (defaultClient2 !== void 0) {
+    return defaultClient2;
+  }
+  if (!process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
+    defaultClient2 = null;
+    return defaultClient2;
+  }
+  appInsights.setup().setAutoCollectDependencies(settings.collectDependencies).setAutoCollectConsole(
+    settings.collectExternalLoggers,
+    settings.collectConsole
+  ).setSendLiveMetrics(settings.sendLiveMetrics).setAutoCollectRequests(settings.collectRequests).setAutoCollectPerformance(
+    settings.collectPerformance,
+    settings.collectExtendedMetrics
+  ).setUseDiskRetryCaching(settings.useDiskRetryCaching).start();
+  defaultClient2 = appInsights.defaultClient;
+  return defaultClient2;
+}
 
 // src/utils/redisClient.ts
 var import_redis = require("redis");
-var client;
-var port = process.env["RedisPort"] ?? "6380";
-async function getRedisClient() {
-  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://${process.env["RedisUrl"]}:${port}`,
-      password: process.env["RedisPassword"],
+      url,
+      password,
       socket: { tls: true }
     });
-    await client.connect();
   }
+  await client.connect();
   return client;
 }
 
 // src/utils/utils.ts
-var aiClient = null;
-if (process.env.APPLICATIONINSIGHTS_CONNECTION_STRING) {
-  appInsights.setup().setAutoCollectDependencies(false).setAutoCollectConsole(true, false).setSendLiveMetrics(false).setAutoCollectRequests(false).setAutoCollectPerformance(false, false).setUseDiskRetryCaching(false).start();
-  aiClient = appInsights.defaultClient;
-}
+var aiClient = createAppInsightsClient();
 var EventPublisherBase = class {
   config;
   constructor(config) {
@@ -117,32 +183,66 @@ var EventPublisherBase = class {
   }
 };
 async function logRedisEvent(key) {
-  const redis = await getRedisClient();
-  if (!redis) return;
-  await redis.hIncrBy(key, "count", 1);
-  await redis.expire(key, 660);
+  if (!process.env.RedisUrl || !process.env.RedisPassword) {
+    return;
+  }
+  const redis = await createRedisClient();
+  await redis.multi().hIncrBy(key, "count", 1).expire(key, 660).exec();
 }
-function logAggregatedMetric(prefix, name, dimensions) {
+var DestinationError = class _DestinationError extends Error {
+  metricType;
+  constructor(message, metricType) {
+    super(message);
+    this.name = "DestinationError";
+    this.metricType = metricType;
+  }
+  static fromResponse(message, status) {
+    const metricType = status === 408 || status === 429 || status >= 500 ? "PlatformError" : "RequestError";
+    return new _DestinationError(message, metricType);
+  }
+  static fromNetworkFailure(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return new _DestinationError(message, "PlatformError");
+  }
+};
+function logAggregatedMetric({ prefix, name, dimensions }, client) {
   const windowStart = Math.floor(Date.now() / 6e4) * 6e4;
-  const key = dimensions ? `${prefix}:${windowStart}:${dimensions}:${name}` : `${prefix}:${windowStart}:${name}`;
-  logRedisEvent(key);
+  let key = "tms:";
+  key += dimensions ? `${prefix}:${windowStart}:${dimensions}:${name}` : `${prefix}:${windowStart}:${name}`;
+  void logRedisEvent(key).catch((error) => {
+    const message = error instanceof Error ? error.message : String(error);
+    logMessage(3, `Metric log error: ${message}`, void 0, client);
+  });
+}
+function logMetric(name, value, properties, client) {
+  (client ?? aiClient)?.trackMetric({
+    name,
+    value,
+    count: value,
+    properties
+  });
 }
-function logMessage(level, message, properties) {
+function logMessage(level, message, properties, client) {
   console.log(message);
-  aiClient?.trackTrace({
+  (client ?? aiClient)?.trackTrace({
     message,
     severity: level,
     properties
   });
 }
-function logEvent(publisher2, event, region, status, payload, id) {
-  if (!process.env["DisableMetrics"]) {
-    const metricRegion = process.env["DisableMetricRegionLogging"] ? "default" : region;
-    const name = status >= 200 && status < 400 ? "DispatchSuccess" : "DispatchFailure";
-    logAggregatedMetric("metrics", name, `${metricRegion}:${publisher2}:${event}`);
+function logEvent(publisher2, event, region, status, payload, id, client) {
+  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"
+      },
+      client
+    );
   }
-  ;
-  if (!process.env["DisableTraces"]) {
+  if (process.env.DisableTraces !== "true") {
     let properties = {
       publisher: publisher2,
       event,
@@ -153,23 +253,29 @@ function logEvent(publisher2, event, region, status, payload, id) {
     };
     const message = status >= 200 && status < 400 ? "Event dispatched to platform" : "Event dispatch failed";
     properties = removeUndefined(properties);
-    logMessage(1, message, properties);
+    logMessage(1, message, properties, client);
   }
-  ;
 }
-function logException(exception, publisher2) {
-  if (!process.env["DisableMetrics"]) {
-    const message = exception.message.split(".")[0]?.substring(0, 100).replace(/:/g, "");
-    logAggregatedMetric("error", exception.name, `${publisher2 ?? "Other"}:${message}`);
+function logException(exception, publisher2, errorType = "InternalError", client) {
+  if (process.env.DisableMetrics !== "true") {
+    logAggregatedMetric(
+      {
+        prefix: "errors",
+        dimensions: publisher2 ?? "Other",
+        name: errorType
+      },
+      client
+    );
   }
-  ;
-  if (!process.env["DisableTraces"]) {
-    aiClient?.trackException({ exception });
+  if (process.env.DisableTraces !== "true") {
+    (client ?? aiClient)?.trackException({
+      exception,
+      properties: { publisher: publisher2, errorType }
+    });
   }
-  ;
 }
-function logMilestone(name, value) {
-  logAggregatedMetric("milestones", String(value), name);
+function logMilestone(name, client) {
+  logAggregatedMetric({ prefix: "milestones", name }, client);
 }
 function removeUndefined(originalValue) {
   if (originalValue instanceof Array) {
@@ -310,29 +416,21 @@ async function handlePlatformRequest({
     // eslint-disable-next-line @typescript-eslint/naming-convention
     headers: { ...requestOptions.headers }
   };
-  let rawPlatformResponse;
-  try {
-    rawPlatformResponse = await fetch(fullUrl, fetchRequestOptions);
-  } catch (e) {
-    logEvent(
-      source,
-      event.event,
-      event.region,
-      0,
-      requestOptions.method === "POST" ? JSON.stringify(requestOptions.body) : query,
-      event.id
-    );
-    throw e;
+  const rawPlatformResponse = await fetch(fullUrl, fetchRequestOptions);
+  if (process.env.PUBLISHER_TESTURL) {
+    await handleTestRequest({
+      fetchRequestOptions,
+      fullUrl,
+      query,
+      rawPlatformResponse
+    });
   }
-  if (rawPlatformResponse) {
-    if (process.env.PUBLISHER_TESTURL) {
-      await handleTestRequest({
-        fetchRequestOptions,
-        fullUrl,
-        query,
-        rawPlatformResponse
-      });
-    }
+  if (!rawPlatformResponse.ok) {
+    throw DestinationError.fromResponse(
+      `HTTP Error code: ${rawPlatformResponse.status}, event: ${event.event}, region: ${event.region}, body: ${await rawPlatformResponse.text()}`,
+      rawPlatformResponse.status
+    );
+  } else {
     logEvent(
       source,
       event.event,
@@ -341,11 +439,6 @@ async function handlePlatformRequest({
       requestOptions.method === "POST" ? JSON.stringify(requestOptions.body) : query,
       event.id
     );
-    if (!rawPlatformResponse.ok) {
-      throw new Error(
-        `HTTP Error code: ${rawPlatformResponse.status}, event: ${event.event}, region: ${event.region}, body: ${await rawPlatformResponse.text()}`
-      );
-    }
   }
 }
 async function handleTestRequest(params) {
@@ -373,7 +466,7 @@ function formatError(error) {
   if (error instanceof Error) {
     formattedError = error;
     if (error.cause) {
-      formattedError.message = `${error.message} Cause: ${error.cause.toString()}`;
+      formattedError.message = `${error.message} Cause: ${String(error.cause)}`;
     } else {
       formattedError.message = error.message;
     }
@@ -617,13 +710,14 @@ 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), source);
+        const errorType = result.reason instanceof DestinationError ? result.reason.metricType : "InternalError";
+        logException(formattedError, source, errorType);
         throw formattedError;
       } else {
         const formattedError = formatError(
           typeof result.reason === "object" ? JSON.stringify(result.reason) : result.reason
         );
-        logException(new Error(formattedError.message), source);
+        logException(formattedError, source, "InternalError");
         throw formattedError;
       }
     }
@@ -879,17 +973,17 @@ var googleAds = {
       error = responseJson.error.message;
     } else {
       status = 200;
+      logEvent(
+        this.source,
+        event.event,
+        event.region,
+        status,
+        requestOptions.body,
+        event.id
+      );
     }
-    logEvent(
-      this.source,
-      event.event,
-      event.region,
-      status,
-      requestOptions.body,
-      event.id
-    );
     if (error) {
-      throw new Error(error);
+      throw DestinationError.fromResponse(error, response.status);
     }
   },
   async getToken(config) {
@@ -920,7 +1014,10 @@ var googleAds = {
             }
           );
           if (!tokenResponse.ok) {
-            throw new Error("Access token fetch failed");
+            throw DestinationError.fromResponse(
+              "Access token fetch failed",
+              tokenResponse.status
+            );
           }
           const parsedTokenResponse = await tokenResponse.json();
           const createdAt = Date.now();
@@ -1038,17 +1135,17 @@ var microsoftAds = {
         error = message;
       } else {
         status = 200;
+        logEvent(
+          this.source,
+          event.event,
+          event.region,
+          status,
+          requestOptions.body,
+          event.id
+        );
       }
-      logEvent(
-        this.source,
-        event.event,
-        event.region,
-        status,
-        requestOptions.body,
-        event.id
-      );
       if (error) {
-        throw new Error(error);
+        throw DestinationError.fromResponse(error, response.status);
       }
     } else {
       throw new Error("Invalid config for platform " + this.source);
@@ -1079,7 +1176,10 @@ var microsoftAds = {
           }
         );
         if (!tokenResponse.ok) {
-          throw new Error("Access token fetch failed");
+          throw DestinationError.fromResponse(
+            "Access token fetch failed",
+            tokenResponse.status
+          );
         }
         const parsedTokenResponse = await tokenResponse.json();
         const createdAt = Date.now();
@@ -1219,6 +1319,8 @@ var publisher = {
 0 && (module.exports = {
   DefaultPublisher,
   broker,
+  createAppInsightsClient,
+  createRedisClient,
   publisher,
   testUtils,
   utils

package/package.json

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