@goodandready/dsh-subscriptions 0.2.5 → 0.2.6

package/lib/accounts.js

@@ -54,6 +54,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl }) {
   const refreshLocks = new Map()
   const refreshFailures = new Map()
   const usage = new Map()
+  const windows = new Map()
   const usageFetched = new Map()
   const doFetch = fetchImpl || fetch
 
@@ -107,6 +108,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl }) {
         const blob = parseBlob(await resolveRaw(ref))
         base.label = blob.label || blob.email || ''
         base.email = blob.email || ''
+        if (Array.isArray(blob.usage)) { base.usage = blob.usage; base.usageAt = blob.usageAt || 0 }
         if (blob.validationUrl) base.validationUrl = blob.validationUrl
         if (blob.validationMessage) base.validationMessage = blob.validationMessage
         if (blob.accountNotice) base.accountNotice = blob.accountNotice
@@ -117,6 +119,7 @@ export function createAccountStore({ credentials, getConfig, fetchImpl }) {
       ...base,
       cooldownUntil: cooldowns.get(ref) || 0,
       quota: quotas.get(ref) || null,
+      usage: windows.get(ref) || base.usage || null,
       usagePercent: usage.has(ref) ? usage.get(ref) : null,
       refreshError: refreshFailures.get(ref)?.error || '',
       validationUrl: base.validationUrl || '',
@@ -194,9 +197,23 @@ export function createAccountStore({ credentials, getConfig, fetchImpl }) {
         const blob = await ensureFresh(provider, parseBlob(raw), slot.ref)
         const snap = await vendor.usage(blob, cfg, doFetch)
         usageFetched.set(slot.ref, Date.now())
-        if (snap && Number.isFinite(Number(snap.usedPercent))) {
+        if (!snap) continue
+        if (Number.isFinite(Number(snap.usedPercent))) {
           usage.set(slot.ref, Number(snap.usedPercent))
         }
+        const list = Array.isArray(snap.windows) ? snap.windows : null
+        if (list) {
+          windows.set(slot.ref, list)
+          // persist last known windows so the card survives restarts
+          try {
+            const prev = Array.isArray(blob.usage) ? JSON.stringify(blob.usage) : ''
+            if (prev !== JSON.stringify(list)) {
+              await saveBlob(slot.ref, { ...blob, usage: list, usageAt: Date.now() })
+            } else if (!blob.usageAt) {
+              await saveBlob(slot.ref, { ...blob, usageAt: Date.now() })
+            }
+          } catch { /* persistence best-effort */ }
+        }
       } catch {
         usageFetched.set(slot.ref, Date.now())
       }

package/lib/blob.js

@@ -16,6 +16,8 @@ export function serializeBlob(obj) {
     email: asString(obj && obj.email),
     accountId: asString(obj && obj.accountId),
     projectId: asString(obj && obj.projectId),
+    ...(Array.isArray(obj && obj.usage) ? { usage: obj.usage } : {}),
+    ...((obj && obj.usageAt) ? { usageAt: Number(obj.usageAt) } : {}),
   })
 }
 
@@ -30,6 +32,8 @@ export function parseBlob(text) {
     email: asString(obj.email),
     accountId: asString(obj.accountId),
     projectId: asString(obj.projectId),
+    ...(Array.isArray(obj.usage) ? { usage: obj.usage } : {}),
+    ...(obj.usageAt ? { usageAt: Number(obj.usageAt) } : {}),
   }
 }
 

package/lib/client.js

@@ -301,17 +301,27 @@ window.__ModuleLoader__.load({
                   t('verifySuffix'),
                 ) : null,
 (function(){
-                  var q=account.quota, up=account.usagePercent, a=[];
+                  var parts=[]
+                  var wins=account.usage
+                  if(Array.isArray(wins)&&wins.length){
+                    wins.forEach(function(w){
+                      if(w&&w.usedPercent!=null)parts.push(t('limit')+' '+(w.ru||w.id)+': '+Math.round(w.usedPercent)+'/100%')
+                    })
+                  }
+                  var q=account.quota
                   if(q){
-                    if(q.remaining!=null&&q.limit!=null)a.push(q.remaining+'/'+q.limit);
-                    else if(q.remaining!=null)a.push(String(q.remaining));
-                    if(q.usedPercent!=null)a.push(Math.round(q.usedPercent)+'%');
-                    if(q.resetAt){var d=new Date(q.resetAt);a.push(d.toLocaleTimeString())}
-                    if(q.measuredAt){var m=Math.round((Date.now()-q.measuredAt)/60000);a.push(m<1?'<1m':m+'m')}
+                    var qa=[]
+                    if(q.remaining!=null&&q.limit!=null)qa.push(q.remaining+'/'+q.limit)
+                    else if(q.remaining!=null)qa.push(String(q.remaining))
+                    if(q.usedPercent!=null)qa.push(Math.round(q.usedPercent)+'%')
+                    if(q.resetAt){var d=new Date(q.resetAt);qa.push(d.toLocaleTimeString())}
+                    if(qa.length)parts.push(t('quota')+': '+qa.join(' / '))
                   }
-                  if(up!=null&&!q)a.push(Math.round(up)+'%');
-                  if(!a.length)return null;
-                  return React.createElement('span',{className:'dsub-sub'},t('quota')+' '+a.join(' \u00b7 '));
+                  if(!wins&&!q&&account.usagePercent!=null)parts.push(Math.round(account.usagePercent)+'/100%')
+                  var at=(q&&q.measuredAt)||(account.usageAt||0)
+                  if(at){var m=Math.round((Date.now()-at)/60000);if(m>=1)parts.push(m+'m')}
+                  if(!parts.length)return null
+                  return React.createElement('span',{className:'dsub-sub'},parts.join(' \u00b7 '))
                 })(),
 
                                 account.paidTierName ? React.createElement('span', { className: 'dsub-sub' }, t('plan') + ': ' + account.paidTierName) : null,

package/lib/code-assist.js

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto'
 import { httpError, readJson } from './wire.js'
 import { validationFromLoadCodeAssist, validationFromHttpError, noticeFromLoadCodeAssist, validationRequiredError } from './google-validation.js'
-import { asUsageSnapshot, deepestUsedPercent } from './usage.js'
+import { asUsageSnapshot, usageWindows, deepestUsedPercent } from './usage.js'
 
 export const CODE_ASSIST_PROD = 'https://cloudcode-pa.googleapis.com/v1internal'
 export const CODE_ASSIST_STREAM = 'https://daily-cloudcode-pa.googleapis.com/v1internal'
@@ -188,7 +188,9 @@ export async function fetchAvailableModels(fetchImpl, token, extraHeaders, fallb
 export async function retrieveQuotaPercent(fetchImpl, token, extraHeaders) {
   try {
     const json = await postAssist(fetchImpl, 'retrieveUserQuota', token, {}, extraHeaders)
-    return asUsageSnapshot(deepestUsedPercent(json))
+    const snap = asUsageSnapshot(deepestUsedPercent(json))
+    if (snap) snap.windows = usageWindows(json)
+    return snap
   } catch {
     return null
   }

package/lib/index.js

@@ -273,6 +273,7 @@ export function apply(ctx, config) {
         cooldownUntil: info.cooldownUntil,
         usagePercent: info.usagePercent,
         quota: info.quota || null,
+        usage: info.usage || null,
         refreshError: info.refreshError || '',
         validationUrl: info.validationUrl || '',
         validationMessage: info.validationMessage || '',

package/lib/usage.js

@@ -48,4 +48,56 @@ export function asUsageSnapshot(percent) {
   const usedPercent = numberOrNull(percent)
   if (usedPercent == null) return null
   return { usedPercent }
-}
+}
+// Named limit windows reported by vendors (five_hour, seven_day, primary...).
+// Label map is a data table: extend it when a vendor adds a window name.
+const WINDOW_LABELS = {
+  five_hour: { ru: "5ч", en: "5h" },
+  seven_day: { ru: "7д", en: "7d" },
+  seven_day_oauth_apps: { ru: "7д прил.", en: "7d apps" },
+  weekly_limit_7_days: { ru: "7д", en: "7d" },
+  primary: { ru: "осн.", en: "primary" },
+  secondary: { ru: "втор.", en: "secondary" },
+  monthly: { ru: "месяц", en: "month" },
+  credits: { ru: "кредиты", en: "credits" },
+}
+
+function windowLabel(id) {
+  const known = WINDOW_LABELS[id]
+  return known || { ru: id, en: id }
+}
+
+// Walk vendor usage JSON; every node carrying a utilization-style number
+// becomes a named window keyed by its JSON key.
+export function usageWindows(obj) {
+  const out = []
+  const seen = new Set()
+  function walk(value, key, depth) {
+    if (!value || typeof value !== "object" || depth > 6) return
+    const pct = numberOrNull(
+      value.utilization ?? value.used_percent ?? value.usedPercent ?? value.creditUsagePercent ?? value.used_percentage,
+    )
+    if (pct != null && key && !seen.has(key)) {
+      seen.add(key)
+      const label = windowLabel(key)
+      out.push({ id: key, ru: label.ru, en: label.en, usedPercent: pct })
+    }
+    const frac = numberOrNull(value.remainingFraction)
+    if (frac != null && key && !seen.has(key)) {
+      seen.add(key)
+      const label = windowLabel(key)
+      out.push({ id: key, ru: label.ru, en: label.en, usedPercent: (1 - frac) * 100 })
+    }
+    const ufrac = numberOrNull(value.usedFraction)
+    if (ufrac != null && key && !seen.has(key)) {
+      seen.add(key)
+      const label = windowLabel(key)
+      out.push({ id: key, ru: label.ru, en: label.en, usedPercent: ufrac * 100 })
+    }
+    for (const [k, child] of Object.entries(value)) {
+      if (child && typeof child === "object") walk(child, k, depth + 1)
+    }
+  }
+  walk(obj, "", 0)
+  return out.length ? out : null
+}

package/lib/vendors/claude.js

@@ -2,7 +2,7 @@ import { buildAuthorizeUrl } from '../oauth.js'
 import { anthropicPayload, modelCatalog } from '../messages.js'
 import { jsonTokenRequest, anthropicStream, httpError, tokenBlobFromOAuth, readJson } from '../wire.js'
 import { emailFromToken } from '../jwt.js'
-import { asUsageSnapshot, deepestUsedPercent } from '../usage.js'
+import { asUsageSnapshot, usageWindows, deepestUsedPercent } from '../usage.js'
 
 export const id = 'claude'
 
@@ -104,7 +104,9 @@ export async function usage(blob, _cfg, fetchImpl) {
   try {
     const res = await (fetchImpl || fetch)(USAGE, { headers: oauthHeaders(blob.accessToken) })
     const json = await readJson(res)
-    return asUsageSnapshot(deepestUsedPercent(json))
+    const snap = asUsageSnapshot(deepestUsedPercent(json))
+    if (snap) snap.windows = usageWindows(json)
+    return snap
   } catch {
     return null
   }

package/lib/vendors/codex.js

@@ -3,7 +3,7 @@ import { buildAuthorizeUrl } from '../oauth.js'
 import { codexResponsesBody, modelCatalog } from '../messages.js'
 import { chatgptAccountId, emailFromToken } from '../jwt.js'
 import { formTokenRequest, codexResponsesStream, readJson, tokenBlobFromOAuth, httpError } from '../wire.js'
-import { asUsageSnapshot, deepestUsedPercent } from '../usage.js'
+import { asUsageSnapshot, usageWindows, deepestUsedPercent } from '../usage.js'
 
 export const id = 'codex'
 
@@ -150,7 +150,9 @@ export async function usage(blob, cfg, fetchImpl) {
       headers: identityHeaders(blob, cfg, { Accept: 'application/json' }),
     })
     const json = await readJson(res)
-    return asUsageSnapshot(deepestUsedPercent(json))
+    const snap = asUsageSnapshot(deepestUsedPercent(json))
+    if (snap) snap.windows = usageWindows(json)
+    return snap
   } catch {
     return null
   }

package/lib/vendors/grok.js

@@ -2,7 +2,7 @@ import { buildAuthorizeUrl } from '../oauth.js'
 import { modelCatalog, codexResponsesBody } from '../messages.js'
 import { formTokenRequest, codexResponsesStream, httpError, tokenBlobFromOAuth, readJson } from '../wire.js'
 import { emailFromToken } from '../jwt.js'
-import { asUsageSnapshot, grokBillingPercent } from '../usage.js'
+import { asUsageSnapshot, usageWindows, grokBillingPercent } from '../usage.js'
 
 export const id = 'grok'
 
@@ -201,7 +201,9 @@ export async function usage(blob, cfg, fetchImpl) {
       headers: { ...identityHeaders(blob, cfg), Accept: 'application/json' },
     })
     const json = await readJson(res)
-    return asUsageSnapshot(grokBillingPercent(json))
+    const snap = asUsageSnapshot(grokBillingPercent(json))
+    if (snap) snap.windows = usageWindows(json)
+    return snap
   } catch {
     return null
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-subscriptions",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Use ChatGPT Codex, Claude, Grok, and Antigravity subscriptions as DeepSeek Harness LLM providers via OAuth.",
   "license": "MIT",
   "type": "module",