@goodandready/dsh-subscriptions 0.4.9 → 0.4.11

package/lib/client.js

@@ -45,6 +45,12 @@ window.__ModuleLoader__.load({
     '.dsub-chipWarn{color:var(--dsw-alias-state-warning-primary);border-color:currentColor}' +
     '.dsub-chipDanger{color:var(--dsw-alias-state-error-primary);border-color:currentColor}' +
     '.dsub-chipDot{width:6px;height:6px;border-radius:999px;background:currentColor;flex:none}' +
+    '.dsub-chipActive{display:inline-flex;align-items:center;gap:6px;height:26px;padding:0 10px;border-radius:999px;border:1px solid var(--dsw-alias-border-l2);font-size:12px;font-weight:600;line-height:1;white-space:nowrap;color:var(--dsw-alias-label-secondary);background:var(--dsw-alias-bg-layer-3)}' +
+    '.dsub-chipActiveWarn{color:var(--dsw-alias-state-warning-primary);border-color:currentColor}' +
+    '.dsub-chipActiveDanger{color:var(--dsw-alias-state-error-primary);border-color:currentColor}' +
+    '.dsub-chipActiveOk{color:var(--dsw-alias-state-success-primary);border-color:currentColor}' +
+    '.dsub-chipActiveBar{height:4px;width:48px;background:var(--dsw-alias-bg-layer-1);border-radius:2px;flex:none;overflow:hidden}' +
+    '.dsub-chipActiveFill{height:100%;border-radius:2px;background:currentColor}' +
 
     '.dsub-link{background:none;border:none;color:var(--dsw-alias-label-secondary);cursor:pointer;font-size:12px;padding:0}' +
     '.dsub-bar{position:relative;height:6px;border-radius:3px;background:var(--dsw-alias-bg-layer-1);overflow:hidden;flex:1;min-width:80px}' +
@@ -630,13 +636,14 @@ function PluginCard(props) {
           expiresAt: (data && data.expiresAt) || {},
           labels: (data && data.labels) || {},
           expiryNotifyDays: (data && data.expiryNotifyDays) || 7,
+          active: (data && data.active) || null,
         }
-      } catch { return { logged: [], usage: 0, expiresAt: {}, labels: {}, expiryNotifyDays: 7 } }
+      } catch { return { logged: [], usage: 0, expiresAt: {}, labels: {}, expiryNotifyDays: 7, active: null } }
     }
 
     // #52: компактный чип в шапке сессии со статусом подключённых подписок.
     function HeaderChip(props) {
-      const [state, setState] = React.useState({ loading: true, count: 0, usage: 0, expiry: null })
+      const [state, setState] = React.useState({ loading: true, count: 0, usage: 0, expiry: null, active: null })
       const t = (props && props.t) || ((k) => k)
       React.useEffect(() => {
         const pull = () => {
@@ -653,13 +660,45 @@ function PluginCard(props) {
                 if (!expiry || at < expiry.at) expiry = { at, label: r.labels[p] || p }
               }
             }
-            setState({ loading: false, count: r.logged.length, usage: r.usage, expiry })
-          }).catch(() => setState({ loading: false, count: 0, usage: 0, expiry: null }))
+            setState({ loading: false, count: r.logged.length, usage: r.usage, expiry, active: r.active })
+          }).catch(() => setState({ loading: false, count: 0, usage: 0, expiry: null, active: null }))
         }
         pull()
         const id = setInterval(pull, 60 * 1000)
         return () => clearInterval(id)
       }, [])
+      // #69/#72: если есть активная подписка — показываем её (провайдер + индекс + windows с процентами).
+      if (state.active) {
+        const a = state.active
+        const wins = Array.isArray(a.windows) ? a.windows : []
+        // макс-процент среди окон для цвета полоски
+        let maxPct = -1
+        for (const w of wins) {
+          if (w && typeof w.usedPercent === 'number' && w.usedPercent > maxPct) maxPct = w.usedPercent
+        }
+        if (maxPct < 0 && typeof a.usagePercent === 'number') maxPct = a.usagePercent
+        const u = maxPct >= 0 ? maxPct : null
+        let acls = 'dsub-chipActive'
+        if (u != null) acls += u >= 100 ? ' dsub-chipActiveDanger' : (u >= 80 ? ' dsub-chipActiveDanger' : (u >= 50 ? ' dsub-chipActiveWarn' : ' dsub-chipActiveOk'))
+        const prov = t('provider' + a.provider.charAt(0).toUpperCase() + a.provider.slice(1)) || a.provider
+        const idx = a.index != null ? (' #' + a.index) : ''
+        const plan = a.plan ? (' ' + a.plan) : ''
+        const label = prov + idx + plan
+        // windows: "5h 12%  7d 8%"
+        const winLabels = wins.map((w) => (w.label || w.id) + ' ' + Math.round(w.usedPercent) + '%').join('  ')
+        return React.createElement('span', {
+          className: acls,
+          title: a.model ? (prov + idx + ' · ' + a.model) : (prov + idx),
+        },
+          React.createElement('span', { className: 'dsub-chipDot' }),
+          label,
+          u != null
+            ? React.createElement('span', { className: 'dsub-chipActiveBar' },
+                React.createElement('span', { className: 'dsub-chipActiveFill', style: { width: Math.min(100, Math.max(0, u)) + '%' } }))
+            : null,
+          winLabels || null,
+        )
+      }
       const on = state.count > 0
       // #66: цвет чипа по максимальному usagePercent (50/80/100).
       const u = state.usage

package/lib/index.js

@@ -535,6 +535,40 @@ export function apply(ctx, config) {
           }
         } catch {}
       }
+      // #69/#72: активная подписка = последний успешный запрос (новые сверху).
+      let active = null
+      const last = history.recent(1)
+      if (last.length) {
+        const lastRow = last[0]
+        const accts = await store.listAccounts(lastRow.provider)
+        const acct = accts.find((a) => a.ref === lastRow.ref) || accts[0]
+        let plan = ''
+        let index = acct && acct.ref ? Number(String(acct.ref).split('_').pop()) || null : null
+        let status = 'ok'
+        let windows = []
+        try {
+          const info = await store.describeRef(lastRow.ref)
+          plan = info.paidTierName || ''
+          if (info.validationUrl) status = 'verify'
+          else if (info.cooldownUntil && info.cooldownUntil > Date.now()) status = 'cooldown'
+          if (Array.isArray(info.usage)) {
+            windows = info.usage
+              .filter((w) => w && typeof w.usedPercent === 'number')
+              .map((w) => ({ id: w.id || w.en || w.ru, label: w.en || w.ru || w.id, usedPercent: w.usedPercent }))
+          }
+        } catch {}
+        active = {
+          provider: lastRow.provider,
+          index,
+          model: lastRow.model || null,
+          path: lastRow.path || null,
+          plan,
+          windows,
+          usagePercent: usage[lastRow.provider] != null ? usage[lastRow.provider] : null,
+          status,
+          at: lastRow.ts,
+        }
+      }
       writeJson(res, 200, {
         ok: true,
         loggedIn: Object.fromEntries(PROVIDERS.map((id) => [id, logged.includes(id)])),
@@ -542,6 +576,7 @@ export function apply(ctx, config) {
         expiresAt: expires,
         labels,
         expiryNotifyDays: live().expiryNotifyDays,
+        active,
       })
     },
   }), 'dsh-subscriptions: /status')

package/package.json

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