@oneuptime/common 11.7.4 → 12.0.0

package/build/dist/Utils/Monitor/MonitorSummarySnapshotUtil.js

@@ -0,0 +1,382 @@
+import JSONFunctions from "../../Types/JSONFunctions";
+import { MonitorSummarySnapshotSource, MonitorSummarySnapshotVersion, } from "../../Types/Monitor/MonitorSummarySnapshot";
+import MonitorType, { MonitorTypeHelper, } from "../../Types/Monitor/MonitorType";
+/*
+ * Synthetic monitors carry base64 screenshots, one per browser × screen
+ * size, and a single check can run to several megabytes. createdStateLog
+ * already stores them unbounded; this column will not. Past the budget we
+ * drop the screenshots (the largest thing by far) and flag it, so the row
+ * stays a sane size and the view can say why the images are missing.
+ */
+export const MonitorSummarySnapshotMaxSizeInBytes = 1024 * 1024;
+/*
+ * How much of an oversized response body to keep. The head is where an
+ * error page's title and message live, which is what a summary is for.
+ */
+export const MonitorSummaryResponseBodyMaxLengthInChars = 64 * 1024;
+export default class MonitorSummarySnapshotUtil {
+    /*
+     * Capture the summary for a monitor evaluation that just opened an
+     * incident or an alert. Returns null when there is nothing worth
+     * storing - a Manual monitor (which has no summary card at all) or an
+     * evaluation with no data and no criteria results behind it.
+     */
+    static buildSnapshot(data) {
+        var _a, _b;
+        if (!data.monitorType) {
+            return null;
+        }
+        /*
+         * Manual monitors never evaluate anything, and Summary.tsx renders
+         * nothing for them. Storing an empty shell would only put an empty
+         * card on the incident page.
+         */
+        if (MonitorTypeHelper.isManualMonitor(data.monitorType)) {
+            return null;
+        }
+        const snapshot = {
+            version: MonitorSummarySnapshotVersion,
+            source: MonitorSummarySnapshotSource.Captured,
+            monitorType: data.monitorType,
+            capturedAt: data.capturedAt,
+        };
+        if (data.monitorId) {
+            snapshot.monitorId = data.monitorId;
+        }
+        if (data.monitorName) {
+            snapshot.monitorName = data.monitorName;
+        }
+        if (data.probeName) {
+            snapshot.probeName = data.probeName;
+        }
+        this.attachResponse({
+            snapshot,
+            monitorType: data.monitorType,
+            dataToProcess: data.dataToProcess,
+            capturedAt: data.capturedAt,
+        });
+        /*
+         * The criteria evaluation is the "why". Prefer the one handed in by
+         * the pipeline (it is the live object the incident was decided from)
+         * and fall back to the copy the response carries.
+         */
+        const evaluationSummary = data.evaluationSummary ||
+            ((_a = data.dataToProcess) === null || _a === void 0 ? void 0 : _a.evaluationSummary);
+        if (evaluationSummary) {
+            snapshot.evaluationSummary = evaluationSummary;
+        }
+        if (!this.hasAnyContent(snapshot)) {
+            return null;
+        }
+        return this.enforceSizeBudget({
+            snapshot,
+            maxSizeInBytes: (_b = data.maxSizeInBytes) !== null && _b !== void 0 ? _b : MonitorSummarySnapshotMaxSizeInBytes,
+        });
+    }
+    /*
+     * Route the evaluated payload into the one slot its monitor type reads
+     * from. monitorType is authoritative - it is the monitor's own column,
+     * not something inferred from the payload - but each branch still
+     * sanity-checks the shape so a mismatched payload (a cron re-evaluation
+     * handing a telemetry response to a probeable monitor, say) is dropped
+     * instead of rendering as a broken check.
+     */
+    static attachResponse(data) {
+        const { snapshot, monitorType, dataToProcess } = data;
+        if (MonitorTypeHelper.isTelemetryMonitor(monitorType)) {
+            snapshot.telemetryMonitorSummary = this.buildTelemetrySummary({
+                monitorType,
+                dataToProcess,
+                capturedAt: data.capturedAt,
+            });
+            return;
+        }
+        if (monitorType === MonitorType.Server) {
+            if (this.isServerMonitorResponse(dataToProcess)) {
+                snapshot.serverMonitorResponse = dataToProcess;
+            }
+            return;
+        }
+        if (monitorType === MonitorType.IncomingRequest) {
+            if (this.isIncomingMonitorRequest(dataToProcess)) {
+                snapshot.incomingMonitorRequest =
+                    dataToProcess;
+            }
+            return;
+        }
+        if (monitorType === MonitorType.IncomingEmail) {
+            if (this.isIncomingEmailMonitorRequest(dataToProcess)) {
+                snapshot.incomingEmailMonitorRequest =
+                    dataToProcess;
+            }
+            return;
+        }
+        /*
+         * Everything else is served by a probe check: every probeable type,
+         * plus Network Device, whose SNMP walk and trap results arrive as a
+         * ProbeMonitorResponse even though the type is not "probeable" (its
+         * schedule belongs to the device, not to a MonitorProbe row).
+         */
+        if (this.isProbeMonitorResponse(dataToProcess)) {
+            const probeMonitorResponse = dataToProcess;
+            snapshot.probeMonitorResponse = probeMonitorResponse;
+            if (probeMonitorResponse.probeId) {
+                snapshot.probeId = probeMonitorResponse.probeId.toString();
+            }
+        }
+    }
+    static buildTelemetrySummary(data) {
+        const summary = {
+            monitoredAt: data.capturedAt,
+        };
+        const payload = (data.dataToProcess || {});
+        /*
+         * The count the criteria was evaluated against. Metric monitors have
+         * no single count (they aggregate a series), so they get the
+         * evaluation log alone - which is where their numbers already live.
+         */
+        const counts = [
+            { key: "logCount", title: "Log Records" },
+            { key: "spanCount", title: "Spans" },
+            { key: "exceptionCount", title: "Exceptions" },
+            { key: "profileCount", title: "Profiles" },
+        ];
+        for (const count of counts) {
+            if (typeof payload[count.key] === "number") {
+                summary.observedCount = payload[count.key];
+                summary.observedCountTitle = count.title;
+                break;
+            }
+        }
+        return summary;
+    }
+    /*
+     * A snapshot with nothing but its own type stamp helps nobody - the
+     * card would render an empty "no summary available" box on an incident
+     * that plainly had a cause. Storing null instead lets the read path
+     * fall back to the legacy createdStateLog reconstruction.
+     */
+    static hasAnyContent(snapshot) {
+        return Boolean(snapshot.probeMonitorResponse ||
+            snapshot.serverMonitorResponse ||
+            snapshot.incomingMonitorRequest ||
+            snapshot.incomingEmailMonitorRequest ||
+            snapshot.telemetryMonitorSummary ||
+            snapshot.evaluationSummary);
+    }
+    /*
+     * Keep the stored jsonb bounded. Only synthetic / custom-code checks
+     * can realistically blow the budget, and only because of their base64
+     * screenshots, so that is the one thing we drop. Everything else - the
+     * script logs, the captured metrics, the evaluation log - is small and
+     * is exactly what someone reading an old incident needs.
+     */
+    static enforceSizeBudget(data) {
+        var _a, _b;
+        const { snapshot, maxSizeInBytes } = data;
+        if (maxSizeInBytes <= 0) {
+            return snapshot;
+        }
+        if (this.getApproximateSizeInBytes(snapshot) <= maxSizeInBytes) {
+            return snapshot;
+        }
+        const syntheticResponses = (_a = snapshot.probeMonitorResponse) === null || _a === void 0 ? void 0 : _a.syntheticMonitorResponse;
+        if (syntheticResponses && syntheticResponses.length > 0) {
+            snapshot.probeMonitorResponse = Object.assign(Object.assign({}, snapshot.probeMonitorResponse), { syntheticMonitorResponse: syntheticResponses.map((response) => {
+                    const withoutScreenshots = Object.assign({}, response);
+                    delete withoutScreenshots.screenshots;
+                    return withoutScreenshots;
+                }) });
+            snapshot.areScreenshotsOmitted = true;
+            if (this.getApproximateSizeInBytes(snapshot) <= maxSizeInBytes) {
+                return snapshot;
+            }
+        }
+        /*
+         * Second largest payload after screenshots: the response body of a
+         * Website / API check against a big HTML page. Keep the head of it -
+         * that is where the error page's title and message are - and say it
+         * was cut.
+         */
+        const responseBody = (_b = snapshot.probeMonitorResponse) === null || _b === void 0 ? void 0 : _b.responseBody;
+        if (typeof responseBody === "string" &&
+            responseBody.length > MonitorSummaryResponseBodyMaxLengthInChars) {
+            snapshot.probeMonitorResponse = Object.assign(Object.assign({}, snapshot.probeMonitorResponse), { responseBody: responseBody.slice(0, MonitorSummaryResponseBodyMaxLengthInChars) });
+            snapshot.isResponseBodyTruncated = true;
+        }
+        /*
+         * Still over budget with nothing safe left to shed. Keep it: an
+         * oversized-but-complete summary is still better than none, and jsonb
+         * tolerates it.
+         */
+        return snapshot;
+    }
+    static getApproximateSizeInBytes(snapshot) {
+        try {
+            return JSON.stringify(snapshot).length;
+        }
+        catch (_a) {
+            /*
+             * A payload we cannot stringify cannot be stored either. Report it
+             * as infinitely large so the caller sheds what it can; the write
+             * itself is guarded by serialize() below.
+             */
+            return Number.MAX_SAFE_INTEGER;
+        }
+    }
+    /*
+     * Encode for the jsonb column. Dates and ObjectIDs inside the payload
+     * are wrapped by JSONFunctions so they come back as the same types on
+     * read, the way telemetryQuery already round-trips.
+     */
+    static serialize(snapshot) {
+        if (!snapshot) {
+            return null;
+        }
+        return JSONFunctions.serialize(snapshot);
+    }
+    /*
+     * Read a stored snapshot back. Returns null for anything this build
+     * does not understand rather than rendering a half-decoded card.
+     */
+    static deserialize(stored) {
+        if (!stored || typeof stored !== "object") {
+            return null;
+        }
+        const snapshot = JSONFunctions.deserialize(stored);
+        if (!snapshot || !snapshot.monitorType) {
+            return null;
+        }
+        if (snapshot.version !== MonitorSummarySnapshotVersion) {
+            return null;
+        }
+        return snapshot;
+    }
+    /*
+     * Best-effort reconstruction for incidents and alerts created before
+     * this column existed. createdStateLog is the same evaluated payload,
+     * just untyped and without the monitor type - which the caller supplies
+     * from the monitor the incident is attached to.
+     *
+     * It cannot recover the probe name (never stored) and it is only as
+     * good as the monitor's type *today*, so a monitor whose type changed
+     * gets nothing useful. That is why new rows carry a real snapshot; this
+     * is purely so existing incidents are not blank.
+     */
+    static fromLegacyCreatedStateLog(data) {
+        if (!data.monitorType || !data.createdStateLog) {
+            return null;
+        }
+        if (typeof data.createdStateLog !== "object") {
+            return null;
+        }
+        /*
+         * createdStateLog was written with a plain JSON.stringify, so its
+         * dates are ISO strings and its ObjectIDs are already flattened.
+         * deserialize() restores whatever JSONFunctions can recognise and
+         * leaves the rest as-is, which the views render fine.
+         */
+        const dataToProcess = JSONFunctions.deserialize(data.createdStateLog);
+        const snapshot = this.buildSnapshot({
+            monitorType: data.monitorType,
+            dataToProcess: dataToProcess,
+            monitorId: data.monitorId,
+            monitorName: data.monitorName,
+            capturedAt: data.capturedAt || new Date(),
+        });
+        if (!snapshot) {
+            return null;
+        }
+        snapshot.source = MonitorSummarySnapshotSource.Legacy;
+        return snapshot;
+    }
+    /*
+     * Map a snapshot onto the props the dashboard's SummaryInfo component
+     * already takes, so the incident and alert pages render the exact same
+     * per-monitor-type views as the monitor page. Every monitor type goes
+     * through here, telemetry included - one render path means a new leaf
+     * view added to SummaryInfo shows up on incidents for free.
+     */
+    static toSummaryInfoProps(snapshot) {
+        const props = {
+            monitorType: snapshot.monitorType,
+        };
+        if (snapshot.probeName) {
+            props.probeName = snapshot.probeName;
+        }
+        if (snapshot.probeMonitorResponse) {
+            props.probeMonitorResponses = [snapshot.probeMonitorResponse];
+        }
+        if (snapshot.serverMonitorResponse) {
+            props.serverMonitorResponse = snapshot.serverMonitorResponse;
+        }
+        if (snapshot.incomingMonitorRequest) {
+            props.incomingMonitorRequest = snapshot.incomingMonitorRequest;
+            /*
+             * The live card shows the monitor's current heartbeat time. On a
+             * capture the equivalent is when this very request was checked.
+             */
+            props.incomingRequestMonitorHeartbeatCheckedAt =
+                snapshot.incomingMonitorRequest.checkedAt;
+        }
+        if (snapshot.incomingEmailMonitorRequest) {
+            props.incomingEmailMonitorRequest = snapshot.incomingEmailMonitorRequest;
+            props.incomingEmailMonitorHeartbeatCheckedAt =
+                snapshot.incomingEmailMonitorRequest.checkedAt;
+        }
+        if (snapshot.telemetryMonitorSummary) {
+            /*
+             * Only "monitored at". The live card's companion field is "next
+             * check at", which has no meaning on a frozen capture, and
+             * TelemetryMonitorView already renders "-" for a missing one.
+             */
+            props.telemetryMonitorSummary = {
+                lastCheckedAt: snapshot.telemetryMonitorSummary.monitoredAt,
+            };
+        }
+        if (snapshot.evaluationSummary) {
+            props.evaluationSummary = snapshot.evaluationSummary;
+        }
+        return props;
+    }
+    /*
+     * Does this snapshot have anything to put on screen? A capture whose
+     * payload was dropped (a shape mismatch, a monitor with no check data)
+     * still carries the evaluation log, which is worth showing on its own.
+     */
+    static hasRenderableContent(snapshot) {
+        if (!snapshot) {
+            return false;
+        }
+        return this.hasAnyContent(snapshot);
+    }
+    static isProbeMonitorResponse(data) {
+        if (!data || typeof data !== "object") {
+            return false;
+        }
+        /*
+         * monitorStepId is the field only a probe check has - every probe
+         * response is scoped to the monitor step it ran.
+         */
+        return Boolean(data.monitorStepId);
+    }
+    static isServerMonitorResponse(data) {
+        if (!data || typeof data !== "object") {
+            return false;
+        }
+        return Boolean(data.requestReceivedAt);
+    }
+    static isIncomingMonitorRequest(data) {
+        if (!data || typeof data !== "object") {
+            return false;
+        }
+        return Boolean(data.incomingRequestReceivedAt);
+    }
+    static isIncomingEmailMonitorRequest(data) {
+        if (!data || typeof data !== "object") {
+            return false;
+        }
+        return Boolean(data.emailReceivedAt);
+    }
+}
+//# sourceMappingURL=MonitorSummarySnapshotUtil.js.map

package/build/dist/Utils/Monitor/MonitorSummarySnapshotUtil.js.map

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

package/build/dist/Utils/NetworkSite/CidrMatchUtil.js

@@ -127,8 +127,9 @@ export class CidrMatchUtil {
     }
     /*
      * True when the rule's populated criteria all match the target. A CIDR
-     * criterion matches the target's ip; a hostname pattern matches either the
-     * hostname or the SNMP sysName. A rule with no criteria never matches.
+     * criterion matches the target's ip; a hostname pattern matches the
+     * hostname, the SNMP sysName, or the device's display name — see
+     * RuleMatchTarget. A rule with no criteria never matches.
      */
     static ruleMatches(rule, target) {
         const hasCidr = Boolean(rule.subnetCidr && rule.subnetCidr.trim().length > 0);
@@ -142,11 +143,16 @@ export class CidrMatchUtil {
             }
         }
         if (hasPattern) {
-            const matchesHostname = Boolean(target.hostname &&
-                CidrMatchUtil.hostnameMatchesWildcard(target.hostname, rule.hostnamePattern));
-            const matchesSysName = Boolean(target.sysName &&
-                CidrMatchUtil.hostnameMatchesWildcard(target.sysName, rule.hostnamePattern));
-            if (!matchesHostname && !matchesSysName) {
+            const candidates = [
+                target.hostname,
+                target.sysName,
+                target.name,
+            ];
+            const matchesAnyName = candidates.some((candidate) => {
+                return Boolean(candidate &&
+                    CidrMatchUtil.hostnameMatchesWildcard(candidate, rule.hostnamePattern));
+            });
+            if (!matchesAnyName) {
                 return false;
             }
         }

package/build/dist/Utils/NetworkSite/CidrMatchUtil.js.map

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

package/build/dist/Utils/Rules/RulePatternMatchUtil.js

@@ -0,0 +1,87 @@
+/*
+ * Matching for the free-text "pattern" criteria on automation rules (label
+ * rules, owner rules).
+ *
+ * These fields are documented as case-insensitive regular expressions, but
+ * the sibling Network Site assignment rules take '*' wildcard globs and the
+ * two features sit next to each other under Network > Automation. A user who
+ * typed `*0664*` into a label rule got silence: `new RegExp("*0664*")` throws
+ * "Nothing to repeat", the rule engine swallowed the SyntaxError, and the
+ * rule matched nothing forever (OneUptime/oneuptime#2940).
+ *
+ * So the pattern is tried as a regex first - existing rules keep their exact
+ * semantics - and a pattern containing '*' additionally gets a wildcard glob
+ * attempt. Matching is therefore a superset of the old behaviour: nothing
+ * that used to match stops matching.
+ *
+ * Pure and dependency-free (no logger, no models) so rule decisions stay
+ * unit-testable.
+ */
+import CidrMatchUtil from "../NetworkSite/CidrMatchUtil";
+export class RulePatternMatchUtil {
+    /*
+     * True when `value` satisfies `pattern`. An empty/missing pattern is "no
+     * criterion configured" and matches everything - callers that treat an
+     * empty criterion as skippable get the same answer either way. A missing
+     * value never matches a configured pattern.
+     */
+    static matches(value, pattern) {
+        if (typeof pattern !== "string" || pattern.trim().length === 0) {
+            return true;
+        }
+        if (typeof value !== "string" || value.length === 0) {
+            return false;
+        }
+        const trimmedPattern = pattern.trim();
+        if (RulePatternMatchUtil.matchesRegex(value, trimmedPattern)) {
+            return true;
+        }
+        /*
+         * Glob fallback only for patterns that actually carry a wildcard. Without
+         * a '*' a glob is just a case-insensitive whole-string equality test,
+         * which the (unanchored) regex attempt above already covers.
+         */
+        if (trimmedPattern.includes("*")) {
+            return CidrMatchUtil.hostnameMatchesWildcard(value, trimmedPattern);
+        }
+        return false;
+    }
+    // True when `pattern` compiles as a JavaScript regular expression.
+    static isValidRegex(pattern) {
+        if (typeof pattern !== "string") {
+            return false;
+        }
+        try {
+            const regex = new RegExp(pattern, "i");
+            return regex instanceof RegExp;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    /*
+     * A pattern this matcher can do something sensible with: either a valid
+     * regex, or a glob. Anything else (`switch-(01`, `[unclosed`) is a typo
+     * that can only ever match nothing - worth telling the user about instead
+     * of failing silently.
+     */
+    static isSupportedPattern(pattern) {
+        if (typeof pattern !== "string" || pattern.trim().length === 0) {
+            return true;
+        }
+        const trimmedPattern = pattern.trim();
+        return (RulePatternMatchUtil.isValidRegex(trimmedPattern) ||
+            trimmedPattern.includes("*"));
+    }
+    static matchesRegex(value, pattern) {
+        try {
+            const regex = new RegExp(pattern, "i");
+            return regex.test(value);
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+}
+export default RulePatternMatchUtil;
+//# sourceMappingURL=RulePatternMatchUtil.js.map

package/build/dist/Utils/Rules/RulePatternMatchUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RulePatternMatchUtil.js","sourceRoot":"","sources":["../../../../Utils/Rules/RulePatternMatchUtil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAEzD,MAAM,OAAO,oBAAoB;IAC/B;;;;;OAKG;IACI,MAAM,CAAC,OAAO,CACnB,KAAgC,EAChC,OAAkC;QAElC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC;QAE9C,IAAI,oBAAoB,CAAC,YAAY,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAED;;;;WAIG;QACH,IAAI,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,aAAa,CAAC,uBAAuB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mEAAmE;IAC5D,MAAM,CAAC,YAAY,CAAC,OAAe;QACxC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAW,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,YAAY,MAAM,CAAC;QACjC,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,kBAAkB,CAAC,OAAe;QAC9C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,cAAc,GAAW,OAAO,CAAC,IAAI,EAAE,CAAC;QAE9C,OAAO,CACL,oBAAoB,CAAC,YAAY,CAAC,cAAc,CAAC;YACjD,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAC7B,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,KAAa,EAAE,OAAe;QACxD,IAAI,CAAC;YACH,MAAM,KAAK,GAAW,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AAED,eAAe,oBAAoB,CAAC"}