@goodandready/dsh-subscriptions 0.6.17 → 0.6.18

package/lib/adapter.js

@@ -7,6 +7,7 @@ import { streamWithRotation } from './stream-rotate.js'
 import { pickFetch } from './proxy.js'
 import { quotaSnapshot, parseBody } from './ratelimit.js'
 import { toTokenUsage } from './wire.js'
+import { isSwitchableError } from './rotate.js'
 
 // #94: heuristic for test/preview/beta/legacy model ids.
 function isDeprecatedId(id) {
@@ -93,7 +94,7 @@ export class SubscriptionAdapter extends LlmAdapter {
     }
   }
 
-  async *stream(options) {
+  async *stream(options, visited = new Set()) {
     const provider = options.provider
     const deps = this.deps
     let yieldedAny = false
@@ -193,13 +194,16 @@ export class SubscriptionAdapter extends LlmAdapter {
       }
       return
     } catch (err) {
-      // #349: opt-in cascading cross-vendor fallback when all accounts are exhausted
-      if (!yieldedAny && typeof deps.cascadingFallback === 'function') {
+      // #349 & #361: opt-in cascading cross-vendor fallback with abort and cycle checks
+      if (!yieldedAny && !options.signal?.aborted && isSwitchableError(err) && typeof deps.cascadingFallback === 'function') {
         try {
-          yield* deps.cascadingFallback({ options, provider, err })
+          for await (const event of deps.cascadingFallback({ options, provider, err, visited })) {
+            yieldedAny = true
+            yield event
+          }
           return
         } catch (cascadeErr) {
-          /* proceed to ollama fallback or error rethrow */
+          err = cascadeErr
         }
       }
       // #91: when the whole pool is exhausted and nothing has been streamed

package/lib/client.js

@@ -493,7 +493,17 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       "updateNow": "Update",
       "updating": "Updating…",
       "updateSuccessRestart": "Update complete. Restarting service…",
-      "updateFailed": "Update failed"
+      "updateFailed": "Update failed",
+      "healthMatrix": "Health Matrix & Quota Runway",
+      "healthAccount": "Account",
+      "healthScore": "Health",
+      "healthLatency": "Latency",
+      "healthStatus": "Status",
+      "healthQuota": "Quota / Runway",
+      "healthQuarantine": "Quarantine",
+      "healthWarmup": "Warmup",
+      "healthActive": "Active",
+      "healthIdle": "Idle"
 };
 
     const zh = {
@@ -663,7 +673,17 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       "updateNow": "立即更新",
       "updating": "正在更新…",
       "updateSuccessRestart": "更新成功，服务重启中…",
-      "updateFailed": "更新失败"
+      "updateFailed": "更新失败",
+      "healthMatrix": "健康矩阵与配额预测",
+      "healthAccount": "账户",
+      "healthScore": "健康度",
+      "healthLatency": "延迟",
+      "healthStatus": "状态",
+      "healthQuota": "额度 / 余量",
+      "healthQuarantine": "隔离期",
+      "healthWarmup": "预热中",
+      "healthActive": "活跃",
+      "healthIdle": "空闲"
 };
     // #51: live countdown to the quota window reset (account.quota.resetAt).
                 function cleanErrorMessage(raw) {
@@ -1232,11 +1252,11 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             React.createElement('table', { style: { width: '100%', fontSize: '12px', borderCollapse: 'collapse' } },
               React.createElement('thead', null,
                 React.createElement('tr', { style: { borderBottom: '1px solid var(--dsw-alias-border-primary, rgba(255,255,255,0.1))', textAlign: 'left', opacity: 0.7 } },
-                  React.createElement('th', { style: { padding: '6px' } }, 'Account'),
-                  React.createElement('th', { style: { padding: '6px' } }, 'Health'),
-                  React.createElement('th', { style: { padding: '6px' } }, 'Latency'),
-                  React.createElement('th', { style: { padding: '6px' } }, 'Status'),
-                  React.createElement('th', { style: { padding: '6px' } }, 'Quota / Runway'),
+                  React.createElement('th', { style: { padding: '6px' } }, t('healthAccount')),
+                  React.createElement('th', { style: { padding: '6px' } }, t('healthScore')),
+                  React.createElement('th', { style: { padding: '6px' } }, t('healthLatency')),
+                  React.createElement('th', { style: { padding: '6px' } }, t('healthStatus')),
+                  React.createElement('th', { style: { padding: '6px' } }, t('healthQuota')),
                 ),
               ),
               React.createElement('tbody', null,
@@ -1244,7 +1264,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
                   const sc = acc.healthScore != null ? acc.healthScore : 100
                   const healthColor = sc >= 80 ? '#10b981' : (sc >= 50 ? '#f59e0b' : '#ef4444')
                   const isQ = acc.status === 'quarantine' || (acc.quarantineUntil && Number(acc.quarantineUntil) > Date.now())
-                  const statusLabel = isQ ? '⛔ Quarantine' : (acc.status === 'probing' ? '🟡 Warmup' : (acc.configured ? '🟢 Active' : '⚪ Idle'))
+                  const statusLabel = isQ ? ('⛔ ' + t('healthQuarantine')) : (acc.status === 'probing' ? ('🟡 ' + t('healthWarmup')) : (acc.configured ? ('🟢 ' + t('healthActive')) : ('⚪ ' + t('healthIdle'))))
                   const pct = acc.usagePercent != null ? Math.round(acc.usagePercent) : null
                   return React.createElement('tr', { key: (acc.ref || acc.provider + acc.index || idx), style: { borderBottom: '1px solid var(--dsw-alias-border-secondary, rgba(255,255,255,0.05))' } },
                     React.createElement('td', { style: { padding: '6px', fontWeight: 600 } }, (acc.provider ? acc.provider.toUpperCase() : 'LLM') + ' #' + (acc.index || 1) + (acc.label ? ' (' + acc.label + ')' : '')),
@@ -1879,7 +1899,7 @@ const cssId = 'dsh-subscriptions/settings.module.css'
             name: 'plugins.item',
             id: ROW_ID,
             order: 60,
-            label: () => 'Subscriptions',
+            label: () => t('title') || 'Subscriptions',
             locale: NS,
             inject: () => ({ ctx: ctx }),
           },

package/lib/index.js

@@ -243,17 +243,20 @@ export function apply(ctx, config) {
     },
   }), 'dsh-subscriptions: image generation service')
   const pending = new Map()
-    async function* cascadeFallbackStream({ options, provider, err }) {
+    async function* cascadeFallbackStream({ options, provider, err, visited = new Set() }) {
     const cfg = live()
     if (!cfg.cascadingFallback) throw err
     const logged = await store.loggedInProviders()
     const available = Object.keys(logged || {}).filter((p) => logged[p] && p !== provider)
-    const nextVendor = resolveFallbackVendor(provider, available, cfg.cascadingChain)
+    visited.add(provider)
+    const nextVendor = resolveFallbackVendor(provider, available, cfg.cascadingChain, visited)
     if (!nextVendor) throw err
+    visited.add(nextVendor)
     const targetModel = mapFallbackModel(provider, options && options.model, nextVendor)
     if (logger && logger.warn) {
       logger.warn('[dsh-subscriptions] ' + provider + ': all accounts exhausted, cascading fallback to ' + nextVendor + '/' + targetModel)
     }
+    yield* adapter.stream({ ...options, provider: nextVendor, model: targetModel }, visited)
     try {
       recordHistory({
         provider: nextVendor,
@@ -265,7 +268,6 @@ export function apply(ctx, config) {
         kind: 'cascade',
       })
     } catch (e) { /* ignore cascade history recording error */ }
-    yield* adapter.stream({ ...options, provider: nextVendor, model: targetModel })
   }
 
   const adapter = new SubscriptionAdapter({
@@ -287,6 +289,7 @@ export function apply(ctx, config) {
   })
 
   let handle
+  let adapterDisposed = false
   let registeredByUs = new Set()
   function disposeAdapterHandle(h) {
     if (!h) return
@@ -299,6 +302,7 @@ export function apply(ctx, config) {
   }
 
   async function syncAdapter() {
+    if (adapterDisposed) return
     const desired = await store.loggedInProviders()
     const globalProviders = ctx.llm && typeof ctx.llm.listProviders === 'function'
       ? ctx.llm.listProviders().map((p) => p.id)
@@ -639,11 +643,12 @@ export function apply(ctx, config) {
     let retries = 0
     let retryTimer
     const scheduleRetry = () => {
-      if (retries >= 30) return
+      if (adapterDisposed || retries >= 30) return
       retryTimer = setTimeout(retrySync, 1000)
       if (retryTimer && typeof retryTimer.unref === 'function') retryTimer.unref()
     }
     const retrySync = async () => {
+      if (adapterDisposed) return
       try {
         const loggedIn = await store.loggedInProviders()
         if (!loggedIn.length) return
@@ -682,6 +687,7 @@ export function apply(ctx, config) {
     }
     eager()
     return () => {
+      adapterDisposed = true
       if (retryTimer) clearTimeout(retryTimer)
       if (handle) {
         disposeAdapterHandle(handle)

package/lib/routes/accounts.js

@@ -398,18 +398,10 @@ export function registerAccountsRoutes(ctx, state) {
       const { passphrase, vault } = payload
       try {
         const result = importVault(vault, passphrase)
-        // Save imported blobs
-        let blobCount = 0
-        if (result.blobs && typeof result.blobs === 'object') {
-          for (const [ref, blob] of Object.entries(result.blobs)) {
-            try {
-              await store.saveBlob(ref, blob)
-              blobCount++
-            } catch { /* ignore */ }
-          }
-        }
-        // Merge imported slots into configuration
-        if (Array.isArray(result.slots) && result.slots.length && getSettingsApi()) {
+        const settings = getSettingsApi()
+        let parsed
+        if (result.slots.length) {
+          if (!settings) throw new Error('settings are unavailable for vault import')
           const curSlots = Array.isArray(live().slots) ? live().slots.slice() : []
           for (const s of result.slots) {
             const idx = curSlots.findIndex((c) => c.provider === s.provider && Number(c.index) === Number(s.index))
@@ -419,8 +411,15 @@ export function registerAccountsRoutes(ctx, state) {
               curSlots.push(s)
             }
           }
-          const parsed = Config({ ...live(), slots: stripLegacySlots(curSlots) })
-          await getSettingsApi().replace(parsed)
+          parsed = Config({ ...live(), slots: stripLegacySlots(curSlots) })
+        }
+        let blobCount = 0
+        for (const [ref, blob] of Object.entries(result.blobs)) {
+          await store.saveBlob(ref, blob)
+          blobCount++
+        }
+        if (parsed) {
+          await settings.replace(parsed)
           syncCustomVendors()
         }
         await syncAdapter()

package/lib/vault.js

@@ -1,7 +1,8 @@
-// #353: Encrypted Vault Export/Import for Subscriptions
+// #353 & #360: Encrypted Vault Export/Import for Subscriptions
 // Secure migration and backup of slots and credentials using AES-256-GCM.
 
 import { encryptWithPassphrase, decryptWithPassphrase } from './crypto.js'
+import { isProvider, oauthRef } from './refs.js'
 
 export const VAULT_FORMAT = 'dsh-subscriptions-vault-v1'
 
@@ -16,7 +17,7 @@ export function exportVault({ slots = [], blobs = {}, exportedBy = 'dsh-subscrip
 
   const payload = {
     format: VAULT_FORMAT,
-    version: '0.6.17',
+    version: '0.6.18',
     exportedAt: new Date().toISOString(),
     exportedBy,
     slots: Array.isArray(slots) ? slots : [],
@@ -33,7 +34,7 @@ export function exportVault({ slots = [], blobs = {}, exportedBy = 'dsh-subscrip
 }
 
 /**
- * Decrypts and validates an encrypted vault string.
+ * Decrypts and validates an encrypted vault string with strict schema and injection protection.
  */
 export function importVault(encryptedPayload, passphrase) {
   const pass = String(passphrase || '').trim()
@@ -60,10 +61,27 @@ export function importVault(encryptedPayload, passphrase) {
     throw new Error('malformed vault content: invalid JSON')
   }
 
-  if (!data || data.format !== VAULT_FORMAT || !Array.isArray(data.slots) || typeof data.blobs !== 'object') {
+  if (!data || data.format !== VAULT_FORMAT || !Array.isArray(data.slots)
+    || !data.blobs || typeof data.blobs !== 'object' || Array.isArray(data.blobs)) {
     throw new Error('invalid vault schema: unsupported structure')
   }
 
+  const refs = new Set()
+  for (const slot of data.slots) {
+    if (!slot || !isProvider(slot.provider) || !Number.isSafeInteger(slot.index) || slot.index < 1) {
+      throw new Error('invalid vault slot')
+    }
+    const ref = oauthRef(slot.provider, slot.index)
+    if (refs.has(ref)) throw new Error('duplicate vault slot')
+    refs.add(ref)
+  }
+
+  for (const [ref, blob] of Object.entries(data.blobs)) {
+    if (!refs.has(ref) || !blob || typeof blob !== 'object' || Array.isArray(blob)) {
+      throw new Error('invalid vault credential: expected a declared slot and an object')
+    }
+  }
+
   return {
     ok: true,
     slots: data.slots,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.6.17",
+  "version": "0.6.18",
   "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",