@angelyeye/dsh-cost-tracker 1.10.0 → 1.10.1
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 +31 -0
- package/index.js +8 -8
- package/package.json +1 -1
- package/store.js +15 -4
- package/sync.js +25 -12
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,37 @@
|
|
|
2
2
|
|
|
3
3
|
本文件用中文记录 dsh-cost-tracker 的版本变更。
|
|
4
4
|
|
|
5
|
+
## v1.10.1(2026-10-25)
|
|
6
|
+
|
|
7
|
+
**安全加固:本地状态文件在 POSIX 上收紧为 owner-only(目录 0700 / 文件 0600);新增 PR CI 门禁(`pull_request` 跑 `npm test`)**
|
|
8
|
+
|
|
9
|
+
> 这两项改进来自外部贡献者 [@shaunpalmer](https://github.com/shaunpalmer) 的 PR #1([Project studios/english hardening](https://github.com/Angelyeye/dsh-cost-tracker/pull/1))。该 PR 整体未合并(包名改为 `@shaunpalmer/…`、版本回退、客户端砍掉约 90% 的界面、屏蔽配置入口、并移除了两个 UI 回归测试),但其中「文件权限收紧」与「PR 跑测试」两处是真实缺口,本次按当前代码结构重写后落地。
|
|
10
|
+
|
|
11
|
+
### 一、本地状态文件权限收紧(`store.js` / `sync.js` / `index.js`)
|
|
12
|
+
|
|
13
|
+
**问题**:`~/.dsh/storages` 下的文件走默认 umask(常见 022)创建,POSIX 上同机其他用户可读。而这里存的是**完整用量明细**(会话、模型、token、花费;未开启脱敏时还有 sessionId)、设备身份与同步游标、云端同步地址等。
|
|
14
|
+
|
|
15
|
+
**改法**:
|
|
16
|
+
|
|
17
|
+
- `store.js` 导出 `PRIVATE_DIR_MODE = 0o700` / `PRIVATE_FILE_MODE = 0o600`:记录文件与实例锁的**目录创建**带 0700、**文件写入**带 0600;
|
|
18
|
+
- `sync.js` 的 `device.json`、`cost-tracker-sync.json` 同样走「目录 0700 + 文件 0600」,并把两处重复的「写临时文件 → rename」收成 `writePrivateJson()`;
|
|
19
|
+
- `index.js` 的配置文件、官方价格状态、历史导入清单也补上同样的模式;
|
|
20
|
+
- **只影响新建**:不 chmod 已有文件,避免动到用户既有部署的权限策略;Windows 忽略 mode,行为完全不变;CSV 导出(用户主动选择落地位置的产物)保持默认权限,方便分享。
|
|
21
|
+
|
|
22
|
+
**测试**:`test/storage.test.js` 用注入的 fs 断言 `mkdirSync(…,{mode:0o700})` / `writeFileSync(…,{mode:0o600})` 真的传进去了(跨平台可断言),并在 POSIX 上额外核对真实文件权限 0600;`test/sync.test.js` 在 POSIX 上核对身份目录/文件与同步目录/游标的实权限,同时验证私有权限路径不影响读写(游标可读回、不留 `.tmp`)。
|
|
23
|
+
|
|
24
|
+
### 二、新增 PR CI 门禁(`.github/workflows/ci.yml`)
|
|
25
|
+
|
|
26
|
+
此前仓库只有手动触发的 `publish-npm.yml`,**PR 上没有任何检查**(评审外部 PR 时只能本地 checkout 分支跑测试)。新增 `CI` 工作流:`pull_request` 与 `push: main` 触发,`permissions: contents: read`(无凭据、fork PR 也能安全跑),Node 24(与发布工作流同版本),执行与发布关卡同一条 `npm test`;另加 concurrency 取消同分支旧运行。不使用 npm cache —— 本包零 npm 依赖、无 lockfile,缓存只会多一次报错。
|
|
27
|
+
|
|
28
|
+
### 三、未采纳部分(保留在作者自己的 fork)
|
|
29
|
+
|
|
30
|
+
包名/版本/入口变更、`index.safe.js` 用 Proxy 屏蔽 `settings` 服务并临时篡改 `process.argv[1]`、英文重写全部模块并替换 README/CHANGELOG(会丢失发布历史,而仓库已有 `README.en.md`)、NZD 展示(浏览器直连第三方汇率 API,且写死单一币种)。隐私默认值(`maskSessionId` / `includePurpose`)方向合理但会改变现有云端归因口径,保持当前默认,后续以显式选项讨论。
|
|
31
|
+
|
|
32
|
+
### 四、测试
|
|
33
|
+
|
|
34
|
+
`npm test` 全绿(22 个测试文件);`storage` 85 项、`sync` 126 项断言通过。
|
|
35
|
+
|
|
5
36
|
## v1.10.0(2026-10-25)
|
|
6
37
|
|
|
7
38
|
**模型目录刷新到 2026-10-25 官方口径:15 家厂商 / 141 个条目(新增 51、改价 10、口径修正 25);火山方舟 Coding Plan 白名单按官方现行 13 个 Model Name 复核,并给「泛 volcengine」分支补上日期后缀容忍**
|
package/index.js
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import { readFileSync, writeFileSync, mkdirSync, renameSync, existsSync, realpathSync } from 'node:fs'
|
|
10
10
|
import { join, dirname } from 'node:path'
|
|
11
11
|
import { homedir } from 'node:os'
|
|
12
|
-
import { createStore, collectTotals, DETAIL_DAYS, MAX_AXIS_DAYS } from './store.js'
|
|
12
|
+
import { createStore, collectTotals, DETAIL_DAYS, MAX_AXIS_DAYS, PRIVATE_DIR_MODE, PRIVATE_FILE_MODE } from './store.js'
|
|
13
13
|
import { PRICE_ERAS, V41_EFFECTIVE_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, setSyncedEras, getSyncedEras, setPriceOverrides, getPriceOverrides, setPeakHolidays, getPeakHolidays } from './pricing.js'
|
|
14
14
|
import {
|
|
15
15
|
normalizePeakConfig, defaultPeakConfig, peakEffective,
|
|
@@ -37,7 +37,7 @@ import { readSettingsSection } from './settings.js'
|
|
|
37
37
|
import { listSessionLogs, planAndBuildImports, loadManifest, IMPORT_SOURCE } from './import.js'
|
|
38
38
|
|
|
39
39
|
/** 插件版本(写入上报信封,便于云端排查版本差异) */
|
|
40
|
-
const PLUGIN_VERSION = '1.10.
|
|
40
|
+
const PLUGIN_VERSION = '1.10.1'
|
|
41
41
|
setPluginVersion(PLUGIN_VERSION)
|
|
42
42
|
|
|
43
43
|
/** 配置面板可写的字段(与 settings 命名空间一致)。
|
|
@@ -317,9 +317,9 @@ export default {
|
|
|
317
317
|
|
|
318
318
|
function saveConfig() {
|
|
319
319
|
try {
|
|
320
|
-
mkdirSync(dirname(CONFIG_FILE), { recursive: true })
|
|
320
|
+
mkdirSync(dirname(CONFIG_FILE), { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
321
321
|
const tmp = CONFIG_FILE + '.tmp'
|
|
322
|
-
writeFileSync(tmp, JSON.stringify(Object.assign({}, peakConfig, cloudConfig, uiConfig, volcengineConfig, billingConfig, importConfig, priceSyncConfig, securityConfig)), 'utf8')
|
|
322
|
+
writeFileSync(tmp, JSON.stringify(Object.assign({}, peakConfig, cloudConfig, uiConfig, volcengineConfig, billingConfig, importConfig, priceSyncConfig, securityConfig)), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
323
323
|
renameSync(tmp, CONFIG_FILE)
|
|
324
324
|
return true
|
|
325
325
|
} catch (e) {
|
|
@@ -1603,9 +1603,9 @@ export default {
|
|
|
1603
1603
|
}
|
|
1604
1604
|
function savePriceState() {
|
|
1605
1605
|
try {
|
|
1606
|
-
mkdirSync(dirname(PRICES_FILE), { recursive: true })
|
|
1606
|
+
mkdirSync(dirname(PRICES_FILE), { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
1607
1607
|
const tmp = PRICES_FILE + '.tmp'
|
|
1608
|
-
writeFileSync(tmp, JSON.stringify(priceState), 'utf8')
|
|
1608
|
+
writeFileSync(tmp, JSON.stringify(priceState), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
1609
1609
|
renameSync(tmp, PRICES_FILE)
|
|
1610
1610
|
return true
|
|
1611
1611
|
} catch (e) {
|
|
@@ -1695,9 +1695,9 @@ export default {
|
|
|
1695
1695
|
}
|
|
1696
1696
|
function saveImportManifest() {
|
|
1697
1697
|
try {
|
|
1698
|
-
mkdirSync(dirname(IMPORT_MANIFEST_FILE), { recursive: true })
|
|
1698
|
+
mkdirSync(dirname(IMPORT_MANIFEST_FILE), { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
1699
1699
|
const tmp = IMPORT_MANIFEST_FILE + '.tmp'
|
|
1700
|
-
writeFileSync(tmp, JSON.stringify(importManifest), 'utf8')
|
|
1700
|
+
writeFileSync(tmp, JSON.stringify(importManifest), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
1701
1701
|
renameSync(tmp, IMPORT_MANIFEST_FILE)
|
|
1702
1702
|
return true
|
|
1703
1703
|
} catch (e) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angelyeye/dsh-cost-tracker",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.1",
|
|
4
4
|
"description": "DeepSeek Harness (DSH) plugin: LLM token usage & cost tracking with a settings dashboard, agent tools, HTTP API, persistent storage, multi-device cloud sync, session-log history import, official price sync and a multi-vendor price catalog.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|
package/store.js
CHANGED
|
@@ -76,6 +76,17 @@ function sleepSync(ms) {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
+
/**
|
|
80
|
+
* 私有目录 / 文件的创建模式:POSIX 上 owner-only(0o700 / 0o600)。
|
|
81
|
+
*
|
|
82
|
+
* 为什么需要:`~/.dsh/storages` 里的记录含**完整用量明细**(会话、模型、token、
|
|
83
|
+
* 花费,未脱敏时还有 sessionId),而默认 umask(常见 022)会让同机其他用户可读。
|
|
84
|
+
* Windows 会忽略 mode,行为不变;POSIX 上显式收紧到 owner-only。
|
|
85
|
+
* 已有文件不会被 chmod 改写(只影响新建),避免动到用户既有部署的权限策略。
|
|
86
|
+
*/
|
|
87
|
+
export const PRIVATE_DIR_MODE = 0o700
|
|
88
|
+
export const PRIVATE_FILE_MODE = 0o600
|
|
89
|
+
|
|
79
90
|
/**
|
|
80
91
|
* 原子落盘:写临时文件 → rename 覆盖目标。
|
|
81
92
|
*
|
|
@@ -96,8 +107,8 @@ export function writeFileAtomic(filePath, data, opts) {
|
|
|
96
107
|
const tmp = filePath + '.' + process.pid + '.tmp'
|
|
97
108
|
const cleanup = () => { try { fs.unlinkSync(tmp) } catch (e) { /* 已被 rename 走或从未创建 */ } }
|
|
98
109
|
try {
|
|
99
|
-
fs.mkdirSync(dirname(filePath), { recursive: true })
|
|
100
|
-
fs.writeFileSync(tmp, data, 'utf8')
|
|
110
|
+
fs.mkdirSync(dirname(filePath), { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
111
|
+
fs.writeFileSync(tmp, data, { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
101
112
|
} catch (e) {
|
|
102
113
|
cleanup()
|
|
103
114
|
return { ok: false, attempts: 0, mode: 'failed', error: e, transient: isTransientRenameError(e) }
|
|
@@ -173,8 +184,8 @@ export function checkStoreLock(filePath, opts) {
|
|
|
173
184
|
export function writeStoreLock(filePath, opts) {
|
|
174
185
|
const o = opts || {}
|
|
175
186
|
try {
|
|
176
|
-
mkdirSync(dirname(filePath), { recursive: true })
|
|
177
|
-
writeFileSync(filePath + '.lock', JSON.stringify({ pid: process.pid, at: Date.now(), version: o.version || '' }), 'utf8')
|
|
187
|
+
mkdirSync(dirname(filePath), { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
188
|
+
writeFileSync(filePath + '.lock', JSON.stringify({ pid: process.pid, at: Date.now(), version: o.version || '' }), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
178
189
|
return true
|
|
179
190
|
} catch (e) {
|
|
180
191
|
return false
|
package/sync.js
CHANGED
|
@@ -47,6 +47,25 @@ export function dataDir(env) {
|
|
|
47
47
|
export function identityPath(env) { return join(dataDir(env), 'device.json') }
|
|
48
48
|
export function syncStatePath(storageDir) { return join(storageDir, 'cost-tracker-sync.json') }
|
|
49
49
|
|
|
50
|
+
/**
|
|
51
|
+
* 同步身份/游标文件的私有权限:POSIX 上 owner-only(0o700 / 0o600)。
|
|
52
|
+
* device.json 含 machineId(主机名+用户名的哈希)与设备名,游标文件含最近同步
|
|
53
|
+
* 结果,都不该让同机其他用户可读;Windows 忽略 mode,行为不变。
|
|
54
|
+
*/
|
|
55
|
+
export const PRIVATE_DIR_MODE = 0o700
|
|
56
|
+
export const PRIVATE_FILE_MODE = 0o600
|
|
57
|
+
|
|
58
|
+
function ensurePrivateDir(dir) {
|
|
59
|
+
mkdirSync(dir, { recursive: true, mode: PRIVATE_DIR_MODE })
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/** 写临时文件(0600)→ rename,避免读者看到半个 JSON */
|
|
63
|
+
function writePrivateJson(file, value) {
|
|
64
|
+
const tmp = file + '.tmp'
|
|
65
|
+
writeFileSync(tmp, JSON.stringify(value, null, 2), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
66
|
+
renameSync(tmp, file)
|
|
67
|
+
}
|
|
68
|
+
|
|
50
69
|
function defaultMachineId(env) {
|
|
51
70
|
const e = env || process.env
|
|
52
71
|
const host = e.COMPUTERNAME || e.HOSTNAME || e.HOST || 'unknown-host'
|
|
@@ -81,8 +100,8 @@ export function loadIdentity(opts) {
|
|
|
81
100
|
nameLocked: false,
|
|
82
101
|
}
|
|
83
102
|
try {
|
|
84
|
-
|
|
85
|
-
writeFileSync(file, JSON.stringify(id, null, 2), 'utf8')
|
|
103
|
+
ensurePrivateDir(dir)
|
|
104
|
+
writeFileSync(file, JSON.stringify(id, null, 2), { encoding: 'utf8', mode: PRIVATE_FILE_MODE })
|
|
86
105
|
} catch (e) { /* 只读环境:内存态继续工作 */ }
|
|
87
106
|
return id
|
|
88
107
|
}
|
|
@@ -91,11 +110,8 @@ export function saveIdentity(id, opts) {
|
|
|
91
110
|
const env = (opts && opts.env) || process.env
|
|
92
111
|
const dir = (opts && opts.dir) || dataDir(env)
|
|
93
112
|
try {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
const tmp = file + '.tmp'
|
|
97
|
-
writeFileSync(tmp, JSON.stringify(id, null, 2), 'utf8')
|
|
98
|
-
renameSync(tmp, file)
|
|
113
|
+
ensurePrivateDir(dir)
|
|
114
|
+
writePrivateJson(join(dir, 'device.json'), id)
|
|
99
115
|
return true
|
|
100
116
|
} catch (e) {
|
|
101
117
|
return false
|
|
@@ -222,11 +238,8 @@ export function readSyncState(storageDir) {
|
|
|
222
238
|
|
|
223
239
|
export function writeSyncState(storageDir, state) {
|
|
224
240
|
try {
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
const tmp = file + '.tmp'
|
|
228
|
-
writeFileSync(tmp, JSON.stringify(state, null, 2), 'utf8')
|
|
229
|
-
renameSync(tmp, file)
|
|
241
|
+
ensurePrivateDir(storageDir)
|
|
242
|
+
writePrivateJson(syncStatePath(storageDir), state)
|
|
230
243
|
return true
|
|
231
244
|
} catch (e) {
|
|
232
245
|
return false
|