wowok 2.1.39 → 2.1.40

package/dist/esm/w/messenger/messenger-manager.d.ts

@@ -1,10 +1,3 @@
-/**
- * Messenger 管理器
- *
- * 支持最多20个账号同时收发消息
- * 自动从account模块筛选有m字段的账号
- * 自动初始化、注册并接收消息
- */
 import { Messenger } from "./messenger.js";
 import type { Message, MessageFilter, MessengerConfig, DecryptedMessage, SendMessageResult, ContactLists, ContactListsSyncResult, MessageListResult, ConversationInfo, WtsFileResult, ListOperationResponse, WtsRange, GetSettingsResponse, UpdateSettingsRequest } from "./types.js";
 interface AccountInfo {
@@ -35,19 +28,8 @@ export declare class MessengerManager {
     refresh_accounts(): Promise<void>;
     start(): Promise<void>;
     stop(): void;
-    /**
-     * 【核心方法】确保账号已初始化
-     * 如果未初始化，自动完成初始化
-     * 如果正在初始化，等待完成
-     */
     ensureAccountReady(address: string): Promise<AccountInfo>;
-    /**
-     * 初始化账号
-     */
     private initializeAccount;
-    /**
-     * 执行实际的初始化
-     */
     private doInitialize;
     private add_account_internal;
     private remove_account_internal;
@@ -97,13 +79,7 @@ export declare class MessengerManager {
     addToGuardList(account: string, guards: any[]): Promise<any>;
     removeFromGuardList(account: string, addresses: string[]): Promise<any>;
     getGuardList(account: string): Promise<any>;
-    /**
-     * 获取用户设置
-     */
     getSettings(account: string): Promise<GetSettingsResponse>;
-    /**
-     * 更新用户设置
-     */
     setSettings(account: string, settings: Partial<UpdateSettingsRequest>): Promise<boolean>;
 }
 export {};

package/dist/esm/w/messenger/messenger-manager.js

@@ -1,12 +1,3 @@
-// Copyright (c) Wowok.
-// SPDX-License-Identifier: Apache-2.0
-/**
- * Messenger 管理器
- *
- * 支持最多20个账号同时收发消息
- * 自动从account模块筛选有m字段的账号
- * 自动初始化、注册并接收消息
- */
 import { Messenger } from "./messenger.js";
 import { MessageStorage } from "./storage.js";
 import { MessengerPersistStorage } from "./storage.js";
@@ -16,7 +7,6 @@ import { canonicalizeJson } from "./utils.js";
 import { MAX_MESSENGER_ACCOUNTS } from "../local/account.js";
 import { GetAccountOrMark_Address } from "../local/index.js";
 const MAX_ACCOUNTS = MAX_MESSENGER_ACCOUNTS;
-// 辅助函数：延迟
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 export class MessengerManager {
     accounts = new Map();
@@ -62,7 +52,6 @@ export class MessengerManager {
                 }
                 catch (error) {
                     console.error(`Failed to add account ${addressLower} to messenger manager:`, error);
-                    // 继续处理下一个账号
                 }
             }
         }
@@ -114,19 +103,12 @@ export class MessengerManager {
         this.stopPolling();
         this.clear_accounts();
     }
-    /**
-     * 【核心方法】确保账号已初始化
-     * 如果未初始化，自动完成初始化
-     * 如果正在初始化，等待完成
-     */
     async ensureAccountReady(address) {
         const lowerAddress = address.toLowerCase();
-        // 1. 检查是否已在管理列表中且已初始化
         const existing = this.accounts.get(lowerAddress);
         if (existing?.initialized) {
             return existing;
         }
-        // 2. 如果正在初始化中，等待完成
         if (existing?.initializing) {
             await existing.initializing;
             const ready = this.accounts.get(lowerAddress);
@@ -135,23 +117,17 @@ export class MessengerManager {
             }
             throw new MessengerError(MessengerErrorCode.SERVER_ERROR, `Account ${address} initialization failed`);
         }
-        // 3. 需要初始化
         return this.initializeAccount(lowerAddress);
     }
-    /**
-     * 初始化账号
-     */
     async initializeAccount(address) {
         const lowerAddress = address.toLowerCase();
         if (this.accounts.size >= MAX_ACCOUNTS) {
             throw new MessengerError(MessengerErrorCode.INVALID_INPUT, `Maximum ${MAX_ACCOUNTS} accounts allowed`);
         }
-        // 创建初始化 Promise
         const initPromise = this.doInitialize(lowerAddress);
-        // 临时状态：正在初始化
         const tempState = {
             address: lowerAddress,
-            messenger: null, // 临时值
+            messenger: null,
             initialized: false,
             initializing: initPromise,
             contactLists: { friends: [], guards: [], lastUpdatedAt: 0 },
@@ -159,7 +135,6 @@ export class MessengerManager {
         this.accounts.set(lowerAddress, tempState);
         try {
             await initPromise;
-            // 获取最终状态
             const finalState = this.accounts.get(lowerAddress);
             if (!finalState || !finalState.initialized) {
                 throw new MessengerError(MessengerErrorCode.SERVER_ERROR, `Account ${address} initialization failed`);
@@ -167,14 +142,10 @@ export class MessengerManager {
             return finalState;
         }
         catch (error) {
-            // 初始化失败，移除临时状态
             this.accounts.delete(lowerAddress);
             throw error;
         }
     }
-    /**
-     * 执行实际的初始化
-     */
     async doInitialize(address) {
         const messenger = new Messenger(address, this.config);
         try {
@@ -183,21 +154,18 @@ export class MessengerManager {
         catch (error) {
             throw new MessengerError(MessengerErrorCode.SERVER_ERROR, `Failed to initialize account ${address}: ${error instanceof Error ? error.message : String(error)}`);
         }
-        // 添加延迟避免服务器限流（429 Too Many Requests）
         await sleep(1000);
         const contactLists = {
             friends: [],
             guards: [],
             lastUpdatedAt: 0,
         };
-        // 更新为完成状态
         this.accounts.set(address, {
             address,
             messenger,
             initialized: true,
             contactLists,
         });
-        // 如果正在运行，设置回调和轮询
         if (this.isWatching) {
             const hasLock = this.persistStorage.tryAcquirePollingLock(address, this.instanceId);
             if (hasLock) {
@@ -211,7 +179,6 @@ export class MessengerManager {
         }
     }
     async add_account_internal(address) {
-        // 【修改】使用 ensureAccountReady 统一处理
         await this.ensureAccountReady(address);
     }
     remove_account_internal(address) {
@@ -235,19 +202,16 @@ export class MessengerManager {
     }
     async send(from, to, content, options) {
         const { Account } = await import("../local/account.js");
-        // 【修改】检查账号是否存在且有 messenger
         const account = await Account.Instance().get(from, false);
         if (!account) {
             throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, `Account ${from} not found`);
         }
-        // 如果没有 messenger 名称，尝试自动设置
         if (account.m == null) {
             if (options?.new_messenger_name == null) {
                 throw new MessengerError(MessengerErrorCode.ACCOUNT_MESSENGER_NOT_ENABLED, `Account messenger name not set. Use new_messenger_name parameter to set it automatically.`);
             }
             await Account.Instance().set_messenger(from, options.new_messenger_name);
         }
-        // 【关键】确保账号已就绪（自动初始化）
         const accountInfo = await this.ensureAccountReady(from);
         if (options?.new_messenger_name != null) {
             const currentAccount = await Account.Instance().get(from, false);
@@ -264,19 +228,16 @@ export class MessengerManager {
     }
     async send_file(from, to, filePath, options) {
         const { Account } = await import("../local/account.js");
-        // 【修改】检查账号是否存在且有 messenger
         const account = await Account.Instance().get(from, false);
         if (!account) {
             throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, `Account ${from} not found`);
         }
-        // 如果没有 messenger 名称，尝试自动设置
         if (account.m == null) {
             if (options?.new_messenger_name == null) {
                 throw new MessengerError(MessengerErrorCode.ACCOUNT_MESSENGER_NOT_ENABLED, `Account messenger name not set. Use new_messenger_name parameter to set it automatically.`);
             }
             await Account.Instance().set_messenger(from, options.new_messenger_name);
         }
-        // 【关键】确保账号已就绪（自动初始化）
         const accountInfo = await this.ensureAccountReady(from);
         if (options?.new_messenger_name != null) {
             const currentAccount = await Account.Instance().get(from, false);
@@ -297,7 +258,6 @@ export class MessengerManager {
         let messages = [];
         if (filter?.account !== undefined) {
             const address = filter.account.toLowerCase();
-            // First, pull messages from server to ensure local storage is up to date
             const accountInfo = this.accounts.get(address);
             if (accountInfo?.messenger) {
                 await accountInfo.messenger.pullMessages();
@@ -307,7 +267,6 @@ export class MessengerManager {
         }
         else {
             for (const accountInfo of this.accounts.values()) {
-                // Pull messages for each account
                 if (accountInfo.messenger) {
                     await accountInfo.messenger.pullMessages();
                 }
@@ -525,7 +484,6 @@ export class MessengerManager {
                         }
                     }
                 }
-                // ========== 查看状态过滤 ==========
                 if (filter.viewed !== undefined) {
                     const isViewed = msg.viewedAt !== undefined;
                     if (filter.viewed !== isViewed)
@@ -738,7 +696,6 @@ export class MessengerManager {
             return acc;
         }, [])
             .sort((a, b) => {
-            // 先按 serverTimestamp 排序，再按 leafIndex 排序
             const timeDiff = a.serverTimestamp - b.serverTimestamp;
             if (timeDiff !== 0)
                 return timeDiff;
@@ -769,7 +726,6 @@ export class MessengerManager {
         if (messages.length === 0) {
             throw new MessengerError(MessengerErrorCode.INVALID_INPUT, "No messages found for the given criteria");
         }
-        // 【新增】检查leafIndex连续性
         const sortedLeafIndices = messages
             .map((m) => m.leafIndex)
             .filter((i) => i !== undefined)
@@ -796,33 +752,26 @@ export class MessengerManager {
             fs.mkdirSync(outputDir, { recursive: true });
         }
         const sessionId = `${myAddress.slice(0, 6)}_${peerAddress.slice(0, 6)}`;
-        // 【关键修复】按leafIndex连续性分组，且每组不超过 WTS_MAX_MESSAGE_COUNT
-        // 每个组的leafIndex必须是连续的，否则验证会失败
         const groups = [];
         let currentGroup = [];
         for (let i = 0; i < messages.length; i++) {
             const msg = messages[i];
             if (currentGroup.length === 0) {
-                // 开始新组
                 currentGroup.push(msg);
             }
             else {
                 const lastMsg = currentGroup[currentGroup.length - 1];
                 const expectedLeafIndex = lastMsg.leafIndex + 1;
-                // 检查是否超过最大消息数限制或leafIndex不连续
                 if (currentGroup.length >= WTS_MAX_MESSAGE_COUNT ||
                     msg.leafIndex !== expectedLeafIndex) {
-                    // 结束当前组并开始新组
                     groups.push(currentGroup);
                     currentGroup = [msg];
                 }
                 else {
-                    // leafIndex连续且未超过限制，加入当前组
                     currentGroup.push(msg);
                 }
             }
         }
-        // 添加最后一组
         if (currentGroup.length > 0) {
             groups.push(currentGroup);
         }
@@ -838,7 +787,6 @@ export class MessengerManager {
                 .filter((i) => i !== undefined);
             const startLeafIndex = Math.min(...leafIndices);
             const endLeafIndex = Math.max(...leafIndices);
-            // 为每个组计算独立的startTime和endTime
             const startTime = group[0].createdAt;
             const endTime = group[group.length - 1].createdAt;
             for (const msg of group) {
@@ -873,7 +821,6 @@ export class MessengerManager {
                     serverPublicKey: msg.serverPublicKey || "",
                     msgType: msg.msgType,
                 };
-                // 只添加非 undefined 的字段
                 if (!excludePlaintext && msg.plaintext !== undefined) {
                     messageObj.plaintext = msg.plaintext;
                 }
@@ -909,7 +856,6 @@ export class MessengerManager {
                 session: wtsSession,
                 messages: wtsMessages,
             };
-            // 计算 payload 的 hash
             const { sha256 } = await import("@noble/hashes/sha256");
             const { bytesToHex } = await import("@noble/hashes/utils");
             const canonicalPayload = canonicalizeJson(payload);
@@ -938,7 +884,6 @@ export class MessengerManager {
             fs.writeFileSync(filePath, JSON.stringify(wtsFile, null, 2));
             generatedFiles.push(filePath);
         }
-        // 计算所有组的总体时间范围
         const overallStartTime = messages[0]?.createdAt || 0;
         const overallEndTime = messages[messages.length - 1]?.createdAt || 0;
         return {
@@ -1041,9 +986,6 @@ export class MessengerManager {
         }
         return acc.messenger.getGuardList();
     }
-    /**
-     * 获取用户设置
-     */
     async getSettings(account) {
         const acc = this.findAccount(account);
         if (!acc) {
@@ -1051,9 +993,6 @@ export class MessengerManager {
         }
         return acc.messenger.getSettings();
     }
-    /**
-     * 更新用户设置
-     */
     async setSettings(account, settings) {
         const acc = this.findAccount(account);
         if (!acc) {
@@ -1062,4 +1001,3 @@ export class MessengerManager {
         return acc.messenger.setSettings(settings);
     }
 }
-//# sourceMappingURL=messenger-manager.js.map

package/dist/esm/w/messenger/messenger.d.ts

@@ -18,152 +18,38 @@ export declare class Messenger {
     private failedMessages;
     private waitingMessageRetries;
     constructor(userAddress: string, config?: Partial<MessengerConfig>);
-    /**
-     * 获取用户地址
-     * @returns 用户地址
-     */
     getUserAddress(): string;
-    /**
-     * 获取用户公钥
-     * @returns 公钥（带标志位）
-     */
     getPublicKey(): Promise<string>;
-    /**
-     * 验证Guard消息格式
-     * @param guardAddress Guard地址
-     * @param passportAddress Passport地址
-     * @returns 是否为有效的Guard消息
-     */
     isValidGuardMessage(guardAddress: string | null | undefined, passportAddress: string | null | undefined): boolean;
-    /**
-     * 生成签名参数
-     * 用于需要签名验证的 API 调用
-     */
     private generateSignatureParams;
-    /**
-     * 生成随机 nonce
-     */
     private generateNonce;
-    /**
-     * 初始化 Messenger
-     * 1. 确保本地身份
-     * 2. 注册设备到服务器
-     * 3. 上传预密钥
-     * 4. 检查预密钥状态（如低于阈值则补充）
-     * 5. 启动合并的polling timer
-     */
     initialize(): Promise<void>;
-    /**
-     * 检查并补充预密钥
-     *
-     * 逻辑：如果服务器预密钥未满，自动补充到最大容量
-     */
     private checkAndRefillPrekeys;
-    /**
-     * 启动合并的polling timer
-     */
     private startPollingTimer;
-    /**
-     * 停止polling timer
-     */
     private stopPollingTimer;
-    /**
-     * 安排下一次poll
-     */
     private scheduleNextPoll;
-    /**
-     * 获取下次poll的间隔时间
-     * 【优化】增加3秒快速模式（有待解密消息时）
-     */
     private getNextPollInterval;
-    /**
-     * 执行一次poll（拉取消息和检查prekey状态）
-     */
     private poll;
-    /**
-     * 触发快速poll（发送消息后调用）
-     */
     private triggerFastPoll;
-    /**
-     * 发送加密消息
-     *
-     * 流程：
-     * 1. 使用 Signal Protocol 加密消息
-     * 2. 发送到服务器
-     * 3. 接收服务器返回的 Merkle 证明数据
-     * 4. 本地存储消息
-     */
     sendMessage(recipientAddress: string, plaintext: string, options?: {
         guardAddress?: string;
         passportAddress?: string;
         force?: boolean;
     }): Promise<SendMessageResult>;
-    /**
-     * 拉取消息
-     *
-     * 流程：
-     * 1. 从服务器拉取消息
-     * 2. 解密消息（Signal Protocol）
-     * 3. 验证 Merkle 证明
-     * 4. 本地存储并确认消息
-     */
     pullMessages(limit?: number): Promise<{
         messages: DecryptedMessage[];
         prekey_status?: PreKeyStatus;
     }>;
-    /**
-     * 获取最后发送的消息序号
-     * @param peerAddress 对方地址
-     * @returns 最后发送的消息 leafIndex，如果没有发送过返回 -1
-     */
     private getLastSentLeafIndex;
-    /**
-     * 获取会话历史消息
-     */
     getSessionMessages(peerAddress: string): Message[];
-    /**
-     * 获取会话当前状态
-     */
     getSessionState(peerAddress: string): import("./types.js").SessionState;
-    /**
-     * 提交链上证明
-     *
-     * 使用 proof.ts 将 Merkle Root 提交到链上，获得时间证明
-     *
-     * @param env CallEnv 环境
-     * @param peerAddress 对方地址
-     * @param description 证明描述
-     */
     submitChainProof(env: CallEnv, peerAddress: string, description?: string): Promise<{
         proofAddress: string;
         txHash: string;
     }>;
-    /**
-     * 销毁 Messenger 实例
-     * 清理所有资源（定时器等）
-     */
     destroy(): void;
-    /**
-     * 断开连接（destroy 的别名）
-     * 用于清理资源
-     */
     disconnect(): void;
-    /**
-     * 设置新消息回调
-     * @param onMessage 新消息回调函数
-     */
     setOnMessageCallback(onMessage: (messages: DecryptedMessage[]) => void): void;
-    /**
-     * 发送 ZIP 压缩文件
-     *
-     * 支持发送本地或网络 WTS/WIP 文件，经过 ZIP 压缩后发送给对方
-     * 支持 Guard 验证，如果提供 guardAddress 和 passportAddress，消息将进入 Guard 验证流程
-     *
-     * @param recipientAddress 接收方地址
-     * @param source 文件源（本地路径或网络 URL）
-     * @param options 可选参数
-     * @returns 发送结果
-     */
     sendZipFile(recipientAddress: string, source: string, options?: {
         fileName?: string;
         contentType?: ZipContentType;
@@ -171,128 +57,36 @@ export declare class Messenger {
         passportAddress?: string;
         force?: boolean;
     }): Promise<SendMessageResult>;
-    /**
-     * 加载文件数据（支持本地路径和网络 URL）
-     */
     private loadFileData;
-    /**
-     * 检测内容类型
-     */
     private detectContentType;
-    /**
-     * 生成签名的请求
-     */
     private _createSignedRequest;
-    /**
-     * 验证地址列表
-     */
     private _validateAddresses;
-    /**
-     * 黑名单 - 添加地址
-     */
     addToBlacklist(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * 黑名单 - 移除地址
-     */
     removeFromBlacklist(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * 黑名单 - 清空
-     */
     clearBlacklist(): Promise<ListOperationResponse>;
-    /**
-     * 黑名单 - 获取列表
-     */
     getBlacklist(): Promise<string[]>;
-    /**
-     * 黑名单 - 检查存在
-     */
     existInBlacklist(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * 好友列表 - 添加地址
-     */
     addToFriendsList(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * 好友列表 - 移除地址
-     */
     removeFromFriendsList(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * 好友列表 - 清空
-     */
     clearFriendsList(): Promise<ListOperationResponse>;
-    /**
-     * 好友列表 - 获取列表
-     */
     getFriendsList(): Promise<string[]>;
-    /**
-     * 好友列表 - 检查存在
-     */
     existInFriendsList(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * Guard 列表 - 添加
-     */
     addToGuardList(guards: GuardListItem[]): Promise<ListOperationResponse>;
-    /**
-     * Guard 列表 - 移除
-     */
     removeFromGuardList(addresses: string[]): Promise<ListOperationResponse>;
-    /**
-     * Guard 列表 - 获取列表
-     */
     getGuardList(): Promise<ListOperationResponse>;
-    /**
-     * 获取用户设置
-     */
     getSettings(): Promise<GetSettingsResponse>;
-    /**
-     * 设置用户设置
-     */
     setSettings(settings: Partial<UpdateSettingsRequest>): Promise<boolean>;
-    /**
-     * 尝试解密单条消息
-     * @param serverMsg 服务器消息
-     * @returns 解密结果
-     */
     private tryDecryptMessage;
-    /**
-     * 判断错误是否可重试（Skip Keys 机制）
-     * @param errorMessage 错误信息
-     * @returns 是否可重试
-     */
     private isRetryableError;
-    /**
-     * 处理 waitingMessages 池中的消息
-     * @param decryptedMessages 解密成功的消息列表
-     * @param acknowledgedIds 已确认的消息ID列表
-     */
     private processWaitingMessages;
-    /**
-     * 保存解密失败的消息
-     * @param serverMsg 服务器消息
-     * @param error 错误信息
-     */
     private saveFailedMessage;
-    /**
-     * 重新调度轮询（用于切换到快速模式）
-     */
     private reschedulePolling;
-    /**
-     * 获取解密失败的消息（供用户决策重发）
-     * @returns 失败消息列表
-     */
     getFailedMessages(): Array<{
         messageId: string;
         from: string;
         error: string;
         leafIndex?: number;
     }>;
-    /**
-     * 清除解密失败的消息记录
-     * @param messageId 消息ID（可选，不提供则清除所有）
-     */
     clearFailedMessages(messageId?: string): void;
-    /**
-     * 获取等待解密的消息数量
-     * @returns 等待消息数量
-     */
     getWaitingMessageCount(): number;
 }