@goodandready/dsh-subscriptions 0.4.18 → 0.4.19

package/lib/client.js

@@ -64,27 +64,7 @@ window.__ModuleLoader__.load({
     '.dsub-manual{display:flex;flex-direction:column;gap:6px;margin-top:4px;padding-top:10px;border-top:1px solid var(--dsw-alias-border-l2)}' +
     '.dsub-verify{font-size:12px;color:var(--dsw-alias-state-warning-primary)}' +
     '.dsub-verify a{color:var(--dsw-alias-brand-primary)}' +
-    '.dsub-hud{pointer-events:auto;position:fixed;z-index:10010;width:64px;height:64px;transition:left .2s,top .2s}' +
-    '.dsub-hud[data-dragging=true]{transition:none}' +
-    '.dsub-hudBtn{position:relative;width:64px;height:64px;padding:0;border:0;border-radius:50%;cursor:grab;display:grid;place-items:center;user-select:none;touch-action:none;' +
     'background:var(--dsw-alias-bg-layer-3);box-shadow:0 0 0 1px var(--dsw-alias-border-l2),0 8px 24px rgba(0,0,0,.25);backdrop-filter:blur(18px)}' +
-    '.dsub-hudBtn:hover{transform:scale(1.05)}' +
-    '.dsub-hudBtn:active{cursor:grabbing}' +
-    '.dsub-hudRing{position:absolute;inset:4px;width:56px;height:56px;transform:rotate(-90deg)}' +
-    '.dsub-hudTrack{fill:none;stroke:var(--dsw-alias-border-l2);stroke-width:4}' +
-    '.dsub-hudVal{fill:none;stroke:var(--dsub-tone,var(--dsw-alias-state-success-primary));stroke-width:4;stroke-linecap:round;transition:stroke-dashoffset .4s}' +
-    '.dsub-hudCore{position:relative;z-index:2;font-size:14px;font-weight:700;font-variant-numeric:tabular-nums;color:var(--dsw-alias-label-primary)}' +
-    '.dsub-hud[data-collapsed=true] .dsub-hudBtn{opacity:.45}' +
-    '.dsub-hud[data-collapsed=true]:hover .dsub-hudBtn{opacity:1}' +
-    '.dsub-hudPanel{pointer-events:none;position:absolute;width:280px;padding:12px;border-radius:14px;background:var(--dsw-alias-bg-layer-3);border:1px solid var(--dsw-alias-border-l2);box-shadow:0 18px 48px rgba(0,0,0,.35);backdrop-filter:blur(28px);opacity:0;transform:translateY(6px);transition:opacity .16s,transform .16s}' +
-    '.dsub-hud:hover .dsub-hudPanel{opacity:1;transform:none}' +
-    '.dsub-hud[data-dragging=true] .dsub-hudPanel{opacity:0}' +
-    '.dsub-hudRow{display:flex;align-items:center;gap:8px;margin-top:8px;font-size:11.5px}' +
-    '.dsub-hudRow .dsub-bar{min-width:70px}' +
-    '.dsub-hudName{font-weight:600;min-width:52px}' +
-    '.dsub-hudPct{margin-left:auto;font-variant-numeric:tabular-nums}' +
-    '.dsub-hudHead{font-size:12px;font-weight:600;color:var(--dsw-alias-label-primary)}' +
-    '.dsub-hudHint{margin-top:10px;font-size:10.5px;color:var(--dsw-alias-label-tertiary)}' +
     '.dsub-pill{display:inline-flex;align-items:center;gap:6px;height:26px;padding:0 10px;border:1px solid var(--dsw-alias-border-l2);border-radius:999px;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-primary);font-size:11.5px;font-weight:600;cursor:pointer;letter-spacing:.06em}' +
     '.dsub-pill:hover{border-color:var(--dsw-alias-label-dimmed)}' +
     '.dsub-led{width:7px;height:7px;border-radius:50%;flex:none}' +
@@ -346,23 +326,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     }
     const Chevron = ChevronIcon || FallbackChevron
 
-function PluginCard(props) {
-      const t = (props && props.t) || ((key) => key)
-      const [open, setOpen] = React.useState(false)
-      return React.createElement('div', { className: 'dsub-block' },
-        React.createElement('div', { className: 'dsub-row' },
-          React.createElement('span', { className: 'dsub-h' }, t('title')),
-          React.createElement('span', { className: 'dsub-sub' }, t('cardIntro')),
-          React.createElement('span', { style: { flex: 1 } }),
-          React.createElement('button', {
-            type: 'button',
-            className: 'dsub-mini',
-            onClick: () => setOpen(!open),
-          }, open ? t('hide') : t('show')),
-        ),
-        open ? React.createElement(SubsSection, props) : null,
-      )
-    }
+
 
     function SubsSection(props) {
       // Переводчик приходит от слота, потому что в его записи указан locale.
@@ -1120,7 +1084,7 @@ function PluginCard(props) {
     // модальной консолью аккаунтов (закрытие: крестик, Escape, клик мимо).
     function SubsPill(props) {
       const t = (props && props.t) || ((k) => k)
-      const [state, setState] = React.useState({ logged: [], usage: 0, accounts: [], open: false })
+      const [state, setState] = React.useState({ logged: [], usage: 0, accounts: [], open: false, active: null })
       React.useEffect(() => {
         let alive = true
         const pull = () => {
@@ -1131,13 +1095,13 @@ function PluginCard(props) {
               .then((res) => res.json())
               .then((cfg) => {
                 if (!alive) return
-                setState({ logged, usage: r.usage, accounts: (cfg && cfg.accounts) || [], open: false })
+                setState({ logged, usage: r.usage, accounts: (cfg && cfg.accounts) || [], open: false, active: r.active })
               })
-              .catch(() => { if (alive) setState({ logged, usage: r.usage, accounts: [], open: false }) })
+              .catch(() => { if (alive) setState({ logged, usage: r.usage, accounts: [], open: false, active: r.active }) })
           }).catch(() => {})
         }
         pull()
-        const id = setInterval(pull, 60 * 1000)
+        const id = setInterval(pull, 20 * 1000)
         return () => { alive = false; clearInterval(id) }
       }, [])
       React.useEffect(() => {
@@ -1149,6 +1113,14 @@ function PluginCard(props) {
       const n = state.logged.length
       const led = n === 0 ? 'dsub-ledOff' : (state.usage >= 90 ? 'dsub-ledBad' : (state.usage >= 50 ? 'dsub-ledWarn' : 'dsub-ledOk'))
       const now = Date.now()
+      let pillText = t('subsPill') + ' (' + n + ')'
+      if (state.active) {
+        const a = state.active
+        const wins = Array.isArray(a.windows) ? a.windows : []
+        const winStr = wins.map((w) => (w.label || w.id) + ' ' + Math.round(w.usedPercent) + '%').join(' ')
+        const provName = a.provider ? (a.provider.charAt(0).toUpperCase() + a.provider.slice(1)) : ''
+        pillText = (a.provider === 'codex' && a.fastMode ? '⚡ ' : '') + provName + (winStr ? ' · ' + winStr : (a.usagePercent != null ? ' · ' + Math.round(a.usagePercent) + '%' : ''))
+      }
       const rows = state.accounts.map((a, i) => {
         const isLogged = state.logged.includes(a.provider)
         const cooled = a.cooldownUntil && a.cooldownUntil > now
@@ -1167,10 +1139,11 @@ function PluginCard(props) {
       return React.createElement(React.Fragment, null,
         React.createElement('button', {
           type: 'button', className: 'dsub-pill', 'aria-expanded': state.open ? 'true' : 'false',
+          title: t('subsPill') + ': ' + (n > 0 ? (n + ' ' + t('connected')) : t('notConnected')),
           onClick: () => setState((s) => Object.assign({}, s, { open: !s.open })),
         },
           React.createElement('span', { className: 'dsub-led ' + led }),
-          t('subsPill') + ' (' + n + ')',
+          pillText,
         ),
         state.open ? React.createElement('div', {
           className: 'dsub-modalWrap',
@@ -1182,7 +1155,7 @@ function PluginCard(props) {
               React.createElement('button', {
                 type: 'button', className: 'dsub-mini',
                 onClick: () => setState((s) => Object.assign({}, s, { open: false })),
-              }, t('subsModalClose') + ' \u00d7'),
+              }, t('subsModalClose') + ' ×'),
             ),
             rows.length ? rows : React.createElement('div', { className: 'dsub-sub' }, t('subsNotLogged')),
             React.createElement('div', { className: 'dsub-row', style: { marginTop: 12 } },
@@ -1190,7 +1163,6 @@ function PluginCard(props) {
                 className: 'dsub-mini', href: '#', onClick: (e) => {
                   e.preventDefault()
                   setState((s) => Object.assign({}, s, { open: false }))
-                  try { document.querySelector('[data-slot-key=\"settings.plugin.item\"],[data-dsub-open]') } catch {}
                   try {
                     const btn = Array.from(document.querySelectorAll('button')).find((b) => (b.textContent || '').includes(t('title')))
                     if (btn) btn.click()
@@ -1202,162 +1174,11 @@ function PluginCard(props) {
         ) : null,
       )
     }
-
     // #82: перетаскиваемый HUD-бабл (shell.overlay) с кольцевой шкалой
     // остатка активной подписки, прилипанием к краям и frosted-панелью.
     const HUD_KEY = 'dsh-subscriptions.hud'
     const HUD_SIZE = 64
 
-    function hudClamp(pos) {
-      const w = window.innerWidth, h = window.innerHeight
-      return {
-        left: Math.min(Math.max(8, pos.left), Math.max(8, w - HUD_SIZE - 8)),
-        top: Math.min(Math.max(8, pos.top), Math.max(8, h - HUD_SIZE - 8)),
-      }
-    }
-
-    function hudLoad() {
-      try {
-        const raw = JSON.parse(localStorage.getItem(HUD_KEY) || 'null')
-        if (raw && typeof raw.left === 'number' && typeof raw.top === 'number') return hudClamp(raw)
-      } catch {}
-      return hudClamp({ left: window.innerWidth - HUD_SIZE - 24, top: window.innerHeight - HUD_SIZE - 120 })
-    }
-
-    function hudDock(pos) {
-      const w = window.innerWidth, h = window.innerHeight
-      const dist = { left: pos.left, right: w - (pos.left + HUD_SIZE), top: pos.top, bottom: h - (pos.top + HUD_SIZE) }
-      const TH = 24
-      let side = null, best = Infinity
-      for (const k of ['left', 'right', 'top', 'bottom']) {
-        if (dist[k] <= TH && dist[k] < best) { best = dist[k]; side = k }
-      }
-      if (!side) return pos
-      const next = { left: pos.left, top: pos.top }
-      if (side === 'left') next.left = 0
-      if (side === 'right') next.left = Math.max(0, w - HUD_SIZE)
-      if (side === 'top') next.top = 0
-      if (side === 'bottom') next.top = Math.max(0, h - HUD_SIZE)
-      return next
-    }
-
-    function UsageBubble(props) {
-      const t = (props && props.t) || ((k) => k)
-      const [pos, setPos] = React.useState(() => (typeof window === 'undefined' ? { left: 0, top: 0 } : hudLoad()))
-      const [accounts, setAccounts] = React.useState([])
-      const [active, setActive] = React.useState(null)
-      const [dragging, setDragging] = React.useState(false)
-      const [busy, setBusy] = React.useState(false)
-      const drag = React.useRef(null)
-      React.useEffect(() => {
-        let alive = true
-        const pull = () => {
-          refreshLoggedIn().then((r) => {
-            if (!alive) return
-            setActive(r.active)
-            fetch('/dsh-subscriptions/config', { cache: 'no-store' })
-              .then((res) => res.json())
-              .then((cfg) => { if (alive) setAccounts((cfg && cfg.accounts) || []) })
-              .catch(() => {})
-          }).catch(() => {})
-        }
-        pull()
-        const id = setInterval(pull, 60 * 1000)
-        return () => { alive = false; clearInterval(id) }
-      }, [])
-      const onPointerDown = (e) => {
-        if (e.button !== 0) return
-        e.preventDefault()
-        e.currentTarget.setPointerCapture(e.pointerId)
-        drag.current = { id: e.pointerId, sx: e.clientX, sy: e.clientY, left: pos.left, top: pos.top, moved: false }
-      }
-      const onPointerMove = (e) => {
-        const d = drag.current
-        if (!d || e.pointerId !== d.id) return
-        if (Math.abs(e.clientX - d.sx) > 3 || Math.abs(e.clientY - d.sy) > 3) { d.moved = true; setDragging(true) }
-        if (!d.moved) return
-        setPos(hudClamp({ left: d.left + (e.clientX - d.sx), top: d.top + (e.clientY - d.sy) }))
-      }
-      const onPointerUp = (e) => {
-        const d = drag.current
-        if (!d || e.pointerId !== d.id) return
-        drag.current = null
-        setDragging(false)
-        setPos((cur) => {
-          const next = d.moved ? hudDock(hudClamp(cur)) : cur
-          try { localStorage.setItem(HUD_KEY, JSON.stringify(next)) } catch {}
-          return next
-        })
-        if (!d.moved) {
-          setBusy(true)
-          refreshLoggedIn().then((r) => {
-            setActive(r.active)
-            return fetch('/dsh-subscriptions/config', { cache: 'no-store' }).then((res) => res.json())
-          }).then((cfg) => setAccounts((cfg && cfg.accounts) || [])).catch(() => {}).finally(() => setBusy(false))
-        }
-      }
-      // Остаток активной подписки: 100 - usagePercent.
-      const remaining = active && active.usagePercent != null ? Math.max(0, 100 - active.usagePercent) : null
-      const tone = remaining == null ? 'var(--dsw-alias-label-tertiary)'
-        : (remaining < 10 ? 'var(--dsw-alias-state-error-primary)'
-          : (remaining < 30 ? 'var(--dsw-alias-state-warning-primary)' : 'var(--dsw-alias-state-success-primary)'))
-      const R = 26
-      const CIRC = 2 * Math.PI * R
-      const offset = CIRC * (1 - (remaining == null ? 0 : Math.min(100, remaining)) / 100)
-      const rows = accounts.map((a, i) => {
-        const pct = a.usagePercent != null ? Math.round(a.usagePercent) : null
-        return React.createElement('div', { className: 'dsub-hudRow', key: i },
-          React.createElement('span', { className: 'dsub-hudName' }, a.provider + (a.index ? ' #' + a.index : '')),
-          React.createElement('span', { className: 'dsub-bar' },
-            React.createElement('span', { className: 'dsub-barFill', style: { width: (pct == null ? 0 : Math.min(100, pct)) + '%' } })),
-          React.createElement('span', { className: 'dsub-hudPct' }, pct == null ? '—' : pct + '%'),
-        )
-      })
-      if (!createPortal) return null
-      return createPortal(React.createElement('div', {
-        className: 'dsub-hud',
-        'data-dragging': dragging ? 'true' : undefined,
-        style: { left: pos.left + 'px', top: pos.top + 'px' },
-      },
-        React.createElement('button', {
-          type: 'button', className: 'dsub-hudBtn', 'aria-label': t('hudTitle'),
-          style: { '--dsub-tone': tone },
-          onPointerDown, onPointerMove, onPointerUp, onPointerCancel: onPointerUp,
-        },
-          React.createElement('svg', { className: 'dsub-hudRing', viewBox: '0 0 56 56', 'aria-hidden': 'true' },
-            React.createElement('circle', { className: 'dsub-hudTrack', cx: 28, cy: 28, r: R }),
-            React.createElement('circle', {
-              className: 'dsub-hudVal', cx: 28, cy: 28, r: R,
-              strokeDasharray: String(CIRC), strokeDashoffset: String(offset),
-            }),
-          ),
-          React.createElement('span', { className: 'dsub-hudCore' },
-            remaining == null ? '—' : (busy ? '\u2026' : Math.round(remaining) + '%'),
-          ),
-        ),
-        React.createElement('div', { className: 'dsub-hudPanel' },
-          React.createElement('div', { className: 'dsub-hudHead' }, t('hudTitle')),
-          rows.length ? rows : React.createElement('div', { className: 'dsub-sub' }, '\u2014'),
-          React.createElement('div', { className: 'dsub-hudHint' }, t('hudHint')),
-        ),
-      ), document.body)
-    }
-
-    function registerUsageBubble(ctx) {
-      ctx.effect(() => {
-        ctx.slots.inject('shell.overlay', () =>
-          ctx.slots.register(
-            {
-              name: 'shell.overlay',
-              id: 'dsh-subscriptions-usage-bubble',
-              order: 40,
-              locale: NS,
-            },
-            (props) => React.createElement(UsageBubble, { t }),
-          ),
-        )
-      }, 'dsh-subscriptions: usage bubble')
-    }
 
     function registerSubsPill(ctx) {
       ctx.effect(() => {
@@ -1391,145 +1212,6 @@ function PluginCard(props) {
       }, 'dsh-subscriptions: composer quota')
     }
 
-    // #52: компактный чип в шапке сессии со статусом подключённых подписок.
-    function HeaderChip(props) {
-      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((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/#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 idx = a.index != null ? ('#' + a.index) : ''
-        const plan = a.plan ? (' ' + a.plan) : ''
-        // #77: без provider-префикса
-        const label = (a.provider === 'codex' && state.fastMode ? '\u26a1' : '') + 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
-      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: cls,
-        title: on ? t('chipActive') + ': ' + state.count : t('none'),
-      },
-        React.createElement('span', { className: 'dsub-chipDot' }),
-        text,
-      )
-    }
-
-    function registerHeaderChip(ctx) {
-      ctx.effect(() => {
-        ctx.slots.inject('conversation.session.header.utilities', () =>
-          ctx.slots.register(
-            {
-              name: 'conversation.session.header.utilities',
-              id: 'dsh-subscriptions-header-chip',
-              order: 5,
-              locale: NS,
-            },
-            (props) => React.createElement(HeaderChip, { t }),
-          ),
-        )
-      }, 'dsh-subscriptions: header chip')
-    }
-
-    function registerComposerSwitch(ctx) {
-      ctx.effect(() => {
-        const render = () => {
-          if (!labelEl) return
-          refreshLoggedIn().then((logged) => {
-            if (!labelEl) return
-            const current = logged.length ? logged[activeIdx % logged.length] : null
-            labelEl.textContent = t('switchLabel') + ': ' + (current || t('none'))
-          }).catch(() => {})
-        }
-        ctx.slots.inject('composer.action', () =>
-          ctx.slots.register(
-            {
-              name: 'composer.action',
-              id: 'dsh-subscriptions-provider-switch',
-              order: 31,
-              label: () => {
-                // label используется ядром до монтирования; держим актуальным
-                setTimeout(render, 0)
-                return t('switchLabel')
-              },
-            },
-            (props) => {
-              const el = React.createElement('button', {
-                onClick: async () => {
-                  const logged = await refreshLoggedIn()
-                  if (!logged.length) return
-                  activeIdx = (activeIdx + 1) % logged.length
-                  render()
-                },
-              }, '')
-              // Обновить текст в смонтированном элементе
-              setTimeout(() => {
-                labelEl = el
-                render()
-              }, 0)
-              return el
-            },
-          ),
-        )
-        render()
-      }, 'dsh-subscriptions: composer provider switch')
-    }
-
-    // #43: slash-команды входа/выхода/статуса прямо из чата.
     function registerSlashCommands(ctx) {
       ctx.effect(() => {
         const triggers = ctx.get('inputTriggers')
@@ -1595,11 +1277,8 @@ function PluginCard(props) {
     exports.apply = function apply(ctx) {
       setT(ctx.locale.bind(NS))
       registerSettings(ctx)
-      registerUsageBubble(ctx)
       registerSubsPill(ctx)
       registerComposerQuota(ctx)
-      registerHeaderChip(ctx)
-      registerComposerSwitch(ctx)
       registerSlashCommands(ctx)
     }
     return module.exports

package/package.json

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