iopenclawwx 0.0.1 → 0.0.2

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "iopenclawwx",
   "name": "iOpenClaw Relay",
   "description": "Channel plugin for iOpenClaw relay service",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "module",
   "main": "index.ts",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iopenclawwx",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "OpenClaw channel plugin for iOpenClaw relay",
   "type": "module",
   "main": "index.ts",

package/src/constants.ts

@@ -1,4 +1,4 @@
-export const PLUGIN_VERSION = "0.0.1";
+export const PLUGIN_VERSION = "0.0.2";
 export const PLUGIN_ID = "iopenclawwx";
 export const CHANNEL_ID = "iopenclawwx";
 

package/src/message-injector.ts

@@ -14,23 +14,118 @@ export interface InjectConfig {
   apiKey: string;
 }
 
-function extractReplyText(payload: unknown): string {
+function asRecord(value: unknown): Record<string, unknown> | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
+  }
+  return value as Record<string, unknown>;
+}
+
+function pushText(bucket: string[], value: unknown): void {
+  if (typeof value !== "string") {
+    return;
+  }
+  const text = value.trim();
+  if (!text) {
+    return;
+  }
+  bucket.push(text);
+}
+
+function extractReplyTextFromAny(payload: unknown, depth = 0): string {
+  if (depth > 4) {
+    return "";
+  }
+
   if (typeof payload === "string") {
     return payload.trim();
   }
 
-  if (payload && typeof payload === "object") {
-    const row = payload as Record<string, unknown>;
-    if (typeof row.text === "string") return row.text.trim();
-    if (typeof row.content === "string") return row.content.trim();
-    if (typeof row.message === "string") return row.message.trim();
+  if (Array.isArray(payload)) {
+    const chunks = payload
+      .map((item) => extractReplyTextFromAny(item, depth + 1))
+      .filter(Boolean);
+    return chunks.join("\n").trim();
   }
 
-  try {
-    return JSON.stringify(payload);
-  } catch {
+  const row = asRecord(payload);
+  if (!row) {
     return "";
   }
+
+  const chunks: string[] = [];
+
+  // Common text fields used by different providers / dispatchers.
+  pushText(chunks, row.text);
+  pushText(chunks, row.content);
+  pushText(chunks, row.message);
+  pushText(chunks, row.output_text);
+  pushText(chunks, row.final_text);
+  pushText(chunks, row.finalText);
+  pushText(chunks, row.answer);
+  pushText(chunks, row.deltaText);
+
+  const listFields = ["content", "parts", "blocks", "messages", "choices", "outputs"];
+  for (const field of listFields) {
+    const value = row[field];
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        const nestedText = extractReplyTextFromAny(item, depth + 1);
+        if (nestedText) {
+          chunks.push(nestedText);
+        }
+      }
+    }
+  }
+
+  const objFields = ["message", "delta", "output", "result", "response", "data"];
+  for (const field of objFields) {
+    const value = row[field];
+    const nestedText = extractReplyTextFromAny(value, depth + 1);
+    if (nestedText) {
+      chunks.push(nestedText);
+    }
+  }
+
+  const deduped = Array.from(new Set(chunks.map((item) => item.trim()).filter(Boolean)));
+  return deduped.join("\n").trim();
+}
+
+function extractReplyText(payload: unknown): string {
+  return extractReplyTextFromAny(payload);
+}
+
+function mergeStreamBuffer(current: string, next: string): string {
+  const a = current.trim();
+  const b = next.trim();
+  if (!b) {
+    return a;
+  }
+  if (!a) {
+    return b;
+  }
+  if (a === b) {
+    return a;
+  }
+  if (b.includes(a)) {
+    return b;
+  }
+  if (a.includes(b)) {
+    return a;
+  }
+  return `${a}\n${b}`;
+}
+
+function pickFinalText(finalText: string, streamText: string): string {
+  const a = finalText.trim();
+  const b = streamText.trim();
+
+  if (a && b) {
+    if (a.includes(b)) return a;
+    if (b.includes(a)) return b;
+    return a;
+  }
+  return a || b;
 }
 
 export async function injectRelayMessage(
@@ -101,7 +196,8 @@ export async function injectRelayMessage(
   }
 
   let replied = false;
-  let firstReplyId = true;
+  let streamBuffer = "";
+  const sentFinals = new Set<string>();
 
   await runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
     ctx: msgContext,
@@ -112,22 +208,35 @@ export async function injectRelayMessage(
           ? String((info as Record<string, unknown>).kind || "")
           : "";
 
+        const fromPayload = extractReplyText(payload);
+        const fromInfo = extractReplyText(info);
+        const candidate = fromPayload || fromInfo;
+
+        if (candidate) {
+          streamBuffer = mergeStreamBuffer(streamBuffer, candidate);
+        }
+
         if (kind !== "final") {
           return;
         }
 
-        const text = extractReplyText(payload);
+        const text = pickFinalText(candidate, streamBuffer);
         if (!text) {
+          log?.warn?.(`[${config.accountId}] final reply arrived but text is empty (msg=${message.id})`);
           return;
         }
 
+        if (sentFinals.has(text)) {
+          return;
+        }
+        sentFinals.add(text);
+
         await relayPushReply({
           relayBaseUrl: config.relayBaseUrl,
           apiKey: config.apiKey,
-          replyToMessageId: firstReplyId ? Number(message.id) : Number(message.id),
+          replyToMessageId: Number(message.id),
           content: text,
         });
-        firstReplyId = false;
         replied = true;
       },
       onError: (error: unknown, info: unknown) => {
@@ -140,6 +249,17 @@ export async function injectRelayMessage(
   });
 
   if (!replied) {
+    const fallbackText = streamBuffer.trim();
+    if (fallbackText) {
+      await relayPushReply({
+        relayBaseUrl: config.relayBaseUrl,
+        apiKey: config.apiKey,
+        replyToMessageId: Number(message.id),
+        content: fallbackText,
+      });
+      return;
+    }
+
     await relayPushReply({
       relayBaseUrl: config.relayBaseUrl,
       apiKey: config.apiKey,