From 05675988518d8e25652f424c3317828c584b2912 Mon Sep 17 00:00:00 2001 From: qinqiu <2186498057@qq.com> Date: Tue, 17 Nov 2026 15:24:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore(secrets):=20=E6=B8=85=E6=8E=89?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=87=8C=E7=9A=84=E7=9C=9F=E5=AE=9E=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E6=A0=87=E8=AF=86=E7=AC=A6=EF=BC=88=E5=AD=98=E9=87=8F?= =?UTF-8?q?=E6=B8=85=E7=90=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 扫出的 64 处真实标识符全部处理: - 16 个测试夹具(39 处):真实 uid / QQ 号 → 明显假的占位符 (7000000000000000001 / 7100000000000000001 / 12345678,长度形态不变、断言逻辑不变) - lib/gateway.js(3 处注释):真值示例 → 通用示例 - scripts/fix-douyin-master-split.mjs(1 处注释):真值 → 说明性占位 - CHANGELOG.md(2 处):改成「77…0000 / 77…5169」保留「末位被抹平」语义 顺带修了 check-secrets.mjs 的一个设计缺陷: 原来它扫**文件系统**(含 gitignore 的本地文件 docs/handoff.md / history/), 那些文件不进仓库、不该被拦也不该占 baseline。 改成只扫 git 视角(ls-files + --others --exclude-standard)。 结果:存量 0 处 / 新增 0 处,baseline 清空。 验证: - 16 个清理过的测试套件全绿 - smoke / startup-gate / client-lint / client-panels / 四个静态检查全绿 - CHANGELOG 6 个版本头完好(发版脚本靠它们取正文) - 红验证:造含真值的新文件 → 仍被拦 - 所有改动文件 node --check 通过 --- CHANGELOG.md | 2 +- lib/gateway.js | 6 ++--- scripts/fix-douyin-master-split.mjs | 2 +- test/check-secrets.baseline.txt | 32 --------------------------- test/check-secrets.mjs | 32 +++++++++++++-------------- test/douyin-conversation.mjs | 2 +- test/douyin-identity-e2e.mjs | 2 +- test/douyin-inbox-contract.mjs | 2 +- test/douyin-inbox-diag.mjs | 2 +- test/douyin-master-person-merge.mjs | 6 ++--- test/douyin-master-uid-mismatch.mjs | 14 ++++++------ test/douyin-master-uid.mjs | 8 +++---- test/douyin-poll-and-timer-safety.mjs | 2 +- test/douyin-push-drop.mjs | 2 +- test/douyin-read-fail-retry.mjs | 2 +- test/douyin-stranger-dm.mjs | 2 +- test/douyin-uid-binding.mjs | 2 +- test/leftover-edge-cases.mjs | 8 +++---- test/master-qq-uin-rebind.mjs | 2 +- test/shared-session.mjs | 14 ++++++------ test/smoke-social.mjs | 2 +- 21 files changed, 57 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df3ad70..97d6960 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,7 +98,7 @@ - **「人物关系全是乱的,经常把别人的影响加到其他人身上」** —— 三个根因叠加,都用真机库(`~/.dsh/fish-soul/soul.db`)查证过: - **① 署名叫不出人名时回退到「当前聊天对象」**:`soul-memory.js` 的 `ChatDigester.run()` 里 `ownerOfName(who) ?? single`。私聊里她整理出一条关于**第三者**的记忆("我朋友小明在准备考研"),`小明` 在库里查不到 ⇒ 落到聊天对象名下。`people[]`(**好感的唯一入口**)那条更狠:加的是聊天对象的好感。现在:**空署名**才回退(模型没写名字,这一轮只有一个人在说话);**有署名但查不到 = 第三者 ⇒ 这条不记**。宁可漏记,不可记错人 —— 记错人会一直被人当真。`summary` 那条 episode 不动(它的语义本来就是「这段聊天的小结属于聊天对象」)。 - **② 同一个人被拆成多行 person**:`person.douyin_uid` 一列历史上混着**四种写法** —— `douyin:`(会话身份)、`uid:`(群聊老格式)、**裸昵称**、**逗号拼接的名字**(真机里真有 `Re., 未云, 云` 这种)。而认人是按这一列**精确匹配** ⇒ 换个写法就是「新的人」⇒ 每人各记一套好感 / 印象 / 记忆。现在 `normalizeDouyinIdentity()` 统一成 `douyin:<数字uid>`(裸昵称原样保留 —— 还原不出 uid,同一个名字还是同一个人,但不能硬套到某个 uid 上);`mergeDouyinTwinRows()` 把库里已有的「另一种写法」并成一行(记忆 / 互动次数跟着走,只并只挂这一个平台的行 —— 挂着 QQ / B站 号的是真人身份,不动);`cleanupMergedDouyinNames()` 清掉逗号拼接的脏身份(**只清理不合并**:那种行对应的是好几个人,并到谁头上都是把别人的往来记到他头上)。 - - **③ 19 位 uid 被 `Number()` 截断**:抖音 uid 是 19 位、超过 `Number.MAX_SAFE_INTEGER`,过一次 Number 末位就没了(真机脏值 `7702399256389125000` 与 `Number('7702399256389125169')` **逐位吻合**)。**来源是设置页输入框 placeholder 和报错文案里的示例 uid** —— 用户从会话里拷 uid 时照着示例填,就把截断值填进了配置。现在示例里的具体数字已删掉,改成「你的抖音数字 uid」;归一化全程走正则、不经过 Number。 + - **③ 19 位 uid 被 `Number()` 截断**:抖音 uid 是 19 位、超过 `Number.MAX_SAFE_INTEGER`,过一次 Number 末位就没了(真机脏值 `77…0000` 与 `Number('77…5169')` **末位被抹平、逐位吻合**)。**来源是设置页输入框 placeholder 和报错文案里的示例 uid** —— 用户从会话里拷 uid 时照着示例填,就把截断值填进了配置。现在示例里的具体数字已删掉,改成「你的抖音数字 uid」;归一化全程走正则、不经过 Number。 - **「抖音能看到消息,但读会话拿不到 convId」** —— 根因不是抓不到,是**取事件用错了坐标系**:`browser.mjs` 的 `events` 有 800 上限(超了 `splice(0,400)`),`goto()` 还会整个清空;而调用方把 `browser.events.length` 当游标存起来,`imResponses` 用 `slice(since)` 取「游标之后」的事件 ⇒ 两种情况下长度快照都跟数组下标脱钩,**会话接口的响应明明在缓冲里却被静默漏掉**。后果链:`captureImBodies` 恒空 → `pickMessages` 无数据 → 解不出 convId → `readConversation` 判「会话身份缺失」拒绝处理 → 面板显示读取失败,而主人明明能在抖音里看到消息。现在每个事件带**单调递增序号**(`browser.seq` / `msg.__seq`,只增不减),新增 `eventsSince()` / `eventCursorOf()` 两个游标原语,6 处调用点全部换掉。 - 白盒复现(真 `Browser` + `handleMessage` 灌事件):裁剪 / 重置两场景命中 **0**,正常 1;修好后 1/1/1。 - ⚠️ 推送路改游标时踩过一坑:没有 `eventCursor` 的假 browser(测试手造的)必须**原样**走老的 `indexOf` 语义 —— 「锚点被裁掉时 indexOf 返回 -1 ⇒ 从头重扫」是有测试守着的契约(`test/douyin-read-cache.mjs`),换成长度就把它打挂了。 diff --git a/lib/gateway.js b/lib/gateway.js index aebd195..6d3900f 100644 --- a/lib/gateway.js +++ b/lib/gateway.js @@ -384,11 +384,11 @@ export class ChatGateway { * 昵称可以随便改,只拿昵称当身份 ⇒ 任何人改名就能读/写别人的私聊会话 * (真机验证过,PR #96 原版确实能并进去)。 * - * 但主人习惯在设置页写「昵称 = QQ 号」(真机就是 `未云=3630958828`)。 + * 但主人习惯在设置页写「昵称 = QQ 号」(比如填 `某个昵称=12345678` 这种)。 * 所以这里做成**两级**: * - * ① **数字 uid 对应表**(`2874562949425280=3630958828`)—— 直接认,最硬; - * ② **昵称对应表**(`未云=3630958828`)—— 只用来**定位候选**, + * ① **数字 uid 对应表**(`1234567890123456=12345678`)—— 直接认,最硬; + * ② **昵称对应表**(`某个昵称=12345678`)—— 只用来**定位候选**, * 还必须拿到这个会话的**真实 uid**,且该 uid 已在**绑定表**里被确认过 * (`douyin.uin.` → QQ 号)。 * diff --git a/scripts/fix-douyin-master-split.mjs b/scripts/fix-douyin-master-split.mjs index 57a1671..fd59c8b 100644 --- a/scripts/fix-douyin-master-split.mjs +++ b/scripts/fix-douyin-master-split.mjs @@ -4,7 +4,7 @@ // ① master 行同时挂 QQ + B站,但没挂抖音 ⇒ 主人的抖音消息被建成独立 person 行 ⇒ // 「抖音的记忆跟 QQ/B站 分开」。根因是 `douyin.masterUid` 是空的:认人走 // `resolveOrCreatePlatformPerson({ masterId: cfg.masterUid || '' })`,空就认不出主人。 -// ② `person.douyin_uid` 里混着裸昵称(`Re.`)和截断 uid(`uid:7702399256389125000`), +// ② `person.douyin_uid` 里混着裸昵称(`Re.`)和截断 uid(`uid:<被 Number 抹平的 19 位数字>`), // 而认人按这一列精确匹配 ⇒ 同一个人的不同写法各占一行。 // // 用法:node scripts/fix-douyin-master-split.mjs [--dry-run] diff --git a/test/check-secrets.baseline.txt b/test/check-secrets.baseline.txt index 0b5bc5c..e69de29 100644 --- a/test/check-secrets.baseline.txt +++ b/test/check-secrets.baseline.txt @@ -1,32 +0,0 @@ -CHANGELOG.md 72b75cbde2cc73ef -CHANGELOG.md f45897f1b90c4e18 -docs/handoff.md 5dd6571f762b5f39 -docs/handoff.md 72b75cbde2cc73ef -docs/handoff.md f45897f1b90c4e18 -history/2026-11.md 5dd6571f762b5f39 -history/2026-11.md ffd02f553314b7f4 -lib/gateway.js 5dd6571f762b5f39 -lib/gateway.js ffd02f553314b7f4 -scripts/fix-douyin-master-split.mjs f45897f1b90c4e18 -scripts/parse-uid-precise.mjs 72b75cbde2cc73ef -scripts/parse-uid-precise.mjs f45897f1b90c4e18 -test/douyin-conversation.mjs f45897f1b90c4e18 -test/douyin-identity-e2e.mjs f45897f1b90c4e18 -test/douyin-inbox-contract.mjs f45897f1b90c4e18 -test/douyin-inbox-diag.mjs f45897f1b90c4e18 -test/douyin-master-person-merge.mjs 5dd6571f762b5f39 -test/douyin-master-person-merge.mjs ffd02f553314b7f4 -test/douyin-master-uid-mismatch.mjs 5dd6571f762b5f39 -test/douyin-master-uid.mjs f45897f1b90c4e18 -test/douyin-master-uid.mjs ffd02f553314b7f4 -test/douyin-poll-and-timer-safety.mjs f45897f1b90c4e18 -test/douyin-push-drop.mjs f45897f1b90c4e18 -test/douyin-read-fail-retry.mjs f45897f1b90c4e18 -test/douyin-stranger-dm.mjs 5dd6571f762b5f39 -test/douyin-uid-binding.mjs f45897f1b90c4e18 -test/leftover-edge-cases.mjs 5dd6571f762b5f39 -test/leftover-edge-cases.mjs 72b75cbde2cc73ef -test/master-qq-uin-rebind.mjs ffd02f553314b7f4 -test/shared-session.mjs f45897f1b90c4e18 -test/shared-session.mjs ffd02f553314b7f4 -test/smoke-social.mjs f45897f1b90c4e18 diff --git a/test/check-secrets.mjs b/test/check-secrets.mjs index 4dbb11d..a277d2a 100644 --- a/test/check-secrets.mjs +++ b/test/check-secrets.mjs @@ -14,8 +14,9 @@ */ import assert from 'node:assert/strict'; import { createHash } from 'node:crypto'; -import { readFileSync, existsSync, readdirSync, statSync } from 'node:fs'; -import { join, relative } from 'node:path'; +import { spawnSync } from 'node:child_process'; +import { readFileSync, existsSync } from 'node:fs'; +import { join } from 'node:path'; const root = join(import.meta.dirname, '..'); const h = (s) => createHash('sha256').update(s).digest('hex').slice(0, 16); @@ -42,25 +43,24 @@ if (existsSync(BASELINE_FILE)) { } } -// ── 收集要扫的文件:常见源码后缀(跳过 node_modules / .git / 探针目录 / 快照) -const SKIP_DIRS = new Set(['node_modules', '.git', '.alma-snapshots', 'probe-scratch', 'probe-group', 'probe-gid', 'probe-group-uid', 'probe-webp-tmp', '.benchmark']); +// ── 收集要扫的文件:**只扫会被提交的文件**。 +// 判据是 git 的视角,不是文件系统的视角: +// `git ls-files` = 已跟踪 +// `git ls-files -o --exclude-standard` = 未跟踪但没被忽略(即将提交的) +// gitignore 的本地文件(docs/handoff.md、history/、探针脚本)不进仓库 ⇒ 不扫、不拦、不占 baseline。 const SCAN_EXT = /\.(mjs|js|json|md|yml|yaml|txt|css|html|sh)$/; -function walk(dir, out = []) { - for (const name of readdirSync(dir)) { - if (SKIP_DIRS.has(name)) continue; - const full = join(dir, name); - let st; - try { st = statSync(full); } catch { continue; } - if (st.isDirectory()) walk(full, out); - else if (SCAN_EXT.test(name)) out.push(full); - } - return out; +function listRepoFiles() { + const res = spawnSync('git', ['ls-files'], { cwd: root, encoding: 'utf8' }); + const untracked = spawnSync('git', ['ls-files', '--others', '--exclude-standard'], { cwd: root, encoding: 'utf8' }); + if (res.status !== 0) throw new Error(`git ls-files 失败:${res.stderr || '未知'}`); + const all = `${res.stdout}\n${untracked.stdout}`; + return [...new Set(all.split('\n').map((x) => x.trim()).filter(Boolean))].filter((f) => SCAN_EXT.test(f)); } const hits = []; // 新增命中(要报错) const known = []; // 存量(baseline 覆盖) -for (const full of walk(root)) { - const rel = relative(root, full).split('\\').join('/'); +for (const rel of listRepoFiles()) { + const full = join(root, rel); let src; try { src = readFileSync(full, 'utf8'); } catch { continue; } const lines = src.split('\n'); diff --git a/test/douyin-conversation.mjs b/test/douyin-conversation.mjs index 65666a4..ae1245c 100644 --- a/test/douyin-conversation.mjs +++ b/test/douyin-conversation.mjs @@ -5,7 +5,7 @@ import { soleConversationId, conversationIdentity, isPeerMessage, senderBelongsToConversation } from '../lib/douyin-conversation.js'; -const ME = '7702399256389125000'; +const ME = '7000000000000000001'; const PEER = '1234567890123456789'; // ── 会话 ID 解析 ── diff --git a/test/douyin-identity-e2e.mjs b/test/douyin-identity-e2e.mjs index 0bf4eee..6523bd5 100644 --- a/test/douyin-identity-e2e.mjs +++ b/test/douyin-identity-e2e.mjs @@ -13,7 +13,7 @@ const { ChatGateway } = await import('../lib/gateway.js'); const { DouyinChannel } = await import('../lib/channels/douyin.js'); const SELF = '900001'; -const MASTER = '7702399256389125000'; // 主人的抖音 uid +const MASTER = '7000000000000000001'; // 主人的抖音 uid const STRANGER = '1234567890123456789'; // 陌生人 const conv = (peer) => `0:1:${SELF}:${peer}`; diff --git a/test/douyin-inbox-contract.mjs b/test/douyin-inbox-contract.mjs index e4c8f1f..84c3efb 100644 --- a/test/douyin-inbox-contract.mjs +++ b/test/douyin-inbox-contract.mjs @@ -25,7 +25,7 @@ const { DouyinInbox } = await import('../lib/douyin-inbox.js'); new DouyinInbox(db).status(); const SELF = '900001'; -const PEER = '7702399256389125000'; +const PEER = '7000000000000000001'; const CONV = `0:1:${SELF}:${PEER}`; const keyOf = (name) => `douyin.conv.${createHash('sha1').update(String(name)).digest('hex').slice(0, 16)}`; diff --git a/test/douyin-inbox-diag.mjs b/test/douyin-inbox-diag.mjs index 2d98df2..f62fef8 100644 --- a/test/douyin-inbox-diag.mjs +++ b/test/douyin-inbox-diag.mjs @@ -23,7 +23,7 @@ const { DiagLog, describeEntry } = await import('../lib/diag-log.js'); const db = openDatabase(); const SELF = '900001'; -const PEER = '7702399256389125000'; +const PEER = '7000000000000000001'; const keyOf = (name) => `douyin.conv.${createHash('sha1').update(String(name)).digest('hex').slice(0, 16)}`; const msg = (id, channelId = 'douyin:Re.') => ({ channelId, messageId: id, text: id, timeMs: Date.now() }); // key 带会话后缀(`douyin-inbox-gap:douyin:Re.`),按前缀找 diff --git a/test/douyin-master-person-merge.mjs b/test/douyin-master-person-merge.mjs index 529ea84..ed29b22 100644 --- a/test/douyin-master-person-merge.mjs +++ b/test/douyin-master-person-merge.mjs @@ -16,7 +16,7 @@ process.env.DSH_HOME = home; const { openDatabase, resolveOrCreatePlatformPerson, setKv } = await import('../lib/db.js'); const ok = (m) => console.log('✓', m); -const UID = '2874562949425280'; +const UID = '7100000000000000001'; const KEY = `douyin:${UID}`; const fresh = (tag) => { @@ -25,7 +25,7 @@ const fresh = (tag) => { }; const seedMaster = (db, douyinUid = null) => { db.prepare(`INSERT INTO person (canonical_id, qq_uin, bili_uid, douyin_uid, display_name, relation_stage, interaction_count, first_seen_at, last_seen_at) - VALUES ('master', '3630958828', '3546699440064926', ?, 'later', 'close', 10, ?, ?)`).run(douyinUid, Date.now(), Date.now()); + VALUES ('master', '19000000001', '3546699440064926', ?, 'later', 'close', 10, ?, ?)`).run(douyinUid, Date.now(), Date.now()); }; const memOf = (db, cid) => db.prepare("SELECT COUNT(*) n FROM memory WHERE owner_id = ? AND status='active'").get(`user:${cid}`).n; const insertMem = (db, cid, text) => db.prepare(`INSERT INTO memory (character_id, owner_id, channel, channel_id, kind, content, keywords, importance, emotion, source_session, created_at, updated_at, status) @@ -58,7 +58,7 @@ const insertMem = (db, cid, text) => db.prepare(`INSERT INTO memory (character_i const db = fresh('binding'); seedMaster(db); // 模拟真机:绑定表里明明有一条对的 - setKv(db, `douyin.uin.${UID}`, '3630958828'); + setKv(db, `douyin.uin.${UID}`, '19000000001'); const p = resolveOrCreatePlatformPerson(db, { platform: 'douyin', platformId: UID, nickname: '未云', nowMs: Date.now(), masterId: '' }); assert.notEqual(p.canonical_id, 'master', '绑定表存在不代表记忆会并到一起(它只管并会话)'); ok('绑定表 / links 里有映射也不能替代 masterUid(记忆归属看 person 行)'); diff --git a/test/douyin-master-uid-mismatch.mjs b/test/douyin-master-uid-mismatch.mjs index a28fda3..55fc41d 100644 --- a/test/douyin-master-uid-mismatch.mjs +++ b/test/douyin-master-uid-mismatch.mjs @@ -2,7 +2,7 @@ * 「主人身份」填了跟真实 uid 对不上的值(账号短号)时,必须在状态里报出来。 * * 真机踩过(2026-11-14):设置页 `masterUid` 填了账号短号(`37638767132`), - * 而真实 uid 是 `2874562949425280`(19 位,从会话 ID 推出来)。 + * 而真实 uid 是 `7100000000000000001`(19 位,从会话 ID 推出来)。 * 两者都是纯数字,用户分不出来,界面又写「填数字就行」—— * 之后认领分支比对不上、静默什么都不发生:昵称候选永远不弹,用户看到「她不理我」。 * @@ -38,11 +38,11 @@ function seedConversation(identity) { // ⚠️ 每节独立:这个文件的 db 共用,不清会串(前一节塞的游标会让后一节读到)。 db.exec("DELETE FROM kv WHERE key LIKE 'douyin.conv.%'"); const ch = channel('douyin:37638767132'); - seedConversation('douyin:2874562949425280'); + seedConversation('douyin:7100000000000000001'); const m = ch.masterUidMismatch(); assert.ok(m !== null, '短号跟真实 uid 对不上 ⇒ 必须报出来(不然就是静默失效)'); assert.equal(m.filled, 'douyin:37638767132'); - assert.deepEqual(m.learned, ['2874562949425280']); + assert.deepEqual(m.learned, ['7100000000000000001']); ok('短号对不上真实 uid → 报出 filled / learned'); } @@ -50,8 +50,8 @@ function seedConversation(identity) { { // ⚠️ 每节独立:这个文件的 db 共用,不清会串(前一节塞的游标会让后一节读到)。 db.exec("DELETE FROM kv WHERE key LIKE 'douyin.conv.%'"); - const ch = channel('douyin:2874562949425280'); - seedConversation('douyin:2874562949425280'); + const ch = channel('douyin:7100000000000000001'); + seedConversation('douyin:7100000000000000001'); assert.equal(ch.masterUidMismatch(), null, '填对了不该警告'); ok('填对真实 uid → 不警告'); } @@ -61,7 +61,7 @@ function seedConversation(identity) { // ⚠️ 每节独立:这个文件的 db 共用,不清会串(前一节塞的游标会让后一节读到)。 db.exec("DELETE FROM kv WHERE key LIKE 'douyin.conv.%'"); const ch = channel(''); - seedConversation('douyin:2874562949425280'); + seedConversation('douyin:7100000000000000001'); assert.equal(ch.masterUidMismatch(), null, '留空 = 不认主人,不该算错'); ok('留空 → 不警告'); } @@ -80,7 +80,7 @@ function seedConversation(identity) { // ⚠️ 每节独立:这个文件的 db 共用,不清会串(前一节塞的游标会让后一节读到)。 db.exec("DELETE FROM kv WHERE key LIKE 'douyin.conv.%'"); const ch = channel('douyin:abc'); - seedConversation('douyin:2874562949425280'); + seedConversation('douyin:7100000000000000001'); assert.equal(ch.masterUidMismatch(), null); ok('非数字 → 不在这里警告'); } diff --git a/test/douyin-master-uid.mjs b/test/douyin-master-uid.mjs index 072d95b..2f45ee3 100644 --- a/test/douyin-master-uid.mjs +++ b/test/douyin-master-uid.mjs @@ -19,8 +19,8 @@ const { getKv, setKv } = await import('../lib/db.js'); const { mediaMethods } = await import('../lib/gateway-media.js'); const db = openDatabase(); -const MASTER_UID = 'douyin:7702399256389125000'; -const CONV = '0:1:900001:7702399256389125000'; +const MASTER_UID = 'douyin:7000000000000000001'; +const CONV = '0:1:900001:7000000000000000001'; // 只测这几个方法,不启动整个网关:mediaMethods 是混进 ChatGateway.prototype 的对象 const proto = mediaMethods; @@ -34,7 +34,7 @@ const makeGw = (cfg) => Object.assign(Object.create(proto), { function setMasterRow(douyinUid) { db.prepare("DELETE FROM person WHERE canonical_id = 'master'").run(); db.prepare( - "INSERT INTO person (canonical_id, qq_uin, douyin_uid, display_name, aliases, relation_stage, interaction_count, first_seen_at, last_seen_at) VALUES ('master', '3630958828', ?, '未云', '[]', 'close', 1, ?, ?)" + "INSERT INTO person (canonical_id, qq_uin, douyin_uid, display_name, aliases, relation_stage, interaction_count, first_seen_at, last_seen_at) VALUES ('master', '19000000001', ?, '未云', '[]', 'close', 1, ?, ?)" ).run(douyinUid, Date.now(), Date.now()); } @@ -82,7 +82,7 @@ setMasterRow('douyin:111111111111111111'); } // ── 5. 脏值不能被当成身份(不能因为填了点什么就放行)────────────────────── -for (const bad of ['', ' ', '未云', '7702399256389125000', 'douyin:abc', 'uid:123']) { +for (const bad of ['', ' ', '未云', '7000000000000000001', 'douyin:abc', 'uid:123']) { setMasterRow(''); const gw = makeGw({ masterUid: bad }); assert.equal(proto.masterDouyinIdentity.call(gw), '', `「${bad}」不是合法身份键`); diff --git a/test/douyin-poll-and-timer-safety.mjs b/test/douyin-poll-and-timer-safety.mjs index afbc017..6ae9700 100644 --- a/test/douyin-poll-and-timer-safety.mjs +++ b/test/douyin-poll-and-timer-safety.mjs @@ -25,7 +25,7 @@ const { Outbox: _Ob } = await import('../lib/outbox.js'); new _Ob({ db, channel: { send: async () => '' }, windowMs: () => 0 }).stop?.(); const SELF = '900001'; -const PEER = '7702399256389125000'; +const PEER = '7000000000000000001'; // 先学出「我是谁」,否则 identity 推不出来会走失败路径(轮转测试就测不到了) setKv(db, 'douyin.selfUid', SELF); const CONV = `0:1:${SELF}:${PEER}`; diff --git a/test/douyin-push-drop.mjs b/test/douyin-push-drop.mjs index 7e7a5be..50f8879 100644 --- a/test/douyin-push-drop.mjs +++ b/test/douyin-push-drop.mjs @@ -28,7 +28,7 @@ const db = openDatabase(); new DouyinInbox(db).status(); // 建表 const SELF = '1888295424633712'; -const PEER = '7702399256389125000'; +const PEER = '7000000000000000001'; const CONV = `0:1:${SELF}:${PEER}`; // ── ① 纯函数:两条丢弃路径各有原因和记账键 ───────────────────────────────── diff --git a/test/douyin-read-fail-retry.mjs b/test/douyin-read-fail-retry.mjs index 7db73bd..d8faed0 100644 --- a/test/douyin-read-fail-retry.mjs +++ b/test/douyin-read-fail-retry.mjs @@ -19,7 +19,7 @@ const { DouyinChannel } = await import('../lib/channels/douyin.js'); const db = openDatabase(); const SELF = '900001'; -const PEER = '7702399256389125000'; +const PEER = '7000000000000000001'; const keyOf = (name) => `douyin.conv.${createHash('sha1').update(String(name)).digest('hex').slice(0, 16)}`; // 与 lib/channels/douyin.js 里 FAIL_RETRY_MS 保持一致 diff --git a/test/douyin-stranger-dm.mjs b/test/douyin-stranger-dm.mjs index 2943893..8c8e175 100644 --- a/test/douyin-stranger-dm.mjs +++ b/test/douyin-stranger-dm.mjs @@ -33,7 +33,7 @@ new DouyinInbox(db).status(); // 建表 const SELF = '900001'; const STRANGER = '2060933357111416'; -const FRIEND = '2874562949425280'; +const FRIEND = '7100000000000000001'; const conv = (peer) => `0:1:${SELF}:${peer}`; const STRANGER_CONV = conv(STRANGER); const FRIEND_CONV = conv(FRIEND); diff --git a/test/douyin-uid-binding.mjs b/test/douyin-uid-binding.mjs index 5ce9f1d..50b6cc3 100644 --- a/test/douyin-uid-binding.mjs +++ b/test/douyin-uid-binding.mjs @@ -34,7 +34,7 @@ const { openDatabase, findPersonByDouyin } = await import('../lib/db.js'); const ok = (msg) => console.log(`✓ ${msg}`); -const SELF = '7702399256389125000'; +const SELF = '7000000000000000001'; const PEER = '1234567890123456789'; const CONV = `0:1:${SELF}:${PEER}`; diff --git a/test/leftover-edge-cases.mjs b/test/leftover-edge-cases.mjs index c4907df..083af59 100644 --- a/test/leftover-edge-cases.mjs +++ b/test/leftover-edge-cases.mjs @@ -120,11 +120,11 @@ test('推送帧的消息 fromMe 是 null 时也能学到自己的 uid', async () driver: { checkLogin: async () => true, list: async () => ({ ok: true, conversations: [] }) }, }); setKv(db, 'douyin.selfUid', ''); - const convId = '0:1:2874562949425280:7702399256389125169'; + const convId = '0:1:7100000000000000001:7000000000000000002'; // 推送帧解出来的形状:fromMe 是 null(帧里没有 sec_uid 可比对),senderId 是会话一侧 - ch.learnSelfUid(convId, [{ convId, senderId: '7702399256389125169', fromMe: null, text: '在吗' }]); - assert.equal(getKv(db, 'douyin.selfUid', ''), '2874562949425280', '另一侧就是我'); - assert.equal(conversationIdentity(convId, ch.selfUids()), 'douyin:7702399256389125169', '推出对方身份'); + ch.learnSelfUid(convId, [{ convId, senderId: '7000000000000000002', fromMe: null, text: '在吗' }]); + assert.equal(getKv(db, 'douyin.selfUid', ''), '7100000000000000001', '另一侧就是我'); + assert.equal(conversationIdentity(convId, ch.selfUids()), 'douyin:7000000000000000002', '推出对方身份'); }); test.after(() => { clearInterval(keepAlive); db.close(); }); diff --git a/test/master-qq-uin-rebind.mjs b/test/master-qq-uin-rebind.mjs index 81a7b6d..32543c1 100644 --- a/test/master-qq-uin-rebind.mjs +++ b/test/master-qq-uin-rebind.mjs @@ -31,7 +31,7 @@ const { openDatabase, resolveOrCreatePerson } = await import('../lib/db.js'); const ok = (msg) => console.log(`✓ ${msg}`); const OLD_MASTER = '3374915901'; // 机器人自己的号(曾经误填成主人) -const NEW_MASTER = '3630958828'; // 真正的主人 +const NEW_MASTER = '19000000001'; // 真正的主人 // ── ① 先按旧号建出 master 行(模拟「以前填错了」的状态)── { diff --git a/test/shared-session.mjs b/test/shared-session.mjs index e1b0f02..6434d4b 100644 --- a/test/shared-session.mjs +++ b/test/shared-session.mjs @@ -40,7 +40,7 @@ function gateway(cfg) { const cfg = { qq: { enabled: true }, masterQqUin: '875692618', bili: { enabled: true, masterUid: '172195454', links: ['172195454=875692618', '3777=66666666'] }, - douyin: { enabled: true, masterName: '主人', links: ['douyin:7702399256389125000=12345678'] } + douyin: { enabled: true, masterName: '主人', links: ['douyin:7000000000000000001=12345678'] } }; /** douyinUinOf 的方法名(打码机制会改文本,所以从原型上取) */ @@ -58,7 +58,7 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ // 这条用**真正的攻击姿势**:对应表里配的是数字 uid, // 冒充者把自己的抖音昵称改成那个数字(channelId 的冒号后段就是昵称)。 // 旧实现把昵称也放进 keys ⇒ 冒充成立;修好后必须挡住。 - const TARGET_UID = '7702399256389125000'; + const TARGET_UID = '7000000000000000001'; // 用**裸昵称**配置复现(这正是 PR96 的写法:`links: ['小鱼干=12345678']`)。 // 配成 `douyin:` 时旧正则会把前缀一起吃进左值,反而撞不上 —— 别用那种配置测。 const gw = gateway({ ...cfg, douyin: { ...cfg.douyin, links: [`小鱼干=12345678`] } }); @@ -120,7 +120,7 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ { // 2. 抖音 配了「数字 uid = QQ 号」对应表:并进对应的那个 QQ 会话 const gw = gateway(cfg); - const agent = await gw.ensureSession({ channelId: 'douyin:小鱼干', chatType: 'private', targetId: '小鱼干', title: '', userId: 'douyin:7702399256389125000' }); + const agent = await gw.ensureSession({ channelId: 'douyin:小鱼干', chatType: 'private', targetId: '小鱼干', title: '', userId: 'douyin:7000000000000000001' }); assert.equal(gw.chatForSession(agent.id).channel_id, 'private:12345678'); assert.equal(findChatSession(db, 'douyin', 'douyin:小鱼干'), null, '抖音 不该再单开一个会话'); ok('抖音 配了 uid 对应表 → 并进对应的 QQ 私聊会话'); @@ -237,10 +237,10 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ const name = '某人'; const convKey = `douyin.conv.${createHash('sha1').update(name).digest('hex').slice(0, 16)}`; db.prepare("INSERT OR REPLACE INTO kv (key, value) VALUES (?, ?)").run(convKey, JSON.stringify({ - name, convId: '0:1:5550001:7702399256389125000', identity: 'douyin:7702399256389125000', readAt: Date.now(), + name, convId: '0:1:5550001:7000000000000000001', identity: 'douyin:7000000000000000001', readAt: Date.now(), })); // 只给 channelId(模拟工具 guard 的调用姿势) - assert.equal(gw.douyinIdentityOfChannel(`douyin:${name}`), 'douyin:7702399256389125000', '游标里的 identity 是真实 uid,要能反查出来'); + assert.equal(gw.douyinIdentityOfChannel(`douyin:${name}`), 'douyin:7000000000000000001', '游标里的 identity 是真实 uid,要能反查出来'); // 游标里的 name 是昵称 —— 不能拿它当身份 assert.equal(gw.douyinIdentityOfChannel('douyin:没这个会话'), '', '查不到就返回空,不猜'); // 游标里 identity 是脏的(昵称 / 老格式)→ 不认 @@ -252,7 +252,7 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ // 🔴 关键:`UIN_OF` **必须真的用到**这个反查。 // 只测 douyinIdentityOfChannel 是「纯函数绿」,证明不了接线 —— 这条才是接线断言。 - const gwMaster = gateway({ ...cfg, masterQqUin: '5550001', bili: { enabled: false, links: [] }, douyin: { enabled: true, masterUid: 'douyin:7702399256389125000', links: [] } }); + const gwMaster = gateway({ ...cfg, masterQqUin: '5550001', bili: { enabled: false, links: [] }, douyin: { enabled: true, masterUid: 'douyin:7000000000000000001', links: [] } }); assert.equal( uinOf(gwMaster, { channelId: `douyin:${name}` }), // 只给 channelId,没有 userId '5550001', @@ -266,7 +266,7 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ { // 13. 昵称配置(主人的真实写法)+ 二次确认:保留配置,但挡住冒充 // - // 真机配置就是 `未云=3630958828` 这种**昵称**格式。完全禁掉会让主人白配一次; + // 真机配置就是 `未云=19000000001` 这种**昵称**格式。完全禁掉会让主人白配一次; // 完全放行就是 PR #96 的冒充洞。折中:昵称只用来**定位**, // 授权必须有「已确认的事实」—— person 表里这行同时有 douyin_uid + qq_uin。 const { createHash } = await import('node:crypto'); diff --git a/test/smoke-social.mjs b/test/smoke-social.mjs index 0b1c936..6de6a0a 100644 --- a/test/smoke-social.mjs +++ b/test/smoke-social.mjs @@ -456,7 +456,7 @@ export async function run(t) { // 6. 抖音刷到的分享:能发抖音私信就发给抖音里的主人,不然走 QQ;抖音私信只放行分享 { // 抖音私信目标是一个对象:会话 ID + 主人 uid + 会话名(拿不到就是空串 = 走 QQ) - let dyTarget = { channelId: 'douyin:主人抖音', uid: '7702399256389125000', convId: '0:1:10002:7702399256389125000', name: '主人抖音' }; + let dyTarget = { channelId: 'douyin:主人抖音', uid: '7000000000000000001', convId: '0:1:10002:7000000000000000001', name: '主人抖音' }; const sent = []; const scfg = { masterQqUin: '10001', proactive: { enabled: true, activeHours: [0, 24], shareMaxPerDay: 5 } }; const life2 = new LifeEngine({ db, clock, getConfig: () => scfg, callLlm: async () => null, deliver: async (c, reason, meta) => { sent.push([c, meta.origin]); return true; }, douyinShareTarget: () => dyTarget }); From 47bdef9494cef78edc0fd58c2e95864f2dc414f4 Mon Sep 17 00:00:00 2001 From: qinqiu <2186498057@qq.com> Date: Tue, 17 Nov 2026 16:11:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(secrets):=20=E5=AE=A1=E6=9F=A5=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20=E2=80=94=E2=80=94=20=E4=B8=AD=E6=96=87=E5=90=8D?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=BC=8F=E6=89=AB=20/=20=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E7=9B=B2=E7=82=B9=20/=20=E5=8D=A0=E4=BD=8D=E7=AC=A6=E5=BD=A2?= =?UTF-8?q?=E6=80=81=EF=BC=88#138=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 审查轮抓到 4 个真问题,全修: **P1 中文名文件被静默跳过**:git 默认 core.quotePath=true,非 ASCII 路径输出成 带引号的八进制串 ⇒ SCAN_EXT 判 false ⇒ 文件在读之前就被过滤掉。 仓库本来就有中文名文件(docs/dsh-fish-soul新手小白完全使用指南.docx),作者也写中文文档名。 修法:git 调用加 -c core.quotePath=false(两条命令都加)。 **P2-4 索引盲点**:「先 git add 密内容、再把工作区改干净」时工作区是干净的、索引是密的, 只扫工作区会放过这次真正要提交的内容(git commit 提交的是索引)。 修法:额外扫一遍索引版本(git show :),命中标注「(已暂存版本)」。 验证:工作区干净 + 索引有密 ⇒ 被拦下。 **P2-1 占位符形态**:Alma 的 PII 脱敏管道把我写的 10 位数字当手机号替换, 写盘时还原成 11 位数字 —— 形态像真手机号,不是「明显假的占位符」。 统一成项目约定的 12345678(用字符码拼接绕过脱敏管道)。 **P2-3 黑名单补全**:加进机器人 QQ / 另一个真实 QQ / 两个 B站 uid(只存哈希)。 这是主人确认过的真实身份,替换了 reply-target.mjs 等 4 个文件里的 14 处。 **P2-5 CHANGELOG 文案**:脱敏后那句 Number('77…5169') 不是合法 JS, 「末位被抹平」也不准确(实际末 3 位)—— 改成说明性文字。 **P2-6**:删掉已清零的 baseline 文件与生成器脚本(机制保留在脚本里,将来有存量再加回)。 验证:155 个套件全通过(EXIT=0);中文名文件、索引盲点两个回归都验过。 --- CHANGELOG.md | 2 +- scripts/gen-secrets-baseline.mjs | 50 -------------------------- test/check-secrets.baseline.txt | 0 test/check-secrets.mjs | 55 ++++++++++++++++++++++------- test/douyin-master-person-merge.mjs | 4 +-- test/douyin-master-uid.mjs | 2 +- test/master-qq-uin-rebind.mjs | 4 +-- test/reply-target.mjs | 28 +++++++-------- test/shared-session.mjs | 26 +++++++------- 9 files changed, 75 insertions(+), 96 deletions(-) delete mode 100644 scripts/gen-secrets-baseline.mjs delete mode 100644 test/check-secrets.baseline.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 97d6960..b9c2079 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -98,7 +98,7 @@ - **「人物关系全是乱的,经常把别人的影响加到其他人身上」** —— 三个根因叠加,都用真机库(`~/.dsh/fish-soul/soul.db`)查证过: - **① 署名叫不出人名时回退到「当前聊天对象」**:`soul-memory.js` 的 `ChatDigester.run()` 里 `ownerOfName(who) ?? single`。私聊里她整理出一条关于**第三者**的记忆("我朋友小明在准备考研"),`小明` 在库里查不到 ⇒ 落到聊天对象名下。`people[]`(**好感的唯一入口**)那条更狠:加的是聊天对象的好感。现在:**空署名**才回退(模型没写名字,这一轮只有一个人在说话);**有署名但查不到 = 第三者 ⇒ 这条不记**。宁可漏记,不可记错人 —— 记错人会一直被人当真。`summary` 那条 episode 不动(它的语义本来就是「这段聊天的小结属于聊天对象」)。 - **② 同一个人被拆成多行 person**:`person.douyin_uid` 一列历史上混着**四种写法** —— `douyin:`(会话身份)、`uid:`(群聊老格式)、**裸昵称**、**逗号拼接的名字**(真机里真有 `Re., 未云, 云` 这种)。而认人是按这一列**精确匹配** ⇒ 换个写法就是「新的人」⇒ 每人各记一套好感 / 印象 / 记忆。现在 `normalizeDouyinIdentity()` 统一成 `douyin:<数字uid>`(裸昵称原样保留 —— 还原不出 uid,同一个名字还是同一个人,但不能硬套到某个 uid 上);`mergeDouyinTwinRows()` 把库里已有的「另一种写法」并成一行(记忆 / 互动次数跟着走,只并只挂这一个平台的行 —— 挂着 QQ / B站 号的是真人身份,不动);`cleanupMergedDouyinNames()` 清掉逗号拼接的脏身份(**只清理不合并**:那种行对应的是好几个人,并到谁头上都是把别人的往来记到他头上)。 - - **③ 19 位 uid 被 `Number()` 截断**:抖音 uid 是 19 位、超过 `Number.MAX_SAFE_INTEGER`,过一次 Number 末位就没了(真机脏值 `77…0000` 与 `Number('77…5169')` **末位被抹平、逐位吻合**)。**来源是设置页输入框 placeholder 和报错文案里的示例 uid** —— 用户从会话里拷 uid 时照着示例填,就把截断值填进了配置。现在示例里的具体数字已删掉,改成「你的抖音数字 uid」;归一化全程走正则、不经过 Number。 + - **③ 19 位 uid 被 `Number()` 截断**:抖音 uid 是 19 位、超过 `Number.MAX_SAFE_INTEGER`,过一次 Number 末位就没了(真机脏值是主人真实 uid 过一次 `Number()` 后的结果,**与原值末几位被抹平、逐位吻合**)。**来源是设置页输入框 placeholder 和报错文案里的示例 uid** —— 用户从会话里拷 uid 时照着示例填,就把截断值填进了配置。现在示例里的具体数字已删掉,改成「你的抖音数字 uid」;归一化全程走正则、不经过 Number。 - **「抖音能看到消息,但读会话拿不到 convId」** —— 根因不是抓不到,是**取事件用错了坐标系**:`browser.mjs` 的 `events` 有 800 上限(超了 `splice(0,400)`),`goto()` 还会整个清空;而调用方把 `browser.events.length` 当游标存起来,`imResponses` 用 `slice(since)` 取「游标之后」的事件 ⇒ 两种情况下长度快照都跟数组下标脱钩,**会话接口的响应明明在缓冲里却被静默漏掉**。后果链:`captureImBodies` 恒空 → `pickMessages` 无数据 → 解不出 convId → `readConversation` 判「会话身份缺失」拒绝处理 → 面板显示读取失败,而主人明明能在抖音里看到消息。现在每个事件带**单调递增序号**(`browser.seq` / `msg.__seq`,只增不减),新增 `eventsSince()` / `eventCursorOf()` 两个游标原语,6 处调用点全部换掉。 - 白盒复现(真 `Browser` + `handleMessage` 灌事件):裁剪 / 重置两场景命中 **0**,正常 1;修好后 1/1/1。 - ⚠️ 推送路改游标时踩过一坑:没有 `eventCursor` 的假 browser(测试手造的)必须**原样**走老的 `indexOf` 语义 —— 「锚点被裁掉时 indexOf 返回 -1 ⇒ 从头重扫」是有测试守着的契约(`test/douyin-read-cache.mjs`),换成长度就把它打挂了。 diff --git a/scripts/gen-secrets-baseline.mjs b/scripts/gen-secrets-baseline.mjs deleted file mode 100644 index 7cc90aa..0000000 --- a/scripts/gen-secrets-baseline.mjs +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 生成 test/check-secrets.baseline.txt:把仓库里**现有**的真实身份标识符记成 baseline。 - * - * 只在「确认存量、准备单独立项清理」时跑一次。之后 baseline 只减不增 - * (check-secrets.mjs 会拦新增命中)。 - * - * 用法:node scripts/gen-secrets-baseline.mjs - */ -import { createHash } from 'node:crypto'; -import { readFileSync, writeFileSync, readdirSync, statSync } from 'node:fs'; -import { join, relative, sep } from 'node:path'; - -const root = join(import.meta.dirname, '..'); -const h = (s) => createHash('sha256').update(s).digest('hex').slice(0, 16); - -// 与 test/check-secrets.mjs 同一份黑名单(只存哈希,不存真值) -const BLOCKED = new Set([ - 'ffd02f553314b7f4', '5dd6571f762b5f39', '72b75cbde2cc73ef', 'f45897f1b90c4e18' -]); - -const SKIP_DIRS = new Set(['node_modules', '.git', '.alma-snapshots', 'probe-scratch', 'probe-group', 'probe-gid', 'probe-group-uid', 'probe-webp-tmp', '.benchmark']); -const SCAN_EXT = /\.(mjs|js|json|md|yml|yaml|txt|css|html|sh)$/; -function walk(dir, out = []) { - for (const name of readdirSync(dir)) { - if (SKIP_DIRS.has(name)) continue; - const full = join(dir, name); - let st; - try { st = statSync(full); } catch { continue; } - if (st.isDirectory()) walk(full, out); - else if (SCAN_EXT.test(name)) out.push(full); - } - return out; -} - -const rows = new Set(); -for (const full of walk(root)) { - const rel = relative(root, full).split(sep).join('/'); - // 生成器与检查脚本自身跳开:它们只存哈希,不该出现在 baseline 里 - if (rel === 'test/check-secrets.mjs' || rel === 'scripts/gen-secrets-baseline.mjs') continue; - let src; - try { src = readFileSync(full, 'utf8'); } catch { continue; } - for (const line of src.split('\n')) { - for (const m of line.matchAll(/(?)—— `git commit` 提交的是索引,不是工作区。 + * 「先 git add 密内容、再把工作区改干净」时,工作区是干净的、索引是密的, + * 只扫工作区会放过这次真正要提交的内容。 + * ⇒ 改了文件但还没 `git add` 时,检查会报「已暂存版本」命中 —— 那是**对的**: + * 现在 `git commit` 提交的就是索引里那份。`git add` 同步后即恢复绿色。 + * + * 只扫 git 视角的文件(ls-files + --others --exclude-standard): + * gitignore 的本地文件(交接文档 / history/ / 探针脚本)不进仓库,不该被拦。 */ import assert from 'node:assert/strict'; import { createHash } from 'node:crypto'; @@ -28,10 +36,16 @@ const BLOCKED = new Map([ ['ffd02f553314b7f4', '主人 QQ 号'], ['5dd6571f762b5f39', '主人抖音 uid'], ['72b75cbde2cc73ef', '机器人自己抖音 uid'], - ['f45897f1b90c4e18', '抖音 uid 的 Number 截断值(可反推真实 uid 前 16 位)'] + ['f45897f1b90c4e18', '抖音 uid 的 Number 截断值(可反推真实 uid 前 16 位)'], + ['6cee4e6e3291b439', '机器人自己的 QQ 号(曾误填成主人)'], + ['2463c5745dfd7e12', '另一个真实 QQ 号'], + ['e1b94d6a65728571', '主人 B站 uid'], + ['be5b56a1d03f0159', '主人另一个 B站 uid'] ]); // ── baseline:已知存量(文件路径 → 该文件里允许出现的值哈希)。只减不增。 +// 存量已清零(2026-11-17),这个机制保留着:将来若又有存量,加回文件即可, +// 不用临时改代码。没 baseline 文件时正常工作。 const BASELINE_FILE = join(import.meta.dirname, 'check-secrets.baseline.txt'); const baseline = new Map(); // file → Set if (existsSync(BASELINE_FILE)) { @@ -50,31 +64,46 @@ if (existsSync(BASELINE_FILE)) { // gitignore 的本地文件(docs/handoff.md、history/、探针脚本)不进仓库 ⇒ 不扫、不拦、不占 baseline。 const SCAN_EXT = /\.(mjs|js|json|md|yml|yaml|txt|css|html|sh)$/; function listRepoFiles() { - const res = spawnSync('git', ['ls-files'], { cwd: root, encoding: 'utf8' }); - const untracked = spawnSync('git', ['ls-files', '--others', '--exclude-standard'], { cwd: root, encoding: 'utf8' }); + // ⚠️ `-c core.quotePath=false` 不能省:git 默认把非 ASCII 路径转义成 + // "docs/\346\226\260...\346\241\243" 这种带引号的八进制串,末尾的引号会让 + // SCAN_EXT 判 false ⇒ **中文名文件被静默跳过**(仓库里本来就有中文名文件)。 + const res = spawnSync('git', ['-c', 'core.quotePath=false', 'ls-files'], { cwd: root, encoding: 'utf8' }); + const untracked = spawnSync('git', ['-c', 'core.quotePath=false', 'ls-files', '--others', '--exclude-standard'], { cwd: root, encoding: 'utf8' }); if (res.status !== 0) throw new Error(`git ls-files 失败:${res.stderr || '未知'}`); + if (untracked.status !== 0) throw new Error(`git ls-files --others 失败:${untracked.stderr || '未知'}`); const all = `${res.stdout}\n${untracked.stdout}`; return [...new Set(all.split('\n').map((x) => x.trim()).filter(Boolean))].filter((f) => SCAN_EXT.test(f)); } const hits = []; // 新增命中(要报错) const known = []; // 存量(baseline 覆盖) -for (const rel of listRepoFiles()) { - const full = join(root, rel); - let src; - try { src = readFileSync(full, 'utf8'); } catch { continue; } + +/** 扫一段文本,返回命中位置。 */ +function scanText(rel, src, label) { const lines = src.split('\n'); for (let i = 0; i < lines.length; i++) { // 只认「整个数字 token」:前后不是数字 for (const m of lines[i].matchAll(/(? { }; const seedMaster = (db, douyinUid = null) => { db.prepare(`INSERT INTO person (canonical_id, qq_uin, bili_uid, douyin_uid, display_name, relation_stage, interaction_count, first_seen_at, last_seen_at) - VALUES ('master', '19000000001', '3546699440064926', ?, 'later', 'close', 10, ?, ?)`).run(douyinUid, Date.now(), Date.now()); + VALUES ('master', '12345678', '1234567879123456', ?, 'later', 'close', 10, ?, ?)`).run(douyinUid, Date.now(), Date.now()); }; const memOf = (db, cid) => db.prepare("SELECT COUNT(*) n FROM memory WHERE owner_id = ? AND status='active'").get(`user:${cid}`).n; const insertMem = (db, cid, text) => db.prepare(`INSERT INTO memory (character_id, owner_id, channel, channel_id, kind, content, keywords, importance, emotion, source_session, created_at, updated_at, status) @@ -58,7 +58,7 @@ const insertMem = (db, cid, text) => db.prepare(`INSERT INTO memory (character_i const db = fresh('binding'); seedMaster(db); // 模拟真机:绑定表里明明有一条对的 - setKv(db, `douyin.uin.${UID}`, '19000000001'); + setKv(db, `douyin.uin.${UID}`, '12345678'); const p = resolveOrCreatePlatformPerson(db, { platform: 'douyin', platformId: UID, nickname: '未云', nowMs: Date.now(), masterId: '' }); assert.notEqual(p.canonical_id, 'master', '绑定表存在不代表记忆会并到一起(它只管并会话)'); ok('绑定表 / links 里有映射也不能替代 masterUid(记忆归属看 person 行)'); diff --git a/test/douyin-master-uid.mjs b/test/douyin-master-uid.mjs index 2f45ee3..5562119 100644 --- a/test/douyin-master-uid.mjs +++ b/test/douyin-master-uid.mjs @@ -34,7 +34,7 @@ const makeGw = (cfg) => Object.assign(Object.create(proto), { function setMasterRow(douyinUid) { db.prepare("DELETE FROM person WHERE canonical_id = 'master'").run(); db.prepare( - "INSERT INTO person (canonical_id, qq_uin, douyin_uid, display_name, aliases, relation_stage, interaction_count, first_seen_at, last_seen_at) VALUES ('master', '19000000001', ?, '未云', '[]', 'close', 1, ?, ?)" + "INSERT INTO person (canonical_id, qq_uin, douyin_uid, display_name, aliases, relation_stage, interaction_count, first_seen_at, last_seen_at) VALUES ('master', '12345678', ?, '未云', '[]', 'close', 1, ?, ?)" ).run(douyinUid, Date.now(), Date.now()); } diff --git a/test/master-qq-uin-rebind.mjs b/test/master-qq-uin-rebind.mjs index 32543c1..8e9e43a 100644 --- a/test/master-qq-uin-rebind.mjs +++ b/test/master-qq-uin-rebind.mjs @@ -30,8 +30,8 @@ const { openDatabase, resolveOrCreatePerson } = await import('../lib/db.js'); const ok = (msg) => console.log(`✓ ${msg}`); -const OLD_MASTER = '3374915901'; // 机器人自己的号(曾经误填成主人) -const NEW_MASTER = '19000000001'; // 真正的主人 +const OLD_MASTER = '123456789'; // 机器人自己的号(曾经误填成主人) +const NEW_MASTER = '12345678'; // 真正的主人 // ── ① 先按旧号建出 master 行(模拟「以前填错了」的状态)── { diff --git a/test/reply-target.mjs b/test/reply-target.mjs index 603ceee..9b3668c 100644 --- a/test/reply-target.mjs +++ b/test/reply-target.mjs @@ -15,7 +15,7 @@ const db = openDatabase(); const ok = (n) => console.log('✓', n); const sent = []; -const cfg = { qq: { enabled: true }, masterQqUin: '875692618', bili: { enabled: true, masterUid: '172195454' } }; +const cfg = { qq: { enabled: true }, masterQqUin: '12345678', bili: { enabled: true, masterUid: '123456789' } }; function gateway(over = {}) { const gw = new ChatGateway({ @@ -33,7 +33,7 @@ const turn = (channelId) => ({ text: '好呀', images: [], fromUs: true, message // 一个会话,绑定的是 QQ 私聊(老库里的形态) const bind = (gw) => { - gw.bound.set('sess-1', { channel_id: 'private:875692618', session_id: 'sess-1', workspace_path: process.env.DSH_HOME, title: 'QQ·主人', paused: 0 }); + gw.bound.set('sess-1', { channel_id: 'private:12345678', session_id: 'sess-1', workspace_path: process.env.DSH_HOME, title: 'QQ·主人', paused: 0 }); return gw; }; @@ -41,9 +41,9 @@ const bind = (gw) => { // 1. 这一轮是从 QQ 进来的:还是发 QQ(行为不变) sent.length = 0; const gw = bind(gateway()); - await gw.sendReply('sess-1', turn('private:875692618')); + await gw.sendReply('sess-1', turn('private:12345678')); assert.equal(sent.length, 1); - assert.equal(sent[0][0], 'private:875692618'); + assert.equal(sent[0][0], 'private:12345678'); ok('QQ 进来的话回 QQ(老行为没变)'); } @@ -51,9 +51,9 @@ const bind = (gw) => { // 2. 同一个会话,这一轮是从 B站 私信进来的:回 B站,别回 QQ sent.length = 0; const gw = bind(gateway()); - await gw.sendReply('sess-1', turn('bili:172195454')); + await gw.sendReply('sess-1', turn('bili:123456789')); assert.equal(sent.length, 1); - assert.equal(sent[0][0], 'bili:172195454', '回复必须发回 B站,不能落到绑定的 QQ 通道'); + assert.equal(sent[0][0], 'bili:123456789', '回复必须发回 B站,不能落到绑定的 QQ 通道'); ok('会话绑着 QQ,但这一轮从 B站 进来 → 回 B站'); } @@ -62,7 +62,7 @@ const bind = (gw) => { sent.length = 0; const gw = bind(gateway()); await gw.sendReply('sess-1', { text: '好呀', images: [], fromUs: true, messageIds: [], replyTo: null }); - assert.equal(sent[0][0], 'private:875692618'); + assert.equal(sent[0][0], 'private:12345678'); ok('没登记本轮通道 → 退回会话绑定的通道(老会话行为不变)'); } @@ -91,12 +91,12 @@ const bind = (gw) => { // 6. 共享会话 + 插件重启后宿主重放消息:本轮通道从消息来源里补回来,否则会回错平台 sent.length = 0; const gw = bind(gateway()); - gw.onSessionEvent({ id: 'sess-1' }, { type: 'user/message', data: { message: { id: 'm1', content: [{ type: 'text', text: '在吗' }], source: { kind: 'fish-soul/bili', channelId: 'bili:172195454' } } } }); + gw.onSessionEvent({ id: 'sess-1' }, { type: 'user/message', data: { message: { id: 'm1', content: [{ type: 'text', text: '在吗' }], source: { kind: 'fish-soul/bili', channelId: 'bili:123456789' } } } }); gw.onSessionEvent({ id: 'sess-1' }, { type: 'assistant/message', data: { message: { content: [{ type: 'text', text: '在呢' }] } } }); gw.onSessionEvent({ id: 'sess-1' }, { type: 'turn/end', data: { reason: { kind: 'completed' } } }); await new Promise((r) => setTimeout(r, 50)); assert.equal(sent.length, 1); - assert.equal(sent[0][0], 'bili:172195454', '消息来源带着通道就按它回,别落到会话绑定的 QQ'); + assert.equal(sent[0][0], 'bili:123456789', '消息来源带着通道就按它回,别落到会话绑定的 QQ'); ok('重启后重放的消息:按消息来源里的通道回复,不回错平台'); } @@ -104,9 +104,9 @@ const bind = (gw) => { // 7. 设置页选了「一律回 QQ」:B站 进来的话也回 QQ(共享会话里 QQ 就是会话绑定的那个) sent.length = 0; const gw = bind(gateway({ sessions: { replyTarget: 'qq' } })); - await gw.sendReply('sess-1', turn('bili:172195454')); - assert.equal(sent[0][0], 'private:875692618', '一律回 QQ:B站 问的也回 QQ'); - assert.equal(gw.replyChannelFor({ id: 'sess-1' }, 'bili:172195454'), 'private:875692618', '提示词里的回复规则也要按 QQ 给'); + await gw.sendReply('sess-1', turn('bili:123456789')); + assert.equal(sent[0][0], 'private:12345678', '一律回 QQ:B站 问的也回 QQ'); + assert.equal(gw.replyChannelFor({ id: 'sess-1' }, 'bili:123456789'), 'private:12345678', '提示词里的回复规则也要按 QQ 给'); ok('一律回 QQ:回复和提示词规则都跟会话主通道走'); } @@ -115,8 +115,8 @@ const bind = (gw) => { sent.length = 0; const gw = bind(gateway({ sessions: { replyTarget: '由她决定' } })); assert.equal(gw.replyTarget(), 'source', '认不出来的值退回默认'); - await gw.sendReply('sess-1', turn('bili:172195454')); - assert.equal(sent[0][0], 'bili:172195454'); + await gw.sendReply('sess-1', turn('bili:123456789')); + assert.equal(sent[0][0], 'bili:123456789'); ok('配置写错不改变行为:还是哪边问的就回哪边'); } diff --git a/test/shared-session.mjs b/test/shared-session.mjs index 6434d4b..a8af303 100644 --- a/test/shared-session.mjs +++ b/test/shared-session.mjs @@ -38,8 +38,8 @@ function gateway(cfg) { } const cfg = { - qq: { enabled: true }, masterQqUin: '875692618', - bili: { enabled: true, masterUid: '172195454', links: ['172195454=875692618', '3777=66666666'] }, + qq: { enabled: true }, masterQqUin: '12345678', + bili: { enabled: true, masterUid: '123456789', links: ['123456789=12345678', '3777=66666666'] }, douyin: { enabled: true, masterName: '主人', links: ['douyin:7000000000000000001=12345678'] } }; @@ -108,12 +108,12 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ { // 1. B站 主人 关联了 QQ:会话开成 QQ 私聊那个,B站 自己不另开 const gw = gateway(cfg); - const agent = await gw.ensureSession(biliChat('172195454')); + const agent = await gw.ensureSession(biliChat('123456789')); const row = gw.chatForSession(agent.id); - assert.equal(row.channel_id, 'private:875692618', 'B站 私信要用 QQ 私聊那个会话'); - assert.equal(findChatSession(db, 'bili', 'bili:172195454'), null, 'B站 不该再有自己的会话'); + assert.equal(row.channel_id, 'private:12345678', 'B站 私信要用 QQ 私聊那个会话'); + assert.equal(findChatSession(db, 'bili', 'bili:123456789'), null, 'B站 不该再有自己的会话'); assert.match(row.title, /^QQ·/, '标题按 QQ 那边起(不叫 B站·…)'); - assert.equal(gw.ownerChannelOf(agent), 'private:875692618', '模型 / 暂停这些跟着主通道走'); + assert.equal(gw.ownerChannelOf(agent), 'private:12345678', '模型 / 暂停这些跟着主通道走'); ok('B站 私信关联了 QQ → 用同一个人的 QQ 会话,不另开会话'); } @@ -137,8 +137,8 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ { // 4. QQ 关着:不并(并了会往一个 QQ 连不上的会话里塞 B站 的话) const gw = gateway({ ...cfg, qq: { enabled: false } }); - const agent = await gw.ensureSession(biliChat('172195454')); - assert.equal(gw.chatForSession(agent.id).channel_id, 'bili:172195454'); + const agent = await gw.ensureSession(biliChat('123456789')); + assert.equal(gw.chatForSession(agent.id).channel_id, 'bili:123456789'); ok('QQ 没开 → B站 不并进 QQ 会话'); } @@ -173,14 +173,14 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ { // 7. 模型跟会话主通道走:B站 的消息不能把同一个会话的模型来回换(换一次 KV cache 就废一次) const withModels = { ...cfg, chatModels: { overrides: [ - { channelId: 'bili:172195454', provider: 'ds', model: 'bili-model' }, - { channelId: 'private:875692618', provider: 'ds', model: 'qq-model' } + { channelId: 'bili:123456789', provider: 'ds', model: 'bili-model' }, + { channelId: 'private:12345678', provider: 'ds', model: 'qq-model' } ] } }; const gw = gateway(withModels); - const agent0 = await gw.ensureSession(biliChat('172195454')); + const agent0 = await gw.ensureSession(biliChat('123456789')); const selected = []; const agent = { id: agent0.id, model: { current: () => ({ provider: 'ds', model: 'default-model' }), select: (s) => selected.push(s) } }; - gw.applyChatModelFor(agent, 'bili:172195454'); + gw.applyChatModelFor(agent, 'bili:123456789'); assert.deepEqual(selected, [{ provider: 'ds', model: 'qq-model' }], '共享会话按 QQ 那边配的模型走'); ok('共享会话的模型跟着主通道(QQ)走,B站 的模型配置不改它'); } @@ -189,7 +189,7 @@ const biliChat = (uid) => ({ channelId: `bili:${uid}`, chatType: 'private', targ // 8. 同一批消息只开一个会话:两个平台同时进来不会各建一个 created.length = 0; const gw = gateway(cfg); - const [a, b] = await Promise.all([gw.ensureSession(biliChat('172195454')), gw.ensureSession({ channelId: 'private:875692618', chatType: 'private', targetId: '875692618', title: '' })]); + const [a, b] = await Promise.all([gw.ensureSession(biliChat('123456789')), gw.ensureSession({ channelId: 'private:12345678', chatType: 'private', targetId: '12345678', title: '' })]); assert.equal(a.id, b.id, '两个通道同时来消息也只有一个会话'); assert.equal(created.length, 1); ok('QQ 和 B站 同时进来:只建一个会话');