@ynhcj/xiaoyi-channel 0.0.44-beta → 0.0.44-next
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +0 -2
- package/dist/index.js +42 -2
- package/dist/src/bot.d.ts +1 -0
- package/dist/src/bot.js +59 -61
- package/dist/src/channel.js +30 -4
- package/dist/src/client.js +0 -9
- package/dist/src/cspl/call-api.d.ts +3 -0
- package/dist/src/cspl/call-api.js +86 -0
- package/dist/src/cspl/config.d.ts +19 -0
- package/dist/src/cspl/config.js +50 -0
- package/dist/src/cspl/constants.d.ts +43 -0
- package/dist/src/cspl/constants.js +22 -0
- package/dist/src/cspl/utils.d.ts +10 -0
- package/dist/src/cspl/utils.js +57 -0
- package/dist/src/file-upload.d.ts +5 -0
- package/dist/src/file-upload.js +88 -6
- package/dist/src/formatter.d.ts +2 -0
- package/dist/src/formatter.js +13 -30
- package/dist/src/heartbeat.js +0 -4
- package/dist/src/monitor.js +8 -10
- package/dist/src/onboarding.d.ts +3 -4
- package/dist/src/onboarding.js +2 -2
- package/dist/src/outbound.d.ts +2 -1
- package/dist/src/outbound.js +1 -19
- package/dist/src/parser.d.ts +6 -0
- package/dist/src/parser.js +16 -0
- package/dist/src/push.js +0 -21
- package/dist/src/reply-dispatcher.d.ts +4 -0
- package/dist/src/reply-dispatcher.js +46 -8
- package/dist/src/steer-injector.d.ts +16 -0
- package/dist/src/steer-injector.js +74 -0
- package/dist/src/thread-bindings.d.ts +54 -0
- package/dist/src/thread-bindings.js +214 -0
- package/dist/src/tools/calendar-tool.js +2 -37
- package/dist/src/tools/call-phone-tool.js +3 -60
- package/dist/src/tools/create-alarm-tool.js +8 -109
- package/dist/src/tools/delete-alarm-tool.js +5 -69
- package/dist/src/tools/device-tool-map.d.ts +4 -0
- package/dist/src/tools/device-tool-map.js +24 -0
- package/dist/src/tools/image-reading-tool.d.ts +5 -0
- package/dist/src/tools/image-reading-tool.js +328 -0
- package/dist/src/tools/location-tool.js +6 -40
- package/dist/src/tools/modify-alarm-tool.js +8 -114
- package/dist/src/tools/modify-note-tool.js +3 -41
- package/dist/src/tools/note-tool.js +4 -16
- package/dist/src/tools/search-alarm-tool.js +12 -118
- package/dist/src/tools/search-calendar-tool.js +4 -81
- package/dist/src/tools/search-contact-tool.js +2 -55
- package/dist/src/tools/search-file-tool.js +4 -61
- package/dist/src/tools/search-message-tool.js +2 -59
- package/dist/src/tools/search-note-tool.js +4 -22
- package/dist/src/tools/search-photo-gallery-tool.js +8 -57
- package/dist/src/tools/send-command-to-car-tool.d.ts +5 -0
- package/dist/src/tools/send-command-to-car-tool.js +85 -0
- package/dist/src/tools/send-file-to-user-tool.js +1 -39
- package/dist/src/tools/send-message-tool.js +5 -56
- package/dist/src/tools/session-manager.d.ts +1 -0
- package/dist/src/tools/session-manager.js +0 -45
- package/dist/src/tools/timestamp-to-utc8-tool.d.ts +12 -0
- package/dist/src/tools/timestamp-to-utc8-tool.js +104 -0
- package/dist/src/tools/upload-file-tool.js +0 -49
- package/dist/src/tools/upload-photo-tool.js +0 -42
- package/dist/src/tools/view-push-result-tool.js +0 -11
- package/dist/src/tools/xiaoyi-collection-tool.js +4 -82
- package/dist/src/tools/xiaoyi-gui-tool.js +0 -34
- package/dist/src/utils/runtime-manager.d.ts +7 -0
- package/dist/src/utils/runtime-manager.js +42 -0
- package/dist/src/websocket.js +33 -13
- package/package.json +3 -4
- package/dist/src/tools/search-photo-tool.d.ts +0 -9
- package/dist/src/tools/search-photo-tool.js +0 -270
- package/dist/src/utils/session.d.ts +0 -34
- package/dist/src/utils/session.js +0 -50
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
// xiaoyi runtime 持久化管理器
|
|
2
|
+
import { promises as fs } from "fs";
|
|
3
|
+
import * as path from "path";
|
|
4
|
+
import { logger } from "./logger.js";
|
|
5
|
+
const RUNTIME_FILE = "/home/sandbox/.openclaw/.xiaoyiruntime";
|
|
6
|
+
/**
|
|
7
|
+
* 确保目录存在
|
|
8
|
+
*/
|
|
9
|
+
async function ensureDirectoryExists(filePath) {
|
|
10
|
+
const dir = path.dirname(filePath);
|
|
11
|
+
try {
|
|
12
|
+
await fs.mkdir(dir, { recursive: true });
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
logger.error(`[RuntimeManager] Failed to create directory ${dir}:`, error);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* 保存 runtime 信息到 .xiaoyiruntime 文件
|
|
20
|
+
* @param webSocketSessionId - WebSocket 层级的 sessionId (SESSION_ID)
|
|
21
|
+
* @param conversationId - param 里的 sessionId (CONVERSATION_ID)
|
|
22
|
+
* @param taskId - 任务 ID (param.id)
|
|
23
|
+
*/
|
|
24
|
+
export async function saveRuntimeInfo(webSocketSessionId, conversationId, taskId) {
|
|
25
|
+
if (!webSocketSessionId || !conversationId || !taskId) {
|
|
26
|
+
logger.warn(`[RuntimeManager] Invalid params: SESSION_ID=${webSocketSessionId}, CONVERSATION_ID=${conversationId}, TASK_ID=${taskId}`);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
try {
|
|
30
|
+
await ensureDirectoryExists(RUNTIME_FILE);
|
|
31
|
+
const content = `SESSION_ID=${webSocketSessionId}\nCONVERSATION_ID=${conversationId}\nTASK_ID=${taskId}\n`;
|
|
32
|
+
await fs.writeFile(RUNTIME_FILE, content, "utf-8");
|
|
33
|
+
logger.log(`[RuntimeManager] ✅ Saved runtime info to .xiaoyiruntime`);
|
|
34
|
+
logger.log(`[RuntimeManager] - SESSION_ID: ${webSocketSessionId}`);
|
|
35
|
+
logger.log(`[RuntimeManager] - CONVERSATION_ID: ${conversationId}`);
|
|
36
|
+
logger.log(`[RuntimeManager] - TASK_ID: ${taskId}`);
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
logger.error(`[RuntimeManager] Failed to save runtime info:`, error);
|
|
40
|
+
// 不抛出异常,避免影响主流程
|
|
41
|
+
}
|
|
42
|
+
}
|
package/dist/src/websocket.js
CHANGED
|
@@ -92,13 +92,11 @@ export class XYWebSocketManager extends EventEmitter {
|
|
|
92
92
|
* Send a message to the server.
|
|
93
93
|
*/
|
|
94
94
|
async sendMessage(sessionId, message) {
|
|
95
|
-
console.log(`[WEBSOCKET-SEND] <<<<<<< Preparing to send message for session: ${sessionId} <<<<<<<`);
|
|
96
95
|
if (!this.ws || !this.state.ready || this.ws.readyState !== WebSocket.OPEN) {
|
|
97
96
|
throw new Error("WebSocket not ready");
|
|
98
97
|
}
|
|
99
98
|
const messageStr = JSON.stringify(message);
|
|
100
99
|
this.ws.send(messageStr);
|
|
101
|
-
console.log(`[WS-SEND] Message sent successfully, size: ${messageStr.length} bytes`);
|
|
102
100
|
}
|
|
103
101
|
/**
|
|
104
102
|
* Check if server is ready.
|
|
@@ -320,29 +318,52 @@ export class XYWebSocketManager extends EventEmitter {
|
|
|
320
318
|
* Handle incoming message from server.
|
|
321
319
|
*/
|
|
322
320
|
handleMessage(data) {
|
|
323
|
-
console.log("[WEBSOCKET-HANDLE] >>>>>>> Receiving message... <<<<<<<");
|
|
324
321
|
try {
|
|
325
322
|
const messageStr = data.toString();
|
|
326
|
-
console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length}
|
|
323
|
+
console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
|
|
327
324
|
const parsed = JSON.parse(messageStr);
|
|
328
|
-
|
|
325
|
+
// 提取并打印消息内容(只显示 text,data 只打印提示)
|
|
326
|
+
const parts = parsed.params?.message?.parts;
|
|
327
|
+
if (parts && Array.isArray(parts) && parts.length > 0) {
|
|
328
|
+
const textParts = parts.filter((p) => p?.kind === "text");
|
|
329
|
+
const dataParts = parts.filter((p) => p?.kind === "data");
|
|
330
|
+
// 打印 text 内容(隐藏敏感信息)
|
|
331
|
+
if (textParts.length > 0) {
|
|
332
|
+
const textContents = textParts
|
|
333
|
+
.map((p) => p?.text || "")
|
|
334
|
+
.filter((text) => text.length > 0)
|
|
335
|
+
.join(" ");
|
|
336
|
+
if (textContents.length > 0) {
|
|
337
|
+
// 隐藏中间内容,只保留前后各5个字符
|
|
338
|
+
let maskedText;
|
|
339
|
+
if (textContents.length <= 8) {
|
|
340
|
+
// 如果长度 <= 8,显示前2个 + *** + 后2个
|
|
341
|
+
maskedText = textContents.length >= 4
|
|
342
|
+
? `${textContents.slice(0, 2)}***${textContents.slice(-2)}`
|
|
343
|
+
: `${textContents.slice(0, 1)}***${textContents.slice(-1)}`;
|
|
344
|
+
}
|
|
345
|
+
else {
|
|
346
|
+
// 如果长度 > 8,显示前5个 + *** + 后5个
|
|
347
|
+
maskedText = `${textContents.slice(0, 5)}***${textContents.slice(-5)}`;
|
|
348
|
+
}
|
|
349
|
+
console.log("[WS-RECV] Text:", maskedText);
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
}
|
|
329
353
|
// Check if message is in direct A2A JSON-RPC format (server push)
|
|
330
354
|
if (parsed.jsonrpc === "2.0") {
|
|
331
355
|
const a2aRequest = parsed;
|
|
332
|
-
console.log(`[XY] Message type: Direct A2A JSON-RPC, method: ${a2aRequest.method}`);
|
|
333
356
|
// Extract sessionId from params
|
|
334
357
|
const sessionId = a2aRequest.params?.sessionId;
|
|
335
358
|
if (!sessionId) {
|
|
336
359
|
console.error("[XY] Message missing sessionId");
|
|
337
360
|
return;
|
|
338
361
|
}
|
|
339
|
-
console.log(`[XY] Session ID: ${sessionId}`);
|
|
340
362
|
// Check if message contains only data parts (tool results)
|
|
341
363
|
const dataParts = a2aRequest.params?.message?.parts?.filter((p) => p.kind === "data");
|
|
342
364
|
const hasOnlyDataParts = dataParts && dataParts.length > 0 &&
|
|
343
365
|
dataParts.length === a2aRequest.params?.message?.parts?.length;
|
|
344
366
|
if (hasOnlyDataParts) {
|
|
345
|
-
console.log("[XY] Message contains only data parts, processing as tool result");
|
|
346
367
|
for (const dataPart of dataParts) {
|
|
347
368
|
const events = dataPart.data?.events;
|
|
348
369
|
if (!Array.isArray(events)) {
|
|
@@ -357,11 +378,11 @@ export class XYWebSocketManager extends EventEmitter {
|
|
|
357
378
|
outputs: item.payload.outputs || {},
|
|
358
379
|
status: "success",
|
|
359
380
|
};
|
|
360
|
-
console.log(
|
|
381
|
+
console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
|
|
361
382
|
this.emit("data-event", dataEvent);
|
|
362
383
|
}
|
|
363
384
|
else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
|
|
364
|
-
console.log(
|
|
385
|
+
console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
|
|
365
386
|
this.emit("gui-agent-response", item);
|
|
366
387
|
}
|
|
367
388
|
else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {
|
|
@@ -378,7 +399,6 @@ export class XYWebSocketManager extends EventEmitter {
|
|
|
378
399
|
return;
|
|
379
400
|
}
|
|
380
401
|
// Emit message event for non-data-only messages
|
|
381
|
-
console.log("[XY] *** EMITTING message event (Direct A2A path) ***");
|
|
382
402
|
this.emit("message", a2aRequest, sessionId);
|
|
383
403
|
return;
|
|
384
404
|
}
|
|
@@ -412,11 +432,11 @@ export class XYWebSocketManager extends EventEmitter {
|
|
|
412
432
|
outputs: item.payload.outputs || {},
|
|
413
433
|
status: "success",
|
|
414
434
|
};
|
|
415
|
-
console.log(
|
|
435
|
+
console.log(`[XY] Emitting data-event, intentName: ${item.payload.intentName}, size: ${JSON.stringify(dataEvent).length} bytes`);
|
|
416
436
|
this.emit("data-event", dataEvent);
|
|
417
437
|
}
|
|
418
438
|
else if (item.header?.namespace === "ClawAgent" && item.header?.name === "InvokeJarvisGUIAgentResponse") {
|
|
419
|
-
console.log(
|
|
439
|
+
console.log(`[XY] Emitting gui-agent-response, size: ${JSON.stringify(item).length} bytes`);
|
|
420
440
|
this.emit("gui-agent-response", item);
|
|
421
441
|
}
|
|
422
442
|
else if (item.header?.namespace === "Common" && item.header?.name === "Trigger") {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ynhcj/xiaoyi-channel",
|
|
3
|
-
"version": "0.0.44-
|
|
3
|
+
"version": "0.0.44-next",
|
|
4
4
|
"description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
51
|
"peerDependencies": {
|
|
52
|
-
"openclaw": ">=2026.3.
|
|
52
|
+
"openclaw": ">=2026.3.24"
|
|
53
53
|
},
|
|
54
54
|
"peerDependenciesMeta": {
|
|
55
55
|
"openclaw": {
|
|
@@ -59,13 +59,12 @@
|
|
|
59
59
|
"dependencies": {
|
|
60
60
|
"ws": "^8.14.2",
|
|
61
61
|
"uuid": "^9.0.0",
|
|
62
|
-
"node-fetch": "^
|
|
62
|
+
"node-fetch": "^3.3.2"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
65
|
"@types/ws": "^8.5.8",
|
|
66
66
|
"@types/uuid": "^9.0.5",
|
|
67
67
|
"@types/node": "^20.8.0",
|
|
68
|
-
"@types/node-fetch": "^2.6.2",
|
|
69
68
|
"typescript": "^5.9.2"
|
|
70
69
|
}
|
|
71
70
|
}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* XY search photo tool - searches photos in user's gallery.
|
|
3
|
-
* Returns publicly accessible URLs of matching photos based on query description.
|
|
4
|
-
*
|
|
5
|
-
* This tool performs a two-step operation:
|
|
6
|
-
* 1. Search for photos using query description
|
|
7
|
-
* 2. Upload found photos to get publicly accessible URLs
|
|
8
|
-
*/
|
|
9
|
-
export declare const searchPhotoTool: any;
|
|
@@ -1,270 +0,0 @@
|
|
|
1
|
-
import { getXYWebSocketManager } from "../client.js";
|
|
2
|
-
import { sendCommand } from "../formatter.js";
|
|
3
|
-
import { getLatestSessionContext } from "./session-manager.js";
|
|
4
|
-
import { logger } from "../utils/logger.js";
|
|
5
|
-
/**
|
|
6
|
-
* XY search photo tool - searches photos in user's gallery.
|
|
7
|
-
* Returns publicly accessible URLs of matching photos based on query description.
|
|
8
|
-
*
|
|
9
|
-
* This tool performs a two-step operation:
|
|
10
|
-
* 1. Search for photos using query description
|
|
11
|
-
* 2. Upload found photos to get publicly accessible URLs
|
|
12
|
-
*/
|
|
13
|
-
export const searchPhotoTool = {
|
|
14
|
-
name: "search_photo",
|
|
15
|
-
label: "Search Photo",
|
|
16
|
-
description: "搜索用户手机图库中的照片。根据图像描述语料检索匹配的照片,并返回照片的可公网访问URL。注意:操作超时时间为120秒,请勿重复调用此工具,如果超时或失败,最多重试一次。",
|
|
17
|
-
parameters: {
|
|
18
|
-
type: "object",
|
|
19
|
-
properties: {
|
|
20
|
-
query: {
|
|
21
|
-
type: "string",
|
|
22
|
-
description: "图像描述语料,用于检索匹配的照片(例如:'小狗的照片'、'带有键盘的图片'等)",
|
|
23
|
-
},
|
|
24
|
-
},
|
|
25
|
-
required: ["query"],
|
|
26
|
-
},
|
|
27
|
-
async execute(toolCallId, params) {
|
|
28
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🚀 Starting execution`);
|
|
29
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - toolCallId: ${toolCallId}`);
|
|
30
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - params:`, JSON.stringify(params));
|
|
31
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - timestamp: ${new Date().toISOString()}`);
|
|
32
|
-
// Validate parameters
|
|
33
|
-
if (!params.query) {
|
|
34
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ Missing required parameter: query`);
|
|
35
|
-
throw new Error("Missing required parameter: query is required");
|
|
36
|
-
}
|
|
37
|
-
// Get session context
|
|
38
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🔍 Attempting to get session context...`);
|
|
39
|
-
const sessionContext = getLatestSessionContext();
|
|
40
|
-
if (!sessionContext) {
|
|
41
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ FAILED: No active session found!`);
|
|
42
|
-
logger.error(`[SEARCH_PHOTO_TOOL] - toolCallId: ${toolCallId}`);
|
|
43
|
-
throw new Error("No active XY session found. Search photo tool can only be used during an active conversation.");
|
|
44
|
-
}
|
|
45
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ Session context found`);
|
|
46
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - sessionId: ${sessionContext.sessionId}`);
|
|
47
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - taskId: ${sessionContext.taskId}`);
|
|
48
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - messageId: ${sessionContext.messageId}`);
|
|
49
|
-
const { config, sessionId, taskId, messageId } = sessionContext;
|
|
50
|
-
// Get WebSocket manager
|
|
51
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🔌 Getting WebSocket manager...`);
|
|
52
|
-
const wsManager = getXYWebSocketManager(config);
|
|
53
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ WebSocket manager obtained`);
|
|
54
|
-
// Step 1: Search for photos
|
|
55
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📸 STEP 1: Searching for photos...`);
|
|
56
|
-
const mediaUris = await searchPhotos(wsManager, config, sessionId, taskId, messageId, params.query);
|
|
57
|
-
if (!mediaUris || mediaUris.length === 0) {
|
|
58
|
-
logger.warn(`[SEARCH_PHOTO_TOOL] ⚠️ No photos found for query: ${params.query}`);
|
|
59
|
-
return {
|
|
60
|
-
content: [
|
|
61
|
-
{
|
|
62
|
-
type: "text",
|
|
63
|
-
text: JSON.stringify({ imageUrls: [], message: "未找到匹配的照片" }),
|
|
64
|
-
},
|
|
65
|
-
],
|
|
66
|
-
};
|
|
67
|
-
}
|
|
68
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ Found ${mediaUris.length} photos`);
|
|
69
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - mediaUris:`, JSON.stringify(mediaUris));
|
|
70
|
-
// Step 2: Get public URLs for the photos
|
|
71
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🌐 STEP 2: Getting public URLs for photos...`);
|
|
72
|
-
const imageUrls = await getPhotoUrls(wsManager, config, sessionId, taskId, messageId, mediaUris);
|
|
73
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🎉 Successfully retrieved ${imageUrls.length} photo URLs`);
|
|
74
|
-
return {
|
|
75
|
-
content: [
|
|
76
|
-
{
|
|
77
|
-
type: "text",
|
|
78
|
-
text: JSON.stringify({ imageUrls }),
|
|
79
|
-
},
|
|
80
|
-
],
|
|
81
|
-
};
|
|
82
|
-
},
|
|
83
|
-
};
|
|
84
|
-
/**
|
|
85
|
-
* Step 1: Search for photos using query description
|
|
86
|
-
* Returns array of mediaUri strings
|
|
87
|
-
*/
|
|
88
|
-
async function searchPhotos(wsManager, config, sessionId, taskId, messageId, query) {
|
|
89
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📦 Building SearchPhotoVideo command...`);
|
|
90
|
-
const command = {
|
|
91
|
-
header: {
|
|
92
|
-
namespace: "Common",
|
|
93
|
-
name: "Action",
|
|
94
|
-
},
|
|
95
|
-
payload: {
|
|
96
|
-
cardParam: {},
|
|
97
|
-
executeParam: {
|
|
98
|
-
executeMode: "background",
|
|
99
|
-
intentName: "SearchPhotoVideo",
|
|
100
|
-
bundleName: "com.huawei.hmos.aidispatchservice",
|
|
101
|
-
needUnlock: true,
|
|
102
|
-
actionResponse: true,
|
|
103
|
-
appType: "OHOS_APP",
|
|
104
|
-
timeOut: 5,
|
|
105
|
-
intentParam: {
|
|
106
|
-
query: query,
|
|
107
|
-
},
|
|
108
|
-
permissionId: [],
|
|
109
|
-
achieveType: "INTENT",
|
|
110
|
-
},
|
|
111
|
-
responses: [
|
|
112
|
-
{
|
|
113
|
-
resultCode: "",
|
|
114
|
-
displayText: "",
|
|
115
|
-
ttsText: "",
|
|
116
|
-
},
|
|
117
|
-
],
|
|
118
|
-
needUploadResult: true,
|
|
119
|
-
noHalfPage: false,
|
|
120
|
-
pageControlRelated: false,
|
|
121
|
-
},
|
|
122
|
-
};
|
|
123
|
-
return new Promise((resolve, reject) => {
|
|
124
|
-
const timeout = setTimeout(() => {
|
|
125
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ⏰ Timeout: No response for SearchPhotoVideo within 60 seconds`);
|
|
126
|
-
wsManager.off("data-event", handler);
|
|
127
|
-
reject(new Error("搜索照片超时(60秒)"));
|
|
128
|
-
}, 60000);
|
|
129
|
-
const handler = (event) => {
|
|
130
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📨 Received data event (Step 1):`, JSON.stringify(event));
|
|
131
|
-
if (event.intentName === "SearchPhotoVideo") {
|
|
132
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🎯 SearchPhotoVideo event received`);
|
|
133
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - status: ${event.status}`);
|
|
134
|
-
clearTimeout(timeout);
|
|
135
|
-
wsManager.off("data-event", handler);
|
|
136
|
-
if (event.status === "success" && event.outputs) {
|
|
137
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ Photo search completed successfully`);
|
|
138
|
-
const result = event.outputs.result;
|
|
139
|
-
const items = result?.items || [];
|
|
140
|
-
// Extract mediaUri from each item
|
|
141
|
-
const mediaUris = items.map((item) => item.mediaUri).filter(Boolean);
|
|
142
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📊 Extracted ${mediaUris.length} mediaUris`);
|
|
143
|
-
resolve(mediaUris);
|
|
144
|
-
}
|
|
145
|
-
else {
|
|
146
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ Photo search failed`);
|
|
147
|
-
logger.error(`[SEARCH_PHOTO_TOOL] - status: ${event.status}`);
|
|
148
|
-
reject(new Error(`搜索照片失败: ${event.status}`));
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
};
|
|
152
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📡 Registering data-event handler for SearchPhotoVideo`);
|
|
153
|
-
wsManager.on("data-event", handler);
|
|
154
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📤 Sending SearchPhotoVideo command...`);
|
|
155
|
-
sendCommand({
|
|
156
|
-
config,
|
|
157
|
-
sessionId,
|
|
158
|
-
taskId,
|
|
159
|
-
messageId,
|
|
160
|
-
command,
|
|
161
|
-
})
|
|
162
|
-
.then(() => {
|
|
163
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ SearchPhotoVideo command sent successfully`);
|
|
164
|
-
})
|
|
165
|
-
.catch((error) => {
|
|
166
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ Failed to send SearchPhotoVideo command:`, error);
|
|
167
|
-
clearTimeout(timeout);
|
|
168
|
-
wsManager.off("data-event", handler);
|
|
169
|
-
reject(error);
|
|
170
|
-
});
|
|
171
|
-
});
|
|
172
|
-
}
|
|
173
|
-
/**
|
|
174
|
-
* Step 2: Get public URLs for photos using mediaUris
|
|
175
|
-
* Returns array of publicly accessible image URLs
|
|
176
|
-
*/
|
|
177
|
-
async function getPhotoUrls(wsManager, config, sessionId, taskId, messageId, mediaUris) {
|
|
178
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📦 Building ImageUploadForClaw command...`);
|
|
179
|
-
// Build imageInfos array from mediaUris
|
|
180
|
-
const imageInfos = mediaUris.map(mediaUri => ({ mediaUri }));
|
|
181
|
-
const command = {
|
|
182
|
-
header: {
|
|
183
|
-
namespace: "Common",
|
|
184
|
-
name: "Action",
|
|
185
|
-
},
|
|
186
|
-
payload: {
|
|
187
|
-
cardParam: {},
|
|
188
|
-
executeParam: {
|
|
189
|
-
executeMode: "background",
|
|
190
|
-
intentName: "ImageUploadForClaw",
|
|
191
|
-
bundleName: "com.huawei.hmos.vassistant",
|
|
192
|
-
needUnlock: true,
|
|
193
|
-
actionResponse: true,
|
|
194
|
-
appType: "OHOS_APP",
|
|
195
|
-
timeOut: 5,
|
|
196
|
-
intentParam: {
|
|
197
|
-
imageInfos: imageInfos,
|
|
198
|
-
},
|
|
199
|
-
permissionId: [],
|
|
200
|
-
achieveType: "INTENT",
|
|
201
|
-
},
|
|
202
|
-
responses: [
|
|
203
|
-
{
|
|
204
|
-
resultCode: "",
|
|
205
|
-
displayText: "",
|
|
206
|
-
ttsText: "",
|
|
207
|
-
},
|
|
208
|
-
],
|
|
209
|
-
needUploadResult: true,
|
|
210
|
-
noHalfPage: false,
|
|
211
|
-
pageControlRelated: false,
|
|
212
|
-
},
|
|
213
|
-
};
|
|
214
|
-
return new Promise((resolve, reject) => {
|
|
215
|
-
const timeout = setTimeout(() => {
|
|
216
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ⏰ Timeout: No response for ImageUploadForClaw within 60 seconds`);
|
|
217
|
-
wsManager.off("data-event", handler);
|
|
218
|
-
reject(new Error("获取照片URL超时(60秒)"));
|
|
219
|
-
}, 60000);
|
|
220
|
-
const handler = (event) => {
|
|
221
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📨 Received data event (Step 2):`, JSON.stringify(event));
|
|
222
|
-
if (event.intentName === "ImageUploadForClaw") {
|
|
223
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🎯 ImageUploadForClaw event received`);
|
|
224
|
-
logger.log(`[SEARCH_PHOTO_TOOL] - status: ${event.status}`);
|
|
225
|
-
clearTimeout(timeout);
|
|
226
|
-
wsManager.off("data-event", handler);
|
|
227
|
-
if (event.status === "success" && event.outputs) {
|
|
228
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ Image URL retrieval completed successfully`);
|
|
229
|
-
const result = event.outputs.result;
|
|
230
|
-
let imageUrls = result?.imageUrls || [];
|
|
231
|
-
// Decode Unicode escape sequences in URLs
|
|
232
|
-
// Replace \u003d with = and \u0026 with &
|
|
233
|
-
imageUrls = imageUrls.map((url) => {
|
|
234
|
-
const decodedUrl = url
|
|
235
|
-
.replace(/\\u003d/g, '=')
|
|
236
|
-
.replace(/\\u0026/g, '&');
|
|
237
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 🔄 Decoded URL: ${url} -> ${decodedUrl}`);
|
|
238
|
-
return decodedUrl;
|
|
239
|
-
});
|
|
240
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📊 Retrieved and decoded ${imageUrls.length} image URLs`);
|
|
241
|
-
resolve(imageUrls);
|
|
242
|
-
}
|
|
243
|
-
else {
|
|
244
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ Image URL retrieval failed`);
|
|
245
|
-
logger.error(`[SEARCH_PHOTO_TOOL] - status: ${event.status}`);
|
|
246
|
-
reject(new Error(`获取照片URL失败: ${event.status}`));
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
};
|
|
250
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📡 Registering data-event handler for ImageUploadForClaw`);
|
|
251
|
-
wsManager.on("data-event", handler);
|
|
252
|
-
logger.log(`[SEARCH_PHOTO_TOOL] 📤 Sending ImageUploadForClaw command...`);
|
|
253
|
-
sendCommand({
|
|
254
|
-
config,
|
|
255
|
-
sessionId,
|
|
256
|
-
taskId,
|
|
257
|
-
messageId,
|
|
258
|
-
command,
|
|
259
|
-
})
|
|
260
|
-
.then(() => {
|
|
261
|
-
logger.log(`[SEARCH_PHOTO_TOOL] ✅ ImageUploadForClaw command sent successfully`);
|
|
262
|
-
})
|
|
263
|
-
.catch((error) => {
|
|
264
|
-
logger.error(`[SEARCH_PHOTO_TOOL] ❌ Failed to send ImageUploadForClaw command:`, error);
|
|
265
|
-
clearTimeout(timeout);
|
|
266
|
-
wsManager.off("data-event", handler);
|
|
267
|
-
reject(error);
|
|
268
|
-
});
|
|
269
|
-
});
|
|
270
|
-
}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import type { SessionBinding, ServerIdentifier } from "../types.js";
|
|
2
|
-
/**
|
|
3
|
-
* Session-to-server binding cache.
|
|
4
|
-
* Tracks which WebSocket server each session is bound to.
|
|
5
|
-
*/
|
|
6
|
-
declare class SessionManager {
|
|
7
|
-
private bindings;
|
|
8
|
-
/**
|
|
9
|
-
* Bind a session to a specific server.
|
|
10
|
-
*/
|
|
11
|
-
bind(sessionId: string, server: ServerIdentifier): void;
|
|
12
|
-
/**
|
|
13
|
-
* Get the server binding for a session.
|
|
14
|
-
*/
|
|
15
|
-
getBinding(sessionId: string): ServerIdentifier | null;
|
|
16
|
-
/**
|
|
17
|
-
* Check if a session is bound to a server.
|
|
18
|
-
*/
|
|
19
|
-
isBound(sessionId: string): boolean;
|
|
20
|
-
/**
|
|
21
|
-
* Unbind a session.
|
|
22
|
-
*/
|
|
23
|
-
unbind(sessionId: string): void;
|
|
24
|
-
/**
|
|
25
|
-
* Clear all bindings.
|
|
26
|
-
*/
|
|
27
|
-
clear(): void;
|
|
28
|
-
/**
|
|
29
|
-
* Get all bindings.
|
|
30
|
-
*/
|
|
31
|
-
getAll(): SessionBinding[];
|
|
32
|
-
}
|
|
33
|
-
export declare const sessionManager: SessionManager;
|
|
34
|
-
export {};
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Session-to-server binding cache.
|
|
3
|
-
* Tracks which WebSocket server each session is bound to.
|
|
4
|
-
*/
|
|
5
|
-
class SessionManager {
|
|
6
|
-
bindings = new Map();
|
|
7
|
-
/**
|
|
8
|
-
* Bind a session to a specific server.
|
|
9
|
-
*/
|
|
10
|
-
bind(sessionId, server) {
|
|
11
|
-
this.bindings.set(sessionId, {
|
|
12
|
-
sessionId,
|
|
13
|
-
server,
|
|
14
|
-
boundAt: Date.now(),
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
/**
|
|
18
|
-
* Get the server binding for a session.
|
|
19
|
-
*/
|
|
20
|
-
getBinding(sessionId) {
|
|
21
|
-
const binding = this.bindings.get(sessionId);
|
|
22
|
-
return binding ? binding.server : null;
|
|
23
|
-
}
|
|
24
|
-
/**
|
|
25
|
-
* Check if a session is bound to a server.
|
|
26
|
-
*/
|
|
27
|
-
isBound(sessionId) {
|
|
28
|
-
return this.bindings.has(sessionId);
|
|
29
|
-
}
|
|
30
|
-
/**
|
|
31
|
-
* Unbind a session.
|
|
32
|
-
*/
|
|
33
|
-
unbind(sessionId) {
|
|
34
|
-
this.bindings.delete(sessionId);
|
|
35
|
-
}
|
|
36
|
-
/**
|
|
37
|
-
* Clear all bindings.
|
|
38
|
-
*/
|
|
39
|
-
clear() {
|
|
40
|
-
this.bindings.clear();
|
|
41
|
-
}
|
|
42
|
-
/**
|
|
43
|
-
* Get all bindings.
|
|
44
|
-
*/
|
|
45
|
-
getAll() {
|
|
46
|
-
return Array.from(this.bindings.values());
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
// Singleton instance
|
|
50
|
-
export const sessionManager = new SessionManager();
|