@oneuptime/common 12.0.32 → 12.0.34

package/build/dist/Utils/NetworkDiscovery/PingMonitorBuilder.js

@@ -60,6 +60,23 @@ const PING_MONITOR_NAME_PREFIX = "Ping ";
  * from the same dropdown.
  */
 export const PING_MONITOR_INTERVAL = "*/5 * * * *";
+/**
+ * Where a Ping monitor is being built FROM. The sentence it writes into the
+ * monitor's description is the only thing that differs, and it matters: an
+ * operator reading the monitor list months later should be told whether a
+ * scan, a form, or a bulk action put it there.
+ */
+export var PingMonitorOrigin;
+(function (PingMonitorOrigin) {
+    // A host that answered a discovery sweep's ping but not its SNMP probe.
+    PingMonitorOrigin["DiscoveryImport"] = "DiscoveryImport";
+    // The device create form, with "create a Ping monitor" ticked.
+    PingMonitorOrigin["DeviceCreateForm"] = "DeviceCreateForm";
+    // The "Create Ping Monitor" button on a device's Overview or Monitors page.
+    PingMonitorOrigin["DevicePage"] = "DevicePage";
+    // The device list's bulk "Create Ping Monitors" action.
+    PingMonitorOrigin["BulkAction"] = "BulkAction";
+})(PingMonitorOrigin || (PingMonitorOrigin = {}));
 /**
  * The monitor's name: "Ping <device name>", clamped to the column.
  *
@@ -116,26 +133,53 @@ function suppressIncidentCreation(step) {
     }
 }
 /**
- * One ping-only discovered host -> the Ping monitor that will report its
- * health once bound to the device through `NetworkDevice.monitorId`.
+ * The sentence a provisioned monitor carries so its origin is legible later.
+ * Exported so the surfaces that build one can be tested against the exact
+ * wording rather than a paraphrase.
+ */
+export function buildPingMonitorDescription(data) {
+    const reachability = `Reachability for ${data.address}`;
+    switch (data.origin) {
+        case PingMonitorOrigin.DiscoveryImport:
+            return `${reachability}, created when this device was imported from a network discovery scan. The device answered ping but not SNMP, so this monitor is what reports whether it is up.`;
+        case PingMonitorOrigin.DeviceCreateForm:
+            return `${reachability}, created with this network device. The device is monitor-backed — nothing polls it over SNMP — so this monitor is what reports whether it is up.`;
+        case PingMonitorOrigin.BulkAction:
+            return `${reachability}, created by the device list's "Create Ping Monitors" action. The device is monitor-backed — nothing polls it over SNMP — so this monitor is what reports whether it is up.`;
+        case PingMonitorOrigin.DevicePage:
+        default:
+            return `${reachability}, created from this network device's page. The device is monitor-backed — nothing polls it over SNMP — so this monitor is what reports whether it is up.`;
+    }
+}
+/**
+ * One device address -> the Ping monitor that will report the device's
+ * health once bound to it through `NetworkDevice.monitorId`.
  *
- * The caller creates this monitor FIRST, then creates the device carrying the
- * new monitor's id: `NetworkDeviceService.onCreateSuccess` stamps the
- * monitor's current status onto the device at bind time, so the device's
- * status pill resolves on the first render rather than waiting for the
- * monitor's next status CHANGE (which on a healthy network may never come —
- * that was OneUptime/oneuptime#3392).
+ * This is the shape every provisioning surface shares: discovery import, the
+ * device create form, the "Create Ping Monitor" button on a device's page and
+ * the bulk action on the device list. They differ only in where the address
+ * and the name come from and in the origin sentence; the monitor itself —
+ * type, interval, criteria, incident suppression — is identical, which is
+ * what lets an operator treat every provisioned monitor the same way.
+ *
+ * Order of operations is the caller's: discovery creates the monitor FIRST
+ * and then the device carrying its id (so the create-time stamp resolves the
+ * pill immediately), while the create form and the bulk action create or
+ * already have the device and bind afterwards — which re-stamps through
+ * `NetworkDeviceService.onUpdateSuccess`, so the pill resolves just the same.
  */
-export function buildPingMonitorForDiscoveredHost(data) {
-    var _a;
-    const address = (((_a = data.host) === null || _a === void 0 ? void 0 : _a.ipAddress) || "").trim();
+export function buildPingMonitorForAddress(data) {
+    const address = (data.address || "").trim();
     if (!address) {
-        throw new Error("A discovered host needs an address before a Ping monitor can be built for it.");
+        throw new Error("A device needs an address before a Ping monitor can be built for it.");
     }
     const monitor = new Monitor();
     monitor.projectId = new ObjectID(data.projectId.toString());
     monitor.name = buildPingMonitorName(data.deviceName);
-    monitor.description = `Reachability for ${address}, created when this device was imported from a network discovery scan. The device answered ping but not SNMP, so this monitor is what reports whether it is up.`;
+    monitor.description = buildPingMonitorDescription({
+        address: address,
+        origin: data.origin,
+    });
     monitor.monitorType = MonitorType.Ping;
     monitor.monitoringInterval = PING_MONITOR_INTERVAL;
     const step = MonitorStep.getDefaultMonitorStep({
@@ -160,4 +204,32 @@ export function buildPingMonitorForDiscoveredHost(data) {
     monitor.monitorSteps = monitorSteps;
     return monitor;
 }
+/**
+ * One ping-only discovered host -> the Ping monitor that will report its
+ * health once bound to the device through `NetworkDevice.monitorId`.
+ *
+ * The caller creates this monitor FIRST, then creates the device carrying the
+ * new monitor's id: `NetworkDeviceService.onCreateSuccess` stamps the
+ * monitor's current status onto the device at bind time, so the device's
+ * status pill resolves on the first render rather than waiting for the
+ * monitor's next status CHANGE (which on a healthy network may never come —
+ * that was OneUptime/oneuptime#3392).
+ *
+ * A thin adapter over `buildPingMonitorForAddress`: the only thing a
+ * discovered host contributes is its address.
+ */
+export function buildPingMonitorForDiscoveredHost(data) {
+    var _a;
+    const address = (((_a = data.host) === null || _a === void 0 ? void 0 : _a.ipAddress) || "").trim();
+    if (!address) {
+        throw new Error("A discovered host needs an address before a Ping monitor can be built for it.");
+    }
+    return buildPingMonitorForAddress({
+        projectId: data.projectId,
+        address: address,
+        deviceName: data.deviceName,
+        seedIds: data.seedIds,
+        origin: PingMonitorOrigin.DiscoveryImport,
+    });
+}
 //# sourceMappingURL=PingMonitorBuilder.js.map

package/build/dist/Utils/NetworkDiscovery/PingMonitorBuilder.js.map

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

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

@@ -1,4 +1,5 @@
 import DeviceReachabilityUtil, { NetworkDeviceReachability, } from "../NetworkDevice/DeviceReachabilityUtil";
+import { NetworkDeviceMonitoringMethodUtil } from "../../Types/NetworkDevice/NetworkDeviceMonitoringMethod";
 import SiteHealthRollupPolicy, { DefaultSiteOfflineThresholdPercent, } from "../../Types/NetworkSite/SiteHealthRollupPolicy";
 export class SiteStatusRollupUtil {
     /*
@@ -8,13 +9,13 @@ export class SiteStatusRollupUtil {
      * operational/offline rows) - the caller treats null as "leave the site's
      * status untouched".
      *
-     * Per device: a stamped monitor status (with a known priority) wins;
-     * otherwise the device's SNMP reachability maps Up to the project's
-     * isOperationalState row and Down to its isOfflineState row. A device
-     * that has never been polled contributes nothing at all - it is not
-     * evidence of an outage, and counting it as one used to pin a site red
-     * for as long as it took the first walk to land. Priority ties keep the
-     * first contributor (stable).
+     * Per device: on a monitor-backed device a stamped monitor status (with a
+     * known priority) is the vote; otherwise the device's poll reachability
+     * maps Up to the project's isOperationalState row and Down to its
+     * isOfflineState row. A device that has never been polled contributes
+     * nothing at all - it is not evidence of an outage, and counting it as
+     * one used to pin a site red for as long as it took the first poll to
+     * land. Priority ties keep the first contributor (stable).
      */
     static worstStatus(data) {
         var _a;
@@ -22,7 +23,8 @@ export class SiteStatusRollupUtil {
         let winner = null;
         for (const device of data.deviceStates) {
             let candidate = null;
-            if (device.currentMonitorStatusId &&
+            if (SiteStatusRollupUtil.isStampAuthoritative(device) &&
+                device.currentMonitorStatusId &&
                 typeof device.monitorStatusPriority === "number" &&
                 Number.isFinite(device.monitorStatusPriority)) {
                 candidate = {
@@ -64,12 +66,12 @@ export class SiteStatusRollupUtil {
      * How the subtree splits between operational and not, in DEVICES rather
      * than in buckets.
      *
-     * A device counts as non-operational when its stamped MonitorStatus is not
-     * the operational one, or - for devices no monitor stamps - when its SNMP
-     * reachability is Down. Never-reported devices are excluded from both the
-     * numerator and the denominator, so a region half-way through its first
-     * discovery walk is scored on the half that has answered rather than
-     * marked down for the half that has not.
+     * A monitor-backed device counts as non-operational when its stamped
+     * MonitorStatus is not the operational one; a probe-polled device when its
+     * poll reachability is Down. Never-reported devices are excluded from both
+     * the numerator and the denominator, so a region half-way through its
+     * first discovery walk is scored on the half that has answered rather
+     * than marked down for the half that has not.
      */
     static deviceHealthShare(data) {
         const now = data.now || new Date();
@@ -77,7 +79,8 @@ export class SiteStatusRollupUtil {
         let nonOperational = 0;
         for (const device of data.deviceStates) {
             const count = SiteStatusRollupUtil.deviceCountOf(device);
-            if (device.currentMonitorStatusId &&
+            if (SiteStatusRollupUtil.isStampAuthoritative(device) &&
+                device.currentMonitorStatusId &&
                 typeof device.monitorStatusIsOperational === "boolean") {
                 reporting += count;
                 if (!device.monitorStatusIsOperational) {
@@ -210,6 +213,16 @@ export class SiteStatusRollupUtil {
         }
         return Math.floor(value);
     }
+    /*
+     * Whether this device's stamped MonitorStatus is its vote — true only for
+     * a monitor-backed device. One gate for both policies, so the same fleet
+     * cannot read differently depending on which one a site uses; and the
+     * same gate DeviceHealthStateUtil and the topology map apply, so the site
+     * card, the map and this rollup describe one network.
+     */
+    static isStampAuthoritative(device) {
+        return NetworkDeviceMonitoringMethodUtil.isMonitorBacked(device.monitoringMethod);
+    }
     static deviceCountOf(device) {
         if (typeof device.deviceCount !== "number" ||
             !Number.isFinite(device.deviceCount) ||
@@ -224,6 +237,8 @@ export class SiteStatusRollupUtil {
             lastPolledAt: device.lastPolledAt,
             lastSeenAt: device.lastSeenAt,
             pollingIntervalInMinutes: device.pollingIntervalInMinutes,
+            // See the field docs: decides whether the columns above mean anything.
+            monitoringMethod: device.monitoringMethod,
         }, now);
     }
 }

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

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

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

@@ -0,0 +1,191 @@
+/*
+ * Network site types describe the shape of a project's site tree. Keep the
+ * read-side helpers defensive: a direct database write or a partially applied
+ * migration can still leave an orphan or a cycle, and neither should make a
+ * settings page hang or hide a type from its operator.
+ */
+export default class NetworkSiteTypeHierarchyUtil {
+    static getParentId(networkSiteType) {
+        var _a, _b, _c, _d;
+        const parentId = ((_a = networkSiteType.parentNetworkSiteTypeId) === null || _a === void 0 ? void 0 : _a.toString()) ||
+            ((_c = (_b = networkSiteType.parentNetworkSiteType) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.toString()) ||
+            null;
+        if (parentId &&
+            parentId.toLowerCase() === ((_d = networkSiteType.id) === null || _d === void 0 ? void 0 : _d.toString().toLowerCase())) {
+            return null;
+        }
+        return parentId;
+    }
+    static buildIndex(data) {
+        var _a;
+        const byId = new Map();
+        const childrenByParentId = new Map();
+        for (const networkSiteType of data.networkSiteTypes) {
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (id) {
+                byId.set(id, networkSiteType);
+            }
+            const parentId = this.getParentId(networkSiteType);
+            const normalizedParentId = parentId
+                ? parentId.toLowerCase()
+                : null;
+            const siblings = childrenByParentId.get(normalizedParentId);
+            if (siblings) {
+                siblings.push(networkSiteType);
+            }
+            else {
+                childrenByParentId.set(normalizedParentId, [networkSiteType]);
+            }
+        }
+        for (const siblings of childrenByParentId.values()) {
+            this.sortInPlace(siblings);
+        }
+        return { byId, childrenByParentId };
+    }
+    static getAncestorNetworkSiteTypes(data) {
+        var _a;
+        const index = data.index || this.buildIndex(data);
+        const ancestors = [];
+        const visited = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            visited.add(ownId);
+        }
+        let parentId = this.getParentId(data.networkSiteType);
+        while (parentId) {
+            const normalizedParentId = parentId.toLowerCase();
+            if (visited.has(normalizedParentId)) {
+                break;
+            }
+            const parent = index.byId.get(normalizedParentId);
+            if (!parent) {
+                break;
+            }
+            ancestors.push(parent);
+            visited.add(normalizedParentId);
+            parentId = this.getParentId(parent);
+        }
+        return ancestors;
+    }
+    static getDescendantNetworkSiteTypes(data) {
+        var _a, _b;
+        const index = data.index || this.buildIndex(data);
+        const descendants = [];
+        const visited = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            visited.add(ownId);
+        }
+        let frontier = ownId
+            ? [...(index.childrenByParentId.get(ownId) || [])]
+            : [];
+        while (frontier.length > 0) {
+            const nextFrontier = [];
+            for (const networkSiteType of frontier) {
+                const id = (_b = networkSiteType.id) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase();
+                if (!id || visited.has(id)) {
+                    continue;
+                }
+                visited.add(id);
+                descendants.push(networkSiteType);
+                nextFrontier.push(...(index.childrenByParentId.get(id) || []));
+            }
+            frontier = nextFrontier;
+        }
+        return descendants;
+    }
+    /*
+     * Parent picker candidates. A leaf/unit type cannot own child types, and a
+     * type cannot be placed under itself or anything already below it.
+     */
+    static getValidParentCandidates(data) {
+        var _a, _b;
+        const index = data.index || this.buildIndex(data);
+        const excludedIds = new Set();
+        const ownId = (_a = data.networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+        if (ownId) {
+            excludedIds.add(ownId);
+        }
+        for (const descendant of this.getDescendantNetworkSiteTypes(Object.assign(Object.assign({}, data), { index }))) {
+            const descendantId = (_b = descendant.id) === null || _b === void 0 ? void 0 : _b.toString().toLowerCase();
+            if (descendantId) {
+                excludedIds.add(descendantId);
+            }
+        }
+        return this.sort(data.networkSiteTypes.filter((candidate) => {
+            var _a;
+            const candidateId = (_a = candidate.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            return (Boolean(candidateId) &&
+                !excludedIds.has(candidateId) &&
+                candidate.isUnitLevel !== true);
+        }));
+    }
+    static getBreadcrumbLabel(data) {
+        const ancestors = this.getAncestorNetworkSiteTypes(data).reverse();
+        return [...ancestors, data.networkSiteType]
+            .map((networkSiteType) => {
+            return networkSiteType.name || "Unnamed Site Type";
+        })
+            .join(data.separator || " › ");
+    }
+    static buildTree(data) {
+        var _a;
+        const index = data.index || this.buildIndex(data);
+        const visited = new Set();
+        const buildNode = (networkSiteType, depth) => {
+            var _a;
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (id) {
+                visited.add(id);
+            }
+            const children = id
+                ? (index.childrenByParentId.get(id) || [])
+                    .filter((child) => {
+                    var _a;
+                    const childId = (_a = child.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+                    return Boolean(childId) && !visited.has(childId);
+                })
+                    .map((child) => {
+                    return buildNode(child, depth + 1);
+                })
+                : [];
+            return { networkSiteType, depth, children };
+        };
+        const roots = this.sort(data.networkSiteTypes.filter((networkSiteType) => {
+            const parentId = this.getParentId(networkSiteType);
+            return !parentId || !index.byId.has(parentId.toLowerCase());
+        }));
+        const tree = roots.map((networkSiteType) => {
+            return buildNode(networkSiteType, 0);
+        });
+        /*
+         * A component containing only a cycle has no natural root. Promote one
+         * member so all rows remain visible, and the visited set breaks the loop.
+         */
+        for (const networkSiteType of this.sort(data.networkSiteTypes)) {
+            const id = (_a = networkSiteType.id) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase();
+            if (!id || visited.has(id)) {
+                continue;
+            }
+            tree.push(buildNode(networkSiteType, 0));
+        }
+        return tree;
+    }
+    static sort(networkSiteTypes) {
+        const copy = [...networkSiteTypes];
+        this.sortInPlace(copy);
+        return copy;
+    }
+    static sortInPlace(networkSiteTypes) {
+        networkSiteTypes.sort((a, b) => {
+            var _a, _b;
+            const aOrder = (_a = a.order) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
+            const bOrder = (_b = b.order) !== null && _b !== void 0 ? _b : Number.MAX_SAFE_INTEGER;
+            if (aOrder !== bOrder) {
+                return aOrder - bOrder;
+            }
+            return (a.name || "").localeCompare(b.name || "");
+        });
+    }
+}
+//# sourceMappingURL=TypeHierarchyUtil.js.map

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

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

package/build/dist/Utils/Rum/ChunkMath.js

@@ -143,5 +143,81 @@ export default class ChunkMath {
             return (total + Math.max(0, entry.chunkEndOffsetMs - entry.chunkStartOffsetMs));
         }, 0);
     }
+    /*
+     * Whether a manifest row is a terminator rather than footage.
+     *
+     * The recorder closes a tab with an empty chunk (payload "[]",
+     * eventCount 0) and emits the same shape when a session hits its chunk
+     * cap. The ingest stores them because they carry the end time, but they
+     * hold nothing to feed a Replayer: treating one as a chunk that "failed
+     * to decode" ends most sessions with an error banner instead of
+     * "recording ended".
+     */
+    static isTerminatorEntry(entry) {
+        return !(entry.eventCount > 0);
+    }
+    /*
+     * The smallest anchor strictly after a chunk index, or null. Used when a
+     * chunk fails to decode: the only safe place to resume is a later full
+     * snapshot, never the next present chunk.
+     */
+    static findNextAnchorAfter(anchors, afterChunkIndex) {
+        let best = null;
+        for (const anchor of anchors) {
+            if (anchor > afterChunkIndex && (best === null || anchor < best)) {
+                best = anchor;
+            }
+        }
+        return best;
+    }
+    /*
+     * True when every index in [fromChunkIndex, toChunkIndex] is present, so
+     * the range can be fed into a live Replayer in order without crossing a
+     * hole. A seek that lands ahead of the fed range but inside a contiguous
+     * run feeds forward instead of tearing the Replayer down.
+     */
+    static isContiguousRange(presentIndexes, fromChunkIndex, toChunkIndex) {
+        if (toChunkIndex < fromChunkIndex) {
+            return false;
+        }
+        for (let index = fromChunkIndex; index <= toChunkIndex; index++) {
+            if (!presentIndexes.has(index)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    /*
+     * The two-chunk priority page for a first paint: the anchor and one
+     * neighbour. The neighbour after it is preferred because playback moves
+     * forward; the one before it is the fallback so a lone full snapshot
+     * (the oversized-snapshot layout) still gets rrweb its two events and,
+     * more importantly, the Meta event that lives in the chunk before it.
+     */
+    static planPriorityPage(presentIndexes, anchorChunkIndex) {
+        if (!presentIndexes.has(anchorChunkIndex)) {
+            return [];
+        }
+        if (presentIndexes.has(anchorChunkIndex + 1)) {
+            return [anchorChunkIndex, anchorChunkIndex + 1];
+        }
+        if (presentIndexes.has(anchorChunkIndex - 1)) {
+            return [anchorChunkIndex - 1, anchorChunkIndex];
+        }
+        return [anchorChunkIndex];
+    }
+    /*
+     * Clamp a requested playhead into what the recording can show. A seek
+     * before the first playable moment lands ON that moment rather than
+     * being refused: refusing turns "press Play at the end" and every ?t=0
+     * link into a dead end whenever chunk 0 cannot anchor playback.
+     */
+    static clampSeekOffset(offsetMs, earliestPlayableMs, durationMs) {
+        if (!Number.isFinite(offsetMs)) {
+            return earliestPlayableMs;
+        }
+        const upper = Math.max(earliestPlayableMs, durationMs);
+        return Math.min(upper, Math.max(earliestPlayableMs, offsetMs));
+    }
 }
 //# sourceMappingURL=ChunkMath.js.map

package/build/dist/Utils/Rum/ChunkMath.js.map

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