openzca 0.1.56 → 0.1.57

package/dist/cli.js

@@ -3291,6 +3291,125 @@ function inferReplyMessageThreadId(params) {
   return void 0;
 }
 
+// src/lib/adaptive-batch.ts
+var RETRYABLE_LOOKUP_ERROR_PATTERNS = [
+  /retry limit/i,
+  /\brate limit/i,
+  /\btoo many requests?\b/i,
+  /\btimeout\b/i,
+  /\btimed out\b/i,
+  /\betimedout\b/i,
+  /\beconnreset\b/i,
+  /\besockettimedout\b/i,
+  /\bsocket hang up\b/i,
+  /\btemporar(?:y|ily)\b/i
+];
+var SPLITTABLE_LOOKUP_ERROR_PATTERNS = [
+  /\binvalid param(?:eter)?s?\b/i,
+  /\binvalid request\b/i,
+  /\bbad request\b/i,
+  /tham so khong hop le/i,
+  /tham số không hợp lệ/i
+];
+function sleep2(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+function chunkKeys(keys, size) {
+  const chunkSize = Math.max(1, Math.trunc(size) || 1);
+  const chunks = [];
+  for (let index = 0; index < keys.length; index += chunkSize) {
+    chunks.push(keys.slice(index, index + chunkSize));
+  }
+  return chunks;
+}
+function toErrorText(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+function isRetryableLookupError(error) {
+  const message = toErrorText(error);
+  return RETRYABLE_LOOKUP_ERROR_PATTERNS.some((pattern) => pattern.test(message));
+}
+function isSplittableLookupError(error) {
+  const message = toErrorText(error);
+  return SPLITTABLE_LOOKUP_ERROR_PATTERNS.some((pattern) => pattern.test(message));
+}
+async function runAdaptiveBatch(keys, options) {
+  const maxRetries = Math.max(0, options.maxRetries ?? 2);
+  const initialDelayMs = Math.max(0, options.retryDelayMs ?? 400);
+  const backoffMultiplier = Math.max(1, options.backoffMultiplier ?? 2);
+  const shouldRetry = options.shouldRetry ?? isRetryableLookupError;
+  const shouldSplit = options.shouldSplit ?? isSplittableLookupError;
+  let attempt = 0;
+  let delayMs = initialDelayMs;
+  while (true) {
+    try {
+      return await options.fetchBatch(keys) ?? {};
+    } catch (error) {
+      if (keys.length > 1 && shouldSplit(error)) {
+        throw error;
+      }
+      attempt += 1;
+      if (attempt > maxRetries || !shouldRetry(error)) {
+        throw error;
+      }
+      await options.onRetry?.({
+        keys: [...keys],
+        attempt,
+        maxRetries,
+        delayMs,
+        error
+      });
+      if (delayMs > 0) {
+        await sleep2(delayMs);
+      }
+      delayMs = Math.max(delayMs * backoffMultiplier, delayMs + 1);
+    }
+  }
+}
+async function fetchAdaptiveObjectBatches(keys, options) {
+  const uniqueKeys = Array.from(new Set(keys.map((value) => value.trim()).filter(Boolean)));
+  const pending = chunkKeys(uniqueKeys, options.initialBatchSize ?? 5);
+  const values = /* @__PURE__ */ new Map();
+  const errors = [];
+  const shouldRetry = options.shouldRetry ?? isRetryableLookupError;
+  const shouldSplit = options.shouldSplit ?? isSplittableLookupError;
+  const continueOnItemError = options.continueOnItemError ?? true;
+  const batchDelayMs = Math.max(0, options.batchDelayMs ?? 75);
+  while (pending.length > 0) {
+    const batch = pending.shift();
+    if (!batch || batch.length === 0) {
+      continue;
+    }
+    try {
+      const result = await runAdaptiveBatch(batch, options);
+      for (const key of batch) {
+        const value = result[key];
+        if (value !== void 0) {
+          values.set(key, value);
+        }
+      }
+    } catch (error) {
+      if (batch.length > 1 && (shouldSplit(error) || shouldRetry(error))) {
+        pending.unshift(...chunkKeys(batch, Math.ceil(batch.length / 2)));
+        continue;
+      }
+      if (!continueOnItemError || batch.length > 1) {
+        throw error;
+      }
+      const itemError = { key: batch[0], error };
+      errors.push(itemError);
+      await options.onItemError?.(itemError);
+      continue;
+    }
+    if (batchDelayMs > 0 && pending.length > 0) {
+      await sleep2(batchDelayMs);
+    }
+  }
+  return { values, errors };
+}
+
 // src/cli.ts
 var require3 = createRequire2(import.meta.url);
 var { version: PKG_VERSION } = require3("../package.json");
@@ -3532,6 +3651,44 @@ function retrySendMethod(operation, command, metaBuilder) {
     }
   });
 }
+var LOOKUP_BATCH_SIZE = 5;
+var LOOKUP_RETRY_COUNT = 2;
+var LOOKUP_RETRY_DELAY_MS = 400;
+var LOOKUP_BATCH_DELAY_MS = 75;
+async function fetchGroupInfoRecords(api, groupIds) {
+  const { values } = await fetchAdaptiveObjectBatches(groupIds, {
+    fetchBatch: async (keys) => {
+      const response = await api.getGroupInfo(keys);
+      return response.gridInfoMap ?? {};
+    },
+    initialBatchSize: LOOKUP_BATCH_SIZE,
+    maxRetries: LOOKUP_RETRY_COUNT,
+    retryDelayMs: LOOKUP_RETRY_DELAY_MS,
+    batchDelayMs: LOOKUP_BATCH_DELAY_MS
+  });
+  return values;
+}
+async function fetchGroupInfoRecord(api, groupId) {
+  const groups = await fetchGroupInfoRecords(api, [groupId]);
+  const group2 = groups.get(groupId);
+  if (!group2) {
+    throw new Error(`Group not found: ${groupId}`);
+  }
+  return group2;
+}
+async function fetchGroupMemberProfiles(api, memberIds) {
+  const { values } = await fetchAdaptiveObjectBatches(memberIds, {
+    fetchBatch: async (keys) => {
+      const response = await api.getGroupMembersInfo(keys);
+      return response.profiles ?? {};
+    },
+    initialBatchSize: LOOKUP_BATCH_SIZE,
+    maxRetries: LOOKUP_RETRY_COUNT,
+    retryDelayMs: LOOKUP_RETRY_DELAY_MS,
+    batchDelayMs: LOOKUP_BATCH_DELAY_MS
+  });
+  return values;
+}
 function isProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return false;
   try {
@@ -3737,7 +3894,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
           command
         );
       } catch (error) {
-        fail(parsed.requestId, toErrorText(error));
+        fail(parsed.requestId, toErrorText2(error));
         writeDebugLine(
           "listen.ipc.upload.error",
           {
@@ -3746,7 +3903,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
             requestId: parsed.requestId,
             threadId: parsed.threadId,
             threadType: parsed.threadType,
-            message: toErrorText(error)
+            message: toErrorText2(error)
           },
           command
         );
@@ -3775,7 +3932,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
         {
           profile,
           sessionId,
-          message: toErrorText(error)
+          message: toErrorText2(error)
         },
         command
       );
@@ -3787,7 +3944,7 @@ async function startListenerIpcServer(api, profile, sessionId, command) {
       {
         profile,
         sessionId,
-        message: toErrorText(error)
+        message: toErrorText2(error)
       },
       command
     );
@@ -3976,7 +4133,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
       {
         profile,
         threadId,
-        message: toErrorText(error)
+        message: toErrorText2(error)
       },
       command
     );
@@ -4001,7 +4158,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
       {
         profile,
         threadId,
-        message: toErrorText(error)
+        message: toErrorText2(error)
       },
       command
     );
@@ -4242,8 +4399,8 @@ async function persistOutgoingMessageBestEffort(params) {
     });
   }
 }
-async function persistGroupMembersSnapshot(profile, groupId, api) {
-  const rows = await listGroupMemberRows(api, groupId);
+async function persistGroupMembersSnapshot(profile, groupId, api, groupInfo) {
+  const rows = await listGroupMemberRows(api, groupId, groupInfo);
   const snapshotAtMs = Date.now();
   for (const row of rows) {
     await persistContact({
@@ -4448,7 +4605,15 @@ async function prepareDbGroupTarget(params) {
     isHidden: params.hiddenIds.has(params.groupId),
     rawJson: params.rawJson
   });
-  await persistGroupMembersSnapshot(params.profile, params.groupId, params.api);
+  if (params.hydrateMembers === false) {
+    return {};
+  }
+  try {
+    await persistGroupMembersSnapshot(params.profile, params.groupId, params.api, params.group);
+    return {};
+  } catch (error) {
+    return { memberSnapshotError: toErrorText2(error) };
+  }
 }
 function resolveContactDisplayName(params) {
   return params.displayName?.trim() || params.zaloName?.trim() || params.fallbackTitle?.trim() || params.userId.trim() || void 0;
@@ -4550,18 +4715,17 @@ async function hydrateUnknownLiveGroup(params) {
     }
   }
   if (group2 || title) {
-    await persistThread({
+    await prepareDbGroupTarget({
       profile: params.profile,
-      scopeThreadId: params.groupId,
-      rawThreadId: params.groupId,
-      threadType: "group",
+      api: params.api,
+      groupId: params.groupId,
+      group: group2,
       title,
-      rawJson: group2 ? JSON.stringify(group2) : void 0
+      rawJson: group2 ? JSON.stringify(group2) : void 0,
+      pinnedIds: /* @__PURE__ */ new Set(),
+      hiddenIds: /* @__PURE__ */ new Set(),
+      hydrateMembers: Boolean(group2)
     });
-    try {
-      await persistGroupMembersSnapshot(params.profile, params.groupId, params.api);
-    } catch {
-    }
     return;
   }
   if (params.fallbackTitle?.trim()) {
@@ -4631,16 +4795,23 @@ async function syncDbGroupHistoryFull(params) {
     pagesRequested = result.pagesRequested;
     listenerImportedCount = await getStoredGroupMessageCount() - beforeCount;
   } catch (error) {
-    stopReason = `fallback_window:${toErrorText(error)}`;
+    stopReason = `fallback_window:${toErrorText2(error)}`;
     completeness = "window";
   }
   const fallbackCount = 200;
   params.progress?.(`merging recent group API window (${fallbackCount} per group)`);
   const beforeApiCount = await getStoredGroupMessageCount();
+  const topoffErrors = [];
   for (const groupId of params.targetGroupIds) {
-    const messages = await fetchRecentGroupMessagesViaApi(params.api, groupId, fallbackCount);
-    await persistMessages(messages);
-    params.progress?.(`group ${groupId}: fetched ${messages.length} message(s) from group history API`);
+    try {
+      const messages = await fetchRecentGroupMessagesViaApi(params.api, groupId, fallbackCount);
+      await persistMessages(messages);
+      params.progress?.(`group ${groupId}: fetched ${messages.length} message(s) from group history API`);
+    } catch (error) {
+      const message = toErrorText2(error);
+      topoffErrors.push({ groupId, error: message });
+      params.progress?.(`group ${groupId}: group history API skipped (${message})`);
+    }
   }
   const afterCount = await getStoredGroupMessageCount();
   const apiAddedCount = afterCount - beforeApiCount;
@@ -4670,7 +4841,8 @@ async function syncDbGroupHistoryFull(params) {
     imported,
     completeness,
     stopReason,
-    pagesRequested
+    pagesRequested,
+    topoffErrors
   });
 }
 async function syncDbFriendDirectory(params) {
@@ -4807,25 +4979,70 @@ async function runDbSync(params) {
       });
     }
     if (params.mode === "all" || params.mode === "groups") {
-      const groups = await buildGroupsDetailed(api);
+      const groups = await api.getAllGroups();
+      const groupIds = Object.keys(groups.gridVerMap ?? {});
       const targetGroupIds = /* @__PURE__ */ new Set();
       const titleById = /* @__PURE__ */ new Map();
-      for (const group2 of groups) {
-        const record = group2;
-        const groupId = normalizeCachedId(record.groupId);
-        if (!groupId) continue;
-        const title = typeof record.name === "string" && record.name.trim() ? record.name.trim() : typeof record.groupName === "string" && record.groupName.trim() ? record.groupName.trim() : void 0;
-        targetGroupIds.add(groupId);
-        titleById.set(groupId, title);
-        await prepareDbGroupTarget({
-          profile,
-          api,
-          groupId,
-          title,
-          rawJson: JSON.stringify(group2),
-          pinnedIds,
-          hiddenIds
-        });
+      params.progress?.(`syncing group directory for ${groupIds.length} group(s)`);
+      for (const groupId of groupIds) {
+        let group2;
+        let title;
+        try {
+          try {
+            group2 = await fetchGroupInfoRecord(api, groupId);
+            title = extractGroupTitle(group2);
+          } catch (error) {
+            const message = toErrorText2(error);
+            params.progress?.(`group ${groupId}: metadata unavailable (${message}), continuing`);
+            summary.syncState.push({
+              kind: "group",
+              groupId,
+              status: "warning",
+              stage: "metadata",
+              error: message
+            });
+          }
+          const { memberSnapshotError } = await prepareDbGroupTarget({
+            profile,
+            api,
+            groupId,
+            group: group2,
+            title,
+            rawJson: group2 ? JSON.stringify(group2) : void 0,
+            pinnedIds,
+            hiddenIds,
+            hydrateMembers: Boolean(group2)
+          });
+          if (memberSnapshotError) {
+            params.progress?.(`group ${groupId}: member snapshot unavailable (${memberSnapshotError}), continuing`);
+            summary.syncState.push({
+              kind: "group",
+              groupId,
+              status: "warning",
+              stage: "members",
+              error: memberSnapshotError
+            });
+          }
+          targetGroupIds.add(groupId);
+          titleById.set(groupId, title);
+        } catch (error) {
+          const message = toErrorText2(error);
+          params.progress?.(`group ${groupId}: skipped (${message})`);
+          await setSyncState({
+            profile,
+            scopeThreadId: groupId,
+            threadType: "group",
+            status: "error",
+            error: message
+          });
+          summary.syncState.push({
+            kind: "group",
+            groupId,
+            status: "error",
+            stage: "prepare",
+            error: message
+          });
+        }
       }
       await syncDbGroupHistoryFull({
         profile,
@@ -4841,18 +5058,29 @@ async function runDbSync(params) {
       if (!params.groupId) {
         throw new Error("Missing group id for db sync group.");
       }
-      const groupInfo = await api.getGroupInfo(params.groupId);
-      const group2 = groupInfo.gridInfoMap[params.groupId];
-      const title = typeof group2?.name === "string" && group2.name.trim() ? group2.name.trim() : void 0;
-      await prepareDbGroupTarget({
+      const group2 = await fetchGroupInfoRecord(api, params.groupId);
+      const title = extractGroupTitle(group2);
+      const { memberSnapshotError } = await prepareDbGroupTarget({
         profile,
         api,
         groupId: params.groupId,
+        group: group2,
         title,
         rawJson: group2 ? JSON.stringify(group2) : void 0,
         pinnedIds,
-        hiddenIds
+        hiddenIds,
+        hydrateMembers: Boolean(group2)
       });
+      if (memberSnapshotError) {
+        params.progress?.(`group ${params.groupId}: member snapshot unavailable (${memberSnapshotError}), continuing`);
+        summary.syncState.push({
+          kind: "group",
+          groupId: params.groupId,
+          status: "warning",
+          stage: "members",
+          error: memberSnapshotError
+        });
+      }
       await syncDbGroupHistoryFull({
         profile,
         api,
@@ -4911,8 +5139,8 @@ async function buildGroupsDetailed(api) {
   const groups = await api.getAllGroups();
   const ids = Object.keys(groups.gridVerMap ?? {});
   if (ids.length === 0) return [];
-  const info = await api.getGroupInfo(ids);
-  return ids.map((id) => info.gridInfoMap?.[id]).filter((item) => Boolean(item));
+  const info = await fetchGroupInfoRecords(api, ids);
+  return ids.map((id) => info.get(id)).filter((item) => Boolean(item));
 }
 function normalizeGroupMemberId(value) {
   if (typeof value === "number" && Number.isFinite(value)) {
@@ -4923,9 +5151,8 @@ function normalizeGroupMemberId(value) {
   if (!trimmed) return "";
   return trimmed.replace(/_\d+$/, "");
 }
-async function listGroupMemberRows(api, groupId) {
-  const info = await api.getGroupInfo(groupId);
-  const groupInfo = info.gridInfoMap[groupId];
+async function listGroupMemberRows(api, groupId, preloadedGroupInfo) {
+  const groupInfo = preloadedGroupInfo ?? await fetchGroupInfoRecord(api, groupId);
   if (!groupInfo) {
     throw new Error(`Group not found: ${groupId}`);
   }
@@ -4949,10 +5176,9 @@ async function listGroupMemberRows(api, groupId) {
       ...Array.from(currentMemberMap.keys())
     ])
   );
-  const profiles = ids.length > 0 ? await api.getGroupMembersInfo(ids) : { profiles: {} };
-  const rawProfileMap = profiles.profiles;
+  const profileLookup = ids.length > 0 ? await fetchGroupMemberProfiles(api, ids) : /* @__PURE__ */ new Map();
   const profileMap = /* @__PURE__ */ new Map();
-  for (const [key, profile] of Object.entries(rawProfileMap)) {
+  for (const [key, profile] of profileLookup.entries()) {
     if (!profile) continue;
     const normalizedKey = normalizeGroupMemberId(key);
     if (normalizedKey && !profileMap.has(normalizedKey)) {
@@ -5007,7 +5233,7 @@ function isListenerAlreadyStarted(error) {
   if (!(error instanceof Error)) return false;
   return /already started/i.test(error.message);
 }
-function toErrorText(error) {
+function toErrorText2(error) {
   return error instanceof Error ? error.message : String(error);
 }
 var SHUTDOWN_CALLBACKS = /* @__PURE__ */ new Set();
@@ -5045,7 +5271,7 @@ async function runShutdownCallbacks(signal) {
         "process.signal.callback_error",
         {
           signal,
-          message: toErrorText(error)
+          message: toErrorText2(error)
         },
         void 0
       );
@@ -5128,7 +5354,7 @@ async function withUploadListener(api, command, task) {
     writeDebugLine(
       "msg.upload.listener.error",
       {
-        message: toErrorText(error)
+        message: toErrorText2(error)
       },
       command
     );
@@ -5170,7 +5396,7 @@ async function withUploadListener(api, command, task) {
         finish();
       };
       const onConnectError = (error) => {
-        finish(new Error(`Upload listener connection error: ${toErrorText(error)}`));
+        finish(new Error(`Upload listener connection error: ${toErrorText2(error)}`));
       };
       const onConnectClosed = (code, reason) => {
         finish(
@@ -5808,7 +6034,7 @@ async function parseCredentialFile(filePath) {
     language: parsed.language
   };
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
   });
@@ -5823,7 +6049,7 @@ async function waitForFileContent(filePath, timeoutMs) {
       }
     } catch {
     }
-    await sleep2(150);
+    await sleep3(150);
   }
   throw new Error(`Timed out waiting for QR image file: ${filePath}`);
 }
@@ -9052,7 +9278,7 @@ ${replyContextText}` : replyContextText;
                       code,
                       reason: reason || void 0,
                       delayMs: keepAliveRestartDelayMs,
-                      message: toErrorText(error),
+                      message: toErrorText2(error),
                       sessionId
                     },
                     command

package/package.json

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