@aiyiran/myclaw 1.1.39 → 1.1.41

package/assets/myclaw-artifacts.js

@@ -2182,6 +2182,7 @@
   // ═══ 作品模板列表弹框 ═══
   // 使用通用文件接口 GET /api/file?path=（路径相对 .openclaw 根）
   var TEMPLATE_ROOT = 'skills/yiran-playground-template-use';
+  var TEMPLATE_CDN_BASE = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/yiran-playground-template-use/templates';
 
   function openTemplateModal() {
     if (document.querySelector('#myclaw-template-modal')) return;
@@ -2422,9 +2423,7 @@
           rightHeader.appendChild(infoSpan);
           rightHeader.appendChild(openNewBtn);
           rightHeader.appendChild(useBtn);
-          previewIframe.src = MYCLAW_API_BASE + '/api/file?path='
-            + encodeURIComponent(TEMPLATE_ROOT + '/templates/' + tpl['文件夹名'] + '/__student-view__.html')
-            + '&t=' + Date.now();
+          previewIframe.src = TEMPLATE_CDN_BASE + '/' + encodeURIComponent(tpl['文件夹名']) + '/__student-view__.html?t=' + Date.now();
         }
 
         row.onclick = setActive;
@@ -2463,11 +2462,60 @@
     }
 
     // ── 并行：加载本地 index + 检查 CDN 更新 ──────────────────────────────
+    var _pollTimer = null; // 提到外层，doSync 守卫用
+
     function doSync() {
+      // 轮询进行中时点击无效，避免重复起 timer
+      if (_pollTimer) return;
       headSyncBtn.disabled = true;
       headSyncBtn.style.opacity = '0.5';
       syncStatus.style.color = 'rgba(205,214,244,0.4)';
       syncStatus.textContent = '⟳ 检查更新...';
+
+      var _pollDeadline = Date.now() + 10 * 60 * 1000; // 最多轮询 10 分钟
+
+      function _reloadList(onDone) {
+        fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))
+          .then(function (r) { return r.json(); })
+          .then(function (idx) { renderTemplateList(flattenTemplates(idx)); if (onDone) onDone(); })
+          .catch(function () { if (onDone) onDone(); });
+      }
+
+      function _stopPolling() {
+        if (_pollTimer) { clearInterval(_pollTimer); _pollTimer = null; }
+      }
+
+      function _startPolling() {
+        _pollTimer = setInterval(function () {
+          if (Date.now() > _pollDeadline) {
+            _stopPolling();
+            syncStatus.textContent = '⚠ 同步超时';
+            setTimeout(function () { syncStatus.textContent = ''; }, 4000);
+            return;
+          }
+          fetch(MYCLAW_API_BASE + '/api/sync-status')
+            .then(function (r) { return r.json(); })
+            .then(function (s) {
+              if (s.running) {
+                syncStatus.textContent = '⟳ 同步中 ' + s.completed.length + '/' + s.total;
+                return;
+              }
+              // 完成
+              _stopPolling();
+              var result = s.result || {};
+              var msg = '';
+              if (result.added && result.added.length) msg += '新增 ' + result.added.length + ' 个';
+              if (result.updated && result.updated.length) msg += (msg ? '，' : '') + '更新 ' + result.updated.length + ' 个';
+              syncStatus.style.color = '#10b981';
+              syncStatus.textContent = '✓ ' + (msg || '已完成');
+              _reloadList(function () {
+                setTimeout(function () { syncStatus.textContent = ''; syncStatus.style.color = 'rgba(205,214,244,0.4)'; }, 4000);
+              });
+            })
+            .catch(function () { /* 网络抖动，下次再试 */ });
+        }, 3000);
+      }
+
       fetch(MYCLAW_API_BASE + '/api/sync-templates')
         .then(function (r) { return r.json(); })
         .then(function (sync) {
@@ -2479,30 +2527,21 @@
             return;
           }
           if (sync.syncing) {
-            syncStatus.textContent = '⟳ 同步中...';
-            setTimeout(function () {
-              fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))
-                .then(function (r) { return r.json(); })
-                .then(function (newIndex) {
-                  renderTemplateList(flattenTemplates(newIndex));
-                  syncStatus.textContent = '✓ 已更新';
-                  syncStatus.style.color = '#10b981';
-                  setTimeout(function () { syncStatus.textContent = ''; }, 3000);
-                })
-                .catch(function () { syncStatus.textContent = ''; });
-            }, 5000);
+            // index 已写好，立刻刷新列表让用户看到模板
+            _reloadList(null);
+            syncStatus.textContent = '⟳ 同步中 ' + (sync.completed || []).length + '/' + (sync.total || '?');
+            _startPolling();
             return;
           }
+          // 极少数情况：同步在返回前已完成
           var msg = '';
           if (sync.added && sync.added.length) msg += '新增 ' + sync.added.length + ' 个';
           if (sync.updated && sync.updated.length) msg += (msg ? '，' : '') + '更新 ' + sync.updated.length + ' 个';
-          syncStatus.textContent = '✓ ' + (msg || '已更新');
           syncStatus.style.color = '#10b981';
-          fetch(MYCLAW_API_BASE + '/api/file?path=' + encodeURIComponent(TEMPLATE_ROOT + '/template-index.json'))
-            .then(function (r) { return r.json(); })
-            .then(function (newIndex) { renderTemplateList(flattenTemplates(newIndex)); })
-            .catch(function () {});
-          setTimeout(function () { syncStatus.textContent = ''; }, 4000);
+          syncStatus.textContent = '✓ ' + (msg || '已更新');
+          _reloadList(function () {
+            setTimeout(function () { syncStatus.textContent = ''; syncStatus.style.color = 'rgba(205,214,244,0.4)'; }, 4000);
+          });
         })
         .catch(function () {
           headSyncBtn.disabled = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiyiran/myclaw",
-  "version": "1.1.39",
+  "version": "1.1.41",
   "description": "",
   "main": "index.js",
   "bin": {

package/server/sync_workspace.py

@@ -479,7 +479,12 @@ def sync_all(workspace_id):
 # 模板同步：从 CDN 增量下载到本地
 # ═══════════════════════════════════════════════════════════════
 
-_sync_state = {'running': False, 'last_result': None}
+_sync_state = {
+    'running': False,
+    'last_result': None,
+    'completed': [],   # 已下载完成的 folder 名列表
+    'total': 0,        # 本次需要下载的 folder 总数
+}
 _sync_lock = threading.Lock()
 
 _SYNC_LOG = os.path.join(get_openclaw_path(), 'sync-templates.log')
@@ -499,55 +504,40 @@ TEMPLATE_LOCAL_INDEX = os.path.join(get_openclaw_path(), 'skills', 'yiran-playgr
 TEMPLATE_CDN_INDEX_URL = 'https://cdn.yiranlaoshi.com/myclaw/live/yiran/skills/yiran-playground-template-use/template-index.json'
 
 
-def _do_sync_templates(cdn_index, local_index):
-    """后台线程：按 folder 全量下载有变化的模板文件"""
+def _do_sync_templates(cdn_index, local_index, pending):
+    """后台线程：按 folder 全量下载有变化的模板文件
+    pending: list of (folder_name, is_new)，已在调用方确定好
+    """
     try:
-        cdn_templates = cdn_index.get('templates', {})
-        local_templates = local_index.get('templates', {})
         added = []
         updated = []
 
-        _sync_log('开始同步，CDN 模板系列: {}'.format(list(cdn_templates.keys())))
+        _sync_log('开始同步，共 {} 个 folder'.format(len(pending)))
 
-        for series, nums in cdn_templates.items():
-            for num, record in nums.items():
-                folder_name = record.get('文件夹名', '')
-                cdn_ua = record.get('updated_at', '')
-                local_ua = local_templates.get(series, {}).get(num, {}).get('updated_at', '')
+        for folder_name, is_new in pending:
+            _sync_log('{} {} → 下载中...'.format('新增' if is_new else '更新', folder_name))
+            cdn_prefix = TEMPLATE_CDN_PREFIX_BASE + '/{}/'.format(folder_name)
+            folder_dir = os.path.join(TEMPLATE_LOCAL_DIR, folder_name)
+            os.makedirs(folder_dir, exist_ok=True)
 
-                if not folder_name:
+            cdn_files = _list_files_from_qiniu(cdn_prefix)
+            _sync_log('  列举到 {} 个文件'.format(len(cdn_files)))
+            for item in cdn_files:
+                key = item.get('key', '')
+                filename = key[len(cdn_prefix):]
+                if not filename:
                     continue
+                ok = _download_from_cdn(key, os.path.join(folder_dir, filename))
+                _sync_log('  {} {}'.format('✓' if ok else '✗', filename))
 
-                is_new = series not in local_templates or num not in local_templates.get(series, {})
-                is_changed = not is_new and cdn_ua != local_ua
-
-                if not is_new and not is_changed:
-                    _sync_log('跳过 {} (无变化)'.format(folder_name))
-                    continue
+            if is_new:
+                added.append(folder_name)
+            else:
+                updated.append(folder_name)
 
-                _sync_log('{} {} → 下载中...'.format('新增' if is_new else '更新', folder_name))
-                cdn_prefix = TEMPLATE_CDN_PREFIX_BASE + '/{}/'.format(folder_name)
-                folder_dir = os.path.join(TEMPLATE_LOCAL_DIR, folder_name)
-                os.makedirs(folder_dir, exist_ok=True)
-                cdn_files = _list_files_from_qiniu(cdn_prefix)
-                _sync_log('  列举到 {} 个文件'.format(len(cdn_files)))
-                for item in cdn_files:
-                    key = item.get('key', '')
-                    filename = key[len(cdn_prefix):]
-                    if not filename:
-                        continue
-                    ok = _download_from_cdn(key, os.path.join(folder_dir, filename))
-                    _sync_log('  {} {}'.format('✓' if ok else '✗', filename))
-
-                if is_new:
-                    added.append(folder_name)
-                else:
-                    updated.append(folder_name)
-
-        # 覆盖本地 index
-        os.makedirs(os.path.dirname(TEMPLATE_LOCAL_INDEX), exist_ok=True)
-        with open(TEMPLATE_LOCAL_INDEX, 'w', encoding='utf-8') as f:
-            json.dump(cdn_index, f, ensure_ascii=False, indent=2)
+            # 每完成一个 folder 就更新进度
+            with _sync_lock:
+                _sync_state['completed'].append(folder_name)
 
         _sync_log('完成。新增: {}, 更新: {}'.format(added, updated))
         with _sync_lock:
@@ -835,6 +825,8 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             return self._handle_file(params)
         elif path == '/api/sync-templates':
             return self._handle_sync_templates()
+        elif path == '/api/sync-status':
+            return self._handle_sync_status()
         else:
             self._send_json({"error": "not found"}, 404)
 
@@ -1223,21 +1215,87 @@ class MyclawAPIHandler(BaseHTTPRequestHandler):
             self._send_json({'changed': False})
             return
 
-        # 有变化 → 启动后台线程，立即返回
+        # 计算需要下载的 folder 列表
+        cdn_templates = cdn_index.get('templates', {})
+        local_templates = local_index.get('templates', {})
+        pending = []  # list of (folder_name, is_new)
+        for series, nums in cdn_templates.items():
+            for num, record in nums.items():
+                folder_name = record.get('文件夹名', '')
+                if not folder_name:
+                    continue
+                cdn_ua = record.get('updated_at', '')
+                local_ua = local_templates.get(series, {}).get(num, {}).get('updated_at', '')
+                is_new = series not in local_templates or num not in local_templates.get(series, {})
+                is_changed = not is_new and cdn_ua != local_ua
+                if is_new or is_changed:
+                    pending.append((folder_name, is_new))
+
+        if not pending:
+            # index_updated_at 变了但所有 folder 都没变，直接更新 index 即可
+            try:
+                os.makedirs(os.path.dirname(TEMPLATE_LOCAL_INDEX), exist_ok=True)
+                with open(TEMPLATE_LOCAL_INDEX, 'w', encoding='utf-8') as f:
+                    json.dump(cdn_index, f, ensure_ascii=False, indent=2)
+            except Exception:
+                pass
+            self._send_json({'changed': False})
+            return
+
+        # 已有同步在跑，直接返回当前进度
         with _sync_lock:
             if _sync_state['running']:
-                self._send_json({'changed': True, 'syncing': True})
+                self._send_json({
+                    'changed': True, 'syncing': True,
+                    'completed': list(_sync_state['completed']),
+                    'total': _sync_state['total'],
+                })
                 return
+
+        # 先写 index.json，让前端列表立刻出现
+        try:
+            os.makedirs(os.path.dirname(TEMPLATE_LOCAL_INDEX), exist_ok=True)
+            with open(TEMPLATE_LOCAL_INDEX, 'w', encoding='utf-8') as f:
+                json.dump(cdn_index, f, ensure_ascii=False, indent=2)
+        except Exception as e:
+            self._send_json({'error': 'index 写入失败: ' + str(e)}, 500)
+            return
+
+        # 初始化状态，启动后台线程
+        with _sync_lock:
             _sync_state['running'] = True
             _sync_state['last_result'] = None
+            _sync_state['completed'] = []
+            _sync_state['total'] = len(pending)
 
         t = threading.Thread(
             target=_do_sync_templates,
-            args=(cdn_index, local_index),
+            args=(cdn_index, local_index, pending),
             daemon=True,
         )
         t.start()
-        self._send_json({'changed': True, 'syncing': True})
+        self._send_json({
+            'changed': True, 'syncing': True,
+            'completed': [],
+            'total': len(pending),
+        })
+
+    def _handle_sync_status(self):
+        """GET /api/sync-status
+        返回当前后台同步进度。
+        运行中: {running: true, completed: [...], total: N}
+        完成后: {running: false, result: {changed, added, updated}}
+        """
+        with _sync_lock:
+            running = _sync_state['running']
+            completed = list(_sync_state['completed'])
+            total = _sync_state['total']
+            last_result = _sync_state['last_result']
+
+        if running:
+            self._send_json({'running': True, 'completed': completed, 'total': total})
+        else:
+            self._send_json({'running': False, 'result': last_result})
 
     def log_message(self, format, *args):
         # 静默日志，避免轮询刷屏