openzca 0.1.28 → 0.1.30

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 when available (fallback: websocket history) |
+| `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,7 +275,7 @@ 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 API is unavailable.
+- `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.

package/dist/cli.js

@@ -1590,23 +1590,117 @@ function getRecentMessageCursor(message) {
   if (actionId) return actionId;
   return String(message.data?.cliMsgId ?? "").trim();
 }
-function getRecentPageCursor(messages) {
-  for (let index = messages.length - 1; index >= 0; index -= 1) {
-    const cursor = getRecentMessageCursor(messages[index] ?? null);
-    if (cursor) return cursor;
+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 "";
+  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") {
     try {
       const response = await historyApi(threadId, count);
-      const messages = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
-      return sortRecentMessagesNewestFirst(messages).slice(0, count);
+      const messagesRaw = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
+      return sortRecentMessagesNewestFirst(
+        normalizeGroupHistoryMessages(messagesRaw, threadId)
+      ).slice(0, count);
     } catch {
     }
   }
+  try {
+    return await fetchRecentGroupMessagesViaCustomApi(api, threadId, count);
+  } catch {
+  }
   return fetchRecentGroupMessagesViaListener(api, threadId, count);
 }
 async function fetchRecentGroupMessagesViaListener(api, threadId, count) {
@@ -1683,16 +1777,16 @@ async function fetchRecentGroupMessagesViaListener(api, threadId, count) {
         finish();
         return;
       }
-      const nextCursor = getRecentPageCursor(typedMessages);
-      if (!nextCursor) {
-        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);
       }
@@ -1791,16 +1885,16 @@ async function fetchRecentUserMessagesViaListener(api, threadId, count) {
         finish();
         return;
       }
-      const nextCursor = getRecentPageCursor(typedMessages);
-      if (!nextCursor) {
-        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);
       }
@@ -3300,13 +3394,53 @@ group.command("members <groupId>").option("-j, --json", "JSON output").descripti
     if (!groupInfo) {
       throw new Error(`Group not found: ${groupId}`);
     }
-    const ids = groupInfo.memberIds ?? [];
+    const normalizeMemberId = (value) => {
+      if (typeof value === "number" && Number.isFinite(value)) {
+        return String(Math.trunc(value));
+      }
+      if (typeof value !== "string") return "";
+      const trimmed = value.trim();
+      if (!trimmed) return "";
+      return trimmed.replace(/_\d+$/, "");
+    };
+    const idsFromMemberIds = Array.isArray(groupInfo.memberIds) ? groupInfo.memberIds.map((id) => normalizeMemberId(id)).filter(Boolean) : [];
+    const memVerList = groupInfo.memVerList;
+    const idsFromMemVerList = Array.isArray(memVerList) ? memVerList.map((id) => normalizeMemberId(id)).filter(Boolean) : [];
+    const currentMems = Array.isArray(groupInfo.currentMems) ? groupInfo.currentMems : [];
+    const currentMemberMap = /* @__PURE__ */ new Map();
+    for (const member of currentMems) {
+      const userId = normalizeMemberId(member.id);
+      if (!userId) continue;
+      currentMemberMap.set(userId, {
+        displayName: member.dName?.trim() || member.zaloName?.trim() || "",
+        zaloName: member.zaloName?.trim() || ""
+      });
+    }
+    const ids = Array.from(
+      /* @__PURE__ */ new Set([
+        ...idsFromMemberIds,
+        ...idsFromMemVerList,
+        ...Array.from(currentMemberMap.keys())
+      ])
+    );
     const profiles = ids.length > 0 ? await api.getGroupMembersInfo(ids) : { profiles: {} };
-    const profileMap = profiles.profiles;
+    const rawProfileMap = profiles.profiles;
+    const profileMap = /* @__PURE__ */ new Map();
+    for (const [key, profile] of Object.entries(rawProfileMap)) {
+      if (!profile) continue;
+      const normalizedKey = normalizeMemberId(key);
+      if (normalizedKey && !profileMap.has(normalizedKey)) {
+        profileMap.set(normalizedKey, profile);
+      }
+      const profileId = normalizeMemberId(profile.id);
+      if (profileId && !profileMap.has(profileId)) {
+        profileMap.set(profileId, profile);
+      }
+    }
     const rows = ids.map((id) => ({
       userId: id,
-      displayName: profileMap[id]?.displayName ?? "",
-      zaloName: profileMap[id]?.zaloName ?? ""
+      displayName: profileMap.get(id)?.displayName ?? currentMemberMap.get(id)?.displayName ?? "",
+      zaloName: profileMap.get(id)?.zaloName ?? currentMemberMap.get(id)?.zaloName ?? ""
     }));
     if (opts.json) {
       output(rows, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {