dscs-server 0.1.4 → 0.1.5

package/README.md

@@ -2,7 +2,7 @@
 
 DSH Session CloudSync 的自部署服务端。
 
-当前发布版本：**0.1.4**（协议版本 3，设备 API 只有 `/v2/*`；数据库结构版本 6）。
+当前发布版本：**0.1.5**（协议版本 3，设备 API 只有 `/v2/*`；数据库结构版本 6）。
 
 ## 能做什么
 
@@ -10,6 +10,7 @@ DSH Session CloudSync 的自部署服务端。
 - **私有部署**：数据留在自己的机器或 NAS，不经过第三方；
 - **端到端加密**：服务端只保存不透明密文和同步所需的基本信息，看不到会话内容；
 - **弱网可用**：断点续传、批量传输、加密前压缩，网络恢复后继续；
+- **附件通道**：加密附件（图片/文件）与按批次的附件索引有独立的 blob 类型，会话移除时一并释放；插件侧接入后生效；
 - **不会互相覆盖**：同一时间只允许一台设备上传，避免多端同时写乱；
 - **设备管理**：签发/改名/吊销设备，查看最后在线时间，为设备设置颜色；
 - **会话管理**：存档、移除并释放空间、重置后重新上传、恢复存档；
@@ -70,6 +71,7 @@ printf '%s' "$NEW_PASSWORD" | dscs-server admin reset-password --data-dir /var/l
 - 默认只监听 `127.0.0.1`，公网部署请放在 TLS 反代后；
 - 数据目录包含 SQLite、blob 文件与迁移备份，升级前请先备份；
 - 数据库结构版本 6，支持从旧版本自动迁移，迁移前会写本地备份；
+- 0.1.5 不迁移数据库，可直接回滚；旧插件不受影响（附件功能按 `/health` 的 `attachment-index` capability 门控）；
 - 旧的变更流接口已移除；0.1.0 插件不兼容，需要插件 >= 0.1.1；
 - 服务端不持有明文会话内容，只存不透明密文和同步元数据；
 - 已有未压缩会话不会自动压缩；需要清空数据目录后由插件全量重传；

package/dist/http.js

@@ -485,7 +485,8 @@ export function createHttpServer(options) {
                             'zstd-frame',
                             'me-device-info',
                             'me-counts',
-                            'device-rename'
+                            'device-rename',
+                            'attachment-index'
                         ],
                         limits: {
                             batchBytes: MAX_BATCH_BODY_BYTES,
@@ -745,7 +746,7 @@ export function createHttpServer(options) {
                     if (!await hasBlob(options.dataDir, sha256)) return json(res, 404, errorBody('not-found', `没有这个 blob：${sha256}`));
                     const record = blobRecord(db, sha256);
                     if (record === undefined) return json(res, 404, errorBody('not-found', `没有这个 blob：${sha256}`));
-                    if (record.kind !== 'frame' && record.kind !== 'attachment' && record.kind !== 'vault') {
+                    if (record.kind !== 'frame' && record.kind !== 'attachment' && record.kind !== 'attachment-index' && record.kind !== 'vault') {
                         throw new SyncError('bad-request', `blob 类别非法：${record.kind}`);
                     }
                     kinds.push(record.kind);
@@ -778,8 +779,8 @@ export function createHttpServer(options) {
                 if (auth === undefined) return json(res, 401, errorBody('unauthorized', '需要设备或 setup token'));
                 const url = new URL(req.url ?? '/', 'http://localhost');
                 const kind = url.searchParams.get('kind') ?? 'frame';
-                if (kind !== 'frame' && kind !== 'attachment' && kind !== 'vault') {
-                    return json(res, 400, errorBody('bad-request', 'kind 只能是 frame、attachment 或 vault'));
+                if (kind !== 'frame' && kind !== 'attachment' && kind !== 'attachment-index' && kind !== 'vault') {
+                    return json(res, 400, errorBody('bad-request', 'kind 只能是 frame、attachment、attachment-index 或 vault'));
                 }
                 const bytes = await readRaw(req, maxBlobBytes);
                 if (bytes.length === 0) return json(res, 400, errorBody('bad-request', 'blob 不能为空'));

package/dist/session-admin.js

@@ -13,11 +13,28 @@ function requireTarget(db, sessionId, createdAt) {
     if (row.created_at !== createdAt) throw new SyncError('conflict', 'createdAt 与当前生命周期不符');
     return row;
 }
+function manifestBlobRefs(manifest) {
+    const frames = Array.isArray(manifest.frames) ? manifest.frames : [];
+    const hashes = [];
+    for (const frame of frames){
+        if (frame === null || typeof frame !== 'object') continue;
+        const record = frame;
+        if (typeof record.blobSha256 === 'string' && record.blobSha256 !== '') hashes.push(record.blobSha256);
+        if (typeof record.attachmentIndexSha256 === 'string' && record.attachmentIndexSha256 !== '') {
+            hashes.push(record.attachmentIndexSha256);
+        }
+        if (Array.isArray(record.attachmentBlobs)) {
+            for (const sha of record.attachmentBlobs){
+                if (typeof sha === 'string' && sha !== '') hashes.push(sha);
+            }
+        }
+    }
+    return hashes;
+}
 function purgeSessionBlobs(db, dataDir, sessionId, manifestJson) {
     let hashes;
     try {
-        const manifest = JSON.parse(manifestJson);
-        hashes = (Array.isArray(manifest.frames) ? manifest.frames : []).map((frame)=>frame !== null && typeof frame === 'object' ? frame.blobSha256 : undefined).filter((hash)=>typeof hash === 'string' && hash !== '');
+        hashes = manifestBlobRefs(JSON.parse(manifestJson));
     } catch  {
         throw new SyncError('conflict', '会话 manifest 损坏，拒绝清理');
     }
@@ -32,10 +49,7 @@ function purgeSessionBlobs(db, dataDir, sessionId, manifestJson) {
     const otherRows = db.handle.prepare('SELECT manifest_json FROM sessions WHERE dataset = ? AND session_id <> ?').all(DEFAULT_DATASET, sessionId);
     for (const row of otherRows){
         try {
-            const manifest = JSON.parse(row.manifest_json);
-            for (const frame of Array.isArray(manifest.frames) ? manifest.frames : []){
-                if (frame !== null && typeof frame === 'object' && typeof frame.blobSha256 === 'string') otherHashes.add(frame.blobSha256);
-            }
+            for (const hash of manifestBlobRefs(JSON.parse(row.manifest_json)))otherHashes.add(hash);
         } catch  {
             for (const hash of unique)otherHashes.add(hash);
         }

package/dist/sessions.js

@@ -3,12 +3,13 @@ import { assertChain, buildManifest, manifestDigest, stableStringify } from './s
 import { sha256 } from './shared/crypto.js';
 import { SyncError } from './shared/wire.js';
 import { blobPath } from './blobs.js';
-import { DEFAULT_DATASET, bumpRevision, readAppendRequest, withTransaction, writeAppendRequest } from './db.js';
+import { DEFAULT_DATASET, blobRecord, bumpRevision, readAppendRequest, withTransaction, writeAppendRequest } from './db.js';
 import { requireLease as requireResourceLease, SYNC_RESOURCE } from './leases.js';
 import { recordSessionEvent } from './session-history.js';
 export const MAX_APPEND_BODY_BYTES = 8 * 1024 * 1024;
 const HASH = /^[0-9a-f]{64}$/u;
 const KEY_ID = /^[0-9a-f]{16}$/u;
+export const MAX_FRAME_ATTACHMENT_BLOBS = 256;
 function assertRef(frame, expectedIndex) {
     if (frame.index !== expectedIndex) throw new SyncError('bad-request', `帧下标应为 ${expectedIndex}，实际是 ${frame.index}`);
     if (!HASH.test(frame.chainHash) || !HASH.test(frame.blobSha256)) throw new SyncError('bad-request', `帧 ${expectedIndex} 的哈希非法`);
@@ -28,6 +29,27 @@ function assertRef(frame, expectedIndex) {
         }
     }
     if (!Number.isSafeInteger(frame.seqFrom) || !Number.isSafeInteger(frame.seqTo)) throw new SyncError('bad-request', `帧 ${expectedIndex} 的 seq 非法`);
+    if (frame.attachmentIndexSha256 !== undefined && !HASH.test(frame.attachmentIndexSha256)) {
+        throw new SyncError('bad-request', `帧 ${expectedIndex} 的附件索引哈希非法`);
+    }
+    const attachments = frame.attachmentBlobs;
+    if (attachments !== undefined) {
+        if (!Array.isArray(attachments) || attachments.length < 1 || attachments.length > MAX_FRAME_ATTACHMENT_BLOBS) {
+            throw new SyncError('bad-request', `帧 ${expectedIndex} 的附件列表必须是 1–${MAX_FRAME_ATTACHMENT_BLOBS} 个哈希`);
+        }
+        const seen = new Set();
+        for (const sha of attachments){
+            if (typeof sha !== 'string' || !HASH.test(sha)) throw new SyncError('bad-request', `帧 ${expectedIndex} 的附件哈希非法`);
+            if (seen.has(sha)) throw new SyncError('bad-request', `帧 ${expectedIndex} 的附件列表重复：${sha}`);
+            seen.add(sha);
+        }
+    }
+}
+function requireStoredBlob(db, dataDir, sha256, kind, label) {
+    if (!existsSync(blobPath(dataDir, sha256))) throw new SyncError('bad-request', `${label} ${sha256} 尚未上传`);
+    const record = blobRecord(db, sha256);
+    if (record === undefined) throw new SyncError('bad-request', `${label} ${sha256} 没有登记`);
+    if (record.kind !== kind) throw new SyncError('bad-request', `${label} ${sha256} 的类别是 ${record.kind}，应为 ${kind}`);
 }
 function toChain(frames) {
     return frames.map((frame)=>({
@@ -199,6 +221,14 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
             if (!existsSync(blobPath(dataDir, frame.blobSha256))) throw new SyncError('bad-request', `帧 ${frame.index} 的 blob 尚未上传`);
         }
         input.frames.forEach((frame, offset)=>assertRef(frame, (row === undefined || replacingLifecycle ? 0 : input.baseIndex + 1) + offset));
+        for (const frame of input.frames){
+            if (frame.attachmentIndexSha256 !== undefined) {
+                requireStoredBlob(db, dataDir, frame.attachmentIndexSha256, 'attachment-index', `帧 ${frame.index} 的附件索引`);
+            }
+            for (const sha of frame.attachmentBlobs ?? []){
+                requireStoredBlob(db, dataDir, sha, 'attachment', `帧 ${frame.index} 的附件`);
+            }
+        }
         const { manifest, digest, headChainHash } = manifestOf(input.sessionId, formatVersion, createdAt, now, combined, input.tailOpen, input.safeThroughSeq, workspaceKey, parentSession, origin, delegationDepth);
         const revision = bumpRevision(db);
         const stats = statsOf(combined);

package/dist/shared/blob-batch.js

@@ -10,12 +10,14 @@ const VERSION = 1;
 const KIND_TO_CODE = {
     frame: 1,
     attachment: 2,
-    vault: 3
+    vault: 3,
+    'attachment-index': 4
 };
 const CODE_TO_KIND = {
     1: 'frame',
     2: 'attachment',
-    3: 'vault'
+    3: 'vault',
+    4: 'attachment-index'
 };
 export function encodeBlobBatch(entries) {
     if (entries.length < 1 || entries.length > MAX_BATCH_BLOBS) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dscs-server",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "type": "module",
   "description": "DSH Session CloudSync self-hosted server.",