@goodandready/dsh-subscriptions 0.4.8 → 0.4.10

package/lib/adapter.js

@@ -121,6 +121,20 @@ export class SubscriptionAdapter extends LlmAdapter {
             })
             // поток завершился успешно: снять кулдаун и здоровье-штрафы
             if (typeof deps.recordSuccess === 'function') deps.recordSuccess(account.ref)
+            // #65: записать в историю запросов и стоимости.
+            if (typeof deps.recordHistory === 'function') {
+              try {
+                deps.recordHistory({
+                  provider,
+                  ref: account.ref,
+                  model: (opts && opts.model) || null,
+                  path: '/responses',
+                  method: 'POST',
+                  status: 200,
+                  kind: 'stream',
+                })
+              } catch {}
+            }
           } catch (err) {
             if (err && err.code === 'VALIDATION_REQUIRED' && err.validationUrl) {
               await deps.saveBlob(account.ref, {

package/lib/client.js

@@ -42,7 +42,15 @@ window.__ModuleLoader__.load({
     '.dsub-badge-warn{color:var(--dsw-alias-state-warning-primary);border-color:currentColor}' +
     '.dsub-chip{display:inline-flex;align-items:center;gap:5px;height:26px;padding:0 10px;border-radius:999px;font-size:12px;font-weight:600;line-height:1;white-space:nowrap;color:var(--dsw-alias-label-secondary);border:1px solid var(--dsw-alias-border-l2)}' +
     '.dsub-chipOn{color:var(--dsw-alias-state-success-primary);border-color:currentColor}' +
+    '.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}' +
@@ -98,6 +106,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'storedAs': 'Stored as',
       'switchLabel': 'Provider',
       'chipActive': 'Subscriptions',
+'expiryLabel': 'expires',
       'slashLogin': 'Login to a subscription provider',
       'slashLogout': 'Log out a subscription provider',
       'slashStatus': 'Subscription status',
@@ -152,6 +161,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'storedAs': 'Хранится как',
       'switchLabel': 'Провайдер',
       'chipActive': 'Подписки',
+'expiryLabel': 'окончание',
       'slashLogin': 'Вход в провайдера подписки',
       'slashLogout': 'Выйти из провайдера подписки',
       'slashStatus': 'Статус подписок',
@@ -617,31 +627,86 @@ function PluginCard(props) {
         const res = await fetch('/dsh-subscriptions/status', { cache: 'no-store' })
         const data = await res.json().catch(() => ({}))
         const loggedIn = (data && data.loggedIn) || {}
-        return ORDER.filter((p) => loggedIn[p])
-      } catch { return [] }
+        const usage = (data && data.usagePercent) || {}
+        const logged = ORDER.filter((p) => loggedIn[p])
+        const maxUsage = logged.reduce((m, p) => Math.max(m, usage[p] || 0), 0)
+        return {
+          logged,
+          usage: maxUsage,
+          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, active: null } }
     }
 
     // #52: компактный чип в шапке сессии со статусом подключённых подписок.
     function HeaderChip(props) {
-      const [state, setState] = React.useState({ loading: true, count: 0 })
+      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 = () => {
-          refreshLoggedIn().then((logged) => {
-            setState({ loading: false, count: logged.length })
-          }).catch(() => setState({ loading: false, count: 0 }))
+          refreshLoggedIn().then((r) => {
+            // #67: ближайшее окончание подписки в пределах expiryNotifyDays.
+            let expiry = null
+            const now = Date.now()
+            const days = r.expiryNotifyDays || 7
+            for (const p of r.logged) {
+              const at = r.expiresAt[p]
+              if (!at) continue
+              const msLeft = at - now
+              if (msLeft > 0 && msLeft <= days * 24 * 60 * 60 * 1000) {
+                if (!expiry || at < expiry.at) expiry = { at, label: r.labels[p] || p }
+              }
+            }
+            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: если есть активная подписка — показываем её (провайдер + план + usage%).
+      if (state.active) {
+        const a = state.active
+        const u = typeof a.usagePercent === 'number' ? a.usagePercent : 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 plan = a.plan || ''
+        const label = plan ? (prov + ' ' + plan) : prov
+        const pctText = u == null ? '' : Math.round(u) + '%'
+        return React.createElement('span', {
+          className: acls,
+          title: a.model ? (prov + ' · ' + a.model) : prov,
+        },
+          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,
+          pctText ? React.createElement('span', null, pctText) : null,
+        )
+      }
       const on = state.count > 0
+      // #66: цвет чипа по максимальному usagePercent (50/80/100).
+      const u = state.usage
+      let cls = 'dsub-chip'
+      if (on) cls += u >= 100 ? ' dsub-chipDanger' : (u >= 80 ? ' dsub-chipDanger' : (u >= 50 ? ' dsub-chipWarn' : ' dsub-chipOn'))
+      // #67: надпись об окончании подписки.
+      let text = on ? String(state.count) : '—'
+      if (state.expiry) {
+        const d = new Date(state.expiry.at).toLocaleDateString()
+        text = t('expiryLabel') + ': ' + state.expiry.label + ' ' + d
+      }
       return React.createElement('span', {
-        className: 'dsub-chip' + (on ? ' dsub-chipOn' : ''),
+        className: cls,
         title: on ? t('chipActive') + ': ' + state.count : t('none'),
       },
         React.createElement('span', { className: 'dsub-chipDot' }),
-        on ? String(state.count) : '—',
+        text,
       )
     }
 

package/lib/history.js

@@ -0,0 +1,66 @@
+import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
+
+// #65: история запросов и стоимости. Хранится в
+// ~/.dsh/storages/dsh-subscriptions/history.json (JSON-массив, новые сверху).
+// Все IO best-effort и синхронные: сбой записи не должен ронять харнесс.
+
+export const DEFAULT_HISTORY_DIR = join(homedir(), '.dsh', 'storages', 'dsh-subscriptions')
+
+export class HistoryStore {
+  constructor(dir = DEFAULT_HISTORY_DIR, ttlMs = 7 * 24 * 60 * 60 * 1000) {
+    this.dir = dir
+    this.ttlMs = ttlMs
+    this.path = join(dir, 'history.json')
+    this.rows = []
+    this._load()
+  }
+
+  _load() {
+    try {
+      mkdirSync(this.dir, { recursive: true })
+    } catch { /* best-effort */ }
+    try {
+      const raw = JSON.parse(readFileSync(this.path, 'utf8'))
+      if (Array.isArray(raw)) this.rows = raw
+    } catch { /* absent/corrupt history is normal */ }
+    this._prune()
+  }
+
+  _prune() {
+    const cutoff = Date.now() - this.ttlMs
+    const before = this.rows.length
+    this.rows = this.rows.filter((r) => r && r.ts && r.ts >= cutoff)
+    if (this.rows.length !== before) this._persist()
+  }
+
+  _persist() {
+    try {
+      mkdirSync(this.dir, { recursive: true })
+      writeFileSync(this.path, JSON.stringify(this.rows))
+    } catch { /* best-effort */ }
+  }
+
+  /** Добавить одну запись. Возвращает длину истории. */
+  add(entry) {
+    if (!entry || typeof entry !== 'object') return this.rows.length
+    this.rows.unshift({ ts: Date.now(), ...entry })
+    this._prune()
+    this._persist()
+    return this.rows.length
+  }
+
+  /** Последние N записей (новые сверху). */
+  recent(n) {
+    return this.rows.slice(0, n)
+  }
+
+  all() {
+    return this.rows
+  }
+
+  size() {
+    return this.rows.length
+  }
+}

package/lib/index.js

@@ -13,6 +13,7 @@ import { createSubscriptionsService } from './subscriptions.js'
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
 import { quotaSnapshot } from './ratelimit.js'
 import { createAccountStore, normalizeSlots, vendorConfig } from './accounts.js'
+import { HistoryStore } from './history.js'
 import {
   inspectGoogleAccount,
   antigravityMetadata,
@@ -32,6 +33,8 @@ const Slot = z.object({
     .description('Account slot number. Credential ref is <PROVIDER>_OAUTH_<index>.'),
   label: z.string().default('')
     .description('Optional display label. Empty uses the account email after login.'),
+  expiresAt: z.number().default(0)
+    .description('#67 Optional subscription expiry timestamp (ms). When set and within expiryNotifyDays, the header chip shows the account and expiry date.'),
 })
 
 const defaultSlots = PROVIDERS.map((provider) => ({ provider, index: 1, label: '' }))
@@ -49,6 +52,8 @@ export const Config = z.object({
     .description('Background health-check interval in minutes. 0 disables.'),
   notifyLimits: z.boolean().default(true)
     .description('Emit log notices when usage crosses 70/90/100% of a window.'),
+  expiryNotifyDays: z.number().default(7)
+    .description('#67 Warn in the header chip this many days before a subscription expiry (expiresAt). 0 disables.'),
   slots: z.array(Slot).default(defaultSlots)
     .description('Account slots. Secrets are not stored here; only the credential ref names.'),
   useWebCallback: z.boolean().default(false)
@@ -132,6 +137,9 @@ export function apply(ctx, config) {
       try { ctx.emit && ctx.emit('subscriptions.limit-notice', { provider, ref, window: win.id, usedPercent: win.usedPercent, threshold }) } catch {}
     },
   })
+  const history = new HistoryStore()
+  const recordHistory = (entry) => history.add(entry)
+
   const subscriptions = createSubscriptionsService({
     listAccounts: (provider) => store.listAccounts(provider),
     loadBlob: (ref) => store.loadBlob(ref),
@@ -149,6 +157,7 @@ export function apply(ctx, config) {
     rememberQuota: (ref, snap) => store.rememberQuota(ref, snap),
     rememberRequest: (ref) => store.rememberRequest(ref),
     getRequestCount: (ref) => store.getRequestCount(ref),
+    recordHistory,
     fetchImpl: fetch,
   })
 
@@ -205,6 +214,7 @@ export function apply(ctx, config) {
     getQuota: (ref) => store.getQuota(ref),
     refreshUsage: (provider) => store.refreshUsage(provider),
     saveBlob: (ref, blob) => store.saveBlob(ref, blob),
+    recordHistory,
     fetchImpl: fetch,
   })
 
@@ -508,9 +518,56 @@ export function apply(ctx, config) {
         return
       }
       const logged = await store.loggedInProviders()
+      // #66/#67: usagePercent (максимум по аккаунтам) и expiresAt для чипа.
+      const usage = {}
+      const expires = {}
+      const labels = {}
+      for (const slot of normalizeSlots(live().slots)) {
+        try {
+          const info = await store.describeRef(slot.ref)
+          if (info.usagePercent != null) {
+            usage[slot.provider] = Math.max(usage[slot.provider] || 0, info.usagePercent)
+          }
+          // #67: дата окончания подписки берётся из слота (вводится в настройках).
+          if (slot.expiresAt) {
+            expires[slot.provider] = Math.max(expires[slot.provider] || 0, slot.expiresAt)
+            labels[slot.provider] = slot.label || info.label || slot.provider
+          }
+        } catch {}
+      }
+      // #69: активная подписка = последний успешный запрос (новые сверху).
+      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 status = 'ok'
+        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'
+        } catch {}
+        active = {
+          provider: lastRow.provider,
+          model: lastRow.model || null,
+          path: lastRow.path || null,
+          plan,
+          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)])),
+        usagePercent: usage,
+        expiresAt: expires,
+        labels,
+        expiryNotifyDays: live().expiryNotifyDays,
+        active,
       })
     },
   }), 'dsh-subscriptions: /status')
@@ -869,6 +926,25 @@ export function apply(ctx, config) {
   }), 'dsh-subscriptions: /import-token')
 
   // #50: сводная страница /subscriptions (localhost-only).
+  // #65: история запросов и стоимости (JSON).
+  ctx.effect(() => ctx.webServer.register({
+    kind: 'exact',
+    path: '/dsh-subscriptions/history',
+    handler: async (req, res) => {
+      if (req.method !== 'GET') {
+        writeJson(res, 405, { ok: false, error: { code: 'method', message: 'GET only' } })
+        return
+      }
+      const host = (req.headers.host || '').split(':')[0]
+      if (host !== 'localhost' && host !== '127.0.0.1') {
+        writeJson(res, 403, { ok: false, error: { code: 'forbidden', message: 'localhost only' } })
+        return
+      }
+      const limit = Math.min(Number(queryOf(req).get('limit') || '10'), 100)
+      writeJson(res, 200, { ok: true, total: history.size(), items: history.recent(limit) })
+    },
+  }), 'dsh-subscriptions: /history')
+
   ctx.effect(() => ctx.webServer.register({
     kind: 'exact',
     path: '/dsh-subscriptions/subscriptions',
@@ -925,6 +1001,18 @@ h1{font-size:20px} .dim{color:#8b949e;font-size:13px}
 <div class="dim">/subscriptions — localhost only</div>
 <div class="stats"><span><b>${connected}</b> connected</span><span><b>${accounts.length}</b> accounts</span><span><b>${slots.length}</b> slots</span></div>
 ${body}
+<h2>History</h2>
+<div class="dim">last 10 · <a href="/dsh-subscriptions/history?limit=100">show 100</a></div>
+<div class="hist" id="hist"></div>
+<script>
+fetch('/dsh-subscriptions/history?limit=10').then(r=>r.json()).then(d=>{
+  const el=document.getElementById('hist')
+  if(!d||!d.items||!d.items.length){el.textContent='No requests yet.';return}
+  el.innerHTML='<table class="grid"><tr><th>time</th><th>provider</th><th>model</th><th>path</th><th>status</th></tr>'+
+    d.items.map(i=>'<tr><td>'+new Date(i.ts).toLocaleString()+'</td><td>'+esc(i.provider)+'</td><td>'+esc(i.model||'')+'</td><td>'+esc(i.path)+'</td><td>'+i.status+'</td></tr>').join('')+'</table>'
+}).catch(()=>{})
+function esc(x){return String(x==null?'':x).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;')}
+</script>
 </body></html>`)
     },
   }), 'dsh-subscriptions: /subscriptions')

package/lib/subscriptions.js

@@ -159,6 +159,20 @@ export function createSubscriptionsService(deps) {
             else err.code = "VENDOR"
             throw err
           }
+          // #65: записать в историю запросов и стоимости.
+          if (typeof deps.recordHistory === "function") {
+            try {
+              deps.recordHistory({
+                provider,
+                ref: account.ref,
+                model: (body && typeof body === "object" && body.model) || null,
+                path,
+                method,
+                status: res.status || 200,
+                kind: "request",
+              })
+            } catch {}
+          }
           return res
         } catch (err) {
           lastError = err

package/package.json

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