@angelyeye/dsh-cost-tracker 1.8.13 → 1.8.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +55 -0
- package/README.en.md +36 -4
- package/README.md +36 -4
- package/client.js +71 -1
- package/config.js +41 -1
- package/index.js +215 -9
- package/package.json +4 -2
- package/pricing.js +159 -1
- package/volcengine.js +456 -0
package/index.js
CHANGED
|
@@ -10,17 +10,21 @@ import { readFileSync, writeFileSync, mkdirSync, renameSync, existsSync, realpat
|
|
|
10
10
|
import { join, dirname } from 'node:path'
|
|
11
11
|
import { homedir } from 'node:os'
|
|
12
12
|
import { createStore, collectTotals, DETAIL_DAYS, MAX_AXIS_DAYS } from './store.js'
|
|
13
|
-
import { PRICE_ERAS, V41_EFFECTIVE_AT, V41_PRO_ROUTE_AT, exactModelsAt, eraAt, SUBSCRIPTION_RATES, PROVIDER_RATES, GENERIC_RATES, PEAK_WINDOWS, PEAK_HOUR_WINDOWS, isPeak, peakPhaseAt, priceFor, computeCost, normalizeTokens } from './pricing.js'
|
|
13
|
+
import { PRICE_ERAS, V41_EFFECTIVE_AT, V41_PRO_ROUTE_AT, exactModelsAt, eraAt, SUBSCRIPTION_RATES, PROVIDER_RATES, GENERIC_RATES, PEAK_WINDOWS, PEAK_HOUR_WINDOWS, isPeak, peakPhaseAt, priceFor, computeCost, normalizeTokens, subscriptionPlanFor, volcenginePlanModels, VOLCENGINE_PLAN_PROVIDER_KEYS, VOLCENGINE_PLAN_RATES } from './pricing.js'
|
|
14
14
|
import {
|
|
15
15
|
normalizePeakConfig, defaultPeakConfig, peakEffective,
|
|
16
16
|
normalizeCloudConfig, defaultCloudConfig, normalizePluginConfig,
|
|
17
17
|
normalizeUiConfig, defaultUiConfig, UI_SURFACES,
|
|
18
|
+
normalizeVolcengineConfig, defaultVolcengineConfig,
|
|
18
19
|
} from './config.js'
|
|
20
|
+
import {
|
|
21
|
+
queryVolcenginePlan, VOLCENGINE_KEY_ENVS, VOLCENGINE_SECRET_ENVS, VOLC_WINDOW_LABELS,
|
|
22
|
+
} from './volcengine.js'
|
|
19
23
|
import { createSyncEngine, setPluginVersion, SOURCE as SYNC_SOURCE, SYNC_VERSION, loadIdentity } from './sync.js'
|
|
20
24
|
import { Schema } from './schema.js'
|
|
21
25
|
|
|
22
26
|
/** 插件版本(写入上报信封,便于云端排查版本差异) */
|
|
23
|
-
const PLUGIN_VERSION = '1.8.
|
|
27
|
+
const PLUGIN_VERSION = '1.8.14'
|
|
24
28
|
setPluginVersion(PLUGIN_VERSION)
|
|
25
29
|
|
|
26
30
|
/** 「设置 → 插件 → 插件配置」里的卡片字段(与 settings 命名空间一致) */
|
|
@@ -40,6 +44,9 @@ const SyncSchema = Schema.object({
|
|
|
40
44
|
uiDockEnabled: Schema.boolean().default(undefined).description('显示输入框上方的花费胶囊'),
|
|
41
45
|
uiPeakEnabled: Schema.boolean().default(undefined).description('显示侧边栏峰谷时段条'),
|
|
42
46
|
uiDashboardEnabled: Schema.boolean().default(undefined).description('显示设置页「花费统计」看板'),
|
|
47
|
+
// 火山方舟配额(v1.8.14):留空即回落凭据发现链,老配置零改动可用
|
|
48
|
+
volcengineAccessKeyId: Schema.string().default(undefined).description('火山引擎 AccessKeyID(留空则用凭据库 / 环境变量)'),
|
|
49
|
+
volcengineSecretAccessKey: Schema.string().role('secret').default(undefined).description('火山引擎 SecretAccessKey(留空则用凭据库 / 环境变量)'),
|
|
43
50
|
})
|
|
44
51
|
|
|
45
52
|
// ============================================================
|
|
@@ -160,6 +167,11 @@ export default {
|
|
|
160
167
|
// ---------- state ----------
|
|
161
168
|
// 注意:records/rollups 在 persistence 段由 store 初始化(details/rollups 引用)
|
|
162
169
|
let kimiCache = null
|
|
170
|
+
// 火山方舟配额缓存(与 kimiCache 同形:{ fetchedAt, data },120s TTL)
|
|
171
|
+
let volcengineCache = null
|
|
172
|
+
// 最近一次实际使用的 provider(归一化后)。用于判断「用户当下正在用哪家订阅」,
|
|
173
|
+
// 从而只预热该家的配额缓存,不为无关厂商发网络请求。
|
|
174
|
+
let lastProviderSeen = ''
|
|
163
175
|
|
|
164
176
|
// ---------- small helpers ----------
|
|
165
177
|
function pad2(n) { return n < 10 ? '0' + n : '' + n }
|
|
@@ -168,6 +180,16 @@ export default {
|
|
|
168
180
|
function r2(x) { return Math.round(x * 100) / 100 }
|
|
169
181
|
function r4(x) { return Math.round(x * 10000) / 10000 }
|
|
170
182
|
function normProvider(p) { return toStr(p).toLowerCase().replace(/-official$/, '') }
|
|
183
|
+
/**
|
|
184
|
+
* 是否属于火山方舟(含用户自定的 Coding Plan provider 别名)。
|
|
185
|
+
* 用于「该不该预热/展示火山配额面板」这一判断——只看 provider 名即可,
|
|
186
|
+
* 与计费侧的模型级订阅判定(subscriptionPlanFor)是两件事。
|
|
187
|
+
*/
|
|
188
|
+
function isVolcengineProvider(np) {
|
|
189
|
+
const n = toStr(np).toLowerCase()
|
|
190
|
+
if (VOLCENGINE_PLAN_PROVIDER_KEYS.indexOf(n) >= 0) return true
|
|
191
|
+
return /volcengine|volces|ark-?coding|byteblus|byteplus/.test(n)
|
|
192
|
+
}
|
|
171
193
|
function dayKey(ts) {
|
|
172
194
|
const d = new Date(ts + 28800000)
|
|
173
195
|
return d.getUTCFullYear() + '-' + pad2(d.getUTCMonth() + 1) + '-' + pad2(d.getUTCDate())
|
|
@@ -223,6 +245,7 @@ export default {
|
|
|
223
245
|
let peakConfig = defaultPeakConfig()
|
|
224
246
|
let cloudConfig = defaultCloudConfig()
|
|
225
247
|
let uiConfig = defaultUiConfig()
|
|
248
|
+
let volcengineConfig = defaultVolcengineConfig()
|
|
226
249
|
let configLoadWarned = false
|
|
227
250
|
|
|
228
251
|
function loadConfig() {
|
|
@@ -232,6 +255,7 @@ export default {
|
|
|
232
255
|
peakConfig = normalizePeakConfig(parsed)
|
|
233
256
|
cloudConfig = normalizeCloudConfig(parsed)
|
|
234
257
|
uiConfig = normalizeUiConfig(parsed)
|
|
258
|
+
volcengineConfig = normalizeVolcengineConfig(parsed)
|
|
235
259
|
} catch (e) {
|
|
236
260
|
if (!configLoadWarned) { console.error('cost tracker config load failed, using defaults', e); configLoadWarned = true }
|
|
237
261
|
}
|
|
@@ -241,7 +265,7 @@ export default {
|
|
|
241
265
|
try {
|
|
242
266
|
mkdirSync(dirname(CONFIG_FILE), { recursive: true })
|
|
243
267
|
const tmp = CONFIG_FILE + '.tmp'
|
|
244
|
-
writeFileSync(tmp, JSON.stringify(Object.assign({}, peakConfig, cloudConfig, uiConfig)), 'utf8')
|
|
268
|
+
writeFileSync(tmp, JSON.stringify(Object.assign({}, peakConfig, cloudConfig, uiConfig, volcengineConfig)), 'utf8')
|
|
245
269
|
renameSync(tmp, CONFIG_FILE)
|
|
246
270
|
return true
|
|
247
271
|
} catch (e) {
|
|
@@ -269,6 +293,13 @@ export default {
|
|
|
269
293
|
return uiConfig
|
|
270
294
|
}
|
|
271
295
|
|
|
296
|
+
/** 火山方舟配额凭据:空串 = 未配置 = 走凭据发现链(凭据库 / 环境变量) */
|
|
297
|
+
function setVolcengineConfig(raw) {
|
|
298
|
+
volcengineConfig = normalizeVolcengineConfig(Object.assign({}, volcengineConfig, raw))
|
|
299
|
+
saveConfig()
|
|
300
|
+
return volcengineConfig
|
|
301
|
+
}
|
|
302
|
+
|
|
272
303
|
// ---------- settings 命名空间(可选服务) ----------
|
|
273
304
|
// 字段全部 .default(undefined):只有用户在卡片里显式保存才写入用户层,
|
|
274
305
|
// 从而不覆盖我们自己配置文件里的既有值。
|
|
@@ -282,11 +313,14 @@ export default {
|
|
|
282
313
|
const patch = {}
|
|
283
314
|
for (const k of Object.keys(next)) if (next[k] !== undefined) patch[k] = next[k]
|
|
284
315
|
if (!Object.keys(patch).length) return
|
|
285
|
-
//
|
|
316
|
+
// 卡片里既有云端同步字段、界面显示字段,也有火山方舟凭据字段,
|
|
317
|
+
// 分给各自的规范化函数(互不覆盖)。
|
|
286
318
|
const cloudPatch = {}
|
|
287
319
|
const uiPatch = {}
|
|
320
|
+
const volcPatch = {}
|
|
288
321
|
for (const [k, v] of Object.entries(patch)) {
|
|
289
322
|
if (UI_SURFACES.some((s) => s.key === k)) uiPatch[k] = v
|
|
323
|
+
else if (k === 'volcengineAccessKeyId' || k === 'volcengineSecretAccessKey') volcPatch[k] = v
|
|
290
324
|
else cloudPatch[k] = v
|
|
291
325
|
}
|
|
292
326
|
let changed = false
|
|
@@ -300,6 +334,13 @@ export default {
|
|
|
300
334
|
uiConfig = normalizeUiConfig(Object.assign({}, uiConfig, uiPatch))
|
|
301
335
|
if (JSON.stringify(uiConfig) !== before) changed = true
|
|
302
336
|
}
|
|
337
|
+
if (Object.keys(volcPatch).length) {
|
|
338
|
+
const before = JSON.stringify(volcengineConfig)
|
|
339
|
+
volcengineConfig = normalizeVolcengineConfig(Object.assign({}, volcengineConfig, volcPatch))
|
|
340
|
+
if (JSON.stringify(volcengineConfig) !== before) changed = true
|
|
341
|
+
// 凭据变更后作废缓存,用户改完 Key 立刻能拿到新结果,不必等 TTL 到期
|
|
342
|
+
volcengineCache = null
|
|
343
|
+
}
|
|
303
344
|
if (changed) saveConfig()
|
|
304
345
|
}
|
|
305
346
|
|
|
@@ -390,6 +431,8 @@ export default {
|
|
|
390
431
|
const model = toStr(options && options.model)
|
|
391
432
|
if (!provider && !model) return
|
|
392
433
|
const np = normProvider(provider)
|
|
434
|
+
// 记下最近一次实际使用的 provider:summary 据此判断该预热哪家的配额缓存
|
|
435
|
+
if (np) lastProviderSeen = np
|
|
393
436
|
// 按「调用发生的时刻」选单价版本(跨 2026-09-10 12:00 / 2026-09-14 12:00 自动切换,无需重启)。
|
|
394
437
|
const price = priceFor(np, model, ts)
|
|
395
438
|
// 峰谷计费开关:随配置峰谷启用 + 生效时间门控;未启用时按非峰谷档(平价)计费。
|
|
@@ -445,15 +488,43 @@ export default {
|
|
|
445
488
|
}
|
|
446
489
|
|
|
447
490
|
// ---------- key resolution ----------
|
|
491
|
+
/** 凭据文件路径:与数据/store 同源,跟随 DSH_HOME(此前硬编码 ~/.dsh,
|
|
492
|
+
* 在 DSH_HOME 被重定向的部署——含本仓库的沙箱测试——下永远读不到)。 */
|
|
493
|
+
function credFilePath() {
|
|
494
|
+
return join(process.env.DSH_HOME || join(homedir(), '.dsh'), '.credentials.yaml')
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
/**
|
|
498
|
+
* 从 .credentials.yaml 读取某个环境变量对应的值。
|
|
499
|
+
*
|
|
500
|
+
* 真实文件是以 `refs:` 段**缩进**存放的:
|
|
501
|
+
* refs:
|
|
502
|
+
* VOLC_ACCESSKEY: AKxxxx
|
|
503
|
+
* 早先的正则只匹配行首无缩进的键,于是所有键都读不出来 —— 这一路兜底
|
|
504
|
+
* 一直静默失效(有宿主凭据服务时被掩盖,没有时就直接报「未找到 Key」)。
|
|
505
|
+
* 现在允许缩进,并优先在 `refs:` 段内匹配;同时保留对「无缩进的旧版
|
|
506
|
+
* 平铺文件」的兼容。
|
|
507
|
+
*/
|
|
448
508
|
function readCredFile(envName) {
|
|
449
509
|
try {
|
|
450
|
-
const
|
|
451
|
-
const t = readFileSync(p, 'utf8')
|
|
510
|
+
const t = readFileSync(credFilePath(), 'utf8')
|
|
452
511
|
const lines = t.split(/\r?\n/)
|
|
512
|
+
let inRefs = false
|
|
513
|
+
let fallback = ''
|
|
453
514
|
for (const line of lines) {
|
|
454
|
-
|
|
455
|
-
|
|
515
|
+
if (/^\S/.test(line)) {
|
|
516
|
+
// 顶层键:进入/离开 refs 段(records 等其它段不应被误读)
|
|
517
|
+
inRefs = /^refs\s*:/.test(line)
|
|
518
|
+
if (/^[A-Za-z0-9_]+\s*:/.test(line)) continue
|
|
519
|
+
}
|
|
520
|
+
const m = line.match(/^\s*([A-Za-z0-9_]+)\s*:\s*(.+?)\s*$/)
|
|
521
|
+
if (!m || m[1] !== envName) continue
|
|
522
|
+
const value = m[2].replace(/^["']|["']$/g, '')
|
|
523
|
+
if (!value) continue
|
|
524
|
+
if (inRefs) return value // refs 段内命中:最可信,立即返回
|
|
525
|
+
if (!fallback) fallback = value // 段外的同名键:留作兜底
|
|
456
526
|
}
|
|
527
|
+
return fallback
|
|
457
528
|
} catch (e) {}
|
|
458
529
|
return ''
|
|
459
530
|
}
|
|
@@ -564,6 +635,119 @@ export default {
|
|
|
564
635
|
return data
|
|
565
636
|
}
|
|
566
637
|
|
|
638
|
+
// ---------- volcengine (火山方舟) coding plan quota ----------
|
|
639
|
+
// 与 kimi 的差别:方舟配额走管控面 OpenAPI,需 AccessKeyID + SecretAccessKey
|
|
640
|
+
// 成对做 HMAC 签名(不是 Bearer),签名与解析在 volcengine.js 里(纯函数可单测)。
|
|
641
|
+
|
|
642
|
+
/** 环境变量名候选:用户自定 provider 的 apiKeyEnv 优先,其后是 SDK 约定名 */
|
|
643
|
+
function volcengineEnvCandidates() {
|
|
644
|
+
const out = []
|
|
645
|
+
const settings = ctx.get('settings')
|
|
646
|
+
if (settings) {
|
|
647
|
+
try {
|
|
648
|
+
const v = settings.get('llm-pi-ai')
|
|
649
|
+
const providers = (v && v.providers) || {}
|
|
650
|
+
for (const [id, p] of Object.entries(providers)) {
|
|
651
|
+
if (!p) continue
|
|
652
|
+
const base = String(p.baseURL || '')
|
|
653
|
+
const looksArkCoding = /ark\.cn-beijing\.volces\.com\/api\/coding/i.test(base)
|
|
654
|
+
const looksVolc = /volcengine/i.test(id) || /volces\.com/i.test(base)
|
|
655
|
+
if (!looksArkCoding && !looksVolc) continue
|
|
656
|
+
if (p.apiKeyEnv) out.push(String(p.apiKeyEnv))
|
|
657
|
+
}
|
|
658
|
+
} catch (e) {}
|
|
659
|
+
}
|
|
660
|
+
return out
|
|
661
|
+
}
|
|
662
|
+
|
|
663
|
+
/** 在候选名单里逐个查凭据库 + .credentials.yaml,返回首个命中 */
|
|
664
|
+
async function resolveAnyEnv(names) {
|
|
665
|
+
for (const n of names) {
|
|
666
|
+
if (!n) continue
|
|
667
|
+
const v = await resolveApiKey(n)
|
|
668
|
+
if (v.value) return { value: v.value, source: v.source + ':' + n, env: n }
|
|
669
|
+
}
|
|
670
|
+
return { value: '', source: 'none', env: names[0] || '' }
|
|
671
|
+
}
|
|
672
|
+
|
|
673
|
+
function emptyVolcengine(error, keySource, keyEnv) {
|
|
674
|
+
return {
|
|
675
|
+
ok: false, error,
|
|
676
|
+
windows: {}, windowList: [],
|
|
677
|
+
planType: '', action: '', updateTime: 0,
|
|
678
|
+
fetchedAt: Date.now(), keySource, keyEnv,
|
|
679
|
+
}
|
|
680
|
+
}
|
|
681
|
+
|
|
682
|
+
/** 把 volcengine.js 的 windows 归一成客户端要好用的形状(带 label,便于直接渲染) */
|
|
683
|
+
function volcengineWindowList(windows) {
|
|
684
|
+
const order = ['fiveHour', 'weekly', 'monthly', 'daily']
|
|
685
|
+
const list = []
|
|
686
|
+
for (const name of order) {
|
|
687
|
+
const w = windows[name]
|
|
688
|
+
if (!w) continue
|
|
689
|
+
list.push({ name, label: VOLC_WINDOW_LABELS[name] || name, percent: w.percent, resetsAt: w.resetsAt, quota: w.quota, used: w.used })
|
|
690
|
+
}
|
|
691
|
+
// 未识别的窗口名附在末尾(接口结构变化时不静默丢弃)
|
|
692
|
+
for (const name of Object.keys(windows)) {
|
|
693
|
+
if (order.indexOf(name) >= 0) continue
|
|
694
|
+
const w = windows[name]
|
|
695
|
+
list.push({ name, label: VOLC_WINDOW_LABELS[name] || name, percent: w.percent, resetsAt: w.resetsAt, quota: w.quota, used: w.used })
|
|
696
|
+
}
|
|
697
|
+
return list
|
|
698
|
+
}
|
|
699
|
+
|
|
700
|
+
/**
|
|
701
|
+
* 查询火山方舟 Coding Plan 配额。
|
|
702
|
+
* 凭据发现链:配置卡片字段 → 凭据库 / .credentials.yaml → 环境变量约定名。
|
|
703
|
+
* 全部失败一律软失败(ok:false + 中文原因),绝不抛到路由层。
|
|
704
|
+
* **返回值只含 keySource/keyEnv,绝不回显 AK/SK 本身。**
|
|
705
|
+
*/
|
|
706
|
+
async function volcengineUsage(force) {
|
|
707
|
+
const now = Date.now()
|
|
708
|
+
if (!force && volcengineCache && now - volcengineCache.fetchedAt < 120000) return volcengineCache.data
|
|
709
|
+
const idEnvs = volcengineEnvCandidates().concat(VOLCENGINE_KEY_ENVS)
|
|
710
|
+
const secretEnvs = volcengineEnvCandidates().concat(VOLCENGINE_SECRET_ENVS)
|
|
711
|
+
let data
|
|
712
|
+
try {
|
|
713
|
+
let id = String(volcengineConfig.volcengineAccessKeyId || '')
|
|
714
|
+
let secret = String(volcengineConfig.volcengineSecretAccessKey || '')
|
|
715
|
+
let keySource = id ? 'config' : 'none'
|
|
716
|
+
let keyEnv = idEnvs[0] || 'VOLC_ACCESSKEY'
|
|
717
|
+
if (!id || !secret) {
|
|
718
|
+
const rid = await resolveAnyEnv(idEnvs)
|
|
719
|
+
const rsec = await resolveAnyEnv(secretEnvs)
|
|
720
|
+
if (!id && rid.value) { id = rid.value; keySource = rid.source; keyEnv = rid.env }
|
|
721
|
+
if (!secret && rsec.value) secret = rsec.value
|
|
722
|
+
}
|
|
723
|
+
if (!id || !secret) {
|
|
724
|
+
data = emptyVolcengine(
|
|
725
|
+
'未找到火山引擎访问密钥(需 AccessKeyID + SecretAccessKey)。配额查询走方舟管控面,'
|
|
726
|
+
+ '与推理用的 ARK API Key 是两套凭据;请配置 ' + keyEnv + ' / VOLC_SECRETKEY,'
|
|
727
|
+
+ '或在插件配置卡片里填写。',
|
|
728
|
+
keySource, keyEnv,
|
|
729
|
+
)
|
|
730
|
+
} else {
|
|
731
|
+
const r = await queryVolcenginePlan({ accessKeyId: id, secretAccessKey: secret })
|
|
732
|
+
const windows = r.windows || {}
|
|
733
|
+
data = {
|
|
734
|
+
ok: true, error: '',
|
|
735
|
+
windows,
|
|
736
|
+
windowList: volcengineWindowList(windows),
|
|
737
|
+
planType: '',
|
|
738
|
+
action: toStr(r.action),
|
|
739
|
+
updateTime: 0,
|
|
740
|
+
fetchedAt: Date.now(),
|
|
741
|
+
keySource, keyEnv,
|
|
742
|
+
}
|
|
743
|
+
}
|
|
744
|
+
} catch (e) {
|
|
745
|
+
data = emptyVolcengine(toStr(e && e.message ? e.message : e), 'none', idEnvs[0] || 'VOLC_ACCESSKEY')
|
|
746
|
+
}
|
|
747
|
+
volcengineCache = { fetchedAt: now, data }
|
|
748
|
+
return data
|
|
749
|
+
}
|
|
750
|
+
|
|
567
751
|
// ---------- deepseek balance ----------
|
|
568
752
|
async function balance(args) {
|
|
569
753
|
const manual = args && typeof args.apiKey === 'string' ? args.apiKey.trim() : ''
|
|
@@ -642,6 +826,12 @@ export default {
|
|
|
642
826
|
v41EffectiveAt: V41_EFFECTIVE_AT,
|
|
643
827
|
v41ProRouteAt: V41_PRO_ROUTE_AT,
|
|
644
828
|
subscription: SUBSCRIPTION_RATES,
|
|
829
|
+
// 火山方舟 Coding Plan 订阅:套餐内模型清单(等效参考价,非真实扣费)
|
|
830
|
+
volcenginePlan: {
|
|
831
|
+
providers: VOLCENGINE_PLAN_PROVIDER_KEYS,
|
|
832
|
+
models: Object.keys(volcenginePlanModels()),
|
|
833
|
+
rates: VOLCENGINE_PLAN_RATES,
|
|
834
|
+
},
|
|
645
835
|
providers: PROVIDER_RATES,
|
|
646
836
|
generic: GENERIC_RATES,
|
|
647
837
|
}
|
|
@@ -839,13 +1029,21 @@ export default {
|
|
|
839
1029
|
} catch (e) {}
|
|
840
1030
|
}
|
|
841
1031
|
const np = normProvider(provider)
|
|
842
|
-
|
|
1032
|
+
// 订阅判定必须带模型:同一 provider 下可能既有套餐内模型也有按量模型
|
|
1033
|
+
// (火山方舟即如此),只看 provider 会把按量调用错记成订阅。
|
|
1034
|
+
const subscription = !!subscriptionPlanFor(np, model)
|
|
1035
|
+
const isVolc = isVolcengineProvider(np)
|
|
843
1036
|
let kimiWeeklyRemaining = null
|
|
844
1037
|
// 只要当前选择是订阅,或本会话实际用了订阅,就刷新 kimi 周配额
|
|
845
1038
|
if (subscription || sessionSub > 0) {
|
|
846
1039
|
if (!kimiCache || now - kimiCache.fetchedAt >= 120000) kimiUsage(false).catch(() => {})
|
|
847
1040
|
if (kimiCache && kimiCache.data && kimiCache.data.ok) kimiWeeklyRemaining = kimiCache.data.weekly.remaining
|
|
848
1041
|
}
|
|
1042
|
+
// 火山的预热条件与 kimi 同源:当前选中的是火山订阅,或最近一次调用就走火山。
|
|
1043
|
+
// 面板自己也会主动拉取(volcengine-usage),这里只是让它在「正在用」时自动出数。
|
|
1044
|
+
if (isVolc || isVolcengineProvider(lastProviderSeen)) {
|
|
1045
|
+
if (!volcengineCache || now - volcengineCache.fetchedAt >= 120000) volcengineUsage(false).catch(() => {})
|
|
1046
|
+
}
|
|
849
1047
|
return {
|
|
850
1048
|
sessionCost: r4(sessionCost), sessionCalls,
|
|
851
1049
|
sessionSub: r4(sessionSub), sessionSubCalls,
|
|
@@ -859,6 +1057,7 @@ export default {
|
|
|
859
1057
|
peak: peakEffective(peakConfig, now) ? isPeak(now) : false,
|
|
860
1058
|
subscription,
|
|
861
1059
|
kimiWeeklyRemaining,
|
|
1060
|
+
volcengineActive: isVolc,
|
|
862
1061
|
}
|
|
863
1062
|
}
|
|
864
1063
|
|
|
@@ -866,6 +1065,7 @@ export default {
|
|
|
866
1065
|
const n = store.counts().calls
|
|
867
1066
|
store.clear()
|
|
868
1067
|
kimiCache = null
|
|
1068
|
+
volcengineCache = null
|
|
869
1069
|
persistNow()
|
|
870
1070
|
return { ok: true, cleared: n }
|
|
871
1071
|
}
|
|
@@ -1194,6 +1394,7 @@ export default {
|
|
|
1194
1394
|
summary: (args) => buildSummary(args),
|
|
1195
1395
|
dashboard: (args) => buildDashboard(args),
|
|
1196
1396
|
'kimi-usage': (args) => kimiUsage(!!(args && args.force)),
|
|
1397
|
+
'volcengine-usage': (args) => volcengineUsage(!!(args && args.force)),
|
|
1197
1398
|
balance: (args) => balance(args),
|
|
1198
1399
|
export: () => exportCsv(),
|
|
1199
1400
|
prices: () => prices(),
|
|
@@ -1203,6 +1404,11 @@ export default {
|
|
|
1203
1404
|
'peak-config': (args) => setPeakConfig(args),
|
|
1204
1405
|
// 界面显示三开关(设置卡片的「界面显示」分组):patch 里只带这几个键,写回后原样回显
|
|
1205
1406
|
'ui-config': (args) => Object.assign({ ok: true }, setUiConfig(args || {})),
|
|
1407
|
+
// 火山方舟配额凭据:只回显是否已配置,**绝不回显 SecretAccessKey 明文**
|
|
1408
|
+
'volcengine-config': (args) => {
|
|
1409
|
+
setVolcengineConfig(args || {})
|
|
1410
|
+
return Object.assign({ ok: true, volcengineHasKeys: !!(volcengineConfig.volcengineAccessKeyId && volcengineConfig.volcengineSecretAccessKey) })
|
|
1411
|
+
},
|
|
1206
1412
|
// 同步状态里一并带上界面显示开关:配置卡片只需一次往返就能初始化表单
|
|
1207
1413
|
sync: () => Object.assign({}, syncEngine.status(), uiConfig),
|
|
1208
1414
|
'sync-now': async (args) => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angelyeye/dsh-cost-tracker",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.14",
|
|
4
4
|
"description": "DeepSeek Harness (DSH) plugin: LLM token usage & cost tracking with a settings dashboard, agent tools, HTTP API, persistent storage and multi-device cloud sync.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
"config.js",
|
|
14
14
|
"schema.js",
|
|
15
15
|
"sync.js",
|
|
16
|
+
"volcengine.js",
|
|
16
17
|
"cordis.patch.yml",
|
|
17
18
|
"CHANGELOG.md"
|
|
18
19
|
],
|
|
@@ -20,10 +21,11 @@
|
|
|
20
21
|
".": "./index.js",
|
|
21
22
|
"./client": "./client.js",
|
|
22
23
|
"./view": "./view.js",
|
|
24
|
+
"./volcengine": "./volcengine.js",
|
|
23
25
|
"./package.json": "./package.json"
|
|
24
26
|
},
|
|
25
27
|
"scripts": {
|
|
26
|
-
"test": "node test/storage.test.js && node test/pricing.test.js && node test/config.test.js && node test/recompute.test.js && node test/client-registration.test.js && node test/ui-display.test.js && node test/client-render.test.js && node test/cloud-read.test.js && node --no-warnings test/cloud-view-e2e.test.js && node test/sync.test.js && node test/view.test.js"
|
|
28
|
+
"test": "node test/storage.test.js && node test/pricing.test.js && node test/volcengine-plan.test.js && node test/volcengine-host.test.js && node test/config.test.js && node test/recompute.test.js && node test/client-registration.test.js && node test/ui-display.test.js && node test/client-render.test.js && node test/cloud-read.test.js && node --no-warnings test/cloud-view-e2e.test.js && node test/sync.test.js && node test/view.test.js"
|
|
27
29
|
},
|
|
28
30
|
"keywords": [
|
|
29
31
|
"dsh-plugin",
|
package/pricing.js
CHANGED
|
@@ -180,6 +180,163 @@ export const SUBSCRIPTION_RATES = {
|
|
|
180
180
|
kimi: { input: 6.5, output: 27.0, cacheRead: 1.1, cacheWrite: 1.1 },
|
|
181
181
|
}
|
|
182
182
|
|
|
183
|
+
/**
|
|
184
|
+
* 订阅套餐的**模型白名单**:provider 键 → 该套餐覆盖的模型。
|
|
185
|
+
*
|
|
186
|
+
* 为什么必须有这层:订阅制的判定原先只看 provider 名。这对 Kimi 成立
|
|
187
|
+
* (kimi 全部走订阅),但**火山方舟不是**——同一个 provider 下既有
|
|
188
|
+
* Coding Plan 套餐内的模型(订阅,不按量扣费),也有套餐外的模型
|
|
189
|
+
* (按量计费)。只看 provider 会把按量调用错记为订阅,金额从「真实花费」
|
|
190
|
+
* 里凭空消失,且原始记录被标成 subscription 后无法自动回滚。
|
|
191
|
+
*
|
|
192
|
+
* 值为 null 表示「该 provider 全部模型都属于这个套餐」(Kimi 即如此,
|
|
193
|
+
* 保持 1.8.13 及以前的既有行为逐字节不变)。
|
|
194
|
+
* 值为数组时按**归一化模型名**匹配(见 normalizeModelName),
|
|
195
|
+
* 另可用 `prefixes` 放行整族模型(如方舟自动调度的 ark-code 系)。
|
|
196
|
+
*/
|
|
197
|
+
export const SUBSCRIPTION_MODELS = {
|
|
198
|
+
'kimi-coding': null,
|
|
199
|
+
kimi: null,
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* 火山方舟(Volcengine Ark)Coding Plan 订阅套餐。
|
|
204
|
+
*
|
|
205
|
+
* provider 名由用户在 DSH 里自定,故登记多个常见别名(normProvider 已剥离
|
|
206
|
+
* `-official` 后缀)。用户实测 provider 为 `byteblus-coding-plan-cn`
|
|
207
|
+
* (baseURL 指向 ark.cn-beijing.volces.com/api/coding/v3),一并纳入。
|
|
208
|
+
*
|
|
209
|
+
* 模型白名单:套餐内含多厂商模型。**同名模型在按量侧也存在**
|
|
210
|
+
* (如 doubao-seed-2.0-pro、deepseek-v4-pro),因此判定必须靠
|
|
211
|
+
* 「provider 命中 + 模型在白名单内」双重限定,缺一不可。
|
|
212
|
+
*
|
|
213
|
+
* ⚠️ 单价口径(**估算,非官方账单**):套餐内的模型各自牌价差异很大
|
|
214
|
+
* (豆包 / GLM / Kimi / DeepSeek / MiniMax 各档不同),而套餐只有一个
|
|
215
|
+
* 固定月费、按窗口百分比计量,**官方没有给出「套餐内某次调用的等效单价」**。
|
|
216
|
+
* 故此处取**单一代表价**,与既有 Kimi 订阅(同样一个价位代表整档套餐)
|
|
217
|
+
* 的口径一致,仅用于横向比较订阅是否划算。
|
|
218
|
+
* 未逐一登记各模型第三方报价:可核实到的多为聚合站的美元估价,
|
|
219
|
+
* 与方舟官方人民币牌价不可直接对照,按本仓库「不编造价格」的约定不收录。
|
|
220
|
+
* 要精确到模型,请以方舟控制台账单为准。
|
|
221
|
+
*/
|
|
222
|
+
const VOLC_PLAN_RATES = { input: 3.0, output: 12.0, cacheRead: 0.6, cacheWrite: 0.6 }
|
|
223
|
+
|
|
224
|
+
/** 火山方舟 Coding Plan 覆盖的 provider 别名 */
|
|
225
|
+
export const VOLCENGINE_PLAN_PROVIDER_KEYS = [
|
|
226
|
+
'volcengine',
|
|
227
|
+
'volcengine-coding',
|
|
228
|
+
'volcengine-plan',
|
|
229
|
+
'volcengine-coding-plan',
|
|
230
|
+
'byteblus-coding-plan-cn',
|
|
231
|
+
'byteplus-coding-plan-cn',
|
|
232
|
+
]
|
|
233
|
+
|
|
234
|
+
/**
|
|
235
|
+
* **专属 Coding Plan 端点**的 provider(baseURL 指向 `.../api/coding/v3`)。
|
|
236
|
+
*
|
|
237
|
+
* 与上面的泛 `volcengine` 别名区别对待:这类 provider 本身就是订阅入口,
|
|
238
|
+
* 其可调模型全部来自套餐(调用套餐外模型需另配 `/api/v3` 在线推理 provider,
|
|
239
|
+
* 那属于另一个 provider 名),因此**不再逐模型限定**——这也解决了
|
|
240
|
+
* 「模型 id 带日期后缀、清单永远追不上」的问题。
|
|
241
|
+
*
|
|
242
|
+
* 泛 `volcengine` 走另一个分支:必须靠模型白名单,因为同一个 provider 下
|
|
243
|
+
* 套餐内外的模型混在一起(接入点 id 形如 ep-xxxx 就是按量)。
|
|
244
|
+
*/
|
|
245
|
+
export const VOLCENGINE_PLAN_DEDICATED_PROVIDERS = [
|
|
246
|
+
'byteblus-coding-plan-cn',
|
|
247
|
+
'byteplus-coding-plan-cn',
|
|
248
|
+
'volcengine-coding',
|
|
249
|
+
'volcengine-plan',
|
|
250
|
+
'volcengine-coding-plan',
|
|
251
|
+
]
|
|
252
|
+
|
|
253
|
+
/**
|
|
254
|
+
* 火山方舟 Coding Plan 覆盖的具体模型(原始名,归一化后匹配)。
|
|
255
|
+
*
|
|
256
|
+
* 带上实测见到的**日期/版本后缀**变体:方舟模型 id 普遍带后缀
|
|
257
|
+
* (用户配置里就有 `glm-5-3-flash-260828`、`deepseek-v4-1-flash-260910`、
|
|
258
|
+
* `doubao-seed-2-1-pro-260915`),漏配的后果是订阅调用被当成未知模型、
|
|
259
|
+
* 标成「按量计费 · 价格为估算」——正是本次要修掉的那类误标。
|
|
260
|
+
*/
|
|
261
|
+
const VOLCENGINE_PLAN_MODEL_IDS = [
|
|
262
|
+
'ark-code-latest',
|
|
263
|
+
// 豆包
|
|
264
|
+
'doubao-seed-code',
|
|
265
|
+
'doubao-seed-2.0-code',
|
|
266
|
+
'doubao-seed-2.0-pro',
|
|
267
|
+
'doubao-seed-2.0-lite',
|
|
268
|
+
'doubao-seed-2.1-pro',
|
|
269
|
+
// 智谱(含用户配置里的 5.3 flash 带日期变体)
|
|
270
|
+
'glm-4.7',
|
|
271
|
+
'glm-5.1',
|
|
272
|
+
'glm-5.3-flash',
|
|
273
|
+
// Kimi / DeepSeek / MiniMax
|
|
274
|
+
'kimi-k2.5',
|
|
275
|
+
'deepseek-v3.2',
|
|
276
|
+
'deepseek-v4-pro',
|
|
277
|
+
'deepseek-v4.1-flash',
|
|
278
|
+
'minimax-m2.5',
|
|
279
|
+
]
|
|
280
|
+
|
|
281
|
+
/**
|
|
282
|
+
* 整族放行的模型前缀(归一化后)。
|
|
283
|
+
*
|
|
284
|
+
* **刻意收得很窄**:只放行方舟自动调度名(`ark-code-*`,会滚动升级,
|
|
285
|
+
* 逐一登记必然过期)。其余一律靠上面的显式清单——
|
|
286
|
+
* 前缀放太宽(如按 `deepseek` / `glm` 整族放行)会把该 provider 下
|
|
287
|
+
* 套餐外的按量模型一并算成订阅,金额从「真实花费」里消失,
|
|
288
|
+
* 那正是本门卫要防的方向,宁可漏配(可显式补清单)也不能错配。
|
|
289
|
+
*/
|
|
290
|
+
export const VOLCENGINE_PLAN_MODEL_PREFIXES = ['arkcode']
|
|
291
|
+
|
|
292
|
+
export const VOLCENGINE_PLAN_RATES = VOLC_PLAN_RATES
|
|
293
|
+
|
|
294
|
+
/** 归一化模型名索引(惰性构建,与下方 eraIndex 同法,避免依赖声明顺序) */
|
|
295
|
+
let VOLC_MODEL_INDEX = null
|
|
296
|
+
function volcModelIndex() {
|
|
297
|
+
if (VOLC_MODEL_INDEX === null) {
|
|
298
|
+
VOLC_MODEL_INDEX = {}
|
|
299
|
+
for (const id of VOLCENGINE_PLAN_MODEL_IDS) VOLC_MODEL_INDEX[normalizeModelName(id)] = id
|
|
300
|
+
}
|
|
301
|
+
return VOLC_MODEL_INDEX
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/** 供测试与展示:归一化模型名 → 套餐单价 */
|
|
305
|
+
export function volcenginePlanModels() {
|
|
306
|
+
const idx = volcModelIndex()
|
|
307
|
+
const out = {}
|
|
308
|
+
for (const k of Object.keys(idx)) out[k] = VOLC_PLAN_RATES
|
|
309
|
+
return out
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
/**
|
|
313
|
+
* 解析某次调用是否命中订阅套餐。
|
|
314
|
+
* @param {string} np - 归一化 provider 名
|
|
315
|
+
* @param {string} model - 模型名
|
|
316
|
+
* @returns {object|null} 命中返回单价表,否则 null
|
|
317
|
+
*/
|
|
318
|
+
export function subscriptionPlanFor(np, model) {
|
|
319
|
+
const sub = SUBSCRIPTION_RATES[np]
|
|
320
|
+
if (sub) {
|
|
321
|
+
const allow = SUBSCRIPTION_MODELS[np]
|
|
322
|
+
// null = 该 provider 全部模型都属于订阅(Kimi:保持既有行为不变)
|
|
323
|
+
if (allow === null || allow === undefined) return sub
|
|
324
|
+
const n = normalizeModelName(model)
|
|
325
|
+
if (Array.isArray(allow) && allow.indexOf(n) >= 0) return sub
|
|
326
|
+
return null
|
|
327
|
+
}
|
|
328
|
+
// 火山方舟 Coding Plan:先看专属订阅端点的 provider(全部模型均属套餐),
|
|
329
|
+
// 再看泛 volcengine(必须靠模型白名单,因为套餐内外模型混在同一 provider 下)。
|
|
330
|
+
if (VOLCENGINE_PLAN_PROVIDER_KEYS.indexOf(np) < 0) return null
|
|
331
|
+
if (VOLCENGINE_PLAN_DEDICATED_PROVIDERS.indexOf(np) >= 0) return VOLC_PLAN_RATES
|
|
332
|
+
const n = normalizeModelName(model)
|
|
333
|
+
if (volcModelIndex()[n] !== undefined) return VOLC_PLAN_RATES
|
|
334
|
+
for (const p of VOLCENGINE_PLAN_MODEL_PREFIXES) {
|
|
335
|
+
if (n.startsWith(p)) return VOLC_PLAN_RATES
|
|
336
|
+
}
|
|
337
|
+
return null
|
|
338
|
+
}
|
|
339
|
+
|
|
183
340
|
/** Provider 兜底单价(估算);缓存写入按缓存命中价计。
|
|
184
341
|
* deepseek 兜底已同步至 V4.1 Flash 档(2.0/8.0/0.04),未知模型不再按旧价高估。 */
|
|
185
342
|
export const PROVIDER_RATES = {
|
|
@@ -274,7 +431,8 @@ export function peakPhaseAt(ts, spanDays) {
|
|
|
274
431
|
* 记账应以它入账;未命中精确表时为原模型名。
|
|
275
432
|
*/
|
|
276
433
|
export function priceFor(np, model, ts) {
|
|
277
|
-
|
|
434
|
+
const sub = subscriptionPlanFor(np, model)
|
|
435
|
+
if (sub) return { rates: sub, tiered: false, estimated: true, subscription: true, model, era: null }
|
|
278
436
|
const era = eraAt(ts)
|
|
279
437
|
const hit = resolveModelInEra(era, model)
|
|
280
438
|
if (hit) return { rates: era.models[hit], tiered: true, estimated: false, subscription: false, model: hit, era: era.id }
|