@dshtrading/watchlist 0.6.1 → 0.6.2

package/lib/file-store.js

@@ -1,54 +1,59 @@
 import { WATCHLIST_SEEDS } from "./seeds.js";
 import { newWatchlistGroupId, normalizeWatchlistRow } from "./index.js";
-import { transactStore } from "@dshtrading/dsh-home";
-import { readFile } from "node:fs/promises";
+import { createRecordStoreAdapter, readStoreText } from "@dshtrading/dsh-home";
 //#region src/file-store.ts
 /**
 * 文件持久化版自选/选中 store（Node.js 宿主侧使用，issue #32 规格）。
 *
-* 写路径经 `@dshtrading/dsh-home` 的 {@link transactStore}——跨进程排他锁 + 锁内
-* 新鲜读盘 + 原子写（2026-10-09 多进程互相覆盖事故修复）：桌面端与 CLI 各写一行时
-* 双方都留在盘上，不再互相抹掉（此前是内存缓存 + 整表回写）。进程内的 enqueue 串行化
-* 保留（它保证同一进程内的读改写顺序），跨进程部分由锁承担。
+* 读写骨架经 `@dshtrading/dsh-home` 的 {@link createRecordStoreAdapter}——跨进程排他锁 +
+* 锁内新鲜读盘 + 原子写 + 落盘成功后才发布缓存（2026-10-09 多进程互相覆盖事故修复）：
+* 桌面端与 CLI 各写一行时双方都留在盘上，不再互相抹掉（此前是内存缓存 + 整表回写）。
+* 进程内的 enqueue 串行化保留（它保证同一进程内的读改写顺序），跨进程部分由锁承担。
+*
+* 本文件是「多文件形态」的自选域：成员关系（本文件）、分组注册表（容器包裹）与选中
+* 记录（非整表对象）各建一个适配器，读写形态互不共享。
 */
 const LOG_PREFIX = "[dsh-trading/watchlist] failed to atomic flush watchlists to";
 function createFileWatchlistStore(filePath) {
-	let cache = null;
 	let pendingWrite = Promise.resolve();
 	const enqueue = (fn) => {
 		const next = pendingWrite.then(fn, fn);
 		pendingWrite = next.then(() => {}, () => {});
 		return next;
 	};
-	/** 新鲜读盘（坏 JSON/非对象按空表）；供 load 与锁内重读共用。 */
-	async function readFromDisk() {
+	/** 读盘/解析失败的日志前缀（坏 JSON 与非 ENOENT 读失败同一条，与既有 load 口径逐字一致）。 */
+	const READ_FAILED = `[dsh-trading/watchlist] failed to read watchlists from ${filePath}:`;
+	/** 文本 → 市场表：坏 JSON / 非对象降级空表，其余（含数组）静默丢弃（不外包）。 */
+	function decode(text) {
+		if (text === void 0) return {};
 		try {
-			const content = await readFile(filePath, "utf8");
-			const parsed = JSON.parse(content);
+			const parsed = JSON.parse(text);
 			return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
 		} catch (err) {
-			if (err?.code !== "ENOENT") console.error(`[dsh-trading/watchlist] failed to read watchlists from ${filePath}:`, err);
+			console.error(READ_FAILED, err);
 			return {};
 		}
 	}
-	async function load() {
-		if (cache !== null) return cache;
-		cache = await readFromDisk();
-		return cache;
-	}
+	const store = createRecordStoreAdapter({
+		filePath,
+		logPrefix: LOG_PREFIX,
+		readFromDisk: () => readStoreText(filePath, READ_FAILED),
+		decode,
+		encode: (map) => map
+	});
 	return {
 		async list() {
-			return { ...await load() };
+			return { ...await store.load() };
 		},
 		async save(next) {
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, () => ({ ...next }), (map) => map, LOG_PREFIX);
+				await store.commit(() => ({ ...next }));
 			});
 		},
 		async add(market, instrument) {
 			let added = false;
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, (onDisk) => {
+				await store.commit((onDisk) => {
 					const rows = onDisk[market] ?? [];
 					if (rows.some((row) => row.symbol === instrument.symbol)) return onDisk;
 					added = true;
@@ -56,14 +61,14 @@ function createFileWatchlistStore(filePath) {
 						...onDisk,
 						[market]: [...rows, normalizeWatchlistRow(instrument)]
 					};
-				}, (map) => map, LOG_PREFIX);
+				});
 			});
 			return added;
 		},
 		async remove(market, symbol) {
 			let removed = false;
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, (onDisk) => {
+				await store.commit((onDisk) => {
 					const existing = onDisk[market];
 					const rows = Array.isArray(existing) ? existing : WATCHLIST_SEEDS[market] ?? [];
 					const nextRows = rows.filter((row) => row.symbol !== symbol);
@@ -73,14 +78,14 @@ function createFileWatchlistStore(filePath) {
 						...onDisk,
 						[market]: nextRows
 					};
-				}, (map) => map, LOG_PREFIX);
+				});
 			});
 			return removed;
 		},
 		async assignGroup(market, symbol, groupId, member) {
 			let assigned = false;
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, (onDisk) => {
+				await store.commit((onDisk) => {
 					const rows = onDisk[market];
 					if (!Array.isArray(rows)) return onDisk;
 					const index = rows.findIndex((row) => row.symbol === symbol);
@@ -104,14 +109,14 @@ function createFileWatchlistStore(filePath) {
 						...onDisk,
 						[market]: nextRows
 					};
-				}, (map) => map, LOG_PREFIX);
+				});
 			});
 			return assigned;
 		},
 		async stripGroup(groupId) {
 			let cleaned = 0;
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, (onDisk) => {
+				await store.commit((onDisk) => {
 					const next = {};
 					for (const [market, rows] of Object.entries(onDisk)) {
 						if (!Array.isArray(rows)) continue;
@@ -134,45 +139,49 @@ function createFileWatchlistStore(filePath) {
 						next[market] = changed ? nextRows : rows;
 					}
 					return cleaned > 0 ? next : onDisk;
-				}, (map) => map, LOG_PREFIX);
+				});
 			});
 			return cleaned;
 		}
 	};
 }
 function createFileWatchlistGroupsStore(filePath) {
-	let cache = null;
 	let pendingWrite = Promise.resolve();
 	const enqueue = (fn) => {
 		const next = pendingWrite.then(fn, fn);
 		pendingWrite = next.then(() => {}, () => {});
 		return next;
 	};
-	/** 新鲜读盘（容器包裹；坏形过滤）；供 load 与锁内重读共用。 */
-	async function readFromDisk() {
+	/** 读盘/解析失败的日志前缀（坏 JSON 与非 ENOENT 读失败同一条，与既有 load 口径逐字一致）。 */
+	const READ_FAILED = `[dsh-trading/watchlist] failed to read watchlist groups from ${filePath}:`;
+	/** 文本 → 分组表：容器包裹（`{ groups: [] }`）逐条过滤形状；坏 JSON 降级空表并打日志。 */
+	function decode(text) {
+		if (text === void 0) return [];
 		try {
-			const content = await readFile(filePath, "utf8");
-			const parsed = JSON.parse(content);
+			const parsed = JSON.parse(text);
 			return Array.isArray(parsed.groups) ? parsed.groups.filter((group) => typeof group === "object" && group !== null && typeof group.id === "string" && group.id !== "" && typeof group.name === "string") : [];
 		} catch (err) {
-			if (err?.code !== "ENOENT") console.error(`[dsh-trading/watchlist] failed to read watchlist groups from ${filePath}:`, err);
+			console.error(READ_FAILED, err);
 			return [];
 		}
 	}
-	async function load() {
-		if (cache !== null) return cache;
-		cache = await readFromDisk();
-		return cache;
-	}
-	const serialize = (groups) => ({ groups });
-	/** 跨进程读改写；返回 null 表示无变化（不落盘），缓存仍取锁内新鲜值。 */
+	const store = createRecordStoreAdapter({
+		filePath,
+		logPrefix: LOG_PREFIX,
+		readFromDisk: () => readStoreText(filePath, READ_FAILED),
+		decode,
+		encode: (groups) => ({ groups })
+	});
+	/**
+	* 跨进程读改写；mutate 返回 null 表示无变化（不落盘），缓存仍取锁内新鲜值。
+	* 返回 null 是分组工具的既有写法，逐字保留。
+	*/
 	async function commit(mutate) {
-		cache = await transactStore(filePath, readFromDisk, (onDisk) => mutate(onDisk) ?? onDisk, serialize, LOG_PREFIX);
-		return cache;
+		return store.commit((onDisk) => mutate(onDisk) ?? onDisk);
 	}
 	return {
 		async list() {
-			return [...await load()];
+			return [...await store.load()];
 		},
 		async create(name) {
 			let result;
@@ -233,37 +242,40 @@ function createFileWatchlistGroupsStore(filePath) {
 	};
 }
 function createFileSelectionStore(filePath) {
-	let cache = null;
 	let pendingWrite = Promise.resolve();
 	const enqueue = (fn) => {
 		const next = pendingWrite.then(fn, fn);
 		pendingWrite = next.then(() => {}, () => {});
 		return next;
 	};
-	/** 新鲜读盘（坏形按空选中）；供 load 与锁内重读共用。 */
-	async function readFromDisk() {
+	/** 读盘/解析失败的日志前缀（坏 JSON 与非 ENOENT 读失败同一条，与既有 load 口径逐字一致）。 */
+	const READ_FAILED = `[dsh-trading/watchlist] failed to read selection from ${filePath}:`;
+	/** 文本 → 选中记录：坏形按空选中；只取 instrument 一个键（其它键不落回）。 */
+	function decode(text) {
+		if (text === void 0) return { instrument: null };
 		try {
-			const content = await readFile(filePath, "utf8");
-			const parsed = JSON.parse(content);
+			const parsed = JSON.parse(text);
 			return parsed !== null && typeof parsed === "object" ? { instrument: parsed.instrument ?? null } : { instrument: null };
 		} catch (err) {
-			if (err?.code !== "ENOENT") console.error(`[dsh-trading/watchlist] failed to read selection from ${filePath}:`, err);
+			console.error(READ_FAILED, err);
 			return { instrument: null };
 		}
 	}
-	async function load() {
-		if (cache !== null) return cache;
-		cache = await readFromDisk();
-		return cache;
-	}
+	const store = createRecordStoreAdapter({
+		filePath,
+		logPrefix: LOG_PREFIX,
+		readFromDisk: () => readStoreText(filePath, READ_FAILED),
+		decode,
+		encode: (value) => value
+	});
 	return {
 		async get() {
-			const record = await load();
+			const record = await store.load();
 			return { instrument: record.instrument === null ? null : { ...record.instrument } };
 		},
 		async set(record) {
 			await enqueue(async () => {
-				cache = await transactStore(filePath, readFromDisk, () => ({ instrument: record.instrument === null ? null : { ...record.instrument } }), (value) => value, LOG_PREFIX);
+				await store.commit(() => ({ instrument: record.instrument === null ? null : { ...record.instrument } }));
 			});
 		}
 	};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dshtrading/watchlist",
   "description": "Host-side watchlist + selection stores for dsh-trading: multi-list file store (~/.dsh/watchlists.json), selection store (~/.dsh/selection.json), and cross-market watchlist_* tools (watchlist_list/add/remove/select) on the host plane",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -21,12 +21,12 @@
   ],
   "license": "PolyForm-Noncommercial-1.0.0",
   "dependencies": {
-    "@dshtrading/api": "^0.6.1",
-    "@dshtrading/dsh-home": "^0.6.1"
+    "@dshtrading/dsh-home": "^0.6.2",
+    "@dshtrading/api": "^0.6.2"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": ">=4.0.0",
-    "@deepseek-ai/dsh-tools": ">=0.2.0-rc.2"
+    "@deepseek-ai/dsh-tools": ">=0.2.1-rc.2"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",