dsh-opencode-routing 2.2.0 → 2.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-opencode-routing",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "type": "module",
   "description": "dsh plugin: OpenCode account pool with automatic A-to-B failover and quota routing, plus a per-account / per-model usage dashboard, in one Settings page.",
   "exports": {
@@ -16,6 +16,13 @@
     "client.js",
     "cordis.patch.yml",
     "README.md",
+    "README.zh-CN.md",
+    "README.zh-TW.md",
+    "README.ja.md",
+    "README.ko.md",
+    "README.ru.md",
+    "CONTRIBUTING.md",
+    "LICENSE",
     "test.mjs",
     "locale/*.json",
     "icon.svg"
@@ -42,6 +49,9 @@
     "multi-account",
     "quota",
     "router",
+    "routing",
+    "failover",
+    "i18n",
     "billing"
   ],
   "repository": {

package/router.js

@@ -967,6 +967,18 @@ export function apply(ctx, config = {}) {
 
   async function handleApi(request, response) {
     try {
+      if (request.method === 'GET') {
+        // Settings can ask for one account's key so "edit key" opens with the
+        // current value filled in. Local-only endpoint, never in the snapshot.
+        const url = new URL(request.url ?? '/', 'http://127.0.0.1')
+        const reveal = url.searchParams.get('key')
+        if (reveal !== null) {
+          const account = state.accounts.find((entry) => entry.id === reveal)
+          if (account === undefined) throw new Error(`没有账户 ${reveal}`)
+          sendJson(response, 200, { id: account.id, key: (await accountKey(account)) ?? null })
+          return
+        }
+      }
       if (request.method === 'POST') {
         const text = await readBody(request)
         let body

package/test.mjs

@@ -357,6 +357,23 @@ await sleep(300)
   assert.equal(freeRow.remaining, undefined, 'free models have no remaining quota')
   assert.equal(freeRow.inputs.includes('video'), true)
   assert.equal(data.peak.plan.leverage, 10)
+
+  // Every model breaks down into the three lines DeepSeek bills on, cheapest first
+  const peakFlash = data.peak.models.find((entry) => entry.model === 'deepseek-v4.1-flash')
+  assert.deepEqual(peakFlash.rows.map((line) => line.kind), ['cacheRead', 'input', 'output'])
+  assert.equal(peakFlash.rows[0].cheaper, 'go', 'the cached line is still cheaper on OpenCode')
+  assert.equal(Math.round(peakFlash.rows[0].ratio * 100) / 100, 0.1)
+}
+
+// A plan change is a config edit, not a code change: the discount is derived
+{
+  const offPeak = Date.UTC(2026, 10, 3, 16, 0)
+  const cheaper = peakSnapshot(7.1, offPeak, 'go', { priceUsd: 10, allowanceUsd: 50 })
+  assert.equal(cheaper.plan.leverage, 5, 'a smaller allowance halves the discount')
+  assert.equal(cheaper.plan.overridden, true)
+  const dearer = peakSnapshot(7.1, offPeak, 'go', { priceUsd: 50, allowanceUsd: 100 })
+  assert.equal(dearer.plan.leverage, 2)
+  assert.equal(dearer.models[0].rows[0].cheaper, 'go', 'still cheaper, just less so')
 }
 console.log('usage view ok')
 
@@ -369,6 +386,37 @@ console.log('usage view ok')
 }
 console.log('single-account fallback ok')
 
+// "Edit key" pre-fills from the stored value; the snapshot never carries it
+{
+  const reveal = async (query) => {
+    const handler = apiRoutes.get('/opencode-quota-router.json')
+    const response = {
+      status: 0,
+      body: undefined,
+      writeHead(status) {
+        this.status = status
+      },
+      end(chunk) {
+        this.body = JSON.parse(chunk)
+      },
+    }
+    await handler({ method: 'GET', url: `/opencode-quota-router.json${query}` }, response)
+    return response
+  }
+
+  const hit = await reveal('?key=a1')
+  assert.equal(hit.status, 200)
+  assert.equal(hit.body.key, 'oc_sk_test', 'the stored key comes back for the editor')
+
+  const missing = await reveal('?key=zzz')
+  assert.equal(missing.status, 400, 'an unknown account is rejected')
+  assert.match(missing.body.error, /zzz/)
+
+  const snapshot = await api('GET')
+  assert.equal(JSON.stringify(snapshot.body).includes('oc_sk_test'), false, 'the snapshot stays masked')
+}
+console.log('reveal key ok')
+
 for (const dispose of disposers) await dispose()
 server.close()
 console.log('all accounts checks passed')

package/usage.js

@@ -230,6 +230,11 @@ function normalize(config = {}) {
     // our own schedule, not DeepSeek's holiday calendar"), so this stays off by
     // default — the dashboard is about the Go bill.
     holidayAware: config.holidayAware === true,
+    // The subscription price and its monthly allowance can be overridden here,
+    // so a plan change from OpenCode needs a config edit, not a patch: the
+    // discount shown on the page is derived from these two numbers.
+    planPriceUsd: Number.isFinite(config.planPriceUsd) && config.planPriceUsd > 0 ? config.planPriceUsd : undefined,
+    planAllowanceUsd: Number.isFinite(config.planAllowanceUsd) && config.planAllowanceUsd > 0 ? config.planAllowanceUsd : undefined,
     limits: LIMITS[plan],
   }
 }
@@ -292,40 +297,60 @@ export function peakMultiplier(model, at, holidayAware = false) {
  *  discount — Go pays $10 for $100 of list-priced usage, i.e. 10x. */
 const PLAN_PRICES = { go: 10, 'go-plus': 40, 'go-teams': 20 }
 
+/** The three lines DeepSeek bills on, in the order the page shows them: a cached
+ *  prompt token is by far the cheapest, so it leads. */
+export const BILLING_KINDS = ['cacheRead', 'input', 'output']
+
 /** Which route is cheaper at this instant, expressed in the money you actually
- *  hand over: Go charges the list price against a 10x-discounted allowance, while
- *  DeepSeek's API bills the list price directly. */
-export function peakSnapshot(cnyPerUsd, at = Date.now(), plan = 'go') {
+ *  hand over: OpenCode charges the list price against a discounted allowance,
+ *  while DeepSeek's API bills the list price directly.
+ *
+ *  `overrides` lets the settings page (or a future price change) replace the
+ *  plan price and its allowance without touching this file: the discount is
+ *  derived, so editing either number re-derives the verdict on its own. */
+export function peakSnapshot(cnyPerUsd, at = Date.now(), plan = 'go', overrides = {}) {
   const fx = Number.isFinite(cnyPerUsd) && cnyPerUsd > 0 ? cnyPerUsd : OFFICIAL.defaultCnyPerUsd
-  const priceUsd = PLAN_PRICES[plan] ?? PLAN_PRICES.go
-  const allowanceUsd = LIMITS[plan]?.['deepseek-v4.1-flash'] ?? LIMITS.go['deepseek-v4.1-flash']
+  const priceUsd = Number.isFinite(overrides.priceUsd) && overrides.priceUsd > 0
+    ? overrides.priceUsd
+    : PLAN_PRICES[plan] ?? PLAN_PRICES.go
+  const listed = LIMITS[plan]?.['deepseek-v4.1-flash'] ?? LIMITS.go['deepseek-v4.1-flash']
+  const allowanceUsd = Number.isFinite(overrides.allowanceUsd) && overrides.allowanceUsd > 0
+    ? overrides.allowanceUsd
+    : listed
   const leverage = allowanceUsd / priceUsd
   const routes = []
   for (const [model, official] of Object.entries(OFFICIAL.prices)) {
     const goFactor = peakMultiplier(model, at, false)
     const officialFactor = peakMultiplier(model, at, true)
-    // One million output tokens is the yardstick: output dominates a coding bill.
-    const list = official.output
-    const burn = list * goFactor // what the request subtracts from the allowance
-    const goPay = burn / leverage // what it actually costs you, given the discount
-    const officialPay = list * officialFactor
+    const rows = BILLING_KINDS.map((kind) => {
+      // One million tokens of this kind is the yardstick; output dominates a
+      // coding bill, so the headline verdict still reads off the output line.
+      const list = official[kind]
+      const burn = list * goFactor // what the request subtracts from the allowance
+      const goPay = burn / leverage // what it actually costs you, given the discount
+      const officialPay = list * officialFactor
+      return { kind, list, go: { factor: goFactor, burn, pay: goPay }, official: { factor: officialFactor, pay: officialPay }, cheaper: goPay <= officialPay ? 'go' : 'official', ratio: goPay / officialPay }
+    })
+    const headline = rows[rows.length - 1]
     routes.push({
       model,
-      list,
-      go: { factor: goFactor, burn, pay: goPay },
-      official: { factor: officialFactor, pay: officialPay },
-      cheaper: goPay <= officialPay ? 'go' : 'official',
-      ratio: goPay / officialPay,
+      rows,
+      list: headline.list,
+      go: headline.go,
+      official: headline.official,
+      cheaper: headline.cheaper,
+      ratio: headline.ratio,
     })
   }
   return {
     at,
     cnyPerUsd: fx,
     holiday: isChinaHoliday(at),
-    plan: { id: plan, priceUsd, priceCny: priceUsd * fx, allowanceUsd, allowanceCny: allowanceUsd * fx, leverage },
+    plan: { id: plan, priceUsd, priceCny: priceUsd * fx, allowanceUsd, allowanceCny: allowanceUsd * fx, leverage, overridden: Boolean(overrides.priceUsd || overrides.allowanceUsd) },
     go: { peak: peakMultiplier('deepseek-v4.1-flash', at, false) === PEAK.factor },
     official: { peak: peakMultiplier('deepseek-v4.1-flash', at, true) === PEAK.factor },
     factor: PEAK.factor,
+    kinds: BILLING_KINDS,
     models: routes,
   }
 }
@@ -659,7 +684,10 @@ export function apply(ctx, config = {}) {
       startedAt,
       windowStarts: starts,
       holidayAware: cfg.holidayAware,
-      peak: peakSnapshot(cfg.cnyPerUsd, Date.now(), detectedPlan ?? cfg.plan),
+      peak: peakSnapshot(cfg.cnyPerUsd, Date.now(), detectedPlan ?? cfg.plan, {
+        priceUsd: cfg.planPriceUsd,
+        allowanceUsd: cfg.planAllowanceUsd,
+      }),
       usage: usageSnapshot,
       usageError,
       accounts,