quota-keepalive 0.1.10 → 0.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quota-keepalive",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "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))

package/ui/app.js

@@ -434,6 +434,22 @@
         </div>
       </div>`
     }
+    if (item.kind === "percent") {
+      const progress = Math.max(0, Math.min(100, number(item.progress)))
+      const label = `${item.name}已用 ${formatNumber(item.percent)}%`
+      return `<div class="quota-window">
+        <div class="quota-window-head">
+          <span class="quota-window-name">${escapeHtml(item.name)}</span>
+          <span class="quota-window-value">已用 ${escapeHtml(formatNumber(item.percent))}%</span>
+        </div>
+        <div class="quota-meter ${escapeHtml(item.level)}" role="progressbar"
+          aria-label="${escapeHtml(label)}" aria-valuemin="0" aria-valuemax="100"
+          aria-valuenow="${escapeHtml(formatNumber(progress))}">
+          <i style="width:${progress}%"></i>
+        </div>
+        ${item.detail ? `<div class="quota-window-foot">${escapeHtml(item.detail)}</div>` : ""}
+      </div>`
+    }
     const detail = item.kind === "display"
       ? "供应商原样显示，不推断已用或剩余"
       : item.detail || ""

package/ui/quota-format.js

@@ -15,6 +15,27 @@
 
   const clampPercent = (value) => Math.max(0, Math.min(100, number(value)))
 
+  function displayAmount(value) {
+    const match = String(value || "").trim().match(
+      /^(\d+(?:\.\d*)?|\.\d+)(e[+-]?\d+)?([kmb])?$/i,
+    )
+    if (!match) return null
+    const scale = { k: 1e3, m: 1e6, b: 1e9 }[String(match[3] || "").toLowerCase()] || 1
+    const parsed = Number(`${match[1]}${match[2] || ""}`) * scale
+    return Number.isFinite(parsed) ? parsed : null
+  }
+
+  function displayPair(display) {
+    const pair = String(display || "").split("·", 1)[0].match(
+      /^\s*([0-9.,]+(?:e[+-]?\d+)?[kmb]?)\s*\/\s*([0-9.,]+(?:e[+-]?\d+)?[kmb]?)(?:\s+([a-zA-Z]+))?\s*$/i,
+    )
+    if (!pair) return null
+    const first = displayAmount(pair[1].replace(/,/g, ""))
+    const total = displayAmount(pair[2].replace(/,/g, ""))
+    if (first === null || total === null || total <= 0) return null
+    return { first, total, unit: pair[3] || "" }
+  }
+
   function quotaLevel(percent) {
     if (percent >= 100) return "exhausted"
     if (percent >= 85) return "warning"
@@ -66,6 +87,22 @@
         return meterItem(name, unit, (limit * Math.max(0, usedPercent)) / 100, limit, usedPercent)
       }
     }
+    const pair = limit === null && usedPercent !== null ? displayPair(display) : null
+    if (pair) {
+      const usedShare = (pair.first / pair.total) * 100
+      const usedMatches = Math.abs(usedShare - usedPercent) < 0.75
+      const remainingMatches = Math.abs(100 - usedShare - usedPercent) < 0.75
+      if (usedMatches || !remainingMatches) {
+        return meterItem(name, unit || pair.unit, pair.first, pair.total, usedPercent)
+      }
+      return meterItem(
+        name,
+        unit || pair.unit,
+        pair.total - pair.first,
+        pair.total,
+        usedPercent,
+      )
+    }
     const balance = number(window?.balance)
     if (balance !== null) {
       return {
@@ -75,11 +112,15 @@
       }
     }
     if (usedPercent !== null) {
+      const percent = clampPercent(usedPercent)
       return {
         kind: "percent",
         name,
         text: `已用 ${formatNumber(usedPercent)}%`,
         detail: display ? `供应商显示 ${display}` : "",
+        percent,
+        progress: percent,
+        level: quotaLevel(percent),
       }
     }
     if (display) {