@workclaw/openclaw-workclaw 1.0.16 → 1.0.18

package/src/outbound/workclaw-sender.ts

@@ -1,133 +1,134 @@
-import type { OpenclawWorkclawConnectionConfig } from '../connection/workclaw-client.js'
-import type { OpenclawWorkclawFullAccountConfig } from '../types.js'
+import type { WorkclawFullAccountConfig } from "../types.js";
 import {
-  resolveOpenclawWorkclawMessage,
-  sendOpenclawWorkclawMessage,
-  sendOpenclawWorkclawReplyMessage as sendWorkclawReplyToMessage,
-
-} from '../connection/workclaw-client.js'
-import { getOpenclawWorkclawLogger } from '../runtime.js'
+    sendWorkclawMessage,
+    sendWorkclawReplyMessage as sendWorkclawReplyToMessage,
+    resolveWorkclawMessage,
+    type WorkclawConnectionConfig,
+} from "../connection/workclaw-client.js";
+import { getWorkclawLogger } from "../runtime.js";
 
 export interface WorkClawSenderParams {
-  cacheKey: string
-  to: string
-  text: string
-  mediaUrl?: string
-  replyToMessageId?: string
-  openConversationId?: string
-  agentId?: string | number
-  config: OpenclawWorkclawFullAccountConfig
-  /**
-   * 消息类型：
-   * - "reply": 回复消息（用户触发）
-   * - "push": 主动推送（定时任务触发）
-   */
-  messageType?: 'reply' | 'push'
-  msgType?: string
-  last?: boolean
+    cacheKey: string;
+    to: string;
+    text: string;
+    mediaUrl?: string;
+    replyToMessageId?: string;
+    openConversationId?: string;
+    agentId?: string | number;
+    config: WorkclawFullAccountConfig;
+    /**
+     * 消息类型：
+     * - "reply": 回复消息（用户触发）
+     * - "push": 主动推送（定时任务触发）
+     */
+    messageType?: "reply" | "push";
+    msgType?: string;
+    last?: boolean;
 }
 
-export async function sendOpenclawWorkclawOutboundMessage(
-  params: WorkClawSenderParams,
+
+export async function sendWorkclawOutboundMessage(
+    params: WorkClawSenderParams,
 ): Promise<{ messageId: string }> {
-  const {
-    cacheKey,
-    to,
-    mediaUrl,
-    replyToMessageId,
-    openConversationId,
-    agentId,
-    config,
-    messageType = 'reply',
-    last,
-  } = params
-
-  let msgType = params.msgType
-  let content = params.text
-
-  // 优先级: 传入参数 > 配置
-  const resolvedAgentId = agentId ?? config.agentId
-
-  if (resolvedAgentId === undefined || resolvedAgentId === null || String(resolvedAgentId).trim() === '') {
-    throw new Error(
-      'agentId is required for sending messages. '
-      + 'Please create an account via cloud platform command or configure accounts in openclaw.json',
-    )
-  }
-
-  if (!msgType) {
-    ({ msgType, content } = resolveOpenclawWorkclawMessage(content, mediaUrl))
-  }
-
-  // msgType 转换为 "1"（文本）或其他类型码
-  const messageTypeCode = msgType === 'text' ? '1' : msgType
-
-  // 构建 OpenclawWorkclawConnectionConfig（短名格式，用于 connection 模块）
-  const workclawConfig: OpenclawWorkclawConnectionConfig = {
-    baseUrl: config.baseUrl ?? '',
-    appKey: config.appKey ?? '',
-    appSecret: config.appSecret ?? '',
-    localIp: config.localIp,
-    allowInsecureTls: config.allowInsecureTls,
-    requestTimeout: config.requestTimeout,
-  }
-
-  // 解析 userId 作为 receiveId（优先使用配置中保存的原始 userId）
-  // 配置中的 userId 是原始值（可能为负数），to 是绝对值（OpenClaw 要求）
-  const receiveId = config.userId ?? to
-
-  // 从配置中读取 endpoint，支持自定义
-  const replyEndpoint = config.replyEndpoint || '/open-apis/im/v1/messages/{messageId}/reply'
-  const pushEndpoint = config.pushEndpoint || '/open-apis/im/v1/messages'
-
-  if (messageType === 'reply') {
-    // 回复消息需要 replyToMessageId
-    if (!replyToMessageId) {
-      throw new Error('replyToMessageId is required for reply message')
+    const {
+        cacheKey,
+        to,
+        mediaUrl,
+        replyToMessageId,
+        openConversationId,
+        agentId,
+        config,
+        messageType = "reply",
+        last,
+    } = params;
+
+    let msgType = params.msgType;
+    let content = params.text;
+
+    // 优先级: 传入参数 > 配置
+    const resolvedAgentId = agentId ?? config.agentId;
+
+    if (resolvedAgentId === undefined || resolvedAgentId === null || String(resolvedAgentId).trim() === "") {
+        throw new Error(
+            "agentId is required for sending messages. " +
+            "Please create an account via cloud platform command or configure accounts in openclaw.json"
+        );
     }
 
-    // 优先使用传入的 openConversationId，其次使用配置中持久化的
-    const resolvedOpenConversationId = openConversationId ?? config.openConversationId
-    getOpenclawWorkclawLogger().info(`Sending reply message to messageId: ${replyToMessageId}, openConversationId: ${resolvedOpenConversationId}`)
-
-    const msgId = await sendWorkclawReplyToMessage({
-      cacheKey,
-      config: workclawConfig,
-      agentId: resolvedAgentId,
-      receiveId,
-      msgType: messageTypeCode,
-      content,
-      messageId: replyToMessageId,
-      openConversationId: resolvedOpenConversationId,
-      endpoint: replyEndpoint.replace('{messageId}', String(replyToMessageId)),
-      last,
-    })
-
-    return { messageId: msgId }
-  }
-  else {
-    // 主动推送消息
-    getOpenclawWorkclawLogger().info(` Sending proactive message`)
-
-    // 优先使用传入的 openConversationId，其次使用配置中持久化的
-    const resolvedOpenConversationId = openConversationId ?? config.openConversationId
-    getOpenclawWorkclawLogger().info(` Resolved openConversationId: ${resolvedOpenConversationId}`)
-    getOpenclawWorkclawLogger().info(` Config openConversationId: ${config.openConversationId}`)
-
-    const msgId = await sendOpenclawWorkclawMessage({
-      cacheKey,
-      config: workclawConfig,
-      agentId: resolvedAgentId,
-      receiveId,
-      msgType: messageTypeCode,
-      content,
-      openConversationId: resolvedOpenConversationId,
-      endpoint: pushEndpoint,
-      last,
-    })
-
-    return { messageId: msgId }
-  }
+
+    if (!msgType) {
+        ({ msgType, content } = resolveWorkclawMessage(content, mediaUrl));
+    }
+
+
+    // msgType 转换为 "1"（文本）或其他类型码
+    const messageTypeCode = msgType === "text" ? "1" : msgType;
+
+    // 构建 WorkclawConnectionConfig（短名格式，用于 connection 模块）
+    const workclawConfig: WorkclawConnectionConfig = {
+        baseUrl: config.baseUrl ?? "",
+        appKey: config.appKey ?? "",
+        appSecret: config.appSecret ?? "",
+        localIp: config.localIp,
+        allowInsecureTls: config.allowInsecureTls,
+        requestTimeout: config.requestTimeout,
+    };
+
+    // 解析 userId 作为 receiveId（优先使用配置中保存的原始 userId）
+    // 配置中的 userId 是原始值（可能为负数），to 是绝对值（OpenClaw 要求）
+    const receiveId = config.userId ?? to;
+
+    // 从配置中读取 endpoint，支持自定义
+    const replyEndpoint = config.replyEndpoint || "/open-apis/im/v1/messages/{messageId}/reply";
+    const pushEndpoint = config.pushEndpoint || "/open-apis/im/v1/messages";
+
+    if (messageType === "reply") {
+        // 回复消息需要 replyToMessageId
+        if (!replyToMessageId) {
+            throw new Error("replyToMessageId is required for reply message");
+        }
+
+        // 优先使用传入的 openConversationId，其次使用配置中持久化的
+        const resolvedOpenConversationId = openConversationId ?? config.openConversationId;
+        getWorkclawLogger().info(`Sending reply message to messageId: ${replyToMessageId}, openConversationId: ${resolvedOpenConversationId}`);
+
+        const msgId = await sendWorkclawReplyToMessage({
+            cacheKey,
+            config: workclawConfig,
+            agentId: resolvedAgentId,
+            receiveId,
+            msgType: messageTypeCode,
+            content,
+            messageId: replyToMessageId,
+            openConversationId: resolvedOpenConversationId,
+            endpoint: replyEndpoint.replace("{messageId}", String(replyToMessageId)),
+            last,
+        });
+
+        return { messageId: msgId };
+    } else {
+        // 主动推送消息
+        getWorkclawLogger().info(` Sending proactive message`);
+
+        // 优先使用传入的 openConversationId，其次使用配置中持久化的
+        const resolvedOpenConversationId = openConversationId ?? config.openConversationId;
+        getWorkclawLogger().info(` Resolved openConversationId: ${resolvedOpenConversationId}`);
+        getWorkclawLogger().info(` Config openConversationId: ${config.openConversationId}`);
+
+        const msgId = await sendWorkclawMessage({
+            cacheKey,
+            config: workclawConfig,
+            agentId: resolvedAgentId,
+            receiveId,
+            msgType: messageTypeCode,
+            content,
+            openConversationId: resolvedOpenConversationId,
+            endpoint: pushEndpoint,
+            last,
+        });
+
+        return { messageId: msgId };
+    }
 }
 
 /**
@@ -135,23 +136,23 @@ export async function sendOpenclawWorkclawOutboundMessage(
  * POST /im/v1/messages
  */
 export async function sendWorkClawPushMessage(
-  params: Omit<WorkClawSenderParams, 'messageType'>,
+    params: Omit<WorkClawSenderParams, "messageType">,
 ): Promise<{ messageId: string }> {
-  return sendOpenclawWorkclawOutboundMessage({
-    ...params,
-    messageType: 'push',
-  })
+    return sendWorkclawOutboundMessage({
+        ...params,
+        messageType: "push",
+    });
 }
 
 /**
  * 发送回复消息（用户触发）
  * POST /im/v1/messages/{messageId}/reply
  */
-export async function sendOpenclawWorkclawReplyMessage(
-  params: Omit<WorkClawSenderParams, 'messageType'>,
+export async function sendWorkclawReplyMessage(
+    params: Omit<WorkClawSenderParams, "messageType">,
 ): Promise<{ messageId: string }> {
-  return sendOpenclawWorkclawOutboundMessage({
-    ...params,
-    messageType: 'reply',
-  })
+    return sendWorkclawOutboundMessage({
+        ...params,
+        messageType: "reply",
+    });
 }