@sensiblestats/widget-react 0.48.0 → 0.48.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @sensiblestats/widget-react
 
+## 0.48.1
+
+### Patch Changes
+
+- A live match no longer loses its minute and drop out of the live section just because its score has not changed recently. The per-match staleness check read a last-changed timestamp as if it were a last-polled one.
+
 ## 0.48.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -1548,43 +1548,8 @@ function dueMatchIds(groups, states, nowMs) {
   return [...due];
 }
 
-// src/liveClock.ts
-var STALE_READING_MS = 5 * 6e4;
-function parseMinute(label) {
-  if (!label) return null;
-  const plus = /^(\d+)\+(\d+)'$/.exec(label);
-  if (plus) return Number(plus[1]) + Number(plus[2]);
-  const plain = /^(\d+)'$/.exec(label);
-  return plain ? Number(plain[1]) : null;
-}
-function readingAgeMs(state, nowMs) {
-  if (!state?.stateAsOfUtc) return null;
-  const t = Date.parse(state.stateAsOfUtc);
-  return Number.isNaN(t) ? null : Math.max(0, nowMs - t);
-}
-function isReadingStale(state, nowMs) {
-  if (state?.isHalfTime) return false;
-  const age = readingAgeMs(state, nowMs);
-  return age !== null && age > STALE_READING_MS;
-}
-function displayMinute(state, nowMs) {
-  if (!state || state.phase !== "live") return null;
-  if (state.isHalfTime) return null;
-  if (isReadingStale(state, nowMs)) return null;
-  const base = parseMinute(state.minuteLabel);
-  if (base === null) return null;
-  const age = readingAgeMs(state, nowMs);
-  if (age === null) return state.minuteLabel ?? null;
-  const advanced = base + Math.floor(age / 6e4);
-  return `${advanced}'`;
-}
-function isTreatedLive(state, pollStale, nowMs) {
-  return state?.phase === "live" && !pollStale && !isReadingStale(state, nowMs);
-}
-
 // src/useMatchDiscovery.ts
 var POLL_MS = 6e4;
-var CLOCK_MS = 1e4;
 var ROLLOVER_CHECK_MS = 6e4;
 var STALE_AFTER_FAILURES = 2;
 function localDateOf(now) {
@@ -1597,7 +1562,6 @@ function useMatchDiscovery(opts) {
   const [groups, setGroups] = (0, import_react4.useState)([]);
   const [states, setStates] = (0, import_react4.useState)({});
   const [failures, setFailures] = (0, import_react4.useState)(0);
-  const [nowMs, setNowMs] = (0, import_react4.useState)(() => Date.now());
   const [expanded, setExpanded] = (0, import_react4.useState)({});
   const [touched, setTouched] = (0, import_react4.useState)({});
   const groupsRef = (0, import_react4.useRef)(groups);
@@ -1675,21 +1639,16 @@ function useMatchDiscovery(opts) {
     }, POLL_MS);
     return () => clearInterval(id);
   }, [opts.isOpen, tick, groups]);
-  (0, import_react4.useEffect)(() => {
-    if (!opts.isOpen) return;
-    const id = setInterval(() => setNowMs(Date.now()), CLOCK_MS);
-    return () => clearInterval(id);
-  }, [opts.isOpen]);
   const stale = failures >= STALE_AFTER_FAILURES;
   const liveCount = (0, import_react4.useMemo)(
-    () => stale ? 0 : Object.values(states).filter((s) => s.phase === "live" && !isReadingStale(s, nowMs)).length,
-    [states, stale, nowMs]
+    () => stale ? 0 : Object.values(states).filter((s) => s.phase === "live").length,
+    [states, stale]
   );
   const toggleGroup = (0, import_react4.useCallback)((competitionId) => {
     setTouched((prev) => ({ ...prev, [competitionId]: true }));
     setExpanded((prev) => ({ ...prev, [competitionId]: !prev[competitionId] }));
   }, []);
-  return { groups, states, nowMs, liveCount, stale, expanded, toggleGroup, _tick: tick };
+  return { groups, states, liveCount, stale, expanded, toggleGroup, _tick: tick };
 }
 
 // src/eventLogContext.ts
@@ -3047,7 +3006,7 @@ function computeDisplayMinute(minute, clockRunning, receivedAtMs) {
   return minute + Math.min(Math.max(0, elapsedMinutes), MAX_LIVE_TICK_MINUTES);
 }
 function useLiveClock(minute, clockRunning, receivedAtMs) {
-  const [displayMinute2, setDisplayMinute] = (0, import_react19.useState)(
+  const [displayMinute, setDisplayMinute] = (0, import_react19.useState)(
     () => computeDisplayMinute(minute, clockRunning, receivedAtMs)
   );
   (0, import_react19.useEffect)(() => {
@@ -3058,7 +3017,7 @@ function useLiveClock(minute, clockRunning, receivedAtMs) {
     }, TICK_MS);
     return () => window.clearInterval(id);
   }, [minute, clockRunning, receivedAtMs]);
-  return displayMinute2;
+  return displayMinute;
 }
 
 // src/components/dashboard/LiveScoreCard.tsx
@@ -3090,7 +3049,7 @@ function LiveScoreCard({
   if (!seedRef.current || seedRef.current.key !== seedKey) {
     seedRef.current = { key: seedKey, receivedAtMs: Date.now() };
   }
-  const displayMinute2 = useLiveClock(data.minute, data.clockRunning, seedRef.current.receivedAtMs);
+  const displayMinute = useLiveClock(data.minute, data.clockRunning, seedRef.current.receivedAtMs);
   const minuteSuffix = data.minuteLabel.replace(/^\d+/, "");
   const scorers = scorersLine(goalEvents);
   return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: "ss-w-fandash-card ss-w-fandash-live-score", children: [
@@ -3100,7 +3059,7 @@ function LiveScoreCard({
         /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "ss-w-fandash-live-dot", "aria-hidden": "true" }),
         data.statusLabel
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "ss-w-fandash-live-minute", children: `${displayMinute2}${minuteSuffix}` }),
+      /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "ss-w-fandash-live-minute", children: `${displayMinute}${minuteSuffix}` }),
       data.competition ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)("span", { className: "ss-w-fandash-live-competition", children: data.competition }) : null
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)("div", { className: "ss-w-fandash-live-main", children: [
@@ -3782,11 +3741,10 @@ function Side({ name, crest }) {
     /* @__PURE__ */ (0, import_jsx_runtime49.jsx)("span", { className: "ss-w-drow-nm", children: name })
   ] });
 }
-function FixtureRow({ match, state, stale, nowMs, ui, monitor }) {
-  const readingStale = isReadingStale(state, nowMs);
-  const isLive = state?.phase === "live" && !stale && !readingStale;
+function FixtureRow({ match, state, stale, ui, monitor }) {
+  const isLive = state?.phase === "live" && !stale;
   const hasScore = (state?.phase === "live" || state?.phase === "fullTime") && typeof state.homeScore === "number" && typeof state.awayScore === "number";
-  const ticked = displayMinute(state, nowMs);
+  const ticked = state?.phase === "live" ? state.minuteLabel ?? null : null;
   const isFinished = state?.phase === "fullTime";
   const when = state?.isHalfTime && !stale ? ui.halfTime : isLive ? ticked ?? "\u2014" : state?.phase === "live" ? "\u2014" : isFinished ? ui.fullTime : kickoffLabel(match.kickoffUnix);
   const pin = { kind: "match", matchId: match.matchId };
@@ -3802,10 +3760,15 @@ function FixtureRow({ match, state, stale, nowMs, ui, monitor }) {
   ] });
 }
 
+// src/liveClock.ts
+function isTreatedLive(state, pollStale) {
+  return state?.phase === "live" && !pollStale;
+}
+
 // src/components/CompetitionGroup.tsx
 var import_jsx_runtime50 = require("react/jsx-runtime");
-function CompetitionGroup({ group, open, onToggle, states, stale, nowMs, ui, monitor, disambiguate = false }) {
-  const own = group.matches.filter((m) => !isTreatedLive(states[m.matchId], stale, nowMs));
+function CompetitionGroup({ group, open, onToggle, states, stale, ui, monitor, disambiguate = false }) {
+  const own = group.matches.filter((m) => !isTreatedLive(states[m.matchId], stale));
   const hasLive = own.length !== group.matches.length;
   if (own.length === 0) {
     return null;
@@ -3824,15 +3787,15 @@ function CompetitionGroup({ group, open, onToggle, states, stale, nowMs, ui, mon
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("span", { className: "ss-w-grp-count", children: own.length })
     ] }),
-    open && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: "ss-w-grp-body", children: own.map((m) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(FixtureRow, { match: m, state: states[m.matchId], stale, nowMs, ui, monitor }, m.matchId)) })
+    open && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { className: "ss-w-grp-body", children: own.map((m) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(FixtureRow, { match: m, state: states[m.matchId], stale, ui, monitor }, m.matchId)) })
   ] });
 }
 
 // src/components/TodayPanel.tsx
 var import_jsx_runtime51 = require("react/jsx-runtime");
 function TodayPanel({ discovery, ui, monitor }) {
-  const { groups, states, nowMs, stale, expanded, toggleGroup } = discovery;
-  const liveRows = stale ? [] : groups.flatMap((group) => group.matches.filter((m) => isTreatedLive(states[m.matchId], stale, nowMs)).map((match) => ({ match, rank: group.rank }))).sort((a, b) => a.rank - b.rank);
+  const { groups, states, stale, expanded, toggleGroup } = discovery;
+  const liveRows = stale ? [] : groups.flatMap((group) => group.matches.filter((m) => isTreatedLive(states[m.matchId], stale)).map((match) => ({ match, rank: group.rank }))).sort((a, b) => a.rank - b.rank);
   const nameCounts = groups.reduce((acc, g) => {
     acc[g.competitionName] = (acc[g.competitionName] ?? 0) + 1;
     return acc;
@@ -3850,7 +3813,6 @@ function TodayPanel({ discovery, ui, monitor }) {
           match,
           state: states[match.matchId],
           stale,
-          nowMs,
           ui,
           monitor
         },
@@ -3866,7 +3828,6 @@ function TodayPanel({ discovery, ui, monitor }) {
         disambiguate: (nameCounts[group.competitionName] ?? 0) > 1,
         states,
         stale,
-        nowMs,
         ui,
         monitor
       },