@zlr_236/popo 0.0.3 → 0.0.5

package/package.json

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

package/src/bot.ts

@@ -27,7 +27,7 @@ export type PopoMessageEvent = {
     from: string; // Sender email
     sessionId: string; // P2P=email, group=groupId
     notify: string; // Message content
-    msgType?: string; // text, image, file, etc.
+    msgType?: string | number; // text, image, file, etc.
     fileId?: string; // File message ID
     timestamp?: number;
     groupId?: string;
@@ -51,7 +51,10 @@ export type PopoActionEvent = {
   };
 };
 
-function parseMessageContent(notify: string, msgType?: string): string {
+function parseMessageContent(
+  notify: string,
+  msgType?: string | number,
+): string {
   if (msgType === "text" || !msgType) {
     return notify;
   }
@@ -62,15 +65,19 @@ function parseMessageContent(notify: string, msgType?: string): string {
 /**
  * Infer placeholder text based on message type.
  */
-function inferPlaceholder(msgType?: string): string {
+function inferPlaceholder(msgType?: string | number): string {
   switch (msgType) {
     case "image":
+    case 171:
       return "<media:image>";
     case "file":
+    case 171:
       return "<media:document>";
     case "audio":
+    case 171:
       return "<media:audio>";
     case "video":
+    case 142:
       return "<media:video>";
     default:
       return "";
@@ -88,21 +95,26 @@ async function resolvePopoMediaList(params: {
 }): Promise<PopoMediaInfo[]> {
   const { cfg, event, maxBytes, log } = params;
   const { msgType, fileId, fileInfo } = event.eventData;
-  // 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(event.eventData, null, 2),
-    "utf-8",
-  );
+  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(event.eventData, null, 2),
+      "utf-8",
+    );
+  } catch (e) {
+    log?.(`popo: DEBUG failed to write event data: ${String(e)}`);
+  }
+
   // Only process media message types
-  const mediaTypes = ["image", "file", "audio", "video", 171];
+  const mediaTypes = ["image", "file", "audio", "video", 171, 142];
   if (
     !msgType ||
     !mediaTypes.includes(msgType) ||
-    (!fileId && !fileInfo.fileId)
+    (!fileId && !fileInfo?.fileId)
   ) {
     return [];
   }
@@ -114,18 +126,22 @@ async function resolvePopoMediaList(params: {
     // First, get download URL using downloadMessageFilePopo
     const urlResult = await downloadMessageFilePopo({
       cfg,
-      fileId: fileId || fileInfo.fileId,
+      fileId: fileId || fileInfo?.fileId,
     });
 
-    // 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",
-    );
+    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)}`);
+    }
 
     if (!urlResult.success || !urlResult.downloadUrl) {
       throw new Error(urlResult.error || "Failed to get download URL");
@@ -209,7 +225,7 @@ export function parsePopoMessageEvent(
     chatType: isGroup ? "group" : "p2p",
     content,
     contentType: eventData.msgType ?? "text",
-    fileId: eventData.fileId,
+    fileId: eventData.fileId || eventData.fileInfo?.fileId,
   };
 }
 
@@ -227,6 +243,15 @@ export async function handlePopoMessage(params: {
   const ctx = parsePopoMessageEvent(event);
   const isGroup = ctx.chatType === "group";
 
+  // Debug: write raw event at handler entry
+  await fs
+    .writeFile(
+      "/home/node/.openclaw/workspace/popo_handler_debug.json",
+      JSON.stringify({ ts: new Date().toISOString(), event }, null, 2),
+      "utf-8",
+    )
+    .catch(() => {});
+
   log(
     `popo: received message from ${ctx.senderEmail} in ${ctx.sessionId} (${ctx.chatType})`,
   );

package/src/monitor.ts

@@ -1,6 +1,13 @@
 import http from "http";
-import { registerPluginHttpRoute, normalizePluginHttpPath } from "openclaw/plugin-sdk";
-import type { ClawdbotConfig, RuntimeEnv, HistoryEntry } from "openclaw/plugin-sdk";
+import {
+  registerPluginHttpRoute,
+  normalizePluginHttpPath,
+} from "openclaw/plugin-sdk";
+import type {
+  ClawdbotConfig,
+  RuntimeEnv,
+  HistoryEntry,
+} from "openclaw/plugin-sdk";
 import type { PopoConfig } from "./types.js";
 import { resolvePopoCredentials } from "./accounts.js";
 import { verifySignature, decryptMessage, encryptMessage } from "./crypto.js";
@@ -24,7 +31,9 @@ function readRequestBody(req: http.IncomingMessage): Promise<string> {
   });
 }
 
-export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<void> {
+export async function monitorPopoProvider(
+  opts: MonitorPopoOpts = {},
+): Promise<void> {
   const cfg = opts.config;
   if (!cfg) {
     throw new Error("Config is required for POPO monitor");
@@ -33,7 +42,9 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
   const popoCfg = cfg.channels?.popo as PopoConfig | undefined;
   const creds = resolvePopoCredentials(popoCfg);
   if (!creds) {
-    throw new Error("POPO credentials not configured (appKey, appSecret required)");
+    throw new Error(
+      "POPO credentials not configured (appKey, appSecret required)",
+    );
   }
 
   const log = opts.runtime?.log ?? console.log;
@@ -50,7 +61,8 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
   const chatHistories = new Map<string, HistoryEntry[]>();
 
   // Normalize path
-  const normalizedPath = normalizePluginHttpPath(webhookPath, "/popo/events") ?? "/popo/events";
+  const normalizedPath =
+    normalizePluginHttpPath(webhookPath, "/popo/events") ?? "/popo/events";
 
   // Register HTTP route to gateway
   const unregisterHttp = registerPluginHttpRoute({
@@ -79,7 +91,9 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
         const timestamp = url.searchParams.get("timestamp");
         const signature = url.searchParams.get("signature");
 
-        log(`popo: URL validation attempt - nonce=${nonce}, timestamp=${timestamp}, signature=${signature}`);
+        log(
+          `popo: URL validation attempt - nonce=${nonce}, timestamp=${timestamp}, signature=${signature}`,
+        );
 
         if (nonce && timestamp && signature && creds.token) {
           const valid = verifySignature({
@@ -141,6 +155,31 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
           }
 
           const event = eventData as { eventType?: string };
+          // Debug: write ALL events before any filtering
+          try {
+            const fsDebug = await import("node:fs/promises");
+            const debugPath =
+              "/home/node/.openclaw/workspace/popo_raw_event.json";
+            await fsDebug.writeFile(
+              debugPath,
+              JSON.stringify(
+                {
+                  ts: new Date().toISOString(),
+                  eventType: event.eventType,
+                  eventData,
+                },
+                null,
+                2,
+              ),
+              "utf-8",
+            );
+            log(`popo: DEBUG wrote raw event to ${debugPath}`);
+          } catch (e) {
+            log(`popo: DEBUG write failed: ${String(e)}`);
+          }
+          log(
+            `popo: DEBUG eventType=${event.eventType} eventData=${JSON.stringify(eventData).slice(0, 500)}`,
+          );
 
           // Handle valid_url event
           if (event.eventType === "valid_url") {
@@ -148,7 +187,10 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
             const response = { eventType: "valid_url" };
 
             if (creds.aesKey) {
-              const encrypted = encryptMessage(JSON.stringify(response), creds.aesKey);
+              const encrypted = encryptMessage(
+                JSON.stringify(response),
+                creds.aesKey,
+              );
               res.writeHead(200, { "Content-Type": "application/json" });
               res.end(JSON.stringify({ encrypt: encrypted }));
             } else {
@@ -186,7 +228,10 @@ export async function monitorPopoProvider(opts: MonitorPopoOpts = {}): Promise<v
           // Return success response
           const successResponse = { success: true };
           if (creds.aesKey) {
-            const encrypted = encryptMessage(JSON.stringify(successResponse), creds.aesKey);
+            const encrypted = encryptMessage(
+              JSON.stringify(successResponse),
+              creds.aesKey,
+            );
             res.writeHead(200, { "Content-Type": "application/json" });
             res.end(JSON.stringify({ encrypt: encrypted }));
           } else {

package/src/types.ts

@@ -19,7 +19,7 @@ export type PopoMessageContext = {
   senderName?: string;
   chatType: "p2p" | "group";
   content: string;
-  contentType: string;
+  contentType: string | number;
   fileId?: string;
 };