@oneuptime/common 14.0.6 → 14.0.8

package/build/dist/Server/Utils/StatusPage/SubscriberTemplateIncidentRecordAccess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubscriberTemplateIncidentRecordAccess.js","sourceRoot":"","sources":["../../../../../Server/Utils/StatusPage/SubscriberTemplateIncidentRecordAccess.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/StatusPageResource.js

@@ -1,3 +1,4 @@
+import SafeHtml from "../../Types/SafeHtml";
 // Groups go on their own line in HTML emails.
 export const HTML_RESOURCE_GROUP_SEPARATOR = "<br/>";
 /*
@@ -6,6 +7,9 @@ export const HTML_RESOURCE_GROUP_SEPARATOR = "<br/>";
  * already comma-separated, which is why groups are split with a semicolon.
  */
 export const PLAIN_TEXT_RESOURCE_GROUP_SEPARATOR = "; ";
+const asWritten = (name) => {
+    return name;
+};
 export default class StatusPageResourceUtil {
     /**
      * Formats an array of StatusPageResource items into an HTML string grouped by their resource group.
@@ -14,15 +18,30 @@ export default class StatusPageResourceUtil {
      * If resources are grouped, returns one group per line, like:
      * "EU: Infrastructure, Website<br/>UK: Infrastructure, API"
      *
+     * The result is HTML: every resource name, group name and the default
+     * value is HTML-escaped before it is joined, and the only markup is the
+     * "<br/>" between groups. A project member names resources and groups, and
+     * the default subscriber emails put this list into their raw-HTML slot, so
+     * a name such as `<a href="https://evil.example">Checkout</a>` would
+     * otherwise arrive as a live link. That is also what makes it safe to hand
+     * a custom email template as SafeHtml.
+     *
      * Use this only where the value is rendered as HTML (email bodies). Use
-     * getResourcesGroupedByGroupNameAsPlainText everywhere else.
+     * getResourcesGroupedByGroupNameAsPlainText everywhere else: it is not
+     * escaped, because SMS, Slack, Teams, subjects and webhooks show text as
+     * written.
      *
      * @param resources - Array of StatusPageResource items with displayName, statusPageGroupId, and optionally statusPageGroup.name
      * @param defaultValue - Value to return if no resources (defaults to "")
      * @returns Formatted string of resources grouped by their resource group
      */
     static getResourcesGroupedByGroupName(resources, defaultValue = "") {
-        return StatusPageResourceUtil.formatResourcesGroupedByGroupName(resources, defaultValue, HTML_RESOURCE_GROUP_SEPARATOR);
+        return StatusPageResourceUtil.formatResourcesGroupedByGroupName({
+            resources: resources,
+            defaultValue: defaultValue,
+            groupSeparator: HTML_RESOURCE_GROUP_SEPARATOR,
+            formatName: SafeHtml.escape,
+        });
     }
     /**
      * The plain-text form of getResourcesGroupedByGroupName, for channels that
@@ -34,10 +53,22 @@ export default class StatusPageResourceUtil {
      * @returns Formatted string of resources grouped by their resource group
      */
     static getResourcesGroupedByGroupNameAsPlainText(resources, defaultValue = "") {
-        return StatusPageResourceUtil.formatResourcesGroupedByGroupName(resources, defaultValue, PLAIN_TEXT_RESOURCE_GROUP_SEPARATOR);
+        return StatusPageResourceUtil.formatResourcesGroupedByGroupName({
+            resources: resources,
+            defaultValue: defaultValue,
+            groupSeparator: PLAIN_TEXT_RESOURCE_GROUP_SEPARATOR,
+            formatName: asWritten,
+        });
     }
-    static formatResourcesGroupedByGroupName(resources, defaultValue, groupSeparator) {
+    /*
+     * Groups are keyed by the name as written, so two groups are merged only
+     * when their names really are the same; formatName (the HTML escaping, for
+     * the HTML form) is applied to each piece of text as it is written out.
+     */
+    static formatResourcesGroupedByGroupName(data) {
         var _a;
+        const { resources, groupSeparator, formatName } = data;
+        const defaultValue = formatName(data.defaultValue);
         if (!resources || resources.length === 0) {
             return defaultValue;
         }
@@ -52,8 +83,9 @@ export default class StatusPageResourceUtil {
                 return r.displayName;
             })
                 .filter((name) => {
-                return name;
+                return Boolean(name);
             })
+                .map(formatName)
                 .join(", ") || "");
         }
         // Group resources by their group name
@@ -80,12 +112,12 @@ export default class StatusPageResourceUtil {
         // Add grouped resources
         for (const groupName in resourcesByGroup) {
             const groupResources = resourcesByGroup[groupName];
-            formattedGroups.push(`${groupName}: ${groupResources.join(", ")}`);
+            formattedGroups.push(`${formatName(groupName)}: ${groupResources.map(formatName).join(", ")}`);
         }
         // Add ungrouped resources on separate lines (without "Other" label)
         if (ungroupedResources.length > 0) {
             for (const resourceName of ungroupedResources) {
-                formattedGroups.push(resourceName);
+                formattedGroups.push(formatName(resourceName));
             }
         }
         return formattedGroups.join(groupSeparator) || defaultValue;

package/build/dist/Server/Utils/StatusPageResource.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatusPageResource.js","sourceRoot":"","sources":["../../../../Server/Utils/StatusPageResource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StatusPageResource.js","sourceRoot":"","sources":["../../../../Server/Utils/StatusPageResource.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Topology/TopologyConcurrencyLimiter.js

@@ -0,0 +1,178 @@
+import TooManyRequestsException from "../../../Types/Exception/TooManyRequestsException";
+/*
+ * Bounds the Topology API's database work in one API process.
+ *
+ * Every Topology request reads in its own snapshot on one pooled connection
+ * (TopologyQueries.inReadOnlySnapshot), and a map build is among the heaviest
+ * reads in the app — a whole-inventory pass that can take seconds on a large
+ * project. The response cache shares a build between viewers of the same
+ * (project, minute), but callers choose the minute and the drawer and
+ * collection reads are not cached at all, so nothing else stops a burst of
+ * them from taking the connection pool (shared with ingest, alerting and
+ * every other request on the process) and the database CPU with it.
+ *
+ * So at most `maxRunning` of them run at once per process, and at most
+ * `maxRunningPerProject` for any one project, so one busy project cannot
+ * occupy every slot. The rest wait in arrival order WITHOUT holding a
+ * connection: a released slot goes to the first waiter whose project is
+ * under its own limit, so a project at its limit never holds up another
+ * project queued behind it. The queue is bounded too — per process and per
+ * project — and a request that finds it full, or waits longer than
+ * `maxWaitMs`, is answered 429 (TooManyRequestsException) at once: the
+ * Dashboard shows "busy, try again" rather than a request that hangs.
+ *
+ * A request whose client has gone (the drawer aborts the previous entity's
+ * load on every click) gives up its queue place at once and never starts:
+ * otherwise one person clicking through the drawer would queue dead reads
+ * ahead of the one they are waiting for and fill their project's queue.
+ *
+ * Per process, like the response cache; there is no cross-process
+ * coordination, so the cluster-wide bound is this times the API replicas.
+ */
+export const TOPOLOGY_BUSY_MESSAGE = "The topology service is busy. Try again in a moment.";
+/* Sent as Retry-After with a 429 from the Topology API. */
+export const TOPOLOGY_BUSY_RETRY_AFTER_SECONDS = 5;
+export const TOPOLOGY_CONCURRENCY_LIMITS = {
+    maxRunning: 4,
+    maxRunningPerProject: 2,
+    maxWaiting: 64,
+    maxWaitingPerProject: 16,
+    maxWaitMs: 30000,
+};
+/* The caller went away before its read started; nobody is waiting for it. */
+export class TopologyRequestAbandonedError extends Error {
+    constructor() {
+        super("The Topology request was abandoned by its client.");
+        this.name = "TopologyRequestAbandonedError";
+    }
+}
+export class TopologyConcurrencyLimiter {
+    constructor(limits = TOPOLOGY_CONCURRENCY_LIMITS) {
+        this.limits = limits;
+        this.running = 0;
+        this.runningByProject = new Map();
+        /*
+         * Arrival order. Invariant between calls: no waiter here could start (the
+         * process is full, or its project is), so a new request that can start
+         * never overtakes one that could have.
+         */
+        this.waiting = [];
+    }
+    /*
+     * Runs `work` once a slot for `projectId` is free, and frees it when the
+     * work settles, however it settles. Throws TooManyRequestsException
+     * without running `work` when the queue is full or the wait too long, and
+     * TopologyRequestAbandonedError without running it when `signal` fires
+     * first (a read that has started runs to completion).
+     */
+    async run(projectId, work, signal) {
+        await this.acquire(projectId, signal);
+        try {
+            if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+                throw new TopologyRequestAbandonedError();
+            }
+            return await work();
+        }
+        finally {
+            this.release(projectId);
+        }
+    }
+    runningCount(projectId) {
+        if (projectId === undefined) {
+            return this.running;
+        }
+        return this.runningByProject.get(projectId) || 0;
+    }
+    waitingCount(projectId) {
+        if (projectId === undefined) {
+            return this.waiting.length;
+        }
+        return this.waiting.filter((waiter) => {
+            return waiter.projectId === projectId;
+        }).length;
+    }
+    canStart(projectId) {
+        return (this.running < this.limits.maxRunning &&
+            this.runningCount(projectId) < this.limits.maxRunningPerProject);
+    }
+    take(projectId) {
+        this.running++;
+        this.runningByProject.set(projectId, this.runningCount(projectId) + 1);
+    }
+    acquire(projectId, signal) {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted) {
+            return Promise.reject(new TopologyRequestAbandonedError());
+        }
+        if (this.canStart(projectId)) {
+            this.take(projectId);
+            return Promise.resolve();
+        }
+        if (this.waiting.length >= this.limits.maxWaiting ||
+            this.waitingCount(projectId) >= this.limits.maxWaitingPerProject) {
+            return Promise.reject(new TooManyRequestsException(TOPOLOGY_BUSY_MESSAGE));
+        }
+        return new Promise((resolve, reject) => {
+            /* Leaves the queue (if still in it) and rejects with `error`. */
+            const leave = (error) => {
+                const index = this.waiting.indexOf(waiter);
+                if (index >= 0) {
+                    this.waiting.splice(index, 1);
+                    waiter.detach();
+                    reject(error);
+                }
+            };
+            const onAbort = () => {
+                leave(new TopologyRequestAbandonedError());
+            };
+            const waiter = {
+                projectId,
+                start: resolve,
+                timer: null,
+                detach: () => {
+                    if (waiter.timer) {
+                        clearTimeout(waiter.timer);
+                    }
+                    signal === null || signal === void 0 ? void 0 : signal.removeEventListener("abort", onAbort);
+                },
+            };
+            if (Number.isFinite(this.limits.maxWaitMs)) {
+                waiter.timer = setTimeout(() => {
+                    leave(new TooManyRequestsException(TOPOLOGY_BUSY_MESSAGE));
+                }, this.limits.maxWaitMs);
+            }
+            signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", onAbort);
+            this.waiting.push(waiter);
+        });
+    }
+    release(projectId) {
+        this.running--;
+        const remaining = this.runningCount(projectId) - 1;
+        if (remaining > 0) {
+            this.runningByProject.set(projectId, remaining);
+        }
+        else {
+            this.runningByProject.delete(projectId);
+        }
+        this.startWaiters();
+    }
+    /* Hands free slots to waiters in arrival order, skipping full projects. */
+    startWaiters() {
+        if (this.waiting.length === 0) {
+            return;
+        }
+        const stillWaiting = [];
+        for (const waiter of this.waiting) {
+            if (this.canStart(waiter.projectId)) {
+                this.take(waiter.projectId);
+                waiter.detach();
+                waiter.start();
+            }
+            else {
+                stillWaiting.push(waiter);
+            }
+        }
+        this.waiting = stillWaiting;
+    }
+}
+export default new TopologyConcurrencyLimiter();
+//# sourceMappingURL=TopologyConcurrencyLimiter.js.map

package/build/dist/Server/Utils/Topology/TopologyConcurrencyLimiter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TopologyConcurrencyLimiter.js","sourceRoot":"","sources":["../../../../../Server/Utils/Topology/TopologyConcurrencyLimiter.ts"],"names":[],"mappings":"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"}