dsh-ollama-usage 0.1.3 → 0.1.4

package/README.md

@@ -27,7 +27,7 @@ panel, persisted credentials & snapshots, auto-refresh.*
 | 🎯 **会话用量（每 5 小时）** | Ollama Cloud 的 5 小时会话配额，置顶展示「已用 X% · 剩余 Y%」 |
 | 📅 **周用量（Weekly）** | 本周配额进度，与会话用量并排展示 |
 | 🎨 **侧边栏双横条** | 极简透明风格：会话 5h **淡紫** + 周用量**深紫**，各带百分比数字，悬停显示详情，每 60 秒自动更新（窄栏自动隐藏） |
-| 🖥️ **设置页完整面板** | 周期起止时间、近 4 周费用、模型请求数排行、最近 5 条会话用量历史 |
+| 🖥️ **设置页完整面板** | 会话/周用量进度条、周用量重置倒计时、模型请求数排行、最近 5 条会话用量历史 |
 | 💾 **持久化** | API Key 与用量快照写入 `$DSH_HOME/storages/ollama-usage/usage.json`（权限 600，保留 24 条历史），跨对话 / 重启自动恢复 |
 | 🔄 **自动刷新** | Host 每 10 分钟自动查询（页面关闭也持续）；Key 失效（401）自动清除并提示 |
 | 🔑 **登录引导** | 未登录时一键打开 [ollama.com/settings](https://ollama.com/settings) 登录、到 [settings/keys](https://ollama.com/settings/keys) 创建 API Key；兼容旧版 CLI 的 `~/.ollama/auth.json` |

package/lib/client.js

@@ -2,8 +2,8 @@
  * dsh-ollama-usage 浏览器端 bundle(经 __ModuleLoader__ 加载)。
  *
  * 提供三处界面:
- *  - settings.section「Ollama 用量」:完整面板(会话 5h / 周用量进度条、费用、
- *    模型请求数、历史记录、API Key 配置、清除 Key);
+ *  - settings.section「Ollama 用量」:完整面板(会话 5h / 周用量进度条、
+ *    周用量重置倒计时、模型请求数、历史记录、API Key 配置、清除 Key);
  *  - sidebar.footer.action:极简双横条(会话 5h 淡紫 / 周用量深紫,透明背景);
  *  - tool.view.cordis:Run 卡片内的同款面板。
  *
@@ -81,9 +81,7 @@ window.__ModuleLoader__.load({
       if (p < 90) return 'var(--dsw-alias-state-warn-primary,#e0af68)'
       return 'var(--dsw-alias-state-error-primary,#f7768e)'
     }
-    const PERIOD_LABELS = { last_4_weeks: '近 4 周', weekly: '本周', session: '本次会话' }
-    const fmtTime = (iso) => {
-      try {
+    const fmtTime = (iso) => {      try {
         const d = new Date(iso)
         const p2 = (n) => (n < 10 ? '0' + n : String(n))
         return p2(d.getMonth() + 1) + '-' + p2(d.getDate()) + ' ' + p2(d.getHours()) + ':' + p2(d.getMinutes())
@@ -91,6 +89,26 @@ window.__ModuleLoader__.load({
         return String(iso || '')
       }
     }
+    /** 距重置时间还有多久,如 "2 小时 33 分钟"、"6 天 15 小时 38 分钟"。 */
+    const fmtCountdown = (iso) => {
+      try {
+        const end = new Date(iso).getTime()
+        if (!Number.isFinite(end)) return null
+        const ms = end - Date.now()
+        if (ms < 60000) return '不到 1 分钟'
+        const totalMin = Math.floor(ms / 60000)
+        const days = Math.floor(totalMin / 1440)
+        const hours = Math.floor((totalMin % 1440) / 60)
+        const mins = totalMin % 60
+        const parts = []
+        if (days > 0) parts.push(days + ' 天')
+        if (hours > 0 || days > 0) parts.push(hours + ' 小时')
+        parts.push(mins + ' 分钟')
+        return parts.join(' ')
+      } catch (e) {
+        return null
+      }
+    }
 
     function apply(ctx) {
       injectCss()
@@ -124,7 +142,8 @@ window.__ModuleLoader__.load({
           ),
           React.createElement('div', { className: 'olusa-bar' },
             React.createElement('div', { className: 'olusa-barfill', style: { width: width + '%', background: colorFor(p) } })
-          )
+          ),
+          (props.resetText ? React.createElement('div', { className: 'olusa-hint' }, props.resetText) : null)
         )
       }
 
@@ -154,23 +173,12 @@ window.__ModuleLoader__.load({
 
       function UsageBody(props) {
         const d = props.data
-        const periodLabel = PERIOD_LABELS[d.periodType] || (d.periodType ? String(d.periodType).toUpperCase() : '')
-        const periodText = periodLabel && d.periodStart && d.periodEnd
-          ? (periodLabel + '  ' + d.periodStart + ' → ' + d.periodEnd)
-          : periodLabel
-        const costNum = d.cost !== null && d.cost !== undefined && d.cost !== '' ? Number(d.cost) : NaN
-        const costText = Number.isFinite(costNum) ? '$' + costNum.toFixed(2) : null
+        const weeklyResetText = d.weeklyResetAt ? fmtCountdown(d.weeklyResetAt) : null
         const models = Array.isArray(d.models) ? d.models.slice(0, 5) : []
         const history = Array.isArray(props.history) ? props.history.slice(-5).reverse() : []
         return React.createElement('div', { className: 'olusa-block' },
-          (periodText ? React.createElement('div', { className: 'olusa-hint' }, periodText) : null),
           React.createElement(BarRow, { label: '会话用量（每 5 小时）', percent: d.sessionPercent, em: true }),
-          React.createElement(BarRow, { label: '本周用量（Weekly）', percent: d.weeklyPercent }),
-          (costText !== null
-            ? React.createElement('div', { className: 'olusa-row' },
-                React.createElement('span', null, '近 4 周费用'),
-                React.createElement('span', null, costText))
-            : null),
+          React.createElement(BarRow, { label: '本周用量（Weekly）', percent: d.weeklyPercent, resetText: weeklyResetText ? '还有 ' + weeklyResetText + ' 重置' : null }),
           (models.length > 0
             ? React.createElement('div', { className: 'olusa-models' },
                 React.createElement('div', { className: 'olusa-hint' }, '模型请求数（本周）'),
@@ -282,7 +290,7 @@ window.__ModuleLoader__.load({
             React.createElement('button', { className: 'olusa-btn', disabled: busy, onClick: () => doCheck('') }, busy ? '查询中…' : '刷新')
           ),
           body,
-          React.createElement('div', { className: 'olusa-ver' }, 'dsh-ollama-usage · v0.1.0')
+          React.createElement('div', { className: 'olusa-ver' }, 'dsh-ollama-usage · v0.1.4')
         )
       }
 

package/lib/index.js

@@ -139,6 +139,22 @@ function parseUsage(body, status) {
   }
 }
 
+/* ------------------------------------------------------------------ *
+ * 周重置时间推算(API 不提供各限额重置时间,按配额语义推算)
+ *  - weekly:下周一 00:00 UTC(last_4_weeks 周期锚点为周一)
+ * ------------------------------------------------------------------ */
+
+function computeResetTimes(nowIso) {
+  const now = new Date(nowIso)
+  const daysUntilMonday = ((7 - now.getUTCDay()) % 7) + 1
+  const weeklyResetAt = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + daysUntilMonday)).toISOString()
+  return { weeklyResetAt }
+}
+
+function withResetTimes(usage, nowIso) {
+  return Object.assign({}, usage, computeResetTimes(nowIso))
+}
+
 /** 用 token 查询并把结果写入持久化文件;返回 RpcResult({ ok, value|error })。 */
 async function checkWithToken(token) {
   let res
@@ -166,10 +182,11 @@ async function checkWithToken(token) {
   const history = Array.isArray(prev && prev.history) ? prev.history.slice() : []
   history.push({ at: now, sessionPercent: parsed.usage.sessionPercent, weeklyPercent: parsed.usage.weeklyPercent })
   const trimmed = history.length > HISTORY_CAP ? history.slice(history.length - HISTORY_CAP) : history
-  const persisted = writeFile({ token, updatedAt: now, usage: parsed.usage, history: trimmed })
+  const usage = withResetTimes(parsed.usage, now)
+  const persisted = writeFile({ token, updatedAt: now, usage, history: trimmed })
   return {
     ok: true,
-    value: { usage: parsed.usage, updatedAt: now, persisted, history: trimmed.slice(-5) },
+    value: { usage, updatedAt: now, persisted, history: trimmed.slice(-5) },
   }
 }
 
@@ -203,7 +220,8 @@ async function dispatch(endpoint, payload) {
   if (endpoint === 'snapshot') {
     const rec = readFile()
     if (!rec || !rec.usage) return { ok: false, error: { code: 'no-data', message: '暂无持久化的用量数据' } }
-    return { ok: true, value: { tokenPersisted: !!rec.token, updatedAt: rec.updatedAt, history: (rec.history || []).slice(-5), usage: rec.usage } }
+    const usage = withResetTimes(rec.usage, new Date().toISOString())
+    return { ok: true, value: { tokenPersisted: !!rec.token, updatedAt: rec.updatedAt, history: (rec.history || []).slice(-5), usage } }
   }
   if (endpoint === 'forget') {
     const rec = readFile()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ollama-usage",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "DeepSeek Harness 插件:可视化 Ollama Cloud 账号用量余量(每 5 小时会话用量 + 周用量),支持侧边栏双横条、设置页面板、API Key 与用量快照持久化、自动刷新与登录引导。Ollama Pro usage & remaining-quota visualization for DeepSeek Harness: 5-hour session + weekly quota bars in the sidebar footer, a full settings panel, persisted API key and usage snapshots, auto-refresh and login guidance.",
   "type": "module",
   "main": "lib/index.js",