@mhubcloud/tms_core 3.8.0-beta.6 → 3.8.0-beta.8

package/dist/index.js

@@ -53,6 +53,7 @@ var import_service_bus = require("@azure/service-bus");
 // src/utils/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  DestinationError: () => DestinationError,
   EventPublisherBase: () => EventPublisherBase,
   encodeEmail: () => encodeEmail,
   extractAdCode: () => extractAdCode,
@@ -78,9 +79,13 @@ var appInsights = __toESM(require("applicationinsights"));
 var import_redis = require("redis");
 var client;
 async function getRedisClient() {
+  const redisUrl = process.env["RedisUrl"];
+  if (!redisUrl) {
+    return null;
+  }
   if (!client) {
     client = (0, import_redis.createClient)({
-      url: `rediss://${process.env["RedisUrl"]}`,
+      url: `rediss://${redisUrl}`,
       password: process.env["RedisPassword"],
       socket: { tls: true }
     });
@@ -118,14 +123,40 @@ 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 (!redis) {
+    return;
+  }
+  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
+}) {
   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) => {
+    if (error instanceof Error) {
+      logException(new Error(`Metric log error: ${error.message}`));
+    }
+  });
 }
 function logMetric(name, value, properties) {
   aiClient?.trackMetric({
@@ -144,13 +175,15 @@ function logMessage(level, message, 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({ prefix: "events", dimensions: `${metricRegion}:${publisher2}:${event}`, name });
+  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,
@@ -163,18 +196,21 @@ function logEvent(publisher2, event, region, status, payload, id) {
     properties = removeUndefined(properties);
     logMessage(1, message, properties);
   }
-  ;
 }
-function logException(exception, publisher2) {
-  if (!process.env["DisableMetrics"]) {
-    const message = exception.message.split(".")[0]?.substring(0, 100)?.replace(/:/g, "") ?? "Error";
-    logAggregatedMetric({ prefix: "errors", dimensions: `${publisher2 ?? "Other"}:${exception.name}`, name: message });
+function logException(exception, publisher2, errorType = "InternalError") {
+  if (process.env.DisableMetrics !== "true") {
+    logAggregatedMetric({
+      prefix: "errors",
+      dimensions: publisher2 ?? "Other",
+      name: errorType
+    });
   }
-  ;
-  if (!process.env["DisableTraces"]) {
-    aiClient?.trackException({ exception });
+  if (process.env.DisableTraces !== "true") {
+    aiClient?.trackException({
+      exception,
+      properties: { publisher: publisher2, errorType }
+    });
   }
-  ;
 }
 function logMilestone(name) {
   logAggregatedMetric({ prefix: "milestones", name });
@@ -318,29 +354,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,
@@ -349,11 +377,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) {
@@ -381,7 +404,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;
     }
@@ -638,13 +661,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;
       }
     }
@@ -900,17 +924,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) {
@@ -941,7 +965,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();
@@ -1059,17 +1086,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);
@@ -1100,7 +1127,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();

package/package.json

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