dsh-lan-peers 0.7.4 → 0.8.1

package/README.md

@@ -76,7 +76,7 @@ dsh plugin --profile web add dsh-lan-peers
     workspace: ~/.dsh/lan-peers/workspace   # 远端派单会话的工作目录
     allowRemotePrompts: false     # 默认关；打开后才接受别人的派单
     requireEncryption: true       # 默认开；旧版本对端会被拒绝
-    trustedCidrs: ["192.168.5.0/24"]  # 可选，限制来源网段
+    trustedCidrs: ["192.168.1.0/24"]  # 可选，限制来源网段
     agentPreset: standard
 ```
 
@@ -98,13 +98,13 @@ dsh plugin --profile web add dsh-lan-peers
 
 ## 配对
 
-**界面**：左下角 🔗 伙伴 → 「生成配对码」，把 6 位码给对方；对方在「添加伙伴」里填本机地址（如 `192.168.5.51:7788`）+ 码。两个方向各配一次，双方都能主动派单。
+**界面**：左下角 🔗 伙伴 → 「生成配对码」，把 6 位码给对方；对方在「添加伙伴」里填本机地址（如 `192.168.1.10:7788`）+ 码。两个方向各配一次，双方都能主动派单。
 
 **命令行**：
 
 ```bash
 npx dsh-lan-peers code  --state-dir ~/.dsh/lan-peers
-npx dsh-lan-peers pair  --url http://192.168.5.51:7788 --code 123456 --name my-nas
+npx dsh-lan-peers pair  --url http://192.168.1.10:7788 --code 123456 --name my-nas
 npx dsh-lan-peers peers --probe
 ```
 
@@ -112,12 +112,12 @@ npx dsh-lan-peers peers --probe
 
 模型侧（会话里直接说）：
 
-> 用 lan_peer_ask 问 fn-302：`/vol5/main` 下 `pwd` 输出什么？
+> 用 lan_peer_ask 问 my-nas：`/data/project` 下 `pwd` 输出什么？
 
 命令行：
 
 ```bash
-npx dsh-lan-peers ask --peer fn-302 "在 /vol5/main 执行 pwd" --timeout 120
+npx dsh-lan-peers ask --peer my-nas "在 /data/project 执行 pwd" --timeout 120
 ```
 
 对端会在自己的 `workspace` 里建真实会话、由对端模型执行，然后把最终回复加密回传。

package/client/cli-archives.test.mjs

@@ -0,0 +1,134 @@
+// dsh-lan-peers · v0.8.0-β（DESIGN §18.2）CLI：group archives / group archive-delete。
+//
+// 两个子命令都只打本机回环的 hub 管理接口（/api/lan-peers/group/archives），
+// 所以这里起一个只实现这两条路由的 node:http 桩，真跑 cli.mjs 子进程，
+// 断言请求形状、stdout 文案与退出码（403/409 归「现在做不了」，其余算失败）。
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import http from 'node:http';
+import { execFile } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { makeTempStateDir } from '../host/test/helpers.mjs';
+
+const CLI = path.join(path.dirname(fileURLToPath(import.meta.url)), 'cli.mjs');
+const MB = 1024 * 1024;
+
+function runAsync(args) {
+  return new Promise((resolve) => {
+    execFile(process.execPath, [CLI, ...args], { encoding: 'utf8' }, (error, stdout, stderr) => {
+      resolve({ status: error ? error.code : 0, stdout, stderr });
+    });
+  });
+}
+
+/** 起一个只实现 group/archives 的管理接口桩；handler 决定状态码与响应体。 */
+async function startAdmin(t, handler) {
+  const seen = [];
+  const server = http.createServer((req, res) => {
+    let raw = '';
+    req.on('data', (chunk) => { raw += chunk; });
+    req.on('end', () => {
+      const body = raw === '' ? null : JSON.parse(raw);
+      const call = { method: req.method, url: req.url, body };
+      seen.push(call);
+      const reply = handler(call) ?? {};
+      res.writeHead(reply.status ?? 200, { 'Content-Type': 'application/json' });
+      res.end(JSON.stringify(reply.body ?? {}));
+    });
+  });
+  const port = await new Promise((resolve) => {
+    server.listen(0, '127.0.0.1', () => resolve(server.address().port));
+  });
+  t.after(() => new Promise((resolve) => { server.close(() => resolve()); }));
+  const dir = makeTempStateDir('dsh-lan-peers-cli-archives-');
+  t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
+  return { seen, url: 'http://127.0.0.1:' + port, dir };
+}
+
+const ARCHIVES = [
+  { file: '101-400.json', fromSeq: 101, toSeq: 400, count: 300, bytes: 12 * MB, createdAt: 1_700_000_000_000 },
+  { file: '1-100.json', fromSeq: 1, toSeq: 100, count: 100, bytes: 9 * MB, createdAt: 1_600_000_000_000 },
+];
+
+test('group archives：逐行打印文件名 / seq 区间 / 条数 / 体积 / 时间，末行汇总', async (t) => {
+  const admin = await startAdmin(t, () => ({ body: { archives: ARCHIVES, totalBytes: 21 * MB } }));
+  const out = await runAsync(['group', 'archives', '--url', admin.url, '--state-dir', admin.dir]);
+  assert.equal(out.status, 0, out.stderr);
+  const lines = out.stdout.trim().split('\n');
+  assert.equal(lines.length, 2);
+  assert.match(lines[0], /^101-400\.json\tseq 101-400\t300 条\t12582912B\t1700000000000$/);
+  assert.match(lines[1], /^1-100\.json\tseq 1-100\t100 条\t9437184B\t1600000000000$/);
+  assert.match(out.stderr, /共 2 个归档 · 22020096 字节/);
+
+  assert.equal(admin.seen.length, 1);
+  assert.equal(admin.seen[0].method, 'GET');
+  assert.equal(admin.seen[0].url, '/api/lan-peers/group/archives');
+});
+
+test('group archives：没有归档时给一行说明，不打印空表头', async (t) => {
+  const admin = await startAdmin(t, () => ({ body: { archives: [], totalBytes: 0 } }));
+  const out = await runAsync(['group', 'archives', '--url', admin.url, '--state-dir', admin.dir]);
+  assert.equal(out.status, 0, out.stderr);
+  assert.equal(out.stdout.trim(), '没有归档（hub 侧还没有归档文件）');
+  assert.equal(out.stderr, '');
+});
+
+test('group archives：非 hub（403）按「现在做不了」退出 2，未启用（409）同理', async (t) => {
+  const forbidden = await startAdmin(t, () => ({ status: 403, body: { error: 'hub-only' } }));
+  const out403 = await runAsync(['group', 'archives', '--url', forbidden.url, '--state-dir', forbidden.dir]);
+  assert.equal(out403.status, 2);
+  assert.match(out403.stderr, /归档操作失败: 403 hub-only/);
+
+  const disabled = await startAdmin(t, () => ({ status: 409, body: { error: 'group-disabled' } }));
+  const out409 = await runAsync(['group', 'archives', '--url', disabled.url, '--state-dir', disabled.dir]);
+  assert.equal(out409.status, 2);
+  assert.match(out409.stderr, /409 group-disabled/);
+});
+
+test('group archives：门面未接线（501）如实报错并退出 1', async (t) => {
+  const admin = await startAdmin(t, () => ({ status: 501, body: { error: 'archives-unsupported' } }));
+  const out = await runAsync(['group', 'archives', '--url', admin.url, '--state-dir', admin.dir]);
+  assert.equal(out.status, 1);
+  assert.match(out.stderr, /归档操作失败: 501 archives-unsupported/);
+  assert.equal(out.stdout, '');
+});
+
+test('group archive-delete：POST { file, action:"delete" } 并打印释放的字节', async (t) => {
+  const admin = await startAdmin(t, () => ({ body: { ok: true, removedBytes: 12 * MB } }));
+  const out = await runAsync(['group', 'archive-delete', '101-400.json', '--url', admin.url, '--state-dir', admin.dir]);
+  assert.equal(out.status, 0, out.stderr);
+  assert.equal(out.stdout.trim(), '已删除归档 101-400.json，释放 12582912 字节');
+  assert.equal(admin.seen.length, 1);
+  assert.equal(admin.seen[0].method, 'POST');
+  assert.equal(admin.seen[0].url, '/api/lan-peers/group/archives');
+  assert.deepEqual(admin.seen[0].body, { file: '101-400.json', action: 'delete' });
+});
+
+test('group archive-delete：未知归档（404）退出 1，权限失败（403）退出 2', async (t) => {
+  const unknown = await startAdmin(t, () => ({ status: 404, body: { error: 'unknown-archive' } }));
+  const out404 = await runAsync(['group', 'archive-delete', 'nope.json', '--url', unknown.url, '--state-dir', unknown.dir]);
+  assert.equal(out404.status, 1);
+  assert.match(out404.stderr, /归档操作失败: 404 unknown-archive/);
+
+  const forbidden = await startAdmin(t, () => ({ status: 403, body: { error: 'hub-only' } }));
+  const out403 = await runAsync(['group', 'archive-delete', '1-100.json', '--url', forbidden.url, '--state-dir', forbidden.dir]);
+  assert.equal(out403.status, 2);
+  assert.match(out403.stderr, /403 hub-only/);
+});
+
+test('group archive-delete：缺文件名直接报用法，不发请求', async (t) => {
+  const admin = await startAdmin(t, () => ({ body: { ok: true, removedBytes: 0 } }));
+  const out = await runAsync(['group', 'archive-delete', '--url', admin.url, '--state-dir', admin.dir]);
+  assert.equal(out.status, 1);
+  assert.match(out.stderr, /用法: dsh-lan-peers group archive-delete <file>/);
+  assert.equal(admin.seen.length, 0);
+});
+
+test('group help：两个归档子命令都出现在帮助里', async () => {
+  const out = await runAsync(['group', 'help']);
+  assert.equal(out.status, 0);
+  assert.match(out.stdout, /archives\s+列出 hub 侧归档文件/);
+  assert.match(out.stdout, /archive-delete <file>\s+删除一个归档文件/);
+});

package/client/cli-group.test.mjs

@@ -185,10 +185,10 @@ test('group join --name 只改自己；两个同名节点在 state / history 里
   const dirB = memberStateDir(t, { baseUrl: hub.baseUrl, hubInstanceId: hubId, identity: peerB });
 
   // 两台机器的默认主机名相同（真机现场就是这个现象）
-  const joinedA = await runAsync(['group', 'join', '--name', 'PW-NEW22G6LR3', '--peer', 'hub', '--state-dir', dirA]);
+  const joinedA = await runAsync(['group', 'join', '--name', 'desk-alpha', '--peer', 'hub', '--state-dir', dirA]);
   assert.equal(joinedA.status, 0, joinedA.stderr);
-  assert.match(joinedA.stdout, /显示名=PW-NEW22G6LR3/);
-  const joinedB = await runAsync(['group', 'join', '--name', 'PW-NEW22G6LR3', '--peer', 'hub', '--state-dir', dirB]);
+  assert.match(joinedA.stdout, /显示名=desk-alpha/);
+  const joinedB = await runAsync(['group', 'join', '--name', 'desk-alpha', '--peer', 'hub', '--state-dir', dirB]);
   assert.equal(joinedB.status, 0, joinedB.stderr);
 
   // 不传 --name 再 join 不会把名字抹掉
@@ -197,20 +197,20 @@ test('group join --name 只改自己；两个同名节点在 state / history 里
 
   const state = await runAsync(['group', 'state', '--peer', 'hub', '--state-dir', dirA]);
   assert.equal(state.status, 0, state.stderr);
-  assert.match(state.stdout, /PW-NEW22G6LR3 \(peer-cli\)/, '同名成员要带短 id 后缀');
-  assert.match(state.stdout, /PW-NEW22G6LR3 \(bbbbbbbb\)/);
+  assert.match(state.stdout, /desk-alpha \(peer-cli\)/, '同名成员要带短 id 后缀');
+  assert.match(state.stdout, /desk-alpha \(bbbbbbbb\)/);
 
   await runAsync(['group', 'post', '--text', 'A 说的', '--peer', 'hub', '--state-dir', dirA]);
   await runAsync(['group', 'post', '--text', 'B 说的', '--peer', 'hub', '--state-dir', dirB]);
   const history = await runAsync(['group', 'history', '--peer', 'hub', '--state-dir', dirA]);
   assert.equal(history.status, 0, history.stderr);
-  assert.match(history.stdout, /PW-NEW22G6LR3 \(peer-cli\) \[chat\] A 说的/, 'history 的 from.name 也要能区分');
-  assert.match(history.stdout, /PW-NEW22G6LR3 \(bbbbbbbb\) \[chat\] B 说的/);
+  assert.match(history.stdout, /desk-alpha \(peer-cli\) \[chat\] A 说的/, 'history 的 from.name 也要能区分');
+  assert.match(history.stdout, /desk-alpha \(bbbbbbbb\) \[chat\] B 说的/);
 
   // hub 侧存的仍是原始 name（渲染层才加后缀）
   const raw = JSON.parse(fs.readFileSync(path.join(hub.stateDir, 'group.json'), 'utf8'));
-  assert.equal(raw.members[MEMBER.peerId].name, 'PW-NEW22G6LR3');
-  assert.equal(raw.members[peerB.peerId].name, 'PW-NEW22G6LR3');
+  assert.equal(raw.members[MEMBER.peerId].name, 'desk-alpha');
+  assert.equal(raw.members[peerB.peerId].name, 'desk-alpha');
 
   // 空 --name 直接拒绝
   const empty = await runAsync(['group', 'join', '--name', '', '--peer', 'hub', '--state-dir', dirA]);