@goodandready/dsh-subscriptions 0.5.0 → 0.5.1

package/lib/client.js

@@ -322,6 +322,22 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     }
 
     // #51: live countdown to the quota window reset (account.quota.resetAt).
+        function formatRelativeReset(resetAt, lang, now) {
+      if (!resetAt || !Number.isFinite(resetAt) || resetAt <= 0) return ''
+      var delta = resetAt - (now || Date.now())
+      var isRu = lang !== 'en'
+      if (delta <= 0) return isRu ? 'только что' : 'just now'
+      var totalMinutes = Math.max(1, Math.round(delta / 60000))
+      var days = Math.floor(totalMinutes / 1440)
+      var hours = Math.floor((totalMinutes % 1440) / 60)
+      var minutes = totalMinutes % 60
+      var bits = []
+      if (days) bits.push(days + (isRu ? ' дн' : 'd'))
+      if (hours) bits.push(hours + (isRu ? ' ч' : 'h'))
+      if (minutes || !bits.length) bits.push(minutes + (isRu ? ' мин' : 'm'))
+      return (isRu ? 'через ' : 'in ') + bits.join(' ')
+    }
+
     function ResetCountdown(props) {
       const [now, setNow] = React.useState(Date.now())
       React.useEffect(() => {
@@ -331,12 +347,15 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       const ms = (props.resetAt || 0) - now
       if (ms <= 0) return null
       const total = Math.floor(ms / 1000)
-      const h = Math.floor(total / 3600)
-      const m = Math.floor((total % 3600) / 60)
+      if (total > 3600) {
+        return React.createElement('span', { className: 'dsub-sub', style: { fontVariantNumeric: 'tabular-nums' } },
+          t('resetLabel') + ' ' + formatRelativeReset(props.resetAt, t('lang'), now))
+      }
+      const m = Math.floor(total / 60)
       const sec = total % 60
       const pad = (n) => String(n).padStart(2, '0')
       return React.createElement('span', { className: 'dsub-sub', style: { fontVariantNumeric: 'tabular-nums' } },
-        t('resetLabel') + ' ' + pad(h) + ':' + pad(m) + ':' + pad(sec))
+        t('resetLabel') + ' ' + pad(m) + ':' + pad(sec))
     }
 
     function badgeFor(account, t) {
@@ -1222,7 +1241,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement('div', { className: 'dsub-heroBars' },
             React.createElement('div', null,
               React.createElement('div', { className: 'dsub-barLabelRow' },
-                React.createElement('span', { style: { fontWeight: 600 } }, (primaryWin && primaryWin.label) ? primaryWin.label + ' window' : t('subs5hWindow')),
+                React.createElement('span', { style: { fontWeight: 600 } }, ((primaryWin && primaryWin.label) ? primaryWin.label + ' window' : t('subs5hWindow')) + (primaryWin && primaryWin.resetAt ? ' (' + formatRelativeReset(primaryWin.resetAt, t('lang'), now) + ')' : '')),
                 React.createElement('span', { style: { fontVariantNumeric: 'tabular-nums', fontWeight: 600 } }, primPct + '% ' + t('subsUsed') + ' (' + (100 - primPct) + '% ' + t('subsFree') + ')'),
               ),
               React.createElement('div', { className: 'dsub-barTrack' },

package/lib/relative-time.js

@@ -0,0 +1,47 @@
+/**
+ * Format a future timestamp as a relative remaining duration down to the minute.
+ * Supports en and ru.
+ */
+
+export const RELATIVE_UNITS = {
+  en: {
+    soon: 'just now',
+    prefix: 'in ',
+    suffix: '',
+    minute: '{n}m',
+    hour: '{n}h',
+    day: '{n}d',
+  },
+  ru: {
+    soon: 'только что',
+    prefix: 'через ',
+    suffix: '',
+    minute: '{n} мин',
+    hour: '{n} ч',
+    day: '{n} дн',
+  },
+}
+
+function fill(template, n) {
+  return String(template).replace('{n}', String(n))
+}
+
+export function formatRelativeReset(resetAt, lang = 'ru', now = Date.now()) {
+  if (typeof resetAt !== 'number' || !Number.isFinite(resetAt) || resetAt <= 0) return ''
+  const delta = resetAt - now
+  const units = RELATIVE_UNITS[lang] || RELATIVE_UNITS.ru
+  if (delta <= 0) return units.soon
+
+  const totalMinutes = Math.max(1, Math.round(delta / 60_000))
+  const days = Math.floor(totalMinutes / 1440)
+  const hours = Math.floor((totalMinutes % 1440) / 60)
+  const minutes = totalMinutes % 60
+
+  const bits = []
+  if (days) bits.push(fill(units.day, days))
+  if (hours) bits.push(fill(units.hour, hours))
+  if (minutes || bits.length === 0) bits.push(fill(units.minute, minutes))
+
+  const durationStr = bits.join(' ')
+  return `${units.prefix}${durationStr}${units.suffix}`.trim()
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",