@jackle.dev/zalox-plugin 1.0.3 → 1.0.5

package/package.json

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

package/src/channel.ts

@@ -110,7 +110,8 @@ export const zaloxPlugin: ChannelPlugin<ResolvedZaloxAccount> = {
     blockStreaming: true,
   },
   reload: { configPrefixes: ['channels.zalox'] },
-  configSchema: buildChannelConfigSchema(ZaloxConfigSchema),
+  // configSchema: buildChannelConfigSchema(ZaloxConfigSchema), // Disabled due to runtime Zod version mismatch
+  configSchema: undefined,
 
   // ── Config ────────────────────────────────────────────
   config: {
@@ -248,7 +249,11 @@ export const zaloxPlugin: ChannelPlugin<ResolvedZaloxAccount> = {
     sendText: async ({ to, text, accountId, cfg }) => {
       const account = resolveAccount({ cfg, accountId });
       const profile = resolveProfile(account.config, account.accountId);
-      const result = await sendText(to, text, { profile });
+      
+      const isGroup = to.startsWith('group:');
+      const cleanTo = to.replace(/^group:/, '');
+      
+      const result = await sendText(cleanTo, text, { profile, isGroup });
       return {
         channel: 'zalox',
         ok: result.ok,
@@ -259,7 +264,11 @@ export const zaloxPlugin: ChannelPlugin<ResolvedZaloxAccount> = {
     sendMedia: async ({ to, text, mediaUrl, accountId, cfg }) => {
       const account = resolveAccount({ cfg, accountId });
       const profile = resolveProfile(account.config, account.accountId);
-      const result = await sendMedia(to, text ?? '', mediaUrl ?? '', { profile });
+      
+      const isGroup = to.startsWith('group:');
+      const cleanTo = to.replace(/^group:/, '');
+      
+      const result = await sendMedia(cleanTo, text ?? '', mediaUrl ?? '', { profile, isGroup });
       return {
         channel: 'zalox',
         ok: result.ok,

package/src/index.ts

@@ -0,0 +1,27 @@
+/**
+ * ZaloX Plugin — OpenClaw Channel Plugin Entry Point
+ *
+ * In-process Zalo messaging. Single login, single WebSocket.
+ * No subprocess spawning — solves the session conflict problem.
+ */
+
+import type { OpenClawPluginApi } from 'openclaw/plugin-sdk';
+import { emptyPluginConfigSchema } from 'openclaw/plugin-sdk';
+import { zaloxPlugin, zaloxDock } from './channel.js';
+import { setPluginRuntime } from './listener.js';
+
+const plugin = {
+  id: 'zalox',
+  name: 'Zalo (ZaloX)',
+  description: 'Zalo personal messaging — in-process, single login, no session conflicts',
+  configSchema: undefined, // Disabled to fix schema.toJSONSchema error
+  register(api: OpenClawPluginApi) {
+    // Store runtime for listener's message processing
+    setPluginRuntime(api.runtime);
+
+    // Register channel plugin
+    api.registerChannel({ plugin: zaloxPlugin, dock: zaloxDock });
+  },
+};
+
+export default plugin;

package/src/listener.ts

@@ -69,18 +69,30 @@ async function downloadZaloMedia(url: string, profile: string, filename?: string
     };
 
     const res = await fetch(url, { headers });
-    if (!res.ok) return null;
+    if (!res.ok) {
+      console.error(`[ZaloX] Download failed: ${res.status} ${res.statusText} for ${url}`);
+      return null;
+    }
 
+    const contentType = res.headers.get('content-type');
     const buffer = await res.arrayBuffer();
-    const ext = extname(url).split('?')[0] || '.jpg';
+    
+    // Determine extension
+    let ext = extname(url).split('?')[0];
+    if (!ext || ext.length > 5) {
+       if (contentType?.includes('jpeg')) ext = '.jpg';
+       else if (contentType?.includes('png')) ext = '.png';
+       else ext = '.jpg';
+    }
+
     const name = filename || `zalox-${Date.now()}-${randomUUID().slice(0, 8)}${ext}`;
     const path = join(getInboundMediaDir(), name);
     
     writeFileSync(path, Buffer.from(buffer));
-    console.log(`[ZaloX] Downloaded media to ${path}`); // DEBUG
+    console.log(`[ZaloX] Downloaded media to ${path}`);
     return path;
   } catch (err) {
-    console.error(`[ZaloX] Download media failed: ${err}`); // DEBUG
+    console.error(`[ZaloX] Download media failed: ${err}`);
     return null;
   }
 }
@@ -117,7 +129,12 @@ async function processMessage(
   let mediaPath: string | undefined;
   if (mediaUrl) {
     const downloaded = await downloadZaloMedia(mediaUrl, profile);
-    if (downloaded) mediaPath = downloaded;
+    if (downloaded) {
+      mediaPath = downloaded;
+      runtime.log?.(`[${account.accountId}] ZaloX: Media downloaded to ${mediaPath}`);
+    } else {
+      runtime.error?.(`[${account.accountId}] ZaloX: Media download failed for ${mediaUrl}`);
+    }
   }
 
   // DM policy check
@@ -135,7 +152,10 @@ async function processMessage(
   const commandAuthorized = shouldComputeAuth
     ? core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
         useAccessGroups,
-        authorizers: [\n          { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },\n        ],\n      })
+        authorizers: [
+          { configured: effectiveAllowFrom.length > 0, allowed: senderAllowedForCommands },
+        ],
+      })
     : undefined;
 
   if (!isGroup) {
@@ -292,31 +312,59 @@ export async function startInProcessListener(
     const isGroup = msg.type === 1;
     const senderId = data.uidFrom ? String(data.uidFrom) : '';
     
-    runtime.log?.(`[${account.accountId}] ZaloX: inbound raw data: ${JSON.stringify(data)}`); // DEBUG LOG
-
     // Skip own messages
     if (senderId === ownId) return;
 
-    // Determine message type and media
-    // zca-js: type 1=group text, direct text unknown (usually also content)
-    // Images often come with msgType=2 or data.url
+    const threadId = isGroup
+      ? String(data.idTo || data.threadId || '')
+      : senderId;
+
     const msgType = data.msgType || 0;
-    let mediaUrl = undefined;
     
-    // DEBUG: Log image detection logic
-    if (data.url) runtime.log?.(`[${account.accountId}] ZaloX: found URL ${data.url} (msgType=${msgType})`);
-
-    if (msgType === 2 && data.url) { // Image
-      mediaUrl = data.url;
-    } else if (msgType === 3 && data.url) { // Sticker (treat as media if needed, but usually just url)
-      // mediaUrl = data.url; // Optional: download stickers?
-    } else if (data.url && (data.url.includes('.jpg') || data.url.includes('.png'))) {
-      mediaUrl = data.url;
+    // 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('{'))) {
+          try {
+             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;
+         if (q.attach) {
+            const attach = typeof q.attach === 'string' ? JSON.parse(q.attach) : q.attach;
+            mediaUrl = attach.href || attach.url || attach.thumb || attach.normalUrl;
+         }
+         if (!mediaUrl && (q.href || q.url)) {
+            mediaUrl = q.href || q.url;
+         }
+       } catch {}
     }
 
     // Group messages: only respond when bot is mentioned (@tagged)
     // UNLESS it's a media message — we might want to analyze all images? 
-    // No, keep same policy for now to avoid spam.
     if (isGroup) {
       const mentions = data.mentions || data.mentionIds || [];
       const content = typeof data.content === 'string' ? data.content : (data.msg || '');
@@ -324,20 +372,19 @@ export async function startInProcessListener(
       const isMentioned = Array.isArray(mentions)
         ? mentions.some((m: any) => String(m.uid || m.id || m) === ownId)
         : false;
-      const textMention = content.includes(`@${account.name || 'Tiệp Lê'}`);
+      const name = account.name || 'Bot';
+      const textMention = content.includes(`@${name}`);
       
-      // If has media, we might want to check if the caption mentions bot
-      if (!isMentioned && !textMention) {
+      // DEBUG Group logic
+      // console.log(`[ZaloX] Group msg: mentioned=${isMentioned} textMention=${textMention} (name=${name})`);
+
+      if (!isMentioned && !textMention && !content.startsWith('/')) {
         return;
       }
     }
 
     statusSink?.({ lastInboundAt: Date.now() });
 
-    const threadId = isGroup
-      ? String(data.idTo || data.threadId || '')
-      : senderId;
-
     const normalized = {
       threadId,
       msgId: String(data.msgId || data.cliMsgId || ''),
@@ -345,7 +392,11 @@ export async function startInProcessListener(
         let c = data.content || data.msg || '';
         if (typeof c !== 'string') return '';
         if (isGroup) {
-          c = c.replace(new RegExp(`@${account.name || 'Tiệp Lê'}\\s*`, 'gi'), '').trim();
+          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();
         }
         return c;
       })(),
@@ -360,8 +411,6 @@ export async function startInProcessListener(
 
     if (!normalized.content?.trim() && !normalized.mediaUrl) return;
 
-    runtime.log?.(`[${account.accountId}] ZaloX: inbound from ${senderId} (type=${msgType} media=${!!mediaUrl})`);
-
     // React with ❤️
     try {
       const reactThreadType = isGroup ? ThreadType.Group : ThreadType.User;
@@ -369,9 +418,36 @@ export async function startInProcessListener(
         threadId: normalized.threadId,
         type: reactThreadType,
         data: {
-          msgId: String(data.msgId || ''),\n          cliMsgId: String(data.cliMsgId || ''),
+          msgId: String(data.msgId || ''),
+          cliMsgId: String(data.cliMsgId || ''),
         },
       }).catch((err: any) => {
         runtime.error?.(`[${account.accountId}] ZaloX reaction failed: ${String(err)}`);
       });
-    } catch {}\n\n    processMessage(normalized, account, config, runtime, profile, statusSink).catch((err) => {\n      runtime.error?.(`[${account.accountId}] ZaloX process error: ${String(err)}`);\n    });\n  });\n\n  // Handle errors\n  listener.on('error', (err: any) => {\n    runtime.error?.(`[${account.accountId}] ZaloX listener error: ${err.message || err}`);\n  });\n\n  // Start WebSocket listener with retry\n  listener.start({ retryOnClose: true });\n  runtime.log?.(`[${account.accountId}] ZaloX: WebSocket listener started`);\n\n  const stop = () => {\n    stopped = true;\n    try {\n      listener.stop();\n    } catch {}\n  };\n\n  abortSignal.addEventListener('abort', stop, { once: true });\n\n  return { stop };\n}\n
+    } 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`);
+
+  const stop = () => {
+    stopped = true;
+    try {
+      listener.stop();
+    } catch {}
+  };
+
+  abortSignal.addEventListener('abort', stop, { once: true });
+
+  return { stop };
+}

package/src/send.ts

@@ -95,14 +95,21 @@ export async function sendMedia(
         tmpPath = `/tmp/${filename}`;
         writeFileSync(tmpPath, buffer);
         
-        const result = await cached.api.sendMessage(
-          { msg: text || '', attachments: [tmpPath] },
-          threadId.trim(),
-          type,
-        );
-        
-        const msgId = result?.message?.msgId ? String(result.message.msgId) : undefined;
-        return { ok: true, messageId: msgId };
+        try {
+          const result = await cached.api.sendMessage(
+            { msg: text || '', attachments: [tmpPath] },
+            threadId.trim(),
+            type,
+          );
+          
+          const msgId = result?.message?.msgId ? String(result.message.msgId) : undefined;
+          return { ok: true, messageId: msgId };
+        } catch (sendErr) {
+          console.error(`[ZaloX] Send attachment failed: ${sendErr}`);
+          // Fallback: send text with URL as link
+          const fullText = text ? `${text}\n${mediaUrl}` : mediaUrl;
+          return sendText(threadId, fullText, options);
+        }
       } catch (dlErr: any) {
         // Fallback: send text with URL as link
         const fullText = text ? `${text}\n${mediaUrl}` : mediaUrl;