dscs-server 0.1.1 → 0.1.3

package/README.md

@@ -2,8 +2,8 @@
 
 DSH Session CloudSync 的自部署服务端。
 
-当前版本：**0.1.0，v2-only**（`PROTOCOL_VERSION = 3`）。设备 API 只有 `/v2/*`，
-旧的 `/v1/*` 已移除；0.0.x 插件不兼容，需要配套的 0.1.0 插件。
+当前版本：**0.1.3，v2-only**（`PROTOCOL_VERSION = 3`）。设备 API 只有 `/v2/*`，
+旧的 `/v1/*` 已移除；0.0.x 插件不兼容，需要 0.1.0 起的插件。
 
 ## 能力
 

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)
         }
     };
 }
@@ -357,6 +375,26 @@ export function revokeDevice(db, deviceId) {
     const result = db.handle.prepare('UPDATE devices SET revoked_at = ? WHERE dataset = ? AND device_id = ? AND revoked_at IS NULL').run(Date.now(), DEFAULT_DATASET, deviceId);
     return Number(result.changes) > 0;
 }
+export function renameDevice(db, deviceId, label) {
+    const result = db.handle.prepare('UPDATE devices SET label = ? WHERE dataset = ? AND device_id = ? AND revoked_at IS NULL').run(label, DEFAULT_DATASET, deviceId);
+    if (Number(result.changes) === 0) return undefined;
+    const row = db.handle.prepare('SELECT device_id, label, created_at, last_seen_at FROM devices WHERE dataset = ? AND device_id = ?').get(DEFAULT_DATASET, deviceId);
+    if (row === undefined) return undefined;
+    return {
+        deviceId: row.device_id,
+        label: row.label,
+        createdAt: row.created_at,
+        ...row.last_seen_at === null ? {} : {
+            lastSeenAt: row.last_seen_at
+        }
+    };
+}
+function requireDeviceLabel(value) {
+    const label = typeof value === 'string' ? value.trim() : '';
+    if (label === '') throw new SyncError('bad-request', '设备名不能为空');
+    if (label.length > 64) throw new SyncError('bad-request', '设备名最长 64 个字符');
+    return label;
+}
 export function createHttpServer(options) {
     const { db } = options;
     const version = options.version ?? SERVER_VERSION;
@@ -445,7 +483,10 @@ export function createHttpServer(options) {
                             'batches',
                             'batch-upload',
                             'batch-download',
-                            'zstd-frame'
+                            'zstd-frame',
+                            'me-device-info',
+                            'me-counts',
+                            'device-rename'
                         ],
                         limits: {
                             batchBytes: MAX_BATCH_BODY_BYTES,
@@ -1175,6 +1216,25 @@ export function createHttpServer(options) {
                 }) : json(res, 404, errorBody('not-found', '没有这个设备'));
             }
         },
+        {
+            method: 'PATCH',
+            path: ADMIN_DEVICE_PATH,
+            handler: async (req, res)=>{
+                requireAdmin(req);
+                const match = ADMIN_DEVICE_PATH.exec(new URL(req.url ?? '/', 'http://localhost').pathname);
+                if (match === null) return json(res, 404, errorBody('not-found', '没有这个设备'));
+                const body = await readJson(req);
+                const label = requireDeviceLabel(body.label);
+                const device = renameDevice(db, match[1], label);
+                if (device === undefined) return json(res, 404, errorBody('not-found', '没有这个设备'));
+                return json(res, 200, {
+                    ok: true,
+                    value: {
+                        device
+                    }
+                });
+            }
+        },
         {
             method: 'GET',
             path: /^\/admin\/sessions$/u,
@@ -1198,11 +1258,42 @@ export function createHttpServer(options) {
                         role: 'admin'
                     }
                 });
+                const counts = sessionCounts(db);
+                const workspaceRow = db.handle.prepare("SELECT COUNT(DISTINCT json_extract(manifest_json, '$.workspaceKey')) AS n FROM sessions WHERE dataset = ? AND deleted_at IS NULL AND json_extract(manifest_json, '$.workspaceKey') IS NOT NULL").get(DEFAULT_DATASET);
                 return json(res, 200, {
                     ok: true,
                     value: {
                         role: 'device',
-                        device: auth.device
+                        device: auth.device,
+                        server: {
+                            version,
+                            protocolVersion: PROTOCOL_VERSION,
+                            quotaBytes: effectiveMaxBytes(),
+                            usedBytes: usedBlobBytes(db)
+                        },
+                        counts: {
+                            workspaces: Number(workspaceRow?.n ?? 0),
+                            sessions: counts.total - counts.deleted
+                        }
+                    }
+                });
+            }
+        },
+        {
+            method: 'PATCH',
+            path: ME_PATH,
+            handler: async (req, res)=>{
+                const auth = authenticate(db, req);
+                if (auth === undefined) return json(res, 401, errorBody('unauthorized', '未知 token'));
+                if (auth.role !== 'device') return json(res, 401, errorBody('unauthorized', '需要设备 token'));
+                const body = await readJson(req);
+                const label = requireDeviceLabel(body.label);
+                const device = renameDevice(db, auth.device.deviceId, label);
+                if (device === undefined) return json(res, 404, errorBody('not-found', '没有这个设备'));
+                return json(res, 200, {
+                    ok: true,
+                    value: {
+                        device
                     }
                 });
             }

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));
@@ -121,6 +139,9 @@ function canonical(value) {
 export function stableStringify(value) {
     return JSON.stringify(canonical(value));
 }
+export function markerEquivalent(local, remote) {
+    return local.type === 'session/end-seed' && remote.type === 'session/end-seed' && stableStringify(local.data) === stableStringify(remote.data);
+}
 export function manifestDigest(manifest) {
     return sha256(stableStringify({
         sessionId: manifest.sessionId,

package/package.json

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

package/web/admin.html

@@ -380,7 +380,7 @@
       <div>
         <span class="eyebrow">Overview</span>
         <h2>同步概览</h2>
-        <p class="muted">自部署节点、设备与会话的只读视图。</p>
+        <p class="muted">自部署节点、设备与会话视图；设备可签发、改名、吊销。</p>
       </div>
       <div class="health"><i></i><span id="healthText">服务正常</span></div>
     </section>
@@ -604,6 +604,31 @@ function renderDevices(devices) {
     )
     main.append(label, idLine, meta)
     const actions = el('div', 'device-actions')
+    const rename = el('button', 'btn small', '改名')
+    rename.type = 'button'
+    rename.onclick = async () => {
+      const next = prompt('新设备名（1–64 个字符）', device.label || 'device')
+      if (next === null) return
+      const label = next.trim()
+      if (label === '') {
+        showToast('设备名不能为空', true)
+        return
+      }
+      rename.disabled = true
+      rename.textContent = '改名中…'
+      try {
+        await api('/admin/devices/' + encodeURIComponent(device.deviceId), {
+          method: 'PATCH',
+          body: JSON.stringify({ label }),
+        })
+        showToast('设备已改名')
+        await refresh(true)
+      } catch (error) {
+        showToast(error.message, true)
+        rename.disabled = false
+        rename.textContent = '改名'
+      }
+    }
     const revoke = el('button', 'btn small danger', '吊销')
     revoke.type = 'button'
     revoke.onclick = async () => {
@@ -620,7 +645,7 @@ function renderDevices(devices) {
         revoke.textContent = '吊销'
       }
     }
-    actions.append(revoke)
+    actions.append(rename, revoke)
     row.append(main, actions)
     return row
   }))