@goodandready/dsh-subscriptions 0.6.44 → 0.6.45

package/lib/accounts.js

@@ -1,3 +1,46 @@
+import { readFileSync, writeFileSync, mkdirSync } from "node:fs"
+import { homedir } from "node:os"
+import { join } from "node:path"
+
+function resolveQuarantineFilePath() {
+  const base = process.env.DSH_HOME || join(homedir(), '.dsh')
+  return join(base, 'subscriptions', 'quarantines.json')
+}
+
+function loadQuarantinesFromFile(map) {
+  try {
+    const p = resolveQuarantineFilePath()
+    const content = readFileSync(p, 'utf8')
+    const json = JSON.parse(content)
+    const now = Date.now()
+    if (json && typeof json === 'object') {
+      for (const [k, v] of Object.entries(json)) {
+        if (v && Number(v.until) > now) {
+          map.set(k, v)
+        }
+      }
+    }
+  } catch { /* best-effort */ }
+}
+
+function saveQuarantinesToFile(map) {
+  try {
+    const p = resolveQuarantineFilePath()
+    mkdirSync(join(p, '..'), { recursive: true })
+    const obj = {}
+    const now = Date.now()
+    for (const [k, v] of map.entries()) {
+      if (v && Number(v.until) > now) {
+        obj[k] = v
+      }
+    }
+    writeFileSync(p, JSON.stringify(obj), 'utf8')
+  } catch { /* best-effort */ }
+}
+
+const sharedQuarantines = new Map()
+loadQuarantinesFromFile(sharedQuarantines)
+
 import { needsWarmupProbe, enterProbing, resolveWarmupSuccess, resolveWarmupFailure, STATUS_QUARANTINE, STATUS_PROBING } from "./quarantine.js"
 import { fetchWithTimeout, isTimeoutError } from "./http.js"
 import { credentialRef } from '@deepseek-ai/dsh-credentials'
@@ -62,7 +105,7 @@ export function vendorConfig(provider, cfg) {
 export function createAccountStore({ credentials, getConfig, fetchImpl, fetchForRef, onLimitNotice }) {
   const cooldowns = new Map()
   const quotas = new Map()
-  const quarantines = new Map()
+  const quarantines = sharedQuarantines
   const writeQueues = new Map()
   const credentialVersions = new Map()
   const clearedRefs = new Set()
@@ -183,6 +226,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       quarantineReason: quarantines.get(ref) ? quarantines.get(ref).reason : null,
       cooldownFamilies: cooldowns.get(ref) && cooldowns.get(ref).families ? cooldowns.get(ref).families : null,
       quota: quotas.get(ref) || null,
+      pacePerHour: quotas.get(ref)?.pacePerHour || 0,
       usage: windows.get(ref) || base.usage || null,
       health: health.get(ref) || null,
       healthScore: computeHealthScore(health.get(ref) || null),
@@ -218,6 +262,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         quarantineUntil: inQ ? q.until : 0,
         quarantineReason: inQ ? q.reason : null,
         label: slot.label || info.label,
+        pacePerHour: info.pacePerHour || 0,
       })
     }
     return out
@@ -417,6 +462,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         attempts: Number(attempts) || 1,
         status: STATUS_QUARANTINE,
       })
+      saveQuarantinesToFile(quarantines)
     },
     getQuarantine(ref, now = Date.now()) {
       const q = quarantines.get(ref)
@@ -456,6 +502,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     },
     releaseQuarantine(ref) {
       quarantines.delete(ref)
+      saveQuarantinesToFile(quarantines)
     },
     rememberRequest(ref) { requestCounts.set(ref, (requestCounts.get(ref) || 0) + 1) },
     getRequestCount(ref) { return requestCounts.get(ref) || 0 },

package/lib/adapter-manager.js

@@ -18,6 +18,7 @@ export function createAdapterManager({
   syncCustomVendors,
   syncOllama,
   stripLegacySlots,
+  ollamaFallback,
 }) {
   let handle
   let adapterDisposed = false
@@ -58,6 +59,8 @@ export function createAdapterManager({
     fetchImpl: fetch,
     fetchForRef,
     hideDeprecatedModels: () => Boolean(live().hideDeprecatedModels),
+    cascadingFallback: (...args) => cascadeFallbackStream(...args),
+    ollamaFallback: typeof ollamaFallback === 'function' ? ollamaFallback : async function* ({ err }) { throw err },
   })
 
   async function* cascadeFallbackStream({ options, provider, err, visited = new Set() }) {

package/lib/index.js

@@ -302,6 +302,7 @@ export function apply(ctx, rawConfig) {
     syncCustomVendors,
     syncOllama,
     stripLegacySlots,
+    ollamaFallback: ollamaFallbackStream,
   })
   const { syncAdapter, reconcileSlots, refreshModels, cascadeFallbackStream } = adapterManager
   adapterManager.registerAdapterLifecycle()

package/lib/rotate.js

@@ -81,7 +81,11 @@ export function pickAccount(accounts, nowMs, opts) {
       const pinned = list.find((a) => (a.ref || a.id) === pinnedRef)
       if (pinned && pinned.hasToken && !isQuarantined(pinned, now)) {
         const isCooldown = pinned.cooldownUntil && Number(pinned.cooldownUntil) > now && cooldownBlocks(pinned, opts && opts.family)
-        if (!isCooldown && !isQuotaExhausted(pinned) && !isUsageExhausted(pinned)) {
+        const isPinnedZero = Boolean(pinned.quota && (
+          (pinned.quota.remaining != null && Number(pinned.quota.remaining) <= 0) ||
+          (pinned.quota.remainingPercent != null && Number(pinned.quota.remainingPercent) <= 0)
+        ) && (!pinned.quota.resetAt || Number(pinned.quota.resetAt) > now))
+        if (!isCooldown && !isPinnedZero && !isQuotaExhausted(pinned) && !isUsageExhausted(pinned)) {
           return pinned
         }
       }
@@ -116,8 +120,12 @@ export function pickAccount(accounts, nowMs, opts) {
     const isCooldown = acc.cooldownUntil && Number(acc.cooldownUntil) > now && cooldownBlocks(acc, opts && opts.family)
     const inQuarantine = isQuarantined(acc, now)
     const isHardExhausted = (acc.usagePercent != null && Number(acc.usagePercent) >= 100 && (!acc.quota || !acc.quota.resetAt || Number(acc.quota.resetAt) > now))
+    const isZeroQuota = Boolean(acc.quota && (
+      (acc.quota.remaining != null && Number(acc.quota.remaining) <= 0) ||
+      (acc.quota.remainingPercent != null && Number(acc.quota.remainingPercent) <= 0)
+    ) && (!acc.quota.resetAt || Number(acc.quota.resetAt) > now))
 
-    if (isCooldown || inQuarantine || isHardExhausted) {
+    if (isCooldown || inQuarantine || isHardExhausted || isZeroQuota) {
       continue
     }
 

package/lib/stream-rotate.js

@@ -27,6 +27,7 @@ export async function* streamWithRotation({
       sessionId: options && options.sessionId,
       tag: options && options.tag,
       vip: options && options.vip,
+      autoPacing: options && (options.autoPacing !== undefined ? options.autoPacing : (options.config && options.config.autoPacing)),
     })
 
     if (!account || tried.has(account.ref || account.id)) {

package/package.json

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