@playcraft/common 0.0.4 → 0.0.7

package/dist/sharedb/server.js

@@ -1,3 +1,4 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
 import ShareDB from 'sharedb';
 import { WebSocketServer, WebSocket } from 'ws';
 import WebSocketJSONStream from '@teamwork/websocket-json-stream';
@@ -21,6 +22,9 @@ export class ShareDBRealtimeServer {
     CACHE_TTL_MS = 30 * 60 * 1000; // 30 分钟
     MAX_CACHE_SIZE = 10000;
     cacheCleanupTimer = null;
+    /** 连接上下文（auth 时由 client 传 projectId/branchId），用于单条 get 与列表同分支 */
+    connectionContextMap = new Map();
+    connectionContextStorage = new AsyncLocalStorage();
     constructor(options = {}) {
         this.options = options;
         this.backend = new ShareDB({ defaultType: 'json0' });
@@ -134,13 +138,13 @@ export class ShareDBRealtimeServer {
         // 🔧 修复：添加 documents 和 settings 到 readSnapshots 中间件
         // Ensure missing docs in readSnapshots (primarily for scenes/assets/documents/settings)
         this.backend.use('readSnapshots', async (ctx, next) => {
-            console.log(`[sharedb] readSnapshots middleware called for collection=${ctx.collection}, snapshots=${ctx.snapshots?.length || 0}`);
+            // console.log(`[sharedb] readSnapshots middleware called for collection=${ctx.collection}, snapshots=${ctx.snapshots?.length || 0}`);
             if (ctx.collection !== 'scenes' && ctx.collection !== 'assets' && ctx.collection !== 'documents' && ctx.collection !== 'settings' && ctx.collection !== 'user_data') {
-                console.log(`[sharedb] Skipping readSnapshots for collection=${ctx.collection}`);
+                // console.log(`[sharedb] Skipping readSnapshots for collection=${ctx.collection}`);
                 return next();
             }
             for (const snap of ctx.snapshots || []) {
-                console.log(`[sharedb] Processing snapshot: id=${snap?.id}, hasType=${!!snap?.type}`);
+                // console.log(`[sharedb] Processing snapshot: id=${snap?.id}, hasType=${!!snap?.type}`);
                 if (!snap || snap.type)
                     continue;
                 const id = String(snap.id);
@@ -155,11 +159,37 @@ export class ShareDBRealtimeServer {
                 if (ctx.collection === 'user_data') {
                     snap.data = doc.data ?? {};
                 }
+                else if (ctx.collection === 'assets') {
+                    // 🔧 Redis 里可能是旧 fallback（无 name/type 或 name=unknown-xxx），一律按不完整从后端补拉
+                    const existing = doc.data;
+                    const isUnknownName = existing?.name && String(existing.name).startsWith('unknown-');
+                    const isIncomplete = !existing || typeof existing !== 'object' || !existing.name || !existing.type || isUnknownName;
+                    // 🔧 强制刷新：如果 name 是 unknown，总是从后端重新获取
+                    if (isUnknownName) {
+                        console.log(`[sharedb] Asset ${id} has unknown name, forcing refresh from backend`);
+                        const fromBackend = await this.fetchAssetDataFromBackend(id);
+                        if (fromBackend && fromBackend.name && !String(fromBackend.name).startsWith('unknown-')) {
+                            console.log(`[sharedb] ✅ Asset ${id} refreshed with name: ${fromBackend.name}`);
+                            snap.data = fromBackend;
+                        }
+                        else {
+                            console.warn(`[sharedb] ⚠️ Asset ${id} backend returned:`, fromBackend?.name || 'null');
+                            snap.data = fromBackend ?? existing ?? { id: Number(id) || id, name: `unknown-${id}`, type: 'folder', data: {} };
+                        }
+                    }
+                    else if (isIncomplete) {
+                        const fromBackend = await this.fetchAssetDataFromBackend(id);
+                        snap.data = fromBackend ?? existing ?? { id: Number(id) || id, name: `unknown-${id}`, type: 'folder', data: {} };
+                    }
+                    else {
+                        snap.data = existing;
+                    }
+                }
                 else {
                     snap.data = doc.data;
                 }
                 snap.v = doc.version;
-                console.log(`[sharedb] ✅ Snapshot filled: id=${id}, type=${snap.type}, hasData=${!!snap.data}`);
+                // console.log(`[sharedb] ✅ Snapshot filled: id=${id}, type=${snap.type}, hasData=${!!snap.data}`);
             }
             next();
         });
@@ -172,63 +202,13 @@ export class ShareDBRealtimeServer {
         return this._commonConn;
     }
     /**
-     * 🔧 性能优化：批量加载项目的所有 assets 到缓存
-     * 避免每个 asset 都单独请求后端 API
+     * 🔧 已禁用：批量加载项目的所有 assets 到缓存
+     * 原因：加载所有资产比按需加载更慢，特别是对于大量资产的项目
+     * 保留代码结构，以备后续实现更智能的预加载策略
      */
     async loadProjectAssetsToCache(projectId) {
-        // 如果已经有加载中的 Promise，等待它完成
-        const existingPromise = this.cacheLoadPromises.get(projectId);
-        if (existingPromise) {
-            return existingPromise;
-        }
-        // 创建新的加载 Promise
-        const loadPromise = (async () => {
-            try {
-                if (!this.options.backendUrl) {
-                    console.warn(`[sharedb] No backendUrl configured, cannot load assets for project ${projectId}`);
-                    return;
-                }
-                const emitSecret = this.options.internalSecret || process.env.EMIT_SECRET || 'dev-emit-secret-change-me';
-                const url = `${this.options.backendUrl}/api/projects/${projectId}/assets?branchId=local-branch`;
-                const path = `/api/projects/${projectId}/assets`;
-                console.log(`[sharedb] 🚀 Batch loading assets for project ${projectId} from ${url}`);
-                const startTime = Date.now();
-                // 生成签名 headers
-                const signedHeaders = generateSignedHeaders('GET', path, emitSecret, 'realtime');
-                const res = await fetch(url, {
-                    headers: signedHeaders,
-                });
-                if (!res.ok) {
-                    console.error(`[sharedb] Failed to batch load assets: status=${res.status}`);
-                    return;
-                }
-                const data = await res.json();
-                const assets = data.result || data; // 兼容不同的响应格式
-                if (!Array.isArray(assets)) {
-                    console.error(`[sharedb] Invalid assets response format`);
-                    return;
-                }
-                const now = Date.now();
-                const projectCache = new Map();
-                for (const asset of assets) {
-                    if (asset.id != null) {
-                        projectCache.set(String(asset.id), { data: asset, timestamp: now, accessCount: 0 });
-                    }
-                }
-                this.assetCache.set(projectId, projectCache);
-                const duration = Date.now() - startTime;
-                console.log(`[sharedb] ✅ Cached ${assets.length} assets for project ${projectId} in ${duration}ms`);
-            }
-            catch (error) {
-                console.error(`[sharedb] Failed to batch load assets for project ${projectId}:`, error);
-            }
-            finally {
-                // 清除加载 Promise，允许重试
-                this.cacheLoadPromises.delete(projectId);
-            }
-        })();
-        this.cacheLoadPromises.set(projectId, loadPromise);
-        return loadPromise;
+        // 禁用批量预加载，改为按需加载
+        return Promise.resolve();
     }
     /**
      * 🔧 从缓存中获取 asset（需已知 contentHash），并更新访问计数与时间戳
@@ -242,6 +222,31 @@ export class ShareDBRealtimeServer {
         cached.timestamp = Date.now();
         return cached.data;
     }
+    /**
+     * 🔧 通过 assetId 从缓存中获取 asset（不需要 contentHash），并更新访问计数与时间戳
+     */
+    getAssetFromCacheById(projectId, assetId) {
+        const projectCache = this.assetCache.get(projectId);
+        if (!projectCache)
+            return null;
+        // 首先尝试直接用 assetId 查找（批量加载使用的格式）
+        const cached = projectCache.get(assetId);
+        if (cached) {
+            cached.accessCount++;
+            cached.timestamp = Date.now();
+            return cached.data;
+        }
+        // 然后尝试查找以 assetId: 开头的 key（单个缓存使用的格式）
+        const prefix = `${assetId}:`;
+        for (const [key, c] of projectCache) {
+            if (key.startsWith(prefix)) {
+                c.accessCount++;
+                c.timestamp = Date.now();
+                return c.data;
+            }
+        }
+        return null;
+    }
     /**
      * 🔧 缓存 asset 数据，使用 assetId:contentHash 作为 key；删除同一 assetId 的旧 hash 版本
      */
@@ -271,13 +276,118 @@ export class ShareDBRealtimeServer {
             accessCount: 0,
         };
         projectCache.set(cacheKey, cached);
-        console.log(`[sharedb] Cached asset ${assetId} with hash ${contentHash.slice(0, 8)}`);
+        // console.log(`[sharedb] Cached asset ${assetId} with hash ${contentHash.slice(0, 8)}`);
         return data;
     }
-    /** 从当前连接上下文获取 projectId（暂无实现时返回 null，则不按项目缓存） */
     getProjectIdFromContext() {
-        return null;
+        return this.connectionContextStorage.getStore()?.projectId ?? null;
     }
+    getBranchIdFromContext() {
+        return this.connectionContextStorage.getStore()?.branchId;
+    }
+    /**
+     * 从后端拉取单个 asset 的完整数据（用于「文档已存在但 data 不完整」时补全读取）
+     * 返回剥离 contentHash 后的对象，失败返回 null
+     */
+    async fetchAssetDataFromBackend(docId) {
+        if (!this.options.backendUrl)
+            return null;
+        const branchId = this.getBranchIdFromContext();
+        const path = `/api/assets/internal/${docId}`;
+        const pathWithQuery = branchId ? `${path}?branchId=${encodeURIComponent(branchId)}` : path;
+        const url = `${this.options.backendUrl}${pathWithQuery}`;
+        const emitSecret = this.options.internalSecret || process.env.EMIT_SECRET || 'dev-emit-secret-change-me';
+        const signedHeaders = generateSignedHeaders('GET', path, emitSecret, 'realtime');
+        try {
+            const res = await fetch(url, { headers: signedHeaders });
+            if (!res.ok)
+                return null;
+            const data = await res.json();
+            if (!data || typeof data !== 'object')
+                return null;
+            const { contentHash: _h, ...rest } = data;
+            return rest;
+        }
+        catch {
+            return null;
+        }
+    }
+    /**
+     * 🔧 性能优化：批量从后端预取资产数据并写入缓存
+     * 尝试使用批量 API（POST /api/assets/internal/batch），如不可用则 fallback 到并行单请求
+     * 这样后续 ensureDocExists 可直接从缓存命中，避免逐个 HTTP 请求
+     */
+    // private async batchPreloadAssets(assetIds: string[]): Promise<void> {
+    //   if (!this.options.backendUrl || assetIds.length === 0) return;
+    //   const projectId = this.getProjectIdFromContext();
+    //   if (!projectId) return;
+    //   // 过滤出缓存中不存在的 asset
+    //   const missingIds = assetIds.filter(id => !this.getAssetFromCacheById(projectId, id));
+    //   if (missingIds.length === 0) {
+    //     console.log(`[sharedb] All ${assetIds.length} assets already cached, skipping batch preload`);
+    //     return;
+    //   }
+    //   console.log(`[sharedb] Batch preloading ${missingIds.length}/${assetIds.length} assets from backend...`);
+    //   const branchId = this.getBranchIdFromContext();
+    //   const emitSecret = this.options.internalSecret || process.env.EMIT_SECRET || 'dev-emit-secret-change-me';
+    //   // 尝试批量 API
+    //   try {
+    //     const path = '/api/assets/internal/batch';
+    //     const pathWithQuery = branchId ? `${path}?branchId=${encodeURIComponent(branchId)}` : path;
+    //     const url = `${this.options.backendUrl}${pathWithQuery}`;
+    //     const signedHeaders = generateSignedHeaders('POST', path, emitSecret, 'realtime');
+    //     const res = await fetch(url, {
+    //       method: 'POST',
+    //       headers: {
+    //         ...signedHeaders,
+    //         'Content-Type': 'application/json',
+    //       },
+    //       body: JSON.stringify({ ids: missingIds }),
+    //     });
+    //     if (res.ok) {
+    //       const batchData = await res.json();
+    //       if (Array.isArray(batchData)) {
+    //         for (const assetData of batchData) {
+    //           if (assetData && assetData.id) {
+    //             const id = String(assetData.id);
+    //             if (assetData.contentHash) {
+    //               this.cacheAssetData(projectId, id, assetData);
+    //             }
+    //           }
+    //         }
+    //         console.log(`[sharedb] ✅ Batch preloaded ${batchData.length} assets via batch API`);
+    //         return;
+    //       }
+    //     }
+    //     // batch API 返回非 200 或数据格式不符，fallback 到并行单请求
+    //     console.log(`[sharedb] Batch API unavailable (status=${res.status}), falling back to parallel individual requests`);
+    //   } catch (e) {
+    //     console.log(`[sharedb] Batch API failed, falling back to parallel individual requests:`, e);
+    //   }
+    //   // Fallback: 并行发送单个请求
+    //   const results = await Promise.allSettled(
+    //     missingIds.map(async (id) => {
+    //       const data = await this.fetchAssetDataFromBackend(id);
+    //       if (data) {
+    //         // 手动构造缓存（fetchAssetDataFromBackend 已剥离 contentHash）
+    //         let projectCache = this.assetCache.get(projectId);
+    //         if (!projectCache) {
+    //           projectCache = new Map();
+    //           this.assetCache.set(projectId, projectCache);
+    //         }
+    //         // 使用 assetId 作为 key（没有 contentHash 时的 fallback）
+    //         projectCache.set(id, {
+    //           data,
+    //           timestamp: Date.now(),
+    //           accessCount: 0,
+    //         });
+    //       }
+    //       return { id, data };
+    //     })
+    //   );
+    //   const successCount = results.filter(r => r.status === 'fulfilled' && (r as any).value?.data).length;
+    //   console.log(`[sharedb] ✅ Parallel preloaded ${successCount}/${missingIds.length} assets`);
+    // }
     async ensureDocExists(collection, id, reason) {
         const docId = String(id);
         const doc = this.getCommonConn().get(collection, docId);
@@ -303,9 +413,9 @@ export class ShareDBRealtimeServer {
             }
             if (initial == null && this.options.onDocCreate) {
                 try {
-                    console.log(`[sharedb] Fetching initial data for ${collection}/${docId} via onDocCreate`);
+                    // console.log(`[sharedb] Fetching initial data for ${collection}/${docId} via onDocCreate`);
                     initial = await this.options.onDocCreate(collection, docId);
-                    console.log(`[sharedb] onDocCreate returned:`, initial ? `data with keys [${Object.keys(initial).join(', ')}]` : 'null');
+                    // console.log(`[sharedb] onDocCreate returned:`, initial ? `data with keys [${Object.keys(initial).join(', ')}]` : 'null');
                 }
                 catch (e) {
                     console.error(`[sharedb] onDocCreate failed for ${collection}/${docId}:`, e);
@@ -325,32 +435,39 @@ export class ShareDBRealtimeServer {
                         path = `/api/assets/internal/${docId}/file`;
                     }
                     else {
-                        // assets 和 scenes 获取元数据（JSON）
+                        // assets 和 scenes 获取元数据（JSON），带 branchId 与列表同分支
                         if (collection === 'assets' || collection === 'scenes') {
-                            url = `${this.options.backendUrl}/api/${collection}/internal/${docId}`;
-                            path = `/api/${collection}/internal/${docId}`;
+                            const pathBase = `/api/${collection}/internal/${docId}`;
+                            path = pathBase;
+                            const branchId = this.getBranchIdFromContext();
+                            if (collection === 'assets' && !branchId) {
+                                console.warn(`[sharedb] ensureDocExists assets/${docId} no branchId in context (auth may lack projectId/branchId)`);
+                            }
+                            url = branchId
+                                ? `${this.options.backendUrl}${pathBase}?branchId=${encodeURIComponent(branchId)}`
+                                : `${this.options.backendUrl}${pathBase}`;
                         }
                         else {
                             url = `${this.options.backendUrl}/api/${collection}/${docId}`;
                             path = `/api/${collection}/${docId}`;
                         }
                     }
-                    console.log(`[sharedb] Fetching initial data from ${url}`);
+                    // console.log(`[sharedb] Fetching initial data from ${url}`);
                     // 生成签名 headers
                     const signedHeaders = generateSignedHeaders('GET', path, emitSecret, 'realtime');
                     const res = await fetch(url, {
                         headers: signedHeaders,
                     });
-                    console.log(`[sharedb] Backend response: status=${res.status}, ok=${res.ok}`);
+                    // console.log(`[sharedb] Backend response: status=${res.status}, ok=${res.ok}`);
                     if (res.ok) {
                         // 🔧 对于 documents，返回文本内容；其他返回 JSON
                         if (collection === 'documents') {
                             initial = await res.text();
-                            console.log(`[sharedb] Backend returned text: ${initial ? initial.substring(0, 100) + '...' : 'empty'}`);
+                            // console.log(`[sharedb] Backend returned text: ${initial ? initial.substring(0, 100) + '...' : 'empty'}`);
                         }
                         else {
                             const responseData = await res.json();
-                            console.log(`[sharedb] Backend returned:`, responseData ? `data with keys [${Object.keys(responseData).join(', ')}]` : 'null');
+                            // console.log(`[sharedb] Backend returned:`, responseData ? `data with keys [${Object.keys(responseData).join(', ')}]` : 'null');
                             // 🔧 assets：剥离 contentHash 后写入 doc；若有 projectId 则按 assetId:contentHash 缓存
                             if (collection === 'assets' && responseData && 'contentHash' in responseData) {
                                 const projectId = this.getProjectIdFromContext();
@@ -360,6 +477,17 @@ export class ShareDBRealtimeServer {
                                         const { contentHash: _h, ...rest } = responseData;
                                         return rest;
                                     })();
+                                // 确保 assets 文档包含 item_id（编辑器 loadAndSubscribe 依赖此字段）
+                                if (initial && initial.item_id == null && initial.id != null) {
+                                    initial.item_id = initial.id;
+                                }
+                                // 验证 assets 必需字段，缺失时从 responseData 补充
+                                if (initial && (!initial.name || !initial.type)) {
+                                    if (!initial.name)
+                                        initial.name = responseData.name || `unknown-${docId}`;
+                                    if (!initial.type)
+                                        initial.type = responseData.type || 'folder';
+                                }
                             }
                             else if (collection === 'scenes' && responseData && 'contentHash' in responseData) {
                                 // 🔧 scenes：Backend 返回 contentHash，仅剥离不写入 doc
@@ -389,16 +517,25 @@ export class ShareDBRealtimeServer {
                     // 🔧 settings: 项目设置，默认空对象
                     initial = {};
                 }
+                else if (collection === 'assets') {
+                    initial = {
+                        item_id: Number(docId) || 1,
+                        id: Number(docId) || 1,
+                        name: `unknown-${docId}`,
+                        type: 'folder',
+                        data: {},
+                    };
+                }
                 else {
                     initial =
                         collection === 'scenes'
-                            ? SceneModel.getDefaultData(docId)
+                            ? SceneModel.getDefaultData(docId, `Scene ${docId}`)
                             : { item_id: Number(docId) || 1, data: {} };
                 }
             }
             // 🔧 修复：documents 使用 text 类型（ot-text 包注册的类型名是 'text'），其他使用 json0 类型
             const docType = collection === 'documents' ? otTextType.name || otTextType.uri || 'text' : 'json0';
-            console.log(`[sharedb] Creating document ${collection}/${docId} with type=${docType}, initial data type=${typeof initial}, length=${initial?.length || 'N/A'}`);
+            // console.log(`[sharedb] Creating document ${collection}/${docId} with type=${docType}, initial data type=${typeof initial}, length=${initial?.length || 'N/A'}`);
             await new Promise((resolve, reject) => {
                 doc.create(initial, docType, (err) => {
                     // 🔧 忽略 "Document already exists" 错误（并发订阅时可能发生）
@@ -411,13 +548,15 @@ export class ShareDBRealtimeServer {
                         reject(err);
                     }
                     else {
-                        console.log(`[sharedb] ✅ Document created: ${collection}/${docId}, type=${doc.type}, version=${doc.version}, hasData=${!!doc.data}`);
+                        const createdTypeLabel = typeof doc.type === 'string' ? doc.type : (doc.type?.name ?? doc.type?.uri ?? '?');
+                        // console.log(`[sharedb] ✅ Document created: ${collection}/${docId}, type=${createdTypeLabel}, version=${doc.version}, hasData=${!!doc.data}`);
                         resolve();
                     }
                 });
             });
         }
-        console.log(`[sharedb] Returning doc ${collection}/${docId}, type=${doc.type}, version=${doc.version}, hasData=${!!doc.data}`);
+        const typeLabel = typeof doc.type === 'string' ? doc.type : (doc.type?.name ?? doc.type?.uri ?? '?');
+        // console.log(`[sharedb] Returning doc ${collection}/${docId}, type=${typeLabel}, version=${doc.version}, hasData=${!!doc.data}`);
         return doc;
     }
     handleConnection(ws) {
@@ -431,8 +570,8 @@ export class ShareDBRealtimeServer {
         // 使用 any 类型避免 TypeScript 重载签名冲突
         ws.send = (data, optionsOrCallback, callback) => {
             const dataStr = String(data);
-            // 🔧 调试：打印所有发送的消息（在发送前）
-            console.log(`[sharedb] >>> Sending to client (length=${dataStr.length}): ${dataStr.substring(0, 200)}...`);
+            // 🔧 调试：打印所有发送的消息（在发送前）- 只在开发环境启用
+            // console.log(`[sharedb] >>> Sending to client (length=${dataStr.length}): ${dataStr.substring(0, 200)}...`);
             // 处理可选的 options 和 callback 参数
             const cb = typeof optionsOrCallback === 'function' ? optionsOrCallback : callback;
             const opts = typeof optionsOrCallback === 'object' ? optionsOrCallback : undefined;
@@ -504,6 +643,10 @@ export class ShareDBRealtimeServer {
                     if (effectiveUser && !streamListenCalled) {
                         authed = true;
                         streamListenCalled = true;
+                        this.connectionContextMap.set(ws, {
+                            projectId: p?.projectId,
+                            branchId: p?.branchId,
+                        });
                         const currentUserId = effectiveUser?.id ?? 1;
                         const authPayload = {
                             user: {
@@ -546,19 +689,55 @@ export class ShareDBRealtimeServer {
                 }
                 return;
             }
-            // JSON：兼容 bulk subscribe / ping-pong / 主动 ensureDocExists
+            // JSON：兼容 bulk subscribe / ping-pong / 主动 ensureDocExists（整段在 connection 上下文中执行，以便 fetch 单条 asset 时带 branchId）
             try {
                 const msg = JSON.parse(text);
+                const ctx = this.connectionContextMap.get(ws);
+                const runWithCtx = (fn) => {
+                    this.connectionContextStorage.run(ctx, fn);
+                };
                 if (msg?.a === 'bs') {
-                    const collection = msg.c;
-                    const ids = msg.b || [];
-                    const results = {};
-                    await Promise.all(ids.map(async (id) => {
-                        const doc = await this.ensureDocExists(collection, id, 'bulkSubscribe');
-                        if (doc.type)
-                            results[id] = { v: doc.version, data: doc.data };
-                    }));
-                    ws.send(JSON.stringify({ a: 'bs', c: collection, data: results }));
+                    await new Promise((resolve, reject) => {
+                        runWithCtx(async () => {
+                            try {
+                                const collection = msg.c;
+                                const ids = Array.isArray(msg.b) ? msg.b : [];
+                                // 🔧 性能优化：先批量预取缺失的资产数据，减少逐个 HTTP 请求
+                                // if (collection === 'assets' && this.options.backendUrl && ids.length > 0) {
+                                //   await this.batchPreloadAssets(ids);
+                                // }
+                                const results = {};
+                                await Promise.all(ids.map(async (id) => {
+                                    const doc = await this.ensureDocExists(collection, id, 'bulkSubscribe');
+                                    if (!doc.type)
+                                        return;
+                                    let data = doc.data;
+                                    if (collection === 'assets') {
+                                        const existing = doc.data;
+                                        const isUnknownName = existing?.name && String(existing.name).startsWith('unknown-');
+                                        const isIncomplete = !existing || typeof existing !== 'object' || !existing.name || !existing.type || isUnknownName;
+                                        if (isIncomplete) {
+                                            // 🔧 先尝试从缓存获取（批量预加载后缓存中应该有）
+                                            const projectId = this.getProjectIdFromContext();
+                                            const fromCache = projectId ? this.getAssetFromCacheById(projectId, id) : null;
+                                            if (fromCache) {
+                                                data = fromCache;
+                                            }
+                                            else {
+                                                const fromBackend = await this.fetchAssetDataFromBackend(id);
+                                                data = fromBackend ?? existing ?? { id: Number(id) || id, name: `unknown-${id}`, type: 'folder', data: {} };
+                                            }
+                                        }
+                                    }
+                                    results[id] = { v: doc.version, data };
+                                }));
+                                ws.send(JSON.stringify({ a: 'bs', c: collection, data: results }));
+                            }
+                            finally {
+                                resolve();
+                            }
+                        });
+                    });
                     return;
                 }
                 if (msg?.a === 'pp') {
@@ -567,7 +746,7 @@ export class ShareDBRealtimeServer {
                 }
                 // 🔧 修复：添加 documents、settings、user_data collection 支持
                 if ((msg?.a === 'f' || msg?.a === 's') && (msg?.c === 'scenes' || msg?.c === 'assets' || msg?.c === 'documents' || msg?.c === 'settings' || msg?.c === 'user_data') && msg?.d != null) {
-                    console.log(`[sharedb] Pre-creating doc for ${msg.c}/${msg.d} (action=${msg.a})`);
+                    // console.log(`[sharedb] Pre-creating doc for ${msg.c}/${msg.d} (action=${msg.a})`);
                     try {
                         await this.ensureDocExists(msg.c, msg.d, `ws:${msg.a}`);
                     }
@@ -576,10 +755,12 @@ export class ShareDBRealtimeServer {
                     }
                 }
                 // 🔧 调试：打印转发逻辑
-                console.log(`[sharedb] Message received: a=${msg?.a}, c=${msg?.c}, d=${msg?.d}, authed=${authed}, hasMessageHandler=${!!messageHandler}`);
+                // console.log(`[sharedb] Message received: a=${msg?.a}, c=${msg?.c}, d=${msg?.d}, authed=${authed}, hasMessageHandler=${!!messageHandler}`);
                 if (messageHandler && (msg?.a === 'hs' || authed)) {
-                    console.log(`[sharedb] Forwarding message to ShareDB: ${msg?.a}/${msg?.c}/${msg?.d || 'N/A'}`);
-                    messageHandler({ data: text });
+                    // console.log(`[sharedb] Forwarding message to ShareDB: ${msg?.a}/${msg?.c}/${msg?.d || 'N/A'}`);
+                    runWithCtx(() => {
+                        messageHandler({ data: text });
+                    });
                 }
                 else {
                     console.log(`[sharedb] ⚠️  Message NOT forwarded: authed=${authed}, hasMessageHandler=${!!messageHandler}`);
@@ -590,6 +771,7 @@ export class ShareDBRealtimeServer {
             }
         });
         ws.on('close', () => {
+            this.connectionContextMap.delete(ws);
             try {
                 stream.end();
             }