openzca 0.1.27 → 0.1.29

package/README.md

@@ -76,7 +76,7 @@ You can also open the saved file manually (for example: `open qr.png` on macOS).
 | `openzca msg delete <msgId> <cliMsgId> <uidFrom> <threadId>` | Delete a message |
 | `openzca msg undo <msgId> <cliMsgId> <threadId>` | Recall a sent message |
 | `openzca msg upload <arg1> [arg2]` | Upload and send file(s) |
-| `openzca msg recent <threadId>` | List recent messages (`-n`, `--json`, newest-first); group mode uses direct group-history API |
+| `openzca msg recent <threadId>` | List recent messages (`-n`, `--json`, newest-first); group mode prefers direct group-history endpoint (websocket fallback) |
 
 Media commands accept local files, `file://` paths, and repeatable `--url` options. Add `--group` for group threads.
 Local paths using `~` are expanded automatically (for positional file args, `--url`, and `OPENZCA_LISTEN_MEDIA_DIR`).
@@ -275,6 +275,9 @@ Listener resilience override:
 - `OPENZCA_RECENT_USER_MAX_PAGES`: max websocket history pages to scan for `msg recent` in user/DM mode.
   - Default: `20`.
   - Increase if a DM thread is old and not found in the first page.
+- `OPENZCA_RECENT_GROUP_MAX_PAGES`: max websocket history pages to scan for `msg recent -g` when direct group-history path fails.
+  - Default: `20`.
+  - Increase if a group thread is old and not found quickly.
 - `OPENZCA_LISTEN_ENFORCE_SINGLE_OWNER`: enforce one `listen` owner process per profile.
   - Default: enabled.
   - Set to `0` to allow multiple listeners on the same profile (not recommended).

package/dist/cli.js

@@ -1584,28 +1584,132 @@ function sortRecentMessagesNewestFirst(messages) {
 }
 function getRecentMessageCursor(message) {
   if (!message) return "";
+  const msgId = String(message.data?.msgId ?? "").trim();
+  if (msgId) return msgId;
   const actionId = String(message.data?.actionId ?? "").trim();
   if (actionId) return actionId;
-  return String(message.data?.msgId ?? "").trim();
+  return String(message.data?.cliMsgId ?? "").trim();
+}
+function getOldestRecentMessage(messages) {
+  let oldest = null;
+  for (const message of messages) {
+    if (!oldest) {
+      oldest = message;
+      continue;
+    }
+    if (parseRecentMessageTs(message.data?.ts) < parseRecentMessageTs(oldest.data?.ts)) {
+      oldest = message;
+    }
+  }
+  return oldest;
+}
+function getRecentPageCursors(messages) {
+  const cursors = [];
+  const seen = /* @__PURE__ */ new Set();
+  const addCursor = (value) => {
+    const cursor = value.trim();
+    if (!cursor || seen.has(cursor)) return;
+    seen.add(cursor);
+    cursors.push(cursor);
+  };
+  addCursor(getRecentMessageCursor(getOldestRecentMessage(messages)));
+  addCursor(getRecentMessageCursor(messages[messages.length - 1] ?? null));
+  addCursor(getRecentMessageCursor(messages[0] ?? null));
+  return cursors;
+}
+function normalizeGroupHistoryMessages(messages, fallbackThreadId) {
+  const normalized = [];
+  for (const message of messages) {
+    if (!message || typeof message !== "object") continue;
+    const raw = message;
+    if (raw.data && raw.threadId) {
+      const wrapped = raw;
+      normalized.push(wrapped);
+      continue;
+    }
+    const threadIdRaw = String(raw.idTo ?? "").trim();
+    normalized.push({
+      threadId: threadIdRaw || fallbackThreadId,
+      type: ThreadType.Group,
+      data: {
+        actionId: typeof raw.actionId === "string" && raw.actionId.trim() ? raw.actionId : void 0,
+        msgId: String(raw.msgId ?? ""),
+        cliMsgId: String(raw.cliMsgId ?? ""),
+        uidFrom: String(raw.uidFrom ?? ""),
+        dName: typeof raw.dName === "string" ? raw.dName : void 0,
+        ts: String(raw.ts ?? ""),
+        msgType: String(raw.msgType ?? ""),
+        content: raw.content ?? ""
+      }
+    });
+  }
+  return normalized;
+}
+async function fetchRecentGroupMessagesViaCustomApi(api, threadId, count) {
+  const customApi = api;
+  if (typeof customApi.__openzcaGroupHistory !== "function") {
+    if (typeof customApi.custom !== "function") {
+      throw new Error("Current zca-js build does not expose API custom hooks.");
+    }
+    customApi.custom("__openzcaGroupHistory", async ({ utils, props }) => {
+      const serviceURL = utils.makeURL(`${api.zpwServiceMap.group[0]}/api/group/history`);
+      const encryptedParams = utils.encodeAES(
+        JSON.stringify({
+          grid: props.groupId,
+          count: props.count
+        })
+      );
+      if (!encryptedParams) throw new Error("Failed to encrypt group history params.");
+      const response2 = await utils.request(
+        utils.makeURL(serviceURL, { params: encryptedParams }),
+        { method: "GET" }
+      );
+      return await utils.resolve(response2, (result) => {
+        if (typeof result.data === "string") {
+          try {
+            return JSON.parse(result.data);
+          } catch {
+            return { groupMsgs: [] };
+          }
+        }
+        return result.data ?? { groupMsgs: [] };
+      });
+    });
+  }
+  const response = await customApi.__openzcaGroupHistory?.({
+    groupId: threadId,
+    count
+  });
+  const messagesRaw = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
+  return sortRecentMessagesNewestFirst(
+    normalizeGroupHistoryMessages(messagesRaw, threadId)
+  ).slice(0, count);
 }
 async function fetchRecentGroupMessagesViaApi(api, threadId, count) {
   const historyApi = api.getGroupChatHistory;
-  if (typeof historyApi !== "function") {
-    throw new Error(
-      "Current zca-js build does not expose getGroupChatHistory(). Upgrade zca-js/openzca."
-    );
+  if (typeof historyApi === "function") {
+    try {
+      const response = await historyApi(threadId, count);
+      const messagesRaw = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
+      return sortRecentMessagesNewestFirst(
+        normalizeGroupHistoryMessages(messagesRaw, threadId)
+      ).slice(0, count);
+    } catch {
+    }
   }
-  const response = await historyApi(threadId, count);
-  const messages = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
-  return sortRecentMessagesNewestFirst(messages).slice(0, count);
+  try {
+    return await fetchRecentGroupMessagesViaCustomApi(api, threadId, count);
+  } catch {
+  }
+  return fetchRecentGroupMessagesViaListener(api, threadId, count);
 }
-async function fetchRecentUserMessagesViaListener(api, threadId, count) {
+async function fetchRecentGroupMessagesViaListener(api, threadId, count) {
   return new Promise((resolve, reject) => {
     let settled = false;
     const collected = [];
     const seenMessageKeys = /* @__PURE__ */ new Set();
     const requestedCursors = /* @__PURE__ */ new Set();
-    const maxPages = parsePositiveIntFromEnv("OPENZCA_RECENT_USER_MAX_PAGES", 20);
+    const maxPages = parsePositiveIntFromEnv("OPENZCA_RECENT_GROUP_MAX_PAGES", 20);
     let pagesRequested = 0;
     const toKey = (message) => {
       const msgId = String(message.data?.msgId ?? "");
@@ -1619,7 +1723,7 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
         requestedCursors.add(cursor);
       }
       pagesRequested += 1;
-      api.listener.requestOldMessages(ThreadType.User, cursor || null);
+      api.listener.requestOldMessages(ThreadType.Group, cursor || null);
       return true;
     };
     const cleanup = () => {
@@ -1651,7 +1755,7 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
       }
     };
     const onOldMessages = (messages, type) => {
-      if (type !== ThreadType.User) return;
+      if (type !== ThreadType.Group) return;
       const typedMessages = messages;
       for (const message of typedMessages) {
         if (message.threadId === threadId) {
@@ -1673,26 +1777,124 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
         finish();
         return;
       }
-      let oldest = null;
-      for (const message of typedMessages) {
-        if (!oldest) {
-          oldest = message;
-          continue;
+      try {
+        const cursorCandidates = getRecentPageCursors(typedMessages);
+        let requested = false;
+        for (const cursor of cursorCandidates) {
+          if (requestPage(cursor)) {
+            requested = true;
+            break;
+          }
         }
-        if (parseRecentMessageTs(message.data?.ts) < parseRecentMessageTs(oldest.data?.ts)) {
-          oldest = message;
+        if (!requested) finish();
+      } catch (error) {
+        finish(error);
+      }
+    };
+    const onError = (error) => {
+      finish(error);
+    };
+    const onClosed = () => {
+      finish();
+    };
+    const timeoutId = setTimeout(() => {
+      finish();
+    }, 12e3);
+    api.listener.on("connected", onConnected);
+    api.listener.on("old_messages", onOldMessages);
+    api.listener.on("error", onError);
+    api.listener.on("closed", onClosed);
+    try {
+      api.listener.start();
+    } catch (error) {
+      finish(error);
+    }
+  });
+}
+async function fetchRecentUserMessagesViaListener(api, threadId, count) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const collected = [];
+    const seenMessageKeys = /* @__PURE__ */ new Set();
+    const requestedCursors = /* @__PURE__ */ new Set();
+    const maxPages = parsePositiveIntFromEnv("OPENZCA_RECENT_USER_MAX_PAGES", 20);
+    let pagesRequested = 0;
+    const toKey = (message) => {
+      const msgId = String(message.data?.msgId ?? "");
+      const cliMsgId = String(message.data?.cliMsgId ?? "");
+      return `${msgId}:${cliMsgId}`;
+    };
+    const requestPage = (lastId) => {
+      const cursor = String(lastId ?? "").trim();
+      if (cursor) {
+        if (requestedCursors.has(cursor)) return false;
+        requestedCursors.add(cursor);
+      }
+      pagesRequested += 1;
+      api.listener.requestOldMessages(ThreadType.User, cursor || null);
+      return true;
+    };
+    const cleanup = () => {
+      clearTimeout(timeoutId);
+      api.listener.off("connected", onConnected);
+      api.listener.off("old_messages", onOldMessages);
+      api.listener.off("error", onError);
+      api.listener.off("closed", onClosed);
+      try {
+        api.listener.stop();
+      } catch {
+      }
+    };
+    const finish = (error) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      if (error) {
+        reject(error);
+        return;
+      }
+      resolve(sortRecentMessagesNewestFirst(collected).slice(0, count));
+    };
+    const onConnected = () => {
+      try {
+        requestPage(null);
+      } catch (error) {
+        finish(error);
+      }
+    };
+    const onOldMessages = (messages, type) => {
+      if (type !== ThreadType.User) return;
+      const typedMessages = messages;
+      for (const message of typedMessages) {
+        if (message.threadId === threadId) {
+          const key = toKey(message);
+          if (seenMessageKeys.has(key)) continue;
+          seenMessageKeys.add(key);
+          collected.push(message);
         }
       }
-      const nextCursor = getRecentMessageCursor(oldest);
-      if (!nextCursor) {
+      if (collected.length >= count) {
+        finish();
+        return;
+      }
+      if (typedMessages.length === 0) {
+        finish();
+        return;
+      }
+      if (pagesRequested >= maxPages) {
         finish();
         return;
       }
       try {
-        const requested = requestPage(nextCursor);
-        if (!requested) {
-          finish();
+        const cursorCandidates = getRecentPageCursors(typedMessages);
+        let requested = false;
+        for (const cursor of cursorCandidates) {
+          if (requestPage(cursor)) {
+            requested = true;
+            break;
+          }
         }
+        if (!requested) finish();
       } catch (error) {
         finish(error);
       }
@@ -3052,7 +3254,7 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
     }
   )
 );
-msg.command("recent <threadId>").option("-g, --group", "List recent messages for group thread").option("-n, --count <count>", "Number of messages (default: 20)", "20").option("-j, --json", "JSON output").description("List recent messages (group uses direct history API)").action(
+msg.command("recent <threadId>").option("-g, --group", "List recent messages for group thread").option("-n, --count <count>", "Number of messages (default: 20)", "20").option("-j, --json", "JSON output").description("List recent messages (group uses direct history API when available)").action(
   wrapAction(
     async (threadId, opts, command) => {
       const { api } = await requireApi(command);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {
@@ -42,15 +42,15 @@
   },
   "dependencies": {
     "@types/qrcode-terminal": "^0.12.2",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "image-size": "^2.0.2",
     "qrcode-terminal": "^0.12.0",
     "zca-js": "^2.0.4"
   },
   "devDependencies": {
-    "@types/node": "^24.5.2",
-    "tsup": "^8.5.0",
+    "@types/node": "^25.2.3",
+    "tsup": "^8.5.1",
     "tsx": "^4.21.0",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   }
 }