@goodandready/dsh-subscriptions 0.5.26 → 0.5.31

package/lib/accounts.js

@@ -189,7 +189,8 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
   async function ensureFresh(provider, blob, ref) {
     if (!blob.refreshToken) return blob
     if (blob.expiresAt && blob.expiresAt - SKEW_MS > Date.now()) return blob
-    if (ref && refreshLocks.has(ref)) return refreshLocks.get(ref)
+    const lockKey = ref || (provider + ":" + (blob.accountId || blob.email || (blob.refreshToken && blob.refreshToken.slice(-16)) || "anon"))
+    if (refreshLocks.has(lockKey)) return refreshLocks.get(lockKey)
     const promise = (async () => {
       try {
         const cfg = vendorConfig(provider, getConfig())
@@ -220,10 +221,10 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         if (ref) refreshFailures.set(ref, { at: Date.now(), error: String(e && e.message || e) })
         throw e
       } finally {
-        if (ref) refreshLocks.delete(ref)
+        refreshLocks.delete(lockKey)
       }
     })()
-    if (ref) refreshLocks.set(ref, promise)
+    refreshLocks.set(lockKey, promise)
     return promise
   }
 

package/lib/client.js

@@ -12,6 +12,35 @@ window.__ModuleLoader__.load({
     let t = (key) => key
     const setT = (fn) => { t = fn }
 
+    class ErrorBoundary extends React.Component {
+      constructor(props) {
+        super(props)
+        this.state = { hasError: false, error: null }
+      }
+      static getDerivedStateFromError(error) {
+        return { hasError: true, error }
+      }
+      componentDidCatch(error, info) {
+        try { console.error("[dsh-subscriptions UI error]", error, info) } catch {}
+      }
+      render() {
+        if (this.state.hasError) {
+          return React.createElement(
+            "div",
+            { style: { padding: "12px", border: "1px solid var(--dsw-alias-state-error-primary, #e5534b)", borderRadius: "8px", background: "var(--dsw-alias-bg-layer-2, #1f1f1f)", margin: "8px 0", fontSize: "13px" } },
+            React.createElement("div", { style: { fontWeight: 600, color: "var(--dsw-alias-state-error-primary, #e5534b)", marginBottom: "4px" } }, "Subscriptions UI error"),
+            React.createElement("div", { style: { color: "var(--dsw-alias-label-secondary, #8b949e)", fontSize: "12px", marginBottom: "8px" } }, String(this.state.error && this.state.error.message || this.state.error || "Unknown error")),
+            React.createElement("button", {
+              className: "dsub-mini",
+              onClick: () => this.setState({ hasError: false, error: null })
+            }, "Retry")
+          )
+        }
+        return this.props.children
+      }
+    }
+
+
     const CSS =
     '.dsub-card{list-style:none;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-3);border-radius:12px;transition:border-color .16s,background .16s}' +
     '.dsub-card:hover{border-color:var(--dsw-alias-label-dimmed)}' +
@@ -1322,7 +1351,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
           React.createElement(Chevron, { className: 'dsub-chev' + (open ? ' dsub-chevOpen' : '') }),
         ),
         open ? React.createElement('div', { className: 'dsub-body' },
-          React.createElement(SubsSection, props),
+          React.createElement(ErrorBoundary, null, React.createElement(SubsSection, props)),
         ) : null,
       )
     }
@@ -1741,7 +1770,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 15,
               locale: NS,
             },
-            (props) => React.createElement(SubsPill, { t }),
+            (props) => React.createElement(ErrorBoundary, null, React.createElement(SubsPill, { t })),
           ),
         )
       }, 'dsh-subscriptions: subs pill')
@@ -1757,7 +1786,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
               order: 5,
               locale: NS,
             },
-            (props) => React.createElement(ComposerQuota, { t }),
+            (props) => React.createElement(ErrorBoundary, null, React.createElement(ComposerQuota, { t })),
           ),
         )
       }, 'dsh-subscriptions: composer quota')

package/lib/config-schema.js

@@ -0,0 +1,80 @@
+import z from '@deepseek-ai/schemastery'
+import { PROVIDERS } from './refs.js'
+
+export const Slot = z.object({
+  provider: z.string().default('codex')
+    .description('One of: codex, claude, grok, antigravity.'),
+  index: z.number().default(1)
+    .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.'),
+  proxyUrl: z.string().default('')
+    .description('#88 Per-account proxy URL (http://, https://, socks5://). All requests for this account route through it. Empty = direct connection.'),
+})
+
+export const defaultSlots = PROVIDERS.map((provider) => ({ provider, index: 1, label: '' }))
+
+export const Config = z.object({
+  cooldownMs: z.number().default(30 * 60 * 1000)
+    .description('After RATE_LIMIT/QUOTA/429, skip that account for this many milliseconds.'),
+  switchAtRemaining: z.number().default(0.01)
+    .description('If remaining <= this (absolute or <1 fraction), treat as exhausted before request. 0 disables.'),
+  refreshAheadMs: z.number().default(5 * 60 * 1000)
+    .description('Background refresh when expiry within this many ms.'),
+  refreshRetryMs: z.number().default(10 * 60 * 1000)
+    .description('Do not retry background refresh more often than this after failure.'),
+  probeIntervalMin: z.number().default(15)
+    .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.'),
+  privacyMask: z.boolean().default(false)
+    .description('#98 Hide personal data in the UI: emails show as j***n@example.com.'),
+  slots: z.array(Slot).default(defaultSlots)
+    .description('Account slots. Secrets are not stored here; only the credential ref names.'),
+  useWebCallback: z.boolean().default(false)
+    .description('When on, redirect_uri is this Web UI origin + /dsh-subscriptions/oauth/callback. When off, the vendor CLI registered redirect is used and you paste the redirected URL.'),
+  autoLoopback: z.boolean().default(true)
+    .description('#89 When on and the vendor redirect_uri is a loopback address (codex :1455, grok :56121), a temporary local server catches the OAuth callback automatically - no paste needed. Paste fallback stays available.'),
+  ollamaBaseUrl: z.string().default('http://127.0.0.1:11434')
+    .description('#91 Local Ollama base URL. Served as the ollama provider in the native model picker when reachable.'),
+  ollamaFallback: z.boolean().default(true)
+    .description('#91 When every account of a provider is exhausted, continue the chat on local Ollama instead of failing.'),
+  ollamaFallbackModel: z.string().default('')
+    .description('#91 Ollama model used for the fallback (for example qwen2.5-coder). Empty = first model from /api/tags.'),
+  hideDeprecatedModels: z.boolean().default(false)
+    .description('#94 Hide test/preview/beta/legacy model ids from the native model picker.'),
+  codexClientId: z.string().default(''),
+  codexVerbosity: z.string().default('')
+    .description('#93 Response verbosity for Codex reasoning models: low, medium or high. Empty = protocol default.'),
+  codexFastMode: z.boolean().default(false)
+    .description('#92 Fast Mode for Codex: sends service_tier priority (1.5x speed billing tier) with every request.'),
+  composerQuota: z.string().default('off')
+    .description('#84 Composer quota indicator mode: off, percent, bar or forecast (predictive runway from a sliding window).'),
+  codexRedirectUri: z.string().default(''),
+  codexBaseUrl: z.string().default(''),
+  claudeClientId: z.string().default(''),
+  claudeRedirectUri: z.string().default(''),
+  grokClientId: z.string().default(''),
+  grokRedirectUri: z.string().default(''),
+  grokBaseUrl: z.string().default(''),
+  grokClientVersion: z.string().default('')
+    .description('Grok CLI identity version header. Empty uses the built-in default.'),
+  antigravityClientId: z.string().default(''),
+  antigravityRedirectUri: z.string().default(''),
+  customVendors: z.array(z.any()).default([])
+    .description('Declarative OpenAI-Responses-compatible providers. See README.'),
+})
+
+export function publicConfig(cfg) {
+  const clone = structuredClone(cfg)
+  // #242: redact all *ClientSecret fields before exposing config via GET /config.
+  // Secrets must never leave the server; the UI does not need them.
+  for (const key of Object.keys(clone)) {
+    if (key.endsWith('ClientSecret')) clone[key] = clone[key] ? '••••••' : ''
+  }
+  return clone
+}

package/lib/http.js

@@ -64,3 +64,19 @@ export async function fetchWithTimeout(fetchImpl, url, init = {}, { timeoutMs =
     clearTimeout(timer)
   }
 }
+
+export function safeJsonHandler(fn) {
+  return async (req, res) => {
+    try {
+      await fn(req, res)
+    } catch (err) {
+      const status = Number(err && (err.status || err.statusCode) || 500)
+      const code = (err && err.code) || "INTERNAL_ERROR"
+      const message = String((err && err.message) || err || "Internal server error")
+      writeJson(res, status >= 400 && status < 600 ? status : 500, {
+        ok: false,
+        error: { code, message },
+      })
+    }
+  }
+}