dscs-server 0.1.1 → 0.1.2

package/dist/http.js

@@ -223,6 +223,15 @@ function parseAppend(body) {
     if (body.workspaceKey !== undefined && (typeof body.workspaceKey !== 'string' || !/^[A-Za-z0-9_-]{16,64}$/u.test(body.workspaceKey))) {
         throw new SyncError('bad-request', 'workspaceKey 非法');
     }
+    if (body.parentSession !== undefined && (typeof body.parentSession !== 'string' || body.parentSession === '')) {
+        throw new SyncError('bad-request', 'parentSession 必须是非空字符串');
+    }
+    if (body.origin !== undefined && (typeof body.origin !== 'string' || body.origin === '')) {
+        throw new SyncError('bad-request', 'origin 必须是非空字符串');
+    }
+    if (body.delegationDepth !== undefined && (!Number.isSafeInteger(body.delegationDepth) || Number(body.delegationDepth) < 0)) {
+        throw new SyncError('bad-request', 'delegationDepth 必须是非负整数');
+    }
     return {
         baseIndex: Number(body.baseIndex),
         baseChainHash: baseChainHash,
@@ -237,6 +246,15 @@ function parseAppend(body) {
         },
         ...body.workspaceKey === undefined ? {} : {
             workspaceKey: body.workspaceKey
+        },
+        ...body.parentSession === undefined ? {} : {
+            parentSession: body.parentSession
+        },
+        ...body.origin === undefined ? {} : {
+            origin: body.origin
+        },
+        ...body.delegationDepth === undefined ? {} : {
+            delegationDepth: Number(body.delegationDepth)
         }
     };
 }

package/dist/sessions.js

@@ -39,7 +39,7 @@ 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);
 }
-function manifestOf(sessionId, formatVersion, createdAt, updatedAt, frames, tailOpen, safeThroughSeq, workspaceKey) {
+function manifestOf(sessionId, formatVersion, createdAt, updatedAt, frames, tailOpen, safeThroughSeq, workspaceKey, parentSession, origin, delegationDepth) {
     assertChain(toChain(frames));
     const manifest = buildManifest({
         sessionId,
@@ -55,6 +55,15 @@ function manifestOf(sessionId, formatVersion, createdAt, updatedAt, frames, tail
         },
         ...workspaceKey === undefined ? {} : {
             workspaceKey
+        },
+        ...parentSession === undefined ? {} : {
+            parentSession
+        },
+        ...origin === undefined ? {} : {
+            origin
+        },
+        ...delegationDepth === undefined ? {} : {
+            delegationDepth
         }
     });
     return {
@@ -88,7 +97,10 @@ function appendRequestHash(input) {
         frames: input.frames,
         tailOpen: input.tailOpen ?? null,
         safeThroughSeq: input.safeThroughSeq ?? null,
-        workspaceKey: input.workspaceKey ?? null
+        workspaceKey: input.workspaceKey ?? null,
+        parentSession: input.parentSession ?? null,
+        origin: input.origin ?? null,
+        delegationDepth: input.delegationDepth ?? null
     }));
 }
 export function appendFrames(db, dataDir, input, now = Date.now()) {
@@ -110,6 +122,9 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
         let formatVersion = input.formatVersion;
         let createdAt = input.createdAt;
         let workspaceKey = input.workspaceKey;
+        let parentSession = input.parentSession;
+        let origin = input.origin;
+        let delegationDepth = input.delegationDepth;
         if (row !== undefined && row.deleted_at !== null && row.created_at === input.createdAt) {
             throw new SyncError('gone', `会话 ${input.sessionId} 的这个生命周期已被删除`);
         }
@@ -134,6 +149,18 @@ export function appendFrames(db, dataDir, input, now = Date.now()) {
             if (workspaceKey !== undefined && existing.workspaceKey === undefined) {
                 throw new SyncError('conflict', '已有会话缺少 workspaceKey，不能在后续 append 补写');
             }
+            if (parentSession !== undefined && existing.parentSession !== undefined && parentSession !== existing.parentSession) {
+                throw new SyncError('conflict', 'append 的 parentSession 与已存 manifest 不一致');
+            }
+            if (origin !== undefined && existing.origin !== undefined && origin !== existing.origin) {
+                throw new SyncError('conflict', 'append 的 origin 与已存 manifest 不一致');
+            }
+            if (delegationDepth !== undefined && existing.delegationDepth !== undefined && delegationDepth !== existing.delegationDepth) {
+                throw new SyncError('conflict', 'append 的 delegationDepth 与已存 manifest 不一致');
+            }
+            if (parentSession === undefined) parentSession = existing.parentSession;
+            if (origin === undefined) origin = existing.origin;
+            if (delegationDepth === undefined) delegationDepth = existing.delegationDepth;
             const start = input.baseIndex + 1;
             if (start < 0 || start > existing.frames.length) throw new SyncError('diverged', `baseIndex=${input.baseIndex} 超出链长 ${existing.frames.length}`);
             if (start < existing.frames.length - 1) throw new SyncError('diverged', '只能追加或替换尾帧');
@@ -153,7 +180,7 @@ 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));
-        const { manifest, digest, headChainHash } = manifestOf(input.sessionId, formatVersion, createdAt, now, combined, input.tailOpen, input.safeThroughSeq, workspaceKey);
+        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)
@@ -229,7 +256,10 @@ const V2_SUMMARY_SELECT = `s.session_id, s.created_at, s.format_version, s.last_
   s.compression, s.stored_bytes,
   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`;
+  json_extract(s.manifest_json, '$.safeThroughSeq') AS safe_through_seq,
+  json_extract(s.manifest_json, '$.parentSession') AS parent_session,
+  json_extract(s.manifest_json, '$.origin') AS origin,
+  json_extract(s.manifest_json, '$.delegationDepth') AS delegation_depth`;
 function mapV2Summary(row) {
     const safe = typeof row.safe_through_seq === 'number' && Number.isSafeInteger(row.safe_through_seq) ? row.safe_through_seq : row.last_seq;
     return {
@@ -244,6 +274,9 @@ function mapV2Summary(row) {
         workspaceKey: typeof row.workspace_key === 'string' && row.workspace_key !== '' ? row.workspace_key : null,
         safeThroughSeq: safe,
         tailOpen: Number(row.tail_open) === 1,
+        parentSession: typeof row.parent_session === 'string' && row.parent_session !== '' ? row.parent_session : null,
+        origin: typeof row.origin === 'string' && row.origin !== '' ? row.origin : null,
+        delegationDepth: typeof row.delegation_depth === 'number' && Number.isSafeInteger(row.delegation_depth) ? row.delegation_depth : null,
         updatedAt: row.updated_at,
         deletedAt: row.deleted_at,
         compression: compressionOf(row.compression),

package/dist/shared/chain.js

@@ -82,6 +82,15 @@ export function buildManifest(input) {
         ...input.safeThroughSeq === undefined ? {} : {
             safeThroughSeq: input.safeThroughSeq
         },
+        ...input.parentSession === undefined ? {} : {
+            parentSession: input.parentSession
+        },
+        ...input.origin === undefined ? {} : {
+            origin: input.origin
+        },
+        ...input.delegationDepth === undefined ? {} : {
+            delegationDepth: input.delegationDepth
+        },
         frames: input.frames,
         updatedAt: input.updatedAt
     };
@@ -108,6 +117,15 @@ export function assertManifest(manifest) {
         throw new Error('manifest 的 workspaceKey 非法');
     }
     if (manifest.tailOpen !== undefined && typeof manifest.tailOpen !== 'boolean') throw new Error('manifest 的 tailOpen 非法');
+    if (manifest.parentSession !== undefined && (typeof manifest.parentSession !== 'string' || manifest.parentSession === '')) {
+        throw new Error('manifest 的 parentSession 非法');
+    }
+    if (manifest.origin !== undefined && (typeof manifest.origin !== 'string' || manifest.origin === '')) {
+        throw new Error('manifest 的 origin 非法');
+    }
+    if (manifest.delegationDepth !== undefined && (!Number.isSafeInteger(manifest.delegationDepth) || manifest.delegationDepth < 0)) {
+        throw new Error('manifest 的 delegationDepth 非法');
+    }
 }
 function canonical(value) {
     if (Array.isArray(value)) return value.map((entry)=>canonical(entry));

package/package.json

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