dsh-subscriptions 0.1.5 → 0.2.2

package/lib/client/usage-pace.js

@@ -21,7 +21,7 @@ export function resetCountdownParts(ms) {
         { unit: 'hour', count: Math.floor((total % 1440) / 60) },
         { unit: 'minute', count: total % 60 },
     ];
-    return parts.filter(part => part.count > 0).slice(0, 2);
+    return parts.filter((part) => part.count > 0).slice(0, 2);
 }
 /**
  * Whether the reported percentage still describes the window now. Only a fresh
@@ -30,10 +30,14 @@ export function resetCountdownParts(ms) {
  * drawn: where the window stands in time never depends on the reading.
  */
 export function isUsageFresh(window, observation, now = Date.now()) {
-    return validUsage(window.usedPercent) && observation.stale !== true
-        && observation.observedAt !== undefined && Number.isFinite(observation.observedAt)
-        && observation.observedAt <= now && now - observation.observedAt <= USAGE_FRESHNESS_MS
-        && (window.resetsAt === undefined || Number.isFinite(window.resetsAt) && window.resetsAt > now);
+    return (validUsage(window.usedPercent) &&
+        observation.stale !== true &&
+        observation.observedAt !== undefined &&
+        Number.isFinite(observation.observedAt) &&
+        observation.observedAt <= now &&
+        now - observation.observedAt <= USAGE_FRESHNESS_MS &&
+        (window.resetsAt === undefined ||
+            (Number.isFinite(window.resetsAt) && window.resetsAt > now)));
 }
 /**
  * How far through its window the clock is, from the window's own timing alone.
@@ -48,10 +52,19 @@ export function elapsedPercent(window, now = Date.now()) {
     if (end === undefined || !Number.isFinite(end) || end <= now)
         return undefined;
     const duration = window.windowDurationMs;
-    const start = window.startsAt ?? (window.fixedWindow === true && duration !== undefined && Number.isFinite(duration) && duration > 0 ? end - duration : undefined);
-    if (start === undefined || !Number.isFinite(start) || start >= end || start > now)
+    const start = window.startsAt ??
+        (window.fixedWindow === true &&
+            duration !== undefined &&
+            Number.isFinite(duration) &&
+            duration > 0
+            ? end - duration
+            : undefined);
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
         return undefined;
-    return Math.min(100, Math.max(0, (now - start) / (end - start) * 100));
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
 }
 export function usageColorState(used, elapsed, preset, fresh) {
     if (!validUsage(used))
@@ -65,7 +78,27 @@ export function usageColorState(used, elapsed, preset, fresh) {
 }
 export function usageBarColor(used, elapsed, preset = 'standard', fresh = true) {
     const state = usageColorState(used, elapsed, preset, fresh);
-    return state === 'red' ? 'var(--dsw-alias-state-error-primary)'
-        : state === 'yellow' ? 'var(--dsw-alias-state-warn-label)'
+    return state === 'red'
+        ? 'var(--dsw-alias-state-error-primary)'
+        : state === 'yellow'
+            ? 'var(--dsw-alias-state-warn-label)'
             : 'var(--dsw-alias-state-success-primary)';
 }
+/**
+ * Marker position from the window's display-only assumed start
+ * (`displayStartsAt`): the reading and its age are irrelevant, exactly
+ * like the verified marker. Returns undefined when the window carries no
+ * assumed start or its reset has passed.
+ */
+export function displayStartPercent(window, now = Date.now()) {
+    const end = window.resetsAt;
+    const start = window.displayStartsAt;
+    if (end === undefined || !Number.isFinite(end) || end <= now)
+        return undefined;
+    if (start === undefined ||
+        !Number.isFinite(start) ||
+        start >= end ||
+        start > now)
+        return undefined;
+    return Math.min(100, Math.max(0, ((now - start) / (end - start)) * 100));
+}