@oneuptime/common 10.0.17 → 10.0.18

package/Server/EnvironmentConfig.ts

@@ -175,41 +175,19 @@ export const AppApiHostname: Hostname = Hostname.fromString(
   }`,
 );
 
-export const ProbeIngestHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_PROBE_INGEST_HOSTNAME"] || "localhost"}:${
-    process.env["PROBE_INGEST_PORT"] || 80
-  }`,
-);
-
 export const OpenTelemetryIngestHostname: Hostname = Hostname.fromString(
   `${process.env["SERVER_TELEMETRY_HOSTNAME"] || "localhost"}:${
     process.env["TELEMETRY_PORT"] || 80
   }`,
 );
 
-export const IncomingRequestIngestHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_INCOMING_REQUEST_INGEST_HOSTNAME"] || "localhost"}:${
-    process.env["INCOMING_REQUEST_INGEST_PORT"] || 80
-  }`,
-);
-
-export const IsolatedVMHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_ISOLATED_VM_HOSTNAME"] || "localhost"}:${
-    process.env["ISOLATED_VM_PORT"] || 80
-  }`,
-);
-
 export const WorkerHostname: Hostname = Hostname.fromString(
   `${process.env["SERVER_WORKER_HOSTNAME"] || "localhost"}:${
     process.env["WORKER_PORT"] || 80
   }`,
 );
 
-export const WorkflowHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_WORKFLOW_HOSTNAME"] || "localhost"}:${
-    process.env["WORKFLOW_PORT"] || 80
-  }`,
-);
+export const WorkflowHostname: Hostname = WorkerHostname;
 
 export const HomeHostname: Hostname = Hostname.fromString(
   `${process.env["SERVER_HOME_HOSTNAME"] || "localhost"}:${
@@ -217,30 +195,6 @@ export const HomeHostname: Hostname = Hostname.fromString(
   }`,
 );
 
-export const AccountsHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_ACCOUNTS_HOSTNAME"] || "localhost"}:${
-    process.env["ACCOUNTS_PORT"] || 80
-  }`,
-);
-
-export const DashboardHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_DASHBOARD_HOSTNAME"] || "localhost"}:${
-    process.env["DASHBOARD_PORT"] || 80
-  }`,
-);
-
-export const AdminDashboardHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_ADMIN_DASHBOARD_HOSTNAME"] || "localhost"}:${
-    process.env["ADMIN_DASHBOARD_PORT"] || 80
-  }`,
-);
-
-export const DocsHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_DOCS_HOSTNAME"] || "localhost"}:${
-    process.env["DOCS_PORT"] || 80
-  }`,
-);
-
 export const Env: string = process.env["NODE_ENV"] || "production";
 
 // Redis does not require password.

package/Server/Infrastructure/Queue.ts

@@ -14,9 +14,6 @@ export enum QueueName {
   Workflow = "Workflow",
   Worker = "Worker",
   Telemetry = "Telemetry",
-  IncomingRequestIngest = "IncomingRequestIngest",
-  ServerMonitorIngest = "ServerMonitorIngest",
-  ProbeIngest = "ProbeIngest",
 }
 
 export type QueueJob = Job;

package/Server/Services/ScheduledMaintenanceService.ts

@@ -97,24 +97,8 @@ export class Service extends DatabaseService<Model> {
       let statusPageResources: Array<StatusPageResource> = [];
 
       if (event.monitors && event.monitors.length > 0) {
-        statusPageResources = await StatusPageResourceService.findBy({
-          query: {
-            monitorId: QueryHelper.any(
-              event.monitors
-                .filter((m: Monitor) => {
-                  return m._id;
-                })
-                .map((m: Monitor) => {
-                  return new ObjectID(m._id!);
-                }),
-            ),
-          },
-          props: {
-            isRoot: true,
-            ignoreHooks: true,
-          },
-          skip: 0,
-          limit: LIMIT_PER_PROJECT,
+        statusPageResources = await StatusPageResourceService.findByMonitors({
+          monitors: event.monitors,
           select: {
             _id: true,
             displayName: true,

package/Server/Services/StatusPageResourceService.ts

@@ -3,21 +3,118 @@ import DeleteBy from "../Types/Database/DeleteBy";
 import { OnCreate, OnDelete, OnUpdate } from "../Types/Database/Hooks";
 import Query from "../Types/Database/Query";
 import QueryHelper from "../Types/Database/QueryHelper";
+import Select from "../Types/Database/Select";
 import UpdateBy from "../Types/Database/UpdateBy";
 import DatabaseService from "./DatabaseService";
+import MonitorGroupResourceService from "./MonitorGroupResourceService";
 import SortOrder from "../../Types/BaseDatabase/SortOrder";
-import LIMIT_MAX from "../../Types/Database/LimitMax";
+import LIMIT_MAX, { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
 import PositiveNumber from "../../Types/PositiveNumber";
 import Model from "../../Models/DatabaseModels/StatusPageResource";
+import Monitor from "../../Models/DatabaseModels/Monitor";
+import MonitorGroupResource from "../../Models/DatabaseModels/MonitorGroupResource";
 
 export class Service extends DatabaseService<Model> {
   public constructor() {
     super(Model);
   }
 
+  @CaptureSpan()
+  public async findByMonitors(data: {
+    monitors?: Array<Monitor>;
+    monitorIds?: Array<ObjectID>;
+    select: Select<Model>;
+  }): Promise<Array<Model>> {
+    let resolvedMonitorIds: Array<ObjectID>;
+
+    if (data.monitorIds && data.monitorIds.length > 0) {
+      resolvedMonitorIds = data.monitorIds;
+    } else if (data.monitors && data.monitors.length > 0) {
+      resolvedMonitorIds = data.monitors
+        .filter((m: Monitor) => {
+          return m._id;
+        })
+        .map((m: Monitor) => {
+          return new ObjectID(m._id!);
+        });
+    } else {
+      return [];
+    }
+
+    if (resolvedMonitorIds.length === 0) {
+      return [];
+    }
+
+    // Find status page resources directly linked to monitors
+    const statusPageResources: Array<Model> = await this.findBy({
+      query: {
+        monitorId: QueryHelper.any(resolvedMonitorIds),
+      },
+      props: {
+        isRoot: true,
+        ignoreHooks: true,
+      },
+      skip: 0,
+      limit: LIMIT_PER_PROJECT,
+      select: data.select,
+    });
+
+    // Find monitor groups that contain the affected monitors
+    const monitorGroupResources: Array<MonitorGroupResource> =
+      await MonitorGroupResourceService.findBy({
+        query: {
+          monitorId: QueryHelper.any(resolvedMonitorIds),
+        },
+        props: {
+          isRoot: true,
+          ignoreHooks: true,
+        },
+        select: {
+          monitorGroupId: true,
+        },
+        skip: 0,
+        limit: LIMIT_PER_PROJECT,
+      });
+
+    const monitorGroupIds: Array<ObjectID> = monitorGroupResources
+      .map((r: MonitorGroupResource) => {
+        return r.monitorGroupId!;
+      })
+      .filter((id: ObjectID) => {
+        return Boolean(id);
+      });
+
+    if (monitorGroupIds.length > 0) {
+      const groupStatusPageResources: Array<Model> = await this.findBy({
+        query: {
+          monitorGroupId: QueryHelper.any(monitorGroupIds),
+        },
+        props: {
+          isRoot: true,
+          ignoreHooks: true,
+        },
+        skip: 0,
+        limit: LIMIT_PER_PROJECT,
+        select: data.select,
+      });
+
+      // Merge and deduplicate
+      for (const resource of groupStatusPageResources) {
+        const alreadyExists: boolean = statusPageResources.some((r: Model) => {
+          return r._id === resource._id;
+        });
+        if (!alreadyExists) {
+          statusPageResources.push(resource);
+        }
+      }
+    }
+
+    return statusPageResources;
+  }
+
   @CaptureSpan()
   protected override async onBeforeCreate(
     createBy: CreateBy<Model>,

package/Server/Types/Markdown.ts

@@ -124,6 +124,17 @@ export default class Markdown {
     return renderer;
   }
 
+  private static slugify(text: string): string {
+    return text
+      .toLowerCase()
+      .replace(/<[^>]*>/g, "")
+      .replace(/&[^;]+;/g, "")
+      .replace(/[^\w\s-]/g, "")
+      .replace(/\s+/g, "-")
+      .replace(/-+/g, "-")
+      .replace(/^-|-$/g, "");
+  }
+
   private static getDocsRenderer(): Renderer {
     if (this.docsRenderer !== null) {
       return this.docsRenderer;
@@ -136,6 +147,75 @@ export default class Markdown {
     };
 
     renderer.blockquote = function (quote) {
+      const calloutMatch: RegExpMatchArray | null = quote.match(
+        /<p[^>]*>\s*<strong>(Note|Warning|Tip|Danger|Info|Caution):?<\/strong>/i,
+      );
+
+      if (calloutMatch) {
+        const type: string = calloutMatch[1]!.toLowerCase();
+        const configMap: Record<
+          string,
+          { border: string; bg: string; icon: string; label: string }
+        > = {
+          note: {
+            border: "border-blue-400",
+            bg: "bg-blue-50",
+            icon: `<svg class="h-5 w-5 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>`,
+            label: "Note",
+          },
+          info: {
+            border: "border-blue-400",
+            bg: "bg-blue-50",
+            icon: `<svg class="h-5 w-5 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>`,
+            label: "Info",
+          },
+          tip: {
+            border: "border-green-400",
+            bg: "bg-green-50",
+            icon: `<svg class="h-5 w-5 text-green-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9.663 17h4.673M12 3v1m6.364 1.636l-.707.707M21 12h-1M4 12H3m3.343-5.657l-.707-.707m2.828 9.9a5 5 0 117.072 0l-.548.547A3.374 3.374 0 0014 18.469V19a2 2 0 11-4 0v-.531c0-.895-.356-1.754-.988-2.386l-.548-.547z"/></svg>`,
+            label: "Tip",
+          },
+          warning: {
+            border: "border-yellow-400",
+            bg: "bg-yellow-50",
+            icon: `<svg class="h-5 w-5 text-yellow-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"/></svg>`,
+            label: "Warning",
+          },
+          caution: {
+            border: "border-yellow-400",
+            bg: "bg-yellow-50",
+            icon: `<svg class="h-5 w-5 text-yellow-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z"/></svg>`,
+            label: "Caution",
+          },
+          danger: {
+            border: "border-red-400",
+            bg: "bg-red-50",
+            icon: `<svg class="h-5 w-5 text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"/></svg>`,
+            label: "Danger",
+          },
+        };
+
+        const config: {
+          border: string;
+          bg: string;
+          icon: string;
+          label: string;
+        } = configMap[type] || configMap["note"]!;
+
+        const content: string = quote.replace(
+          /<p[^>]*>\s*<strong>(Note|Warning|Tip|Danger|Info|Caution):?<\/strong>\s*/i,
+          '<p class="mt-2 mb-2 leading-8 text-gray-600">',
+        );
+
+        return `<div class="callout callout-${type} my-4 rounded-r-lg border-l-4 ${config.border} ${config.bg} p-4">
+          <div class="flex items-center gap-2 mb-1">
+            ${config.icon}
+            <span class="text-sm font-semibold text-gray-700">${config.label}</span>
+          </div>
+          <div class="leading-7 text-gray-600 text-sm">${content}</div>
+        </div>`;
+      }
+
       return `<blockquote class="p-4 pt-1 pb-1 my-4 border-s-4 border-indigo-500">
             <div class="leading-8 text-gray-600">${quote}</div>
         </blockquote>`;
@@ -147,25 +227,50 @@ export default class Markdown {
 
     renderer.code = function (code, language) {
       if (language === "mermaid") {
-        return `<div class="mermaid">${code}</div>`;
+        return `<div class="mermaid-wrapper overflow-x-auto my-6"><div class="mermaid">${code}</div></div>`;
       }
       const escaped: string = Markdown.escapeHtml(code);
       return `<pre><code class="language-${language}">${escaped}</code></pre>`;
     };
 
     renderer.heading = function (text, level) {
+      const slug: string = Markdown.slugify(text);
+      const anchor: string =
+        level === 2 || level === 3
+          ? `<a href="#${slug}" class="anchor-link" aria-hidden="true">#</a>`
+          : "";
+
       if (level === 1) {
-        return `<h1 class="my-5 mt-8 text-4xl font-bold tracking-tight text-gray-800">${text}</h1>`;
+        return `<h1 id="${slug}" class="my-5 mt-8 text-4xl font-bold tracking-tight text-gray-800">${text}</h1>`;
       } else if (level === 2) {
-        return `<h2 class="my-5  mt-8 text-3xl font-bold tracking-tight text-gray-800">${text}</h2>`;
+        return `<h2 id="${slug}" class="group my-5 mt-8 text-3xl font-bold tracking-tight text-gray-800">${text} ${anchor}</h2>`;
       } else if (level === 3) {
-        return `<h3 class="my-5  mt-8 text-2xl font-bold tracking-tight text-gray-800">${text}</h3>`;
+        return `<h3 id="${slug}" class="group my-5 mt-8 text-2xl font-bold tracking-tight text-gray-800">${text} ${anchor}</h3>`;
       } else if (level === 4) {
-        return `<h4 class="my-5  mt-8 text-xl font-bold tracking-tight text-gray-800">${text}</h4>`;
+        return `<h4 id="${slug}" class="my-5 mt-8 text-xl font-bold tracking-tight text-gray-800">${text}</h4>`;
       } else if (level === 5) {
-        return `<h5 class="my-5  mt-8 text-lg font-bold tracking-tight text-gray-800">${text}</h5>`;
+        return `<h5 id="${slug}" class="my-5 mt-8 text-lg font-bold tracking-tight text-gray-800">${text}</h5>`;
       }
-      return `<h6 class="my-5 tracking-tight font-bold text-gray-800">${text}</h6>`;
+      return `<h6 id="${slug}" class="my-5 tracking-tight font-bold text-gray-800">${text}</h6>`;
+    };
+
+    renderer.table = function (header, body) {
+      return `<div class="docs-table-wrapper overflow-x-auto my-6 rounded-lg border border-slate-200">
+        <table class="min-w-full text-sm text-left">${header}${body}</table>
+      </div>`;
+    };
+
+    renderer.tablerow = function (content) {
+      return `<tr class="border-b border-slate-200 last:border-b-0 hover:bg-slate-50/50 transition-colors">${content}</tr>`;
+    };
+
+    renderer.tablecell = function (content, flags) {
+      const tag: string = flags.header ? "th" : "td";
+      const align: string = flags.align ? ` text-${flags.align}` : "";
+      const headerClass: string = flags.header
+        ? " font-semibold text-slate-900 bg-slate-50"
+        : " text-slate-600";
+      return `<${tag} class="px-4 py-2.5${align}${headerClass}">${content}</${tag}>`;
     };
 
     // Inline code

package/Server/Utils/VM/VMAPI.ts

@@ -1,15 +1,8 @@
-import { IsolatedVMHostname } from "../../../Server/EnvironmentConfig";
-import ClusterKeyAuthorization from "../../Middleware/ClusterKeyAuthorization";
-import HTTPErrorResponse from "../../../Types/API/HTTPErrorResponse";
-import HTTPResponse from "../../../Types/API/HTTPResponse";
-import Protocol from "../../../Types/API/Protocol";
-import Route from "../../../Types/API/Route";
-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";
+import VMRunner from "./VMRunner";
 
 export default class VMUtil {
   @CaptureSpan()
@@ -17,32 +10,10 @@ export default class VMUtil {
     code: string;
     options: {
       args?: JSONObject | undefined;
-      timeout?: number | undefined;
+      timeout?: number;
     };
   }): Promise<ReturnResult> {
-    const returnResultHttpResponse:
-      | HTTPErrorResponse
-      | HTTPResponse<JSONObject> = await API.post<JSONObject>({
-      url: new URL(
-        Protocol.HTTP,
-        IsolatedVMHostname,
-        new Route("/isolated-vm/run-code"),
-      ),
-      data: {
-        ...data,
-      },
-      headers: {
-        ...ClusterKeyAuthorization.getClusterKeyHeaders(),
-      },
-    });
-
-    if (returnResultHttpResponse instanceof HTTPErrorResponse) {
-      throw returnResultHttpResponse;
-    }
-
-    const returnResult: ReturnResult = returnResultHttpResponse.data as any;
-
-    return returnResult;
+    return VMRunner.runCodeInSandbox(data);
   }
 
   @CaptureSpan()