ec-web 0.0.20 → 0.0.22

package/dist/sources/gateway.js

@@ -10,9 +10,10 @@
  */
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
-async function getSnapshot() {
+import { watchMenuRequestAuth } from './types.js';
+async function getSnapshot(params = {}) {
     const sock = resolvePaths().socket;
-    const resp = await ipcQuery(sock, { type: 'menu.exec', payload: { type: 'menu.query', name: 'gateway', id: 'ecw-gateway-snap' }, auth: { source: 'ecweb', localDirect: true } }, 5000);
+    const resp = await ipcQuery(sock, { type: 'menu.exec', payload: { type: 'menu.query', name: 'gateway', id: 'ecw-gateway-snap' }, auth: watchMenuRequestAuth(params) }, 5000);
     if (!resp) {
         return { gateways: [], scopes: [], types: [], error: 'evolcore 未运行或 socket 不可达' };
     }
@@ -34,8 +35,8 @@ async function getSnapshot() {
 }
 export const gatewaySource = {
     kind: 'gateway',
-    async snapshot() {
-        return getSnapshot();
+    async snapshot(params = {}) {
+        return getSnapshot(params);
     },
     subscribe(_params, _push) {
         // 网关配置变更不频繁，无文件监听；前端通过操作后主动 re-subscribe 刷新。

package/dist/sources/monitor.js

@@ -14,6 +14,7 @@
 import fs from 'node:fs';
 import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc-client.js';
+import crypto from 'node:crypto';
 function processGroupKey(process) {
     return `${process.kind}\u0000${process.name}`;
 }
@@ -192,9 +193,9 @@ function sampleNetworkRate(ts) {
     previousNetworkSample = { ...totals, ts };
     return latestNetworkRate;
 }
-async function fetchSnapshot() {
+async function fetchSnapshot(leaseId) {
     const p = resolvePaths();
-    const resp = await ipcQuery(p.socket, { type: 'monitor-snapshot' }, 3000);
+    const resp = await ipcQuery(p.socket, { type: 'monitor-snapshot', ...(leaseId ? { leaseId } : {}) }, 3000);
     // resp === null → daemon 离线或 socket 不可达；resp.ok === false → 命令不受支持（旧 daemon）
     if (!resp?.ok) {
         return { daemonRunning: resp !== null, snapshot: null, history: { fine: [], mid: [], coarse: [] } };
@@ -237,8 +238,24 @@ async function fetchSnapshot() {
 }
 export const monitorSource = {
     kind: 'monitor',
-    async snapshot() {
-        return fetchSnapshot();
+    async activate(params) {
+        const leaseId = crypto.randomUUID();
+        const p = resolvePaths();
+        const response = await ipcQuery(p.socket, { type: 'monitor-subscribe', leaseId }, 3000);
+        if (!response?.ok)
+            throw new Error('daemon rejected monitor subscription');
+        params.__monitorLeaseId = leaseId;
+        let released = false;
+        return () => {
+            if (released)
+                return;
+            released = true;
+            delete params.__monitorLeaseId;
+            void ipcQuery(p.socket, { type: 'monitor-unsubscribe', leaseId }, 3000);
+        };
+    },
+    async snapshot(params) {
+        return fetchSnapshot(params?.__monitorLeaseId);
     },
     subscribe(_params, push) {
         let lastJson = '';
@@ -247,7 +264,7 @@ export const monitorSource = {
             if (stopped)
                 return;
             try {
-                const snap = await fetchSnapshot();
+                const snap = await fetchSnapshot(_params.__monitorLeaseId);
                 const json = JSON.stringify(snap);
                 if (json !== lastJson) {
                     lastJson = json;

package/dist/sources/msg.js

@@ -13,8 +13,6 @@ import { decodeDirSegment, isTransientProtocolMessage, readAllJsonlLines, readJs
 let contextModulesPromise = null;
 const sessionAdapterPromises = new Map();
 let peerDisplayResolverPromise = null;
-const aunGroupNameCache = new Map();
-const aunGroupNameRequests = new Map();
 let agentDisplayNamesCache = null;
 const messageFileCache = new Map();
 function getContextModules() {
@@ -67,94 +65,10 @@ export function resolveAunGroupName(names, groupId, fallback) {
     }
     return fallback;
 }
-async function fetchAunGroupNames(aid) {
-    const names = new Map();
-    let cursor = null;
-    let page = 0;
-    do {
-        page += 1;
-        const response = await ipcQuery(resolvePaths().socket, {
-            type: 'menu.exec',
-            payload: {
-                type: 'menu.query',
-                name: 'connect',
-                cmd: '/connect',
-                agent: aid,
-                id: `ecweb-msg-groups-${Date.now()}-${page}`,
-                args: { self: aid, view: 'groups', limit: 200, ...(cursor ? { cursor } : {}) },
-            },
-            auth: { source: 'ecweb', localDirect: true },
-        }, 10_000);
-        const data = response?.ok && !response.response?.error ? response.response?.data : null;
-        if (!data || !Array.isArray(data.items))
-            break;
-        for (const item of data.items) {
-            const groupId = String(item?.groupId || '').trim();
-            const displayName = String(item?.displayName || '').trim();
-            if (!groupId || !displayName)
-                continue;
-            for (const variant of aunGroupIdVariants(groupId))
-                names.set(variant, displayName);
-        }
-        cursor = typeof data.nextCursor === 'string' && data.nextCursor ? data.nextCursor : null;
-    } while (cursor && page < 20);
-    return names;
-}
-function getAunGroupNames(aid) {
-    const cached = aunGroupNameCache.get(aid);
-    if (cached && cached.expiresAt > Date.now())
-        return Promise.resolve(cached.names);
-    const pending = aunGroupNameRequests.get(aid);
-    if (pending)
-        return pending;
-    const request = fetchAunGroupNames(aid)
-        .then(names => {
-        aunGroupNameCache.set(aid, {
-            names,
-            expiresAt: Date.now() + (names.size ? 5 * 60_000 : 15_000),
-        });
-        return names;
-    })
-        .catch(() => new Map())
-        .finally(() => aunGroupNameRequests.delete(aid));
-    aunGroupNameRequests.set(aid, request);
-    return request;
-}
-async function hydrateAunGroupNames(chats, waitForRefresh = false) {
-    const aids = [...new Set(chats
-            .filter(chat => chat.channelType === 'aun' && chat.chatType === 'group')
-            .map(chat => chat.selfAID))];
-    if (!aids.length)
-        return;
-    const directories = new Map();
-    if (waitForRefresh) {
-        for (const [aid, names] of await Promise.all(aids.map(async (aid) => [aid, await getAunGroupNames(aid)]))) {
-            directories.set(aid, names);
-        }
-    }
-    else {
-        for (const aid of aids) {
-            const cached = aunGroupNameCache.get(aid);
-            if (cached)
-                directories.set(aid, cached.names);
-            if (!cached || cached.expiresAt <= Date.now())
-                void getAunGroupNames(aid);
-        }
-    }
-    for (const chat of chats) {
-        if (chat.channelType !== 'aun' || chat.chatType !== 'group')
-            continue;
-        const groupName = resolveAunGroupName(directories.get(chat.selfAID) || new Map(), chat.groupId, chat.groupName);
-        if (!groupName)
-            continue;
-        chat.groupName = groupName;
-        chat.peerName = groupName;
-    }
-}
 export function resolveSessionBindDisplayName(bind, resolver, aunGroupNames = new Map()) {
     const isGroup = bind.chatType === 'group' || !!bind.groupId;
     if (bind.channelType === 'aun' && isGroup) {
-        return resolveAunGroupName(aunGroupNames, bind.groupId || bind.channelId, bind.groupName || null);
+        return bind.groupName || bind.groupId || bind.channelId || null;
     }
     if (isGroup)
         return bind.groupName || null;
@@ -166,18 +80,14 @@ export function resolveSessionBindDisplayName(bind, resolver, aunGroupNames = ne
     }, bind.peerId || bind.channelId, bind.peerName);
 }
 /** 为会话页绑定标签补齐联系人名或 AUN 群名，不改变原始 channelId。 */
-export async function hydrateSessionBindDisplayNames(binds) {
+export async function hydrateSessionBindDisplayNames(binds, params = {}) {
+    void params;
     const items = [...binds];
     if (!items.length)
         return;
     const resolver = await getPeerDisplayResolver();
-    const groupAids = [...new Set(items
-            .filter(bind => bind.channelType === 'aun' && (bind.chatType === 'group' || !!bind.groupId))
-            .map(bind => bind.selfAID)
-            .filter(Boolean))];
-    const groupDirectories = new Map(await Promise.all(groupAids.map(async (aid) => [aid, await getAunGroupNames(aid)])));
     for (const bind of items) {
-        bind.displayName = resolveSessionBindDisplayName(bind, resolver, groupDirectories.get(bind.selfAID) || new Map());
+        bind.displayName = resolveSessionBindDisplayName(bind, resolver, new Map());
     }
 }
 function getSessionAdapter(baseagent) {
@@ -943,8 +853,6 @@ async function buildSnapshot(params) {
         : requestedScope;
     const peer = params.peer || null;
     const inScope = selectedChats(chats, scope);
-    if (scope)
-        await hydrateAunGroupNames(inScope);
     const peers = scope ? mergePeerInfo(inScope) : [];
     const requestedLimit = Number(params.limit);
     const limit = Number.isFinite(requestedLimit) ? Math.min(Math.max(Math.trunc(requestedLimit), 20), 200) : 100;