@oneuptime/common 7.0.4372 → 7.0.4415

package/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts

@@ -140,13 +140,6 @@ export default class AnalyticsBaseModel extends CommonModel {
     this.crudApiPath = data.crudApiPath;
     this.enableRealtimeEventsOn = data.enableRealtimeEventsOn;
     this.partitionKey = data.partitionKey;
-
-    // initialize Arrays.
-    for (const column of this.tableColumns) {
-      if (column.type === TableColumnType.NestedModel) {
-        this.setColumnValue(column.key, []);
-      }
-    }
   }
 
   private _enableWorkflowOn: EnableWorkflowOn | undefined;

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 = [];
         }
       }
@@ -207,19 +207,6 @@ export default class CommonModel {
         return;
       }
 
-      if (recordValue instanceof Array) {
-        if (recordValue.length > 0 && column.nestedModelType) {
-          json[column.key] = CommonModel.toJSONArray(
-            recordValue as Array<CommonModel>,
-            column.nestedModelType,
-          );
-        } else {
-          json[column.key] = recordValue;
-        }
-
-        return;
-      }
-
       json[column.key] = recordValue;
     });
 

package/Models/DatabaseModels/Monitor.ts

@@ -531,7 +531,7 @@ export default class Monitor extends BaseModel {
     ],
   })
   @TableColumn({
-    type: TableColumnType.JSON,
+    type: TableColumnType.MonitorSteps,
     required: false,
     title: "Monitor Steps",
     description: "What would you like to monitor and what is the criteria?",

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/ProjectAuthorization.ts

@@ -67,7 +67,7 @@ export default class ProjectMiddleware {
     next: NextFunction,
   ): Promise<void> {
     try {
-      const tenantId: ObjectID | null = this.getProjectId(req);
+      let tenantId: ObjectID | null = this.getProjectId(req);
 
       const apiKey: ObjectID | null = this.getApiKey(req);
 
@@ -81,19 +81,27 @@ export default class ProjectMiddleware {
 
       let apiKeyModel: ApiKey | null = null;
 
-      if (tenantId) {
+      if (apiKey) {
         apiKeyModel = await ApiKeyService.findOneBy({
           query: {
-            projectId: tenantId,
             apiKey: apiKey,
             expiresAt: QueryHelper.greaterThan(OneUptimeDate.getCurrentDate()),
           },
           select: {
             _id: true,
+            projectId: true,
           },
           props: { isRoot: true },
         });
 
+        tenantId = apiKeyModel?.projectId || null;
+
+        if (!tenantId) {
+          throw new BadDataException(
+            "Project ID not found for the provided API Key.",
+          );
+        }
+
         if (apiKeyModel) {
           (req as OneUptimeRequest).userType = UserType.API;
           // TODO: Add API key permissions.

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

@@ -128,15 +128,19 @@ export default class OTelIngestService {
       Metric,
     ) as Metric;
 
-    newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
-    newDbMetric.startTime = OneUptimeDate.fromUnixNano(
-      datapoint["startTimeUnixNano"] as number,
-    );
-
-    newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
-    newDbMetric.time = OneUptimeDate.fromUnixNano(
-      datapoint["timeUnixNano"] as number,
-    );
+    if (datapoint["startTimeUnixNano"]) {
+      newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
+      newDbMetric.startTime = OneUptimeDate.fromUnixNano(
+        datapoint["startTimeUnixNano"] as number,
+      );
+    }
+
+    if (datapoint["timeUnixNano"]) {
+      newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
+      newDbMetric.time = OneUptimeDate.fromUnixNano(
+        datapoint["timeUnixNano"] as number,
+      );
+    }
 
     if (Object.keys(datapoint).includes("asInt")) {
       newDbMetric.value = datapoint["asInt"] 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/AnalyticsDatabase/Statement.ts

@@ -169,7 +169,6 @@ export class Statement implements BaseQueryParams {
       [TableColumnType.Decimal]: "Double",
       [TableColumnType.Date]: "DateTime",
       [TableColumnType.JSON]: "JSON",
-      [TableColumnType.NestedModel]: "Nested",
       [TableColumnType.ArrayNumber]: "Array(Int32)",
       [TableColumnType.ArrayText]: "Array(String)",
       [TableColumnType.LongNumber]: "Int128",

package/Server/Utils/AnalyticsDatabase/StatementGenerator.ts

@@ -53,12 +53,18 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
     const whereStatement: Statement = this.toWhereStatement(updateBy.query);
 
     /* eslint-disable prettier/prettier */
-        const statement: Statement = SQL`
-            ALTER TABLE ${this.database.getDatasourceOptions().database!}.${this.model.tableName
+    const statement: Statement = SQL`
+            ALTER TABLE ${this.database.getDatasourceOptions().database!}.${
+              this.model.tableName
             }
-            UPDATE `.append(setStatement).append(SQL`
-            WHERE TRUE `).append(whereStatement);
-        /* eslint-enable prettier/prettier */
+            UPDATE `
+      .append(setStatement)
+      .append(
+        SQL`
+            WHERE TRUE `
+      )
+      .append(whereStatement);
+    /* eslint-enable prettier/prettier */
 
     logger.debug(`${this.model.tableName} Update Statement`);
     logger.debug(statement);
@@ -71,27 +77,7 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
   ): Array<string> {
     const columnNames: Array<string> = [];
     for (const column of tableColumns) {
-      if (column.type === TableColumnType.NestedModel) {
-        // Example of nested model query:
-
-        /**
-                 * 
-                 * INSERT INTO opentelemetry_spans (trace_id, span_id, attributes.key, attributes.value) VALUES 
-                    ('trace1', 'span1', ['key1', 'key2'], ['value1', 'value2']),
-                    ('trace2', 'span2', ['keyA', 'keyB'], ['valueA', 'valueB']);
-                 */
-
-        // Nested Model Support.
-        const nestedModelColumnNames: Array<string> = this.getColumnNames(
-          column.nestedModel!.tableColumns,
-        );
-
-        for (const nestedModelColumnName of nestedModelColumnNames) {
-          columnNames.push(`${column.key}.${nestedModelColumnName}`);
-        }
-      } else {
-        columnNames.push(column.key);
-      }
+      columnNames.push(column.key);
     }
 
     return columnNames;
@@ -168,45 +154,12 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
     const record: Record = [];
 
     for (const column of item.getTableColumns()) {
-      if (column.type === TableColumnType.NestedModel) {
-        // Nested Model Support.
-
-        // THis is very werid, but the output should work in a query like this:
-
-        /**
-                 * 
-                 * INSERT INTO opentelemetry_spans (trace_id, span_id, attributes.key, attributes.value) VALUES 
-                    ('trace1', 'span1', ['key1', 'key2'], ['value1', 'value2']),
-                    ('trace2', 'span2', ['keyA', 'keyB'], ['valueA', 'valueB']);
-                 */
-
-        for (const subColumn of column.nestedModel!.tableColumns) {
-          const subRecord: Record = [];
-
-          for (const nestedModelItem of item.getColumnValue(
-            column.key,
-          ) as Array<CommonModel>) {
-            const value: RecordValue = this.sanitizeValue(
-              nestedModelItem.getColumnValue(subColumn.key),
-              subColumn,
-              {
-                isNestedModel: true,
-              },
-            );
-
-            subRecord.push(value);
-          }
-
-          record.push(subRecord);
-        }
-      } else {
-        const value: RecordValue | undefined = this.sanitizeValue(
-          item.getColumnValue(column.key),
-          column,
-        );
+      const value: RecordValue | undefined = this.sanitizeValue(
+        item.getColumnValue(column.key),
+        column,
+      );
 
-        record.push(value);
-      }
+      record.push(value);
     }
 
     return record;
@@ -625,16 +578,6 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
         columns.append(SQL`, `);
       }
 
-      let nestedModelColumns: Statement | null = null;
-
-      if (column.type === TableColumnType.NestedModel) {
-        nestedModelColumns = SQL`(`
-          .append(
-            this.toColumnsCreateStatement(column.nestedModel!.tableColumns),
-          )
-          .append(SQL`)`);
-      }
-
       // special case - ClickHouse does not support using an a query parameter
       // to specify the column name when creating the table
       const keyStatement: string = column.key;
@@ -649,10 +592,6 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
                 .append(this.toColumnType(column.type))
                 .append(SQL`)`),
         );
-
-      if (nestedModelColumns) {
-        columns.append(SQL` `).append(nestedModelColumns);
-      }
     }
 
     return columns;
@@ -672,26 +611,34 @@ export default class StatementGenerator<TBaseModel extends AnalyticsBaseModel> {
       "Array(String)": TableColumnType.ArrayText,
       "Array(Int32)": TableColumnType.ArrayNumber,
       JSON: TableColumnType.JSON, //JSONArray is also JSON
-      Nested: TableColumnType.NestedModel,
       Bool: TableColumnType.Boolean,
     }[clickhouseType];
   }
 
   public toColumnType(type: TableColumnType): Statement {
-    return {
+    const statement: Statement | undefined = {
       [TableColumnType.Text]: SQL`String`,
       [TableColumnType.ObjectID]: SQL`String`,
       [TableColumnType.Boolean]: SQL`Bool`,
       [TableColumnType.Number]: SQL`Int32`,
       [TableColumnType.Decimal]: SQL`Double`,
+      [TableColumnType.IP]: SQL`String`,
+      [TableColumnType.Port]: SQL`String`,
       [TableColumnType.Date]: SQL`DateTime`,
       [TableColumnType.JSON]: SQL`String`, // we use JSON as a string because ClickHouse has really good JSON support for string types
       [TableColumnType.JSONArray]: SQL`String`, // we use JSON as a string because ClickHouse has really good JSON support for string types
-      [TableColumnType.NestedModel]: SQL`Nested`,
       [TableColumnType.ArrayNumber]: SQL`Array(Int32)`,
       [TableColumnType.ArrayText]: SQL`Array(String)`,
       [TableColumnType.LongNumber]: SQL`Int128`,
     }[type];
+
+    if (!statement) {
+      throw new BadDataException(
+        `Unknown column type: ${type}. Please add support for this column type.`,
+      );
+    }
+
+    return statement;
   }
 
   public toDoesColumnExistStatement(columnName: string): string {

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;
         }