dsh-lan-peers 0.7.3 → 0.7.4

package/host/server.mjs

@@ -96,7 +96,7 @@ import { parseArgs } from 'node:util';
 // ---------------------------------------------------------------------------
 
 /** 插件版本，用于 /v1/health.version */
-export const PLUGIN_VERSION = '0.7.3';
+export const PLUGIN_VERSION = '0.7.4';
 
 /** §4.1 允许的时钟偏移 */
 export const CLOCK_SKEW_MS = 60_000;
@@ -1095,10 +1095,16 @@ export class GroupStore {
     return name;
   }
 
-  /** 追加一条消息：seq = ++lastSeq（消息被删也不回收号） */
+  /**
+   * 追加一条消息（**单阶段写**：quorum:none、以及管理接口/面板的直写路径）。
+   * 取号必须避开 pending 已预留的空号：两阶段提交的提案先占住 lastSeq+1，
+   * 此时若再来一条直写也取 lastSeq+1，两条消息就会共用同一个 seq ——
+   * 客户端按 seq 去重，后一条会被静默丢弃。
+   */
   append({ peerId, name, kind, text = '', meta = {} }) {
     const data = this.#load();
-    const seq = Number(data.lastSeq) + 1;
+    const reserved = data.pending.reduce((max, entry) => Math.max(max, Number(entry?.seq) || 0), 0);
+    const seq = Math.max(Number(data.lastSeq) || 0, reserved) + 1;
     data.lastSeq = seq;
     const message = {
       seq,
@@ -3086,11 +3092,13 @@ export function createPeerServer(overrides = {}) {
     const id = String(peerId ?? '');
     if (id === '') return '';
     if (id === store.instanceId) return localAdvertiseBaseUrl();
-    const learned = String(peerBaseUrls.get(id) ?? '').trim().replace(/\/+$/, '');
-    if (learned !== '') return learned;
+    // 群成员表优先：它同样是成员自报的地址（hub 写 group.json / 成员写 group-key.json），
+    // 但它是**持久化且运维可见可覆盖**的那一份；学到的缓存只做兜底（两者来源相同，顺序不影响线上）。
     const fromGroup = String(localGroupContext()?.members?.[id]?.baseUrl ?? '')
       .trim().replace(/\/+$/, '');
     if (fromGroup !== '') return fromGroup;
+    const learned = String(peerBaseUrls.get(id) ?? '').trim().replace(/\/+$/, '');
+    if (learned !== '') return learned;
     const recorded = String(groupStore ? groupStore.state().members[id]?.baseUrl ?? '' : '')
       .trim().replace(/\/+$/, '');
     if (recorded !== '') return recorded;

package/host/test/group-commit.test.mjs

@@ -49,6 +49,8 @@ test('S3 majority：propose→commit 全链路，三台都可见且 commitSeq
   assert.equal(a.server.group.state().pendingCount, 0, '提交后 pending 必须清空');
 
   // 日志：一行 post、一行 commit、至少一次心跳；不含正文/密钥
+  // 心跳按 heartbeatMs（默认 120ms）广播，用例本身只要 ~200ms —— 必须**等事件**，不能靠时序。
+  await waitFor(() => lines.some((line) => line.startsWith('[group] heartbeat ')), { timeoutMs: 3_000 });
   const logText = lines.join('\n');
   assert.match(logText, /\[group\] post kind=chat seq=1 /);
   assert.match(logText, /\[group\] commit seq=1 /);
@@ -203,7 +205,8 @@ test('S3 seq 连续无重复：失败的提案不消耗号，恢复后重试拿
   assert.equal(first.status, 201);
   assert.equal(first.json.seq, 1);
 
-  // 把两台成员的地址改成打不通：只拿得到自己一票 → 503
+  // 把两台成员的地址改成打不通：只拿得到自己一票 → 503。
+  // 群成员表里的 baseUrl 是权威寻址（baseUrlOf 优先读它），所以这里改完立刻生效。
   const members = a.server.group.state().members;
   members[b.peerId].baseUrl = 'http://127.0.0.1:1';
   members[c.peerId].baseUrl = 'http://127.0.0.1:1';
@@ -264,6 +267,50 @@ test('S3 成员当 leader 且要求加密时：post 走 X-Peer-Enc 也能两阶
   // hub 侧靠 commit 转正（加密通道同理）
   await waitFor(() => a.server.group.history({ sinceSeq: 0 }).length === 1);
 });
+test('S3 取号闸门：pending 占着的号不会被单阶段写（面板/管理接口）复用', async (t) => {
+  const cluster = await startCluster(t, { count: 3, commitTimeoutMs: 2_000 });
+  const [a, b, c] = cluster.nodes;
+  // 黑洞：提案会一直挂在 pending 里，直到 commitTimeoutMs 才丢弃
+  const sockets = new Set();
+  const blackhole = net.createServer((socket) => {
+    sockets.add(socket);
+    socket.on('close', () => sockets.delete(socket));
+    socket.on('error', () => sockets.delete(socket));
+  });
+  await new Promise((resolve) => blackhole.listen(0, '127.0.0.1', resolve));
+  t.after(() => {
+    for (const socket of sockets) socket.destroy();
+    blackhole.close();
+  });
+  blackhole.unref();
+  const holeUrl = `http://127.0.0.1:${blackhole.address().port}`;
+  const members = a.server.group.state().members;
+  members[b.peerId].baseUrl = holeUrl;
+  members[c.peerId].baseUrl = holeUrl;
+
+  const inflight = postAs(a.baseUrl, b.peerId, { kind: 'chat', text: 'slow-proposal' });
+  await waitFor(() => a.server.group.state().pendingCount === 1, { timeoutMs: 1_500 });
+  const pendingSeq = a.server.group.state().lastSeq + 1;
+  assert.equal(a.server.group.state().lastSeq, 0, '提案未提交，lastSeq 不推进');
+
+  // 面板/管理接口走单阶段写（server.group.post → GroupStore.append）：必须避开 pending 占的号
+  const panel = a.server.group.post({ peerId: 'peer-panel', name: 'panel', kind: 'chat', text: 'panel-msg' });
+  assert.equal(panel.seq, pendingSeq + 1, '单阶段写不得复用 pending 占着的 seq');
+
+  const failed = await inflight;
+  assert.equal(failed.status, 503, failed.text);
+  assert.equal(a.server.group.state().pendingCount, 0, '超时后 pending 必须清空');
+
+  // 恢复可达后继续写：号必须继续往前走，且任何两条消息不共用 seq
+  members[b.peerId].baseUrl = b.baseUrl;
+  members[c.peerId].baseUrl = c.baseUrl;
+  const next = await postAs(a.baseUrl, b.peerId, { kind: 'chat', text: 'after-drop' });
+  assert.equal(next.status, 201, next.text);
+  assert.equal(next.json.seq, panel.seq + 1);
+  const seqs = a.server.group.history({ sinceSeq: 0 }).map((m) => m.seq);
+  assert.deepEqual(seqs, [panel.seq, panel.seq + 1]);
+  assert.equal(new Set(seqs).size, seqs.length, 'seq 不得重复（客户端按 seq 去重）');
+});
 test('S3 提交串行化：连续多条 post 的 seq 严格连续（并发下也不撞号）', async (t) => {
   const cluster = await startCluster(t, { count: 3 });
   const [a, b] = cluster.nodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-lan-peers",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "局域网 DSH 协同：一次性配对互认、HMAC 签名 + AES-256-GCM 加密、agent 互派任务",
   "type": "module",
   "main": "lib/index.js",