openzca 0.1.54 → 0.1.55

package/dist/cli.js

@@ -4414,6 +4414,19 @@ async function persistLiveDmContact(params) {
     rawJson
   });
 }
+function extractGroupTitle(record) {
+  if (!record) {
+    return void 0;
+  }
+  return typeof record.name === "string" && record.name.trim() ? record.name.trim() : typeof record.groupName === "string" && record.groupName.trim() ? record.groupName.trim() : void 0;
+}
+async function findGroupDirectoryEntry(api, groupId) {
+  const groups = await buildGroupsDetailed(api);
+  return groups.find((item) => {
+    const record = item;
+    return normalizeCachedId(record.groupId ?? record.grid ?? record.threadId ?? record.id) === groupId;
+  });
+}
 async function hydrateUnknownLiveGroup(params) {
   const existing = await getThreadInfo({
     profile: params.profile,
@@ -4423,10 +4436,25 @@ async function hydrateUnknownLiveGroup(params) {
   if (existing && (existing.title || typeof existing.memberCount === "number" && existing.memberCount > 0)) {
     return;
   }
+  let group2;
+  let title = params.fallbackTitle?.trim() || void 0;
   try {
     const info = await params.api.getGroupInfo(params.groupId);
-    const group2 = info.gridInfoMap[params.groupId];
-    const title = typeof group2?.name === "string" && group2.name.trim() ? group2.name.trim() : typeof group2?.groupName === "string" && group2.groupName.trim() ? group2.groupName.trim() : params.fallbackTitle?.trim() || void 0;
+    group2 = info.gridInfoMap[params.groupId];
+    title = extractGroupTitle(group2) ?? title;
+  } catch {
+  }
+  if (!group2 || !title) {
+    try {
+      const directoryGroup = await findGroupDirectoryEntry(params.api, params.groupId);
+      if (directoryGroup) {
+        group2 = group2 ?? directoryGroup;
+        title = extractGroupTitle(directoryGroup) ?? title;
+      }
+    } catch {
+    }
+  }
+  if (group2 || title) {
     await persistThread({
       profile: params.profile,
       scopeThreadId: params.groupId,
@@ -4435,17 +4463,20 @@ async function hydrateUnknownLiveGroup(params) {
       title,
       rawJson: group2 ? JSON.stringify(group2) : void 0
     });
-    await persistGroupMembersSnapshot(params.profile, params.groupId, params.api);
-  } catch {
-    if (params.fallbackTitle?.trim()) {
-      await persistThread({
-        profile: params.profile,
-        scopeThreadId: params.groupId,
-        rawThreadId: params.groupId,
-        threadType: "group",
-        title: params.fallbackTitle.trim()
-      });
+    try {
+      await persistGroupMembersSnapshot(params.profile, params.groupId, params.api);
+    } catch {
     }
+    return;
+  }
+  if (params.fallbackTitle?.trim()) {
+    await persistThread({
+      profile: params.profile,
+      scopeThreadId: params.groupId,
+      rawThreadId: params.groupId,
+      threadType: "group",
+      title: params.fallbackTitle.trim()
+    });
   }
 }
 async function syncDbGroupHistoryFull(params) {
@@ -4654,128 +4685,132 @@ async function syncDbChatsBestEffort(params) {
 }
 async function runDbSync(params) {
   const { profile, api } = await requireApi(params.command);
-  const dbPath = await resolveDbPath(profile);
-  params.progress?.(`starting sync for profile ${profile}`);
-  const summary = createDbSyncSummary(
-    profile,
-    dbPath,
-    params.mode === "all" || params.mode === "chats" || params.mode === "chat" ? params.count : void 0
-  );
-  const selfId = api.getOwnId();
-  const selfInfo = normalizeMeInfoOutput(await api.fetchAccountInfo());
-  await persistSelfProfile({
-    profile,
-    userId: selfId,
-    displayName: typeof selfInfo.displayName === "string" && selfInfo.displayName.trim() ? selfInfo.displayName.trim() : void 0,
-    infoJson: JSON.stringify(selfInfo)
-  });
-  const { pinnedIds, hiddenIds } = await collectConversationIds(api);
-  let friendNames = /* @__PURE__ */ new Map();
-  if (params.mode === "all" || params.mode === "friends" || params.mode === "chats") {
-    friendNames = await syncDbFriendDirectory({
+  try {
+    const dbPath = await resolveDbPath(profile);
+    params.progress?.(`starting sync for profile ${profile}`);
+    const summary = createDbSyncSummary(
       profile,
-      api,
-      summary,
-      progress: params.progress
+      dbPath,
+      params.mode === "all" || params.mode === "chats" || params.mode === "chat" ? params.count : void 0
+    );
+    const selfId = api.getOwnId();
+    const selfInfo = normalizeMeInfoOutput(await api.fetchAccountInfo());
+    await persistSelfProfile({
+      profile,
+      userId: selfId,
+      displayName: typeof selfInfo.displayName === "string" && selfInfo.displayName.trim() ? selfInfo.displayName.trim() : void 0,
+      infoJson: JSON.stringify(selfInfo)
     });
-  }
-  if (params.mode === "all" || params.mode === "groups") {
-    const groups = await buildGroupsDetailed(api);
-    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);
+    const { pinnedIds, hiddenIds } = await collectConversationIds(api);
+    let friendNames = /* @__PURE__ */ new Map();
+    if (params.mode === "all" || params.mode === "friends" || params.mode === "chats") {
+      friendNames = await syncDbFriendDirectory({
+        profile,
+        api,
+        summary,
+        progress: params.progress
+      });
+    }
+    if (params.mode === "all" || params.mode === "groups") {
+      const groups = await buildGroupsDetailed(api);
+      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
+        });
+      }
+      await syncDbGroupHistoryFull({
+        profile,
+        api,
+        selfId,
+        targetGroupIds,
+        titleById,
+        summary,
+        progress: params.progress
+      });
+    }
+    if (params.mode === "group") {
+      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({
         profile,
         api,
-        groupId,
+        groupId: params.groupId,
         title,
-        rawJson: JSON.stringify(group2),
+        rawJson: group2 ? JSON.stringify(group2) : void 0,
         pinnedIds,
         hiddenIds
       });
+      await syncDbGroupHistoryFull({
+        profile,
+        api,
+        selfId,
+        targetGroupIds: /* @__PURE__ */ new Set([params.groupId]),
+        titleById: /* @__PURE__ */ new Map([[params.groupId, title]]),
+        summary,
+        progress: params.progress
+      });
     }
-    await syncDbGroupHistoryFull({
-      profile,
-      api,
-      selfId,
-      targetGroupIds,
-      titleById,
-      summary,
-      progress: params.progress
-    });
-  }
-  if (params.mode === "group") {
-    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({
-      profile,
-      api,
-      groupId: params.groupId,
-      title,
-      rawJson: group2 ? JSON.stringify(group2) : void 0,
-      pinnedIds,
-      hiddenIds
-    });
-    await syncDbGroupHistoryFull({
-      profile,
-      api,
-      selfId,
-      targetGroupIds: /* @__PURE__ */ new Set([params.groupId]),
-      titleById: /* @__PURE__ */ new Map([[params.groupId, title]]),
-      summary,
-      progress: params.progress
-    });
-  }
-  if (params.mode === "chat") {
-    if (!params.threadId) {
-      throw new Error("Missing chat id for db sync chat.");
-    }
-    if (friendNames.size === 0) {
-      friendNames = await persistFriendDirectory(profile, api);
+    if (params.mode === "chat") {
+      if (!params.threadId) {
+        throw new Error("Missing chat id for db sync chat.");
+      }
+      if (friendNames.size === 0) {
+        friendNames = await persistFriendDirectory(profile, api);
+      }
+      await syncDbChatThread({
+        profile,
+        api,
+        selfId,
+        threadId: params.threadId,
+        count: params.count,
+        title: friendNames.get(params.threadId),
+        pinnedIds,
+        hiddenIds,
+        summary,
+        progress: params.progress
+      });
     }
-    await syncDbChatThread({
-      profile,
-      api,
-      selfId,
-      threadId: params.threadId,
-      count: params.count,
-      title: friendNames.get(params.threadId),
-      pinnedIds,
-      hiddenIds,
-      summary,
-      progress: params.progress
-    });
-  }
-  if (params.mode === "all" || params.mode === "chats") {
-    if (friendNames.size === 0) {
-      friendNames = await persistFriendDirectory(profile, api);
+    if (params.mode === "all" || params.mode === "chats") {
+      if (friendNames.size === 0) {
+        friendNames = await persistFriendDirectory(profile, api);
+      }
+      await syncDbChatsBestEffort({
+        profile,
+        api,
+        selfId,
+        count: params.count,
+        titleById: friendNames,
+        pinnedIds,
+        hiddenIds,
+        summary,
+        progress: params.progress
+      });
     }
-    await syncDbChatsBestEffort({
-      profile,
-      api,
-      selfId,
-      count: params.count,
-      titleById: friendNames,
-      pinnedIds,
-      hiddenIds,
-      summary,
-      progress: params.progress
-    });
+    params.progress?.(
+      `done: groups=${summary.groupsSynced}, groupMessages=${summary.groupMessagesImported}, friends=${summary.friendsSynced}, chats=${summary.chatsSynced}, dmMessages=${summary.dmMessagesImported}`
+    );
+    return summary;
+  } finally {
+    await closeDb(profile);
   }
-  params.progress?.(
-    `done: groups=${summary.groupsSynced}, groupMessages=${summary.groupMessagesImported}, friends=${summary.friendsSynced}, chats=${summary.chatsSynced}, dmMessages=${summary.dmMessagesImported}`
-  );
-  return summary;
 }
 async function buildGroupsDetailed(api) {
   const groups = await api.getAllGroups();

package/package.json

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