@jackle.dev/zalox-plugin 1.0.27 → 1.0.29

package/package.json

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

package/src/client.ts

@@ -60,72 +60,52 @@ export async function getOrCreateApi(profile: string): Promise<CachedApiEntry> {
   const zalo = new Zalo({ logging: false, imageMetadataGetter } as any);
   const api = await zalo.login(credentials);
 
-  // Get own user info
-  let ownId = '';
+  // Get own user info with robust fallback
+  let ownId = String((credentials as any).uid || (credentials as any).id || (credentials as any).userId || '');
   let displayName: string | undefined;
   let avatar: string | undefined;
-  try {
-    const info = await api.fetchAccountInfo();
-    ownId = String((info as any).userId || '');
-    displayName = (info as any).displayName || (info as any).zaloName;
-    avatar = (info as any).avatar;
-  } catch {
-    // Try to get from context
-    try {
-      const ctx = await api.getContext();
-      ownId = String((ctx as any).uid || '');
-    } catch {}
-  }
-
-  const entry: CachedApiEntry = {
-    api,
-    ownId,
-    displayName,
-    avatar,
-    connectedAt: Date.now(),
-  };
-
-  apiCache.set(profile, entry);
-  return entry;
-}
-
-/**
- * Get cached API instance (no login if not cached)
- */
-export function getCachedApi(profile: string): CachedApiEntry | undefined {
-  return apiCache.get(profile);
-}
-
-/**
- * Check if credentials exist for a profile (offline, no login)
- */
-export function hasCredentials(profile: string): boolean {
-  return existsSync(resolveCredentialsPath(profile));
-}
 
-/**
- * Clear cached API instance
- */
-export function clearApi(profile: string): void {
-  apiCache.delete(profile);
-}
-
-function resolveOpenClawDir(): string {
-  return process.env.OPENCLAW_DIR || join(homedir(), '.openclaw');
-}
+  // Try API if credentials didn't have ID
+  if (!ownId || ownId === 'undefined') {
+      try {
+        if (typeof (api as any).getOwnId === 'function') {
+            const id = await (api as any).getOwnId();
+            if (id) ownId = String(id);
+        }
+      } catch (e) {
+          console.warn('[ZaloX] Failed to getOwnId from API:', e);
+      }
+  }
 
-export function resolveCredentialsPath(profile: string): string {
-  // 1. Persistent path inside .openclaw (survives container restarts)
-  const openclawPath = join(resolveOpenClawDir(), 'zalox', 'profiles', `${profile}.json`);
-  if (existsSync(openclawPath)) return openclawPath;
+  // Try Context if still missing
+  if (!ownId || ownId === 'undefined') {
+      try {
+          const ctx = (api as any).context || (api as any).ctx || (zalo as any).context;
+          if (ctx && (ctx.uid || ctx.userId)) {
+              ownId = String(ctx.uid || ctx.userId);
+          }
+      } catch {}
+  }
+  
+  // Try to parse from Cookie as last resort
+  if ((!ownId || ownId === 'undefined') && credentials.cookie) {
+      const c = typeof credentials.cookie === 'string' ? credentials.cookie : JSON.stringify(credentials.cookie);
+      const match = c.match(/uid=([0-9]+)/) || c.match(/z_uuid=([a-zA-Z0-9]+)/);
+      if (match) ownId = match[1];
+  }
 
-  // 2. Legacy ZaloX config path
-  const zaloxPath = join(homedir(), '.config', 'zalox', 'profiles', `${profile}.json`);
-  if (existsSync(zaloxPath)) return zaloxPath;
+  // Get display name
+  try {
+    if (typeof (api as any).fetchAccountInfo === 'function') {
+        const info = await (api as any).fetchAccountInfo();
+        if (info) {
+            displayName = (info as any).displayName || (info as any).zaloName;
+            avatar = (info as any).avatar;
+            if (!ownId) ownId = String((info as any).userId || '');
+        }
+    }
+  } catch {}
 
-  // 3. Legacy zca-cli path
-  const zcaPath = join(homedir(), '.config', 'zca-cli-nodejs', 'profiles', `${profile}.json`);
-  if (existsSync(zcaPath)) return zcaPath;
+  console.log(`[ZaloX] Logged in profile=${profile} ownId=${ownId}`);
 
-  return openclawPath; // Default to persistent .openclaw path
-}
+  const entry: CachedApiEntry = {\n    api,\n    ownId,\n    displayName,\n    avatar,\n    connectedAt: Date.now(),\n  };\n\n  apiCache.set(profile, entry);\n  return entry;\n}\n\n/**\n * Get cached API instance (no login if not cached)\n */\nexport function getCachedApi(profile: string): CachedApiEntry | undefined {\n  return apiCache.get(profile);\n}\n\n/**\n * Check if credentials exist for a profile (offline, no login)\n */\nexport function hasCredentials(profile: string): boolean {\n  return existsSync(resolveCredentialsPath(profile));\n}\n\n/**\n * Clear cached API instance\n */\nexport function clearApi(profile: string): void {\n  apiCache.delete(profile);\n}\n\nfunction resolveOpenClawDir(): string {\n  return process.env.OPENCLAW_DIR || join(homedir(), '.openclaw');\n}\n\nexport function resolveCredentialsPath(profile: string): string {\n  // 1. Persistent path inside .openclaw (survives container restarts)\n  const openclawPath = join(resolveOpenClawDir(), 'zalox', 'profiles', `${profile}.json`);\n  if (existsSync(openclawPath)) return openclawPath;\n\n  // 2. Legacy ZaloX config path\n  const zaloxPath = join(homedir(), '.config', 'zalox', 'profiles', `${profile}.json`);\n  if (existsSync(zaloxPath)) return zaloxPath;\n\n  // 3. Legacy zca-cli path\n  const zcaPath = join(homedir(), '.config', 'zca-cli-nodejs', 'profiles', `${profile}.json`);\n  if (existsSync(zcaPath)) return zcaPath;\n\n  return openclawPath; // Default to persistent .openclaw path\n}\n

package/src/listener.ts

@@ -231,190 +231,4 @@ async function processMessage(
     RawBody: rawBody,
     CommandBody: rawBody,
     From: isGroup ? `zalox:group:${chatId}` : `zalox:${senderId}`,
-    To: `zalox:${chatId}`,
-    SessionKey: route.sessionKey,
-    AccountId: route.accountId,
-    ChatType: isGroup ? 'group' : 'direct',
-    ConversationLabel: fromLabel,
-    SenderName: senderName || undefined,
-    SenderId: senderId,
-    CommandAuthorized: commandAuthorized,
-    Provider: 'zalox',
-    Surface: 'zalox',
-    MessageSid: message.msgId ?? `${timestamp}`,
-    OriginatingChannel: 'zalox',
-    OriginatingTo: `zalox:${chatId}`,
-    MediaPath: mediaPath,
-  });
-
-  await core.channel.session.recordInboundSession({
-    storePath,
-    sessionKey: ctxPayload.SessionKey ?? route.sessionKey,
-    ctx: ctxPayload,
-    onRecordError: (err: unknown) => {
-      runtime.error?.(`[zalox] session meta error: ${String(err)}`);
-    },
-  });
-
-  await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
-    ctx: ctxPayload,
-    cfg: config,
-    dispatcherOptions: {
-      deliver: async (payload: any) => {
-        const text = payload.text ?? '';
-        if (!text) return;
-
-        const tableMode = core.channel.text.resolveMarkdownTableMode({
-          cfg: config,
-          channel: 'zalox',
-          accountId: account.accountId,
-        });
-        const converted = core.channel.text.convertMarkdownTables(text, tableMode ?? 'code');
-        const chunkMode = core.channel.text.resolveChunkMode(config, 'zalox', account.accountId);
-        const chunks = core.channel.text.chunkMarkdownTextWithMode(converted, 2000, chunkMode);
-
-        for (const chunk of chunks) {
-          try {
-            await sendText(chatId, chunk, { profile, isGroup });
-            statusSink?.({ lastOutboundAt: Date.now() });
-          } catch (err) {
-            runtime.error?.(`[zalox] send failed: ${String(err)}`);
-          }
-        }
-      },
-      onError: (err: unknown, info: any) => {
-        runtime.error?.(`[${account.accountId}] ZaloX ${info.kind} reply failed: ${String(err)}`);
-      },
-    },
-  });
-}
-
-export async function startInProcessListener(
-  options: ListenerOptions,
-): Promise<{ stop: () => void }> {
-  const { account, config, runtime, api, ownId, profile, abortSignal, statusSink } = options;
-  let stopped = false;
-
-  const listener = api.listener;
-
-  listener.on('message', (msg: any) => {
-    if (stopped || abortSignal.aborted) return;
-
-    const data = msg.data || msg;
-    const isGroup = msg.type === 1;
-    const senderId = data.uidFrom ? String(data.uidFrom) : '';
-    
-    if (senderId === ownId) return;
-
-    const threadId = isGroup
-      ? String(data.idTo || data.threadId || '')
-      : senderId;
-
-    const msgType = data.msgType || 0;
-    
-    let mediaUrl = undefined;
-    mediaUrl = data.url || data.href;
-    if (!mediaUrl && (msgType === 2 || String(msgType) === 'chat.photo')) {
-       if (data.params?.url) mediaUrl = data.params.url;
-       else if (typeof data.content === 'object' && data.content !== null) {
-          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 {
-             if (data.content.startsWith('http')) mediaUrl = data.content;
-          }
-       }
-    }
-    if (!mediaUrl && data.url && (data.url.includes('.jpg') || data.url.includes('.png'))) {
-        mediaUrl = data.url;
-    }
-
-    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 {} 
-    }
-
-    if (isGroup) {
-      const mentions = data.mentions || data.mentionIds || [];
-      const content = typeof data.content === 'string' ? data.content : (data.msg || '');
-      
-      const isMentioned = Array.isArray(mentions)
-        ? mentions.some((m: any) => String(m.uid || m.id || m) === ownId)
-        : false;
-      
-      console.log(`[ZaloX] Group Check Strict: ownId=${ownId} mentions=${JSON.stringify(mentions)} isMentioned=${isMentioned}`);
-
-      if (content.trim() === '/whoami') {
-          // Pass
-      } else if (!isMentioned && !content.startsWith('/')) {
-        return;
-      }
-    }
-
-    statusSink?.({ lastInboundAt: Date.now() });
-
-    const normalized = {
-      threadId,
-      msgId: String(data.msgId || data.cliMsgId || ''),
-      content: (() => {
-        let c = data.content || data.msg || '';
-        if (typeof c !== 'string') return '';
-        return c;
-      })(),
-      msgType,
-      mediaUrl,
-      timestamp: data.ts ? Math.floor(data.ts / 1000) : Math.floor(Date.now() / 1000),
-      isGroup,
-      senderId,
-      senderName: data.dName || data.senderName || undefined,
-      groupName: data.threadName || data.groupName || undefined,
-    };
-
-    if (!normalized.content?.trim() && !normalized.mediaUrl) return;
-
-    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)}`);
-    });
-  });
-
-  listener.on('error', (err: any) => {
-    runtime.error?.(`[${account.accountId}] ZaloX listener error: ${err.message || err}`);
-  });
-
-  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 };
-}
+    To: `zalox:${chatId}`,\n    SessionKey: route.sessionKey,\n    AccountId: route.accountId,\n    ChatType: isGroup ? 'group' : 'direct',\n    ConversationLabel: fromLabel,\n    SenderName: senderName || undefined,\n    SenderId: senderId,\n    CommandAuthorized: commandAuthorized,\n    Provider: 'zalox',\n    Surface: 'zalox',\n    MessageSid: message.msgId ?? `${timestamp}`,\n    OriginatingChannel: 'zalox',\n    OriginatingTo: `zalox:${chatId}`,\n    MediaPath: mediaPath,\n  });\n\n  await core.channel.session.recordInboundSession({\n    storePath,\n    sessionKey: ctxPayload.SessionKey ?? route.sessionKey,\n    ctx: ctxPayload,\n    onRecordError: (err: unknown) => {\n      runtime.error?.(`[zalox] session meta error: ${String(err)}`);\n    },\n  });\n\n  await core.channel.reply.dispatchReplyWithBufferedBlockDispatcher({\n    ctx: ctxPayload,\n    cfg: config,\n    dispatcherOptions: {\n      deliver: async (payload: any) => {\n        const text = payload.text ?? '';\n        if (!text) return;\n\n        const tableMode = core.channel.text.resolveMarkdownTableMode({\n          cfg: config,\n          channel: 'zalox',\n          accountId: account.accountId,\n        });\n        const converted = core.channel.text.convertMarkdownTables(text, tableMode ?? 'code');\n        const chunkMode = core.channel.text.resolveChunkMode(config, 'zalox', account.accountId);\n        const chunks = core.channel.text.chunkMarkdownTextWithMode(converted, 2000, chunkMode);\n\n        for (const chunk of chunks) {\n          try {\n            await sendText(chatId, chunk, { profile, isGroup });\n            statusSink?.({ lastOutboundAt: Date.now() });\n          } catch (err) {\n            runtime.error?.(`[zalox] send failed: ${String(err)}`);\n          }\n        }\n      },\n      onError: (err: unknown, info: any) => {\n        runtime.error?.(`[${account.accountId}] ZaloX ${info.kind} reply failed: ${String(err)}`);\n      },\n    },\n  });\n}\n\nexport async function startInProcessListener(\n  options: ListenerOptions,\n): Promise<{ stop: () => void }> {\n  const { account, config, runtime, api, ownId, profile, abortSignal, statusSink } = options;\n  let stopped = false;\n\n  const listener = api.listener;\n\n  listener.on('message', async (msg: any) => {\n    if (stopped || abortSignal.aborted) return;\n\n    const data = msg.data || msg;\n    const isGroup = msg.type === 1;\n    const senderId = data.uidFrom ? String(data.uidFrom) : '';\n    \n    if (senderId === ownId) return;\n\n    const threadId = isGroup\n      ? String(data.idTo || data.threadId || '')\n      : senderId;\n\n    const msgType = data.msgType || 0;\n    \n    let mediaUrl = undefined;\n    mediaUrl = data.url || data.href;\n    if (!mediaUrl && (msgType === 2 || String(msgType) === 'chat.photo')) {\n       if (data.params?.url) mediaUrl = data.params.url;\n       else if (typeof data.content === 'object' && data.content !== null) {\n          mediaUrl = (data.content as any).href || (data.content as any).url || (data.content as any).thumb || (data.content as any).normalUrl;\n       }\n       else if (typeof data.content === 'string' && (data.content.includes('http') || data.content.startsWith('{'))) {\n          try {\n             const parsed = JSON.parse(data.content);\n             mediaUrl = parsed.href || parsed.url || parsed.thumb || parsed.normalUrl;\n          } catch {\n             if (data.content.startsWith('http')) mediaUrl = data.content;\n          }\n       }\n    }\n    if (!mediaUrl && data.url && (data.url.includes('.jpg') || data.url.includes('.png'))) {\n        mediaUrl = data.url;\n    }\n\n    if (!mediaUrl && data.quote) {\n       try {\n         const q = data.quote;\n         if (q.attach) {\n            const attach = typeof q.attach === 'string' ? JSON.parse(q.attach) : q.attach;\n            mediaUrl = attach.href || attach.url || attach.thumb || attach.normalUrl;\n         }\n         if (!mediaUrl && (q.href || q.url)) {\n            mediaUrl = q.href || q.url;\n         }\n       } catch {} \n    }\n\n    if (isGroup) {\n      const mentions = data.mentions || data.mentionIds || [];\n      const content = typeof data.content === 'string' ? data.content : (data.msg || '');\n      \n      // STRICT: Check UID Only\n      let isMentioned = Array.isArray(mentions)\n        ? mentions.some((m: any) => String(m.uid || m.id || m) === ownId)\n        : false;\n\n      // FALLBACK: Text Check (Safety net for empty ownId)\n      if (!isMentioned) {\n          const name = account.name || 'Bot';\n          // Safe string check - no regex\n          if (content.includes(`@${name}`) || content.includes('@Tiệp Lê') || content.includes('@Javis')) {\n              isMentioned = true;\n          }\n      }\n      \n      // DEBUG COMMAND\n      if (content.trim() === '/debug') {\n          try {\n             await sendText(threadId, `DEBUG:\\nownId: "${ownId}"\\nmentions: ${JSON.stringify(mentions)}\\nisMentioned: ${isMentioned}`, { profile, isGroup: true });\n          } catch {}\n          // Don't return, let it proceed so agent can also see /debug\n      }\n\n      if (content.trim() === '/whoami') {\n          // Pass\n      } else if (!isMentioned && !content.startsWith('/') && content.trim() !== '/debug') {\n        return;\n      }\n    }\n\n    statusSink?.({ lastInboundAt: Date.now() });\n\n    const normalized = {\n      threadId,\n      msgId: String(data.msgId || data.cliMsgId || ''),\n      content: (() => {\n        let c = data.content || data.msg || '';\n        if (typeof c !== 'string') return '';\n        return c;\n      })(),\n      msgType,\n      mediaUrl,\n      timestamp: data.ts ? Math.floor(data.ts / 1000) : Math.floor(Date.now() / 1000),\n      isGroup,\n      senderId,\n      senderName: data.dName || data.senderName || undefined,\n      groupName: data.threadName || data.groupName || undefined,\n    };\n\n    if (!normalized.content?.trim() && !normalized.mediaUrl) return;\n\n    try {\n      const reactThreadType = isGroup ? ThreadType.Group : ThreadType.User;\n      api.addReaction(Reactions.HEART, {\n        threadId: normalized.threadId,\n        type: reactThreadType,\n        data: {\n          msgId: String(data.msgId || ''),\n          cliMsgId: String(data.cliMsgId || ''),\n        },\n      }).catch(() => {});\n    } 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  listener.on('error', (err: any) => {\n    runtime.error?.(`[${account.accountId}] ZaloX listener error: ${err.message || err}`);\n  });\n\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