@goodandready/dsh-subscriptions 0.6.51 → 0.6.52

package/lib/accounts.js

@@ -13,10 +13,9 @@ function loadQuarantinesFromFile(map) {
     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) {
+        if (v && typeof v === 'object' && v.until) {
           map.set(k, v)
         }
       }
@@ -29,9 +28,8 @@ function saveQuarantinesToFile(map) {
     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) {
+      if (v && typeof v === 'object' && v.until) {
         obj[k] = v
       }
     }
@@ -452,12 +450,25 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
     },
     rememberQuota(ref, snap) {
       if (snap) {
+        const prevSnap = quotas.get(ref)
         quotas.set(ref, snap)
         if (snap.usedPercent != null) {
           const now = snap.measuredAt || Date.now()
-          const samples = quotaSamples.get(ref) || []
+          let samples = (quotaSamples.get(ref) || []).slice()
           const remainingPercent = snap.remainingPercent ?? (100 - Number(snap.usedPercent))
-          samples.push({ at: now, pct: remainingPercent })
+          const lastSample = samples[samples.length - 1]
+
+          const prevReset = prevSnap?.resetAt ?? lastSample?.resetAt ?? null
+          const currReset = snap.resetAt ?? null
+          const resetChanged = (prevReset !== null && currReset !== null && Math.abs(Number(prevReset) - Number(currReset)) > 300) ||
+                               (prevSnap !== undefined && (prevReset === null) !== (currReset === null))
+          const increased = lastSample !== undefined && remainingPercent > lastSample.pct + 0.5
+
+          if (resetChanged || increased) {
+            samples = []
+          }
+
+          samples.push({ at: now, pct: remainingPercent, resetAt: currReset })
           while (samples.length > 20) samples.shift()
           quotaSamples.set(ref, samples)
           snap.samples = [...samples]
@@ -483,12 +494,14 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
       saveQuarantinesToFile(quarantines)
       if (health.has(ref)) health.set(ref, null)
     },
-    rememberQuarantine(ref, reason, until, attempts = 1) {
+    rememberQuarantine(ref, reason, until, attempts) {
       if (!ref) return
+      const existing = quarantines.get(ref)
+      const finalAttempts = attempts !== undefined ? Number(attempts) : (existing?.attempts ? existing.attempts + 1 : 1)
       quarantines.set(ref, {
-        reason: reason || 'RATE_LIMIT',
-        until: Number(until) || (Date.now() + 3600000),
-        attempts: Number(attempts) || 1,
+        reason: reason || existing?.reason || 'RATE_LIMIT',
+        until: Number(until) || existing?.until || (Date.now() + 3600000),
+        attempts: Number(finalAttempts) || 1,
         status: STATUS_QUARANTINE,
       })
       saveQuarantinesToFile(quarantines)
@@ -510,12 +523,14 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
         return { success: false, reason: 'NOT_EXPIRED' }
       }
       quarantines.set(ref, enterProbing(acc))
+      saveQuarantinesToFile(quarantines)
       try {
         if (typeof probeFn === 'function') {
           await probeFn(ref)
         }
         resolveWarmupSuccess(acc)
         quarantines.delete(ref)
+        saveQuarantinesToFile(quarantines)
         return { success: true }
       } catch (err) {
         const updated = resolveWarmupFailure(acc, err?.message || q.reason)
@@ -525,6 +540,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl, fetchFor
           attempts: updated.quarantineAttempts,
           status: updated.status,
         })
+        saveQuarantinesToFile(quarantines)
         return { success: false, account: updated, error: err }
       }
     },

package/lib/adapter-manager.js

@@ -44,7 +44,7 @@ export function createAdapterManager({
     autoPacing: () => live().autoPacing,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
-    rememberQuarantine: (ref, reason, until) => store.rememberQuarantine(ref, reason, until),
+    rememberQuarantine: (ref, reason, until, attempts) => store.rememberQuarantine(ref, reason, until, attempts),
     getQuarantine: (ref) => store.getQuarantine(ref),
     probeWarmup: (ref, fn) => store.probeWarmup(ref, fn),
     rememberQuota: (ref, snap) => store.rememberQuota(ref, snap),

package/lib/adapter.js

@@ -133,7 +133,12 @@ export class SubscriptionAdapter extends LlmAdapter {
         onCooldown: (account) => {
           if (typeof deps.rememberCooldown === 'function') deps.rememberCooldown(account.ref, account.cooldownUntil, account.cooldownFamilies || null)
           if (typeof deps.rememberQuarantine === 'function') {
-            deps.rememberQuarantine(account.ref, account.quarantineReason || 'RATE_LIMIT', account.quarantineUntil || account.cooldownUntil)
+            const currentQ = typeof deps.getQuarantine === 'function' ? deps.getQuarantine(account.ref) : null
+            if (currentQ && currentQ.attempts && currentQ.attempts > 1) {
+              deps.rememberQuarantine(account.ref, currentQ.reason, currentQ.until, currentQ.attempts)
+            } else {
+              deps.rememberQuarantine(account.ref, account.quarantineReason || 'RATE_LIMIT', account.quarantineUntil || account.cooldownUntil, account.quarantineAttempts || 1)
+            }
           }
           if (typeof deps.recordSwitch === 'function') deps.recordSwitch(account.ref)
         },
@@ -267,15 +272,21 @@ export class SubscriptionAdapter extends LlmAdapter {
             if (typeof deps.probeWarmup === "function") {
               const qUntil = Number(account.quarantineUntil || 0)
               if (qUntil > 0 && qUntil <= Date.now()) {
+                const probeFetch = typeof deps.fetchForRef === 'function'
+                  ? deps.fetchForRef(account.ref)
+                  : (typeof deps.fetchFor === 'function' ? deps.fetchFor(account.ref) : (deps.fetchImpl || fetch))
+                const probeCfg = typeof deps.vendorConfig === 'function' ? (deps.vendorConfig(provider) || {}) : {}
                 const probeResult = await deps.probeWarmup(account.ref, async () => {
                   if (vendor && typeof vendor.check === "function") {
                     const probeBlob = await deps.ensureFresh(provider, await deps.loadBlob(account.ref), account.ref)
-                    await vendor.check(probeBlob, { config: deps.vendorConfig(provider), signal: opts && opts.signal })
+                    await vendor.check(probeBlob, probeCfg, probeFetch)
                   }
                 })
                 if (probeResult && !probeResult.success) {
                   const err = probeResult.error || new Error("warmup probe failed")
                   err.code = "QUOTA"
+                  err.isWarmupProbeFailure = true
+                  err.warmupAccount = probeResult.account
                   throw err
                 }
               }

package/lib/client.js

@@ -2362,44 +2362,68 @@ const cssId = 'dsh-subscriptions/settings.module.css'
       return { label: (p.charAt(0).toUpperCase() || 'P'), cls: 'dsub-brandCodex', icon: '●' }
     }
 
-        const PLUGIN_LABELS = new Set(['Plugins', '插件'])
+    const PLUGIN_LABELS = new Set(['plugins', 'плагины', '插件', 'plugin'])
+    function matchesPluginLabel(el) {
+      if (!el) return false
+      const txt = (el.textContent || '').trim().toLowerCase()
+      const aria = (el.getAttribute('aria-label') || '').trim().toLowerCase()
+      const title = (el.getAttribute('title') || '').trim().toLowerCase()
+      const dataTab = (el.getAttribute('data-tab') || '').trim().toLowerCase()
+      return PLUGIN_LABELS.has(txt) || PLUGIN_LABELS.has(aria) || PLUGIN_LABELS.has(title) || PLUGIN_LABELS.has(dataTab)
+    }
+
+    function findAndClickCard(doc) {
+      for (const key of [PKG, 'dsh-subscriptions', '@goodandready/dsh-subscriptions']) {
+        const card = doc.querySelector(`[data-plugin-package="${key}"]`) || doc.querySelector(`[data-plugin-item="${ROW_ID}"]`)
+        if (card) {
+          const open = [...card.querySelectorAll('button')].filter((b) => b.getAttribute('role') !== 'switch')
+          const target = open.length >= 1 ? open[0] : card
+          if (typeof target.click === 'function') {
+            target.click()
+            return true
+          }
+        }
+      }
+      return false
+    }
+
     function openPluginSettings(doc = document, schedule = (run, ms) => window.setTimeout(run, ms)) {
       try {
-        const buttons = [...doc.querySelectorAll('button')]
-        const panel = buttons.find((b) => PLUGIN_LABELS.has(b.getAttribute('aria-label') || ''))
-          || buttons.find((b) => PLUGIN_LABELS.has(b.textContent.trim()))
+        if (findAndClickCard(doc)) return
+
+        const buttons = [...doc.querySelectorAll('button, a, div[role="button"], div[role="tab"]')]
+        const panel = buttons.find(matchesPluginLabel)
         if (panel) {
           panel.click()
           const poll = (left) => {
-            try {
-              for (const key of [PKG, 'dsh-subscriptions', '@goodandready/dsh-subscriptions']) {
-                const card = doc.querySelector(`[data-plugin-package="${key}"]`) || doc.querySelector(`[data-plugin-item="${ROW_ID}"]`)
-                if (card) {
-                  const open = [...card.querySelectorAll('button')].filter((b) => b.getAttribute('role') !== 'switch')
-                  const target = open.length >= 1 ? open[0] : card
-                  if (typeof target.click === 'function') {
-                    target.click()
-                    return
-                  }
-                }
-              }
-            } catch {}
+            if (findAndClickCard(doc)) return
             if (left > 0) schedule(() => poll(left - 1), 100)
           }
-          schedule(() => poll(40), 150)
+          schedule(() => poll(40), 100)
           return
         }
+
         const triggers = buttons.filter((b) => b.getAttribute('aria-haspopup') === 'dialog' && b.hasAttribute('aria-expanded'))
         if (triggers.length > 0) {
           const trigger = triggers.find((b) => b.getAttribute('aria-expanded') !== 'true') || triggers[0]
           if (trigger && typeof trigger.click === 'function') {
             trigger.click()
-            schedule(() => {
+            const pollSection = (left) => {
               try {
-                const section = [...doc.querySelectorAll('button')].find((b) => PLUGIN_LABELS.has(b.textContent.trim()))
-                if (section && typeof section.click === 'function') section.click()
+                const section = [...doc.querySelectorAll('button, a, div[role="tab"], [role="button"]')].find(matchesPluginLabel)
+                if (section && typeof section.click === 'function') {
+                  section.click()
+                  const poll = (cLeft) => {
+                    if (findAndClickCard(doc)) return
+                    if (cLeft > 0) schedule(() => poll(cLeft - 1), 100)
+                  }
+                  schedule(() => poll(40), 100)
+                  return
+                }
               } catch {}
-            }, 80)
+              if (left > 0) schedule(() => pollSection(left - 1), 80)
+            }
+            schedule(() => pollSection(20), 80)
           }
         }
       } catch {}

package/lib/forecast.js

@@ -73,8 +73,22 @@ export function estimateForecast(state, key, remainingPercent, resetsAt, now) {
 // #352: Burn-rate calculation & Pacing risk estimator
 export function calculateBurnRatePerHour(samples, now = Date.now()) {
   if (!Array.isArray(samples) || samples.length < 2) return 0
-  const recent = samples.filter((s) => s.at >= now - 6 * HOUR_MS)
+  let recent = samples.filter((s) => s.at >= now - 6 * HOUR_MS)
   if (recent.length < 2) return 0
+
+  let windowStartIdx = 0
+  for (let i = 1; i < recent.length; i++) {
+    const prev = recent[i - 1]
+    const curr = recent[i]
+    const resetChanged = prev.resetAt != null && curr.resetAt != null && Math.abs(Number(prev.resetAt) - Number(curr.resetAt)) > 300
+    const increased = curr.pct > prev.pct + 0.5
+    if (resetChanged || increased) {
+      windowStartIdx = i
+    }
+  }
+  recent = recent.slice(windowStartIdx)
+  if (recent.length < 2) return 0
+
   const first = recent[0]
   const last = recent[recent.length - 1]
   const hours = (last.at - first.at) / HOUR_MS

package/lib/index.js

@@ -316,7 +316,7 @@ export function apply(ctx, rawConfig) {
     cooldownMs: () => live().cooldownMs,
     switchAtRemaining: () => live().switchAtRemaining,
     rememberCooldown: (ref, until, families) => store.rememberCooldown(ref, until, families),
-    rememberQuarantine: (ref, reason, until) => store.rememberQuarantine(ref, reason, until),
+    rememberQuarantine: (ref, reason, until, attempts) => store.rememberQuarantine(ref, reason, until, attempts),
     recordSuccess: (ref) => store.recordSuccess(ref),
     getHealth: (ref) => store.getHealth(ref),
     recordSwitch: (ref) => store.recordSwitch(ref),

package/lib/stream-rotate.js

@@ -100,9 +100,17 @@ export async function* streamWithRotation({
             ? REASON_HARD_LIMIT
             : REASON_RATE_LIMIT
 
-        const quarantined = putInQuarantine(account, reason, nowMs())
-        account.quarantineUntil = quarantined.quarantineUntil
-        account.quarantineReason = quarantined.quarantineReason
+        if (err && err.isWarmupProbeFailure && err.warmupAccount) {
+          account.quarantineUntil = err.warmupAccount.quarantineUntil
+          account.quarantineReason = err.warmupAccount.quarantineReason
+          account.quarantineAttempts = err.warmupAccount.quarantineAttempts
+          account.status = err.warmupAccount.status
+        } else {
+          const quarantined = putInQuarantine(account, reason, nowMs())
+          account.quarantineUntil = quarantined.quarantineUntil
+          account.quarantineReason = quarantined.quarantineReason
+          account.quarantineAttempts = (account.quarantineAttempts || 0) + 1
+        }
 
         if (reason === REASON_REVOKED) {
           try {

package/package.json

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