@xgjktech/xg_cwork_im 1.0.6 → 1.0.8

package/src/send-service.ts

@@ -1,68 +1,215 @@
-/**
- * XG-IM 消息发送模块
- *
- * 调用 IM 接口将 AI 回复发送到指定群聊，并 @ 原始发送者。
- */
-
-import axios from "axios";
-import type { Log } from "./auth.js";
-import type { GetLatestMsgListResponse, SendMessageBody, WsMessageParams, XgImConfig } from "./types.js";
-
-/**
- * 发送文本消息到指定 IM 群聊。
- *
- * @param config     插件配置
- * @param token      鉴权 token
- * @param groupId    目标群聊 ID（gid / groupId）
- * @param content    消息内容文本
- * @param atUserIds  需要 @ 的用户 ID 列表（可为空）
- * @param log        日志接口
- * @param msgId      可选的业务消息 ID（用于覆盖/更新已有消息）
- * @param reply      可选的被回复消息信息（用于在 IM 中建立“回复某条消息”的关联）
- */
-export async function sendTextMessage(
-    config: XgImConfig,
-    token: string,
-    groupId: string,
-    content: string,
-    atUserIds: string[] = [],
-    log?: Log,
-    msgId?: string,
-    reply?: SendMessageBody["reply"],
-): Promise<void> {
-    const url = `${config.baseUrl}/im/message/send`;
-
-    const body: SendMessageBody = {
-        type: "RICH_TEXT",
-        groupId,
-        text: content,
-        ...(atUserIds.length > 0 ? { atUserIds } : {}),
-        ...(msgId ? { msgId } : {}),
-        ...(reply ? { reply } : {}),
-    };
-
-    log?.info(`[cwork_im:send] POST ${url} groupId=${groupId} atUsers=${JSON.stringify(atUserIds)}`);
-    if (config.debug) {
-        log?.debug?.(`[cwork_im:send] Request body: ${JSON.stringify(body)}`);
-    }
-
-    try {
-        const res = await axios.post(url, body, {
-            headers: {
-                "Content-Type": "application/json",
-                "access-token": token,
-            },
-            timeout: 10_000,
-        });
-
-        log?.info(`[cwork_im:send] Response status=${res.status}`);
-        if (config.debug) {
-            log?.debug?.(`[cwork_im:send] Response body: ${JSON.stringify(res.data)}`);
-        }
-    } catch (err: unknown) {
-        const msg = err instanceof Error ? err.message : String(err);
-        log?.error(`[cwork_im:send] Failed to send message to groupId=${groupId}: ${msg}`);
-        throw err;
-    }
-}
-
+/**
+ * XG-IM 消息发送模块
+ *
+ * 调用 IM 接口将 AI 回复发送到指定群聊，并 @ 原始发送者。
+ * 支持 RICH_TEXT 与带资源 fileId 的 FILE 类型（attachments）。
+ */
+
+import axios from "axios";
+import type { Log } from "./auth.js";
+import {
+    downloadMediaBuffer,
+    formatFromFilename,
+    resolveMaxAttachmentBytes,
+    resolveResourceUploadUrl,
+    uploadWholeResourceFile,
+} from "./resource-file.js";
+import type { SendMessageBody, SendMessageFileAttachment, SendMessageReply, XgImConfig } from "./types.js";
+
+function formatDeliverError(err: unknown): string {
+    if (axios.isAxiosError(err)) {
+        const parts = [err.message];
+        if (err.code) parts.push(`axiosCode=${err.code}`);
+        if (err.response?.status != null) parts.push(`httpStatus=${err.response.status}`);
+        return parts.join(" ");
+    }
+    if (err instanceof Error) return err.message;
+    return String(err);
+}
+
+async function postImMessage(
+    config: XgImConfig,
+    token: string,
+    groupId: string,
+    body: SendMessageBody,
+    atUserIds: string[] = [],
+    log?: Log,
+): Promise<void> {
+    const url = `${config.baseUrl}/im/message/send`;
+    const full: SendMessageBody = {
+        ...body,
+        groupId,
+        ...(atUserIds.length > 0 ? { atUserIds } : {}),
+    } as SendMessageBody;
+
+    log?.info(`[cwork_im:send] POST ${url} groupId=${groupId} type=${full.type} atUsers=${JSON.stringify(atUserIds)}`);
+    if (config.debug) {
+        log?.debug?.(`[cwork_im:send] Request body: ${JSON.stringify(full)}`);
+    }
+
+    try {
+        const res = await axios.post(url, full, {
+            headers: {
+                "Content-Type": "application/json",
+                "access-token": token,
+            },
+            timeout: 10_000,
+        });
+
+        log?.info(`[cwork_im:send] Response status=${res.status}`);
+        if (config.debug) {
+            log?.debug?.(`[cwork_im:send] Response body: ${JSON.stringify(res.data)}`);
+        }
+    } catch (err: unknown) {
+        const msg = err instanceof Error ? err.message : String(err);
+        log?.error(`[cwork_im:send] Failed to send message to groupId=${groupId}: ${msg}`);
+        throw err;
+    }
+}
+
+/** OpenClaw dispatch deliver 单块载荷：文本 + 可选媒体 URL（与 plugin-sdk 约定对齐）。 */
+export type ReplyDeliverPayload = {
+    markdown?: string;
+    text?: string;
+    isThinking?: boolean;
+    mediaUrl?: string;
+    mediaUrls?: string[];
+};
+
+/**
+ * 将 deliver 块发到 IM：若有媒体则先 POST baseUrl/file/upDownload/uploadWholeFile 再发 FILE；否则发 RICH_TEXT。
+ */
+export async function sendReplyDeliverBlock(
+    config: XgImConfig,
+    token: string,
+    groupId: string,
+    payload: ReplyDeliverPayload,
+    atUserIds: string[] = [],
+    log?: Log,
+    msgId?: string,
+    reply?: SendMessageReply,
+): Promise<void> {
+    const textToSend = (payload.markdown || payload.text || "").trim();
+    const mediaList = [
+        ...(payload.mediaUrl ? [payload.mediaUrl] : []),
+        ...((payload.mediaUrls ?? []).filter((u) => typeof u === "string" && u.trim())),
+    ];
+    const uniqueUrls = [...new Set(mediaList)];
+    const maxBytes = resolveMaxAttachmentBytes(config);
+    const formField = config.fileUploadFormField?.trim() || "file";
+
+    const wantFile = uniqueUrls.length > 0 && !payload.isThinking;
+
+    if (wantFile) {
+        const fileUploadUrl = resolveResourceUploadUrl(config.baseUrl);
+        try {
+            const attachments: SendMessageFileAttachment[] = [];
+            for (const u of uniqueUrls) {
+                const { buffer, filename } = await downloadMediaBuffer(u, maxBytes, log);
+                const { fileId } = await uploadWholeResourceFile({
+                    fileUploadUrl,
+                    token,
+                    buffer,
+                    filename,
+                    formField,
+                    log,
+                });
+                attachments.push({
+                    fileId,
+                    fileType: "FILE",
+                    format: formatFromFilename(filename),
+                    name: filename,
+                    size: buffer.length,
+                    source: "resource",
+                });
+            }
+            const caption = textToSend.length > 0 ? textToSend : " ";
+            await postImMessage(
+                config,
+                token,
+                groupId,
+                {
+                    type: "FILE",
+                    text: caption,
+                    attachments,
+                    ...(msgId ? { msgId } : {}),
+                    ...(reply ? { reply } : {}),
+                },
+                atUserIds,
+                log,
+            );
+            return;
+        } catch (err: unknown) {
+            log?.error(`[cwork_im:send] FILE deliver failed, fallback to text if any: ${formatDeliverError(err)}`);
+            if (textToSend.length > 0) {
+                await postImMessage(
+                    config,
+                    token,
+                    groupId,
+                    {
+                        type: "RICH_TEXT",
+                        text: `${textToSend}\n\n（媒体未发出：${formatDeliverError(err)}）`,
+                        ...(msgId ? { msgId } : {}),
+                        ...(reply ? { reply } : {}),
+                    },
+                    atUserIds,
+                    log,
+                );
+            }
+            return;
+        }
+    }
+
+    if (textToSend.length > 0) {
+        await postImMessage(
+            config,
+            token,
+            groupId,
+            {
+                type: "RICH_TEXT",
+                text: textToSend,
+                ...(msgId ? { msgId } : {}),
+                ...(reply ? { reply } : {}),
+            },
+            atUserIds,
+            log,
+        );
+    }
+}
+
+/**
+ * 发送文本消息到指定 IM 群聊。
+ *
+ * @param config     插件配置
+ * @param token      鉴权 token
+ * @param groupId    目标群聊 ID（gid / groupId）
+ * @param content    消息内容文本
+ * @param atUserIds  需要 @ 的用户 ID 列表（可为空）
+ * @param log        日志接口
+ * @param msgId      可选的业务消息 ID（用于覆盖/更新已有消息）
+ * @param reply      可选的被回复消息信息（用于在 IM 中建立“回复某条消息”的关联）
+ */
+export async function sendTextMessage(
+    config: XgImConfig,
+    token: string,
+    groupId: string,
+    content: string,
+    atUserIds: string[] = [],
+    log?: Log,
+    msgId?: string,
+    reply?: SendMessageReply,
+): Promise<void> {
+    await postImMessage(
+        config,
+        token,
+        groupId,
+        {
+            type: "RICH_TEXT",
+            text: content,
+            ...(msgId ? { msgId } : {}),
+            ...(reply ? { reply } : {}),
+        },
+        atUserIds,
+        log,
+    );
+}

package/src/tool-json-result.ts

@@ -0,0 +1,24 @@
+import type { AnyAgentTool } from "openclaw/plugin-sdk";
+
+type ToolExecuteReturn = Awaited<ReturnType<NonNullable<AnyAgentTool["execute"]>>>;
+
+/**
+ * 与 `openclaw/plugin-sdk` 的 `jsonResult` 返回结构一致（AgentToolResult），
+ * 供工具 `execute` 使用。
+ *
+ * 部分环境下网关打包插件后，`import { jsonResult } from "openclaw/plugin-sdk"` 会变成
+ * `_pluginSdk.jsonResult` 且值为 `undefined`，调用时报
+ * `(0 , _pluginSdk.jsonResult) is not a function`。
+ * 使用本函数可避免依赖该命名导出在打包产物中是否保留。
+ */
+export function toolJsonResult(payload: unknown): ToolExecuteReturn {
+    if (payload === undefined) {
+        return { content: [{ type: "text", text: "" }] } as ToolExecuteReturn;
+    }
+    const text =
+        typeof payload === "string" ? JSON.stringify(payload) : JSON.stringify(payload, null, 2);
+    return {
+        content: [{ type: "text", text }],
+        details: payload,
+    } as ToolExecuteReturn;
+}