zalo-agent-cli 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zalo-agent-cli",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "CLI tool for Zalo automation — multi-account, proxy support, bank transfers, QR payments",
   "type": "module",
   "bin": {

package/src/commands/friend.js

@@ -2,8 +2,8 @@
  * Friend commands — list, find, info, add, accept, remove, block, unblock, last-online, online.
  */
 
-import { getApi, autoLogin, clearSession } from "../core/zalo-client.js";
-import { success, error, info, warning, output } from "../utils/output.js";
+import { getApi } from "../core/zalo-client.js";
+import { success, error, info, output } from "../utils/output.js";
 
 /** Extract numeric error code from zca-js error message string. */
 function extractErrorCode(msg) {
@@ -166,140 +166,4 @@ export function registerFriendCommands(program) {
                 error(e.message);
             }
         });
-
-    /** Map FriendEventType enum to readable labels */
-    const FRIEND_EVENT_LABELS = {
-        0: "FRIEND_ADDED",
-        1: "FRIEND_REMOVED",
-        2: "FRIEND_REQUEST",
-        3: "UNDO_REQUEST",
-        4: "REJECT_REQUEST",
-        5: "SEEN_REQUEST",
-        6: "BLOCKED",
-        7: "UNBLOCKED",
-        8: "BLOCK_CALL",
-        9: "UNBLOCK_CALL",
-        10: "PIN_UNPIN",
-        11: "PIN_CREATE",
-    };
-
-    friend
-        .command("listen")
-        .description(
-            "Listen for friend events: new requests, accepts, removes, blocks. Use --json for machine parsing. Auto-reconnect enabled.",
-        )
-        .option(
-            "-f, --filter <type>",
-            "Filter events: request (new requests only), add (accepted only), all (default)",
-            "all",
-        )
-        .option("-w, --webhook <url>", "POST each event as JSON to this URL (for n8n, Make, etc.)")
-        .option("--auto-accept", "Automatically accept incoming friend requests")
-        .action(async (opts) => {
-            const jsonMode = program.opts().json;
-            const startTime = Date.now();
-
-            function uptime() {
-                const s = Math.floor((Date.now() - startTime) / 1000);
-                const h = Math.floor(s / 3600);
-                const m = Math.floor((s % 3600) / 60);
-                return h > 0 ? `${h}h${m}m` : `${m}m${s % 60}s`;
-            }
-
-            async function startListener() {
-                try {
-                    const api = getApi();
-
-                    api.listener.on("friend_event", async (event) => {
-                        const label = FRIEND_EVENT_LABELS[event.type] || "UNKNOWN";
-
-                        // Filter
-                        if (opts.filter === "request" && event.type !== 2) return;
-                        if (opts.filter === "add" && event.type !== 0) return;
-
-                        const data = {
-                            event: label,
-                            type: event.type,
-                            threadId: event.threadId,
-                            isSelf: event.isSelf,
-                            data: event.data,
-                        };
-
-                        if (jsonMode) {
-                            console.log(JSON.stringify(data));
-                        } else {
-                            const msg =
-                                event.type === 2
-                                    ? `Friend request from ${event.data.fromUid}: "${event.data.message || ""}"`
-                                    : `${label} — ${event.threadId}`;
-                            info(msg);
-                        }
-
-                        // Webhook
-                        if (opts.webhook) {
-                            try {
-                                await fetch(opts.webhook, {
-                                    method: "POST",
-                                    headers: { "Content-Type": "application/json" },
-                                    body: JSON.stringify(data),
-                                });
-                            } catch {
-                                // Silent
-                            }
-                        }
-
-                        // Auto-accept friend requests
-                        if (opts.autoAccept && event.type === 2 && !event.isSelf) {
-                            try {
-                                await api.acceptFriendRequest(event.data.fromUid);
-                                success(`Auto-accepted friend request from ${event.data.fromUid}`);
-                            } catch (e) {
-                                error(`Auto-accept failed: ${e.message}`);
-                            }
-                        }
-                    });
-
-                    api.listener.on("closed", async (code, _reason) => {
-                        if (code === 3000) {
-                            error("Another Zalo Web session opened. Listener stopped.");
-                            process.exit(1);
-                        }
-                        warning(`Connection closed (code: ${code}). Re-login in 5s...`);
-                        await new Promise((r) => setTimeout(r, 5000));
-                        try {
-                            clearSession();
-                            await autoLogin(jsonMode);
-                            startListener();
-                        } catch (e) {
-                            error(`Re-login failed: ${e.message}. Retrying in 30s...`);
-                            await new Promise((r) => setTimeout(r, 30000));
-                            startListener();
-                        }
-                    });
-
-                    api.listener.start({ retryOnClose: true });
-
-                    info("Listening for friend events... Press Ctrl+C to stop.");
-                    info("Auto-reconnect enabled.");
-                    if (opts.filter !== "all") info(`Filter: ${opts.filter} events only`);
-                    if (opts.webhook) info(`Webhook: POST to ${opts.webhook}`);
-                    if (opts.autoAccept) info("Auto-accept: ON — will accept all incoming requests");
-                } catch (e) {
-                    error(`Listen failed: ${e.message}`);
-                    process.exit(1);
-                }
-            }
-
-            await startListener();
-
-            await new Promise((resolve) => {
-                process.on("SIGINT", () => {
-                    try {
-                        getApi().listener.stop();
-                    } catch {}
-                    info(`Listener stopped. Uptime: ${uptime()}`);
-                    resolve();
-                });
-            });
-        });
 }

package/src/commands/listen.js

@@ -6,7 +6,11 @@
 import { getApi, autoLogin, clearSession } from "../core/zalo-client.js";
 import { success, error, info, warning } from "../utils/output.js";
 
-/** Friend event type enum → readable label */
+/** Thread types matching zca-js ThreadType enum */
+const THREAD_USER = 0;
+const THREAD_GROUP = 1;
+
+/** Friend event type → readable label (matches zca-js FriendEventType enum order) */
 const FRIEND_EVENT_LABELS = {
     0: "friend_added",
     1: "friend_removed",
@@ -17,6 +21,10 @@ const FRIEND_EVENT_LABELS = {
     6: "blocked",
     7: "unblocked",
 };
+const FRIEND_REQUEST_TYPE = 2;
+
+/** Zalo close code for duplicate web session */
+const CLOSE_DUPLICATE = 3000;
 
 export function registerListenCommand(program) {
     program
@@ -47,30 +55,36 @@ export function registerListenCommand(program) {
                 return h > 0 ? `${h}h${m}m` : `${m}m${s % 60}s`;
             }
 
-            /** Send event data to webhook */
-            async function postWebhook(data) {
+            /** Fire-and-forget webhook POST — never blocks event processing */
+            function postWebhook(data) {
                 if (!opts.webhook) return;
-                try {
-                    await fetch(opts.webhook, {
-                        method: "POST",
-                        headers: { "Content-Type": "application/json" },
-                        body: JSON.stringify(data),
-                    });
-                } catch {
-                    // Silent — don't block listener
+                fetch(opts.webhook, {
+                    method: "POST",
+                    headers: { "Content-Type": "application/json" },
+                    body: JSON.stringify(data),
+                }).catch(() => {});
+            }
+
+            /** Output event as JSON or human-readable, then post to webhook */
+            function emitEvent(data, humanMsg) {
+                eventCount++;
+                if (jsonMode) {
+                    console.log(JSON.stringify(data));
+                } else {
+                    info(humanMsg);
                 }
+                postWebhook(data);
             }
 
-            /** Attach all event handlers to current API */
-            function attachHandlers(api) {
+            /** Attach ALL handlers (data + lifecycle) to current API listener */
+            function attachAllHandlers(api) {
                 // --- Message events ---
                 if (enabledEvents.has("message")) {
                     api.listener.on("message", async (msg) => {
-                        if (opts.filter === "user" && msg.type !== 0) return;
-                        if (opts.filter === "group" && msg.type !== 1) return;
+                        if (opts.filter === "user" && msg.type !== THREAD_USER) return;
+                        if (opts.filter === "group" && msg.type !== THREAD_GROUP) return;
                         if (!opts.self && msg.isSelf) return;
 
-                        eventCount++;
                         const content = typeof msg.data.content === "string" ? msg.data.content : "[non-text]";
                         const data = {
                             event: "message",
@@ -81,24 +95,18 @@ export function registerListenCommand(program) {
                             isSelf: msg.isSelf,
                             content,
                         };
-
-                        if (jsonMode) {
-                            console.log(JSON.stringify(data));
-                        } else {
-                            const dir = msg.isSelf ? "→" : "←";
-                            const typeLabel = msg.type === 0 ? "DM" : "GR";
-                            console.log(
-                                `  ${dir} [${typeLabel}] [${msg.threadId}] ${content}  (msgId: ${msg.data.msgId})`,
-                            );
-                        }
-                        await postWebhook(data);
+                        const dir = msg.isSelf ? "→" : "←";
+                        const typeLabel = msg.type === THREAD_USER ? "DM" : "GR";
+                        emitEvent(
+                            data,
+                            `${dir} [${typeLabel}] [${msg.threadId}] ${content}  (msgId: ${msg.data.msgId})`,
+                        );
                     });
                 }
 
                 // --- Friend events ---
                 if (enabledEvents.has("friend")) {
                     api.listener.on("friend_event", async (event) => {
-                        eventCount++;
                         const label = FRIEND_EVENT_LABELS[event.type] || "friend_unknown";
                         const data = {
                             event: label,
@@ -106,20 +114,14 @@ export function registerListenCommand(program) {
                             isSelf: event.isSelf,
                             data: event.data,
                         };
-
-                        if (jsonMode) {
-                            console.log(JSON.stringify(data));
-                        } else {
-                            const msg =
-                                event.type === 2
-                                    ? `Friend request from ${event.data.fromUid}: "${event.data.message || ""}"`
-                                    : `${label} — ${event.threadId}`;
-                            info(msg);
-                        }
-                        await postWebhook(data);
-
-                        // Auto-accept
-                        if (opts.autoAccept && event.type === 2 && !event.isSelf) {
+                        const humanMsg =
+                            event.type === FRIEND_REQUEST_TYPE
+                                ? `Friend request from ${event.data.fromUid}: "${event.data.message || ""}"`
+                                : `${label} — ${event.threadId}`;
+                        emitEvent(data, humanMsg);
+
+                        // Auto-accept incoming friend requests
+                        if (opts.autoAccept && event.type === FRIEND_REQUEST_TYPE && !event.isSelf) {
                             try {
                                 await api.acceptFriendRequest(event.data.fromUid);
                                 success(`Auto-accepted friend request from ${event.data.fromUid}`);
@@ -132,104 +134,103 @@ export function registerListenCommand(program) {
 
                 // --- Group events ---
                 if (enabledEvents.has("group")) {
-                    api.listener.on("group_event", async (event) => {
-                        eventCount++;
-                        const data = {
-                            event: `group_${event.type}`,
-                            threadId: event.threadId,
-                            isSelf: event.isSelf,
-                            data: event.data,
-                        };
-
-                        if (jsonMode) {
-                            console.log(JSON.stringify(data));
-                        } else {
-                            info(`Group: ${event.type} — ${event.threadId}`);
-                        }
-                        await postWebhook(data);
+                    api.listener.on("group_event", (event) => {
+                        emitEvent(
+                            {
+                                event: `group_${event.type}`,
+                                threadId: event.threadId,
+                                isSelf: event.isSelf,
+                                data: event.data,
+                            },
+                            `Group: ${event.type} — ${event.threadId}`,
+                        );
                     });
                 }
 
                 // --- Reaction events ---
                 if (enabledEvents.has("reaction")) {
-                    api.listener.on("reaction", async (reaction) => {
+                    api.listener.on("reaction", (reaction) => {
                         if (!opts.self && reaction.isSelf) return;
-                        eventCount++;
-                        const data = {
-                            event: "reaction",
-                            threadId: reaction.threadId,
-                            isSelf: reaction.isSelf,
-                            isGroup: reaction.isGroup,
-                            data: reaction.data,
-                        };
-
-                        if (jsonMode) {
-                            console.log(JSON.stringify(data));
-                        } else {
-                            info(`Reaction in ${reaction.threadId}`);
-                        }
-                        await postWebhook(data);
+                        emitEvent(
+                            {
+                                event: "reaction",
+                                threadId: reaction.threadId,
+                                isSelf: reaction.isSelf,
+                                isGroup: reaction.isGroup,
+                                data: reaction.data,
+                            },
+                            `Reaction in ${reaction.threadId}`,
+                        );
                     });
                 }
-            }
-
-            /** Start listener with auto-reconnect */
-            async function startListener() {
-                try {
-                    const api = getApi();
 
-                    api.listener.on("connected", () => {
-                        if (reconnectCount > 0) {
-                            info(`Reconnected (#${reconnectCount}, uptime: ${uptime()}, events: ${eventCount})`);
-                        }
-                    });
+                // --- Lifecycle events (MUST be on same listener for reconnect to work) ---
+                api.listener.on("connected", () => {
+                    if (reconnectCount > 0) {
+                        info(`Reconnected (#${reconnectCount}, uptime: ${uptime()}, events: ${eventCount})`);
+                    }
+                });
 
-                    api.listener.on("disconnected", (code, _reason) => {
-                        warning(`Disconnected (code: ${code}). Auto-retrying...`);
-                    });
+                api.listener.on("disconnected", (code, _reason) => {
+                    warning(`Disconnected (code: ${code}). Auto-retrying...`);
+                });
 
-                    api.listener.on("closed", async (code, _reason) => {
-                        if (code === 3000) {
-                            error("Another Zalo Web session opened. Listener stopped.");
-                            process.exit(1);
-                        }
-                        reconnectCount++;
-                        warning(`Connection closed (code: ${code}). Re-login in 5s... (uptime: ${uptime()})`);
-                        await new Promise((r) => setTimeout(r, 5000));
+                api.listener.on("closed", async (code, _reason) => {
+                    if (code === CLOSE_DUPLICATE) {
+                        error("Another Zalo Web session opened. Listener stopped.");
+                        process.exit(1);
+                    }
+                    reconnectCount++;
+                    warning(`Connection closed (code: ${code}). Re-login in 5s... (uptime: ${uptime()})`);
+                    await new Promise((r) => setTimeout(r, 5000));
+                    try {
+                        clearSession();
+                        await autoLogin(jsonMode);
+                        info("Re-login successful. Restarting listener...");
+                        // Attach ALL handlers to the NEW api (including lifecycle)
+                        const newApi = getApi();
+                        attachAllHandlers(newApi);
+                        newApi.listener.start({ retryOnClose: true });
+                    } catch (e) {
+                        error(`Re-login failed: ${e.message}. Retrying in 30s...`);
+                        await new Promise((r) => setTimeout(r, 30000));
                         try {
                             clearSession();
                             await autoLogin(jsonMode);
-                            info("Re-login successful. Restarting listener...");
-                            attachHandlers(getApi());
-                            getApi().listener.start({ retryOnClose: true });
-                        } catch (e) {
-                            error(`Re-login failed: ${e.message}. Retrying in 30s...`);
-                            await new Promise((r) => setTimeout(r, 30000));
-                            startListener();
+                            const retryApi = getApi();
+                            attachAllHandlers(retryApi);
+                            retryApi.listener.start({ retryOnClose: true });
+                            info("Re-login successful on retry.");
+                        } catch (e2) {
+                            error(`Re-login retry failed: ${e2.message}. Exiting.`);
+                            process.exit(1);
                         }
-                    });
-
-                    api.listener.on("error", (_err) => {
-                        // Log but don't crash
-                    });
+                    }
+                });
 
-                    attachHandlers(api);
-                    api.listener.start({ retryOnClose: true });
-
-                    info("Listening for Zalo events... Press Ctrl+C to stop.");
-                    info(`Events: ${opts.events}`);
-                    info("Auto-reconnect enabled.");
-                    if (opts.filter !== "all") info(`Message filter: ${opts.filter}`);
-                    if (opts.webhook) info(`Webhook: ${opts.webhook}`);
-                    if (opts.autoAccept) info("Auto-accept friend requests: ON");
-                } catch (e) {
-                    error(`Listen failed: ${e.message}`);
-                    process.exit(1);
-                }
+                api.listener.on("error", (_err) => {
+                    // WS errors are followed by close/disconnect — don't crash
+                });
             }
 
-            await startListener();
+            // --- Initial start ---
+            try {
+                const api = getApi();
+                attachAllHandlers(api);
+                api.listener.start({ retryOnClose: true });
+
+                info("Listening for Zalo events... Press Ctrl+C to stop.");
+                info(`Events: ${opts.events}`);
+                info("Auto-reconnect enabled.");
+                if (opts.filter !== "all") info(`Message filter: ${opts.filter}`);
+                if (opts.webhook) info(`Webhook: ${opts.webhook}`);
+                if (opts.autoAccept) info("Auto-accept friend requests: ON");
+            } catch (e) {
+                error(`Listen failed: ${e.message}`);
+                process.exit(1);
+            }
 
+            // Keep alive until Ctrl+C
             await new Promise((resolve) => {
                 process.on("SIGINT", () => {
                     try {

package/src/commands/msg.js

@@ -4,8 +4,8 @@
  */
 
 import { resolve } from "path";
-import { getApi, autoLogin, clearSession } from "../core/zalo-client.js";
-import { success, error, info, warning, output } from "../utils/output.js";
+import { getApi } from "../core/zalo-client.js";
+import { success, error, info, output } from "../utils/output.js";
 
 export function registerMsgCommands(program) {
     const msg = program.command("msg").description("Send and manage messages");
@@ -211,10 +211,7 @@ export function registerMsgCommands(program) {
             "React to a message. Reaction codes: :> (haha), /-heart (heart), /-strong (like), :o (wow), :-(( (cry), :-h (angry)",
         )
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")
-        .option(
-            "-c, --cli-msg-id <id>",
-            "Client message ID (required for reaction to appear, get from msg listen --json)",
-        )
+        .option("-c, --cli-msg-id <id>", "Client message ID (required for reaction to appear, get from listen --json)")
         .action(async (msgId, threadId, reaction, opts) => {
             try {
                 // zca-js addReaction(icon, dest) — dest needs msgId + cliMsgId
@@ -230,139 +227,6 @@ export function registerMsgCommands(program) {
             }
         });
 
-    msg.command("listen")
-        .description(
-            "Listen for incoming messages in real-time via WebSocket. Outputs msgId + cliMsgId needed for react. Use --json for machine parsing.",
-        )
-        .option("-f, --filter <type>", "Filter messages: user (DM only), group (groups only), all (default)", "all")
-        .option("-w, --webhook <url>", "POST each message as JSON to this URL (for n8n, Make, etc.)")
-        .option("--no-self", "Exclude messages sent by this account")
-        .action(async (opts) => {
-            const jsonMode = program.opts().json;
-            const startTime = Date.now();
-            let reconnectCount = 0;
-
-            /** Format uptime as human-readable string */
-            function uptime() {
-                const s = Math.floor((Date.now() - startTime) / 1000);
-                const h = Math.floor(s / 3600);
-                const m = Math.floor((s % 3600) / 60);
-                return h > 0 ? `${h}h${m}m` : `${m}m${s % 60}s`;
-            }
-
-            /** Attach message handler to current API listener */
-            function attachMessageHandler(api) {
-                api.listener.on("message", async (msg) => {
-                    if (opts.filter === "user" && msg.type !== 0) return;
-                    if (opts.filter === "group" && msg.type !== 1) return;
-                    if (!opts.self && msg.isSelf) return;
-
-                    const content = typeof msg.data.content === "string" ? msg.data.content : "[non-text]";
-                    const data = {
-                        msgId: msg.data.msgId,
-                        cliMsgId: msg.data.cliMsgId,
-                        threadId: msg.threadId,
-                        type: msg.type,
-                        isSelf: msg.isSelf,
-                        content,
-                    };
-
-                    if (jsonMode) {
-                        console.log(JSON.stringify(data));
-                    } else {
-                        const dir = msg.isSelf ? "→" : "←";
-                        const typeLabel = msg.type === 0 ? "DM" : "GR";
-                        console.log(`  ${dir} [${typeLabel}] [${msg.threadId}] ${content}  (msgId: ${msg.data.msgId})`);
-                    }
-
-                    if (opts.webhook) {
-                        try {
-                            await fetch(opts.webhook, {
-                                method: "POST",
-                                headers: { "Content-Type": "application/json" },
-                                body: JSON.stringify(data),
-                            });
-                        } catch {
-                            // Silent webhook failure
-                        }
-                    }
-                });
-            }
-
-            /** Start listener with auto-reconnect and re-login */
-            async function startListener() {
-                try {
-                    const api = getApi();
-
-                    api.listener.on("connected", () => {
-                        if (reconnectCount > 0) {
-                            info(`Reconnected (attempt #${reconnectCount}, uptime: ${uptime()})`);
-                        }
-                    });
-
-                    api.listener.on("disconnected", (code, _reason) => {
-                        warning(`Disconnected (code: ${code}). Auto-retrying...`);
-                    });
-
-                    // "closed" = permanent close (retries exhausted or duplicate connection)
-                    api.listener.on("closed", async (code, _reason) => {
-                        if (code === 3000) {
-                            // Duplicate connection — someone opened Zalo Web
-                            error("Another Zalo Web session opened. Listener stopped.");
-                            error("Close the other session and restart listener.");
-                            process.exit(1);
-                        }
-
-                        reconnectCount++;
-                        warning(`Connection closed (code: ${code}). Re-login in 5s... (uptime: ${uptime()})`);
-
-                        // Re-login and restart
-                        await new Promise((r) => setTimeout(r, 5000));
-                        try {
-                            clearSession();
-                            await autoLogin(jsonMode);
-                            info(`Re-login successful. Restarting listener...`);
-                            attachMessageHandler(getApi());
-                            getApi().listener.start({ retryOnClose: true });
-                        } catch (e) {
-                            error(`Re-login failed: ${e.message}. Retrying in 30s...`);
-                            await new Promise((r) => setTimeout(r, 30000));
-                            startListener();
-                        }
-                    });
-
-                    api.listener.on("error", (_err) => {
-                        // Log but don't crash — WS errors are usually followed by close/disconnect
-                    });
-
-                    attachMessageHandler(api);
-                    // retryOnClose: true = zca-js auto-retries on temporary disconnects
-                    api.listener.start({ retryOnClose: true });
-
-                    info("Listening for messages... Press Ctrl+C to stop.");
-                    info("Auto-reconnect enabled. Will survive network drops.");
-                    if (opts.filter !== "all") info(`Filter: ${opts.filter} messages only`);
-                    if (opts.webhook) info(`Webhook: POST to ${opts.webhook}`);
-                } catch (e) {
-                    error(`Listen failed: ${e.message}`);
-                    process.exit(1);
-                }
-            }
-
-            await startListener();
-
-            // Keep alive until Ctrl+C
-            await new Promise((resolve) => {
-                process.on("SIGINT", () => {
-                    try {
-                        getApi().listener.stop();
-                    } catch {}
-                    info(`Listener stopped. Uptime: ${uptime()}, reconnects: ${reconnectCount}`);
-                    resolve();
-                });
-            });
-        });
-
     msg.command("delete <msgId> <threadId>")
         .description("Delete a message you sent")
         .option("-t, --type <n>", "Thread type: 0=User, 1=Group", "0")