@openclaw-channel/socket-chat 1.0.5 → 1.0.7

package/src/mqtt-client.ts

@@ -1,20 +1,29 @@
 import type { MqttClient, IPublishPacket } from "mqtt";
 import mqtt from "mqtt";
-import type { ChannelGatewayContext } from "openclaw/plugin-sdk";
 import { fetchMqttConfigCached, invalidateMqttConfigCache } from "./api.js";
-import { handleInboundMessage } from "./inbound.js";
-import type { ResolvedSocketChatAccount } from "./config.js";
-import type { SocketChatInboundMessage, SocketChatMqttConfig, SocketChatStatusPatch } from "./types.js";
-import { buildTextPayload, sendSocketChatMessage } from "./outbound.js";
+import { handleSocketChatInbound } from "./inbound.js";
+import type { CoreConfig, ResolvedSocketChatAccount } from "./config.js";
+import type {
+  SocketChatInboundMessage,
+  SocketChatMqttConfig,
+  SocketChatOutboundPayload,
+  SocketChatStatusPatch,
+} from "./types.js";
+import { parseSocketChatTarget, sendSocketChatMessage } from "./outbound.js";
 
 const MAX_RECONNECT_ATTEMPTS_DEFAULT = 10;
 const RECONNECT_BASE_DELAY_MS_DEFAULT = 2000;
 const RECONNECT_MAX_DELAY_MS = 60_000;
 
-type LogSink = NonNullable<ChannelGatewayContext["log"]>;
+type LogSink = {
+  info: (m: string) => void;
+  warn: (m: string) => void;
+  error: (m: string) => void;
+  debug?: (m: string) => void;
+};
 
 // ---------------------------------------------------------------------------
-// 活跃连接注册表（供 outbound 查找当前 MQTT client）
+// Active connection registry (used by outbound to find the current MQTT client)
 // ---------------------------------------------------------------------------
 const activeClients = new Map<string, MqttClient>();
 const activeMqttConfigs = new Map<string, SocketChatMqttConfig>();
@@ -43,7 +52,7 @@ export function clearActiveMqttSession(accountId: string): void {
 }
 
 // ---------------------------------------------------------------------------
-// 工具函数
+// Helpers
 // ---------------------------------------------------------------------------
 
 function buildMqttUrl(mqttConfig: SocketChatMqttConfig): string {
@@ -77,9 +86,10 @@ function parseInboundMessage(raw: Buffer | string): SocketChatInboundMessage | n
       messageId: m.messageId,
       type: typeof m.type === "string" ? m.type : undefined,
       url: typeof m.url === "string" ? m.url : undefined,
-      mediaInfo: m.mediaInfo && typeof m.mediaInfo === "object" && !Array.isArray(m.mediaInfo)
-        ? (m.mediaInfo as Record<string, unknown>)
-        : undefined,
+      mediaInfo:
+        m.mediaInfo && typeof m.mediaInfo === "object" && !Array.isArray(m.mediaInfo)
+          ? (m.mediaInfo as Record<string, unknown>)
+          : undefined,
     };
   } catch {
     return null;
@@ -94,47 +104,48 @@ function backoffDelay(attempt: number, baseMs: number): number {
 function waitMs(ms: number, signal: AbortSignal): Promise<void> {
   return new Promise((resolve) => {
     const timer = setTimeout(resolve, ms);
-    signal.addEventListener("abort", () => {
-      clearTimeout(timer);
-      resolve();
-    }, { once: true });
+    signal.addEventListener(
+      "abort",
+      () => {
+        clearTimeout(timer);
+        resolve();
+      },
+      { once: true },
+    );
   });
 }
 
 // ---------------------------------------------------------------------------
-// 核心 Monitor 循环
+// Core monitor loop
 // ---------------------------------------------------------------------------
 
 /**
- * 启动 MQTT 监听循环，支持：
- *  - 自动拉取远端 MQTT 配置（带缓存）
- *  - 自动重连 + 指数退避
- *  - 注册活跃 client 供 outbound 发消息
- *  - AbortSignal 优雅停止
+ * Start the MQTT monitoring loop with:
+ * - Remote MQTT config fetch (with TTL cache)
+ * - Auto-reconnect with exponential backoff
+ * - Active client registry for outbound sends
+ * - AbortSignal-based graceful shutdown
  */
 export async function monitorSocketChatProviderWithRegistry(params: {
   account: ResolvedSocketChatAccount;
   accountId: string;
-  ctx: ChannelGatewayContext<ResolvedSocketChatAccount>;
+  config: CoreConfig;
+  abortSignal: AbortSignal;
   log: LogSink;
+  statusSink: (patch: SocketChatStatusPatch) => void;
 }): Promise<void> {
-  const { account, accountId, ctx, log } = params;
-  const { abortSignal } = ctx;
+  const { account, accountId, config, abortSignal, log, statusSink } = params;
   const maxReconnects = account.config.maxReconnectAttempts ?? MAX_RECONNECT_ATTEMPTS_DEFAULT;
   const reconnectBaseMs = account.config.reconnectBaseDelayMs ?? RECONNECT_BASE_DELAY_MS_DEFAULT;
   const mqttConfigTtlMs = (account.config.mqttConfigTtlSec ?? 300) * 1000;
 
   let reconnectAttempts = 0;
 
-  const setStatus = (patch: SocketChatStatusPatch): void => {
-    ctx.setStatus({ accountId, ...patch } as Parameters<typeof ctx.setStatus>[0]);
-  };
-
-  setStatus({ running: true, lastStartAt: Date.now() });
+  statusSink({ running: true, lastStartAt: Date.now() });
 
   try {
     while (!abortSignal.aborted) {
-      // 1. 拉取 MQTT 配置
+      // 1. Fetch MQTT config
       let mqttConfig: SocketChatMqttConfig;
       try {
         mqttConfig = await fetchMqttConfigCached({
@@ -147,18 +158,18 @@ export async function monitorSocketChatProviderWithRegistry(params: {
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         log.error(`[${accountId}] failed to fetch MQTT config: ${message}`);
-        setStatus({ lastError: message });
+        statusSink({ lastError: message });
         reconnectAttempts++;
         if (reconnectAttempts > maxReconnects) {
           log.error(`[${accountId}] max reconnect attempts (${maxReconnects}) reached`);
           break;
         }
-        setStatus({ reconnectAttempts });
+        statusSink({ reconnectAttempts });
         await waitMs(backoffDelay(reconnectAttempts, reconnectBaseMs), abortSignal);
         continue;
       }
 
-      // 2. 建立 MQTT 连接
+      // 2. Establish MQTT connection
       const mqttUrl = buildMqttUrl(mqttConfig);
       log.info(`[${accountId}] connecting to ${mqttUrl} (clientId=${mqttConfig.clientId})`);
 
@@ -167,14 +178,14 @@ export async function monitorSocketChatProviderWithRegistry(params: {
         username: mqttConfig.username,
         password: mqttConfig.password,
         clean: true,
-        reconnectPeriod: 0,   // 禁用 mqtt.js 内置重连，由外层循环管理
+        reconnectPeriod: 0, // disable mqtt.js auto-reconnect; managed by outer loop
         connectTimeout: 15_000,
         keepalive: 60,
       });
 
       setActiveMqttClient(accountId, client);
 
-      // 等待连接关闭（正常关闭或错误都会 resolve）
+      // Wait until connection closes (normally or on error)
       await new Promise<void>((resolve) => {
         const onAbort = (): void => {
           log.info(`[${accountId}] abort signal, disconnecting`);
@@ -185,7 +196,7 @@ export async function monitorSocketChatProviderWithRegistry(params: {
 
         client.on("connect", () => {
           reconnectAttempts = 0;
-          setStatus({
+          statusSink({
             connected: true,
             reconnectAttempts: 0,
             lastConnectedAt: Date.now(),
@@ -205,74 +216,79 @@ export async function monitorSocketChatProviderWithRegistry(params: {
 
         client.on("message", (topic: string, rawPayload: Buffer, _packet: IPublishPacket) => {
           if (topic !== mqttConfig.reciveTopic) return;
-          setStatus({ lastEventAt: Date.now(), lastInboundAt: Date.now() });
+          statusSink({ lastEventAt: Date.now(), lastInboundAt: Date.now() });
 
           const msg = parseInboundMessage(rawPayload);
           if (!msg) {
             log.warn(`[${accountId}] unparseable message on ${topic}`);
             return;
           }
-          // 跳过机器人自己的回声消息
+          // Skip the bot's own echo messages
           if (msg.robotId === mqttConfig.robotId && msg.senderId === mqttConfig.robotId) {
             return;
           }
 
           log.info(
             `[${accountId}] inbound msg ${msg.messageId} from ${msg.senderId}` +
-            (msg.isGroup ? ` in group ${msg.groupId}` : ""),
+              (msg.isGroup ? ` in group ${msg.groupId}` : ""),
           );
 
-          void handleInboundMessage({
+          void handleSocketChatInbound({
             msg,
             accountId,
-            ctx,
+            config,
             log,
+            statusSink,
             sendReply: async (to: string, text: string) => {
-              const payload = buildTextPayload(to, text);
+              const base = parseSocketChatTarget(to);
+              const payload: SocketChatOutboundPayload = {
+                ...base,
+                messages: [{ type: 1, content: text }],
+              };
               await sendSocketChatMessage({ mqttClient: client, mqttConfig, payload });
             },
           }).catch((e: unknown) => {
             log.error(
-              `[${accountId}] handleInboundMessage error: ${e instanceof Error ? e.message : String(e)}`,
+              `[${accountId}] handleSocketChatInbound error: ${e instanceof Error ? e.message : String(e)}`,
             );
           });
         });
 
         client.on("error", (err: Error) => {
           log.warn(`[${accountId}] MQTT error: ${err.message}`);
-          setStatus({ lastError: err.message });
+          statusSink({ lastError: err.message });
         });
 
         client.on("close", () => {
-          setStatus({ connected: false, lastDisconnect: new Date().toISOString() });
+          statusSink({ connected: false, lastDisconnect: new Date().toISOString() });
           abortSignal.removeEventListener("abort", onAbort);
           resolve();
         });
       });
 
-      // 清理注册表
+      // Remove from registry
       activeClients.delete(accountId);
 
       if (abortSignal.aborted) break;
 
-      // 3. 重连退避
+      // 3. Reconnect with backoff
       reconnectAttempts++;
       if (reconnectAttempts > maxReconnects) {
         log.error(`[${accountId}] max reconnect attempts (${maxReconnects}) reached, giving up`);
         break;
       }
-      // 清除 MQTT config 缓存，下次重连时重新拉取（token 可能已过期）
+      // Invalidate config cache so next reconnect re-fetches (token may have expired)
       invalidateMqttConfigCache({ apiBaseUrl: account.apiBaseUrl!, apiKey: account.apiKey! });
       const delay = backoffDelay(reconnectAttempts, reconnectBaseMs);
       log.info(
         `[${accountId}] reconnect ${reconnectAttempts}/${maxReconnects} in ${Math.round(delay)}ms`,
       );
-      setStatus({ reconnectAttempts });
+      statusSink({ reconnectAttempts });
       await waitMs(delay, abortSignal);
     }
   } finally {
     clearActiveMqttSession(accountId);
-    setStatus({ running: false, connected: false, lastStopAt: Date.now() });
+    statusSink({ running: false, connected: false, lastStopAt: Date.now() });
     log.info(`[${accountId}] monitor stopped`);
   }
 }

package/src/outbound.test.ts

@@ -1,12 +1,21 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import {
-  buildMediaPayload,
-  buildTextPayload,
+  buildSocketChatMediaPayload,
+  buildSocketChatTextPayload,
   looksLikeSocketChatTargetId,
   normalizeSocketChatTarget,
   parseSocketChatTarget,
 } from "./outbound.js";
 
+// Mock mqtt-client to prevent deep transitive imports from pulling in the full openclaw runtime
+vi.mock("./mqtt-client.js", () => ({
+  getActiveMqttClient: vi.fn(() => null),
+  getActiveMqttConfig: vi.fn(() => null),
+  monitorSocketChatProviderWithRegistry: vi.fn(),
+  getActiveMqttSession: vi.fn(() => null),
+  clearActiveMqttSession: vi.fn(),
+}));
+
 // ---------------------------------------------------------------------------
 // parseSocketChatTarget
 // ---------------------------------------------------------------------------
@@ -18,20 +27,20 @@ describe("parseSocketChatTarget", () => {
   });
 
   it("parses a group target without mentions", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx");
-    expect(result).toEqual({ isGroup: true, groupId: "roomid_xxx" });
+    const result = parseSocketChatTarget("group:17581395450@chatroom");
+    expect(result).toEqual({ isGroup: true, groupId: "17581395450@chatroom" });
   });
 
   it("parses a group target with single mention", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx@wxid_a");
-    expect(result).toEqual({ isGroup: true, groupId: "roomid_xxx", mentionIds: ["wxid_a"] });
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a");
+    expect(result).toEqual({ isGroup: true, groupId: "17581395450@chatroom", mentionIds: ["wxid_a"] });
   });
 
   it("parses a group target with multiple mentions", () => {
-    const result = parseSocketChatTarget("group:roomid_xxx@wxid_a,wxid_b,wxid_c");
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a,wxid_b,wxid_c");
     expect(result).toEqual({
       isGroup: true,
-      groupId: "roomid_xxx",
+      groupId: "17581395450@chatroom",
       mentionIds: ["wxid_a", "wxid_b", "wxid_c"],
     });
   });
@@ -42,7 +51,7 @@ describe("parseSocketChatTarget", () => {
   });
 
   it("filters empty mention ids", () => {
-    const result = parseSocketChatTarget("group:roomid@wxid_a,,wxid_b");
+    const result = parseSocketChatTarget("group:17581395450@chatroom|wxid_a,,wxid_b");
     expect(result.isGroup).toBe(true);
     if (result.isGroup) {
       expect(result.mentionIds).toEqual(["wxid_a", "wxid_b"]);
@@ -57,7 +66,8 @@ describe("parseSocketChatTarget", () => {
 describe("normalizeSocketChatTarget", () => {
   it("returns the target unchanged for native IDs", () => {
     expect(normalizeSocketChatTarget("wxid_abc")).toBe("wxid_abc");
-    expect(normalizeSocketChatTarget("group:roomid_xxx")).toBe("group:roomid_xxx");
+    expect(normalizeSocketChatTarget("group:17581395450@chatroom")).toBe("group:17581395450@chatroom");
+    expect(normalizeSocketChatTarget("group:17581395450@chatroom|wxid_a")).toBe("group:17581395450@chatroom|wxid_a");
   });
 
   it("strips socket-chat: prefix (case-insensitive)", () => {
@@ -103,12 +113,12 @@ describe("looksLikeSocketChatTargetId", () => {
 });
 
 // ---------------------------------------------------------------------------
-// buildTextPayload
+// buildSocketChatTextPayload
 // ---------------------------------------------------------------------------
 
-describe("buildTextPayload", () => {
+describe("buildSocketChatTextPayload", () => {
   it("builds a DM text payload", () => {
-    const payload = buildTextPayload("wxid_abc", "hello");
+    const payload = buildSocketChatTextPayload("wxid_abc", "hello");
     expect(payload.isGroup).toBe(false);
     expect(payload.contactId).toBe("wxid_abc");
     expect(payload.messages).toEqual([{ type: 1, content: "hello" }]);
@@ -116,35 +126,35 @@ describe("buildTextPayload", () => {
   });
 
   it("builds a group text payload", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi group");
+    const payload = buildSocketChatTextPayload("group:17581395450@chatroom", "hi group");
     expect(payload.isGroup).toBe(true);
-    expect(payload.groupId).toBe("roomid_xxx");
+    expect(payload.groupId).toBe("17581395450@chatroom");
     expect(payload.messages).toEqual([{ type: 1, content: "hi group" }]);
   });
 
   it("extracts mentions from group target string", () => {
-    const payload = buildTextPayload("group:roomid_xxx@wxid_a,wxid_b", "hi");
+    const payload = buildSocketChatTextPayload("group:17581395450@chatroom|wxid_a,wxid_b", "hi");
     expect(payload.mentionIds).toEqual(["wxid_a", "wxid_b"]);
   });
 
   it("allows explicit override of mentionIds", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi", { mentionIds: ["wxid_override"] });
+    const payload = buildSocketChatTextPayload("group:17581395450@chatroom", "hi", { mentionIds: ["wxid_override"] });
     expect(payload.mentionIds).toEqual(["wxid_override"]);
   });
 
   it("sets mentionIds to undefined when empty", () => {
-    const payload = buildTextPayload("group:roomid_xxx", "hi", { mentionIds: [] });
+    const payload = buildSocketChatTextPayload("group:17581395450@chatroom", "hi", { mentionIds: [] });
     expect(payload.mentionIds).toBeUndefined();
   });
 });
 
 // ---------------------------------------------------------------------------
-// buildMediaPayload
+// buildSocketChatMediaPayload
 // ---------------------------------------------------------------------------
 
-describe("buildMediaPayload", () => {
+describe("buildSocketChatMediaPayload", () => {
   it("builds a media-only payload without caption", () => {
-    const payload = buildMediaPayload("wxid_abc", "https://img.example.com/photo.jpg");
+    const payload = buildSocketChatMediaPayload("wxid_abc", "https://img.example.com/photo.jpg");
     expect(payload.isGroup).toBe(false);
     expect(payload.messages).toEqual([
       { type: 2, url: "https://img.example.com/photo.jpg" },
@@ -152,7 +162,7 @@ describe("buildMediaPayload", () => {
   });
 
   it("includes caption text before image when provided", () => {
-    const payload = buildMediaPayload("wxid_abc", "https://img.example.com/photo.jpg", "Look at this");
+    const payload = buildSocketChatMediaPayload("wxid_abc", "https://img.example.com/photo.jpg", "Look at this");
     expect(payload.messages).toEqual([
       { type: 1, content: "Look at this" },
       { type: 2, url: "https://img.example.com/photo.jpg" },
@@ -160,15 +170,15 @@ describe("buildMediaPayload", () => {
   });
 
   it("skips empty caption", () => {
-    const payload = buildMediaPayload("wxid_abc", "https://img.example.com/photo.jpg", "   ");
+    const payload = buildSocketChatMediaPayload("wxid_abc", "https://img.example.com/photo.jpg", "   ");
     expect(payload.messages).toEqual([
       { type: 2, url: "https://img.example.com/photo.jpg" },
     ]);
   });
 
   it("builds group media payload", () => {
-    const payload = buildMediaPayload("group:roomid_xxx", "https://img.example.com/photo.jpg");
+    const payload = buildSocketChatMediaPayload("group:17581395450@chatroom", "https://img.example.com/photo.jpg");
     expect(payload.isGroup).toBe(true);
-    expect(payload.groupId).toBe("roomid_xxx");
+    expect(payload.groupId).toBe("17581395450@chatroom");
   });
 });

package/src/outbound.ts

@@ -1,5 +1,4 @@
 import type { MqttClient } from "mqtt";
-import type { ChannelOutboundAdapter } from "openclaw/plugin-sdk";
 import { DEFAULT_ACCOUNT_ID } from "./config.js";
 import { getActiveMqttClient, getActiveMqttConfig } from "./mqtt-client.js";
 import type { SocketChatMqttConfig, SocketChatOutboundPayload } from "./types.js";
@@ -9,19 +8,19 @@ import type { SocketChatMqttConfig, SocketChatOutboundPayload } from "./types.js
  *
  * 格式约定：
  *   - 私聊：contactId，例如 "wxid_abc123"
- *   - 群聊：以 "group:" 前缀，例如 "group:roomid_xxx"
- *   - 群聊带 @：以 "group:roomid_xxx@wxid_a,wxid_b"（@ 后面逗号分隔 mentionIds）
+ *   - 群聊：以 "group:" 前缀，例如 "group:17581395450@chatroom"
+ *   - 群聊带 mention：用 "|" 分隔 groupId 与 mentionIds，例如 "group:17581395450@chatroom|wxid_a,wxid_b"
  */
 export function parseSocketChatTarget(to: string): Omit<SocketChatOutboundPayload, "messages"> {
   const trimmed = to.trim();
 
   if (trimmed.startsWith("group:")) {
     const withoutPrefix = trimmed.slice("group:".length);
-    const atIdx = withoutPrefix.indexOf("@");
-    if (atIdx !== -1) {
-      const groupId = withoutPrefix.slice(0, atIdx);
+    const pipeIdx = withoutPrefix.indexOf("|");
+    if (pipeIdx !== -1) {
+      const groupId = withoutPrefix.slice(0, pipeIdx);
       const mentionIds = withoutPrefix
-        .slice(atIdx + 1)
+        .slice(pipeIdx + 1)
         .split(",")
         .map((s) => s.trim())
         .filter(Boolean);
@@ -53,27 +52,22 @@ export function looksLikeSocketChatTargetId(s: string): boolean {
 }
 
 /**
- * 构建纯文本发送 payload
+ * 构建文字消息 payload（纯函数，不发送）
  */
-export function buildTextPayload(
+export function buildSocketChatTextPayload(
   to: string,
   text: string,
-  opts: { mentionIds?: string[] } = {},
+  opts?: { mentionIds?: string[] },
 ): SocketChatOutboundPayload {
   const base = parseSocketChatTarget(to);
-  const mentionIds =
-    opts.mentionIds ?? (base.isGroup ? base.mentionIds : undefined);
-  return {
-    ...base,
-    mentionIds: mentionIds?.length ? mentionIds : undefined,
-    messages: [{ type: 1, content: text }],
-  };
+  const mentionIds = opts?.mentionIds?.length ? opts.mentionIds : undefined;
+  return { ...base, messages: [{ type: 1, content: text }], ...(mentionIds ? { mentionIds } : {}) };
 }
 
 /**
  * 构建图片发送 payload（可附带文字 caption）
  */
-export function buildMediaPayload(
+export function buildSocketChatMediaPayload(
   to: string,
   imageUrl: string,
   caption?: string,
@@ -110,66 +104,34 @@ export async function sendSocketChatMessage(params: {
 }
 
 // ---------------------------------------------------------------------------
-// ChannelOutboundAdapter 实现
+// Shared outbound helper used by channel.ts and inbound.ts
 // ---------------------------------------------------------------------------
 
 /**
- * socket-chat 出站适配器。
- *
- * 通过注册表查找当前账号的活跃 MQTT client 发送消息：
- *   - sendText：发送纯文字
- *   - sendMedia：优先发图片（type:2），无 mediaUrl 时退化为纯文字
- *   - resolveTarget：规范化目标地址（strip socket-chat: 前缀）
+ * 通过活跃的 MQTT client 发送文字消息到指定目标
  */
-export const socketChatOutbound: ChannelOutboundAdapter = {
-  deliveryMode: "direct",
-  textChunkLimit: 4096,
-
-  resolveTarget: ({ to }) => {
-    const normalized = to ? normalizeSocketChatTarget(to) : undefined;
-    if (!normalized) {
-      return { ok: false, error: new Error(`Invalid socket-chat target: "${to}"`) };
-    }
-    return { ok: true, to: normalized };
-  },
-
-  sendText: async ({ to, text, accountId }) => {
-    const resolvedAccountId = accountId ?? DEFAULT_ACCOUNT_ID;
-    const client = getActiveMqttClient(resolvedAccountId);
-    const mqttConfig = getActiveMqttConfig(resolvedAccountId);
-
-    if (!client || !mqttConfig) {
-      throw new Error(
-        `[socket-chat] No active MQTT connection for account "${resolvedAccountId}". ` +
+export async function sendSocketChatText(params: {
+  to: string;
+  text: string;
+  accountId?: string;
+}): Promise<{ channel: string; messageId: string }> {
+  const { to, text } = params;
+  const resolvedAccountId = params.accountId ?? DEFAULT_ACCOUNT_ID;
+  const client = getActiveMqttClient(resolvedAccountId);
+  const mqttConfig = getActiveMqttConfig(resolvedAccountId);
+
+  if (!client || !mqttConfig) {
+    throw new Error(
+      `[socket-chat] No active MQTT connection for account "${resolvedAccountId}". ` +
         "Is the gateway running?",
-      );
-    }
-
-    const payload = buildTextPayload(to, text);
-    const result = await sendSocketChatMessage({ mqttClient: client, mqttConfig, payload });
-    return { channel: "socket-chat", messageId: result.messageId };
-  },
-
-  sendMedia: async ({ to, text, mediaUrl, accountId }) => {
-    const resolvedAccountId = accountId ?? DEFAULT_ACCOUNT_ID;
-    const client = getActiveMqttClient(resolvedAccountId);
-    const mqttConfig = getActiveMqttConfig(resolvedAccountId);
-
-    if (!client || !mqttConfig) {
-      throw new Error(
-        `[socket-chat] No active MQTT connection for account "${resolvedAccountId}".`,
-      );
-    }
-
-    // 有图片 URL 时发图片（可附带 caption），否则退化为纯文字
-    if (mediaUrl) {
-      const payload = buildMediaPayload(to, mediaUrl, text);
-      const result = await sendSocketChatMessage({ mqttClient: client, mqttConfig, payload });
-      return { channel: "socket-chat", messageId: result.messageId };
-    }
+    );
+  }
 
-    const payload = buildTextPayload(to, text);
-    const result = await sendSocketChatMessage({ mqttClient: client, mqttConfig, payload });
-    return { channel: "socket-chat", messageId: result.messageId };
-  },
-};
+  const base = parseSocketChatTarget(to);
+  const payload: SocketChatOutboundPayload = {
+    ...base,
+    messages: [{ type: 1, content: text }],
+  };
+  const result = await sendSocketChatMessage({ mqttClient: client, mqttConfig, payload });
+  return { channel: "socket-chat", messageId: result.messageId };
+}

package/src/runtime-api.ts

@@ -0,0 +1,28 @@
+// Internal runtime barrel for socket-chat extension.
+// All SDK subpath imports are centralised here.
+// Production files import from "./runtime-api.js" — never directly from "openclaw/plugin-sdk/*".
+
+export type { PluginRuntime } from "openclaw/plugin-sdk/runtime-store";
+export type { OutboundReplyPayload } from "openclaw/plugin-sdk/reply-payload";
+export type { ChannelPlugin } from "openclaw/plugin-sdk/channel-core";
+export { createChatChannelPlugin } from "openclaw/plugin-sdk/channel-core";
+export type {
+  ChannelAccountSnapshot,
+  ChannelStatusIssue,
+} from "openclaw/plugin-sdk/status-helpers";
+
+export { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
+export { createChannelPairingController } from "openclaw/plugin-sdk/channel-pairing";
+export { createAccountStatusSink } from "openclaw/plugin-sdk/channel-lifecycle";
+export { dispatchInboundReplyWithBase } from "openclaw/plugin-sdk/inbound-reply-dispatch";
+export {
+  deliverFormattedTextWithAttachments,
+  buildMediaPayload,
+} from "openclaw/plugin-sdk/reply-payload";
+export { resolveChannelMediaMaxBytes, detectMime } from "openclaw/plugin-sdk/media-runtime";
+export { resolveAllowlistMatchByCandidates } from "openclaw/plugin-sdk/allow-from";
+export {
+  buildBaseChannelStatusSummary,
+  buildBaseAccountStatusSnapshot,
+  collectStatusIssuesFromLastError,
+} from "openclaw/plugin-sdk/status-helpers";

package/src/runtime.ts

@@ -1,14 +1,10 @@
-import type { PluginRuntime } from "openclaw/plugin-sdk";
+import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store";
+import type { PluginRuntime } from "./runtime-api.js";
 
-let runtime: PluginRuntime | null = null;
+const {
+  setRuntime: setSocketChatRuntime,
+  getRuntime: getSocketChatRuntime,
+  clearRuntime: clearSocketChatRuntime,
+} = createPluginRuntimeStore<PluginRuntime>("socket-chat runtime not initialized");
 
-export function setSocketChatRuntime(next: PluginRuntime): void {
-  runtime = next;
-}
-
-export function getSocketChatRuntime(): PluginRuntime {
-  if (!runtime) {
-    throw new Error("socket-chat runtime not initialized");
-  }
-  return runtime;
-}
+export { setSocketChatRuntime, getSocketChatRuntime, clearSocketChatRuntime };

package/tsconfig.json

@@ -12,6 +12,6 @@
     "sourceMap": true,
     "lib": ["ES2022", "DOM"]
   },
-  "include": ["index.ts", "src/**/*.ts"],
+  "include": ["index.ts", "channel-api.ts", "runtime-api.ts", "src/**/*.ts"],
   "exclude": ["node_modules", "dist"]
 }