dscs-server 0.1.3 → 0.1.5

package/dist/sessions.js

@@ -3,11 +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, readRevision, 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} 的哈希非法`);
@@ -27,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)=>({
@@ -37,7 +60,18 @@ function toChain(frames) {
         }));
 }
 function sessionRow(db, sessionId) {
-    return db.handle.prepare('SELECT created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, compression, stored_bytes FROM sessions WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+    return db.handle.prepare('SELECT created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, purged_at, compression, stored_bytes FROM sessions WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+}
+function activeReset(db, sessionId, now) {
+    const row = db.handle.prepare('SELECT device_id, expires_at FROM session_resets WHERE dataset = ? AND session_id = ?').get(DEFAULT_DATASET, sessionId);
+    if (row === undefined) return undefined;
+    if (row.expires_at <= now) {
+        db.handle.prepare('DELETE FROM session_resets WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, sessionId);
+        return undefined;
+    }
+    return {
+        device_id: row.device_id
+    };
 }
 function manifestOf(sessionId, formatVersion, createdAt, updatedAt, frames, tailOpen, safeThroughSeq, workspaceKey, parentSession, origin, delegationDepth) {
     assertChain(toChain(frames));
@@ -105,6 +139,10 @@ function appendRequestHash(input) {
 }
 export function appendFrames(db, dataDir, input, now = Date.now()) {
     return withTransaction(db, ()=>{
+        const reset = activeReset(db, input.sessionId, now);
+        if (reset !== undefined && reset.device_id !== null && reset.device_id !== input.deviceId) {
+            throw new SyncError('reset-pending', '该会话正在等待指定设备重建');
+        }
         const idempotencyKey = input.idempotencyKey;
         const requestHash = idempotencyKey === undefined ? undefined : appendRequestHash(input);
         if (idempotencyKey !== undefined && requestHash !== undefined) {
@@ -125,6 +163,9 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         let parentSession = input.parentSession;
         let origin = input.origin;
         let delegationDepth = input.delegationDepth;
+        if (row !== undefined && row.purged_at !== null) {
+            throw new SyncError('gone', `会话 ${input.sessionId} 已移除并释放空间，需要由管理台重置后才能重建`);
+        }
         if (row !== undefined && row.deleted_at !== null && row.created_at === input.createdAt) {
             throw new SyncError('gone', `会话 ${input.sessionId} 的这个生命周期已被删除`);
         }
@@ -180,16 +221,24 @@ 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);
-        db.handle.prepare(`INSERT INTO sessions (dataset, session_id, created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, compression, stored_bytes)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, ?, ?)
+        db.handle.prepare(`INSERT INTO sessions (dataset, session_id, created_at, format_version, last_seq, frame_count, head_chain_hash, manifest_json, manifest_digest, revision, updated_at, deleted_at, purged_at, compression, stored_bytes)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?)
                 ON CONFLICT(dataset, session_id) DO UPDATE SET
                   created_at = excluded.created_at, format_version = excluded.format_version, last_seq = excluded.last_seq,
                   frame_count = excluded.frame_count, head_chain_hash = excluded.head_chain_hash,
                   manifest_json = excluded.manifest_json, manifest_digest = excluded.manifest_digest,
-                  revision = excluded.revision, updated_at = excluded.updated_at, deleted_at = NULL,
+                  revision = excluded.revision, updated_at = excluded.updated_at, deleted_at = NULL, purged_at = NULL,
                   compression = excluded.compression, stored_bytes = excluded.stored_bytes`).run(DEFAULT_DATASET, input.sessionId, createdAt, formatVersion, manifest.lastSeq, combined.length, headChainHash, JSON.stringify(manifest), digest, revision, now, stats.compression, stats.storedBytes);
         const summary = {
             sessionId: input.sessionId,
@@ -206,6 +255,37 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         if (idempotencyKey !== undefined && requestHash !== undefined) {
             writeAppendRequest(db, input.deviceId, input.sessionId, idempotencyKey, requestHash, JSON.stringify(summary), now);
         }
+        if (reset !== undefined) {
+            db.handle.prepare('DELETE FROM session_resets WHERE dataset = ? AND session_id = ?').run(DEFAULT_DATASET, input.sessionId);
+        }
+        const created = row === undefined || replacingLifecycle;
+        const oldSeq = created ? 0 : row.last_seq;
+        const oldBytes = created ? 0 : row.stored_bytes;
+        const tailReplaced = !created && input.baseIndex < row.frame_count - 1;
+        recordSessionEvent(db, {
+            sessionId: input.sessionId,
+            at: now,
+            kind: created ? 'create' : 'append',
+            deviceId: input.deviceId,
+            actorKind: 'device',
+            actorId: input.deviceId,
+            events: tailReplaced ? 0 : Math.max(0, summary.lastSeq - oldSeq),
+            bytes: Math.max(0, summary.storedBytes - oldBytes),
+            seqFrom: input.frames[0]?.seqFrom ?? null,
+            seqTo: input.frames[input.frames.length - 1]?.seqTo ?? null,
+            batchCount: input.frames.length,
+            lastSeq: summary.lastSeq,
+            storedBytes: summary.storedBytes,
+            detail: {
+                createdAt,
+                ...tailReplaced ? {
+                    tailReplaced: true
+                } : {},
+                ...workspaceKey === undefined ? {} : {
+                    workspaceKey
+                }
+            }
+        });
         return summary;
     });
 }
@@ -219,6 +299,19 @@ export function deleteSession(db, sessionId, deviceId, clientId, createdAt, now
         const revision = bumpRevision(db);
         db.handle.prepare('UPDATE sessions SET deleted_at = ?, revision = ?, updated_at = ? WHERE dataset = ? AND session_id = ?').run(now, revision, now, DEFAULT_DATASET, sessionId);
         db.handle.prepare('INSERT OR REPLACE INTO tombstones (dataset, session_id, created_at, deleted_at, deleted_by) VALUES (?, ?, ?, ?, ?)').run(DEFAULT_DATASET, sessionId, createdAt, now, deviceId);
+        recordSessionEvent(db, {
+            sessionId,
+            at: now,
+            kind: 'device-delete',
+            deviceId,
+            actorKind: 'device',
+            actorId: deviceId,
+            lastSeq: row.last_seq,
+            storedBytes: row.stored_bytes,
+            detail: {
+                createdAt
+            }
+        });
         return {
             sessionId,
             revision,
@@ -253,7 +346,10 @@ export function listBatches(db, sessionId, from, limit) {
 }
 const V2_SUMMARY_SELECT = `s.session_id, s.created_at, s.format_version, s.last_seq, s.frame_count,
   s.head_chain_hash, s.manifest_digest, s.revision, s.updated_at, s.deleted_at,
-  s.compression, s.stored_bytes,
+  s.purged_at, s.compression, s.stored_bytes,
+  (SELECT t.deleted_by FROM tombstones t
+     WHERE t.dataset = s.dataset AND t.session_id = s.session_id AND t.created_at = s.created_at
+     LIMIT 1) AS deleted_by,
   json_extract(s.manifest_json, '$.workspaceKey') AS workspace_key,
   json_extract(s.manifest_json, '$.tailOpen') AS tail_open,
   json_extract(s.manifest_json, '$.safeThroughSeq') AS safe_through_seq,
@@ -279,15 +375,17 @@ function mapV2Summary(row) {
         delegationDepth: typeof row.delegation_depth === 'number' && Number.isSafeInteger(row.delegation_depth) ? row.delegation_depth : null,
         updatedAt: row.updated_at,
         deletedAt: row.deleted_at,
+        deletedBy: row.deleted_by,
+        purgedAt: row.purged_at,
         compression: compressionOf(row.compression),
         storedBytes: Number.isSafeInteger(row.stored_bytes) ? row.stored_bytes : 0
     };
 }
-export function listV2Sessions(db, after, limit) {
+export function listV2Sessions(db, after, limit, includeDeleted = false) {
     const rows = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
               FROM sessions s
-              WHERE s.dataset = ? AND s.deleted_at IS NULL AND s.session_id > ?
-              ORDER BY s.session_id ASC LIMIT ?`).all(DEFAULT_DATASET, after ?? '', limit + 1);
+              WHERE s.dataset = ? AND (? = 1 OR s.deleted_at IS NULL) AND s.session_id > ?
+              ORDER BY s.session_id ASC LIMIT ?`).all(DEFAULT_DATASET, includeDeleted ? 1 : 0, after ?? '', limit + 1);
     const visible = rows.slice(0, limit);
     const last = visible[visible.length - 1];
     return {
@@ -295,40 +393,6 @@ export function listV2Sessions(db, after, limit) {
         nextSessionId: rows.length > limit && last !== undefined ? last.session_id : null
     };
 }
-export function listV2Changes(db, sinceRevision, sinceTombstone, limit) {
-    const highWater = Math.max(sinceRevision, readRevision(db));
-    const rows = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
-              FROM sessions s
-              WHERE s.dataset = ? AND s.deleted_at IS NULL AND s.revision > ? AND s.revision <= ?
-              ORDER BY s.revision ASC LIMIT ?`).all(DEFAULT_DATASET, sinceRevision, highWater, limit + 1);
-    const tombstoneRows = db.handle.prepare(`SELECT session_id, created_at, deleted_at FROM tombstones
-              WHERE dataset = ? AND (
-                deleted_at > ? OR
-                (deleted_at = ? AND session_id > ?) OR
-                (deleted_at = ? AND session_id = ? AND created_at > ?)
-              )
-              ORDER BY deleted_at ASC, session_id ASC, created_at ASC LIMIT ?`).all(DEFAULT_DATASET, sinceTombstone.deletedAt, sinceTombstone.deletedAt, sinceTombstone.sessionId, sinceTombstone.deletedAt, sinceTombstone.sessionId, sinceTombstone.createdAt, limit + 1);
-    const visible = rows.slice(0, limit);
-    const visibleTombstones = tombstoneRows.slice(0, limit);
-    const last = visible[visible.length - 1];
-    const lastTombstone = visibleTombstones[visibleTombstones.length - 1];
-    const hasMore = rows.length > limit || tombstoneRows.length > limit;
-    return {
-        sessions: visible.map(mapV2Summary),
-        tombstones: visibleTombstones.map((row)=>({
-                sessionId: row.session_id,
-                createdAt: row.created_at,
-                deletedAt: row.deleted_at
-            })),
-        nextRevision: rows.length > limit && last !== undefined ? last.revision : highWater,
-        nextTombstone: lastTombstone === undefined ? sinceTombstone : {
-            deletedAt: lastTombstone.deleted_at,
-            sessionId: lastTombstone.session_id,
-            createdAt: lastTombstone.created_at
-        },
-        hasMore
-    };
-}
 export function getV2SessionSummary(db, sessionId) {
     const row = db.handle.prepare(`SELECT ${V2_SUMMARY_SELECT}
               FROM sessions s
@@ -347,11 +411,26 @@ export function listV2Batches(db, sessionId, from, limit) {
     };
 }
 export function adminSessions(db, limit = 500) {
-    const rows = db.handle.prepare(`SELECT s.session_id, s.created_at, s.format_version, s.frame_count, s.last_seq, s.head_chain_hash,
-                     s.revision, s.updated_at, s.deleted_at,
-                     json_extract(s.manifest_json, '$.workspaceKey') AS workspace_key
-              FROM sessions s
-              WHERE s.dataset = ? ORDER BY s.updated_at DESC LIMIT ?`).all(DEFAULT_DATASET, limit);
+    const rows = db.handle.prepare(`SELECT * FROM (
+                SELECT s.session_id, s.created_at, s.format_version, s.frame_count, s.last_seq, s.head_chain_hash,
+                       s.revision, s.updated_at, s.deleted_at, s.purged_at, s.stored_bytes,
+                       t.deleted_by, r.device_id AS reset_device_id, r.expires_at AS reset_expires_at, r.reset_at,
+                       COALESCE(json_extract(s.manifest_json, '$.workspaceKey'), r.workspace_key) AS workspace_key
+                FROM sessions s
+                LEFT JOIN tombstones t
+                  ON t.dataset = s.dataset AND t.session_id = s.session_id AND t.created_at = s.created_at
+                LEFT JOIN session_resets r
+                  ON r.dataset = s.dataset AND r.session_id = s.session_id
+                WHERE s.dataset = ?
+                UNION ALL
+                SELECT r.session_id, r.created_at, 0, 0, 0, '', 0, r.reset_at, NULL, NULL, 0,
+                       NULL, r.device_id, r.expires_at, r.reset_at, r.workspace_key
+                FROM session_resets r
+                WHERE r.dataset = ? AND NOT EXISTS (
+                  SELECT 1 FROM sessions s WHERE s.dataset = r.dataset AND s.session_id = r.session_id
+                )
+              )
+              ORDER BY updated_at DESC LIMIT ?`).all(DEFAULT_DATASET, DEFAULT_DATASET, limit);
     return rows.map((row)=>({
             sessionId: row.session_id,
             createdAt: row.created_at,
@@ -362,6 +441,12 @@ export function adminSessions(db, limit = 500) {
             revision: row.revision,
             updatedAt: row.updated_at,
             deletedAt: row.deleted_at,
+            deletedBy: row.deleted_by,
+            purgedAt: row.purged_at,
+            resetAt: row.reset_at,
+            resetDeviceId: row.reset_device_id,
+            resetExpiresAt: row.reset_expires_at,
+            storedBytes: row.stored_bytes,
             workspaceKey: row.workspace_key === null ? null : String(row.workspace_key)
         }));
 }
@@ -372,31 +457,6 @@ export function sessionCounts(db) {
         deleted: Number(row?.deleted ?? 0)
     };
 }
-export function listChanges(db, since, limit) {
-    const rows = db.handle.prepare('SELECT session_id, created_at, format_version, frame_count, head_chain_hash, manifest_digest, revision, updated_at, deleted_at FROM sessions WHERE dataset = ? AND revision > ? ORDER BY revision ASC LIMIT ?').all(DEFAULT_DATASET, since, limit + 1);
-    const tombstones = db.handle.prepare('SELECT session_id, created_at, deleted_at FROM tombstones WHERE dataset = ? AND deleted_at > ? ORDER BY deleted_at ASC LIMIT ?').all(DEFAULT_DATASET, since, limit + 1);
-    const sessions = rows.slice(0, limit).map((row)=>({
-            sessionId: row.session_id,
-            revision: row.revision,
-            formatVersion: row.format_version,
-            createdAt: row.created_at,
-            batchCount: row.frame_count,
-            headChainHash: row.head_chain_hash,
-            manifestDigest: row.manifest_digest,
-            updatedAt: row.updated_at,
-            deletedAt: row.deleted_at
-        }));
-    return {
-        revision: readRevision(db),
-        sessions,
-        tombstones: tombstones.slice(0, limit).map((row)=>({
-                sessionId: row.session_id,
-                createdAt: row.created_at,
-                deletedAt: row.deleted_at
-            })),
-        hasMore: rows.length > limit || tombstones.length > limit
-    };
-}
 
 
 //# sourceURL=sessions.ts

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/dist/shared/wire.js

@@ -5,6 +5,7 @@ export const ERROR_STATUS = {
     conflict: 409,
     diverged: 409,
     'lease-held': 409,
+    'reset-pending': 409,
     gone: 410,
     quota: 507,
     'rate-limited': 429

package/package.json

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