@zlr_236/popo 0.0.6 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zlr_236/popo",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "description": "OpenClaw POPO channel plugin",
   "license": "MIT",

package/src/bot.ts

@@ -20,6 +20,15 @@ import {
 import { createPopoReplyDispatcher } from "./reply-dispatcher.js";
 import { downloadMessageFilePopo } from "./media.js";
 
+//1-普通文本消息 211 - 引用消息; 171 - 文件消息; 142 - 视频消息; 161 - 合并消息;
+export enum PopoEventType {
+  Message = 1,
+  Qoute = 2,
+  File = 171,
+  Video = 142,
+  Merge = 161,
+}
+
 export type PopoMessageEvent = {
   eventType: "IM_P2P_TO_ROBOT_MSG" | "IM_CHAT_TO_ROBOT_AT_MSG";
   eventData: {
@@ -27,8 +36,7 @@ export type PopoMessageEvent = {
     from: string; // Sender email
     sessionId: string; // P2P=email, group=groupId
     notify: string; // Message content
-    msgType?: string | number; // text, image, file, etc.
-    fileId?: string; // File message ID
+    msgType?: PopoEventType; // text, image, file, etc.
     timestamp?: number;
     groupId?: string;
     fileInfo?: {
@@ -51,11 +59,8 @@ export type PopoActionEvent = {
   };
 };
 
-function parseMessageContent(
-  notify: string,
-  msgType?: string | number,
-): string {
-  if (msgType === "text" || !msgType) {
+function parseMessageContent(notify: string, msgType?: number): string {
+  if (msgType === 1 || !msgType) {
     return notify;
   }
   // For non-text messages, return the raw notify as placeholder
@@ -74,7 +79,6 @@ function inferPlaceholder(msgType?: string | number): string {
     case 171:
       return "<media:document>";
     case "audio":
-    case 171:
       return "<media:audio>";
     case "video":
     case 142:
@@ -94,16 +98,12 @@ async function resolvePopoMediaList(params: {
   log?: (msg: string) => void;
 }): Promise<PopoMediaInfo[]> {
   const { cfg, event, maxBytes, log } = params;
-  const { msgType, fileId, fileInfo } = event.eventData;
+  const { msgType, fileInfo } = event.eventData;
   log?.(`popo: resolvePopoMediaList: ${JSON.stringify(event)}`);
 
   // Only process media message types
-  const mediaTypes = ["image", "file", "audio", "video", 171, 142];
-  if (
-    !msgType ||
-    !mediaTypes.includes(msgType) ||
-    (!fileId && !fileInfo?.fileId)
-  ) {
+  const mediaTypes = [PopoEventType.File, PopoEventType.Video];
+  if (!msgType || !mediaTypes.includes(msgType) || !fileInfo?.fileId) {
     return [];
   }
 
@@ -114,22 +114,9 @@ async function resolvePopoMediaList(params: {
     // First, get download URL using downloadMessageFilePopo
     const urlResult = await downloadMessageFilePopo({
       cfg,
-      fileId: fileId || fileInfo?.fileId,
+      fileId: fileInfo?.fileId,
     });
-
-    try {
-      // Write urlResult to res.txt
-      const __filename = fileURLToPath(import.meta.url);
-      const __dirname = dirname(__filename);
-      const resFilePath = join(__dirname, "res.txt");
-      await fs.writeFile(
-        resFilePath,
-        JSON.stringify(urlResult, null, 2),
-        "utf-8",
-      );
-    } catch (e) {
-      log?.(`popo: DEBUG failed to write event data: ${String(e)}`);
-    }
+    log?.(`popo: 33333333333333333 ${JSON.stringify(urlResult)}`);
 
     if (!urlResult.success || !urlResult.downloadUrl) {
       throw new Error(urlResult.error || "Failed to get download URL");
@@ -138,6 +125,7 @@ async function resolvePopoMediaList(params: {
     // Fetch file content from the download URL
     const response = await fetch(urlResult.downloadUrl);
     if (!response.ok) {
+      log?.(`popo: 44444444444444444 ${JSON.stringify(response)}`);
       throw new Error(
         `Failed to fetch file: ${response.status} ${response.statusText}`,
       );
@@ -213,7 +201,7 @@ export function parsePopoMessageEvent(
     chatType: isGroup ? "group" : "p2p",
     content,
     contentType: eventData.msgType ?? "text",
-    fileId: eventData.fileId || eventData.fileInfo?.fileId,
+    fileId: eventData.fileInfo?.fileId,
   };
 }
 
@@ -325,7 +313,9 @@ export async function handlePopoMessage(params: {
       sessionKey: route.sessionKey,
       contextKey: `popo:message:${ctx.sessionId}:${ctx.messageId}`,
     });
-
+    log(
+      `popo: 111111111111111111  ${JSON.parse(ctx.messageId)} ${JSON.stringify(event)} ${JSON.stringify(popoCfg)}`,
+    );
     // Resolve media from message
     const mediaMaxBytes = (popoCfg?.mediaMaxMb ?? 20) * 1024 * 1024;
     const mediaList = await resolvePopoMediaList({

package/src/monitor.ts

@@ -178,7 +178,7 @@ export async function monitorPopoProvider(
             log(`popo: DEBUG write failed: ${String(e)}`);
           }
           log(
-            `popo: DEBUG eventType=${event.eventType} eventData=${JSON.stringify(eventData).slice(0, 500)}`,
+            `popo: DEBUG2 eventType=${event.eventType} eventData=${JSON.stringify(eventData).slice(0, 500)}`,
           );
 
           // Handle valid_url event