@goodandready/dsh-subscriptions 0.5.0 → 0.5.2

package/lib/client.js

@@ -83,6 +83,8 @@ window.__ModuleLoader__.load({
     '.dsub-brandOllama{background:rgba(107,114,128,.15);color:#9ca3af;border:1px solid rgba(107,114,128,.3)}' +
     '.dsub-brandKimi{background:rgba(236,72,153,.15);color:#f472b6;border:1px solid rgba(236,72,153,.3)}' +
     '.dsub-brandGlm{background:rgba(20,184,166,.15);color:#2dd4bf;border:1px solid rgba(20,184,166,.3)}' +
+    '.dsub-planBadge{display:inline-flex;align-items:center;padding:1px 6px;border-radius:4px;font-size:10px;font-weight:600;text-transform:uppercase;letter-spacing:0.5px;background:rgba(99,102,241,.15);color:#818cf8;border:1px solid rgba(99,102,241,.3);margin-left:6px}' +
+    
     '.dsub-accInfo{flex:1;min-width:0;display:flex;flex-direction:column;gap:3px}' +
     '.dsub-accNameRow{display:flex;align-items:center;justify-content:space-between;gap:8px}' +
     '.dsub-accName{font-size:13px;font-weight:600}' +
@@ -322,6 +324,47 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     }
 
     // #51: live countdown to the quota window reset (account.quota.resetAt).
+            function normalizePlanBadge(provider, plan) {
+      if (!plan && provider !== 'kimi' && provider !== 'glm') return null
+      var p = String(plan || '').toLowerCase().replace(/[^a-z0-9]/g, '')
+      var label = plan
+      if (provider === 'codex') {
+        if (p.indexOf('pro20') >= 0 || p === 'pro') label = 'Pro 20x'
+        else if (p.indexOf('pro5') >= 0 || p.indexOf('prolite') >= 0) label = 'Pro 5x'
+        else if (p.indexOf('team') >= 0) label = 'Team'
+        else if (p.indexOf('plus') >= 0) label = 'Plus'
+        else if (p.indexOf('enterp') >= 0) label = 'Enterprise'
+      } else if (provider === 'grok') {
+        if (p.indexOf('super') >= 0) label = 'SuperGrok'
+        else if (p.indexOf('plus') >= 0) label = 'X Premium+'
+        else if (p.indexOf('premium') >= 0) label = 'X Premium'
+      } else if (provider === 'antigravity') {
+        if (p.indexOf('ultra') >= 0) label = 'Ultra'
+        else if (p.indexOf('pro') >= 0) label = 'Pro'
+      } else if (provider === 'kimi') {
+        label = 'Coding Plan'
+      } else if (provider === 'glm') {
+        label = '150% Boost'
+      }
+      return label ? React.createElement('span', { className: 'dsub-planBadge' }, label) : null
+    }
+
+    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 +374,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) {
@@ -718,6 +764,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                     },
                   }),
                   React.createElement('span', { className: 'dsub-badge' + (account.validationUrl ? ' dsub-badge-warn' : (on ? ' dsub-badge-on' : '')) }, badgeFor(account, t)),
+                  normalizePlanBadge(row.slot.provider, account.plan || (account.quota && account.quota.plan)),
                   React.createElement('button', {
                     type: 'button', className: 'dsub-mini',
                     onClick: () => connect(row.slot.provider, row.slot.index).catch((e) => setErr(String(e.message || e))),
@@ -1222,7 +1269,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/plan.js

@@ -0,0 +1,42 @@
+/**
+ * Normalize and pretty-print subscription plans.
+ */
+
+export function normalizePlanName(provider, rawPlan) {
+  if (!rawPlan || typeof rawPlan !== 'string') {
+    if (provider === 'kimi') return 'Coding Plan'
+    if (provider === 'glm') return 'Coding Plan 150%'
+    return ''
+  }
+  const key = rawPlan.trim().toLowerCase().replace(/[^a-z0-9]/g, '')
+  if (provider === 'codex') {
+    if (key.includes('pro20') || key === 'pro') return 'Pro 20x'
+    if (key.includes('pro5') || key.includes('prolite')) return 'Pro 5x'
+    if (key.includes('team')) return 'Team'
+    if (key.includes('plus')) return 'Plus'
+    if (key.includes('enterp')) return 'Enterprise'
+    if (key.includes('edu')) return 'Edu'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'grok') {
+    if (key.includes('super')) return 'SuperGrok'
+    if (key.includes('plus') || key.includes('premiumplus')) return 'X Premium+'
+    if (key.includes('premium')) return 'X Premium'
+    if (key.includes('basic')) return 'X Basic'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'claude') {
+    if (key.includes('team')) return 'Team'
+    if (key.includes('enterp')) return 'Enterprise'
+    if (key.includes('pro')) return 'Pro'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'antigravity') {
+    if (key.includes('ultra')) return 'Ultra'
+    if (key.includes('pro')) return 'Pro'
+    if (key.includes('free')) return 'Free'
+  }
+  if (provider === 'kimi') return 'Coding Plan'
+  if (provider === 'glm') return 'Coding Plan 150%'
+  return rawPlan
+}

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.2",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",