myagent-ai 1.20.9 → 1.20.11

package/agents/main_agent.py

@@ -1669,6 +1669,7 @@ class MainAgent(BaseAgent):
                     _media_type = "audio" if tool_name == "playaudio" else "video"
                     _embed_url = None
                     _embed_title = params.get("title", "")
+                    _fallback_link = None  # [v1.20.10] 无法嵌入时提供外部链接
 
                     if _media_url:
                         # 在线链接 — 提取嵌入式播放 URL
@@ -1679,6 +1680,21 @@ class MainAgent(BaseAgent):
                         if _yt_match:
                             _embed_url = f"https://www.youtube.com/embed/{_yt_match.group(1)}"
                             _embed_title = _embed_title or "YouTube 视频"
+                        # YouTube Music 播放列表: https://music.youtube.com/playlist?list=xxx
+                        elif 'music.youtube.com' in _url_lower:
+                            _ym_match = re.search(r'list=([\w-]+)', _media_url)
+                            if _ym_match:
+                                _embed_url = f"https://music.youtube.com/embed?list={_ym_match.group(1)}&layout=full"
+                                _embed_title = _embed_title or "YouTube Music"
+                            else:
+                                # 单曲: https://music.youtube.com/watch?v=xxx
+                                _ymv_match = re.search(r'watch\?v=([\w-]+)', _media_url)
+                                if _ymv_match:
+                                    _embed_url = f"https://music.youtube.com/embed/{_ymv_match.group(1)}"
+                                    _embed_title = _embed_title or "YouTube Music"
+                                else:
+                                    _fallback_link = _media_url
+                                    _embed_title = _embed_title or "YouTube Music"
                         # Bilibili: https://www.bilibili.com/video/BVxxx 或 b23.tv/xxx
                         elif 'bilibili.com' in _url_lower or 'b23.tv' in _url_lower:
                             _bv_match = re.search(r'bilibili\.com/video/(BV[\w]+)', _media_url)
@@ -1690,8 +1706,14 @@ class MainAgent(BaseAgent):
                                 _embed_title = _embed_title or "B站视频"
                         # QQ音乐: https://y.qq.com/n/ryqq/songDetail/xxx
                         elif 'y.qq.com' in _url_lower:
-                            _embed_url = _media_url
-                            _embed_title = _embed_title or "QQ音乐"
+                            # QQ音乐支持 outchain player
+                            _qq_match = re.search(r'songDetail/(\w+)', _media_url)
+                            if _qq_match:
+                                _embed_url = f"https://y.qq.com/n/ryqq/songDetail/{_qq_match.group(1)}"
+                                _embed_title = _embed_title or "QQ音乐"
+                            else:
+                                _embed_url = _media_url
+                                _embed_title = _embed_title or "QQ音乐"
                         # 网易云音乐: https://music.163.com/song?id=xxx
                         elif 'music.163.com' in _url_lower:
                             _song_match = re.search(r'music\.163\.com.*[?&]id=(\d+)', _media_url)
@@ -1723,6 +1745,19 @@ class MainAgent(BaseAgent):
                         })
                         result = {"success": True, "output": f"已嵌入{_embed_title}播放器: {_media_url}"}
 
+                    elif _fallback_link and stream_callback:
+                        # [v1.20.10] 无法嵌入但提供外部链接 — 发送链接卡片
+                        stream_callback({
+                            "type": "v2_media",
+                            "data": {
+                                "media_type": _media_type,
+                                "embed_url": "",  # 空 embed_url 告诉前端渲染链接
+                                "title": _embed_title,
+                                "original_url": _fallback_link,
+                            }
+                        })
+                        result = {"success": True, "output": f"已提供{_embed_title}链接（不支持嵌入播放）: {_fallback_link}"}
+
                     elif _media_file:
                         # 本地文件 — 使用 file_send 发送文件，前端渲染内嵌播放器
                         from pathlib import Path as _P

package/core/vnc_manager.py

@@ -335,15 +335,23 @@ class VNCManager:
         """查找 noVNC web 文件目录
         
         搜索顺序:
-          1. /usr/share/novnc (apt 安装)
-          2. /usr/local/share/novnc
-          3. pip 安装的 websockify 自带 novnc
+          1. 项目内置 noVNC (data/novnc/)
+          2. /usr/share/novnc (apt 安装)
+          3. /usr/local/share/novnc
+          4. pip 安装的 websockify 自带 novnc
         """
-        search_paths = [
+        search_paths = []
+
+        # [v1.20.9] 优先搜索项目内置 noVNC
+        _builtin_novnc = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'data', 'novnc')
+        if os.path.isdir(_builtin_novnc):
+            search_paths.append(_builtin_novnc)
+
+        search_paths.extend([
             "/usr/share/novnc",
             "/usr/local/share/novnc",
             "/opt/novnc",
-        ]
+        ])
 
         # 也搜索 pip 安装路径
         try:
@@ -362,12 +370,16 @@ class VNCManager:
 
         for path in search_paths:
             if os.path.isdir(path):
-                # 检查是否有 vnc.html
+                # 检查是否有 vnc.html（完整 noVNC 安装）
                 for sub in ["", "/vnc_lite", "/vnc"]:
                     html = os.path.join(path + sub, "vnc.html")
                     vnc_lite = os.path.join(path + sub, "vnc_lite.html")
                     if os.path.isfile(html) or os.path.isfile(vnc_lite):
                         return path + sub if sub else path
+                # [v1.20.9] 检查是否有 lib/rfb.js（内置精简 noVNC）
+                rfb_js = os.path.join(path, "lib", "rfb.js")
+                if os.path.isfile(rfb_js):
+                    return path
 
         return None
 

package/data/novnc/lib/base64.js

@@ -0,0 +1,100 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var Log = _interopRequireWildcard(require("./util/logging.js"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools/jint/sunspider/string-base64.js
+var _default = exports["default"] = {
+  /* Convert data (an array of integers) to a Base64 string. */
+  toBase64Table: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='.split(''),
+  base64Pad: '=',
+  encode: function encode(data) {
+    "use strict";
+
+    var result = '';
+    var length = data.length;
+    var lengthpad = length % 3;
+    // Convert every three bytes to 4 ascii characters.
+
+    for (var i = 0; i < length - 2; i += 3) {
+      result += this.toBase64Table[data[i] >> 2];
+      result += this.toBase64Table[((data[i] & 0x03) << 4) + (data[i + 1] >> 4)];
+      result += this.toBase64Table[((data[i + 1] & 0x0f) << 2) + (data[i + 2] >> 6)];
+      result += this.toBase64Table[data[i + 2] & 0x3f];
+    }
+
+    // Convert the remaining 1 or 2 bytes, pad out to 4 characters.
+    var j = length - lengthpad;
+    if (lengthpad === 2) {
+      result += this.toBase64Table[data[j] >> 2];
+      result += this.toBase64Table[((data[j] & 0x03) << 4) + (data[j + 1] >> 4)];
+      result += this.toBase64Table[(data[j + 1] & 0x0f) << 2];
+      result += this.toBase64Table[64];
+    } else if (lengthpad === 1) {
+      result += this.toBase64Table[data[j] >> 2];
+      result += this.toBase64Table[(data[j] & 0x03) << 4];
+      result += this.toBase64Table[64];
+      result += this.toBase64Table[64];
+    }
+    return result;
+  },
+  /* Convert Base64 data to a string */
+  /* eslint-disable comma-spacing */
+  toBinaryTable: [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1],
+  /* eslint-enable comma-spacing */decode: function decode(data) {
+    var offset = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var dataLength = data.indexOf('=') - offset;
+    if (dataLength < 0) {
+      dataLength = data.length - offset;
+    }
+
+    /* Every four characters is 3 resulting numbers */
+    var resultLength = (dataLength >> 2) * 3 + Math.floor(dataLength % 4 / 1.5);
+    var result = new Array(resultLength);
+
+    // Convert one by one.
+
+    var leftbits = 0; // number of bits decoded, but yet to be appended
+    var leftdata = 0; // bits decoded, but yet to be appended
+    for (var idx = 0, i = offset; i < data.length; i++) {
+      var c = this.toBinaryTable[data.charCodeAt(i) & 0x7f];
+      var padding = data.charAt(i) === this.base64Pad;
+      // Skip illegal characters and whitespace
+      if (c === -1) {
+        Log.Error("Illegal character code " + data.charCodeAt(i) + " at position " + i);
+        continue;
+      }
+
+      // Collect data into leftdata, update bitcount
+      leftdata = leftdata << 6 | c;
+      leftbits += 6;
+
+      // If we have 8 or more bits, append 8 bits to the result
+      if (leftbits >= 8) {
+        leftbits -= 8;
+        // Append if not padding.
+        if (!padding) {
+          result[idx++] = leftdata >> leftbits & 0xff;
+        }
+        leftdata &= (1 << leftbits) - 1;
+      }
+    }
+
+    // If there are any bits left, the base64 string was corrupted
+    if (leftbits) {
+      var err = new Error('Corrupted base64 string');
+      err.name = 'Base64-Error';
+      throw err;
+    }
+    return result;
+  }
+};
+/* End of Base64 namespace */