@oneuptime/common 11.0.1 → 11.0.3

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

@@ -0,0 +1,174 @@
+import AggregationIntervalUtil from "../../Types/BaseDatabase/AggregationIntervalUtil";
+/*
+ * How long after a bucket closes we keep treating silence in it as
+ * "not evaluable yet" rather than "down". Covers collector export
+ * jitter + transport + ingest-queue wait for a heartbeat stamped near
+ * the end of the bucket.
+ *
+ * Worst-case downtime-onset-to-report on the Minute grid is the sum
+ * of: up to one bucket of in-bucket residual (outage right after a
+ * beat at a bucket start), one bucket to close, this lag buffer, and
+ * one more bucket for the bridge's right-neighbor witness to turn
+ * down — ~4 minutes total. The old behavior (report instantly, flap
+ * constantly on every refresh) was not worth those minutes.
+ */
+export const HEARTBEAT_INGEST_LAG_MS = 60000;
+/*
+ * Upper bound on how far the ingest pipeline may backdate a heartbeat
+ * from the ingest wall clock when trusting the batch's own scrape
+ * timestamps (see the heartbeat stamping in OtelMetricsIngestService,
+ * which imports this). The invariant that keeps a floored heartbeat
+ * rendering as UP here: this bound must stay <= one Minute bucket
+ * (60s, where the floored stamp lands and proves the bucket up)
+ * + HEARTBEAT_INGEST_LAG_MS (the unevaluable shadow) — with the
+ * single transitional bucket in between rescued by the Minute-grid
+ * bridge. Raise it past that and behind-skewed host clocks get a
+ * permanent false "down" tail at the chart's right edge.
+ */
+export const HEARTBEAT_MAX_BACKDATE_MS = 2 * 60000;
+export class HeartbeatAvailabilityUtil {
+    static buildAvailabilitySeries(data) {
+        const windowStartMs = data.windowStart.getTime();
+        const windowEndMs = data.windowEnd.getTime();
+        const nowMs = data.now.getTime();
+        if (!Number.isFinite(windowStartMs) ||
+            !Number.isFinite(windowEndMs) ||
+            windowEndMs <= windowStartMs) {
+            return { points: [], uptimePercent: null };
+        }
+        const interval = AggregationIntervalUtil.getAggregationIntervalForWindow({
+            startDate: data.windowStart,
+            endDate: data.windowEnd,
+        });
+        const bucketMs = AggregationIntervalUtil.getAggregationIntervalMs(interval);
+        const rowTimestamps = [];
+        for (const p of data.heartbeatData) {
+            const t = this.getBucketTimestamp(p);
+            const c = Number(p["value"]);
+            if (Number.isFinite(t) && Number.isFinite(c) && c > 0) {
+                rowTimestamps.push(t);
+            }
+        }
+        rowTimestamps.sort((a, b) => {
+            return a - b;
+        });
+        /*
+         * Anchor the grid to the first returned row rather than to the
+         * window start: server buckets are `toStartOfInterval`-aligned and
+         * the window start generally isn't, and anchoring to real data
+         * also absorbs any constant offset introduced by timestamp
+         * serialization. With no rows at all, anchor to the window start —
+         * everything is down regardless of alignment.
+         */
+        const anchorMs = rowTimestamps.length > 0 ? rowTimestamps[0] : windowStartMs;
+        const stepsBack = Math.ceil((anchorMs - windowStartMs) / bucketMs);
+        const gridStartMs = anchorMs - stepsBack * bucketMs;
+        const lastIndex = Math.floor((windowEndMs - gridStartMs) / bucketMs);
+        /*
+         * Snap each row to its nearest grid slot instead of requiring
+         * exact equality. Minute/hour buckets land exactly; day buckets
+         * can drift by an hour against a fixed 24h step when timestamps
+         * cross a DST boundary in the rendering timezone, and Month/Year
+         * widths are calendar-approximate — nearest-slot matching with a
+         * half-bucket tolerance absorbs all of those without ever mapping
+         * one row to two slots.
+         */
+        const presentSlots = new Set();
+        for (const t of rowTimestamps) {
+            const index = Math.round((t - gridStartMs) / bucketMs);
+            if (index >= 0 && index <= lastIndex) {
+                presentSlots.add(index);
+            }
+        }
+        /*
+         * A bucket is only evaluable as DOWN once it has fully closed and
+         * the ingest-lag buffer has passed. Buckets are also partial when
+         * they start before the window does (leading edge of the grid).
+         */
+        const evaluableEndMs = Math.min(windowEndMs, nowMs - HEARTBEAT_INGEST_LAG_MS);
+        const states = [];
+        for (let index = 0; index <= lastIndex; index++) {
+            const startMs = gridStartMs + index * bucketMs;
+            const up = presentSlots.has(index);
+            const isPartial = startMs < windowStartMs || startMs + bucketMs > evaluableEndMs;
+            if (up) {
+                states.push("up");
+            }
+            else if (isPartial) {
+                states.push("excluded");
+            }
+            else {
+                states.push("down");
+            }
+        }
+        /*
+         * Bridge single-bucket gaps — but only on the Minute grid. The
+         * hysteresis is justified by one missed 30-60s heartbeat emptying
+         * a 60s bucket; at Hour+ widths an empty bucket is dozens of
+         * consecutive missed beats — a real outage — and bridging it
+         * would erase up to a full bucket of genuine downtime from both
+         * the chart and the uptime %.
+         *
+         * Neighbor checks run in grid-index space against the ORIGINAL
+         * states (no chaining): a down slot bridges when both grid
+         * neighbors show no downtime AND at least one of them is a real
+         * up — an excluded or out-of-grid neighbor is unknown, not
+         * evidence of life, so it counts as a wildcard but never as the
+         * sole witness. This covers the window edges regardless of
+         * whether the window happens to align with a bucket boundary: a
+         * jitter miss in the first or last evaluable bucket bridges off
+         * its single up neighbor instead of rendering a one-refresh
+         * false-down flap.
+         */
+        const allowBridge = bucketMs <= 2 * 60000;
+        const isBridged = (index) => {
+            if (!allowBridge) {
+                return false;
+            }
+            const left = states[index - 1];
+            const right = states[index + 1];
+            const leftOk = left !== "down";
+            const rightOk = right !== "down";
+            return leftOk && rightOk && (left === "up" || right === "up");
+        };
+        const points = [];
+        let upCount = 0;
+        let evaluatedCount = 0;
+        for (let index = 0; index <= lastIndex; index++) {
+            const state = states[index];
+            if (state === "excluded") {
+                continue;
+            }
+            const up = state === "up" || isBridged(index);
+            points.push({
+                x: new Date(gridStartMs + index * bucketMs),
+                y: up ? 100 : 0,
+            });
+            evaluatedCount++;
+            if (up) {
+                upCount++;
+            }
+        }
+        return {
+            points,
+            uptimePercent: evaluatedCount > 0 ? (upCount / evaluatedCount) * 100 : null,
+        };
+    }
+    /*
+     * AggregatedModel exposes the bucket timestamp on `timestamp`, but
+     * the MV statement path aliases its time column to `time` — read
+     * whichever is present so rows are never silently dropped.
+     */
+    static getBucketTimestamp(p) {
+        const raw = p["timestamp"] !== undefined ? p["timestamp"] : p["time"];
+        if (raw instanceof Date) {
+            return raw.getTime();
+        }
+        if (typeof raw === "string" || typeof raw === "number") {
+            return new Date(raw).getTime();
+        }
+        return NaN;
+    }
+}
+export default HeartbeatAvailabilityUtil;
+//# sourceMappingURL=HeartbeatAvailability.js.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneuptime/common",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "description": "",
   "repository": {
     "type": "git",
@@ -19,6 +19,9 @@
   },
   "author": "OneUptime <hello@oneuptime.com> (https://oneuptime.com/)",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=26.0.0"
+  },
   "devDependencies": {
     "@faker-js/faker": "^8.0.2",
     "@testing-library/jest-dom": "^5.16.5",
@@ -33,7 +36,7 @@
     "@types/jsonwebtoken": "^8.5.9",
     "@types/node": "^17.0.45",
     "@types/node-cron": "^3.0.7",
-    "@types/nodemailer": "^6.4.7",
+    "@types/nodemailer": "^8.0.1",
     "@types/react": "^18.2.38",
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-big-calendar": "^1.8.5",
@@ -54,22 +57,22 @@
     "@elastic/elasticsearch": "^8.12.1",
     "@hcaptcha/react-hcaptcha": "^1.14.0",
     "@monaco-editor/react": "^4.4.6",
-    "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/api-logs": "^0.206.0",
-    "@opentelemetry/context-zone": "^1.25.1",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.207.0",
-    "@opentelemetry/exporter-metrics-otlp-proto": "^0.207.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
-    "@opentelemetry/id-generator-aws-xray": "^1.2.2",
-    "@opentelemetry/instrumentation": "^0.207.0",
-    "@opentelemetry/instrumentation-fetch": "^0.207.0",
-    "@opentelemetry/instrumentation-xml-http-request": "^0.207.0",
-    "@opentelemetry/resources": "^1.25.1",
-    "@opentelemetry/sdk-logs": "^0.207.0",
-    "@opentelemetry/sdk-metrics": "^1.25.1",
-    "@opentelemetry/sdk-node": "^0.207.0",
-    "@opentelemetry/sdk-trace-web": "^1.25.1",
+    "@opentelemetry/api": "^1.9.1",
+    "@opentelemetry/api-logs": "^0.219.0",
+    "@opentelemetry/context-zone": "^2.8.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.219.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "^0.219.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.219.0",
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.219.0",
+    "@opentelemetry/id-generator-aws-xray": "^2.1.0",
+    "@opentelemetry/instrumentation": "^0.219.0",
+    "@opentelemetry/instrumentation-fetch": "^0.219.0",
+    "@opentelemetry/instrumentation-xml-http-request": "^0.219.0",
+    "@opentelemetry/resources": "^2.8.0",
+    "@opentelemetry/sdk-logs": "^0.219.0",
+    "@opentelemetry/sdk-metrics": "^2.8.0",
+    "@opentelemetry/sdk-node": "^0.219.0",
+    "@opentelemetry/sdk-trace-web": "^2.8.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@pyroscope/nodejs": "^0.4.11",
     "@remixicon/react": "^4.2.0",
@@ -96,14 +99,14 @@
     "dompurify": "^3.4.0",
     "dotenv": "^16.4.4",
     "ejs": "^3.1.10",
-    "esbuild": "^0.25.5",
+    "esbuild": "^0.28.1",
     "expo-server-sdk": "^3.15.0",
     "express": "^4.21.1",
     "formik": "^2.4.6",
     "history": "^5.3.0",
     "i18next": "^23.16.8",
     "ioredis": "^5.3.2",
-    "isolated-vm": "^6.1.2",
+    "isolated-vm": "^7.0.0",
     "json2csv": "^5.0.7",
     "json5": "^2.2.3",
     "jsonwebtoken": "^9.0.0",
@@ -114,7 +117,7 @@
     "moment-timezone": "^0.5.45",
     "multer": "^2.1.1",
     "node-cron": "^4.0.0",
-    "nodemailer": "^7.0.7",
+    "nodemailer": "^8.0.11",
     "otpauth": "^9.3.1",
     "pg": "^8.16.3",
     "playwright": "^1.56.0",
@@ -156,5 +159,10 @@
     "use-async-effect": "^2.2.6",
     "web-push": "^3.6.7",
     "zod": "^3.25.76"
+  },
+  "overrides": {
+    "lodash-es": "^4.18.0",
+    "uuid": "^11.1.1",
+    "qs": "^6.15.2"
   }
 }