@oneuptime/common 12.0.32 → 12.0.34

package/build/dist/Server/Utils/Monitor/SeriesContextEnricher.js

@@ -0,0 +1,237 @@
+import ColumnLength from "../../../Types/Database/ColumnLength";
+import SeriesDebugHints from "../../../Types/Monitor/SeriesContext/SeriesDebugHints";
+import SeriesLabelDisplay from "../../../Types/Monitor/SeriesContext/SeriesLabelDisplay";
+/*
+ * Make a per-series alert or incident say WHICH pod, container, node or
+ * mount it is about.
+ *
+ * A grouped metric monitor raises one alert per breaching series and
+ * stores that series' identity in `seriesLabels`. Until now the identity
+ * stopped there: the title came from the criteria template, which is one
+ * fixed string shared by every series, so a cluster with fifty saturated
+ * pods produced fifty alerts whose titles were character-for-character
+ * identical. The identity was reachable - in a table, at the bottom of
+ * the alert detail page - but the alert list, the Slack message, the
+ * email and the phone notification all showed the same undifferentiated
+ * line.
+ *
+ * This enricher runs at creation time, after the criteria template has
+ * been rendered, and appends the series identity to the title and a
+ * resource + first-commands block to the description.
+ *
+ * Two properties matter and are covered by tests:
+ *
+ *   - It never fights the user's own template. A title that already
+ *     names the series (because the user wrote `{{resource.k8s.pod.name}}`
+ *     into it, or because the new `{{seriesResourceSuffix}}` variable
+ *     expanded there) is left exactly as the user wrote it. The check is
+ *     on the VALUES, not on the placeholders, so it works the same
+ *     whether the identity arrived from a template variable or was typed
+ *     literally.
+ *
+ *   - It is a no-op for whole-monitor alerts. A monitor with no group-by
+ *     has no series identity, and nothing is appended.
+ */
+/*
+ * Hoisted rather than written inline at its single use site: two lint
+ * rules disagree about parenthesising a regex literal in an expression
+ * and `--fix` oscillates between them (ESLintCircularFixesWarning). A
+ * named constant sidesteps the argument and reads better anyway.
+ */
+const WordCharacterPattern = /[A-Za-z0-9]/;
+class SeriesContextEnricher {
+    /**
+     * What counts as "part of the same word" when deciding whether a
+     * value found in the text is really a mention of it.
+     *
+     * Deliberately narrower than `\w`: `-`, `.`, `/` and `_` all appear
+     * inside the values themselves (pod names, mountpoints, Ceph daemon
+     * ids), so treating them as word characters would make a value that
+     * IS present look like part of a longer token.
+     */
+    static isWordCharacter(character) {
+        if (character === "") {
+            return false;
+        }
+        return WordCharacterPattern.test(character);
+    }
+    /**
+     * Whether `text` already names this label's value.
+     *
+     * Two ways to be already-named, and both matter:
+     *
+     *   - This module's own rendering (`"Pod: web-1"`) is matched exactly.
+     *     That is what makes the enricher idempotent, whatever the value
+     *     looks like.
+     *
+     *   - A distinctive value appearing anywhere on a token boundary. That
+     *     is the user's own template - `{{resource.k8s.pod.name}}` has
+     *     already expanded by the time this runs, so the check has to be
+     *     on the VALUE, not on the placeholder. The boundary requirement
+     *     stops a pod called `web` from counting as mentioned because the
+     *     title happens to contain the word "website".
+     */
+    static isValueMentioned(input) {
+        const { text, label } = input;
+        if (text.includes(`${label.name}: ${label.value}`)) {
+            return true;
+        }
+        if (label.value.length < SeriesContextEnricher.MinimumMatchableValueLength) {
+            return false;
+        }
+        let searchFrom = 0;
+        for (;;) {
+            const index = text.indexOf(label.value, searchFrom);
+            if (index === -1) {
+                return false;
+            }
+            const before = index > 0 ? text.charAt(index - 1) : "";
+            const after = text.charAt(index + label.value.length);
+            if (!SeriesContextEnricher.isWordCharacter(before) &&
+                !SeriesContextEnricher.isWordCharacter(after)) {
+                return true;
+            }
+            searchFrom = index + 1;
+        }
+    }
+    /*
+     * The identity labels not already present in `text`.
+     *
+     * Deliberately per-label rather than all-or-nothing: a title that
+     * mentions the pod by name but not the namespace still gets the
+     * namespace appended, because dropping the rest whenever a user's
+     * template happened to mention one identifier would lose exactly the
+     * context this exists to add.
+     */
+    static getUnmentionedLabels(input) {
+        const labels = SeriesLabelDisplay.getDisplayLabels(input.seriesLabels);
+        if (labels.length === 0) {
+            return [];
+        }
+        const text = input.text || "";
+        return labels.filter((label) => {
+            return !SeriesContextEnricher.isValueMentioned({ text, label });
+        });
+    }
+    /*
+     * `title` with the series identity appended, or `title` unchanged when
+     * there is no identity to add or the title already carries it.
+     */
+    static enrichTitle(input) {
+        const title = input.title || "";
+        const unmentioned = SeriesContextEnricher.getUnmentionedLabels({
+            text: title,
+            seriesLabels: input.seriesLabels,
+        });
+        if (unmentioned.length === 0) {
+            return title;
+        }
+        /*
+         * Rebuild a label map from just the unmentioned labels so the
+         * shared formatter still applies its own ordering and title cap
+         * rather than this module reimplementing either.
+         */
+        const remaining = {};
+        for (const label of unmentioned) {
+            remaining[label.key] = label.value;
+        }
+        const suffix = SeriesLabelDisplay.buildTitleSuffix(remaining);
+        if (!suffix) {
+            return title;
+        }
+        /*
+         * `Alert.title` and `Incident.title` are LongText, i.e. 500
+         * characters. Overflowing the column does not produce a shortened
+         * title - it fails the INSERT, and the alert does not exist at all.
+         * That would turn a labelling improvement into dropped pages, so the
+         * appended identity is bounded here as well as per-value inside
+         * SeriesLabelDisplay.
+         *
+         * A base title that is ALREADY at or over the limit is returned
+         * untouched: it was going to fail with or without this enricher, and
+         * silently truncating what the user wrote is not this module's call
+         * to make.
+         */
+        if (title.length >= SeriesContextEnricher.MaxTitleLength) {
+            return title;
+        }
+        const room = SeriesContextEnricher.MaxTitleLength - title.length;
+        if (suffix.length <= room) {
+            return `${title}${suffix}`;
+        }
+        return `${title}${suffix.slice(0, room)}`;
+    }
+    /*
+     * `description` with an "Affected resource" block and the read-only
+     * commands worth running first appended.
+     *
+     * The description is what reaches Slack, email and the mobile push, so
+     * this is where the full identity goes - the title only has room for
+     * the top few labels.
+     */
+    static enrichDescription(input) {
+        const description = input.description || "";
+        const labels = SeriesLabelDisplay.getDisplayLabels(input.seriesLabels);
+        if (labels.length === 0) {
+            return description;
+        }
+        const sections = [];
+        /*
+         * Only skip the resource block when the description already names
+         * EVERY label. A description mentioning the pod but not the node is
+         * still missing the thing the engineer needs.
+         */
+        const unmentioned = SeriesContextEnricher.getUnmentionedLabels({
+            text: description,
+            seriesLabels: input.seriesLabels,
+        });
+        const block = SeriesLabelDisplay.buildMarkdownBlock(input.seriesLabels);
+        /*
+         * The exact-block check is the idempotency guarantee. Per-label
+         * matching alone cannot provide it: a one-character label value
+         * (a Ceph pool id, a Proxmox vmid) is deliberately not matched as a
+         * bare substring, so a second pass would append the block again.
+         */
+        if (unmentioned.length > 0 && block && !description.includes(block)) {
+            sections.push(block);
+        }
+        const commandsBlock = SeriesDebugHints.buildMarkdownBlock({
+            monitorType: input.monitorType,
+            seriesLabels: input.seriesLabels,
+        });
+        /*
+         * The commands embed the label values, so a description that
+         * already carries them would otherwise get a near-duplicate block
+         * appended on top of a user's own runbook snippet.
+         */
+        if (commandsBlock && !description.includes(commandsBlock)) {
+            sections.push(commandsBlock);
+        }
+        if (sections.length === 0) {
+            return description;
+        }
+        if (!description.trim()) {
+            return sections.join("\n\n");
+        }
+        return `${description}\n\n${sections.join("\n\n")}`;
+    }
+}
+/**
+ * The `title` column's own limit, taken from the schema rather than
+ * restated as a number - `Alert.title` and `Incident.title` are both
+ * `ColumnType.LongText`.
+ */
+SeriesContextEnricher.MaxTitleLength = ColumnLength.LongText;
+/**
+ * Shortest label value that may be matched as a bare substring.
+ *
+ * Ceph pool ids and Proxmox vmids are one or two characters, and
+ * "does the title contain 3?" is answered `true` by any title with a
+ * threshold in it ("Restarts > 3"). Below this length only this
+ * module's own `Name: value` rendering counts as a mention, which
+ * keeps idempotency without letting a coincidence swallow the
+ * identity.
+ */
+SeriesContextEnricher.MinimumMatchableValueLength = 4;
+export default SeriesContextEnricher;
+//# sourceMappingURL=SeriesContextEnricher.js.map

package/build/dist/Server/Utils/Monitor/SeriesContextEnricher.js.map

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

package/build/dist/Server/Utils/NetworkDevice/DeviceHealthAggregation.js

@@ -15,12 +15,12 @@ import OneUptimeDate from "../../../Types/Date";
  *
  * So the rule does not move. What moves is the DATA REDUCTION.
  *
- * `deviceHealthState` is a pure function of six facts about a row, and five of
- * them are already booleans or three-state flags. Group the table by those
- * facts in SQL and 80,000 rows collapse into at most a few per site — one
- * bucket per distinct combination that actually occurs. Then hand each bucket
- * back to the REAL classifier once and multiply its verdict by the bucket's
- * count.
+ * `deviceHealthState` is a pure function of seven facts about a row, and six
+ * of them are already booleans, three-state flags or a column that only ever
+ * holds two values. Group the table by those facts in SQL and 80,000 rows
+ * collapse into at most a few per site — one bucket per distinct combination
+ * that actually occurs. Then hand each bucket back to the REAL classifier
+ * once and multiply its verdict by the bucket's count.
  *
  * One rule, one implementation, and the wire carries buckets instead of rows.
  *
@@ -102,20 +102,26 @@ const DEVICE_HEALTH_DISCRIMINATOR_COLUMNS = [
      * The column only ever holds a handful of distinct values, so the raw form
      * costs nothing in bucket count.
      *
-     * Note carefully WHO reads it: `deviceHealthState` never receives it (it is
-     * not part of `DeviceHealthStateInput`, and `deviceHealthInputForGroup` does
-     * not emit it), so the per-site health rollups are indifferent to it. Its
-     * one consumer is the Overview's fleet tally, which re-attaches it and calls
-     * `DeviceReachabilityUtil` directly — and a tally that dropped it would
-     * report every ping-only device as Pending forever (issue #3392, one level
-     * up).
+     * Every consumer of a bucket reads it. `deviceHealthInputForGroup` and
+     * `deviceRollupStateForGroup` carry it into the classifier inputs, where
+     * the shared reachability rule uses it to decide whether the poll facts
+     * beside it mean anything. On a monitor-backed device they do not: its
+     * `isReachable` mirrors the bound monitor (NULL when nothing is bound) and
+     * its `lastSeenAt` is whatever a probe last found before it stopped asking
+     * — so an unstamped monitor-backed bucket has to classify as "unknown",
+     * not as whatever those leftovers happen to say, or the site card and the
+     * device list under it describe two different networks. The Overview's
+     * fleet tally reads it for the same reason one level up (issue #3392: a
+     * tally that dropped it reported every ping-only device as Pending
+     * forever).
      *
-     * It therefore costs the rollup path a discriminator it does not use. On a
-     * real fleet that costs nothing, because `monitoringMethod` is almost
+     * Dropping it from the group keys would therefore not be a harmless
+     * simplification: a bucket that mixed probe-polled and monitor-backed devices with
+     * the same poll facts would classify all of them by the poll rule. On a
+     * real fleet it also costs nothing, because `monitoringMethod` is almost
      * perfectly correlated with whether the device carries a stamped monitor
      * status — which is already a group key — so it splits no bucket that
-     * `currentMonitorStatusId` had not split anyway. Keeping one discriminator
-     * set is worth more than saving that.
+     * `currentMonitorStatusId` had not split anyway.
      */
     {
         expression: column("monitoringMethod"),
@@ -291,6 +297,11 @@ export function deviceHealthInputForGroup(data) {
          * the synthetic dates above are placed relative to.
          */
         pollingIntervalInMinutes: undefined,
+        /*
+         * Carried verbatim — the classifier parses it, and NULL reads as Probe
+         * there. See the discriminator column for why a bucket cannot drop it.
+         */
+        monitoringMethod: group.monitoringMethod,
         interfacesDown: group.hasDownInterfaces ? 1 : 0,
     };
 }
@@ -326,6 +337,8 @@ export function deviceRollupStateForGroup(data) {
         lastSeenAt: group.hasBeenSeen ? contactAt : null,
         // See deviceHealthInputForGroup — staleness is already applied.
         pollingIntervalInMinutes: undefined,
+        // ...and for why this rides along with the poll facts it qualifies.
+        monitoringMethod: group.monitoringMethod,
         deviceCount: group.deviceCount,
     };
 }

package/build/dist/Server/Utils/NetworkDevice/DeviceHealthAggregation.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceHealthAggregation.js","sourceRoot":"","sources":["../../../../../Server/Utils/NetworkDevice/DeviceHealthAggregation.ts"],"names":[],"mappings":"AAKA,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,mBAAmB,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EACL,0CAA0C,EAC1C,kCAAkC,EAClC,4BAA4B,GAC7B,MAAM,qDAAqD,CAAC;AAC7D,OAAO,aAAa,MAAM,qBAAqB,CAAC;AAGhD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH;;;GAGG;AACH,SAAS,MAAM,CAAC,UAAkB;IAChC,OAAO,oBAAoB,UAAU,GAAG,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,2BAA2B,GAAW;;WAEjC,MAAM,CAAC,0BAA0B,CAAC;WAClC,MAAM,CAAC,0BAA0B,CAAC;WAClC,0CAA0C;oBACjC,MAAM,CAAC,0BAA0B,CAAC;oBAClC,4BAA4B;IAC5C,kCAAkC;EACpC,CAAC;AAEH;;;;GAIG;AACH,MAAM,mBAAmB,GAAW,YAAY,MAAM,CACpD,cAAc,CACf,KAAK,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;AAE9B;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAW,iBAAiB,CAAC;AAErE,mDAAmD;AACnD,MAAM,CAAN,IAAY,sBAWX;AAXD,WAAY,sBAAsB;IAChC,2CAAiB,CAAA;IACjB,6DAAmC,CAAA;IACnC,+DAAqC,CAAA;IACrC,qDAA2B,CAAA;IAC3B,yDAA+B,CAAA;IAC/B,qDAA2B,CAAA;IAC3B,6CAAmB,CAAA;IACnB,iEAAuC,CAAA;IACvC,qDAA2B,CAAA;IAC3B,qEAA2C,CAAA;AAC7C,CAAC,EAXW,sBAAsB,KAAtB,sBAAsB,QAWjC;AAED;;;;;;;;GAQG;AACH,MAAM,mCAAmC,GAA2B;IAClE;QACE,UAAU,EAAE,MAAM,CAAC,wBAAwB,CAAC;QAC5C,KAAK,EAAE,sBAAsB,CAAC,eAAe;KAC9C;IACD;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH;QACE,UAAU,EAAE,MAAM,CAAC,kBAAkB,CAAC;QACtC,KAAK,EAAE,sBAAsB,CAAC,gBAAgB;KAC/C;IACD;QACE,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC;QACjC,KAAK,EAAE,sBAAsB,CAAC,WAAW;KAC1C;IACD;QACE,UAAU,EAAE,IAAI,MAAM,CAAC,cAAc,CAAC,eAAe;QACrD,KAAK,EAAE,sBAAsB,CAAC,aAAa;KAC5C;IACD;QACE,UAAU,EAAE,IAAI,MAAM,CAAC,YAAY,CAAC,eAAe;QACnD,KAAK,EAAE,sBAAsB,CAAC,WAAW;KAC1C;IACD;;;;;;;;;;;;;;;OAeG;IACH;QACE;;;;;;;;;;;;;;WAcG;QACH,UAAU,EAAE;kBACE,MAAM,CAAC,aAAa,CAAC;sBACjB,MAAM,CAAC,YAAY,CAAC;;UAEhC,mBAAmB;;yBAEJ,2BAA2B,mBAAmB,mBAAmB;mBACvE,2BAA2B;;;MAGxC;QACF,KAAK,EAAE,sBAAsB,CAAC,OAAO;KACtC;IACD;QACE,UAAU,EAAE,aAAa,MAAM,CAAC,gBAAgB,CAAC,WAAW;QAC5D,KAAK,EAAE,sBAAsB,CAAC,iBAAiB;KAChD;CACF,CAAC;AAEF,wCAAwC;AACxC,MAAM,CAAC,MAAM,sBAAsB,GAAoB;IACrD,UAAU,EAAE,UAAU;IACtB,KAAK,EAAE,sBAAsB,CAAC,WAAW;CAC1C,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAoB;IACxD,UAAU,EAAE,gBAAgB,MAAM,CAAC,gBAAgB,CAAC,OAAO;IAC3D,KAAK,EAAE,sBAAsB,CAAC,mBAAmB;CAClD,CAAC;AAEF,oEAAoE;AACpE,MAAM,CAAC,MAAM,wBAAwB,GAA2B;IAC9D,sBAAsB;IACtB,yBAAyB;CAC1B,CAAC;AAEF,4EAA4E;AAC5E,MAAM,CAAC,MAAM,2BAA2B,GAA2B;IACjE,GAAG,mCAAmC;CACvC,CAAC;AAEF,yEAAyE;AACzE,MAAM,CAAC,MAAM,mCAAmC,GAA2B;IACzE,EAAE,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,sBAAsB,CAAC,MAAM,EAAE;IACtE,GAAG,mCAAmC;CACvC,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAA0B;IAC9D;QACE,UAAU,EAAE,IAAI,sBAAsB,CAAC,eAAe,GAAG;QACzD,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B;IACD;QACE,UAAU,EAAE,IAAI,sBAAsB,CAAC,WAAW,GAAG;QACrD,SAAS,EAAE,SAAS,CAAC,UAAU;KAChC;CACF,CAAC;AAsBF,MAAM,UAAU,sBAAsB,CAAC,GAAiB;IACtD,OAAO;QACL,MAAM,EAAE,mBAAmB,CAAC,cAAc,CACxC,GAAG,EACH,sBAAsB,CAAC,MAAM,CAC9B;QACD,eAAe,EAAE,mBAAmB,CAAC,cAAc,CACjD,GAAG,EACH,sBAAsB,CAAC,eAAe,CACvC;QACD,gBAAgB,EAAE,mBAAmB,CAAC,cAAc,CAClD,GAAG,EACH,sBAAsB,CAAC,gBAAgB,CACxC;QACD,WAAW,EAAE,mBAAmB,CAAC,iBAAiB,CAChD,GAAG,EACH,sBAAsB,CAAC,WAAW,CACnC;QACD,aAAa,EAAE,mBAAmB,CAAC,SAAS,CAC1C,GAAG,EACH,sBAAsB,CAAC,aAAa,CACrC;QACD,WAAW,EAAE,mBAAmB,CAAC,SAAS,CACxC,GAAG,EACH,sBAAsB,CAAC,WAAW,CACnC;QACD,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,GAAG,EAAE,sBAAsB,CAAC,OAAO,CAAC;QAC3E,iBAAiB,EAAE,mBAAmB,CAAC,SAAS,CAC9C,GAAG,EACH,sBAAsB,CAAC,iBAAiB,CACzC;QACD,WAAW,EAAE,mBAAmB,CAAC,QAAQ,CACvC,GAAG,EACH,sBAAsB,CAAC,WAAW,CACnC;QACD,mBAAmB,EAAE,mBAAmB,CAAC,QAAQ,CAC/C,GAAG,EACH,sBAAsB,CAAC,mBAAmB,CAC3C;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,8BAA8B,GAAW,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;AAE7D;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAKzC;IACC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAE5B,MAAM,SAAS,GAAS,KAAK,CAAC,OAAO;QACnC,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;QACtE,CAAC,CAAC,GAAG,CAAC;IAER,OAAO;QACL,sBAAsB,EAAE,IAAI,CAAC,sBAAsB;QACnD,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACpD,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QAChD;;;;;;WAMG;QACH,wBAAwB,EAAE,SAAS;QACnC,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KAChD,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,yBAAyB,CAAC,IAWzC;IACC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAE5B,MAAM,SAAS,GAAS,KAAK,CAAC,OAAO;QACnC,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;QACtE,CAAC,CAAC,GAAG,CAAC;IAER,OAAO;QACL,sBAAsB,EAAE,KAAK,CAAC,eAAe;QAC7C,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;QAC3D,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,YAAY,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QACpD,UAAU,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;QAChD,gEAAgE;QAChE,wBAAwB,EAAE,SAAS;QACnC,WAAW,EAAE,KAAK,CAAC,WAAW;KAC/B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"DeviceHealthAggregation.js","sourceRoot":"","sources":["../../../../../Server/Utils/NetworkDevice/DeviceHealthAggregation.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/NetworkSite/NetworkSiteHierarchyLock.js

@@ -0,0 +1,158 @@
+import Semaphore from "../../Infrastructure/Semaphore";
+import logger from "../../Utils/Logger";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import ServerException from "../../../Types/Exception/ServerException";
+import ObjectID from "../../../Types/ObjectID";
+export const NETWORK_SITE_HIERARCHY_LOCK_NAMESPACE = "NetworkSiteHierarchy";
+export const NETWORK_SITE_HIERARCHY_LOCK_ERROR_MESSAGE = "Could not acquire the Network Site hierarchy lock. Please try again.";
+export const NETWORK_SITE_HIERARCHY_ROOT_SCOPE_ERROR_MESSAGE = "Root Network Site hierarchy mutations must be scoped to a project or a closed set of row IDs.";
+const LOCK_TIMEOUT_IN_MILLISECONDS = 30000;
+const ACQUIRE_TIMEOUT_IN_MILLISECONDS = 15000;
+const RETRY_INTERVAL_IN_MILLISECONDS = 100;
+/*
+ * NetworkSite and NetworkSiteType jointly define one invariant: concrete
+ * parent-site edges must agree with the configured parent-type graph. Their
+ * service hooks validate that invariant before DatabaseService persists the
+ * write, so two concurrent requests must not validate the same old snapshot.
+ *
+ * This distributed, project-keyed critical section is intentionally owned by
+ * the public service methods rather than a before hook. DatabaseService can
+ * still fail after a before hook returns; a redis-semaphore mutex acquired in
+ * the hook would then never reach a success hook and would keep refreshing
+ * forever. runExclusive's finally releases every mutex on every write path.
+ */
+export default class NetworkSiteHierarchyLock {
+    static getExplicitProjectIds(query) {
+        for (const key of ["projectId", "project"]) {
+            const value = query[key];
+            if (this.isExactId(value)) {
+                return [value];
+            }
+        }
+        return [];
+    }
+    /*
+     * Resolving an arbitrary root query and locking the projects it happens to
+     * match is not safe: another create can enter that query's limit/skip window
+     * before DatabaseService executes it. A permission-enforced tenant scope,
+     * a literal project scope, and explicit ID sets are closed; no new row can
+     * silently introduce an unlocked project.
+     */
+    static assertSafeRootMutationScope(data) {
+        if (this.isSafeRootMutationScope(data)) {
+            return;
+        }
+        throw new BadDataException(NETWORK_SITE_HIERARCHY_ROOT_SCOPE_ERROR_MESSAGE);
+    }
+    static isSafeRootMutationScope(data) {
+        if (!data.props.isRoot && !data.props.isMasterAdmin) {
+            return true;
+        }
+        /*
+         * DeletePermission retains an explicit tenantId even for a root caller,
+         * so it is a closed project scope for deletes. UpdatePermission does not:
+         * a root update keeps the caller's raw query. Callers must opt in only
+         * when their permission path actually applies the tenant predicate.
+         */
+        if (data.tenantScopeIsClosed &&
+            data.props.tenantId &&
+            !data.props.isMultiTenantRequest) {
+            return true;
+        }
+        const hasExactProjectScope = ["projectId", "project"].some((key) => {
+            return this.isExactId(data.query[key]);
+        });
+        const hasExplicitRowIdScope = this.isExplicitIdSet(data.query["_id"]);
+        if (hasExactProjectScope || hasExplicitRowIdScope) {
+            return true;
+        }
+        return false;
+    }
+    /*
+     * QueryHelper predicates are TypeORM FindOperator objects. Even when one
+     * happens to be backed by a fixed value today, accepting an arbitrary raw
+     * predicate here would let a later row enter the pre-read/write window in
+     * a project for which no mutex was acquired. Only literal UUIDs are a
+     * stable project scope; literal row-ID arrays are a stable closed set.
+     */
+    static isExactId(value) {
+        if (value instanceof ObjectID) {
+            return ObjectID.isValidUUID(value.toString());
+        }
+        return typeof value === "string" && ObjectID.isValidUUID(value.trim());
+    }
+    static isExplicitIdSet(value) {
+        if (this.isExactId(value)) {
+            return true;
+        }
+        return (Array.isArray(value) &&
+            value.every((candidate) => {
+                return this.isExactId(candidate);
+            }));
+    }
+    static async runExclusive(data) {
+        const projectIds = [
+            ...new Set(data.projectIds
+                .map((projectId) => {
+                return projectId.toString().trim().toLowerCase();
+            })
+                .filter((projectId) => {
+                return Boolean(projectId);
+            })),
+        ].sort((left, right) => {
+            return left.localeCompare(right);
+        });
+        /*
+         * A mutation that matched no rows has no project whose hierarchy it can
+         * change. Let DatabaseService preserve its normal zero-row/permission
+         * semantics without taking an unrelated global lock.
+         */
+        if (projectIds.length === 0) {
+            return await data.operation();
+        }
+        const acquiredMutexes = [];
+        try {
+            for (const projectId of projectIds) {
+                const mutex = await Semaphore.lock({
+                    key: projectId,
+                    namespace: NETWORK_SITE_HIERARCHY_LOCK_NAMESPACE,
+                    lockTimeout: LOCK_TIMEOUT_IN_MILLISECONDS,
+                    acquireTimeout: ACQUIRE_TIMEOUT_IN_MILLISECONDS,
+                    retryInterval: RETRY_INTERVAL_IN_MILLISECONDS,
+                });
+                acquiredMutexes.push({ projectId, mutex });
+            }
+        }
+        catch (error) {
+            await this.releaseAll(acquiredMutexes);
+            logger.error(error);
+            throw new ServerException(NETWORK_SITE_HIERARCHY_LOCK_ERROR_MESSAGE);
+        }
+        try {
+            return await data.operation();
+        }
+        finally {
+            await this.releaseAll(acquiredMutexes);
+        }
+    }
+    /*
+     * Release in reverse acquisition order. This mirrors ordinary lock-stack
+     * discipline and, together with sorted acquisition, prevents bulk writes
+     * spanning the same projects from deadlocking each other.
+     *
+     * Semaphore.release stops the mutex refresh timer before talking to Redis.
+     * A Redis failure is therefore logged but must not replace the mutation's
+     * real result/error; the lock key will expire at lockTimeout.
+     */
+    static async releaseAll(acquiredMutexes) {
+        for (const acquired of [...acquiredMutexes].reverse()) {
+            try {
+                await Semaphore.release(acquired.mutex);
+            }
+            catch (error) {
+                logger.error(error, { projectId: acquired.projectId });
+            }
+        }
+    }
+}
+//# sourceMappingURL=NetworkSiteHierarchyLock.js.map

package/build/dist/Server/Utils/NetworkSite/NetworkSiteHierarchyLock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkSiteHierarchyLock.js","sourceRoot":"","sources":["../../../../../Server/Utils/NetworkSite/NetworkSiteHierarchyLock.ts"],"names":[],"mappings":"AAAA,OAAO,SAA6B,MAAM,gCAAgC,CAAC;AAC3E,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AACzE,OAAO,eAAe,MAAM,0CAA0C,CAAC;AACvE,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAE/C,MAAM,CAAC,MAAM,qCAAqC,GAChD,sBAAsB,CAAC;AAEzB,MAAM,CAAC,MAAM,yCAAyC,GACpD,sEAAsE,CAAC;AAEzE,MAAM,CAAC,MAAM,+CAA+C,GAC1D,+FAA+F,CAAC;AAElG,MAAM,4BAA4B,GAAW,KAAM,CAAC;AACpD,MAAM,+BAA+B,GAAW,KAAM,CAAC;AACvD,MAAM,8BAA8B,GAAW,GAAG,CAAC;AAOnD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,OAAO,wBAAwB;IACpC,MAAM,CAAC,qBAAqB,CACjC,KAA8B;QAE9B,KAAK,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE,CAAC;YAC3C,MAAM,KAAK,GAAY,KAAK,CAAC,GAAG,CAAC,CAAC;YAElC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,2BAA2B,CAAC,IAIzC;QACC,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,gBAAgB,CAAC,+CAA+C,CAAC,CAAC;IAC9E,CAAC;IAEM,MAAM,CAAC,uBAAuB,CAAC,IAIrC;QACC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;YACpD,OAAO,IAAI,CAAC;QACd,CAAC;QAED;;;;;WAKG;QACH,IACE,IAAI,CAAC,mBAAmB;YACxB,IAAI,CAAC,KAAK,CAAC,QAAQ;YACnB,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,EAChC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,oBAAoB,GAAY,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,IAAI,CACjE,CAAC,GAAW,EAAW,EAAE;YACvB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC,CACF,CAAC;QACF,MAAM,qBAAqB,GAAY,IAAI,CAAC,eAAe,CACzD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAClB,CAAC;QAEF,IAAI,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;OAMG;IACK,MAAM,CAAC,SAAS,CAAC,KAAc;QACrC,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAEO,MAAM,CAAC,eAAe,CAAC,KAAc;QAC3C,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,CACL,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACpB,KAAK,CAAC,KAAK,CAAC,CAAC,SAAkB,EAAW,EAAE;gBAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACnC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAU,IAGzC;QACC,MAAM,UAAU,GAAkB;YAChC,GAAG,IAAI,GAAG,CACR,IAAI,CAAC,UAAU;iBACZ,GAAG,CAAC,CAAC,SAA4B,EAAU,EAAE;gBAC5C,OAAO,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACnD,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,SAAiB,EAAW,EAAE;gBACrC,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC,CAAC,CACL;SACF,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,KAAa,EAAU,EAAE;YAC7C,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH;;;;WAIG;QACH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,CAAC;QAED,MAAM,eAAe,GAAyB,EAAE,CAAC;QAEjD,IAAI,CAAC;YACH,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,KAAK,GAAmB,MAAM,SAAS,CAAC,IAAI,CAAC;oBACjD,GAAG,EAAE,SAAS;oBACd,SAAS,EAAE,qCAAqC;oBAChD,WAAW,EAAE,4BAA4B;oBACzC,cAAc,EAAE,+BAA+B;oBAC/C,aAAa,EAAE,8BAA8B;iBAC9C,CAAC,CAAC;gBAEH,eAAe,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YACvC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,IAAI,eAAe,CAAC,yCAAyC,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,MAAM,CAAC,KAAK,CAAC,UAAU,CAC7B,eAAqC;QAErC,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,eAAe,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACtD,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;CACF"}

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

@@ -0,0 +1,123 @@
+import { AppVersion } from "../EnvironmentConfig";
+/*
+ * The User-Agent this platform presents when it calls somebody else's HTTP
+ * server on a project's behalf — TAXII threat-intel feeds and the external
+ * Data Source connectors (Prometheus, Loki, Elasticsearch, REST API).
+ *
+ * This is not cosmetic. With no User-Agent of our own, axios stamps its
+ * default `axios/<version>` on every request, and a bare HTTP-library UA is
+ * a stock rule in most WAFs, CDNs and bot-management products: the operator
+ * on the far end sees an anonymous script rather than a named product, and
+ * answers 403 before the request reaches their API at all. A product token
+ * plus a URL is what makes the traffic allowlistable, and what lets the far
+ * end's logs and abuse contact attribute it to something.
+ *
+ * Shape follows RFC 9110 §10.1.5 — a product/product-version token
+ * followed by a comment:
+ *
+ *   OneUptime/8.0.1234 (+https://oneuptime.com)
+ *
+ * The version is dropped rather than printed as "unknown" when APP_VERSION
+ * is unset (development, and any deployment that does not inject it), so
+ * the UA never advertises a version that is not one.
+ */
+export const OUTBOUND_USER_AGENT_HEADER_NAME = "User-Agent";
+export const OUTBOUND_USER_AGENT_PRODUCT = "OneUptime";
+export const OUTBOUND_USER_AGENT_URL = "https://oneuptime.com";
+/*
+ * APP_VERSION is supplied by whoever deployed the instance, and a header
+ * value carrying CR/LF is a request-smuggling primitive, so the version is
+ * filtered down to RFC 9110 token characters instead of being trusted. The
+ * length cap keeps a junk value from becoming a multi-kilobyte header.
+ */
+const VERSION_DISALLOWED_CHARACTERS = /[^A-Za-z0-9._+-]/g;
+const MAX_VERSION_LENGTH = 64;
+/*
+ * EnvironmentConfig's own placeholder when APP_VERSION is unset — a
+ * sentinel, not a version, so it never reaches the wire.
+ */
+const UNKNOWN_VERSION = "unknown";
+export default class OutboundUserAgent {
+    // The User-Agent for this running instance.
+    static get() {
+        return this.build(AppVersion);
+    }
+    /*
+     * Pure builder — takes the version rather than reading it, so the format
+     * is testable without reaching into the process environment.
+     */
+    static build(version) {
+        const sanitizedVersion = this.sanitizeVersion(version);
+        const product = sanitizedVersion
+            ? `${OUTBOUND_USER_AGENT_PRODUCT}/${sanitizedVersion}`
+            : OUTBOUND_USER_AGENT_PRODUCT;
+        return `${product} (+${OUTBOUND_USER_AGENT_URL})`;
+    }
+    /*
+     * A version safe to put in a header, or "" when there is nothing worth
+     * printing (unset, the "unknown" sentinel, or nothing left after
+     * filtering).
+     */
+    static sanitizeVersion(version) {
+        const trimmed = (version || "").trim();
+        if (trimmed === "" || trimmed.toLowerCase() === UNKNOWN_VERSION) {
+            return "";
+        }
+        return trimmed
+            .replace(VERSION_DISALLOWED_CHARACTERS, "")
+            .substring(0, MAX_VERSION_LENGTH);
+    }
+    /*
+     * Whether the caller already set a User-Agent of its own. Header names
+     * are case-insensitive on the wire, so the check is too — otherwise a
+     * caller's lowercase `user-agent` would end up alongside ours rather
+     * than replacing it. A present-but-blank value counts as absent: an
+     * empty UA is the same anonymous-client problem this whole file exists
+     * to avoid.
+     */
+    static hasUserAgent(headers) {
+        if (!headers) {
+            return false;
+        }
+        for (const headerName of Object.keys(headers)) {
+            if (headerName.toLowerCase() !==
+                OUTBOUND_USER_AGENT_HEADER_NAME.toLowerCase()) {
+                continue;
+            }
+            const value = headers[headerName];
+            if (typeof value === "string" && value.trim() !== "") {
+                return true;
+            }
+        }
+        return false;
+    }
+    /*
+     * The headers to send: the caller's, plus our User-Agent when the caller
+     * did not set one. An explicit User-Agent always wins — a REST API data
+     * source whose provider demands a particular UA configures it as a custom
+     * header, and that must reach the wire untouched.
+     *
+     * Returns a new dictionary; the caller's is never mutated.
+     */
+    static withDefault(headers) {
+        const merged = Object.assign({}, (headers || {}));
+        if (this.hasUserAgent(merged)) {
+            return merged;
+        }
+        /*
+         * A blank `user-agent` in any casing is dropped rather than left
+         * beside ours: two keys differing only in case are one header on the
+         * wire, and which of them survives normalization is not something to
+         * leave to the HTTP client.
+         */
+        for (const headerName of Object.keys(merged)) {
+            if (headerName.toLowerCase() ===
+                OUTBOUND_USER_AGENT_HEADER_NAME.toLowerCase()) {
+                delete merged[headerName];
+            }
+        }
+        merged[OUTBOUND_USER_AGENT_HEADER_NAME] = this.get();
+        return merged;
+    }
+}
+//# sourceMappingURL=OutboundUserAgent.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"OutboundUserAgent.js","sourceRoot":"","sources":["../../../../Server/Utils/OutboundUserAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,CAAC,MAAM,+BAA+B,GAAW,YAAY,CAAC;AACpE,MAAM,CAAC,MAAM,2BAA2B,GAAW,WAAW,CAAC;AAC/D,MAAM,CAAC,MAAM,uBAAuB,GAAW,uBAAuB,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,6BAA6B,GAAW,mBAAmB,CAAC;AAClE,MAAM,kBAAkB,GAAW,EAAE,CAAC;AAEtC;;;GAGG;AACH,MAAM,eAAe,GAAW,SAAS,CAAC;AAE1C,MAAM,CAAC,OAAO,OAAO,iBAAiB;IACpC,4CAA4C;IACrC,MAAM,CAAC,GAAG;QACf,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAChC,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,OAA4B;QAC9C,MAAM,gBAAgB,GAAW,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAE/D,MAAM,OAAO,GAAW,gBAAgB;YACtC,CAAC,CAAC,GAAG,2BAA2B,IAAI,gBAAgB,EAAE;YACtD,CAAC,CAAC,2BAA2B,CAAC;QAEhC,OAAO,GAAG,OAAO,MAAM,uBAAuB,GAAG,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,eAAe,CAAC,OAA4B;QACxD,MAAM,OAAO,GAAW,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAE/C,IAAI,OAAO,KAAK,EAAE,IAAI,OAAO,CAAC,WAAW,EAAE,KAAK,eAAe,EAAE,CAAC;YAChE,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,OAAO;aACX,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC;aAC1C,SAAS,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,YAAY,CACxB,OAAwC;QAExC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9C,IACE,UAAU,CAAC,WAAW,EAAE;gBACxB,+BAA+B,CAAC,WAAW,EAAE,EAC7C,CAAC;gBACD,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAAuB,OAAO,CAAC,UAAU,CAAC,CAAC;YAEtD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;gBACrD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,WAAW,CACvB,OAAwC;QAExC,MAAM,MAAM,qBAA4B,CAAC,OAAO,IAAI,EAAE,CAAC,CAAE,CAAC;QAE1D,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,MAAM,CAAC;QAChB,CAAC;QAED;;;;;WAKG;QACH,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7C,IACE,UAAU,CAAC,WAAW,EAAE;gBACxB,+BAA+B,CAAC,WAAW,EAAE,EAC7C,CAAC;gBACD,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,MAAM,CAAC,+BAA+B,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAErD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}