@xiaoyuyu6420/dsh-backup 0.9.1 → 0.11.0

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@xiaoyuyu6420/dsh-backup",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "description": "Backup, restore, download and GitHub-sync DeepSeek Harness user data (~/.dsh): /backup, scheduled auto-backup that survives restarts, sha256 checksums, integrity verify, rotation, credential redaction with a local vault (plaintext never leaves the machine), cross-machine restore preflight with github pull, and a visual Settings panel. Cross-platform (macOS/Linux/Windows). 一键备份与恢复 DSH 数据：定时自动备份、完整性校验、凭据默认脱敏（明文只存本机 vault）、跨机恢复预检与 github pull 拉取，附 Settings 可视面板。",
   "type": "module",
+  "packageManager": "pnpm@11.24.0",
   "main": "lib/index.js",
   "exports": {
     ".": "./lib/index.js",

package/rescue/rescue.mjs

@@ -104,7 +104,7 @@ async function listBackups(root) {
   }
   const backups = [];
   for (const d of dirents) {
-    if (!d.name.startsWith('dsh-') || d.name.startsWith('dsh-pre-restore-') || !d.name.endsWith('.tar.gz')) continue;
+    if (!d.name.startsWith('dsh-') || d.name.startsWith('dsh-pre-restore-') || d.name.startsWith('dsh-t-') || !d.name.endsWith('.tar.gz')) continue;
     let size;
     try {
       size = (await fs.stat(`${root}/${d.name}`)).size;
@@ -133,9 +133,9 @@ async function verifyOne(root, name) {
   try {
     expected = (await fs.readFile(`${root}/${name}.sha256`, 'utf8')).trim().split(/\s+/)[0];
   } catch { /* 边车缺失 */ }
-  if (!/^[0-9a-f]{64}$/.test(expected)) return { name, ok: false, note: '缺少或无效的 .sha256 边车文件' };
+  if (!/^[0-9a-f]{64}$/.test(expected)) return { name, ok: false, note: '缺少或无效的配套校验文件（.sha256）——无法确认这份备份是否完好' };
   const actual = await sha256File(`${root}/${name}`);
-  return { name, ok: actual === expected, note: actual === expected ? '完整' : 'sha256 不匹配（归档已损坏）' };
+  return { name, ok: actual === expected, note: actual === expected ? '完整' : '校验和不匹配（归档或校验文件之一可能损坏）' };
 }
 
 async function pickArchive(root, selector) {
@@ -238,12 +238,9 @@ function walkZstdFrames(buf) {
       frames.push([off, pos]);
       off = pos;
     } else if (magic >= 0x184d2a50 && magic <= 0x184d2a5f) {
-      if (buf.length - off < 8) throw new Error('skippable 帧头截断');
-      const size = buf.readUInt32LE(off + 4);
-      const end = off + 8 + size;
-      if (end > buf.length) throw new Error('skippable 帧数据越界');
-      frames.push([off, end]);
-      off = end;
+      // 宿主 scanZstdFrames 拒绝一切非数据帧魔数——容忍 skippable 会造成
+      // 「doctor 报 OK、宿主整体拒载」（#66，与 lib/index.js 同步）
+      throw new Error('遇 skippable 帧——宿主读端不支持任何非数据帧魔数，整个文件将被拒载');
     } else {
       throw new Error(`偏移 ${off} 处不是 zstd 帧魔数`);
     }
@@ -251,18 +248,32 @@ function walkZstdFrames(buf) {
   return frames;
 }
 
+/**
+ * 解出 .zstd 会话日志的全部逻辑行；任一帧损坏即抛错。同时对首个数据帧做
+ * 宿主容器契约判定 headerFrameOk——宿主 assertZstdHeaderFrame 是字节精确的：
+ * 首帧解出必须非空、且首个换行符恰在最后一个字节（「恰好一行、单个 \n 结尾」）。
+ * 行流拼接校验覆盖不到这条（#66，与 lib/index.js 同步）。
+ */
 function decodeZstdLog(buf) {
   const parts = [];
   let frameNo = 0;
+  let headerFrameOk;
   for (const [s, e] of walkZstdFrames(buf)) {
     frameNo += 1;
     try {
-      parts.push(zlib.zstdDecompressSync(buf.subarray(s, e)));
+      const out = zlib.zstdDecompressSync(buf.subarray(s, e));
+      parts.push(out);
+      if (headerFrameOk === undefined) {
+        headerFrameOk = out.length > 0 && out.indexOf(10) === out.length - 1;
+      }
     } catch (err) {
       throw new Error(`第 ${frameNo} 帧解压失败：${String(err && err.message ? err.message : err)}`);
     }
   }
-  return Buffer.concat(parts).toString('utf8').split('\n').filter((l) => l.length > 0);
+  return {
+    lines: Buffer.concat(parts).toString('utf8').split('\n').filter((l) => l.length > 0),
+    headerFrameOk,
+  };
 }
 
 function validateSessionLines(lines) {
@@ -329,8 +340,13 @@ async function validateSessionFile(f) {
       return { state: 'skipped', reason: `文件 ${Math.floor(info.size / 1048576)}MB 超过深度校验上限` };
     }
     let lines;
+    let headerFrameOk;
     if (f.abs.endsWith('.zstd')) {
-      lines = decodeZstdLog(await fs.readFile(f.abs));
+      ({ lines, headerFrameOk } = decodeZstdLog(await fs.readFile(f.abs)));
+      // 容器契约（#66/#1047）：首帧必须解出「恰好一行 header、单个换行结尾」
+      if (headerFrameOk === false) {
+        return { state: 'bad', reason: '首帧不是恰好一行 header——违反容器契约（首帧应解出一行 SessionHeader 且以单个换行结尾；单帧重写/多余空行/缺行尾的典型形态，宿主读端会拒载）' };
+      }
     } else {
       lines = (await fs.readFile(f.abs, 'utf8')).split('\n').filter((l) => l.length > 0);
     }
@@ -430,6 +446,11 @@ async function restoreArchive(root, selector, apply) {
   const parent = dshHome.slice(0, -(base.length + 1)) || '/';
   const entries = safeEntries(run(['tar', '-tvzf', picked.name], root), base);
   const { meta, redactedFiles } = await readArchiveMeta(root, picked.name);
+  // 分类型归档是子集，整包恢复会挪旁 ~/.dsh 后只解压子集 → 丢失未包含的类型
+  // 数据。灾时请用全量归档（dsh-）整包恢复；分类型恢复走 dsh 的 --types。
+  if (meta && Array.isArray(meta.types) && meta.types.length) {
+    throw new Error(`${picked.name} 是分类型归档（${meta.types.join(', ')}），整包恢复会丢失其他类型数据。请选一份全量归档（dsh- 开头）整包恢复，或用 dsh 的「/backup restore ${picked.name} --types ${meta.types.join(',')}」分类型恢复。`);
+  }
   const home = userHome();
   const preflight = [];
   if (meta && typeof meta.home === 'string' && home && meta.home !== home) {
@@ -547,8 +568,27 @@ dialog::backdrop{background:rgba(0,0,0,.4)}
   <button class="danger" id="confirmGo">确认恢复</button></div></dialog>
 <p class="note">恢复是整体替换：现有数据会先自动快照再挪到一旁（.dsh.pre-restore-*），凭据从本机 vault 补回。只监听本机回环地址。</p>
 <script>
-const log = (t) => { document.getElementById('log').textContent = typeof t === 'string' ? t : JSON.stringify(t, null, 2); };
+const ERR_TEXT = {
+  'not-found': '接口不存在（可能是浏览器缓存了旧页面），请刷新后重试',
+  'missing-rescue-header': '页面安全校验未通过，请刷新页面后重试',
+  'confirm-required': '该操作需要先在确认框里确认',
+  'unknown-op': '未知的操作类型，请刷新页面后重试',
+  'bad-json': '请求内容无法解析，请刷新页面后重试',
+  'too-large': '请求内容过大',
+  'no-archive': '备份目录里没有可用的归档，请先确认备份目录位置',
+};
+// 失败结果按"出了什么问题 + 怎么办"展示；未知错误再回退 JSON 细节
+const show = (r) => {
+  if (r.ok !== false) return typeof r === 'string' ? r : JSON.stringify(r, null, 2);
+  // 校验类失败（verify/restore 拦截）没有 error 码，note/summary 本身就是人话主文案
+  const note = typeof (r.note || r.summary) === 'string' ? (r.note || r.summary) : null;
+  const human = ERR_TEXT[r.error] || note || '操作失败';
+  const detail = r.summary || r.note || r.error;
+  return '❌ ' + human + (detail && detail !== r.error && detail !== human ? '\\n技术细节: ' + (typeof detail === 'string' ? detail : JSON.stringify(detail)) : '');
+};
+const log = (t) => { document.getElementById('log').textContent = typeof t === 'string' ? t : show(t); };
 const dlg = document.getElementById('confirm');
+const fmtSize = (n) => typeof n !== 'number' ? '?' : n >= 1048576 ? (n/1048576).toFixed(1) + 'MB' : Math.max(1, Math.round(n/1024)) + 'KB';
 async function api(op, body) {
   const res = await fetch('/api/' + op, { method: 'POST', headers: { 'Content-Type': 'application/json', 'X-Dsh-Rescue': '1' }, body: JSON.stringify(body || {}) });
   return res.json();
@@ -556,7 +596,7 @@ async function api(op, body) {
 async function renderList() {
   const r = await api('list');
   if (!r.ok) { log(r); return; }
-  const rows = r.backups.map(b => '<tr><td>' + b.name + '</td><td>' + (b.size ? (b.size/1048576).toFixed(1) + 'MB' : '?') +
+  const rows = r.backups.map(b => '<tr><td>' + b.name + '</td><td>' + fmtSize(b.size) +
     '</td><td><button onclick="verify(\\'' + b.name + '\\')">校验</button> ' +
     '<button class="danger" onclick="restore(\\'' + b.name + '\\')">恢复…</button></td></tr>').join('');
   document.getElementById('list').innerHTML = r.backups.length