quota-keepalive 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quota-keepalive",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "Unofficial multi-provider quota inventory, check-in, keepalive scheduling, history, and quota trends for Magpie",
   "keywords": [
     "magpie",

package/src/inventory.js

@@ -261,12 +261,37 @@ function historyByAccount(history) {
   return out
 }
 
-export function quotaByAccount(quotas) {
+function refreshedQuotaCard(card) {
+  if (!object(card) || object(card.quota)) return null
+  const provider = sanitize(card.provider, 80).trim()
+  const user = sanitize(card.user, 240).trim()
+  if (!provider || !user || sanitize(card.error, 300).trim()) return null
+  const windows = (Array.isArray(card.windows) ? card.windows : []).map(publicWindow)
+  const plan = sanitize(card.plan, 80)
+  const balance = typeof card.balance === "number" && Number.isFinite(card.balance)
+    ? String(card.balance)
+    : sanitize(card.balance, 80)
+  if (!windows.length && !plan && !balance) return null
+  const readAt = sanitize(card.readAt || card.asOf || card.at, 40)
+  return {
+    key: cardKey(provider, user).toLowerCase(),
+    entry: {
+      at: readAt,
+      quota: { plan, balance, windows, readAt },
+    },
+  }
+}
+
+export function quotaByAccount(quotas, quotaCards = []) {
   const out = new Map()
   for (const [key, entry] of Object.entries(object(quotas) ? quotas : {})) {
     if (!object(entry?.quota)) continue
     out.set(key.toLowerCase(), entry)
   }
+  for (const card of Array.isArray(quotaCards) ? quotaCards : []) {
+    const refreshed = refreshedQuotaCard(card)
+    if (refreshed) out.set(refreshed.key, refreshed.entry)
+  }
   return out
 }
 
@@ -581,6 +606,7 @@ export async function readInventory({
   logPath = "",
   records = [],
   accountsData = null,
+  quotaCards = [],
 } = {}) {
   const [providers, checkins, quotas, histories, auth] = await Promise.all([
     readJson(join(configHome, "plugin-providers.json"), []),
@@ -589,7 +615,7 @@ export async function readInventory({
     readJson(join(configHome, "quota-history.json"), {}),
     readJson(join(configHome, "plugin-auth.json"), {}),
   ])
-  const cards = quotaByAccount(quotas)
+  const cards = quotaByAccount(quotas, quotaCards)
   const history = historyByAccount(histories)
   const activity = activityIndex(records)
   const sourceProviders = Array.isArray(providers) ? providers : []

package/src/runner.js

@@ -290,6 +290,7 @@ export async function runRefresh({
   }
 
   const accounts = []
+  const quotaCards = []
   for (const id of providers) {
     const { result, body } = await runJsonCommand({
       args: ["quota", "refresh", id, "--json"],
@@ -298,6 +299,7 @@ export async function runRefresh({
       timeoutMs: Math.max(30_000, Math.min(50_000, Number(config.timeoutMs) || 50_000)),
     })
     const classified = classifyRefreshResult(result, body)
+    if (Array.isArray(classified.cards)) quotaCards.push(...classified.cards)
     accounts.push({
       provider: id,
       account: "",
@@ -324,7 +326,7 @@ export async function runRefresh({
       console.warn(`[quota-keepalive] cannot write quota refresh log: ${errorText(error)}`)
     })
   }
-  await refreshSnapshot(config, null)
+  await refreshSnapshot(config, null, quotaCards)
   const success = accounts.filter((item) => item.status === "success").length
   const failed = accounts.filter((item) => item.status === "failed").length
   const skipped = accounts.filter((item) => item.status === "skipped").length
@@ -358,13 +360,14 @@ async function logCommand(config, entry, run = newRunId()) {
   })
 }
 
-async function refreshSnapshot(config, accountsData) {
+async function refreshSnapshot(config, accountsData, quotaCards = []) {
   await writeDailySnapshot({
     ...(config.configHome ? { configHome: config.configHome } : {}),
     logPath: config.logPath,
     snapshotPath: config.snapshotPath,
     commandPath: config.commandPath,
     accountsData,
+    quotaCards,
   }).catch((error) => {
     console.warn(`[daily-keepalive] ${snapshotWarning(error)}`)
   })

package/src/snapshot.js

@@ -278,6 +278,7 @@ export async function writeDailySnapshot(options = {}) {
     snapshotPath = defaultSnapshotPath(),
     configHome = undefined,
     accountsData = null,
+    quotaCards = [],
     commandPath = undefined,
   } = options
   const writeCompanion = options.writeCompanion ??
@@ -302,6 +303,7 @@ export async function writeDailySnapshot(options = {}) {
     logPath,
     records,
     accountsData,
+    quotaCards,
   })
   if (!Array.isArray(accountsData)) {
     inventory = carryForwardQuotas(inventory, await readPreviousSnapshot(snapshotPath))