myagent-ai 1.23.16 → 1.23.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.23.16",
+  "version": "1.23.18",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/web/api_server.py

@@ -1007,16 +1007,75 @@ class ApiServer:
   </div>
 </div>
 
-<!-- [v1.20.11] noVNC 组件加载：本地优先，CDN 回退 -->
+<!-- [v1.23.16] noVNC 组件加载：本地优先，CDN 回退 -->
 <script>
-// [v1.20.11] 本地 noVNC 加载器：通过动态 <script> 标签加载 CommonJS 模块
-// 本地 data/novnc/lib/ 中的文件是 CommonJS 格式，不能直接用 import()
+// [v1.23.16] 本地 noVNC 加载器 — 支持 ../ 相对路径解析
 async function loadLocalNoVNC() {{
     const basePath = '/vnc/lib/';
-    // 加载 noVNC 依赖模块（按依赖顺序）
+    const _modules = {{}};
+
+    // 规范化路径：处理 ./ 和 ../ 相对路径
+    function resolvePath(fromModId, depId) {{
+        if (!depId.startsWith('.')) return depId;
+        // 取 fromModId 所在目录
+        const baseParts = fromModId.split('/');
+        baseParts.pop(); // 去掉文件名，得到目录
+        const depParts = depId.split('/');
+        for (const part of depParts) {{
+            if (part === '.') continue;
+            else if (part === '..') baseParts.pop();
+            else baseParts.push(part);
+        }}
+        return baseParts.join('/');
+    }}
+
+    // 去掉 .js 后缀（模块 ID 不含后缀）
+    function stripJs(p) {{ return p.endsWith('.js') ? p.slice(0, -3) : p; }}
+
+    // 加载并注册单个模块
+    async function loadModule(filePath) {{
+        const modId = stripJs(filePath);
+        if (_modules[modId]) return _modules[modId]; // 已加载
+        const resp = await fetch(basePath + filePath);
+        if (!resp.ok) throw new Error('Failed to fetch ' + filePath + ': ' + resp.status);
+        const code = await resp.text();
+        const modExports = {{}};
+        _modules[modId] = modExports;
+        try {{
+            const fn = new Function('exports', 'require', 'module', code);
+            fn(modExports, function(depId) {{
+                const resolved = stripJs(resolvePath(modId, depId));
+                return _modules[resolved] || {{}};
+            }}, {{ exports: modExports }});
+        }} catch(e) {{
+            console.warn('[noVNC] Module error:', filePath, e);
+        }}
+        return modExports;
+    }}
+
+    // 按依赖顺序加载所有 noVNC 模块
     const depFiles = [
-        'vendor/pako/lib/inflate.js',
-        'vendor/pako/lib/deflate.js',
+        // pako vendor (zlib 依赖)
+        'vendor/pako/lib/utils/common.js',
+        'vendor/pako/lib/zlib/adler32.js',
+        'vendor/pako/lib/zlib/crc32.js',
+        'vendor/pako/lib/zlib/messages.js',
+        'vendor/pako/lib/zlib/inffast.js',
+        'vendor/pako/lib/zlib/inftrees.js',
+        'vendor/pako/lib/zlib/trees.js',
+        'vendor/pako/lib/zlib/inflate.js',
+        'vendor/pako/lib/zlib/deflate.js',
+        'vendor/pako/lib/zlib/gzheader.js',
+        'vendor/pako/lib/zlib/zstream.js',
+        // noVNC core
+        'util/logging.js',
+        'util/events.js',
+        'util/eventtarget.js',
+        'util/strings.js',
+        'util/browser.js',
+        'util/int.js',
+        'util/element.js',
+        'util/cursor.js',
         'base64.js',
         'websock.js',
         'display.js',
@@ -1030,97 +1089,31 @@ async function loadLocalNoVNC() {{
         'decoders/tightpng.js',
         'decoders/zrle.js',
         'decoders/jpeg.js',
-        'util/events.js',
-        'util/eventtarget.js',
-        'util/logging.js',
-        'util/strings.js',
-        'util/browser.js',
-        'util/int.js',
-        'util/element.js',
-        'util/cursor.js',
+        'encodings.js',
+        'input/keysymdef.js',
         'input/keysym.js',
         'input/xtscancodes.js',
-        'input/util.js',
-        'input/domkeytable.js',
         'input/vkeys.js',
+        'input/fixedkeys.js',
+        'input/domkeytable.js',
+        'input/util.js',
         'input/keyboard.js',
         'input/gesturehandler.js',
-        'encodings.js',
+        // crypto (rfb.js → ra2.js → crypto/)
+        'crypto/bigint.js',
+        'crypto/dh.js',
+        'crypto/md5.js',
+        'crypto/des.js',
+        'crypto/aes.js',
+        'crypto/rsa.js',
+        'crypto/crypto.js',
+        'ra2.js',
     ];
-    // 加载所有依赖文件为全局变量
     for (const file of depFiles) {{
-        const resp = await fetch(basePath + file);
-        if (!resp.ok) throw new Error('Failed to fetch ' + file + ': ' + resp.status);
-        const code = await resp.text();
-        // 使用 Function 构造器执行 CommonJS 代码，注入 require 和 exports
-        const _modules = window.__novnc_modules = window.__novnc_modules || {{}};
-        const modId = file.replace('.js', '');
-        const modExports = {{}};
-        _modules[modId] = modExports;
-        try {{
-            const fn = new Function('exports', 'require', 'module', code);
-            fn(modExports, function(depId) {{
-                // 解析相对路径
-                let resolved = depId;
-                if (depId.startsWith('./')) {{
-                    resolved = (modId.substring(0, modId.lastIndexOf('/') + 1) || '') + depId.substring(2);
-                }}
-                return _modules[resolved] || {{}};
-            }}, {{ exports: modExports }});
-        }} catch(e) {{
-            console.warn('[noVNC] Failed to load module:', file, e);
-        }}
+        await loadModule(file);
     }}
     // 最后加载 rfb.js
-    const resp = await fetch(basePath + 'rfb.js');
-    if (!resp.ok) throw new Error('Failed to fetch rfb.js: ' + resp.status);
-    const code = await resp.text();
-    const _modules = window.__novnc_modules || {{}};
-    const rfbExports = {{}};
-    _modules['rfb'] = rfbExports;
-    const fn = new Function('exports', 'require', 'module', code);
-    fn(rfbExports, function(depId) {{
-        let resolved = depId;
-        if (depId.startsWith('./')) {{
-            resolved = 'rfb/' + depId.substring(2);
-            // 映射到实际模块路径
-            const pathMap = {{
-                './util/int': 'util/int',
-                './util/logging': 'util/logging',
-                './util/strings': 'util/strings',
-                './util/browser': 'util/browser',
-                './util/element': 'util/element',
-                './util/events': 'util/events',
-                './util/eventtarget': 'util/eventtarget',
-                './display': 'display',
-                './inflator': 'inflator',
-                './deflator': 'deflator',
-                './websock': 'websock',
-                './decoders/copyrect': 'decoders/copyrect',
-                './decoders/raw': 'decoders/raw',
-                './decoders/rre': 'decoders/rre',
-                './decoders/hextile': 'decoders/hextile',
-                './decoders/tight': 'decoders/tight',
-                './decoders/tightpng': 'decoders/tightpng',
-                './decoders/zrle': 'decoders/zrle',
-                './decoders/jpeg': 'decoders/jpeg',
-                './encodings': 'encodings',
-                './input/keysym': 'input/keysym',
-                './input/keyboard': 'input/keyboard',
-                './input/xtscancodes': 'input/xtscancodes',
-                './input/util': 'input/util',
-                './input/domkeytable': 'input/domkeytable',
-                './input/vkeys': 'input/vkeys',
-                './input/gesturehandler': 'input/gesturehandler',
-                './base64': 'base64',
-            }};
-            if (depId.startsWith('./')) {{
-                const mapped = pathMap[depId];
-                if (mapped) resolved = mapped;
-            }}
-        }}
-        return _modules[resolved] || {{}};
-    }}, {{ exports: rfbExports }});
+    const rfbExports = await loadModule('rfb.js');
     return rfbExports.default || rfbExports;
 }}
 </script>
@@ -1129,34 +1122,16 @@ try {{
     let RFB = null;
     let loadError = '';
 
-    // [v1.20.11] 优先从本地服务器加载 noVNC（data/novnc/lib/）
+    // [v1.23.16] 从本地服务器加载 noVNC（data/novnc/lib/）
     try {{
         RFB = await loadLocalNoVNC();
     }} catch (localErr) {{
         loadError = localErr.message;
-        console.warn('[VNC] 本地加载失败，尝试 CDN:', localErr.message);
-        // 本地加载失败，尝试 CDN 回退（多源容错）
-        const CDN_SOURCES = [
-            'https://cdn.jsdelivr.net/npm/@novnc/novnc@1.5.0/core/rfb.js',
-            'https://fastly.jsdelivr.net/npm/@novnc/novnc@1.5.0/core/rfb.js',
-            'https://unpkg.com/@novnc/novnc@1.5.0/core/rfb.js',
-            'https://registry.npmmirror.com/@novnc/novnc/1.5.0/files/core/rfb.js',
-            'https://cdn.staticfile.net/novnc/novnc/1.5.0/files/core/rfb.js',
-        ];
-        for (const src of CDN_SOURCES) {{
-            try {{
-                const mod = await import(src);
-                RFB = mod.default || mod.RFB;
-                if (RFB) break;
-            }} catch (e) {{
-                loadError = e.message;
-                continue;
-            }}
-        }}
+        console.error('[VNC] 本地 noVNC 加载失败:', localErr);
     }}
 
     if (!RFB) {{
-        throw new Error('noVNC 加载失败: ' + loadError);
+        throw new Error('noVNC 本地加载失败: ' + loadError);
     }}
 
     initVNC(RFB);
@@ -1166,7 +1141,8 @@ try {{
     document.getElementById('statusTitle').textContent = 'VNC 组件加载失败';
     document.getElementById('statusMsg').innerHTML =
         'noVNC 组件加载失败: ' + e.message + '<br><br>' +
-        '请确保 myagent/data/novnc/lib/ 目录存在。';
+        '请确保 myagent/data/novnc/lib/ 目录存在。<br>' +
+        '在服务器上运行: myagent-ai reinstall';
     document.getElementById('statusActions').style.display = '';
     console.error('[VNC] 组件加载失败:', e);
 }}