@oneuptime/common 7.0.4395 → 7.0.4415

package/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel.ts

@@ -76,7 +76,7 @@ export default class CommonModel {
       if (column.type === TableColumnType.JSON && typeof value === "string") {
         try {
           value = JSONFunctions.parse(value);
-        } catch (e) {
+        } catch {
           value = {};
         }
       }
@@ -91,7 +91,7 @@ export default class CommonModel {
           if (!Array.isArray(value)) {
             throw new BadDataException("Not an array");
           }
-        } catch (e) {
+        } catch {
           value = [];
         }
       }

package/Server/API/StatusPageAPI.ts

@@ -142,6 +142,10 @@ export default class StatusPageAPI extends BaseAPI<
           try {
             statusPageId = new ObjectID(statusPageIdOrDomain);
           } catch (err) {
+            logger.error(
+              `Error converting statusPageIdOrDomain to ObjectID: ${statusPageIdOrDomain}`,
+            );
+            logger.error(err);
             return Response.sendErrorResponse(
               req,
               res,
@@ -224,6 +228,7 @@ export default class StatusPageAPI extends BaseAPI<
           try {
             statusPageId = new ObjectID(statusPageIdOrDomain);
           } catch (err) {
+            logger.error(err);
             return Response.sendErrorResponse(
               req,
               res,

package/Server/Middleware/NotificationMiddleware.ts

@@ -6,6 +6,7 @@ import {
 } from "../Utils/Express";
 import JSONWebToken from "../Utils/JsonWebToken";
 import Response from "../Utils/Response";
+import logger from "../Utils/Logger";
 import { OnCallInputRequest } from "../../Types/Call/CallRequest";
 import BadDataException from "../../Types/Exception/BadDataException";
 import JSONFunctions from "../../Types/JSONFunctions";
@@ -61,6 +62,7 @@ export default class NotificationMiddleware {
         JSONWebToken.decodeJsonPayload(token),
       );
     } catch (e) {
+      logger.error(e);
       return Response.sendErrorResponse(
         req,
         res,

package/Server/Middleware/UserAuthorization.ts

@@ -173,6 +173,7 @@ export default class UserMiddleware {
       oneuptimeRequest.userAuthorization = JSONWebToken.decode(accessToken);
     } catch (err) {
       // if the token is invalid or expired, it'll throw this error.
+      logger.error(err);
       oneuptimeRequest.userType = UserType.Public;
       return next();
     }

package/Server/Services/OpenTelemetryIngestService.ts

@@ -125,20 +125,20 @@ export default class OTelIngestService {
 
     const newDbMetric: Metric = Metric.fromJSON(
       dbMetric.toJSON(),
-      Metric
+      Metric,
     ) as Metric;
 
     if (datapoint["startTimeUnixNano"]) {
       newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
       newDbMetric.startTime = OneUptimeDate.fromUnixNano(
-        datapoint["startTimeUnixNano"] as number
+        datapoint["startTimeUnixNano"] as number,
       );
     }
 
     if (datapoint["timeUnixNano"]) {
       newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
       newDbMetric.time = OneUptimeDate.fromUnixNano(
-        datapoint["timeUnixNano"] as number
+        datapoint["timeUnixNano"] as number,
       );
     }
 

package/Server/Services/StatusPageDomainService.ts

@@ -237,6 +237,7 @@ export class Service extends DatabaseService<StatusPageDomain> {
 
       return true;
     } catch (err) {
+      logger.error(err);
       return false;
     }
   }

package/Server/Types/Database/QueryHelper.ts

@@ -271,7 +271,7 @@ export default class QueryHelper {
   @CaptureSpan()
   public static greaterThanEqualTo<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -280,13 +280,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static greaterThanEqualToOrNull<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -295,13 +295,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static lessThanEqualTo<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -310,13 +310,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static lessThanOrNull<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -325,13 +325,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static lessThanEqualToOrNull<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -340,13 +340,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static greaterThan<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<number | Date> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -355,13 +355,13 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static greaterThanOrNull<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -370,14 +370,14 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static inBetween<T extends number | Date>(
     startValue: T,
     endValue: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -388,14 +388,14 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static inBetweenOrNull<T extends number | Date>(
     startValue: T,
     endValue: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -406,14 +406,14 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
   public static notInBetween<T extends number | Date>(
     startValue: T,
     endValue: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid1: string = Text.generateRandomText(10);
     const rid2: string = Text.generateRandomText(10);
     return Raw(
@@ -424,7 +424,7 @@ export default class QueryHelper {
         [rid1]: startValue,
         [rid2]: endValue,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 
   @CaptureSpan()
@@ -481,7 +481,7 @@ export default class QueryHelper {
   @CaptureSpan()
   public static lessThan<T extends number | Date>(
     value: T,
-  ): FindWhereProperty<T> {
+  ): FindWhereProperty<any> {
     const rid: string = Text.generateRandomText(10);
     return Raw(
       (alias: string) => {
@@ -490,6 +490,6 @@ export default class QueryHelper {
       {
         [rid]: value,
       },
-    ) as FindWhereProperty<T>;
+    ) as FindWhereProperty<any>;
   }
 }

package/Server/Types/Workflow/Components/JSON/JsonToText.ts

@@ -2,6 +2,7 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode";
 import BadDataException from "../../../../../Types/Exception/BadDataException";
 import { JSONObject } from "../../../../../Types/JSON";
 import JSONFunctions from "../../../../../Types/JSONFunctions";
+import logger from "../../../../Utils/Logger";
 import ComponentMetadata, {
   Port,
 } from "../../../../../Types/Workflow/Component";
@@ -74,6 +75,7 @@ export default class JsonToText extends ComponentCode {
         executePort: successPort,
       });
     } catch (err) {
+      logger.error(err);
       options.log("JSON is not in the correct format.");
       return Promise.resolve({
         returnValues: {},

package/Server/Types/Workflow/Components/JSON/TextToJson.ts

@@ -2,6 +2,7 @@ import ComponentCode, { RunOptions, RunReturnType } from "../../ComponentCode";
 import BadDataException from "../../../../../Types/Exception/BadDataException";
 import { JSONObject } from "../../../../../Types/JSON";
 import JSONFunctions from "../../../../../Types/JSONFunctions";
+import logger from "../../../../Utils/Logger";
 import ComponentMetadata, {
   Port,
 } from "../../../../../Types/Workflow/Component";
@@ -72,6 +73,7 @@ export default class TextToJSON extends ComponentCode {
         executePort: successPort,
       });
     } catch (err) {
+      logger.error(err);
       options.log("text is not in the correct format.");
       return Promise.resolve({
         returnValues: {},

package/Server/Utils/CronTab.ts

@@ -1,5 +1,6 @@
 import BadDataException from "../../Types/Exception/BadDataException";
 import CronParser, { CronExpression } from "cron-parser";
+import logger from "./Logger";
 import CaptureSpan from "./Telemetry/CaptureSpan";
 
 export default class CronTab {
@@ -10,6 +11,7 @@ export default class CronTab {
       const nextExecutionTime: Date = interval.next().toDate();
       return nextExecutionTime;
     } catch (error) {
+      logger.error(error);
       throw new BadDataException(`Invalid cron expression: ${crontab}`);
     }
   }

package/Server/Utils/JsonWebToken.ts

@@ -10,6 +10,7 @@ import Timezone from "../../Types/Timezone";
 import StatusPagePrivateUser from "../../Models/DatabaseModels/StatusPagePrivateUser";
 import User from "../../Models/DatabaseModels/User";
 import jwt from "jsonwebtoken";
+import logger from "./Logger";
 import CaptureSpan from "./Telemetry/CaptureSpan";
 
 class JSONWebToken {
@@ -119,6 +120,7 @@ class JSONWebToken {
         isGlobalLogin: Boolean(decoded["isGlobalLogin"]),
       };
     } catch (e) {
+      logger.error(e);
       throw new BadDataException("AccessToken is invalid or expired");
     }
   }

package/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.ts

@@ -4,6 +4,7 @@ import {
   CriteriaFilter,
 } from "../../../../Types/Monitor/CriteriaFilter";
 import CustomCodeMonitorResponse from "../../../../Types/Monitor/CustomCodeMonitor/CustomCodeMonitorResponse";
+import logger from "../../Logger";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
 
 export default class CustomCodeMonitoringCriteria {
@@ -78,6 +79,7 @@ export default class CustomCodeMonitoringCriteria {
           thresholdAsNumber = parseFloat(threshold.toString());
         }
       } catch (err) {
+        logger.error(err);
         thresholdAsNumber = null;
       }
 

package/Server/Utils/Monitor/MonitorResource.ts

@@ -1244,6 +1244,7 @@ export default class MonitorResourceUtil {
               .responseBody as string) || "{}",
           );
         } catch (err) {
+          logger.error(err);
           responseBody = (input.dataToProcess as ProbeMonitorResponse)
             .responseBody as JSONObject;
         }

package/Server/Utils/VM/VMAPI.ts

@@ -8,6 +8,7 @@ import URL from "../../../Types/API/URL";
 import ReturnResult from "../../../Types/IsolatedVM/ReturnResult";
 import { JSONObject, JSONValue } from "../../../Types/JSON";
 import API from "../../../Utils/API";
+import logger from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
 
 export default class VMUtil {
@@ -57,6 +58,7 @@ export default class VMUtil {
         valueToReplaceInPlace = JSON.stringify(valueToReplaceInPlace);
         didStringify = true;
       } catch (err) {
+        logger.error(err);
         return valueToReplaceInPlace;
       }
     }
@@ -104,6 +106,7 @@ export default class VMUtil {
       try {
         valueToReplaceInPlace = JSON.parse(valueToReplaceInPlace);
       } catch (err) {
+        logger.error(err);
         return valueToReplaceInPlace;
       }
     }

package/Server/Utils/VM/VMRunner.ts

@@ -16,7 +16,7 @@ export default class VMRunner {
     options: {
       timeout?: number;
       args?: JSONObject | undefined;
-      context?: Dictionary<GenericObject> | undefined;
+      context?: Dictionary<GenericObject | string> | undefined;
     };
   }): Promise<ReturnResult> {
     const { code, options } = data;

package/Tests/Server/API/BaseAPI.test.ts

@@ -25,7 +25,6 @@ import { UserPermission } from "../../../Types/Permission";
 import PositiveNumber from "../../../Types/PositiveNumber";
 import UserType from "../../../Types/UserType";
 import getJestMockFunction, { MockFunction } from "../../MockType";
-import ConfigLogLevel from "../../../Server/Types/ConfigLogLevel";
 
 jest.mock("../../../Server/Utils/Express", () => {
   return {
@@ -105,8 +104,7 @@ jest.mock("../../../Server/Services/ProjectService", () => {
 jest.mock("../../../Server/EnvironmentConfig", () => {
   return {
     IsBillingEnabled: true,
-    LogLevel: ConfigLogLevel.INFO, // Or any other appropriate default for tests
-    ConfigLogLevel: ConfigLogLevel,
+    LogLevel: "INFO", // Use string literal instead of ConfigLogLevel.INFO
     DisableTelemetry: true,
   };
 });

package/Tests/Server/Middleware/ProjectAuthorization.test.ts

@@ -144,6 +144,7 @@ describe("ProjectMiddleware", () => {
 
     const mockedApiModel: ApiKey = {
       id: mockedObjectId,
+      projectId: mockedObjectId,
     } as ApiKey;
 
     beforeEach(
@@ -167,6 +168,9 @@ describe("ProjectMiddleware", () => {
     });
 
     test("should throw BadDataException when getProjectId returns null", async () => {
+      // Mock ApiKeyService.findOneBy to return null first
+      getJestSpyOn(ApiKeyService, "findOneBy").mockResolvedValue(null);
+      
       const spyFindOneBy: jest.SpyInstance = getJestSpyOn(
         GlobalConfigService,
         "findOneBy",
@@ -232,12 +236,12 @@ describe("ProjectMiddleware", () => {
 
       expect(spyFindOneBy).toHaveBeenCalledWith({
         query: {
-          projectId: mockedObjectId,
           apiKey: mockedObjectId,
           expiresAt: QueryHelper.greaterThan(OneUptimeDate.getCurrentDate()),
         },
         select: {
           _id: true,
+          projectId: true,
         },
         props: { isRoot: true },
       });

package/Tests/Server/Services/AnalyticsDatabaseService.test.ts

@@ -82,13 +82,13 @@ describe("AnalyticsDatabaseService", () => {
 
     test("should return count statement", () => {
       const statement: Statement = service.toCountStatement({
-        query: "<query>" as GenericObject,
-        props: "<props>" as GenericObject,
+        query: { field: "value" } as GenericObject,
+        props: { prop: "test" } as GenericObject,
       });
 
-      expect(service.statementGenerator.toWhereStatement).toBeCalledWith(
-        "<query>",
-      );
+      expect(service.statementGenerator.toWhereStatement).toBeCalledWith({
+        field: "value",
+      });
 
       expect(logger.debug).toHaveBeenCalledTimes(2);
       expect(logger.debug).toHaveBeenNthCalledWith(
@@ -111,8 +111,8 @@ describe("AnalyticsDatabaseService", () => {
 
     test("optionally adds LIMIT", () => {
       const statement: Statement = service.toCountStatement({
-        query: "<query>" as GenericObject,
-        props: "<props>" as GenericObject,
+        query: { field: "value" } as GenericObject,
+        props: { prop: "test" } as GenericObject,
         limit: 123,
       });
 
@@ -132,8 +132,8 @@ describe("AnalyticsDatabaseService", () => {
 
     test("optionally adds OFFSET", () => {
       const statement: Statement = service.toCountStatement({
-        query: "<query>" as GenericObject,
-        props: "<props>" as GenericObject,
+        query: { field: "value" } as GenericObject,
+        props: { prop: "test" } as GenericObject,
         skip: 123,
       });
 
@@ -177,23 +177,23 @@ describe("AnalyticsDatabaseService", () => {
 
     test("should return find statement", () => {
       const { statement, columns } = service.toFindStatement({
-        select: "<select>" as GenericObject,
-        query: "<query>" as GenericObject,
-        props: "<props>" as GenericObject,
-        sort: "<sort>" as GenericObject,
+        select: { columns: ["col1", "col2"] } as GenericObject,
+        query: { field: "value" } as GenericObject,
+        props: { prop: "test" } as GenericObject,
+        sort: { field: "asc" } as GenericObject,
         limit: 123,
         skip: 234,
       });
 
-      expect(service.statementGenerator.toSelectStatement).toBeCalledWith(
-        "<select>",
-      );
-      expect(service.statementGenerator.toWhereStatement).toBeCalledWith(
-        "<query>",
-      );
-      expect(service.statementGenerator.toSortStatement).toBeCalledWith(
-        "<sort>",
-      );
+      expect(service.statementGenerator.toSelectStatement).toBeCalledWith({
+        columns: ["col1", "col2"],
+      });
+      expect(service.statementGenerator.toWhereStatement).toBeCalledWith({
+        field: "value",
+      });
+      expect(service.statementGenerator.toSortStatement).toBeCalledWith({
+        field: "asc",
+      });
 
       expect(jest.mocked(logger.debug)).toHaveBeenCalledTimes(2);
       expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith(
@@ -213,46 +213,46 @@ describe("AnalyticsDatabaseService", () => {
       });
       expect(columns).toStrictEqual(["<column-1>", "<column-2>"]);
     });
+  });
 
-    describe("toDeleteStatement", () => {
-      beforeEach(() => {
-        service.statementGenerator.toWhereStatement = jest.fn(() => {
-          return SQL`<where-statement>`;
-        });
-        jest.spyOn(logger, "debug").mockImplementation(() => {
-          return undefined!;
-        });
+  describe("toDeleteStatement", () => {
+    beforeEach(() => {
+      service.statementGenerator.toWhereStatement = jest.fn(() => {
+        return SQL`<where-statement>`;
       });
-
-      afterEach(() => {
-        jest.restoreAllMocks();
+      jest.spyOn(logger, "debug").mockImplementation(() => {
+        return undefined!;
       });
+    });
 
-      test("should return delete statement", () => {
-        const statement: Statement = service.toDeleteStatement({
-          query: "<query>" as GenericObject,
-          props: "<props>" as GenericObject,
-        });
+    afterEach(() => {
+      jest.restoreAllMocks();
+    });
+
+    test("should return delete statement", () => {
+      const statement: Statement = service.toDeleteStatement({
+        query: { field: "value" } as GenericObject,
+        props: { prop: "test" } as GenericObject,
+      });
 
-        expect(service.statementGenerator.toWhereStatement).toBeCalledWith(
-          "<query>",
-        );
+      expect(service.statementGenerator.toWhereStatement).toBeCalledWith({
+        field: "value",
+      });
 
-        expect(logger.debug).toHaveBeenCalledTimes(2);
-        expect(logger.debug).toHaveBeenNthCalledWith(
-          1,
-          "<table-name> Delete Statement",
-        );
-        expect(logger.debug).toHaveBeenNthCalledWith(2, statement);
+      expect(logger.debug).toHaveBeenCalledTimes(2);
+      expect(logger.debug).toHaveBeenNthCalledWith(
+        1,
+        "<table-name> Delete Statement",
+      );
+      expect(logger.debug).toHaveBeenNthCalledWith(2, statement);
 
-        expect(statement.query).toBe(
-          "ALTER TABLE {p0:Identifier}.{p1:Identifier}\n" +
-            "DELETE WHERE TRUE <where-statement>",
-        );
-        expect(statement.query_params).toStrictEqual({
-          p0: "oneuptime",
-          p1: "<table-name>",
-        });
+      expect(statement.query).toBe(
+        "ALTER TABLE {p0:Identifier}.{p1:Identifier}\n" +
+          "DELETE WHERE TRUE <where-statement>",
+      );
+      expect(statement.query_params).toStrictEqual({
+        p0: "oneuptime",
+        p1: "<table-name>",
       });
     });
   });