@oneuptime/common 11.7.0 → 11.7.2

package/build/dist/Server/Services/ProbeService.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import crypto from "crypto";
 import DatabaseService from "./DatabaseService";
 import ObjectID from "../../Types/ObjectID";
 import Version from "../../Types/Version";
@@ -30,16 +31,197 @@ import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import GlobalCache from "../Infrastructure/GlobalCache";
 import { createWhatsAppMessageFromTemplate } from "../Utils/WhatsAppTemplateUtil";
+/*
+ * Cache namespace for the probe heartbeat throttle: holds the wall-clock of
+ * the last attempted lastAlive write per probe, so at most one Postgres
+ * write happens per probe per 30 seconds no matter how many requests the
+ * probe sends.
+ */
+const PROBE_LAST_ALIVE_CACHE_NAMESPACE = "probe-last-alive";
+/*
+ * Cache namespace for probe authentication: probeId → SHA-256 of the
+ * probe's CURRENT key, written only after the key was verified against the
+ * database. Lets the probe-auth middleware skip its per-request Probe
+ * SELECT — the exact query that queues behind a starved connection pool and
+ * stalls heartbeats. Entries are deleted whenever a probe's key changes or
+ * the probe is deleted (see onUpdateSuccess / onDeleteSuccess below), and
+ * the TTL bounds the exposure if that invalidation is ever missed.
+ */
+const PROBE_AUTH_KEY_HASH_CACHE_NAMESPACE = "probe-auth-key-hash";
+const PROBE_AUTH_KEY_HASH_CACHE_TTL_IN_SECONDS = 120;
+/*
+ * Revocation sentinel. Invalidation WRITES this value (with the normal TTL)
+ * instead of deleting the key: a bare DELETE can be silently undone by an
+ * in-flight verification that DB-checked the OLD key just before a rotation
+ * committed and then re-cached it just after the delete ran. The sentinel —
+ * combined with verifyProbeKey's write-only-if-unchanged re-read below —
+ * makes the straggler skip its write, so invalidation wins the race. It can
+ * never equal a real SHA-256 hex digest, so on the auth path it always
+ * behaves as a cache miss.
+ */
+const PROBE_AUTH_KEY_REVOKED_SENTINEL = "revoked";
+/*
+ * Upper bound for a single Redis cache operation on the probe request path.
+ * The ioredis client has no command timeout, so a stalled-but-open Redis
+ * socket would otherwise hang the probe-auth middleware forever with no
+ * error at all. Cache is an optimization here — on timeout we fall back to
+ * the database, exactly as we do when Redis rejects.
+ */
+const PROBE_CACHE_OPERATION_TIMEOUT_IN_MS = 2000;
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
     }
+    /*
+     * Bounds a cache operation in time. Promise.race subscribes to both
+     * promises, so a late settlement of the losing cache operation is
+     * observed and can never surface as an unhandled rejection.
+     */
+    async boundedCacheOperation(operationName, operation) {
+        let timer = undefined;
+        const timeout = new Promise((_resolve, reject) => {
+            timer = setTimeout(() => {
+                reject(new Error(`${operationName} timed out after ${PROBE_CACHE_OPERATION_TIMEOUT_IN_MS}ms`));
+            }, PROBE_CACHE_OPERATION_TIMEOUT_IN_MS);
+        });
+        try {
+            return await Promise.race([operation, timeout]);
+        }
+        finally {
+            if (timer) {
+                clearTimeout(timer);
+            }
+        }
+    }
+    hashProbeKey(probeKey) {
+        return crypto.createHash("sha256").update(probeKey).digest("hex");
+    }
+    /*
+     * Verifies a probeId/probeKey pair, serving repeat verifications from
+     * cache. This runs on EVERY authenticated probe request (heartbeats,
+     * monitor list fetches, result ingest), so it must stay responsive even
+     * when the Postgres pool is saturated — which is exactly when the
+     * heartbeat matters most: if this check queues behind a starved pool, the
+     * probe's lastAlive goes stale and a healthy probe gets flagged
+     * Disconnected.
+     *
+     * Security invariants:
+     * - The cache stores only a SHA-256 hash of the key, never the key.
+     * - A cache entry is only ever written from a value that was JUST
+     *   verified against the database.
+     * - A cache mismatch falls through to the database, so a rotated key
+     *   works immediately.
+     * - Rotating or deleting a probe overwrites its cache entry cluster-wide
+     *   with the revocation sentinel (GlobalCache is Redis-backed), and the
+     *   write below is write-only-if-unchanged so an in-flight verification
+     *   straddling the rotation cannot resurrect the old hash. The TTL caps
+     *   the stale window if the invalidation write itself fails: a REVOKED
+     *   key can then still authenticate for at most
+     *   PROBE_AUTH_KEY_HASH_CACHE_TTL_IN_SECONDS.
+     * - Any cache failure (Redis down, slow, timeout) falls back to the
+     *   database check — never open.
+     */
+    async verifyProbeKey(data) {
+        var _a, _b, _c, _d;
+        if (!data.probeId) {
+            throw new BadDataException("probeId is required");
+        }
+        if (!data.probeKey) {
+            throw new BadDataException("probeKey is required");
+        }
+        const presentedKeyHash = this.hashProbeKey(data.probeKey);
+        try {
+            const cachedKeyHash = await this.boundedCacheOperation("Probe auth cache read", GlobalCache.getString(PROBE_AUTH_KEY_HASH_CACHE_NAMESPACE, data.probeId.toString()));
+            if (cachedKeyHash && cachedKeyHash === presentedKeyHash) {
+                return true;
+            }
+        }
+        catch (err) {
+            logger.error("Error in reading probe auth cache", {
+                probeId: (_a = data.probeId) === null || _a === void 0 ? void 0 : _a.toString(),
+            });
+            logger.error(err, {
+                probeId: (_b = data.probeId) === null || _b === void 0 ? void 0 : _b.toString(),
+            });
+        }
+        // Cache miss, mismatch (e.g. key rotated), or cache failure: ask the DB.
+        const probe = await this.findOneBy({
+            query: {
+                _id: data.probeId.toString(),
+                key: data.probeKey,
+            },
+            select: {
+                _id: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!probe) {
+            return false;
+        }
+        try {
+            /*
+             * Write-only-if-unchanged: re-read the entry right before writing and
+             * skip the write when someone else changed it since our first read.
+             * The DB verification above can straddle a key rotation — its SELECT
+             * resolves against the pre-rotation row, the rotation commits and
+             * invalidates, and an unconditional write here would then re-cache
+             * the just-revoked key for a fresh TTL. Seeing the revocation
+             * sentinel (or any other concurrent write) means skip: the DB check
+             * stays the source of truth and caching resumes once the entry
+             * expires. The remaining race window is the microseconds between
+             * this re-read and the write — down from the full DB round-trip.
+             */
+            const currentCacheValue = await this.boundedCacheOperation("Probe auth cache pre-write read", GlobalCache.getString(PROBE_AUTH_KEY_HASH_CACHE_NAMESPACE, data.probeId.toString()));
+            if (currentCacheValue === null ||
+                currentCacheValue === presentedKeyHash) {
+                await this.boundedCacheOperation("Probe auth cache write", GlobalCache.setString(PROBE_AUTH_KEY_HASH_CACHE_NAMESPACE, data.probeId.toString(), presentedKeyHash, {
+                    expiresInSeconds: PROBE_AUTH_KEY_HASH_CACHE_TTL_IN_SECONDS,
+                }));
+            }
+        }
+        catch (err) {
+            // Next request re-verifies against the DB. Nothing is broken.
+            logger.error("Error in writing probe auth cache", {
+                probeId: (_c = data.probeId) === null || _c === void 0 ? void 0 : _c.toString(),
+            });
+            logger.error(err, {
+                probeId: (_d = data.probeId) === null || _d === void 0 ? void 0 : _d.toString(),
+            });
+        }
+        return true;
+    }
+    /*
+     * Replaces cached auth entries with the revocation sentinel so a rotated
+     * key stops working everywhere immediately (the cache is Redis-backed and
+     * shared by all pods). A sentinel WRITE rather than a delete: a deleted
+     * key can be silently re-created by an in-flight verification that
+     * DB-checked the old key just before the rotation committed, whereas the
+     * sentinel makes that straggler's write-only-if-unchanged check fail.
+     * Errors are logged loudly but not thrown: the entries also expire via
+     * TTL, and failing the surrounding update/delete over a cache hiccup
+     * would be worse than a bounded stale window.
+     */
+    async invalidateProbeAuthCache(probeIds) {
+        for (const probeId of probeIds) {
+            try {
+                await this.boundedCacheOperation("Probe auth cache invalidation", GlobalCache.setString(PROBE_AUTH_KEY_HASH_CACHE_NAMESPACE, probeId.toString(), PROBE_AUTH_KEY_REVOKED_SENTINEL, {
+                    expiresInSeconds: PROBE_AUTH_KEY_HASH_CACHE_TTL_IN_SECONDS,
+                }));
+            }
+            catch (err) {
+                logger.error(`CRITICAL: failed to invalidate probe auth cache for probe ${probeId.toString()} — a rotated/revoked probe key may keep authenticating for up to ${PROBE_AUTH_KEY_HASH_CACHE_TTL_IN_SECONDS}s`, { probeId: probeId === null || probeId === void 0 ? void 0 : probeId.toString() });
+                logger.error(err, { probeId: probeId === null || probeId === void 0 ? void 0 : probeId.toString() });
+            }
+        }
+    }
     async saveLastAliveInCache(probeId, lastAlive) {
         if (!probeId) {
             throw new BadDataException("probeId is required");
         }
         try {
-            await GlobalCache.setString("probe-last-alive", probeId.toString(), OneUptimeDate.toString(lastAlive));
+            await this.boundedCacheOperation("Probe last-alive cache write", GlobalCache.setString(PROBE_LAST_ALIVE_CACHE_NAMESPACE, probeId.toString(), OneUptimeDate.toString(lastAlive)));
         }
         catch (err) {
             logger.error("Error in saving last alive in cache", {
@@ -52,7 +234,7 @@ export class Service extends DatabaseService {
         const now = OneUptimeDate.getCurrentDate();
         try {
             // before we hit the database, we need to check if the lastAlive was updated in Global Cache.
-            const previousLastAliveCheck = await GlobalCache.getString("probe-last-alive", probeId.toString());
+            const previousLastAliveCheck = await this.boundedCacheOperation("Probe last-alive cache read", GlobalCache.getString(PROBE_LAST_ALIVE_CACHE_NAMESPACE, probeId.toString()));
             if (!previousLastAliveCheck) {
                 await this.saveLastAliveInCache(probeId, now);
                 return true;
@@ -94,12 +276,39 @@ export class Service extends DatabaseService {
          * hooks (onBeforeUpdate/onUpdateSuccess) are inert here. See
          * ServiceService.updateLastSeen.
          */
-        await this.updateColumnsByIdWithoutHooks({
-            id: probeId,
-            data: {
-                lastAlive: now,
-            },
-        });
+        try {
+            await this.updateColumnsByIdWithoutHooks({
+                id: probeId,
+                data: {
+                    lastAlive: now,
+                },
+            });
+        }
+        catch (err) {
+            /*
+             * The 30s throttle stamp was written BEFORE this write was attempted
+             * (shouldSaveLastAlive sets it — deliberately, as dogpile
+             * protection). If we leave it in place after a FAILED write, every
+             * request for the next 30 seconds silently skips the retry, lastAlive
+             * quietly crosses the connection-status worker's staleness threshold,
+             * and a healthy probe gets flagged Disconnected. Clear the stamp so
+             * the very next request retries the write.
+             */
+            await this.clearLastAliveThrottle(probeId);
+            throw err;
+        }
+    }
+    // Best-effort: on failure the throttle simply expires on its own.
+    async clearLastAliveThrottle(probeId) {
+        try {
+            await this.boundedCacheOperation("Probe last-alive throttle clear", GlobalCache.deleteKey(PROBE_LAST_ALIVE_CACHE_NAMESPACE, probeId.toString()));
+        }
+        catch (err) {
+            logger.error("Error in clearing last alive throttle", {
+                probeId: probeId === null || probeId === void 0 ? void 0 : probeId.toString(),
+            });
+            logger.error(err, { probeId: probeId === null || probeId === void 0 ? void 0 : probeId.toString() });
+        }
     }
     async onBeforeCreate(createBy) {
         if (!createBy.data.key) {
@@ -192,7 +401,16 @@ export class Service extends DatabaseService {
         }
         return { updateBy: updateBy, carryForward };
     }
-    async onUpdateSuccess(onUpdate, _updatedItemIds) {
+    async onUpdateSuccess(onUpdate, updatedItemIds) {
+        /*
+         * Key rotation: the auth middleware trusts a cached hash of the key, so
+         * the moment the key column changes the cached entries for the updated
+         * probes must go — otherwise the OLD key keeps authenticating until the
+         * cache TTL runs out.
+         */
+        if (onUpdate.updateBy.data.key !== undefined) {
+            await this.invalidateProbeAuthCache(updatedItemIds);
+        }
         if (onUpdate.carryForward &&
             onUpdate.carryForward.probesToNotifyOwners.length > 0) {
             for (const probe of onUpdate.carryForward.probesToNotifyOwners) {
@@ -204,6 +422,11 @@ export class Service extends DatabaseService {
         }
         return Promise.resolve(onUpdate);
     }
+    async onDeleteSuccess(onDelete, itemIdsBeforeDelete) {
+        // A deleted probe's key must stop authenticating.
+        await this.invalidateProbeAuthCache(itemIdsBeforeDelete);
+        return Promise.resolve(onDelete);
+    }
     async notifyOwnersOnStatusChange(data) {
         var _a, _b, _c, _d;
         const probe = await this.findOneById({
@@ -345,6 +568,12 @@ __decorate([
     __metadata("design:paramtypes", [Object, Array]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "onUpdateSuccess", null);
+__decorate([
+    CaptureSpan(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, Array]),
+    __metadata("design:returntype", Promise)
+], Service.prototype, "onDeleteSuccess", null);
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),

package/build/dist/Server/Services/ProbeService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProbeService.js","sourceRoot":"","sources":["../../../../Server/Services/ProbeService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProbeService.js","sourceRoot":"","sources":["../../../../Server/Services/ProbeService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAI5B,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,KAAK,EAAE,EACZ,qBAAqB,GACtB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,SAAS,EAAE,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAE7E,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAC5D,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,4BAA4B,MAAM,8DAA8D,CAAC;AACxG,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AAIxD,OAAO,iBAAiB,MAAM,qCAAqC,CAAC;AACpE,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,GAAG,MAAM,qBAAqB,CAAC;AAEtC,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,OAAO,oBAAoB,MAAM,+BAA+B,CAAC;AACjE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,iCAAiC,EAAE,MAAM,+BAA+B,CAAC;AAGlF;;;;;GAKG;AACH,MAAM,gCAAgC,GAAW,kBAAkB,CAAC;AAEpE;;;;;;;;GAQG;AACH,MAAM,mCAAmC,GAAW,qBAAqB,CAAC;AAC1E,MAAM,wCAAwC,GAAW,GAAG,CAAC;AAE7D;;;;;;;;;GASG;AACH,MAAM,+BAA+B,GAAW,SAAS,CAAC;AAE1D;;;;;;GAMG;AACH,MAAM,mCAAmC,GAAW,IAAI,CAAC;AAEzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,qBAAqB,CACjC,aAAqB,EACrB,SAAqB;QAErB,IAAI,KAAK,GAA8C,SAAS,CAAC;QAEjE,MAAM,OAAO,GAAmB,IAAI,OAAO,CACzC,CAAC,QAAgC,EAAE,MAA4B,EAAE,EAAE;YACjE,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACtB,MAAM,CACJ,IAAI,KAAK,CACP,GAAG,aAAa,oBAAoB,mCAAmC,IAAI,CAC5E,CACF,CAAC;YACJ,CAAC,EAAE,mCAAmC,CAAC,CAAC;QAC1C,CAAC,CACF,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC;QAClD,CAAC;gBAAS,CAAC;YACT,IAAI,KAAK,EAAE,CAAC;gBACV,YAAY,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAEM,YAAY,CAAC,QAAgB;QAClC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACI,KAAK,CAAC,cAAc,CAAC,IAG3B;;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,MAAM,IAAI,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,gBAAgB,GAAW,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElE,IAAI,CAAC;YACH,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CACnE,uBAAuB,EACvB,WAAW,CAAC,SAAS,CACnB,mCAAmC,EACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CACxB,CACF,CAAC;YAEF,IAAI,aAAa,IAAI,aAAa,KAAK,gBAAgB,EAAE,CAAC;gBACxD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBAChD,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,EAAE;aACjB,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChB,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,EAAE;aACjB,CAAC,CAAC;QACtB,CAAC;QAED,yEAAyE;QACzE,MAAM,KAAK,GAAiB,MAAM,IAAI,CAAC,SAAS,CAAC;YAC/C,KAAK,EAAE;gBACL,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;gBAC5B,GAAG,EAAE,IAAI,CAAC,QAAQ;aACnB;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;aACV;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH;;;;;;;;;;;eAWG;YACH,MAAM,iBAAiB,GAAkB,MAAM,IAAI,CAAC,qBAAqB,CACvE,iCAAiC,EACjC,WAAW,CAAC,SAAS,CACnB,mCAAmC,EACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CACxB,CACF,CAAC;YAEF,IACE,iBAAiB,KAAK,IAAI;gBAC1B,iBAAiB,KAAK,gBAAgB,EACtC,CAAC;gBACD,MAAM,IAAI,CAAC,qBAAqB,CAC9B,wBAAwB,EACxB,WAAW,CAAC,SAAS,CACnB,mCAAmC,EACnC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EACvB,gBAAgB,EAChB;oBACE,gBAAgB,EAAE,wCAAwC;iBAC3D,CACF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,8DAA8D;YAC9D,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBAChD,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,EAAE;aACjB,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAChB,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,EAAE;aACjB,CAAC,CAAC;QACtB,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;OAUG;IACI,KAAK,CAAC,wBAAwB,CACnC,QAAyB;QAEzB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,qBAAqB,CAC9B,+BAA+B,EAC/B,WAAW,CAAC,SAAS,CACnB,mCAAmC,EACnC,OAAO,CAAC,QAAQ,EAAE,EAClB,+BAA+B,EAC/B;oBACE,gBAAgB,EAAE,wCAAwC;iBAC3D,CACF,CACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,KAAK,CACV,6DAA6D,OAAO,CAAC,QAAQ,EAAE,oEAAoE,wCAAwC,GAAG,EAC9L,EAAE,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,EAAmB,CAClD,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,EAAmB,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAC/B,OAAiB,EACjB,SAAe;QAEf,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,qBAAqB,CAC9B,8BAA8B,EAC9B,WAAW,CAAC,SAAS,CACnB,gCAAgC,EAChC,OAAO,CAAC,QAAQ,EAAE,EAClB,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,CAClC,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE;gBAClD,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE;aACd,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,EAAmB,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAAC,OAAiB;QAChD,MAAM,GAAG,GAAS,aAAa,CAAC,cAAc,EAAE,CAAC;QAEjD,IAAI,CAAC;YACH,6FAA6F;YAC7F,MAAM,sBAAsB,GAC1B,MAAM,IAAI,CAAC,qBAAqB,CAC9B,6BAA6B,EAC7B,WAAW,CAAC,SAAS,CACnB,gCAAgC,EAChC,OAAO,CAAC,QAAQ,EAAE,CACnB,CACF,CAAC;YAEJ,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC9C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,0BAA0B,GAAgB,aAAa,CAAC,UAAU,CACtE,sBAAsB,CACvB,CAAC;YAEF,6FAA6F;YAC7F,IAAI,0BAA0B,EAAE,CAAC;gBAC/B,MAAM,IAAI,GAAW,aAAa,CAAC,sBAAsB,CACvD,GAAG,EACH,0BAA0B,CAC3B,CAAC;gBAEF,IAAI,IAAI,GAAG,EAAE,EAAE,CAAC;oBACd,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,uDAAuD;YACvD,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE;gBACrD,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE;aACZ,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,EAAmB,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAAiB;QAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,mBAAmB,GACvB,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAE1C,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,GAAG,GAAS,aAAa,CAAC,cAAc,EAAE,CAAC;QAEjD;;;;;;;;WAQG;QACH,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,6BAA6B,CAAC;gBACvC,EAAE,EAAE,OAAO;gBACX,IAAI,EAAE;oBACJ,SAAS,EAAE,GAAG;iBACf;aACF,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb;;;;;;;;eAQG;YACH,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,kEAAkE;IAC1D,KAAK,CAAC,sBAAsB,CAAC,OAAiB;QACpD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,qBAAqB,CAC9B,iCAAiC,EACjC,WAAW,CAAC,SAAS,CACnB,gCAAgC,EAChC,OAAO,CAAC,QAAQ,EAAE,CACnB,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,uCAAuC,EAAE;gBACpD,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE;aACZ,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,EAAmB,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAClD,CAAC;IAGY,AAAN,KAAK,CAAC,SAAS,CAAC,OAAiB;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,UAAU,GACd,MAAM,qBAAqB,CAAC,MAAM,CAAC;YACjC,KAAK,EAAE;gBACL,OAAO,EAAE,OAAO;aACjB;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,IAAI,EAAE;oBACJ,GAAG,EAAE,IAAI;oBACT,KAAK,EAAE,IAAI;oBACX,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,IAAI;iBACf;aACF;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,KAAK,EAAE,iBAAiB;YACxB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC;QAEL,MAAM,UAAU,GACd,MAAM,qBAAqB,CAAC,MAAM,CAAC;YACjC,KAAK,EAAE;gBACL,OAAO,EAAE,OAAO;aACjB;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,MAAM,EAAE,IAAI;aACb;YACD,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,iBAAiB;YACxB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;SACF,CAAC,CAAC;QAEL,MAAM,KAAK,GACT,UAAU,CAAC,GAAG,CAAC,CAAC,SAAyB,EAAE,EAAE;YAC3C,OAAO,SAAS,CAAC,IAAK,CAAC;QACzB,CAAC,CAAC,IAAI,EAAE,CAAC;QAEX,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,OAAO,GACX,UAAU,CAAC,GAAG,CAAC,CAAC,SAAyB,EAAE,EAAE;gBAC3C,OAAO,SAAS,CAAC,MAAO,CAAC;YAC3B,CAAC,CAAC,IAAI,EAAE,CAAC;YAEX,MAAM,SAAS,GACb,MAAM,iBAAiB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAEnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,qCAAqC;gBACrC,MAAM,kBAAkB,GAAqB,KAAK,CAAC,IAAI,CACrD,CAAC,IAAU,EAAE,EAAE;oBACb,OAAO,IAAI,CAAC,EAAG,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,EAAG,CAAC,QAAQ,EAAE,CAAC;gBACzD,CAAC,CACF,CAAC;gBAEF,IAAI,CAAC,kBAAkB,EAAE,CAAC;oBACxB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,MAAM,YAAY,GAAQ;YACxB,oBAAoB,EAAE,EAAE;SACzB,CAAC;QAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,gBAAgB,IAAI,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;YACzD,MAAM,MAAM,GAAiB,MAAM,IAAI,CAAC,MAAM,CAAC;gBAC7C,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;gBACD,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,gBAAgB,EAAE,IAAI;iBACvB;gBACD,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YAEH,MAAM,oBAAoB,GAAiB,MAAM,CAAC,MAAM,CACtD,CAAC,KAAY,EAAE,EAAE;gBACf,OAAO,CACL,KAAK,CAAC,gBAAgB;oBACtB,KAAK,CAAC,gBAAgB,KAAK,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAC1D,CAAC;YACJ,CAAC,CACF,CAAC;YAEF,YAAY,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;QAC3D,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;IAC9C,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,cAA+B;QAE/B;;;;;WAKG;QACH,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,wBAAwB,CAAC,cAAc,CAAC,CAAC;QACtD,CAAC;QAED,IACE,QAAQ,CAAC,YAAY;YACrB,QAAQ,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,GAAG,CAAC,EACrD,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBAC/D,MAAM,cAAc,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAG,CAAC,CAAC;gBAEnD,MAAM,IAAI,CAAC,0BAA0B,CAAC;oBACpC,OAAO,EAAE,KAAK,CAAC,EAAG;iBACnB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAGwB,AAAN,KAAK,CAAC,eAAe,CACtC,QAAyB,EACzB,mBAAoC;QAEpC,kDAAkD;QAClD,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,CAAC;QAEzD,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAGY,AAAN,KAAK,CAAC,0BAA0B,CAAC,IAEvC;;QACC,MAAM,KAAK,GAAiB,MAAM,IAAI,CAAC,WAAW,CAAC;YACjD,EAAE,EAAE,IAAI,CAAC,OAAO;YAChB,KAAK,EAAE;gBACL,MAAM,EAAE,IAAI;aACb;YACD,MAAM,EAAE;gBACN,GAAG,EAAE,IAAI;gBACT,SAAS,EAAE,IAAI;gBACf,gBAAgB,EAAE,IAAI;gBACtB,aAAa,EAAE,IAAI;gBACnB,IAAI,EAAE,IAAI;gBACV,WAAW,EAAE,IAAI;gBACjB,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE;oBACP,IAAI,EAAE,IAAI;iBACX;aACF;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACxB,MAAM,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,CAAC,wCAAwC;QAClD,CAAC;QAED,IAAI,KAAK,CAAC,aAAa,IAAI,gBAAgB,EAAE,CAAC;YAC5C,OAAO,CAAC,mCAAmC;QAC7C,CAAC;QAED,yBAAyB;QACzB,IAAI,MAAM,GAAgB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAG,CAAC,CAAC;QAE1D,IAAI,qBAAqB,GAAY,IAAI,CAAC;QAE1C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,qBAAqB,GAAG,KAAK,CAAC;YAE9B,uBAAuB;YACvB,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC,SAAU,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,uBAAuB;QACjC,CAAC;QAED,MAAM,gBAAgB,GACpB,KAAK,CAAC,gBAAgB,KAAK,qBAAqB,CAAC,SAAS;YACxD,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,cAAc,CAAC;QAErB,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,MAAM,IAAI,GAAuB;oBAC/B,KAAK,EAAE,GAAG,KAAK,CAAC,IAAI,OAAO,gBAAgB,EAAE;oBAC7C,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI,OAAO;oBAChC,gBAAgB,EAAE,KAAK,CAAC,WAAW,IAAI,yBAAyB;oBAChE,WAAW,EAAE,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,IAAI,KAAI,SAAS;oBAC7C,WAAW,EAAE,gBAAgB,IAAI,SAAS;oBAC1C,SAAS,EAAE,aAAa,CAAC,yCAAyC,CAAC;wBACjE,IAAI,EAAE,KAAK,CAAC,SAAS,IAAI,aAAa,CAAC,cAAc,EAAE;wBACvD,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;qBAChD,CAAC;oBACF,cAAc,EAAE,CACd,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,SAAU,EAAE,KAAK,CAAC,EAAG,CAAC,CAC3D,CAAC,QAAQ,EAAE;iBACb,CAAC;gBAEF,IAAI,qBAAqB,KAAK,IAAI,EAAE,CAAC;oBACnC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;gBAC3B,CAAC;gBAED,MAAM,YAAY,GAAkB;oBAClC,YAAY,EAAE,iBAAiB,CAAC,2BAA2B;oBAC3D,IAAI,EAAE,IAAI;oBACV,OAAO,EAAE,UAAU,gBAAgB,KAAK,KAAK,CAAC,IAAI,EAAE;iBACrD,CAAC;gBAEF,MAAM,GAAG,GAAe;oBACtB,OAAO,EAAE,2CAA2C,KAAK,CAAC,IAAI,OAAO,gBAAgB,qFAAqF;iBAC3K,CAAC;gBAEF,MAAM,WAAW,GAAuB;oBACtC,IAAI,EAAE;wBACJ;4BACE,UAAU,EAAE,2CAA2C,KAAK,CAAC,IAAI,OAAO,gBAAgB,+FAA+F;yBACxL;qBACF;iBACF,CAAC;gBAEF,MAAM,iBAAiB,GAKnB;oBACF,SAAS,EAAE,KAAK,CAAC,IAAK;oBACtB,WAAW,EAAE,CAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,IAAI,KAAI,SAAS;oBAC7C,gBAAgB,EAAE,gBAAgB;iBACnC,CAAC;gBAEF,IAAI,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;oBAC3B,iBAAiB,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBACzD,CAAC;gBAED,MAAM,WAAW,GACf,oBAAoB,CAAC,oCAAoC,CACvD,iBAAiB,CAClB,CAAC;gBAEJ,MAAM,SAAS,GACb,4BAA4B,CAAC,4CAA4C,CAAC;gBAE5E,MAAM,eAAe,GACnB,iCAAiC,CAAC;oBAChC,SAAS;oBACT,iBAAiB,EAAE;wBACjB,UAAU,EAAE,KAAK,CAAC,IAAK;wBACvB,YAAY,EAAE,gBAAgB;wBAC9B,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE;qBACzC;iBACF,CAAC,CAAC;gBAEL,MAAM,8BAA8B,CAAC,oBAAoB,CAAC;oBACxD,MAAM,EAAE,IAAI,CAAC,EAAG;oBAChB,SAAS,EAAE,KAAK,CAAC,SAAU;oBAC3B,aAAa,EAAE,YAAY;oBAC3B,UAAU,EAAE,GAAG;oBACf,kBAAkB,EAAE,WAAW;oBAC/B,uBAAuB,EAAE,WAAW;oBACpC,eAAe;oBACf,SAAS;iBACV,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACV,yDAAyD,EACzD,EAAE,SAAS,EAAE,MAAA,KAAK,CAAC,SAAS,0CAAE,QAAQ,EAAE,EAAmB,CAC5D,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;oBACd,SAAS,EAAE,MAAA,KAAK,CAAC,SAAS,0CAAE,QAAQ,EAAE;iBACtB,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,kBAAkB,CAC7B,SAAmB,EACnB,OAAiB;QAEjB,MAAM,YAAY,GAAQ,MAAM,cAAc,CAAC,eAAe,EAAE,CAAC;QAEjE,OAAO,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CACrD,IAAI,SAAS,CAAC,QAAQ,EAAE,oBAAoB,OAAO,CAAC,QAAQ,EAAE,EAAE,CACjE,CAAC;IACJ,CAAC;CACF;AAxU0B;IADxB,WAAW,EAAE;;;;6CAab;AAGY;IADZ,WAAW,EAAE;;qCACkB,QAAQ;;wCAuEvC;AAGwB;IADxB,WAAW,EAAE;;;;6CAmCb;AAGwB;IADxB,WAAW,EAAE;;6CAGI,KAAK;;8CA0BtB;AAGwB;IADxB,WAAW,EAAE;;6CAGS,KAAK;;8CAM3B;AAGY;IADZ,WAAW,EAAE;;;;yDAoJb;AAGY;IADZ,WAAW,EAAE;;qCAED,QAAQ;QACV,QAAQ;;iDAOlB;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}

package/build/dist/Server/Services/StatusPageService.js

@@ -45,7 +45,7 @@ import StatusPageSubscriberNotificationMethod from "../../Types/StatusPage/Statu
 import { StatusPageApiRoute } from "../../ServiceRoute";
 import ProjectSMTPConfigService from "./ProjectSmtpConfigService";
 import StatusPageResourceService from "./StatusPageResourceService";
-import MonitorGroupResourceService from "./MonitorGroupResourceService";
+import MonitorGroupService from "./MonitorGroupService";
 import QueryHelper from "../Types/Database/QueryHelper";
 import OneUptimeDate from "../../Types/Date";
 import IncidentService from "./IncidentService";
@@ -71,6 +71,18 @@ export class Service extends DatabaseService {
          * `clearStatusPageUrlCache` after writes to the underlying domain.
          */
         this.statusPageUrlCache = new InMemoryTTLCache(10000);
+        /*
+         * Caches verified custom-domain -> statusPageId resolution. Every public
+         * status-page API call served on a custom domain (overview, incidents,
+         * announcements, polling — several per page view) starts with this lookup,
+         * and the mapping only changes when a customer provisions or removes a
+         * domain (which takes minutes anyway), so a 60s staleness window is the
+         * same tradeoff `statusPageUrlCache` above already accepts. Only
+         * SUCCESSFUL resolutions are cached: misses re-query, so a freshly
+         * verified domain works immediately and attacker-controlled Host headers
+         * cannot fill the cache with negative entries.
+         */
+        this.statusPageDomainToIdCache = new InMemoryTTLCache(10000);
     }
     clearStatusPageUrlCache(statusPageId) {
         if (statusPageId) {
@@ -79,6 +91,13 @@ export class Service extends DatabaseService {
         }
         this.statusPageUrlCache.clear();
     }
+    clearStatusPageDomainToIdCache(fullDomain) {
+        if (fullDomain) {
+            this.statusPageDomainToIdCache.delete(fullDomain);
+            return;
+        }
+        this.statusPageDomainToIdCache.clear();
+    }
     /*
      * Mirrors `resolveStatusPageIdOrThrow` in `Common/Server/API/StatusPageAPI.ts`
      * (module-private there), but returns null instead of throwing so callers can
@@ -91,6 +110,10 @@ export class Service extends DatabaseService {
             return null;
         }
         if (statusPageIdOrDomain.includes(".")) {
+            const cachedStatusPageId = this.statusPageDomainToIdCache.get(statusPageIdOrDomain);
+            if (cachedStatusPageId) {
+                return new ObjectID(cachedStatusPageId);
+            }
             const statusPageDomain = await StatusPageDomainService.findOneBy({
                 query: {
                     fullDomain: statusPageIdOrDomain,
@@ -108,6 +131,7 @@ export class Service extends DatabaseService {
             if (!statusPageDomain || !statusPageDomain.statusPageId) {
                 return null;
             }
+            this.statusPageDomainToIdCache.set(statusPageIdOrDomain, statusPageDomain.statusPageId.toString(), Service.DOMAIN_TO_ID_CACHE_TTL_MS);
             return statusPageDomain.statusPageId;
         }
         try {
@@ -967,7 +991,10 @@ export class Service extends DatabaseService {
         });
     }
     async getMonitorIdsOnStatusPage(data) {
-        const statusPageResources = await this.getStatusPageResources(data);
+        const statusPageResources = data.statusPageResources ||
+            (await this.getStatusPageResources({
+                statusPageId: data.statusPageId,
+            }));
         const monitorGroupIds = statusPageResources
             .map((resource) => {
             return resource.monitorGroupId;
@@ -984,29 +1011,11 @@ export class Service extends DatabaseService {
             .filter((id) => {
             return Boolean(id); // remove nulls
         });
+        // Batched: one query for all monitor groups instead of one per group.
+        const monitorIdsByGroupId = await MonitorGroupService.getMonitorIdsInMonitorGroups(monitorGroupIds);
         for (const monitorGroupId of monitorGroupIds) {
-            // get current status of monitors in the group.
             // get monitors in the group.
-            const groupResources = await MonitorGroupResourceService.findBy({
-                query: {
-                    monitorGroupId: monitorGroupId,
-                },
-                select: {
-                    monitorId: true,
-                },
-                props: {
-                    isRoot: true,
-                },
-                limit: LIMIT_PER_PROJECT,
-                skip: 0,
-            });
-            const monitorsInGroupIds = groupResources
-                .map((resource) => {
-                return resource.monitorId;
-            })
-                .filter((id) => {
-                return Boolean(id); // remove nulls
-            });
+            const monitorsInGroupIds = monitorIdsByGroupId[monitorGroupId.toString()] || [];
             for (const monitorId of monitorsInGroupIds) {
                 if (!monitorsOnStatusPage.find((item) => {
                     return item.toString() === monitorId.toString();
@@ -1067,24 +1076,21 @@ export class Service extends DatabaseService {
     }
     async getMonitorGroupCurrentStatuses(data) {
         const monitorGroupCurrentStatuses = {};
+        /*
+         * Batched: this used to issue one MonitorGroupResource query per status
+         * page resource (not even per distinct group) on every badge render and
+         * subscriber report. One query now serves all groups.
+         */
+        const resourcesByGroupId = await MonitorGroupService.getMonitorGroupResourcesByGroupIds(data.statusPageResources
+            .map((resource) => {
+            return resource.monitorGroupId;
+        })
+            .filter((id) => {
+            return Boolean(id); // remove nulls
+        }));
         for (const resource of data.statusPageResources) {
             if (resource.monitorGroupId) {
-                const monitorGroupResources = await MonitorGroupResourceService.findBy({
-                    query: {
-                        monitorGroupId: resource.monitorGroupId,
-                    },
-                    select: {
-                        monitorId: true,
-                        monitor: {
-                            currentMonitorStatusId: true,
-                        },
-                    },
-                    skip: 0,
-                    limit: LIMIT_PER_PROJECT,
-                    props: {
-                        isRoot: true,
-                    },
-                });
+                const monitorGroupResources = resourcesByGroupId[resource.monitorGroupId.toString()] || [];
                 const statuses = monitorGroupResources
                     .filter((item) => {
                     return (item.monitor &&
@@ -1149,6 +1155,7 @@ export class Service extends DatabaseService {
         return currentStatus;
     }
 }
+Service.DOMAIN_TO_ID_CACHE_TTL_MS = 60 * 1000;
 __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),