@oneuptime/common 14.0.1 → 14.0.2

package/build/dist/Utils/Telemetry/AttributesJSON.js

@@ -0,0 +1,245 @@
+export const ATTRIBUTES_JSON_FORMATS = [
+    "flat",
+    "nested",
+];
+// Written in place of a value that refers back to one of its own ancestors.
+export const CIRCULAR_REFERENCE_PLACEHOLDER = "[Circular]";
+function createSafeObject() {
+    return Object.create(null);
+}
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function compareKeys(left, right) {
+    return left.localeCompare(right);
+}
+/*
+ * One value made safe for JSON.stringify without changing what it means.
+ * `undefined` is returned for the values JSON has no way to carry (functions,
+ * symbols, undefined itself) so the caller can drop the key, as
+ * JSON.stringify would.
+ */
+function toJSONSafeValue(value, ancestors) {
+    if (value === null) {
+        return null;
+    }
+    switch (typeof value) {
+        case "string":
+        case "boolean":
+            return value;
+        case "number":
+            /*
+             * JSON.stringify writes NaN and Infinity as null, which would turn a
+             * recorded value into "no value". Keep what was recorded, as text.
+             */
+            return Number.isFinite(value) ? value : String(value);
+        case "bigint":
+            // JSON.stringify throws on a bigint; text keeps every digit.
+            return value.toString();
+        case "undefined":
+        case "function":
+        case "symbol":
+            return undefined;
+        default:
+            break;
+    }
+    if (value instanceof Date) {
+        return Number.isNaN(value.getTime()) ? String(value) : value.toISOString();
+    }
+    const objectValue = value;
+    if (ancestors.includes(objectValue)) {
+        return CIRCULAR_REFERENCE_PLACEHOLDER;
+    }
+    ancestors.push(objectValue);
+    try {
+        if (Array.isArray(objectValue)) {
+            return objectValue.map((item) => {
+                const safeItem = toJSONSafeValue(item, ancestors);
+                // JSON.stringify writes a missing array element as null too.
+                return safeItem === undefined ? null : safeItem;
+            });
+        }
+        const result = createSafeObject();
+        for (const key of Object.keys(objectValue).sort(compareKeys)) {
+            const safeValue = toJSONSafeValue(objectValue[key], ancestors);
+            if (safeValue !== undefined) {
+                result[key] = safeValue;
+            }
+        }
+        return result;
+    }
+    finally {
+        ancestors.pop();
+    }
+}
+/*
+ * Spans store attributes as a JSON column, so a sender that nested them
+ * (`{"http": {"method": "GET"}}`) arrives nested; logs store a flat map. The
+ * flat shape walks into plain objects and joins the path with dots. An empty
+ * object and an array are values in their own right and stay as they are.
+ */
+function flattenInto(target, source, prefix, ancestors) {
+    if (ancestors.includes(source)) {
+        if (prefix && !Object.prototype.hasOwnProperty.call(target, prefix)) {
+            target[prefix] = CIRCULAR_REFERENCE_PLACEHOLDER;
+        }
+        return;
+    }
+    ancestors.push(source);
+    try {
+        for (const key of Object.keys(source)) {
+            const value = source[key];
+            const fullKey = prefix ? `${prefix}.${key}` : key;
+            if (isRecord(value) &&
+                !(value instanceof Date) &&
+                Object.keys(value).length > 0) {
+                flattenInto(target, value, fullKey, ancestors);
+                continue;
+            }
+            const safeValue = toJSONSafeValue(value, ancestors);
+            /*
+             * `{"a.b": 1, "a": {"b": 2}}` names the same flat key twice. There is
+             * no lossless answer, so the first one seen is kept - deterministically,
+             * rather than whichever happened to be written last.
+             */
+            if (safeValue === undefined ||
+                Object.prototype.hasOwnProperty.call(target, fullKey)) {
+                continue;
+            }
+            target[fullKey] = safeValue;
+        }
+    }
+    finally {
+        ancestors.pop();
+    }
+}
+function sortObjectKeys(source) {
+    const sorted = createSafeObject();
+    for (const key of Object.keys(source).sort(compareKeys)) {
+        sorted[key] = source[key];
+    }
+    return sorted;
+}
+/**
+ * Attributes as one level of dotted keys, sorted, with every value keeping
+ * its type. Anything that is not an attribute map (null, an array, a
+ * primitive) yields an empty object.
+ */
+export function toFlatAttributesJSON(attributes) {
+    const flat = createSafeObject();
+    if (!isRecord(attributes)) {
+        return flat;
+    }
+    flattenInto(flat, attributes, "", []);
+    return sortObjectKeys(flat);
+}
+/**
+ * Attributes with their dotted keys expanded into nested objects.
+ *
+ * OpenTelemetry keys are not a tree: `db.system` and `db.system.name` are
+ * both valid attributes on the same span, and `db.system` cannot be a string
+ * and an object at once. Rather than drop one (what a naive unflatten does),
+ * the rest of a clashing path is kept as a dotted key inside the deepest
+ * object it can reach: `{"db": {"system": "postgresql", "system.name": ...}}`.
+ * Keys with an empty segment (`.leading`, `trailing.`, `a..b`) are not paths
+ * at all and are kept verbatim.
+ */
+export function toNestedAttributesJSON(attributes) {
+    const flat = toFlatAttributesJSON(attributes);
+    const nested = createSafeObject();
+    /*
+     * Only objects this function created while expanding a path may be walked
+     * into. An object that is itself an attribute value (an empty `{}`) is data
+     * and is never merged into.
+     */
+    const containers = new WeakSet();
+    containers.add(nested);
+    /*
+     * Sorted keys put a path before every key it prefixes (`db.system` before
+     * `db.system.name`), so a leaf is always placed before anything that would
+     * have to walk through it.
+     */
+    for (const key of Object.keys(flat)) {
+        const value = flat[key];
+        const segments = key.split(".");
+        if (segments.length === 1 ||
+            segments.some((segment) => {
+                return segment.length === 0;
+            })) {
+            if (!Object.prototype.hasOwnProperty.call(nested, key)) {
+                nested[key] = value;
+            }
+            continue;
+        }
+        let node = nested;
+        for (let index = 0; index < segments.length; index++) {
+            const segment = segments[index];
+            const isLast = index === segments.length - 1;
+            const existing = Object.prototype.hasOwnProperty.call(node, segment)
+                ? node[segment]
+                : undefined;
+            if (isLast) {
+                if (existing === undefined) {
+                    node[segment] = value;
+                }
+                break;
+            }
+            if (existing === undefined) {
+                const child = createSafeObject();
+                containers.add(child);
+                node[segment] = child;
+                node = child;
+                continue;
+            }
+            if (isRecord(existing) && containers.has(existing)) {
+                node = existing;
+                continue;
+            }
+            // A value already lives here: keep the rest of the path as one key.
+            const remainder = segments.slice(index).join(".");
+            if (!Object.prototype.hasOwnProperty.call(node, remainder)) {
+                node[remainder] = value;
+            }
+            break;
+        }
+    }
+    return nested;
+}
+export function toAttributesJSON(attributes, format) {
+    return format === "nested"
+        ? toNestedAttributesJSON(attributes)
+        : toFlatAttributesJSON(attributes);
+}
+/**
+ * The text the "Copy JSON" affordances put on the clipboard: pretty-printed
+ * with two spaces by default, `indent: 0` for a single line.
+ */
+export function stringifyAttributesJSON(attributes, format, options) {
+    const indent = (options === null || options === void 0 ? void 0 : options.indent) === undefined ? 2 : Math.max(0, options.indent);
+    return JSON.stringify(toAttributesJSON(attributes, format), null, indent || undefined);
+}
+/** How many attributes a copy will contain (flat keys). */
+export function countAttributes(attributes) {
+    return Object.keys(toFlatAttributesJSON(attributes)).length;
+}
+/**
+ * A one-line taste of what a format looks like for these attributes - the
+ * first attribute only, followed by an ellipsis when there are more - for
+ * the format picker. Empty when there is nothing to copy.
+ */
+export function previewAttributesJSON(attributes, format) {
+    const flat = toFlatAttributesJSON(attributes);
+    const keys = Object.keys(flat);
+    const firstKey = keys[0];
+    if (firstKey === undefined) {
+        return "";
+    }
+    const first = createSafeObject();
+    first[firstKey] = flat[firstKey];
+    const compact = JSON.stringify(format === "nested" ? toNestedAttributesJSON(first) : first);
+    if (keys.length === 1) {
+        return compact;
+    }
+    return `${compact.slice(0, -1)}, …}`;
+}
+//# sourceMappingURL=AttributesJSON.js.map

package/build/dist/Utils/Telemetry/AttributesJSON.js.map

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

package/build/dist/Utils/Uptime/DayUptimeGraphUtil.js

@@ -13,6 +13,8 @@
  * accessible names can be tested without a renderer.
  */
 import { DefaultUptimeHistoryLabels, } from "../../Types/Monitor/UptimeHistoryLabels";
+import OneUptimeDate from "../../Types/Date";
+import moment from "moment-timezone";
 class DayUptimeGraphUtil {
     /*
      * Where focus goes for a key pressed on the bar at `currentIndex`, or null
@@ -126,6 +128,107 @@ class DayUptimeGraphUtil {
             total: String(Math.max(data.dayCount, 0)),
         });
     }
+    static isValidTimezone(timezone) {
+        return (typeof timezone === "string" &&
+            timezone.trim() !== "" &&
+            moment.tz.zone(timezone) !== null);
+    }
+    /*
+     * The calendar days the strip draws, oldest first, one per bar.
+     *
+     * Without a zone this is the strip's long-standing behaviour, unchanged:
+     * the browser's own days, stepped from startDate.
+     *
+     * With a zone, the days are that zone's days. A strip painted from server
+     * readings must pass the zone the server cut its buckets in, or a bar and
+     * the reading it is painted from describe different spans of time. The
+     * status page's buckets are UTC days, shared by every visitor through one
+     * cached response. Drawn on a New York visitor's local days, each UTC
+     * bucket started at 20:00 the PREVIOUS local day, so every bar showed the
+     * next day's reading and today's bar had no reading at all.
+     *
+     * The zone path steps calendar days in the zone rather than adding 24
+     * hours, so a DST day is one bar of 23 or 25 hours, as the server's bucket
+     * for it is.
+     */
+    static getDays(data) {
+        const days = [];
+        if (!this.isValidTimezone(data.timezone)) {
+            const count = OneUptimeDate.getNumberOfDaysBetweenDatesInclusive(data.startDate, data.endDate);
+            for (let i = 0; i < count; i++) {
+                const date = OneUptimeDate.getSomeDaysAfterDate(data.startDate, i);
+                days.push({
+                    date: date,
+                    startOfDay: OneUptimeDate.getStartOfDay(date),
+                    endOfDay: OneUptimeDate.getEndOfDay(date),
+                });
+            }
+            return days;
+        }
+        const timezone = data.timezone;
+        const firstDay = OneUptimeDate.getStartOfDay(data.startDate, timezone);
+        const lastDay = OneUptimeDate.getStartOfDay(data.endDate, timezone);
+        /*
+         * Rounded, because a span of calendar days that crosses a DST change is
+         * a whole number of days give or take an hour, never exactly.
+         */
+        const count = Math.round((lastDay.getTime() - firstDay.getTime()) / (24 * 60 * 60 * 1000)) + 1;
+        /*
+         * Stepped from local MIDDAY, not midnight. In a zone that changes its
+         * clocks at midnight (America/Santiago, America/Havana, Asia/Beirut) that
+         * day has no 00:00, and stepping a midnight onto it keeps the old offset
+         * and lands on 23:00 of the PREVIOUS day - which would draw that day twice
+         * and skip the next. Midday is never in a DST gap. addRemoveHours adds
+         * absolute hours, so the anchor is 11:00-13:00 local on firstDay's own
+         * date even when that date is 23 or 25 hours long.
+         */
+        const midday = OneUptimeDate.addRemoveHours(firstDay, 12);
+        const getStartOfNthDay = (n) => {
+            return OneUptimeDate.getStartOfDay(OneUptimeDate.addRemoveDays(midday, n, timezone), timezone);
+        };
+        for (let i = 0; i < count; i++) {
+            const startOfDay = getStartOfNthDay(i);
+            days.push({
+                date: startOfDay,
+                startOfDay: startOfDay,
+                /*
+                 * The next day's start less a millisecond, not endOf("day"): on a
+                 * day whose clock repeats its last hour, endOf("day") is the FIRST
+                 * 23:59:59.999 and the repeated hour would belong to no bar.
+                 */
+                endOfDay: new Date(getStartOfNthDay(i + 1).getTime() - 1),
+            });
+        }
+        return days;
+    }
+    /*
+     * The date a bar is labelled with, in the zone its day was drawn in.
+     *
+     * When that zone draws a different calendar day from the visitor's own -
+     * a UTC strip read from New York - the label says which zone it is, so
+     * "Sep 23" at eight in the evening on Sep 22 reads as the UTC date it is
+     * rather than as a mistake. When the two agree on the day (a UTC strip read
+     * in London in winter), the label is left alone.
+     */
+    static formatDayLabel(data) {
+        if (!this.isValidTimezone(data.timezone)) {
+            return OneUptimeDate.getDateAsUserFriendlyLocalFormattedString(data.date, true);
+        }
+        const label = OneUptimeDate.getDateAsCustomFormattedStringInTimezone({
+            date: data.date,
+            format: "MMM DD, YYYY",
+            timezone: data.timezone,
+        });
+        const viewerTimezone = OneUptimeDate.getCurrentTimezone();
+        const barOffset = moment(data.date).tz(data.timezone).utcOffset();
+        const viewerOffset = this.isValidTimezone(viewerTimezone)
+            ? moment(data.date).tz(viewerTimezone).utcOffset()
+            : barOffset;
+        if (barOffset === viewerOffset) {
+            return label;
+        }
+        return `${label} (${OneUptimeDate.getZoneAbbrByTimezone(data.timezone, data.date)})`;
+    }
     /*
      * The same {{placeholder}} shape i18next uses, so a caller can hand these
      * strings straight from a translation file. Replacing rather than

package/build/dist/Utils/Uptime/DayUptimeGraphUtil.js.map

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

package/build/dist/Utils/Uptime/UptimeUtil.js

@@ -3,6 +3,48 @@ import OneUptimeDate from "../../Types/Date";
 import ObjectID from "../../Types/ObjectID";
 import UptimePrecision from "../../Types/StatusPage/UptimePrecision";
 export default class UptimeUtil {
+    /**
+     * Chronological order for timeline rows, to the millisecond.
+     *
+     * Not OneUptimeDate.isAfter: that compares at SECOND granularity, so two
+     * rows that start within the same wall-clock second compare as equal and
+     * keep whatever order they arrived in. The server sends rows newest-first,
+     * and a flapping monitor writes most of its transitions within a second of
+     * each other (Offline at 12:47:40.326, back to Operational at .540). Left in
+     * arrival order, the still-open Operational row sorted BEFORE the Offline
+     * row it follows, took that row's start as its own end, and ended before it
+     * began. The monitor's current status then never reached "now", so today's
+     * bar had nothing in it and was painted the no-events colour - grey on a
+     * page whose default bar colour is grey - while the monitor was up.
+     *
+     * On an exact tie a closed row sorts before an open one, so the open row is
+     * the one that runs on to the next row or to now. This is the order
+     * getRollingUptimeTotals and getDailyUptimeAggregate use server-side
+     * (`ORDER BY startsAt, endsAt NULLS LAST`); the zero-length row a backfill
+     * tie leaves behind can then never cut the open row short.
+     */
+    static compareTimelinesChronologically(a, b) {
+        if (!a.startsAt || !b.startsAt) {
+            return 0;
+        }
+        const startDifference = OneUptimeDate.fromString(a.startsAt).getTime() -
+            OneUptimeDate.fromString(b.startsAt).getTime();
+        if (startDifference !== 0) {
+            return startDifference;
+        }
+        if (!a.endsAt && !b.endsAt) {
+            return 0;
+        }
+        // closed before open.
+        if (!a.endsAt) {
+            return 1;
+        }
+        if (!b.endsAt) {
+            return -1;
+        }
+        return (OneUptimeDate.fromString(a.endsAt).getTime() -
+            OneUptimeDate.fromString(b.endsAt).getTime());
+    }
     /**
      * This function, `getMonitorEventsForId`, takes a `monitorId` as an argument and returns an array of `MonitorEvent` objects.
      * @param {ObjectID} monitorId - The ID of the monitor for which events are to be fetched.
@@ -12,19 +54,10 @@ export default class UptimeUtil {
     static getMonitorEventsForId(monitorId, statusTimelineItems, window) {
         // Initialize an empty array to store the monitor events.
         var _a, _b, _c, _d, _e, _f;
-        // make sure items are sorted by start date.
+        // make sure items are sorted by start date - to the millisecond, see compareTimelinesChronologically.
         let items = [...statusTimelineItems];
         items = items.sort((a, b) => {
-            if (!a.startsAt || !b.startsAt) {
-                return 0;
-            }
-            if (OneUptimeDate.isAfter(a.startsAt, b.startsAt)) {
-                return 1;
-            }
-            if (OneUptimeDate.isAfter(b.startsAt, a.startsAt)) {
-                return -1;
-            }
-            return 0;
+            return UptimeUtil.compareTimelinesChronologically(a, b);
         });
         const eventList = [];
         const monitorEvents = items.filter((item) => {
@@ -73,6 +106,16 @@ export default class UptimeUtil {
                     continue;
                 }
             }
+            else if (OneUptimeDate.fromString(eventEndDate).getTime() <
+                OneUptimeDate.fromString(eventStartDate).getTime()) {
+                /*
+                 * An event that ends before it starts covers nothing. Kept, it counts
+                 * negative seconds, which the day bars and the downtime sums then
+                 * subtract from real time. A row can only produce one from a corrupt
+                 * endsAt now that the rows are sorted to the millisecond.
+                 */
+                continue;
+            }
             // Push a new MonitorEvent object to the eventList array with properties from the current item and calculated dates.
             eventList.push({
                 startDate: eventStartDate,
@@ -87,6 +130,14 @@ export default class UptimeUtil {
         // Return the populated eventList array.
         return eventList;
     }
+    /*
+     * Start-date order for events, to the millisecond rather than to the second
+     * OneUptimeDate.isAfter compares at. Ties keep their existing order.
+     */
+    static compareEventsByStartDate(a, b) {
+        return (OneUptimeDate.fromString(a.startDate).getTime() -
+            OneUptimeDate.fromString(b.startDate).getTime());
+    }
     static getNonOverlappingMonitorEvents(items, window) {
         var _a;
         const monitorEventList = this.getMonitorEvents(items, window);
@@ -156,29 +207,21 @@ export default class UptimeUtil {
             const monitorEvents = this.getMonitorEventsForId(monitorId, items, window);
             eventList.push(...monitorEvents);
         }
-        // sort event list by start date.
+        /*
+         * sort event list by start date, to the millisecond. Events from several
+         * monitors (a monitor group) that start within the same second must still
+         * come out in the order they happened - see compareTimelinesChronologically.
+         */
         eventList.sort((a, b) => {
-            if (OneUptimeDate.isAfter(a.startDate, b.startDate)) {
-                return 1;
-            }
-            if (OneUptimeDate.isAfter(b.startDate, a.startDate)) {
-                return -1;
-            }
-            return 0;
+            return UptimeUtil.compareEventsByStartDate(a, b);
         });
         return [...eventList];
     }
     static getTotalDowntimeInSeconds(monitorStatusTimelines, downtimeMonitorStatuses, window) {
         const monitorEvents = this.getNonOverlappingMonitorEvents(monitorStatusTimelines, window);
-        // sort these by start date,
+        // sort these by start date, to the millisecond.
         monitorEvents.sort((a, b) => {
-            if (OneUptimeDate.isAfter(a.startDate, b.startDate)) {
-                return 1;
-            }
-            if (OneUptimeDate.isAfter(b.startDate, a.startDate)) {
-                return -1;
-            }
-            return 0;
+            return UptimeUtil.compareEventsByStartDate(a, b);
         });
         /*
          * If a window is supplied then the time period is the window itself, and not "first event -> now".
@@ -287,6 +330,27 @@ export default class UptimeUtil {
             precision,
         });
     }
+    /**
+     * Uptime over the seconds that were actually recorded, or null when none
+     * were, so a caller can tell a resource with no data from one that was up.
+     *
+     * Both uncapped figures come through here: a single monitor's, from its
+     * day buckets, and a merged one from getMergedDowntimeSeconds. Measured
+     * over coverage rather than the window, a monitor younger than the window
+     * is measured from its first reading. Clamped to [0, 100], then rounded
+     * down to the precision the way every other uptime figure is.
+     */
+    static calculateUptimePercentOfCoveredSeconds(data) {
+        if (!(data.coveredSeconds > 0)) {
+            return null;
+        }
+        const percentage = ((data.coveredSeconds - data.downtimeSeconds) / data.coveredSeconds) *
+            100;
+        return this.roundToPrecision({
+            number: Math.min(100, Math.max(0, percentage)),
+            precision: data.precision,
+        });
+    }
     static calculateAvgUptimePercentage(data) {
         // calculate percentage.
         const { uptimePercentages, precision } = data;

package/build/dist/Utils/Uptime/UptimeUtil.js.map

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

package/jest.config.json

@@ -5,7 +5,8 @@
   "globals": {
     "ts-jest": {
       "tsconfig": "tsconfig.json",
-      "babelConfig": false
+      "babelConfig": false,
+      "isolatedModules": true
     }
   },
   "modulePathIgnorePatterns": ["<rootDir>/build/dist"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "14.0.1",
+  "version": "14.0.2",
   "description": "",
   "repository": {
     "type": "git",
@@ -12,6 +12,7 @@
     "test-file": "cd ../.. && export $(grep -v '^#' config.env | xargs) && cd packages/Common && node node_modules/.bin/jest --runInBand $1 --detectOpenHandles",
     "coverage": "jest --detectOpenHandles --coverage",
     "compile": "tsc",
+    "compile-tests": "node --max-old-space-size=8192 node_modules/typescript/bin/tsc -p tsconfig.tests.json",
     "clear-modules": "rm -rf node_modules && rm package-lock.json && npm install",
     "dep-check": "npm install -g depcheck && depcheck ./ --skip-missing=true",
     "debug:test": "cd ../.. && export $(grep -v '^#' config.env | xargs) && cd packages/Common && node --inspect node_modules/.bin/jest --runInBand ./Tests --detectOpenHandles",