@goodandready/dsh-subscriptions 0.6.4 → 0.6.5

package/lib/blob.js

@@ -37,11 +37,3 @@ export function parseBlob(text) {
   }
 }
 
-export function publicAccountView(blob, extra) {
-  const label = (blob && (blob.label || blob.email)) || ''
-  return {
-    label,
-    email: (blob && blob.email) || '',
-    ...(extra || {}),
-  }
-}

package/lib/client.js

@@ -54,6 +54,10 @@ window.__ModuleLoader__.load({
     '.dsub-chevOpen{transform:rotate(180deg)}' +
     '.dsub-body{border-top:1px solid var(--dsw-alias-border-l2);margin:0 16px;padding-bottom:12px}' +
     '.dsub-block{margin-top:10px}' +
+    '.dsub-group{margin-top:12px;border:1px solid var(--dsw-alias-border-l2);border-radius:10px;padding:0 14px}' +
+    '.dsub-group[open]{padding-bottom:6px}' +
+    '.dsub-groupHead{cursor:pointer;font-size:13px;font-weight:600;color:var(--dsw-alias-label-primary);padding:10px 0;list-style:none}' +
+    '.dsub-groupHead::-webkit-details-marker{display:none}' +
     '.dsub-row{display:flex;align-items:center;flex-wrap:wrap;gap:8px;margin-top:8px}' +
     '.dsub-grow{flex:1 1 180px;min-width:140px}' +
     '.dsub-helpBox{margin-top:8px;padding:12px 14px;border-radius:8px;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);font-size:12px;line-height:1.6}' +
@@ -310,6 +314,12 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       'intro': 'Log in with a consumer subscription. Tokens stay on the host credentials store. The browser never reads them back. After Connect, if the provider lands on localhost or a vendor page, paste the redirected URL or the code here.',
       'useOrigin': 'Use this Web UI origin as OAuth redirect_uri',
       'useOriginHint': 'Leave off unless you registered your own OAuth client for this origin. Vendor CLI clients usually require their published redirect URI plus the paste step.',
+      'closeModal': 'Close',
+      'groupAuth': 'Sign-in and redirect',
+      'groupPrivacy': 'Privacy and model list',
+      'groupRotation': 'Rotation and limits',
+      'groupProvider': 'Provider behaviour',
+      'groupFallback': 'Local fallback',
       'privacyMask': 'Mask emails and account identifiers',
       'privacyMaskHint': 'For demos and screen sharing: emails show as j***n@example.com.',
       'autoLoopback': 'Auto Loopback',
@@ -539,6 +549,10 @@ const cssId = 'dsh-subscriptions/settings.module.css'
     function badgeFor(account, t) {
       if (!account || !account.configured) return t('notConnected')
       if (account.validationUrl) return t('verifyAccount')
+      // #303: a quarantined account says why it is parked.
+      if (account.quarantineReason && account.quarantineUntil && account.quarantineUntil > Date.now()) {
+        return account.quarantineReason === 'VERIFY' ? t('verifyAccount') : String(account.quarantineReason)
+      }
       if (account.cooldownUntil && account.cooldownUntil > Date.now()) return t('coolingDown')
       if (account.usagePercent != null && account.usagePercent >= 100) return t('usageFull')
       return t('connected')
@@ -862,6 +876,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement('div', { className: 'dsub-h' }, t('title')),
           React.createElement('div', { className: 'dsub-sub' },
             t('intro')),
+          React.createElement('details', { className: 'dsub-group', open: true },
+            React.createElement('summary', { className: 'dsub-groupHead' }, t('groupAuth')),
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
@@ -875,23 +891,26 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
-              checked: !!draft.privacyMask,
-              onChange: (e) => setDraft((d) => Object.assign({}, d, { privacyMask: e.target.checked })),
+              checked: !!draft.autoLoopback,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { autoLoopback: e.target.checked })),
             }),
-            React.createElement('span', null, t('privacyMask')),
+            React.createElement('span', null, t('autoLoopback')),
           ),
           React.createElement('div', { className: 'dsub-sub' },
-            t('privacyMaskHint')),
+            t('autoLoopbackHint')),
+          ),
+          React.createElement('details', { className: 'dsub-group', open: true },
+            React.createElement('summary', { className: 'dsub-groupHead' }, t('groupPrivacy')),
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
-              checked: !!draft.autoLoopback,
-              onChange: (e) => setDraft((d) => Object.assign({}, d, { autoLoopback: e.target.checked })),
+              checked: !!draft.privacyMask,
+              onChange: (e) => setDraft((d) => Object.assign({}, d, { privacyMask: e.target.checked })),
             }),
-            React.createElement('span', null, t('autoLoopback')),
+            React.createElement('span', null, t('privacyMask')),
           ),
           React.createElement('div', { className: 'dsub-sub' },
-            t('autoLoopbackHint')),
+            t('privacyMaskHint')),
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
@@ -902,6 +921,9 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           ),
           React.createElement('div', { className: 'dsub-sub' },
             t('hideDeprecatedHint')),
+          ),
+          React.createElement('details', { className: 'dsub-group', open: true },
+            React.createElement('summary', { className: 'dsub-groupHead' }, t('groupRotation')),
           React.createElement('div', { className: 'dsub-row' },
             React.createElement('span', { className: 'dsub-h' }, t('composerQuota')),
             React.createElement('select', {
@@ -931,6 +953,9 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           ),
           React.createElement('div', { className: 'dsub-sub' },
             t('expiryNotifyDaysHint')),
+          ),
+          React.createElement('details', { className: 'dsub-group', open: true },
+            React.createElement('summary', { className: 'dsub-groupHead' }, t('groupProvider')),
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
@@ -956,6 +981,9 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           ),
           React.createElement('div', { className: 'dsub-sub' },
             t('codexVerbosityHint')),
+          ),
+          React.createElement('details', { className: 'dsub-group', open: true },
+            React.createElement('summary', { className: 'dsub-groupHead' }, t('groupFallback')),
           React.createElement('label', { className: 'dsub-row' },
             React.createElement('input', {
               type: 'checkbox',
@@ -982,6 +1010,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               onChange: (e) => setDraft((d) => Object.assign({}, d, { ollamaFallbackModel: e.target.value })),
             }),
           ) : null,
+          ),
           React.createElement('details', { className: 'dsub-details' },
             React.createElement('summary', { className: 'dsub-summary' }, t('advancedSettings')),
             React.createElement('div', { className: 'dsub-block' },
@@ -1691,15 +1720,20 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       const rows = state.accounts.map((a, i) => {
         const isLogged = state.logged.includes(a.provider)
         const cooled = a.cooldownUntil && a.cooldownUntil > now
+        const quarantined = Boolean(a.quarantineReason) && Number(a.quarantineUntil || 0) > now
         const pct = a.usagePercent != null ? Math.round(a.usagePercent) : null
         const b = brandBadge(a.provider)
         const isActiveThis = state.active && state.active.provider === a.provider && state.active.index === a.index
 
         let statusClass = 'dsub-statusOff'
         let statusText = t('subsNotLogged')
-        if (cooled) {
+        if (quarantined) {
+          statusClass = 'dsub-statusBad'
+          statusText = a.quarantineReason === 'VERIFY' ? t('verifyAccount') : String(a.quarantineReason)
+        } else if (cooled) {
           statusClass = 'dsub-statusWarn'
-          statusText = t('subsCooldown')
+          // Only some model families may be cooled down - say which ones.
+          statusText = t('subsCooldown') + (Array.isArray(a.cooldownFamilies) && a.cooldownFamilies.length ? ' · ' + a.cooldownFamilies.join('/') : '')
         } else if (isLogged) {
           if (pct >= 90) { statusClass = 'dsub-statusBad'; statusText = '90%+ ' + t('subsUsed') }
           else if (pct >= 50) { statusClass = 'dsub-statusWarn'; statusText = pct + '% ' + t('subsUsed') }
@@ -1715,7 +1749,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                 isActiveThis ? React.createElement('span', { className: 'dsub-pillTag', style: { background: 'color-mix(in srgb,var(--dsw-alias-state-success-primary) 15%,transparent)', color: 'var(--dsw-alias-state-success-primary)' } }, 'ACTIVE') : null,
                 a.proxy ? React.createElement('span', { className: 'dsub-dim', title: a.proxy }, '🌐 proxy') : null,
               ),
-              React.createElement('span', { className: 'dsub-accStatusTag ' + statusClass }, statusText),
+              React.createElement('span', { className: 'dsub-accStatusTag ' + statusClass, role: 'status', 'aria-live': 'polite' }, statusText),
             ),
             (isLogged && pct != null) ? React.createElement('div', { className: 'dsub-barTrack', style: { marginTop: 4, height: 4 } },
               React.createElement('div', {
@@ -1746,7 +1780,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           className: 'dsub-modalWrap',
           onClick: (e) => { if (e.target === e.currentTarget) setState((s) => Object.assign({}, s, { open: false })) },
         },
-          React.createElement('div', { className: 'dsub-modal', role: 'dialog', 'aria-label': t('subsModalTitle') },
+          React.createElement('div', { className: 'dsub-modal', role: 'dialog', 'aria-modal': 'true', 'aria-label': t('subsModalTitle') },
             React.createElement('div', { className: 'dsub-modalHead' },
               React.createElement('div', { className: 'dsub-modalTitleWrap' },
                 React.createElement('div', { className: 'dsub-modalIcon' }, '⚡'),
@@ -1765,6 +1799,8 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                 React.createElement('button', {
                   type: 'button',
                   className: 'dsub-mini',
+                  autoFocus: true,
+                  'aria-label': t('closeModal'),
                   onClick: () => setState((s) => Object.assign({}, s, { open: false })),
                 }, '✕'),
               ),

package/lib/http.js

@@ -30,7 +30,10 @@ export function readBody(req, maxBytes = 64 * 1024) {
   })
 }
 
-/** Reject cross-site writes. Do not require loopback: Web UI is used over LAN and reverse proxies. */
+/**
+ * @param {import('node:http').IncomingMessage} request
+ * @returns {boolean}
+ * Reject cross-site writes. Do not require loopback: Web UI is used over LAN and reverse proxies. */
 export function isTrustedSettingsRequest(request) {
   return request.headers['sec-fetch-site'] !== 'cross-site'
 }

package/lib/index.js

@@ -440,6 +440,11 @@ export function apply(ctx, config) {
         configured: info.configured,
         writable: info.writable,
         cooldownUntil: info.cooldownUntil,
+        // #303: expose the cooldown scope and quarantine so the card can
+        // explain why only some models are blocked.
+        cooldownFamilies: info.cooldownFamilies || null,
+        quarantineUntil: info.quarantineUntil || 0,
+        quarantineReason: info.quarantineReason || null,
         usagePercent: info.usagePercent,
         quota: info.quota || null,
         usage: info.usage || null,

package/lib/quarantine.js

@@ -29,10 +29,3 @@ export function isQuarantined(account, nowMs = Date.now()) {
   return Number(account.quarantineUntil) > Number(nowMs)
 }
 
-export function releaseFromQuarantine(account) {
-  const next = { ...account }
-  delete next.quarantineReason
-  delete next.quarantineUntil
-  if (next.status === 'quarantine') next.status = 'active'
-  return next
-}

package/lib/ratelimit-parser.js

@@ -1,24 +0,0 @@
-export function parseRateLimitHeaders(headers) {
-  if (!headers || typeof headers !== 'object') return null
-
-  const get = (key) => {
-    const k = Object.keys(headers).find((h) => h.toLowerCase() === key.toLowerCase())
-    return k ? headers[k] : null
-  }
-
-  const remainingTokens = get('x-ratelimit-remaining-tokens')
-  const resetTokens = get('x-ratelimit-reset-tokens')
-  const remainingRequests = get('x-ratelimit-remaining-requests')
-  const resetRequests = get('x-ratelimit-reset-requests')
-
-  if (!remainingTokens && !resetTokens && !remainingRequests && !resetRequests) {
-    return null
-  }
-
-  return {
-    remainingTokens: remainingTokens != null ? Number(remainingTokens) : null,
-    resetTokensTime: resetTokens || null,
-    remainingRequests: remainingRequests != null ? Number(remainingRequests) : null,
-    resetRequestsTime: resetRequests || null
-  }
-}

package/lib/ratelimit.js

@@ -208,11 +208,3 @@ export function quotaSnapshot(provider, headers, bodyJson, nowMs = Date.now()) {
   return { remaining, limit, resetAt: resetAt ?? null, usedPercent, measuredAt: nowMs }
 }
 
-export function formatQuota(q) {
-  if (!q) return ""
-  const parts = []
-  if (q.remaining!=null && q.limit!=null) parts.push(q.remaining+"/"+q.limit)
-  else if (q.remaining!=null) parts.push("left "+q.remaining)
-  if (q.resetAt) parts.push("reset "+new Date(q.resetAt).toLocaleString())
-  return parts.join(" · ")
-}

package/lib/refs.js

@@ -61,6 +61,11 @@ export function displayName(provider) {
   return DISPLAY[provider] || displayExtra[provider] || provider
 }
 
+/**
+ * @param {string} provider
+ * @param {number} index
+ * @returns {string} provider-scoped credential ref, e.g. CODEX_OAUTH_1
+ */
 export function oauthRef(provider, index) {
   const n = Number(index)
   if (!Number.isInteger(n) || n < 1) throw new Error('account index must be an integer >= 1')

package/lib/relative-time.js

@@ -26,6 +26,12 @@ function fill(template, n) {
   return String(template).replace('{n}', String(n))
 }
 
+/**
+ * @param {number} resetAt epoch ms of the quota window reset
+ * @param {string} [lang]
+ * @param {number} [now]
+ * @returns {string} human-readable remaining time, down to the minute
+ */
 export function formatRelativeReset(resetAt, lang = 'ru', now = Date.now()) {
   if (typeof resetAt !== 'number' || !Number.isFinite(resetAt) || resetAt <= 0) return ''
   const delta = resetAt - now

package/lib/session-pin.js

@@ -1,6 +1,13 @@
 const sessionPins = new Map()
 const DEFAULT_TTL_MS = 30 * 60 * 1000 // 30 mins
 
+/**
+ * Bind a session id to an account ref for ttlMs (default 30 minutes).
+ * @param {string|undefined} sessionId
+ * @param {string|undefined} accountRef
+ * @param {number} [ttlMs]
+ * @returns {void}
+ */
 export function pinSession(sessionId, accountRef, ttlMs = DEFAULT_TTL_MS) {
   if (!sessionId || !accountRef) return
   sessionPins.set(sessionId, {
@@ -9,6 +16,10 @@ export function pinSession(sessionId, accountRef, ttlMs = DEFAULT_TTL_MS) {
   })
 }
 
+/**
+ * @param {string|undefined} sessionId
+ * @returns {string|null} the bound account ref, or null when absent/expired
+ */
 export function getPinnedAccountRef(sessionId) {
   if (!sessionId) return null
   const entry = sessionPins.get(sessionId)

package/lib/vendors/antigravity.js

@@ -150,7 +150,9 @@ export async function usage(blob, _cfg, fetchImpl) {
 }
 
 export async function* streamOnce({ blob, options, fetchImpl, headers, config, signal, saveBlob }) {
-  const ready = await withProject(blob, fetchImpl, saveBlob)
+  // Abort must cover the project pre-flight as well as the stream.
+  const preflight = (u, i) => fetchImpl(u, { ...(i || {}), signal })
+  const ready = await withProject(blob, preflight, saveBlob)
   const { envelope, sessionId } = streamEnvelope({
     projectId: ready.projectId,
     model: options.model,

package/lib/vendors/grok.js

@@ -236,7 +236,8 @@ export async function* streamOnce({ blob, options, fetchImpl, headers, config, s
   if (!body.instructions) delete body.instructions
   // grok manages reasoning itself (cli catalog aware); drop the codex-level field
   delete body.reasoning
-  const catalog = await cliCatalogCached(blob, config, fetchImpl).catch(() => new Map())
+  // Thread the caller AbortSignal through the catalog pre-flight too.
+  const catalog = await cliCatalogCached(blob, config, (u, i) => fetchImpl(u, { ...(i || {}), signal })).catch(() => new Map())
   const reasoning = grokReasoningBody(options.model, options.reasoningEffort, catalog)
   if (reasoning) body.reasoning = reasoning
   body = grokBodyForModel(options.model, body)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "Use ChatGPT Codex, Claude, Grok, Antigravity, Kimi, GLM, Cursor, Kiro, Copilot, Qwen, ERNIE, Spark, JetBrains, Perplexity, Replit, and Cody subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",
@@ -35,7 +35,8 @@
     "url": "https://github.com/GooDAnDReaDY/dsh-subscriptions/issues"
   },
   "scripts": {
-    "test": "eslint lib/ && node --test test/*.test.mjs"
+    "test": "eslint lib/ && node --test test/*.test.mjs",
+    "typecheck": "tsc -p tsconfig.checkjs.json"
   },
   "dsh": {
     "bundle": {
@@ -62,6 +63,8 @@
     "undici": "^8.10.1"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8"
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
+    "@types/node": "^22.20.2",
+    "typescript": "^7.0.2"
   }
 }