openclaw-channel-dmwork 0.2.18 → 0.2.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-channel-dmwork",
-  "version": "0.2.18",
+  "version": "0.2.19",
   "description": "DMWork channel plugin for OpenClaw via WuKongIM WebSocket",
   "main": "index.ts",
   "type": "module",
@@ -11,7 +11,9 @@
   ],
   "scripts": {
     "build": "tsc",
-    "type-check": "tsc --noEmit"
+    "type-check": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "axios": "^1.7.0",
@@ -24,7 +26,8 @@
   "devDependencies": {
     "@types/ws": "^8.5.10",
     "openclaw": "2026.3.1",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "vitest": "^3.0.0"
   },
   "openclaw": {
     "id": "openclaw-channel-dmwork",

package/src/api-fetch.ts

@@ -200,7 +200,7 @@ export async function getChannelMessages(params: {
   limit?: number;
   signal?: AbortSignal;
   log?: { info?: (...args: any[]) => void; error?: (...args: any[]) => void };
-}): Promise<Array<{ from_uid: string; content: string; timestamp: number }>> {
+}): Promise<Array<{ from_uid: string; content: string; timestamp: number; type?: number; url?: string; name?: string }>> {
   try {
     const url = `${params.apiUrl.replace(/\/+$/, "")}/v1/bot/channel/messages`;
     const response = await fetch(url, {
@@ -225,6 +225,9 @@ export async function getChannelMessages(params: {
     const data = await response.json();
     return (data.messages ?? data ?? []).map((m: any) => ({
       from_uid: m.from_uid ?? m.sender_id ?? "unknown",
+      type: m.payload?.type ?? undefined,
+      url: m.payload?.url ?? undefined,
+      name: m.payload?.name ?? undefined,
       content: m.payload?.content ?? m.content ?? "",
       timestamp: m.timestamp ?? Math.floor(Date.now() / 1000),  // API timestamps are in seconds
     }));

package/src/channel.ts

@@ -80,7 +80,7 @@ export const dmworkPlugin: ChannelPlugin<ResolvedDmworkAccount> = {
   meta,
   capabilities: {
     chatTypes: ["direct", "group"],
-    media: false,
+    media: true,
     reactions: false,
     threads: false,
   },
@@ -280,8 +280,9 @@ export const dmworkPlugin: ChannelPlugin<ResolvedDmworkAccount> = {
         onMessage: (msg: BotMessage) => {
           // Skip self messages
           if (msg.from_uid === credentials.robot_id) return;
-          // Skip non-text for now
-          if (!msg.payload || msg.payload.type !== MessageType.Text) return;
+          // Skip unsupported message types (Location, Card)
+          const supportedTypes = [MessageType.Text, MessageType.Image, MessageType.GIF, MessageType.Voice, MessageType.Video, MessageType.File];
+          if (!msg.payload || !supportedTypes.includes(msg.payload.type)) return;
 
           log?.info?.(
             `dmwork: recv message from=${msg.from_uid} channel=${msg.channel_id ?? "DM"} type=${msg.channel_type ?? 1}`,

package/src/inbound.test.ts

@@ -0,0 +1,53 @@
+import { describe, it, expect } from "vitest";
+import { ChannelType, MessageType, type MentionPayload } from "./types.js";
+
+/**
+ * Tests for mention.all detection logic.
+ *
+ * The API can return mention.all as either:
+ * - boolean `true` (newer API versions)
+ * - number `1` (older API versions / WuKongIM native format)
+ *
+ * Both should be treated as "mention all".
+ */
+describe("mention.all detection", () => {
+  // Helper to simulate the detection logic from inbound.ts
+  function isMentionAll(mention?: MentionPayload): boolean {
+    const mentionAllRaw = mention?.all;
+    return mentionAllRaw === true || mentionAllRaw === 1;
+  }
+
+  it("should detect mention.all when all is boolean true", () => {
+    const mention: MentionPayload = { all: true };
+    expect(isMentionAll(mention)).toBe(true);
+  });
+
+  it("should detect mention.all when all is numeric 1", () => {
+    const mention: MentionPayload = { all: 1 };
+    expect(isMentionAll(mention)).toBe(true);
+  });
+
+  it("should NOT detect mention.all when all is false", () => {
+    const mention: MentionPayload = { all: false as unknown as boolean | number };
+    expect(isMentionAll(mention)).toBe(false);
+  });
+
+  it("should NOT detect mention.all when all is 0", () => {
+    const mention: MentionPayload = { all: 0 };
+    expect(isMentionAll(mention)).toBe(false);
+  });
+
+  it("should NOT detect mention.all when all is undefined", () => {
+    const mention: MentionPayload = { uids: ["user1"] };
+    expect(isMentionAll(mention)).toBe(false);
+  });
+
+  it("should NOT detect mention.all when mention is undefined", () => {
+    expect(isMentionAll(undefined)).toBe(false);
+  });
+
+  it("should NOT detect mention.all when all is a different number", () => {
+    const mention: MentionPayload = { all: 2 };
+    expect(isMentionAll(mention)).toBe(false);
+  });
+});

package/src/inbound.ts

@@ -44,11 +44,89 @@ export type DmworkStatusSink = (patch: {
   lastError?: string | null;
 }) => void;
 
-function resolveContent(payload: BotMessage["payload"]): string {
-  if (!payload) return "";
-  if (typeof payload.content === "string") return payload.content;
-  if (typeof payload.url === "string") return payload.url;
-  return "";
+interface ResolvedContent {
+  text: string;
+  mediaUrl?: string;
+  mediaType?: string;
+}
+
+function resolveContent(payload: BotMessage["payload"]): ResolvedContent {
+  if (!payload) return { text: "" };
+  switch (payload.type) {
+    case MessageType.Text:
+      return { text: payload.content ?? "" };
+    case MessageType.Image:
+      return { text: "[图片]", mediaUrl: payload.url, mediaType: "image" };
+    case MessageType.GIF:
+      return { text: "[GIF]", mediaUrl: payload.url, mediaType: "image" };
+    case MessageType.Voice:
+      return { text: "[语音消息]" };
+    case MessageType.Video:
+      return { text: "[视频]", mediaUrl: payload.url, mediaType: "video" };
+    case MessageType.File:
+      return { text: `[文件: ${payload.name ?? "未知文件"}]`, mediaUrl: payload.url };
+    case MessageType.Location:
+      return { text: "[位置信息]" };
+    case MessageType.Card:
+      return { text: "[名片]" };
+    default:
+      return { text: payload.content ?? payload.url ?? "" };
+  }
+}
+
+/** Extract text-only content for history/quotes (no mediaUrl) */
+function resolveContentText(payload: BotMessage["payload"]): string {
+  return resolveContent(payload).text;
+}
+
+/** Placeholder text for non-text API history messages */
+function resolveApiMessagePlaceholder(type?: number, name?: string): string {
+  switch (type) {
+    case MessageType.Image: return "[图片]";
+    case MessageType.GIF: return "[GIF]";
+    case MessageType.Voice: return "[语音消息]";
+    case MessageType.Video: return "[视频]";
+    case MessageType.File: return `[文件: ${name ?? "未知文件"}]`;
+    case MessageType.Location: return "[位置信息]";
+    case MessageType.Card: return "[名片]";
+    default: return "[消息]";
+  }
+}
+
+/**
+ * Strip emoji from string for fuzzy matching.
+ * Removes most emoji using Unicode ranges.
+ */
+function stripEmoji(str: string): string {
+  return str
+    .replace(/[\u{1F300}-\u{1F9FF}]/gu, '') // Most emoji (faces, symbols, etc.)
+    .replace(/[\u{2600}-\u{26FF}]/gu, '')   // Misc symbols
+    .replace(/[\u{2700}-\u{27BF}]/gu, '')   // Dingbats
+    .replace(/[\u{FE00}-\u{FE0F}]/gu, '')   // Variation selectors
+    .replace(/[\u{1F000}-\u{1F02F}]/gu, '') // Mahjong, dominos
+    .replace(/[\u{1F0A0}-\u{1F0FF}]/gu, '') // Playing cards
+    .trim();
+}
+
+/**
+ * Find uid by displayName with emoji-tolerant matching.
+ * First tries exact match, then falls back to matching with emoji stripped.
+ */
+function findUidByName(name: string, memberMap: Map<string, string>): string | undefined {
+  // First try exact match
+  const exact = memberMap.get(name);
+  if (exact) return exact;
+  
+  // Then try matching by stripping emoji from both sides
+  const strippedName = stripEmoji(name);
+  if (!strippedName) return undefined;
+  
+  for (const [displayName, uid] of memberMap.entries()) {
+    if (stripEmoji(displayName) === strippedName) {
+      return uid;
+    }
+  }
+  return undefined;
 }
 
 // Cache expiry time: 1 hour
@@ -78,7 +156,9 @@ export async function handleInboundMessage(params: {
     ? message.channel_id!
     : message.from_uid;
 
-  const rawBody = resolveContent(message.payload);
+  const resolved = resolveContent(message.payload);
+  const rawBody = resolved.text;
+  const inboundMediaUrl = resolved.mediaUrl;
   if (!rawBody) {
     log?.info?.(
       `dmwork: inbound dropped session=${sessionId} reason=empty-content`,
@@ -91,7 +171,7 @@ export async function handleInboundMessage(params: {
   const replyData = message.payload?.reply;
   if (replyData) {
     const replyPayload = replyData.payload;
-    const replyContent = replyPayload?.content ?? resolveContent(replyPayload);
+    const replyContent = replyPayload?.content ?? resolveContentText(replyPayload);
     const replyFrom = replyData.from_uid ?? replyData.from_name ?? "unknown";
     if (replyContent) {
       quotePrefix = `[Quoted message from ${replyFrom}]: ${replyContent}\n---\n`;
@@ -132,6 +212,14 @@ export async function handleInboundMessage(params: {
           if (m.name && m.uid) {
             memberMap.set(m.name, m.uid);
             uidToNameMap.set(m.uid, m.name);
+            
+            // Also save name without leading emoji for faster lookup
+            // (complements findUidByName's emoji-tolerant matching)
+            const nameWithoutEmoji = stripEmoji(m.name);
+            if (nameWithoutEmoji && nameWithoutEmoji !== m.name && !memberMap.has(nameWithoutEmoji)) {
+              memberMap.set(nameWithoutEmoji, m.uid);
+              log?.debug?.(`dmwork: [CACHE] Added emoji alias: "${nameWithoutEmoji}" -> "${m.uid}"`);
+            }
           }
         }
         groupCacheTimestamps.set(sessionId, now);
@@ -188,7 +276,9 @@ export async function handleInboundMessage(params: {
 
   if (isGroup && requireMention) {
     const mentionUids: string[] = message.payload?.mention?.uids ?? [];
-    const mentionAll: boolean = message.payload?.mention?.all === true;
+    // mention.all can be boolean `true` or numeric `1` depending on API version
+    const mentionAllRaw = message.payload?.mention?.all;
+    const mentionAll: boolean = mentionAllRaw === true || mentionAllRaw === 1;
     const isMentioned = mentionAll || mentionUids.includes(botUid);
     
     // Debug: log received mention info
@@ -241,11 +331,11 @@ export async function handleInboundMessage(params: {
           log,
         });
         entries = apiMessages
-          .filter((m: any) => m.from_uid !== botUid && m.content && !m.content.includes(`@${botUid}`))
+          .filter((m: any) => m.from_uid !== botUid && (m.content || m.type !== 1))
           .slice(-historyLimit)
           .map((m: any) => ({
             sender: m.from_uid,
-            body: m.content,
+            body: m.content || resolveApiMessagePlaceholder(m.type, m.name),
             timestamp: m.timestamp * 1000,
           }));
         log?.info?.(`dmwork: [MENTION] 从API获取到 ${entries.length} 条历史消息`);
@@ -330,6 +420,9 @@ export async function handleInboundMessage(params: {
     BodyForAgent: body,  // ← 关键！AI 实际读取的是这个字段！
     RawBody: rawBody,
     CommandBody: rawBody,
+    MediaUrl: inboundMediaUrl,
+    MediaUrls: inboundMediaUrl ? [inboundMediaUrl] : undefined,
+    MediaTypes: resolved.mediaType ? [resolved.mediaType] : undefined,
     From: `dmwork:${message.from_uid}`,
     To: `dmwork:${sessionId}`,
     SessionKey: route.sessionKey,
@@ -408,7 +501,7 @@ export async function handleInboundMessage(params: {
           // Helper to resolve a single mention
           const resolveMention = (name: string): { uid: string | null; newContent: string } => {
             // First try memberMap (displayName -> uid)
-            let uid = memberMap.get(name);
+            let uid = findUidByName(name, memberMap);
             let newContent = finalContent;
             
             if (uid) {
@@ -462,7 +555,7 @@ export async function handleInboundMessage(params: {
             if (refreshed) {
               // Retry unresolved names and insert at original positions
               for (const { name, index } of unresolvedNames) {
-                const uid = memberMap.get(name);
+                const uid = findUidByName(name, memberMap);
                 if (uid) {
                   resolvedUids[index] = uid; // Insert at original position
                   log?.debug?.(`dmwork: [REPLY] after refresh: resolved @${name}`);
@@ -476,10 +569,6 @@ export async function handleInboundMessage(params: {
           // Build final mention UIDs array preserving original order
           replyMentionUids = resolvedUids.filter((uid): uid is string => uid !== null);
           
-          // Always include the original sender so they get notified of the reply
-          if (message.from_uid && !replyMentionUids.includes(message.from_uid)) {
-            replyMentionUids.unshift(message.from_uid);
-          }
           
           if (replyMentionUids.length > 0) {
             log?.debug?.(`dmwork: [REPLY] final mentionUids count: ${replyMentionUids.length}`);

package/src/types.ts

@@ -52,13 +52,14 @@ export interface BotMessage {
 
 export interface MentionPayload {
   uids?: string[];
-  all?: number; // 1 = @all
+  all?: boolean | number; // true or 1 = @all (API returns either depending on version)
 }
 
 export interface MessagePayload {
   type: MessageType;
   content?: string;
   url?: string;
+  name?: string;
   mention?: MentionPayload;
   [key: string]: unknown;
 }