agent-bridge-doubao 1.0.8 → 1.0.10

package/dist/src-ts/plugins/doubao/cdp-client.js

@@ -1,8 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoubaoCdpClient = exports.responseTextScript = void 0;
+exports.doubaoStreamErrorMessage = doubaoStreamErrorMessage;
 exports.requestBody = requestBody;
 const node_crypto_1 = require("node:crypto");
+function doubaoStreamErrorMessage(data) {
+    let code = "";
+    let subtype = "";
+    try {
+        const value = JSON.parse(data);
+        code = String(value.code ?? value.error?.code ?? "");
+        subtype = String(value.subtype ?? value.error?.subtype ?? "").toLowerCase();
+    }
+    catch { /* 平台可能返回非 JSON 错误 */ }
+    if (code === "710022004" || subtype === "slide" || /rate limited|verify|slide/i.test(data)) {
+        return `豆包平台触发滑块验证${code ? `（错误码 ${code}）` : ""}，请在豆包客户端完成验证后重试`;
+    }
+    return `豆包平台返回流式错误${code ? `（错误码 ${code}）` : ""}，请稍后重试`;
+}
 const defaults = { port: Number(process.env.DOUBAO_CDP_PORT ?? "9227"), conversationId: process.env.DOUBAO_CONVERSATION_ID ?? "759450172544514", botId: process.env.DOUBAO_BOT_ID ?? "7338286299411103781", timeoutMs: Number(process.env.DOUBAO_TIMEOUT_MS ?? "180000") };
 function sleep(ms, signal) {
     if (signal?.aborted)
@@ -18,6 +33,7 @@ exports.responseTextScript = `(value) => { const texts = []; const visit = (item
 class DoubaoCdpClient {
     socket;
     sequence = 0;
+    closeController = new AbortController();
     pending = new Map();
     options;
     constructor(options = {}) { this.options = { port: options.port ?? defaults.port, conversationId: options.conversationId ?? defaults.conversationId, botId: options.botId ?? defaults.botId, pluginList: options.pluginList ?? [], timeoutMs: options.timeoutMs ?? defaults.timeoutMs, fetchImpl: options.fetchImpl }; }
@@ -37,13 +53,29 @@ class DoubaoCdpClient {
         socket.onmessage = event => this.onMessage(String(event.data));
         await new Promise((resolve, reject) => { socket.onopen = () => resolve(); socket.onerror = () => reject(new Error("豆包 CDP WebSocket 连接失败")); });
     }
-    close() { this.socket?.close(); this.socket = undefined; for (const pending of this.pending.values())
-        pending.reject(new Error("豆包 CDP 已关闭")); this.pending.clear(); }
+    async cancel() {
+        this.closeController.abort();
+        if (this.socket) {
+            try {
+                await this.evaluate("window.__mab_doubao_controller?.abort()");
+            }
+            catch { /* CDP 已断开时无需等待页面确认 */ }
+        }
+    }
+    async close() {
+        await this.cancel();
+        this.socket?.close();
+        this.socket = undefined;
+        for (const pending of this.pending.values())
+            pending.reject(new Error("豆包 CDP 已关闭"));
+        this.pending.clear();
+    }
     async direct(text, signal) {
         await this.evaluate(buildInjection(requestBody(text, this.options.conversationId, this.options.botId, this.options.pluginList)));
         const deadline = Date.now() + this.options.timeoutMs;
+        const requestSignal = signal ? AbortSignal.any([signal, this.closeController.signal]) : this.closeController.signal;
         while (Date.now() < deadline) {
-            await sleep(1000, signal);
+            await sleep(1000, requestSignal);
             const result = await this.evaluate("window.__mab_doubao_result");
             if (typeof result !== "string")
                 continue;
@@ -64,7 +96,13 @@ class DoubaoCdpClient {
         return; const pending = this.pending.get(message.id); if (!pending)
         return; this.pending.delete(message.id); pending.resolve(message); }
     async cdp(method, params = {}) { if (!this.socket)
-        throw new Error("豆包 CDP 尚未连接"); const id = ++this.sequence; const result = new Promise((resolve, reject) => this.pending.set(id, { resolve, reject })); this.socket.send(JSON.stringify({ id, method, params })); return Promise.race([result, sleep(this.options.timeoutMs).then(() => { throw new Error(`CDP ${method} 超时`); })]); }
+        throw new Error("豆包 CDP 尚未连接"); const id = ++this.sequence; const result = new Promise((resolve, reject) => this.pending.set(id, { resolve, reject })); let timer; try {
+        this.socket.send(JSON.stringify({ id, method, params }));
+        return await Promise.race([result, new Promise((_, reject) => { timer = setTimeout(() => { this.pending.delete(id); reject(new Error(`CDP ${method} 超时`)); }, this.options.timeoutMs); })]);
+    }
+    finally {
+        clearTimeout(timer);
+    } }
     async evaluate(expression) { const response = await this.cdp("Runtime.evaluate", { expression, returnByValue: true, awaitPromise: false }); if (response.result?.exceptionDetails)
         throw new Error(`豆包页面 JS 异常: ${JSON.stringify(response.result.exceptionDetails).slice(0, 300)}`); return response.result?.result?.value; }
 }
@@ -73,6 +111,8 @@ function buildInjection(body) {
     const url = "https://www.doubao.com/chat/completion?aid=582478&channel=win&chromium_version=147.0.7727.149&client_platform=pc_client&device_id=2750296938275162&device_platform=web&doubao_device_platform=desktop&doubao_pc_version=2.30.4&fp=verify_2750296938275162&language=zh&pc_version=2.30.4&pkg_type=release_version&real_aid=582478&region=CN&runtime=web&runtime_version=3.37.7&samantha_web=1&sys_region=CN&tea_uuid=2750296938275162&tz_name=Asia%2FShanghai&use-olympus-account=1&version_code=20800&web_platform=desktop";
     return String.raw `(() => {
     window.__mab_doubao_result = null;
+    window.__mab_doubao_controller?.abort();
+    window.__mab_doubao_controller = new AbortController();
     const merge = (a, b) => { if (!b || a.endsWith(b)) return a; const n = Math.min(a.length, b.length); let k = 0; for (let i = 1; i <= n; i++) if (a.endsWith(b.slice(0, i))) k = i; return a + (k >= 4 ? b.slice(k) : b); };
     (async () => {
       try {
@@ -81,11 +121,11 @@ function buildInjection(body) {
         webId ||= '7689385646880933426'; tabId ||= '98f6fc8e-a1f7-4585-aa08-89b9a10aa451';
         let requestUrl = ${JSON.stringify(url)} + '&web_id=' + encodeURIComponent(webId) + '&web_tab_id=' + encodeURIComponent(tabId);
         for (const entry of performance.getEntriesByType('resource')) if (entry.name.includes('/chat/completion?')) requestUrl = entry.name;
-        const response = await fetch(requestUrl, { method: 'POST', headers: { 'content-type': 'application/json' }, credentials: 'include', body: ${JSON.stringify(body)} });
+        const response = await fetch(requestUrl, { method: 'POST', headers: { 'content-type': 'application/json' }, credentials: 'include', body: ${JSON.stringify(body)}, signal: window.__mab_doubao_controller.signal });
         if (!response.ok) throw new Error('HTTP ' + response.status);
         const reader = response.body?.getReader(); if (!reader) throw new Error('响应无 body');
         const decoder = new TextDecoder(); let buffer = '', reply = '', events = [];
-        const consume = (block) => { const event = (block.match(/^event:\s*(.+)$/m) || [])[1] || ''; const data = (block.match(/^data:\s*(.+)$/m) || [])[1] || ''; if (event) events.push(event); if (event === 'STREAM_ERROR') throw new Error('STREAM_ERROR ' + data.slice(0, 500)); if (!data) return; try { const json = JSON.parse(data); if (event === 'STREAM_CHUNK') for (const patch of (json.patch_op || [])) reply = merge(reply, patch.patch_value?.tts_content || ''); if (event === 'CHUNK_DELTA' && typeof json.text === 'string') reply = merge(reply, json.text); if (event === 'STREAM_MSG_NOTIFY' || event === 'FULL_MSG_NOTIFY') for (const text of (${exports.responseTextScript})(json)) reply = merge(reply, text); if (event === 'SSE_REPLY_END') reply = merge(reply, json.msg_finish_attr?.brief || json.data?.msg_finish_attr?.brief || ''); } catch {} };
+        const consume = (block) => { const event = (block.match(/^event:\s*(.+)$/m) || [])[1] || ''; const data = (block.match(/^data:\s*(.+)$/m) || [])[1] || ''; if (event) events.push(event); if (event === 'STREAM_ERROR') throw new Error((${doubaoStreamErrorMessage.toString()})(data)); if (!data) return; try { const json = JSON.parse(data); if (event === 'STREAM_CHUNK') for (const patch of (json.patch_op || [])) reply = merge(reply, patch.patch_value?.tts_content || ''); if (event === 'CHUNK_DELTA' && typeof json.text === 'string') reply = merge(reply, json.text); if (event === 'STREAM_MSG_NOTIFY' || event === 'FULL_MSG_NOTIFY') for (const text of (${exports.responseTextScript})(json)) reply = merge(reply, text); if (event === 'SSE_REPLY_END') reply = merge(reply, json.msg_finish_attr?.brief || json.data?.msg_finish_attr?.brief || ''); } catch {} };
         for (;;) { const item = await reader.read(); if (item.done) break; buffer += decoder.decode(item.value, { stream: true }).replace(/\r\n/g, '\n'); let index; while ((index = buffer.indexOf('\n\n')) >= 0) { consume(buffer.slice(0, index)); buffer = buffer.slice(index + 2); } }
         if (buffer.trim()) consume(buffer);
         window.__mab_doubao_result = JSON.stringify({ ok: Boolean(reply.trim()), reply, reason: reply.trim() ? '' : 'SSE 未提取到文本; events=' + events.slice(0, 20).join(',') });

package/dist/src-ts/plugins/doubao/index.js

@@ -6,7 +6,7 @@ const plugin_1 = require("../../plugin");
 const desktop_launch_1 = require("../desktop-launch");
 exports.doubaoManifest = {
     id: "doubao",
-    version: "1.0.8",
+    version: "1.0.10",
     displayName: "豆包",
     entry: "dist/index.js",
     apiVersion: "1",
@@ -67,7 +67,7 @@ class DoubaoPlugin {
     async deactivate() {
         this.disposer?.();
         this.disposer = undefined;
-        this.client?.close();
+        await this.client?.close();
         this.client = undefined;
         this.state = "stopped";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-bridge-doubao",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "agent-bridge 的豆包插件。",
   "keywords": [
     "mu-agent-bridge-plugin",

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "doubao",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "type": "agent",
   "displayName": "豆包",
   "entry": "dist/src-ts/plugins/doubao/index.js",