@jackle.dev/zalox-plugin 1.0.19 → 1.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jackle.dev/zalox-plugin",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "OpenClaw channel plugin for Zalo via zca-js (in-process, single login)",
   "type": "module",
   "main": "./src/index.ts",

package/src/listener.ts

@@ -62,7 +62,6 @@ async function downloadZaloMedia(url: string, profile: string, filename?: string
     const credentialsPath = resolveCredentialsPath(profile);
     const creds = JSON.parse(readFileSync(credentialsPath, 'utf-8'));
     
-    // Zalo media URLs usually require cookies
     const headers: Record<string, string> = {
       'User-Agent': creds.userAgent || 'Mozilla/5.0',
       'Cookie': typeof creds.cookie === 'object' ? JSON.stringify(creds.cookie) : String(creds.cookie),
@@ -77,7 +76,6 @@ async function downloadZaloMedia(url: string, profile: string, filename?: string
     const contentType = res.headers.get('content-type');
     const buffer = await res.arrayBuffer();
     
-    // Determine extension
     let ext = extname(url).split('?')[0];
     if (!ext || ext.length > 5) {
        if (contentType?.includes('jpeg')) ext = '.jpg';
@@ -119,13 +117,11 @@ async function processMessage(
   const core = getRuntime();
   const { threadId, content, msgType, timestamp, isGroup, senderId, senderName, groupName, mediaUrl } = message;
 
-  // Allow empty content if it's an image
   if (!content?.trim() && !mediaUrl) return;
 
   const chatId = threadId;
   const rawBody = content.trim();
 
-  // Handle media download
   let mediaPath: string | undefined;
   if (mediaUrl) {
     const downloaded = await downloadZaloMedia(mediaUrl, profile);
@@ -137,7 +133,6 @@ async function processMessage(
     }
   }
 
-  // DM policy check
   const configAllowFrom = (account.config.allowFrom ?? []).map(String);
   const dmPolicy = account.config.dmPolicy ?? 'pairing';
 
@@ -194,7 +189,6 @@ async function processMessage(
     }
   }
 
-  // Group command authorization
   if (
     isGroup &&
     core.channel.commands.isControlCommandMessage(rawBody, config) &&
@@ -203,7 +197,6 @@ async function processMessage(
     return;
   }
 
-  // Route to agent
   const peer = isGroup
     ? { kind: 'group' as const, id: chatId }
     : { kind: 'dm' as const, id: senderId };
@@ -251,7 +244,7 @@ async function processMessage(
     MessageSid: message.msgId ?? `${timestamp}`,
     OriginatingChannel: 'zalox',
     OriginatingTo: `zalox:${chatId}`,
-    MediaPath: mediaPath, // Pass media path here
+    MediaPath: mediaPath,
   });
 
   await core.channel.session.recordInboundSession({
@@ -304,7 +297,6 @@ export async function startInProcessListener(
 
   const listener = api.listener;
 
-  // Handle incoming messages
   listener.on('message', (msg: any) => {
     if (stopped || abortSignal.aborted) return;
 
@@ -312,7 +304,6 @@ export async function startInProcessListener(
     const isGroup = msg.type === 1;
     const senderId = data.uidFrom ? String(data.uidFrom) : '';
     
-    // Skip own messages
     if (senderId === ownId) return;
 
     const threadId = isGroup
@@ -321,17 +312,11 @@ export async function startInProcessListener(
 
     const msgType = data.msgType || 0;
     
-    // DEBUG: Force reply details for every DM to user (DISABLED)
-    // if (!isGroup) { ... }
-
     let mediaUrl = undefined;
-    // Prioritize high-res URL if available
     mediaUrl = data.url || data.href;
     if (!mediaUrl && (msgType === 2 || String(msgType) === 'chat.photo')) {
-       // Try to find URL in params or content
        if (data.params?.url) mediaUrl = data.params.url;
        else if (typeof data.content === 'object' && data.content !== null) {
-          // Already parsed object
           mediaUrl = (data.content as any).href || (data.content as any).url || (data.content as any).thumb || (data.content as any).normalUrl;
        }
        else if (typeof data.content === 'string' && (data.content.includes('http') || data.content.startsWith('{'))) {
@@ -339,17 +324,14 @@ export async function startInProcessListener(
              const parsed = JSON.parse(data.content);
              mediaUrl = parsed.href || parsed.url || parsed.thumb || parsed.normalUrl;
           } catch {
-             // Maybe content IS the url?
              if (data.content.startsWith('http')) mediaUrl = data.content;
           }
        }
     }
-    // Also check for image extension if URL exists but type != 2
     if (!mediaUrl && data.url && (data.url.includes('.jpg') || data.url.includes('.png'))) {
         mediaUrl = data.url;
     }
 
-    // Check quote/reply for media
     if (!mediaUrl && data.quote) {
        try {
          const q = data.quote;
@@ -360,11 +342,9 @@ export async function startInProcessListener(
          if (!mediaUrl && (q.href || q.url)) {
             mediaUrl = q.href || q.url;
          }
-       } catch {}
+       } catch {} 
     }
 
-    // Group messages: only respond when bot is mentioned (@tagged)
-    // UNLESS it's a media message — we might want to analyze all images? 
     if (isGroup) {
       const mentions = data.mentions || data.mentionIds || [];
       const content = typeof data.content === 'string' ? data.content : (data.msg || '');
@@ -373,12 +353,17 @@ export async function startInProcessListener(
         ? mentions.some((m: any) => String(m.uid || m.id || m) === ownId)
         : false;
       const name = account.name || 'Bot';
-      const textMention = content.includes(`@${name}`) || content.includes('@Tiệp Lê');
       
-      // DEBUG Group logic
-      console.log(`[ZaloX] Group Check: ownId=${ownId} mentioned=${isMentioned} textMention=${textMention} content="${content}"`);
+      const textMention = 
+           content.includes(`@${name}`) || 
+           content.includes('@Bot') || 
+           content.includes('@Javis');
+      
+      console.log(`[ZaloX] Group Check: ownId=${ownId} mentions=${JSON.stringify(mentions)} textMention=${textMention} content="${content.slice(0, 50)}..."`);
 
-      if (!isMentioned && !textMention && !content.startsWith('/')) {
+      if (content.trim() === '/whoami') {
+          // Pass
+      } else if (!isMentioned && !textMention && !content.startsWith('/')) {
         return;
       }
     }
@@ -393,10 +378,10 @@ export async function startInProcessListener(
         if (typeof c !== 'string') return '';
         if (isGroup) {
           const name = account.name || 'Bot';
-          // Simple cleanup without regex if possible, or use safe regex
-          // But escaping special chars is safer
-          const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-          c = c.replace(new RegExp(`@${escaped}\\s*`, 'gi'), '').trim();
+          // SAFE CLEANUP: No Regex
+          if (c.includes(`@${name}`)) c = c.split(`@${name}`).join('').trim();
+          if (c.includes('@Javis')) c = c.split('@Javis').join('').trim();
+          if (c.includes('@Bot')) c = c.split('@Bot').join('').trim();
         }
         return c;
       })(),
@@ -411,20 +396,27 @@ export async function startInProcessListener(
 
     if (!normalized.content?.trim() && !normalized.mediaUrl) return;
 
-    // React logic removed.
-    // Agent should decide when to react.
+    try {
+      const reactThreadType = isGroup ? ThreadType.Group : ThreadType.User;
+      api.addReaction(Reactions.HEART, {
+        threadId: normalized.threadId,
+        type: reactThreadType,
+        data: {
+          msgId: String(data.msgId || ''),
+          cliMsgId: String(data.cliMsgId || ''),
+        },
+      }).catch(() => {});
+    } catch {}
 
     processMessage(normalized, account, config, runtime, profile, statusSink).catch((err) => {
       runtime.error?.(`[${account.accountId}] ZaloX process error: ${String(err)}`);
     });
   });
 
-  // Handle errors
   listener.on('error', (err: any) => {
     runtime.error?.(`[${account.accountId}] ZaloX listener error: ${err.message || err}`);
   });
 
-  // Start WebSocket listener with retry
   listener.start({ retryOnClose: true });
   runtime.log?.(`[${account.accountId}] ZaloX: WebSocket listener started`);