wowok 2.1.10 → 2.1.13

package/dist/cjs/w/messenger/messenger.js

@@ -1,1512 +1,1366 @@
 "use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var messenger_exports = {};
-__export(messenger_exports, {
-  Messenger: () => Messenger
+// Copyright (c) Wowok.
+// SPDX-License-Identifier: Apache-2.0
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
 });
-module.exports = __toCommonJS(messenger_exports);
-var import_crypto = require("crypto");
-var fs = __toESM(require("fs"));
-var path = __toESM(require("path"));
-var import_proof = require("../call/proof.js");
-var import_session = require("./session.js");
-var import_server = require("./server.js");
-var import_storage = require("./storage.js");
-var import_crypto2 = require("./crypto.js");
-var import_utils = require("./utils.js");
-var import_types = require("./types.js");
-var import_sui_types = require("../../utils/sui-types.js");
-var import_account = require("../local/account.js");
-if (typeof window === "undefined" && typeof EventSource === "undefined") {
-  try {
-    const eventsource = require("eventsource");
-    const EventSourcePolyfill = eventsource.EventSource || eventsource.default || eventsource;
-    globalThis.EventSource = EventSourcePolyfill;
-  } catch (error) {
-    console.warn(
-      "EventSource polyfill not found. SSE functionality will be disabled in Node.js environment."
-    );
-  }
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Messenger = void 0;
+/**
+ * Messenger 核心模块
+ *
+ * 提供完整的端到端加密消息功能：
+ * 1. 发送加密消息（集成 Merkle Tree 时序证明）
+ * 2. 接收并解密消息
+ * 3. 链上证明提交（使用 proof.ts）
+ * 4. 会话状态同步
+ *
+ * 三重信任模型：
+ * - 身份信任：wowok 账户 Ed25519 签名
+ * - 加密信任：Signal Protocol 双棘轮
+ * - 时序信任：Merkle Tree + 服务器签名 + 链上证明
+ */
+const crypto_1 = require("crypto");
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const proof_js_1 = require("../call/proof.js");
+const session_js_1 = require("./session.js");
+const server_js_1 = require("./server.js");
+const storage_js_1 = require("./storage.js");
+const crypto_js_1 = require("./crypto.js");
+const utils_js_1 = require("./utils.js");
+const types_js_1 = require("./types.js");
+const sui_types_js_1 = require("../../utils/sui-types.js");
+const account_js_1 = require("../local/account.js");
+const eventsource_1 = require("eventsource");
+// Polyfill EventSource for Node.js environment
+if (typeof window === "undefined" &&
+    typeof globalThis.EventSource === "undefined") {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    globalThis.EventSource = eventsource_1.EventSource;
+    console.log("[EventSource] Successfully polyfilled EventSource");
 }
 class Messenger {
-  constructor(userAddress, config) {
-    __publicField(this, "session");
-    __publicField(this, "serverClient");
-    __publicField(this, "config");
-    __publicField(this, "userAddress", null);
-    __publicField(this, "eventSource", null);
-    __publicField(this, "onMessageCallback", null);
-    __publicField(this, "prekeyCheckTimer", null);
-    __publicField(this, "messageStorage");
-    __publicField(this, "sessionStateStorage");
-    this.userAddress = userAddress;
-    this.config = { ...import_types.DEFAULT_MESSENGER_CONFIG, ...config };
-    this.session = new import_session.MessengerSession(userAddress, this.config);
-    this.serverClient = new import_server.MessengerServerClient(this.config);
-    this.messageStorage = new import_storage.MessageStorage(userAddress);
-    this.sessionStateStorage = new import_storage.SessionStateStorage(userAddress);
-  }
-  /**
-   * 获取用户地址
-   * @returns 用户地址
-   */
-  getUserAddress() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
-    }
-    return this.userAddress;
-  }
-  /**
-   * 获取用户公钥
-   * @returns 公钥（带标志位）
-   */
-  async getPublicKey() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    session;
+    serverClient;
+    config;
+    userAddress = null;
+    eventSource = null;
+    onMessageCallback = null;
+    prekeyCheckTimer = null;
+    messageStorage;
+    sessionStateStorage;
+    constructor(userAddress, config) {
+        this.userAddress = userAddress;
+        this.config = { ...types_js_1.DEFAULT_MESSENGER_CONFIG, ...config };
+        this.session = new session_js_1.MessengerSession(userAddress, this.config);
+        this.serverClient = new server_js_1.MessengerServerClient(this.config);
+        this.messageStorage = new storage_js_1.MessageStorage(userAddress);
+        this.sessionStateStorage = new storage_js_1.SessionStateStorage(userAddress);
     }
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    return account?.pubkey || "";
-  }
-  /**
-   * 验证Guard消息格式
-   * @param guardAddress Guard地址
-   * @param passportAddress Passport地址
-   * @returns 是否为有效的Guard消息
-   */
-  isValidGuardMessage(guardAddress, passportAddress) {
-    return Boolean(
-      guardAddress && passportAddress && (0, import_sui_types.isValidWowAddress)(guardAddress) && (0, import_sui_types.isValidWowAddress)(passportAddress)
-    );
-  }
-  /**
-   * 生成签名参数
-   * 用于需要签名验证的 API 调用
-   */
-  async generateSignatureParams(operation) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
-    }
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    if (!account?.secret) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        `Account not found or no secret key for ${this.userAddress}`
-      );
+    /**
+     * 获取用户地址
+     * @returns 用户地址
+     */
+    getUserAddress() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        return this.userAddress;
     }
-    const { Ed25519Keypair } = await import("../../keypairs/ed25519/index.js");
-    const keypair = Ed25519Keypair.fromSecretKey(account.secret);
-    const publicKey = keypair.getPublicKey();
-    const publicKeyWithFlag = publicKey.toWPublicKey();
-    const timestamp = Date.now();
-    const nonce = this.generateNonce();
-    const message = `${operation}:${publicKeyWithFlag}:${timestamp}:${nonce}`;
-    const signature = await keypair.sign(new TextEncoder().encode(message));
-    return {
-      signatureScheme: "ED25519",
-      signature: Buffer.from(signature).toString("base64"),
-      timestamp,
-      nonce
-    };
-  }
-  /**
-   * 生成随机 nonce
-   */
-  generateNonce() {
-    const array = new Uint8Array(16);
-    crypto.getRandomValues(array);
-    return Array.from(array, (b) => b.toString(16).padStart(2, "0")).join(
-      ""
-    );
-  }
-  /**
-   * 初始化 Messenger
-   * 1. 确保本地身份
-   * 2. 注册设备到服务器
-   * 3. 上传预密钥
-   * 4. 检查预密钥状态（如低于阈值则补充）
-   * 5. 启动定期预密钥检查
-   */
-  async initialize() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 获取用户公钥
+     * @returns 公钥（带标志位）
+     */
+    async getPublicKey() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        return account?.pubkey || "";
     }
-    await this.session.ensureIdentity(this.userAddress);
-    await this.session.registerDevice(this.userAddress);
-    await this.session.ensurePreKeys(this.userAddress);
-    await this.checkAndRefillPrekeys();
-    this.startPrekeyCheckTimer();
-  }
-  /**
-   * 检查并补充预密钥
-   *
-   * 逻辑：如果服务器预密钥未满，自动补充到最大容量
-   */
-  async checkAndRefillPrekeys() {
-    if (!this.userAddress) return;
-    await this.session.ensurePreKeys(this.userAddress, false);
-  }
-  /**
-   * 启动预密钥定期检查定时器
-   */
-  startPrekeyCheckTimer() {
-    if (this.prekeyCheckTimer) {
-      clearInterval(this.prekeyCheckTimer);
+    /**
+     * 验证Guard消息格式
+     * @param guardAddress Guard地址
+     * @param passportAddress Passport地址
+     * @returns 是否为有效的Guard消息
+     */
+    isValidGuardMessage(guardAddress, passportAddress) {
+        return Boolean(guardAddress &&
+            passportAddress &&
+            (0, sui_types_js_1.isValidWowAddress)(guardAddress) &&
+            (0, sui_types_js_1.isValidWowAddress)(passportAddress));
     }
-    const interval = this.config.prekeyCheckIntervalMs ?? 24 * 60 * 60 * 1e3;
-    this.prekeyCheckTimer = setInterval(() => {
-      this.checkAndRefillPrekeys();
-    }, interval);
-  }
-  /**
-   * 停止预密钥定期检查定时器
-   */
-  stopPrekeyCheckTimer() {
-    if (this.prekeyCheckTimer) {
-      clearInterval(this.prekeyCheckTimer);
-      this.prekeyCheckTimer = null;
+    /**
+     * 生成签名参数
+     * 用于需要签名验证的 API 调用
+     */
+    async generateSignatureParams(operation) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        if (!account?.secret) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, `Account not found or no secret key for ${this.userAddress}`);
+        }
+        const { Ed25519Keypair } = await import("../../keypairs/ed25519/index.js");
+        const keypair = Ed25519Keypair.fromSecretKey(account.secret);
+        const publicKey = keypair.getPublicKey();
+        const publicKeyWithFlag = publicKey.toWPublicKey();
+        const timestamp = Date.now(); //@ 使用ms时间戳
+        const nonce = this.generateNonce();
+        const message = `${operation}:${publicKeyWithFlag}:${timestamp}:${nonce}`;
+        const signature = await keypair.sign(new TextEncoder().encode(message));
+        return {
+            signatureScheme: "ED25519",
+            signature: Buffer.from(signature).toString("base64"),
+            timestamp,
+            nonce,
+        };
     }
-  }
-  /**
-   * 发送加密消息
-   *
-   * 流程：
-   * 1. 使用 Signal Protocol 加密消息
-   * 2. 发送到服务器
-   * 3. 接收服务器返回的 Merkle 证明数据
-   * 4. 本地存储消息
-   */
-  async sendMessage(recipientAddress, plaintext, options) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 生成随机 nonce
+     */
+    generateNonce() {
+        const array = new Uint8Array(16);
+        crypto.getRandomValues(array);
+        return Array.from(array, (b) => b.toString(16).padStart(2, "0")).join("");
     }
-    const createdAt = Date.now();
-    const timestamp = Date.now();
-    const nonce = this.generateNonce();
-    const plaintextBytes = new TextEncoder().encode(plaintext).length;
-    if (plaintextBytes > import_types.NORMAL_MESSAGE_BYTES_LIMIT) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.INVALID_INPUT,
-        `Message size (${plaintextBytes} bytes) exceeds maximum allowed size (${import_types.NORMAL_MESSAGE_BYTES_LIMIT} bytes). Consider using sendZipFile for large content.`
-      );
+    /**
+     * 初始化 Messenger
+     * 1. 确保本地身份
+     * 2. 注册设备到服务器
+     * 3. 上传预密钥
+     * 4. 检查预密钥状态（如低于阈值则补充）
+     * 5. 启动定期预密钥检查
+     */
+    async initialize() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        // 确保身份并注册设备
+        await this.session.ensureIdentity(this.userAddress);
+        await this.session.registerDevice(this.userAddress);
+        await this.session.ensurePreKeys(this.userAddress);
+        // 初始化时检查预密钥状态
+        await this.checkAndRefillPrekeys();
+        // 启动定期预密钥检查
+        this.startPrekeyCheckTimer();
     }
-    const lastReceivedLeafIndex = this.messageStorage.getLastReceivedLeafIndex(
-      this.userAddress,
-      recipientAddress
-    );
-    const encrypted = await this.session.encryptMessage(
-      this.userAddress,
-      recipientAddress,
-      plaintext
-    );
-    const ciphertext = Buffer.from(new Uint8Array(encrypted.body)).toString(
-      "base64"
-    );
-    const plaintextHash = (0, import_crypto2.hashPlaintext)(
-      plaintext,
-      createdAt,
-      options?.guardAddress,
-      options?.passportAddress,
-      lastReceivedLeafIndex
-    );
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    if (!account) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User account not found"
-      );
+    /**
+     * 检查并补充预密钥
+     *
+     * 逻辑：如果服务器预密钥未满，自动补充到最大容量
+     */
+    async checkAndRefillPrekeys() {
+        if (!this.userAddress)
+            return;
+        // 直接调用 ensurePreKeys，它会查询服务器状态并按需补充
+        await this.session.ensurePreKeys(this.userAddress, false);
     }
-    const publicKey = account.pubkey;
-    const guardAddr = options?.guardAddress || "";
-    const passportAddr = options?.passportAddress || "";
-    const lastReceivedStr = lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex.toString() : "";
-    const forceStr = options?.force ? "true" : "false";
-    const signMessage = `send_message:${this.userAddress}:${recipientAddress}:${guardAddr}:${passportAddr}:${plaintextHash}:${lastReceivedStr}:${publicKey}:${timestamp}:${nonce}:${forceStr}`;
-    const signResult = await import_account.Account.Instance().signData(
-      this.userAddress,
-      signMessage
-    );
-    const signatureBuffer = Buffer.from(
-      signResult.signature.slice(2),
-      "hex"
-    );
-    const signatureBase64 = (0, import_crypto2.bytesToBase64)(new Uint8Array(signatureBuffer));
-    const response = await this.serverClient.sendMessage({
-      sender: signResult.publicKey,
-      recipient: recipientAddress,
-      ciphertext,
-      plaintextHash,
-      clientTimestamp: createdAt,
-      msgType: encrypted.type,
-      signatureScheme: "ED25519",
-      signature: signatureBase64,
-      timestamp,
-      nonce,
-      guardAddress: options?.guardAddress,
-      passportAddress: options?.passportAddress,
-      force: options?.force,
-      // 【修复】只有当 lastReceivedLeafIndex >= 0 时才发送，否则发送 undefined
-      lastReceivedLeafIndex: lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex : void 0
-    });
-    const message = {
-      messageId: response.messageId,
-      fromAddress: this.userAddress,
-      toAddress: recipientAddress,
-      plaintextHash,
-      plaintext,
-      guardAddress: options?.guardAddress,
-      passportAddress: options?.passportAddress,
-      lastReceivedLeafIndex,
-      // 【新增】保存消息确认字段
-      direction: import_types.MessageDirection.SENT,
-      status: response.status === "confirmed" ? import_types.MessageStatus.CONFIRMED : import_types.MessageStatus.PENDING,
-      msgType: encrypted.type,
-      createdAt
-    };
-    if (response.merkleData) {
-      message.leafIndex = response.merkleData.leafIndex;
-      message.prevRoot = response.merkleData.prevRoot;
-      message.newRoot = response.merkleData.newRoot;
-      message.serverSignature = response.merkleData.serverSignature;
-      message.serverTimestamp = response.merkleData.serverTimestamp;
-      message.serverPublicKey = response.merkleData.serverPublicKey;
-      this.sessionStateStorage.updateSessionState(
-        this.userAddress,
-        recipientAddress,
-        {
-          currentRoot: response.merkleData.newRoot,
-          prevRoot: response.merkleData.prevRoot,
-          lastLeafIndex: response.merkleData.leafIndex,
-          lastSyncAt: Date.now()
+    /**
+     * 启动预密钥定期检查定时器
+     */
+    startPrekeyCheckTimer() {
+        if (this.prekeyCheckTimer) {
+            clearInterval(this.prekeyCheckTimer);
         }
-      );
+        const interval = this.config.prekeyCheckIntervalMs ?? 24 * 60 * 60 * 1000; // 默认1天
+        this.prekeyCheckTimer = setInterval(() => {
+            this.checkAndRefillPrekeys();
+        }, interval);
+        //console.log(`Prekey check timer started (interval: ${interval}ms)`);
     }
-    this.messageStorage.saveMessage(message);
-    if (response.pendingMerkleData) {
-      for (const [msgId, merkleData] of Object.entries(
-        response.pendingMerkleData
-      )) {
-        const existingMsg = this.messageStorage.getMessage(msgId);
-        if (existingMsg && existingMsg.status === import_types.MessageStatus.PENDING) {
-          this.messageStorage.updateMessageStatus(
-            msgId,
-            import_types.MessageStatus.CONFIRMED,
-            {
-              leafIndex: merkleData.leafIndex,
-              newRoot: merkleData.newRoot,
-              serverSignature: merkleData.serverSignature,
-              serverTimestamp: merkleData.serverTimestamp,
-              serverPublicKey: merkleData.serverPublicKey
-            }
-          );
+    /**
+     * 停止预密钥定期检查定时器
+     */
+    stopPrekeyCheckTimer() {
+        if (this.prekeyCheckTimer) {
+            clearInterval(this.prekeyCheckTimer);
+            this.prekeyCheckTimer = null;
+            //console.log("Prekey check timer stopped");
         }
-      }
-    }
-    return {
-      messageId: response.messageId,
-      status: message.status,
-      merkleData: response.merkleData,
-      guardList: response.guard_list
-    };
-  }
-  /**
-   * 拉取消息
-   *
-   * 流程：
-   * 1. 从服务器拉取消息
-   * 2. 解密消息（Signal Protocol）
-   * 3. 验证 Merkle 证明
-   * 4. 本地存储并确认消息
-   */
-  async pullMessages(limit) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
     }
-    const timestamp = Date.now();
-    const nonce = this.generateNonce();
-    const message = `fetch_messages:${this.userAddress}:${limit || 100}:${timestamp}:${nonce}`;
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    const publicKey = account?.pubkey || "";
-    const signResult = await import_account.Account.Instance().signData(
-      this.userAddress,
-      message
-    );
-    const signature = Buffer.from(signResult.signature.slice(2), "hex");
-    const signatureParams = {
-      signatureScheme: "ED25519",
-      signature: (0, import_crypto2.bytesToBase64)(signature),
-      timestamp,
-      nonce
-    };
-    const response = await this.serverClient.pullMessages(
-      this.userAddress,
-      publicKey,
-      signatureParams,
-      limit
-    );
-    if (response.messages.length === 0) {
-      return [];
-    }
-    const decryptedMessages = [];
-    const acknowledgedIds = [];
-    for (const serverMsg of response.messages) {
-      try {
-        const existingMessage = this.messageStorage.getMessage(
-          serverMsg.id
-        );
-        if (existingMessage) {
-          acknowledgedIds.push(serverMsg.id);
-          continue;
-        }
-        const ciphertext = Uint8Array.from(
-          Buffer.from(serverMsg.bodyB64, "base64")
-        );
-        const decryptedData = await this.session.decryptMessage(
-          this.userAddress,
-          serverMsg.from,
-          ciphertext.buffer,
-          serverMsg.msgType
-        );
-        const plaintext = decryptedData;
-        const senderLastReceivedIndex = serverMsg.lastReceivedLeafIndex ?? -1;
-        if (senderLastReceivedIndex >= 0) {
-          const myLastSent = this.getLastSentLeafIndex(
-            serverMsg.from
-          );
-          if (senderLastReceivedIndex < myLastSent) {
-          }
+    /**
+     * 发送加密消息
+     *
+     * 流程：
+     * 1. 使用 Signal Protocol 加密消息
+     * 2. 发送到服务器
+     * 3. 接收服务器返回的 Merkle 证明数据
+     * 4. 本地存储消息
+     */
+    async sendMessage(recipientAddress, plaintext, options) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
-        if (!serverMsg.clientTimestamp) {
-          throw new Error(
-            `Missing clientTimestamp for message ${serverMsg.id}`
-          );
+        const createdAt = Date.now();
+        const timestamp = Date.now();
+        const nonce = this.generateNonce();
+        // 检查普通消息大小限制（10KB）
+        const plaintextBytes = new TextEncoder().encode(plaintext).length;
+        if (plaintextBytes > types_js_1.NORMAL_MESSAGE_BYTES_LIMIT) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.INVALID_INPUT, `Message size (${plaintextBytes} bytes) exceeds maximum allowed size (${types_js_1.NORMAL_MESSAGE_BYTES_LIMIT} bytes). Consider using sendZipFile for large content.`);
         }
-        if (!serverMsg.plaintextHash) {
-          throw new Error(
-            `Missing plaintextHash for message ${serverMsg.id}`
-          );
+        // 【新增】获取最后收到的消息序号（用于消息确认）
+        const lastReceivedLeafIndex = this.messageStorage.getLastReceivedLeafIndex(this.userAddress, recipientAddress);
+        // 1. 加密消息（明文就是原始消息内容）
+        const encrypted = await this.session.encryptMessage(this.userAddress, recipientAddress, plaintext);
+        const ciphertext = Buffer.from(new Uint8Array(encrypted.body)).toString("base64");
+        // 2. 计算明文哈希（用于 Merkle Tree 证明）
+        // 【更新】包含 lastReceivedLeafIndex 在哈希计算中
+        const plaintextHash = (0, crypto_js_1.hashPlaintext)(plaintext, createdAt, options?.guardAddress, options?.passportAddress, lastReceivedLeafIndex);
+        // 3. 签名消息
+        // 注意: guard_address 和 passport_address 始终包含在签名中（可能为空字符串），防止参数篡改
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        if (!account) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User account not found");
         }
-        if (serverMsg.merkleMetadata) {
-          if (!serverMsg.merkleMetadata.prevRoot) {
-            throw new Error(
-              `Message ${serverMsg.id} missing prevRoot in merkleMetadata`
-            );
-          }
-          if (!serverMsg.merkleMetadata.newRoot) {
-            throw new Error(
-              `Message ${serverMsg.id} missing newRoot in merkleMetadata`
-            );
-          }
-        }
-        const verificationResult = (0, import_crypto2.verifyMessage)({
-          messageId: serverMsg.id,
-          plaintext,
-          plaintextHash: serverMsg.plaintextHash,
-          createdAt: serverMsg.clientTimestamp,
-          guardAddress: serverMsg.guardAddress,
-          passportAddress: serverMsg.passportAddress,
-          lastReceivedLeafIndex: serverMsg.lastReceivedLeafIndex,
-          // 【新增】传入消息确认字段
-          serverSignature: serverMsg.merkleMetadata?.serverSignature,
-          serverPublicKey: serverMsg.merkleMetadata?.serverPublicKey,
-          merkleMetadata: serverMsg.merkleMetadata ? {
-            prevRoot: serverMsg.merkleMetadata.prevRoot,
-            newRoot: serverMsg.merkleMetadata.newRoot,
-            serverTimestamp: serverMsg.merkleMetadata.serverTimestamp,
-            leafIndex: serverMsg.merkleMetadata.leafIndex,
-            proofSiblings: serverMsg.merkleMetadata.proofSiblings,
-            proofIndices: serverMsg.merkleMetadata.proofIndices
-          } : void 0
+        const publicKey = account.pubkey;
+        const guardAddr = options?.guardAddress || "";
+        const passportAddr = options?.passportAddress || "";
+        // 统一发送模式（合并 send 和 send_force）
+        // 统一签名格式: send_message:{sender}:{recipient}:{guard_address}:{passport_address}:{plaintext_hash}:{last_received_leaf_index}:{public_key}:{timestamp}:{nonce}:{force}
+        const lastReceivedStr = lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex.toString() : "";
+        const forceStr = options?.force ? "true" : "false";
+        const signMessage = `send_message:${this.userAddress}:${recipientAddress}:${guardAddr}:${passportAddr}:${plaintextHash}:${lastReceivedStr}:${publicKey}:${timestamp}:${nonce}:${forceStr}`;
+        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, signMessage);
+        const signatureBuffer = Buffer.from(signResult.signature.slice(2), "hex");
+        const signatureBase64 = (0, crypto_js_1.bytesToBase64)(new Uint8Array(signatureBuffer));
+        // 使用统一的 sendMessage API
+        const response = await this.serverClient.sendMessage({
+            sender: signResult.publicKey,
+            recipient: recipientAddress,
+            ciphertext,
+            plaintextHash,
+            clientTimestamp: createdAt,
+            msgType: encrypted.type,
+            signatureScheme: "ED25519",
+            signature: signatureBase64,
+            timestamp,
+            nonce,
+            guardAddress: options?.guardAddress,
+            passportAddress: options?.passportAddress,
+            force: options?.force,
+            // 【修复】只有当 lastReceivedLeafIndex >= 0 时才发送，否则发送 undefined
+            lastReceivedLeafIndex: lastReceivedLeafIndex >= 0
+                ? lastReceivedLeafIndex
+                : undefined,
         });
-        if (!verificationResult.valid) {
-          throw new Error(verificationResult.error);
-        }
-        const message2 = {
-          messageId: serverMsg.id,
-          fromAddress: serverMsg.from,
-          toAddress: this.userAddress,
-          plaintextHash: serverMsg.plaintextHash,
-          plaintext,
-          guardAddress: serverMsg.guardAddress,
-          passportAddress: serverMsg.passportAddress,
-          lastReceivedLeafIndex: serverMsg.lastReceivedLeafIndex,
-          // 【新增】保存消息确认字段
-          direction: import_types.MessageDirection.RECEIVED,
-          status: import_types.MessageStatus.CONFIRMED,
-          msgType: serverMsg.msgType,
-          leafIndex: serverMsg.merkleMetadata?.leafIndex,
-          prevRoot: serverMsg.merkleMetadata?.prevRoot,
-          newRoot: serverMsg.merkleMetadata?.newRoot,
-          serverSignature: serverMsg.merkleMetadata?.serverSignature,
-          serverTimestamp: serverMsg.merkleMetadata?.serverTimestamp,
-          serverPublicKey: serverMsg.merkleMetadata?.serverPublicKey,
-          createdAt: serverMsg.clientTimestamp,
-          // 保存 ZIP 元数据（如果是 ZIP 消息）
-          zipMetadata: serverMsg.zipMetadata
+        // 4. 保存到本地存储
+        const message = {
+            messageId: response.messageId,
+            fromAddress: this.userAddress,
+            toAddress: recipientAddress,
+            plaintextHash,
+            plaintext,
+            guardAddress: options?.guardAddress,
+            passportAddress: options?.passportAddress,
+            lastReceivedLeafIndex, // 【新增】保存消息确认字段
+            direction: types_js_1.MessageDirection.SENT,
+            status: response.status === "confirmed"
+                ? types_js_1.MessageStatus.CONFIRMED
+                : types_js_1.MessageStatus.PENDING,
+            msgType: encrypted.type,
+            createdAt,
         };
-        this.messageStorage.saveMessage(message2);
-        if (serverMsg.merkleMetadata) {
-          this.sessionStateStorage.updateSessionState(
-            this.userAddress,
-            serverMsg.from,
-            {
-              currentRoot: serverMsg.merkleMetadata.newRoot,
-              prevRoot: serverMsg.merkleMetadata.prevRoot,
-              lastLeafIndex: serverMsg.merkleMetadata.leafIndex,
-              lastSyncAt: Date.now()
+        if (response.merkleData) {
+            message.leafIndex = response.merkleData.leafIndex;
+            message.prevRoot = response.merkleData.prevRoot;
+            message.newRoot = response.merkleData.newRoot;
+            message.serverSignature = response.merkleData.serverSignature;
+            message.serverTimestamp = response.merkleData.serverTimestamp;
+            message.serverPublicKey = response.merkleData.serverPublicKey;
+            // 更新会话状态
+            this.sessionStateStorage.updateSessionState(this.userAddress, recipientAddress, {
+                currentRoot: response.merkleData.newRoot,
+                prevRoot: response.merkleData.prevRoot,
+                lastLeafIndex: response.merkleData.leafIndex,
+                lastSyncAt: Date.now(),
+            });
+        }
+        this.messageStorage.saveMessage(message);
+        // 方案B：处理服务器返回的其他已验证消息的 Merkle 数据
+        // 这些消息可能之前因为发送方离线而没有收到 Merkle 数据
+        if (response.pendingMerkleData) {
+            for (const [msgId, merkleData] of Object.entries(response.pendingMerkleData)) {
+                // 检查本地是否已有该消息
+                const existingMsg = this.messageStorage.getMessage(msgId);
+                if (existingMsg &&
+                    existingMsg.status === types_js_1.MessageStatus.PENDING) {
+                    // 更新消息的 Merkle 数据
+                    this.messageStorage.updateMessageStatus(msgId, types_js_1.MessageStatus.CONFIRMED, {
+                        leafIndex: merkleData.leafIndex,
+                        newRoot: merkleData.newRoot,
+                        serverSignature: merkleData.serverSignature,
+                        serverTimestamp: merkleData.serverTimestamp,
+                        serverPublicKey: merkleData.serverPublicKey,
+                    });
+                    /*console.log(
+                        `Updated pending message ${msgId} with merkle data from pendingMerkleData`,
+                    );*/
+                }
             }
-          );
         }
-        const timestamp2 = serverMsg.merkleMetadata?.serverTimestamp || serverMsg.clientTimestamp || Date.now();
-        decryptedMessages.push({
-          id: serverMsg.id,
-          from: serverMsg.from,
-          plaintext,
-          // 【更新】明文直接是消息内容
-          timestamp: timestamp2,
-          merkleVerified: !!serverMsg.merkleMetadata,
-          merkleData: serverMsg.merkleMetadata ? {
-            leafIndex: serverMsg.merkleMetadata.leafIndex,
-            rootHash: serverMsg.merkleMetadata.newRoot
-          } : void 0
-        });
-        acknowledgedIds.push(serverMsg.id);
-      } catch (error) {
-        throw new Error(
-          `Failed to decrypt message ${serverMsg.id}: ${error instanceof Error ? error.message : String(error)}`
-        );
-      }
+        return {
+            messageId: response.messageId,
+            status: message.status,
+            merkleData: response.merkleData,
+            guardList: response.guard_list,
+        };
     }
-    if (acknowledgedIds.length > 0 && this.userAddress) {
-      const ackTimestamp = Date.now();
-      const ackNonce = this.generateNonce();
-      const account2 = await import_account.Account.Instance().get(
-        this.userAddress,
-        false
-      );
-      if (account2?.pubkey) {
-        const ackMessage = `ack_messages:${this.userAddress}:${acknowledgedIds.join(",")}:${account2.pubkey}:${ackTimestamp}:${ackNonce}`;
-        const signResult2 = await import_account.Account.Instance().signData(
-          this.userAddress,
-          ackMessage
-        );
-        const signatureBuffer = Buffer.from(
-          signResult2.signature.slice(2),
-          "hex"
-        );
-        const signatureBase64 = (0, import_crypto2.bytesToBase64)(
-          new Uint8Array(signatureBuffer)
-        );
-        await this.serverClient.acknowledgeMessages(
-          acknowledgedIds,
-          signResult2.publicKey,
-          {
-            publicKey: signResult2.publicKey,
+    /**
+     * 拉取消息
+     *
+     * 流程：
+     * 1. 从服务器拉取消息
+     * 2. 解密消息（Signal Protocol）
+     * 3. 验证 Merkle 证明
+     * 4. 本地存储并确认消息
+     */
+    async pullMessages(limit) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        // 1. 生成签名参数
+        // 签名格式: fetch_messages:{address}:{limit}:{timestamp}:{nonce}
+        const timestamp = Date.now(); //@ 使用ms时间戳
+        const nonce = this.generateNonce();
+        const message = `fetch_messages:${this.userAddress}:${limit || 100}:${timestamp}:${nonce}`;
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const publicKey = account?.pubkey || "";
+        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, message);
+        const signature = Buffer.from(signResult.signature.slice(2), "hex");
+        const signatureParams = {
             signatureScheme: "ED25519",
-            signature: signatureBase64,
-            timestamp: ackTimestamp,
-            nonce: ackNonce
-          }
-        );
-      }
-    }
-    await this.session.ensurePreKeys(this.userAddress);
-    return decryptedMessages;
-  }
-  /**
-   * 获取最后发送的消息序号
-   * @param peerAddress 对方地址
-   * @returns 最后发送的消息 leafIndex，如果没有发送过返回 -1
-   */
-  getLastSentLeafIndex(peerAddress) {
-    if (!this.userAddress) return -1;
-    const messages = this.messageStorage.getMessagesBySession(
-      this.userAddress,
-      peerAddress
-    );
-    const sentMessages = messages.filter(
-      (m) => m.direction === import_types.MessageDirection.SENT && m.leafIndex !== void 0
-    );
-    if (sentMessages.length === 0) return -1;
-    return Math.max(...sentMessages.map((m) => m.leafIndex));
-  }
-  /**
-   * 获取会话历史消息
-   */
-  getSessionMessages(peerAddress) {
-    if (!this.userAddress) {
-      return [];
-    }
-    return this.messageStorage.getMessagesBySession(
-      this.userAddress,
-      peerAddress
-    );
-  }
-  /**
-   * 获取会话当前状态
-   */
-  getSessionState(peerAddress) {
-    if (!this.userAddress) {
-      return void 0;
-    }
-    return this.sessionStateStorage.getSessionState(
-      this.userAddress,
-      peerAddress
-    );
-  }
-  /**
-   * 提交链上证明
-   *
-   * 使用 proof.ts 将 Merkle Root 提交到链上，获得时间证明
-   *
-   * @param env CallEnv 环境
-   * @param peerAddress 对方地址
-   * @param description 证明描述
-   */
-  async submitChainProof(env, peerAddress, description) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
-    }
-    const sessionState = this.sessionStateStorage.getSessionState(
-      this.userAddress,
-      peerAddress
-    );
-    if (!sessionState || !sessionState.currentRoot) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.SESSION_NOT_ESTABLISHED,
-        "No session state found"
-      );
-    }
-    const messages = this.messageStorage.getMessagesBySession(
-      this.userAddress,
-      peerAddress
-    );
-    const lastMessage = messages[messages.length - 1];
-    if (!lastMessage || !lastMessage.serverPublicKey || !lastMessage.serverSignature) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.INVALID_PROOF,
-        "No temporal proof (missing server public key or signature), cannot submit Proof to WoWok blockchain"
-      );
-    }
-    const serverPubKey = lastMessage.serverPublicKey;
-    const serverSignature = lastMessage.serverSignature;
-    const proofData = {
-      sessionId: sessionState.sessionId,
-      merkleRoot: sessionState.currentRoot,
-      messageCount: sessionState.messageCount,
-      timestamp: Date.now()
-    };
-    const callProof = new import_proof.CallProof({
-      proof: JSON.stringify(proofData),
-      server_pubkey: serverPubKey,
-      server_signature: serverSignature,
-      proof_type: import_types.CHAIN_PROOF_TYPE,
-      // 1 = Messenger Session Proof
-      description: description || `Messenger session proof for ${this.userAddress} <-> ${peerAddress}`,
-      item_count: sessionState.messageCount,
-      about_address: sessionState.sessionId
-    });
-    const result = await callProof.call(env);
-    const responseData = result?.objectChanges;
-    const proofAddress = responseData?.find(
-      (change) => change.objectType?.includes("Proof")
-    )?.objectId;
-    return {
-      proofAddress: proofAddress || "",
-      txHash: result?.digest || ""
-    };
-  }
-  /**
-   * 建立 SSE 连接并监听服务器事件
-   *
-   * 安全要求：必须提供签名验证，防止未授权监听他人事件
-   * @param onMessage 新消息回调
-   * @param signatureParams 签名参数（可选，不提供时自动生成）
-   */
-  async connectEventSource(onMessage, signatureParams) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
-    }
-    this.disconnectEventSource();
-    if (onMessage) {
-      this.onMessageCallback = onMessage;
-    }
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    const publicKey = account?.pubkey || "";
-    let params = signatureParams;
-    if (!params) {
-      const timestamp = Date.now();
-      const nonce = this.generateNonce();
-      const message = `event_stream:${this.userAddress}:${timestamp}:${nonce}`;
-      const signResult = await import_account.Account.Instance().signData(
-        this.userAddress,
-        message
-      );
-      const signatureBuffer = Buffer.from(
-        signResult.signature.slice(2),
-        "hex"
-      );
-      const signatureBase64 = (0, import_crypto2.bytesToBase64)(
-        new Uint8Array(signatureBuffer)
-      );
-      params = {
-        signatureScheme: "ED25519",
-        signature: signatureBase64,
-        timestamp,
-        nonce
-      };
-    }
-    const queryParams = new URLSearchParams({
-      publicKey,
-      signatureScheme: params.signatureScheme,
-      signature: params.signature,
-      timestamp: params.timestamp.toString(),
-      nonce: params.nonce
-    });
-    const url = `${this.config.serverUrl}/v1/events/${this.userAddress}?${queryParams}`;
-    if (typeof EventSource === "undefined") {
-      throw new ReferenceError("EventSource is not defined");
-    }
-    this.eventSource = new EventSource(url);
-    this.eventSource.onmessage = async (event) => {
-      try {
-        const sseEvent = JSON.parse(event.data);
-        switch (sseEvent.type) {
-          case "NewMessage":
-            if (this.onMessageCallback) {
-              const messages = await this.pullMessages();
-              if (messages.length > 0) {
-                this.onMessageCallback(messages);
-              }
-            }
-            break;
-          case "ark_confirmed": {
-            const {
-              message_ids,
-              recipient,
-              recipient_public_key,
-              signature,
-              timestamp
-            } = sseEvent.data;
-            const verifyMessage2 = `ack_messages:${recipient}:${message_ids.join(",")}:${recipient_public_key}:${timestamp}`;
+            signature: (0, crypto_js_1.bytesToBase64)(signature),
+            timestamp,
+            nonce,
+        };
+        // 2. 拉取消息（带签名验证）
+        const response = await this.serverClient.pullMessages(this.userAddress, publicKey, signatureParams, limit);
+        /*console.log(`[Messenger] 服务器返回 ${response.messages.length} 条消息`);
+        if (response.messages.length > 0) {
+            console.log(`[Messenger] 消息 IDs: ${response.messages.map(m => m.id).join(', ')}`);
+        }*/
+        if (response.messages.length === 0) {
+            return [];
+        }
+        const decryptedMessages = [];
+        const acknowledgedIds = [];
+        for (const serverMsg of response.messages) {
             try {
-              const { Ed25519PublicKey } = await import("../../keypairs/ed25519/publickey.js");
-              const publicKey2 = new Ed25519PublicKey(
-                recipient_public_key
-              );
-              const signatureBytes = Uint8Array.from(
-                Buffer.from(signature, "base64")
-              );
-              const isValid = await publicKey2.verify(
-                new TextEncoder().encode(verifyMessage2),
-                signatureBytes
-              );
-              if (isValid) {
-                for (const msgId of message_ids) {
-                  const existingMsg = this.messageStorage.getMessage(msgId);
-                  if (existingMsg) {
-                    existingMsg.arkConfirmed = {
-                      recipient,
-                      recipientPublicKey: recipient_public_key,
-                      signature,
-                      timestamp
-                    };
-                    this.messageStorage.saveMessage(
-                      existingMsg
-                    );
-                  }
+                //console.log(`[Messenger] 处理消息 ${serverMsg.id}, from=${serverMsg.from}, msgType=${serverMsg.msgType}`);
+                // 检查消息是否已经在本地存储
+                // 注意：由于每个用户有自己的数据库文件，消息 ID 不会冲突
+                const existingMessage = this.messageStorage.getMessage(serverMsg.id);
+                if (existingMessage) {
+                    // 消息已存在，直接确认
+                    //console.log(`[Messenger] 消息 ${serverMsg.id} 已存在于本地存储，跳过`);
+                    acknowledgedIds.push(serverMsg.id);
+                    continue;
                 }
-              } else {
-                console.error(
-                  "ARK signature verification failed - possible server tampering"
-                );
-              }
-            } catch (error) {
-              console.error(
-                "Failed to verify ARK signature:",
-                error
-              );
-            }
-            break;
-          }
-          case "PreKeyLow":
-            await this.checkAndRefillPrekeys();
-            break;
-          case "Custom":
-            break;
-          case "guard_confirmed": {
-            const {
-              message_id,
-              merkle_data,
-              timestamp: _timestamp
-            } = sseEvent.data;
-            const existingMsg = this.messageStorage.getMessage(message_id);
-            if (!existingMsg) {
-              console.warn(
-                `Guard confirmed event received but message ${message_id} not found in local storage`
-              );
-              break;
-            }
-            if (!merkle_data.prevRoot) {
-              console.error(
-                `Guard message ${message_id} missing prevRoot in merkle_data`
-              );
-              break;
-            }
-            if (!merkle_data.newRoot) {
-              console.error(
-                `Guard message ${message_id} missing newRoot in merkle_data`
-              );
-              break;
-            }
-            if (!merkle_data.serverTimestamp) {
-              console.error(
-                `Guard message ${message_id} missing serverTimestamp in merkle_data`
-              );
-              break;
-            }
-            if (!merkle_data.serverSignature) {
-              console.error(
-                `Guard message ${message_id} missing serverSignature in merkle_data`
-              );
-              break;
-            }
-            if (!merkle_data.serverPublicKey) {
-              console.error(
-                `Guard message ${message_id} missing serverPublicKey in merkle_data`
-              );
-              break;
-            }
-            const { verifySingleMerkleRoot } = await import("./crypto.js");
-            const rootValid = verifySingleMerkleRoot(
-              merkle_data.prevRoot,
-              merkle_data.newRoot,
-              existingMsg.plaintextHash,
-              merkle_data.serverTimestamp,
-              merkle_data.leafIndex
-            );
-            if (!rootValid.valid) {
-              console.error(
-                `Guard message ${message_id} Merkle root verification failed: ${rootValid.error}`
-              );
-              break;
-            }
-            const { verifyEd25519Signature } = await import("./crypto.js");
-            const signData = `${merkle_data.prevRoot}:${merkle_data.newRoot}:${merkle_data.serverTimestamp}:${merkle_data.serverPublicKey}`;
-            const signatureValid = verifyEd25519Signature(
-              merkle_data.serverPublicKey,
-              signData,
-              merkle_data.serverSignature
-            );
-            if (!signatureValid) {
-              console.error(
-                `Guard message ${message_id} server signature verification failed`
-              );
-              break;
-            }
-            this.messageStorage.updateMessageStatus(
-              message_id,
-              import_types.MessageStatus.CONFIRMED,
-              {
-                leafIndex: merkle_data.leafIndex,
-                newRoot: merkle_data.newRoot,
-                serverSignature: merkle_data.serverSignature,
-                serverTimestamp: merkle_data.serverTimestamp,
-                serverPublicKey: merkle_data.serverPublicKey
-              }
-            );
-            const updated = true;
-            if (updated) {
-              if (existingMsg.toAddress === null) {
-                throw new Error(
-                  `Guard message ${message_id} has null toAddress`
-                );
-              }
-              const toAddr = existingMsg.toAddress;
-              if (toAddr === null) {
-                throw new Error(
-                  `Guard message ${message_id} has null toAddress`
-                );
-              }
-              this.sessionStateStorage.updateSessionState(
-                this.userAddress,
-                toAddr,
-                {
-                  currentRoot: merkle_data.newRoot,
-                  prevRoot: merkle_data.prevRoot,
-                  lastLeafIndex: merkle_data.leafIndex,
-                  lastSyncAt: Date.now()
+                // 2. 解密消息
+                //console.log(`[Messenger] 解密消息 ${serverMsg.id}...`);
+                const ciphertext = Uint8Array.from(Buffer.from(serverMsg.bodyB64, "base64"));
+                //console.log(`[Messenger] 密文长度: ${ciphertext.length} bytes`);
+                const decryptedData = await this.session.decryptMessage(this.userAddress, serverMsg.from, ciphertext.buffer, serverMsg.msgType);
+                //console.log(`[Messenger] 消息 ${serverMsg.id} 解密成功`);
+                // 【更新】明文直接就是消息内容（不再是 JSON 格式）
+                const plaintext = decryptedData;
+                // 【新增】从服务器返回的字段获取 lastReceivedLeafIndex
+                const senderLastReceivedIndex = serverMsg.lastReceivedLeafIndex ?? -1;
+                // 【新增】处理消息确认信息
+                if (senderLastReceivedIndex >= 0) {
+                    const myLastSent = this.getLastSentLeafIndex(serverMsg.from);
+                    if (senderLastReceivedIndex < myLastSent) {
+                        /*console.warn(
+                            `[Messenger] ${serverMsg.from} 可能丢失了消息，` +
+                                `对方确认: ${senderLastReceivedIndex}, ` +
+                                `我已发送: ${myLastSent}`,
+                        );*/
+                    }
+                }
+                // 3. 使用通用验证函数验证消息
+                // 检查必需字段
+                if (!serverMsg.clientTimestamp) {
+                    throw new Error(`Missing clientTimestamp for message ${serverMsg.id}`);
+                }
+                if (!serverMsg.plaintextHash) {
+                    throw new Error(`Missing plaintextHash for message ${serverMsg.id}`);
+                }
+                // 验证 Merkle 元数据完整性
+                if (serverMsg.merkleMetadata) {
+                    if (!serverMsg.merkleMetadata.prevRoot) {
+                        throw new Error(`Message ${serverMsg.id} missing prevRoot in merkleMetadata`);
+                    }
+                    if (!serverMsg.merkleMetadata.newRoot) {
+                        throw new Error(`Message ${serverMsg.id} missing newRoot in merkleMetadata`);
+                    }
                 }
-              );
-            } else {
-              console.warn(
-                `Failed to update Guard message ${message_id}`
-              );
+                const verificationResult = (0, crypto_js_1.verifyMessage)({
+                    messageId: serverMsg.id,
+                    plaintext,
+                    plaintextHash: serverMsg.plaintextHash,
+                    createdAt: serverMsg.clientTimestamp,
+                    guardAddress: serverMsg.guardAddress,
+                    passportAddress: serverMsg.passportAddress,
+                    lastReceivedLeafIndex: serverMsg.lastReceivedLeafIndex, // 【新增】传入消息确认字段
+                    serverSignature: serverMsg.merkleMetadata?.serverSignature,
+                    serverPublicKey: serverMsg.merkleMetadata?.serverPublicKey,
+                    merkleMetadata: serverMsg.merkleMetadata
+                        ? {
+                            prevRoot: serverMsg.merkleMetadata.prevRoot,
+                            newRoot: serverMsg.merkleMetadata.newRoot,
+                            serverTimestamp: serverMsg.merkleMetadata.serverTimestamp,
+                            leafIndex: serverMsg.merkleMetadata.leafIndex,
+                            proofSiblings: serverMsg.merkleMetadata.proofSiblings,
+                            proofIndices: serverMsg.merkleMetadata.proofIndices,
+                        }
+                        : undefined,
+                });
+                if (!verificationResult.valid) {
+                    throw new Error(verificationResult.error);
+                }
+                // 5. 保存到本地存储
+                // 经过 verifyMessage 验证，这些字段一定存在
+                const message = {
+                    messageId: serverMsg.id,
+                    fromAddress: serverMsg.from,
+                    toAddress: this.userAddress,
+                    plaintextHash: serverMsg.plaintextHash,
+                    plaintext,
+                    guardAddress: serverMsg.guardAddress,
+                    passportAddress: serverMsg.passportAddress,
+                    lastReceivedLeafIndex: serverMsg.lastReceivedLeafIndex, // 【新增】保存消息确认字段
+                    direction: types_js_1.MessageDirection.RECEIVED,
+                    status: types_js_1.MessageStatus.CONFIRMED,
+                    msgType: serverMsg.msgType,
+                    leafIndex: serverMsg.merkleMetadata?.leafIndex,
+                    prevRoot: serverMsg.merkleMetadata?.prevRoot,
+                    newRoot: serverMsg.merkleMetadata?.newRoot,
+                    serverSignature: serverMsg.merkleMetadata?.serverSignature,
+                    serverTimestamp: serverMsg.merkleMetadata?.serverTimestamp,
+                    serverPublicKey: serverMsg.merkleMetadata?.serverPublicKey,
+                    createdAt: serverMsg.clientTimestamp,
+                    // 保存 ZIP 元数据（如果是 ZIP 消息）
+                    zipMetadata: serverMsg.zipMetadata,
+                };
+                this.messageStorage.saveMessage(message);
+                // 更新会话状态
+                if (serverMsg.merkleMetadata) {
+                    this.sessionStateStorage.updateSessionState(this.userAddress, serverMsg.from, {
+                        currentRoot: serverMsg.merkleMetadata.newRoot,
+                        prevRoot: serverMsg.merkleMetadata.prevRoot,
+                        lastLeafIndex: serverMsg.merkleMetadata.leafIndex,
+                        lastSyncAt: Date.now(),
+                    });
+                }
+                const timestamp = serverMsg.merkleMetadata?.serverTimestamp ||
+                    serverMsg.clientTimestamp ||
+                    Date.now();
+                decryptedMessages.push({
+                    id: serverMsg.id,
+                    from: serverMsg.from,
+                    plaintext, // 【更新】明文直接是消息内容
+                    timestamp,
+                    merkleVerified: !!serverMsg.merkleMetadata,
+                    merkleData: serverMsg.merkleMetadata
+                        ? {
+                            leafIndex: serverMsg.merkleMetadata.leafIndex,
+                            rootHash: serverMsg.merkleMetadata.newRoot,
+                        }
+                        : undefined,
+                });
+                acknowledgedIds.push(serverMsg.id);
             }
-            break;
-          }
-          case "guard_rejected": {
-            const {
-              message_id,
-              reason: _reason,
-              timestamp: _timestamp
-            } = sseEvent.data;
-            const existingMsg = this.messageStorage.getMessage(message_id);
-            if (existingMsg) {
-              existingMsg.status = import_types.MessageStatus.REJECTED;
-              this.messageStorage.saveMessage(existingMsg);
-            } else {
+            catch (error) {
+                throw new Error(`Failed to decrypt message ${serverMsg.id}: ${error instanceof Error ? error.message : String(error)}`);
             }
-            break;
-          }
         }
-      } catch (error) {
-        console.error("Failed to handle SSE event:", error);
-      }
-    };
-    this.eventSource.onopen = () => {
-    };
-    this.eventSource.onerror = (error) => {
-      console.error("SSE connection error:", error);
-      this.disconnectEventSource();
-    };
-  }
-  /**
-   * 检查 SSE 是否已连接
-   */
-  isEventSourceConnected() {
-    return this.eventSource !== null;
-  }
-  /**
-   * 断开 SSE 连接
-   */
-  disconnectEventSource() {
-    if (this.eventSource) {
-      this.eventSource.close();
-      this.eventSource = null;
-    }
-  }
-  /**
-   * 销毁 Messenger 实例
-   * 清理所有资源（定时器、SSE 连接等）
-   */
-  destroy() {
-    this.stopPrekeyCheckTimer();
-    this.disconnectEventSource();
-  }
-  /**
-   * 断开连接（destroy 的别名）
-   * 用于清理资源
-   */
-  disconnect() {
-    this.destroy();
-  }
-  /**
-   * 发送 ZIP 压缩文件
-   *
-   * 支持发送本地或网络 WTS/WIP 文件，经过 ZIP 压缩后发送给对方
-   * 支持 Guard 验证，如果提供 guardAddress 和 passportAddress，消息将进入 Guard 验证流程
-   *
-   * @param recipientAddress 接收方地址
-   * @param source 文件源（本地路径或网络 URL）
-   * @param options 可选参数
-   * @returns 发送结果
-   */
-  async sendZipFile(recipientAddress, source, options) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
-    }
-    const fileData = await this.loadFileData(source);
-    const JSZip = (await import("jszip")).default;
-    const zip = new JSZip();
-    const fileName = options?.fileName || path.basename(source) || "file.zip";
-    const contentType = options?.contentType || this.detectContentType(fileName);
-    zip.file(fileName, fileData);
-    const zipBlob = await zip.generateAsync({ type: "uint8array" });
-    if (zipBlob.length > import_types.WTS_FILE_BYTES_LIMIT) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.INVALID_INPUT,
-        `ZIP file size (${zipBlob.length} bytes) exceeds local maximum allowed size (${import_types.WTS_FILE_BYTES_LIMIT} bytes)`
-      );
+        // 5. 确认已处理的消息（带签名）
+        if (acknowledgedIds.length > 0 && this.userAddress) {
+            const ackTimestamp = Date.now(); //@ 使用ms时间戳
+            const ackNonce = this.generateNonce();
+            // 签名消息格式: ack_messages:{user}:{message_ids}:{public_key}:{timestamp}:{nonce}
+            const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+            if (account?.pubkey) {
+                const ackMessage = `ack_messages:${this.userAddress}:${acknowledgedIds.join(",")}:${account.pubkey}:${ackTimestamp}:${ackNonce}`;
+                const signResult = await account_js_1.Account.Instance().signData(this.userAddress, ackMessage);
+                const signatureBuffer = Buffer.from(signResult.signature.slice(2), "hex");
+                const signatureBase64 = (0, crypto_js_1.bytesToBase64)(new Uint8Array(signatureBuffer));
+                await this.serverClient.acknowledgeMessages(acknowledgedIds, signResult.publicKey, {
+                    publicKey: signResult.publicKey,
+                    signatureScheme: "ED25519",
+                    signature: signatureBase64,
+                    timestamp: ackTimestamp,
+                    nonce: ackNonce,
+                });
+            }
+        }
+        // 6. 补充预密钥
+        await this.session.ensurePreKeys(this.userAddress);
+        return decryptedMessages;
     }
-    const zipFileHash = "0x" + (0, import_crypto.createHash)("sha256").update(zipBlob).digest("hex");
-    const zipBase64 = Buffer.from(zipBlob).toString("base64");
-    const zipMetadata = {
-      fileName: `${fileName}.zip`,
-      fileSize: zipBlob.length,
-      fileHash: zipFileHash,
-      contentType
-    };
-    const lastReceivedLeafIndex = this.messageStorage.getLastReceivedLeafIndex(
-      this.userAddress,
-      recipientAddress
-    );
-    const createdAt = Date.now();
-    const encrypted = await this.session.encryptMessage(
-      this.userAddress,
-      recipientAddress,
-      zipBase64
-      // 直接加密 ZIP 的 base64 内容
-    );
-    const ciphertext = Buffer.from(new Uint8Array(encrypted.body)).toString(
-      "base64"
-    );
-    const guardAddr = options?.guardAddress || "";
-    const passportAddr = options?.passportAddress || "";
-    const plaintextHash = (0, import_crypto2.hashPlaintext)(
-      zipBase64,
-      createdAt,
-      guardAddr,
-      passportAddr,
-      lastReceivedLeafIndex
-    );
-    const timestamp = Date.now();
-    const nonce = this.generateNonce();
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    if (!account) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User account not found"
-      );
+    /**
+     * 获取最后发送的消息序号
+     * @param peerAddress 对方地址
+     * @returns 最后发送的消息 leafIndex，如果没有发送过返回 -1
+     */
+    getLastSentLeafIndex(peerAddress) {
+        if (!this.userAddress)
+            return -1;
+        const messages = this.messageStorage.getMessagesBySession(this.userAddress, peerAddress);
+        const sentMessages = messages.filter((m) => m.direction === types_js_1.MessageDirection.SENT &&
+            m.leafIndex !== undefined);
+        if (sentMessages.length === 0)
+            return -1;
+        return Math.max(...sentMessages.map((m) => m.leafIndex));
     }
-    const publicKey = account.pubkey;
-    const lastReceivedStr = lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex.toString() : "";
-    const forceStr = options?.force ? "true" : "false";
-    const signMessage = `send_message:${this.userAddress}:${recipientAddress}:${guardAddr}:${passportAddr}:${plaintextHash}:${lastReceivedStr}:${publicKey}:${timestamp}:${nonce}:${forceStr}`;
-    const signResult = await import_account.Account.Instance().signData(
-      this.userAddress,
-      signMessage
-    );
-    const signatureBuffer = Buffer.from(
-      signResult.signature.slice(2),
-      "hex"
-    );
-    const signatureBase64 = (0, import_crypto2.bytesToBase64)(new Uint8Array(signatureBuffer));
-    const response = await this.serverClient.sendMessage({
-      sender: signResult.publicKey,
-      recipient: recipientAddress,
-      ciphertext,
-      plaintextHash,
-      clientTimestamp: createdAt,
-      msgType: encrypted.type,
-      // 使用底层 Signal Protocol 消息类型（1 或 3）
-      zipMetadata,
-      guardAddress: options?.guardAddress,
-      passportAddress: options?.passportAddress,
-      force: options?.force,
-      // 【修复】只有当 lastReceivedLeafIndex >= 0 时才发送，否则发送 undefined
-      lastReceivedLeafIndex: lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex : void 0,
-      signatureScheme: "ED25519",
-      signature: signatureBase64,
-      timestamp,
-      nonce
-    });
-    const message = {
-      messageId: response.messageId,
-      fromAddress: this.userAddress,
-      toAddress: recipientAddress,
-      plaintextHash,
-      plaintext: zipBase64,
-      // 保存 ZIP 数据的 base64 编码，方便本地查看
-      guardAddress: options?.guardAddress,
-      passportAddress: options?.passportAddress,
-      lastReceivedLeafIndex,
-      // 【新增】保存消息确认字段
-      direction: import_types.MessageDirection.SENT,
-      status: response.status === "confirmed" ? import_types.MessageStatus.CONFIRMED : import_types.MessageStatus.PENDING,
-      msgType: encrypted.type,
-      // 使用底层 Signal Protocol 消息类型（1 或 3）
-      zipMetadata,
-      createdAt
-    };
-    if (response.merkleData) {
-      message.leafIndex = response.merkleData.leafIndex;
-      message.prevRoot = response.merkleData.prevRoot;
-      message.newRoot = response.merkleData.newRoot;
-      message.serverSignature = response.merkleData.serverSignature;
-      message.serverTimestamp = response.merkleData.serverTimestamp;
-      message.serverPublicKey = response.merkleData.serverPublicKey;
-      this.sessionStateStorage.updateSessionState(
-        this.userAddress,
-        recipientAddress,
-        {
-          currentRoot: response.merkleData.newRoot,
-          prevRoot: response.merkleData.prevRoot,
-          lastLeafIndex: response.merkleData.leafIndex,
-          lastSyncAt: Date.now()
+    /**
+     * 获取会话历史消息
+     */
+    getSessionMessages(peerAddress) {
+        if (!this.userAddress) {
+            return [];
         }
-      );
+        return this.messageStorage.getMessagesBySession(this.userAddress, peerAddress);
     }
-    this.messageStorage.saveMessage(message);
-    if (response.pendingMerkleData) {
-      for (const [msgId, merkleData] of Object.entries(
-        response.pendingMerkleData
-      )) {
-        const existingMsg = this.messageStorage.getMessage(msgId);
-        if (existingMsg && existingMsg.status === import_types.MessageStatus.PENDING) {
-          this.messageStorage.updateMessageStatus(
-            msgId,
-            import_types.MessageStatus.CONFIRMED,
-            {
-              leafIndex: merkleData.leafIndex,
-              newRoot: merkleData.newRoot,
-              serverSignature: merkleData.serverSignature,
-              serverTimestamp: merkleData.serverTimestamp,
-              serverPublicKey: merkleData.serverPublicKey
-            }
-          );
+    /**
+     * 获取会话当前状态
+     */
+    getSessionState(peerAddress) {
+        if (!this.userAddress) {
+            return undefined;
         }
-      }
+        return this.sessionStateStorage.getSessionState(this.userAddress, peerAddress);
     }
-    return {
-      messageId: response.messageId,
-      status: message.status,
-      merkleData: response.merkleData,
-      guardList: response.guard_list
-    };
-  }
-  /**
-   * 加载文件数据（支持本地路径和网络 URL）
-   */
-  async loadFileData(source) {
-    if (source.startsWith("http://") || source.startsWith("https://")) {
-      const response = await fetch(source);
-      if (!response.ok) {
-        throw new import_types.MessengerError(
-          import_types.MessengerErrorCode.NETWORK_ERROR,
-          `Failed to fetch file from ${source}: ${response.statusText}`
-        );
-      }
-      const arrayBuffer = await response.arrayBuffer();
-      return new Uint8Array(arrayBuffer);
-    }
-    const resolvedPath = path.resolve(source);
-    if (!fs.existsSync(resolvedPath)) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.FILE_NOT_FOUND,
-        `File not found: ${resolvedPath}`
-      );
-    }
-    const buffer = fs.readFileSync(resolvedPath);
-    return new Uint8Array(buffer);
-  }
-  /**
-   * 检测内容类型
-   */
-  detectContentType(fileName) {
-    const ext = path.extname(fileName).toLowerCase();
-    switch (ext) {
-      case ".wts":
-        return "wts";
-      case ".wip":
-        return "wip";
-      default:
-        return "zip";
+    /**
+     * 提交链上证明
+     *
+     * 使用 proof.ts 将 Merkle Root 提交到链上，获得时间证明
+     *
+     * @param env CallEnv 环境
+     * @param peerAddress 对方地址
+     * @param description 证明描述
+     */
+    async submitChainProof(env, peerAddress, description) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        // 获取当前会话状态
+        const sessionState = this.sessionStateStorage.getSessionState(this.userAddress, peerAddress);
+        if (!sessionState || !sessionState.currentRoot) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.SESSION_NOT_ESTABLISHED, "No session state found");
+        }
+        // 从会话消息中获取服务器公钥和签名
+        const messages = this.messageStorage.getMessagesBySession(this.userAddress, peerAddress);
+        const lastMessage = messages[messages.length - 1];
+        if (!lastMessage ||
+            !lastMessage.serverPublicKey ||
+            !lastMessage.serverSignature) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.INVALID_PROOF, "No temporal proof (missing server public key or signature), cannot submit Proof to WoWok blockchain");
+        }
+        const serverPubKey = lastMessage.serverPublicKey;
+        const serverSignature = lastMessage.serverSignature;
+        // 构造证明数据
+        const proofData = {
+            sessionId: sessionState.sessionId,
+            merkleRoot: sessionState.currentRoot,
+            messageCount: sessionState.messageCount,
+            timestamp: Date.now(),
+        };
+        // 使用 CallProof 提交到链上
+        const callProof = new proof_js_1.CallProof({
+            proof: JSON.stringify(proofData),
+            server_pubkey: serverPubKey,
+            server_signature: serverSignature,
+            proof_type: types_js_1.CHAIN_PROOF_TYPE, // 1 = Messenger Session Proof
+            description: description ||
+                `Messenger session proof for ${this.userAddress} <-> ${peerAddress}`,
+            item_count: sessionState.messageCount,
+            about_address: sessionState.sessionId,
+        });
+        const result = await callProof.call(env);
+        // 从结果中提取 proof 对象地址
+        // 这里需要根据实际的 CallProof 返回格式调整
+        const responseData = result?.objectChanges;
+        const proofAddress = responseData?.find((change) => change.objectType?.includes("Proof"))?.objectId;
+        return {
+            proofAddress: proofAddress || "",
+            txHash: result?.digest || "",
+        };
     }
-  }
-  /**
-   * 生成签名的请求
-   */
-  async _createSignedRequest(data) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 建立 SSE 连接并监听服务器事件
+     *
+     * 安全要求：必须提供签名验证，防止未授权监听他人事件
+     * @param onMessage 新消息回调
+     * @param signatureParams 签名参数（可选，不提供时自动生成）
+     */
+    async connectEventSource(onMessage, signatureParams) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        // 关闭已有连接
+        this.disconnectEventSource();
+        if (onMessage) {
+            this.onMessageCallback = onMessage;
+        }
+        // 如果没有提供签名参数，自动生成
+        // 签名格式: event_stream:{address}:{timestamp}:{nonce}
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const publicKey = account?.pubkey || "";
+        let params = signatureParams;
+        if (!params) {
+            const timestamp = Date.now(); //@ 使用ms时间戳
+            const nonce = this.generateNonce();
+            const message = `event_stream:${this.userAddress}:${timestamp}:${nonce}`;
+            const signResult = await account_js_1.Account.Instance().signData(this.userAddress, message);
+            const signatureBuffer = Buffer.from(signResult.signature.slice(2), "hex");
+            const signatureBase64 = (0, crypto_js_1.bytesToBase64)(new Uint8Array(signatureBuffer));
+            params = {
+                signatureScheme: "ED25519",
+                signature: signatureBase64,
+                timestamp,
+                nonce,
+            };
+        }
+        // 构建带签名的 URL
+        const queryParams = new URLSearchParams({
+            publicKey: publicKey,
+            signatureScheme: params.signatureScheme,
+            signature: params.signature,
+            timestamp: params.timestamp.toString(),
+            nonce: params.nonce,
+        });
+        const url = `${this.config.serverUrl}/v1/events/${this.userAddress}?${queryParams}`;
+        //console.log(`Connecting to SSE: ${url}`);
+        // 检查是否有 EventSource 可用
+        if (typeof EventSource === "undefined") {
+            console.warn("EventSource is not available in this environment. SSE functionality disabled, falling back to polling.");
+            return;
+        }
+        try {
+            this.eventSource = new EventSource(url);
+        }
+        catch (error) {
+            console.warn("Failed to create EventSource connection, falling back to polling.", error);
+            return;
+        }
+        // 监听消息事件
+        this.eventSource.onmessage = async (event) => {
+            try {
+                const sseEvent = JSON.parse(event.data);
+                //console.log("SSE event received:", sseEvent.type);
+                switch (sseEvent.type) {
+                    case "NewMessage":
+                        // 收到新消息通知，拉取并解密消息
+                        if (this.onMessageCallback) {
+                            const messages = await this.pullMessages();
+                            if (messages.length > 0) {
+                                this.onMessageCallback(messages);
+                            }
+                        }
+                        break;
+                    case "ark_confirmed": {
+                        // 发送方收到 ARK 确认，验证接收方签名后更新本地状态
+                        const { message_ids, recipient, recipient_public_key, signature, timestamp, } = sseEvent.data;
+                        /*console.log(
+                            `SSE ark_confirmed: messages ${message_ids} confirmed by ${recipient}`,
+                        );*/
+                        // 验证接收方签名（防止服务器作恶）
+                        // 签名消息格式: ack_messages:{recipient}:{message_ids}:{public_key}:{timestamp}:{nonce}
+                        // 注意: SSE事件中不包含nonce，因为nonce是在ARK请求时由接收方生成的，服务器只是转发
+                        const verifyMessage = `ack_messages:${recipient}:${message_ids.join(",")}:${recipient_public_key}:${timestamp}`;
+                        try {
+                            // 使用事件中携带的接收方公钥验证签名
+                            const { Ed25519PublicKey } = await import("../../keypairs/ed25519/publickey.js");
+                            const publicKey = new Ed25519PublicKey(recipient_public_key);
+                            const signatureBytes = Uint8Array.from(Buffer.from(signature, "base64"));
+                            const isValid = await publicKey.verify(new TextEncoder().encode(verifyMessage), signatureBytes);
+                            if (isValid) {
+                                // 签名验证成功，保存 ARK 确认（不可更改字段）
+                                for (const msgId of message_ids) {
+                                    // 获取现有消息并更新 ARK 确认
+                                    const existingMsg = this.messageStorage.getMessage(msgId);
+                                    if (existingMsg) {
+                                        existingMsg.arkConfirmed = {
+                                            recipient,
+                                            recipientPublicKey: recipient_public_key,
+                                            signature,
+                                            timestamp,
+                                        };
+                                        this.messageStorage.saveMessage(existingMsg);
+                                    }
+                                }
+                                /*console.log(
+                                    `ARK verified, stored ${message_ids.length} ARK confirmations`,
+                                );*/
+                            }
+                            else {
+                                console.error("ARK signature verification failed - possible server tampering");
+                            }
+                        }
+                        catch (error) {
+                            console.error("Failed to verify ARK signature:", error);
+                        }
+                        break;
+                    }
+                    case "PreKeyLow":
+                        // 收到预密钥低库存通知，立即补充
+                        /*console.log(
+                            `SSE PreKeyLow event: ${sseEvent.data.current}/${sseEvent.data.max_allowed}, auto-refilling...`,
+                        );*/
+                        await this.checkAndRefillPrekeys();
+                        break;
+                    case "Custom":
+                        // 自定义事件（如 Guard 确认/拒绝），暂不处理
+                        //console.log("SSE Custom event received");
+                        break;
+                    case "guard_confirmed": {
+                        // Guard 消息验证通过，更新消息的 merkleData
+                        const { message_id, merkle_data, timestamp: _timestamp, } = sseEvent.data;
+                        /*console.log(
+                            `SSE guard_confirmed: message ${message_id} confirmed`,
+                        );*/
+                        // 更新本地消息状态
+                        // 获取原始消息数据用于验证
+                        const existingMsg = this.messageStorage.getMessage(message_id);
+                        if (!existingMsg) {
+                            console.warn(`Guard confirmed event received but message ${message_id} not found in local storage`);
+                            break;
+                        }
+                        // 验证 Merkle 数据完整性
+                        if (!merkle_data.prevRoot) {
+                            console.error(`Guard message ${message_id} missing prevRoot in merkle_data`);
+                            break;
+                        }
+                        if (!merkle_data.newRoot) {
+                            console.error(`Guard message ${message_id} missing newRoot in merkle_data`);
+                            break;
+                        }
+                        if (!merkle_data.serverTimestamp) {
+                            console.error(`Guard message ${message_id} missing serverTimestamp in merkle_data`);
+                            break;
+                        }
+                        if (!merkle_data.serverSignature) {
+                            console.error(`Guard message ${message_id} missing serverSignature in merkle_data`);
+                            break;
+                        }
+                        if (!merkle_data.serverPublicKey) {
+                            console.error(`Guard message ${message_id} missing serverPublicKey in merkle_data`);
+                            break;
+                        }
+                        // 验证消息的 Merkle Root 计算
+                        const { verifySingleMerkleRoot } = await import("./crypto.js");
+                        const rootValid = verifySingleMerkleRoot(merkle_data.prevRoot, merkle_data.newRoot, existingMsg.plaintextHash, merkle_data.serverTimestamp, merkle_data.leafIndex);
+                        if (!rootValid.valid) {
+                            console.error(`Guard message ${message_id} Merkle root verification failed: ${rootValid.error}`);
+                            break;
+                        }
+                        // 验证服务器签名
+                        const { verifyEd25519Signature } = await import("./crypto.js");
+                        const signData = `${merkle_data.prevRoot}:${merkle_data.newRoot}:${merkle_data.serverTimestamp}:${merkle_data.serverPublicKey}`;
+                        const signatureValid = verifyEd25519Signature(merkle_data.serverPublicKey, signData, merkle_data.serverSignature);
+                        if (!signatureValid) {
+                            console.error(`Guard message ${message_id} server signature verification failed`);
+                            break;
+                        }
+                        /*console.log(
+                            `Guard message ${message_id} verification passed, updating...`,
+                        );*/
+                        // 直接使用 updateMessageStatus 更新消息的 Merkle 数据
+                        // 因为 message_id 已经包含 nonce，不需要再更新消息 ID
+                        this.messageStorage.updateMessageStatus(message_id, types_js_1.MessageStatus.CONFIRMED, {
+                            leafIndex: merkle_data.leafIndex,
+                            newRoot: merkle_data.newRoot,
+                            serverSignature: merkle_data.serverSignature,
+                            serverTimestamp: merkle_data.serverTimestamp,
+                            serverPublicKey: merkle_data.serverPublicKey,
+                        });
+                        const updated = true;
+                        if (updated) {
+                            /*console.log(
+                                `Guard message ${message_id} updated with merkle data`,
+                            );*/
+                            // 更新会话状态
+                            if (existingMsg.toAddress === null) {
+                                throw new Error(`Guard message ${message_id} has null toAddress`);
+                            }
+                            const toAddr = existingMsg.toAddress;
+                            if (toAddr === null) {
+                                throw new Error(`Guard message ${message_id} has null toAddress`);
+                            }
+                            this.sessionStateStorage.updateSessionState(this.userAddress, toAddr, {
+                                currentRoot: merkle_data.newRoot,
+                                prevRoot: merkle_data.prevRoot,
+                                lastLeafIndex: merkle_data.leafIndex,
+                                lastSyncAt: Date.now(),
+                            });
+                        }
+                        else {
+                            console.warn(`Failed to update Guard message ${message_id}`);
+                        }
+                        break;
+                    }
+                    case "guard_rejected": {
+                        // Guard 消息验证被拒绝
+                        const { message_id, reason: _reason, timestamp: _timestamp, } = sseEvent.data;
+                        /*console.log(
+                            `SSE guard_rejected: message ${message_id} rejected: ${reason}`,
+                        );*/
+                        // 更新本地消息状态
+                        // 首先尝试通过 message_id 查找消息
+                        const existingMsg = this.messageStorage.getMessage(message_id);
+                        if (existingMsg) {
+                            existingMsg.status = types_js_1.MessageStatus.REJECTED;
+                            this.messageStorage.saveMessage(existingMsg);
+                            /*console.log(
+                                `Guard message ${message_id} marked as rejected`,
+                            );*/
+                        }
+                        else {
+                            /*console.warn(
+                                `Guard rejected event received but message ${message_id} not found in local storage`,
+                            );*/
+                        }
+                        break;
+                    }
+                }
+            }
+            catch (error) {
+                console.error("Failed to handle SSE event:", error);
+            }
+        };
+        // 连接打开
+        this.eventSource.onopen = () => {
+            //console.log("SSE connection opened");
+        };
+        // 连接错误
+        this.eventSource.onerror = (error) => {
+            console.error("SSE connection error:", error);
+            this.disconnectEventSource();
+        };
     }
-    const timestamp = Date.now();
-    const nonce = this.generateNonce();
-    const dataJson = (0, import_utils.canonicalizeJson)(data);
-    const signMessage = `${timestamp}:${nonce}:${dataJson}`;
-    const signResult = await import_account.Account.Instance().signData(
-      this.userAddress,
-      signMessage
-    );
-    const signatureBuffer = Buffer.from(
-      signResult.signature.slice(2),
-      "hex"
-    );
-    const signatureBase64 = (0, import_crypto2.bytesToBase64)(new Uint8Array(signatureBuffer));
-    const account = await import_account.Account.Instance().get(this.userAddress, false);
-    if (!account || !account.pubkey) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "Account public key not found"
-      );
+    /**
+     * 检查 SSE 是否已连接
+     */
+    isEventSourceConnected() {
+        return this.eventSource !== null;
     }
-    return {
-      userAddress: this.userAddress,
-      publicKey: account.pubkey,
-      signatureScheme: "ED25519",
-      signature: signatureBase64,
-      timestamp,
-      nonce,
-      data
-    };
-  }
-  /**
-   * 验证地址列表
-   */
-  _validateAddresses(addresses) {
-    const valid = [];
-    const invalid = [];
-    for (const addr of addresses) {
-      if ((0, import_sui_types.isValidWowAddress)(addr)) {
-        valid.push(addr);
-      } else {
-        invalid.push(addr);
-      }
+    /**
+     * 断开 SSE 连接
+     */
+    disconnectEventSource() {
+        if (this.eventSource) {
+            this.eventSource.close();
+            this.eventSource = null;
+            //console.log("SSE connection closed");
+        }
     }
-    return { valid, invalid };
-  }
-  /**
-   * 黑名单 - 添加地址
-   */
-  async addToBlacklist(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 销毁 Messenger 实例
+     * 清理所有资源（定时器、SSE 连接等）
+     */
+    destroy() {
+        this.stopPrekeyCheckTimer();
+        this.disconnectEventSource();
+        //console.log("Messenger instance destroyed");
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "add",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 断开连接（destroy 的别名）
+     * 用于清理资源
+     */
+    disconnect() {
+        this.destroy();
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.addToBlacklist(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 黑名单 - 移除地址
-   */
-  async removeFromBlacklist(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 发送 ZIP 压缩文件
+     *
+     * 支持发送本地或网络 WTS/WIP 文件，经过 ZIP 压缩后发送给对方
+     * 支持 Guard 验证，如果提供 guardAddress 和 passportAddress，消息将进入 Guard 验证流程
+     *
+     * @param recipientAddress 接收方地址
+     * @param source 文件源（本地路径或网络 URL）
+     * @param options 可选参数
+     * @returns 发送结果
+     */
+    async sendZipFile(recipientAddress, source, options) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        // 1. 加载文件内容
+        const fileData = await this.loadFileData(source);
+        // 2. 创建 ZIP 压缩
+        const JSZip = (await import("jszip")).default;
+        const zip = new JSZip();
+        const fileName = options?.fileName || path.basename(source) || "file.zip";
+        const contentType = options?.contentType || this.detectContentType(fileName);
+        zip.file(fileName, fileData);
+        const zipBlob = await zip.generateAsync({ type: "uint8array" });
+        // 3. 本地文件大小限制检查（默认 5MB）
+        if (zipBlob.length > types_js_1.WTS_FILE_BYTES_LIMIT) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.INVALID_INPUT, `ZIP file size (${zipBlob.length} bytes) exceeds local maximum allowed size (${types_js_1.WTS_FILE_BYTES_LIMIT} bytes)`);
+        }
+        // 4. 计算 ZIP 文件哈希（用于 zipMetadata）
+        const zipFileHash = "0x" + (0, crypto_1.createHash)("sha256").update(zipBlob).digest("hex");
+        // 4. 将 ZIP 数据转为 base64
+        const zipBase64 = Buffer.from(zipBlob).toString("base64");
+        // 5. 构造 ZIP 元数据
+        const zipMetadata = {
+            fileName: `${fileName}.zip`,
+            fileSize: zipBlob.length,
+            fileHash: zipFileHash,
+            contentType: contentType,
+        };
+        // 【新增】获取最后收到的消息序号
+        const lastReceivedLeafIndex = this.messageStorage.getLastReceivedLeafIndex(this.userAddress, recipientAddress);
+        // 6. 加密 ZIP 数据（作为普通消息发送，明文就是 ZIP 的 base64）
+        const createdAt = Date.now();
+        const encrypted = await this.session.encryptMessage(this.userAddress, recipientAddress, zipBase64);
+        const ciphertext = Buffer.from(new Uint8Array(encrypted.body)).toString("base64");
+        // 7. 计算 plaintextHash（使用与服务器一致的格式）
+        // 【更新】包含 lastReceivedLeafIndex 在哈希计算中
+        const guardAddr = options?.guardAddress || "";
+        const passportAddr = options?.passportAddress || "";
+        const plaintextHash = (0, crypto_js_1.hashPlaintext)(zipBase64, createdAt, guardAddr, passportAddr, lastReceivedLeafIndex);
+        // 8. 发送到服务器（带 ZIP 元数据）
+        const timestamp = Date.now();
+        const nonce = this.generateNonce();
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        if (!account) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User account not found");
+        }
+        const publicKey = account.pubkey;
+        // 统一发送模式（合并 send 和 send_force）
+        // 统一签名格式: send_message:{sender}:{recipient}:{guard_address}:{passport_address}:{plaintext_hash}:{last_received_leaf_index}:{public_key}:{timestamp}:{nonce}:{force}
+        const lastReceivedStr = lastReceivedLeafIndex >= 0 ? lastReceivedLeafIndex.toString() : "";
+        const forceStr = options?.force ? "true" : "false";
+        const signMessage = `send_message:${this.userAddress}:${recipientAddress}:${guardAddr}:${passportAddr}:${plaintextHash}:${lastReceivedStr}:${publicKey}:${timestamp}:${nonce}:${forceStr}`;
+        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, signMessage);
+        const signatureBuffer = Buffer.from(signResult.signature.slice(2), "hex");
+        const signatureBase64 = (0, crypto_js_1.bytesToBase64)(new Uint8Array(signatureBuffer));
+        // 使用统一的 sendMessage API
+        const response = await this.serverClient.sendMessage({
+            sender: signResult.publicKey,
+            recipient: recipientAddress,
+            ciphertext,
+            plaintextHash,
+            clientTimestamp: createdAt,
+            msgType: encrypted.type, // 使用底层 Signal Protocol 消息类型（1 或 3）
+            zipMetadata,
+            guardAddress: options?.guardAddress,
+            passportAddress: options?.passportAddress,
+            force: options?.force,
+            // 【修复】只有当 lastReceivedLeafIndex >= 0 时才发送，否则发送 undefined
+            lastReceivedLeafIndex: lastReceivedLeafIndex >= 0
+                ? lastReceivedLeafIndex
+                : undefined,
+            signatureScheme: "ED25519",
+            signature: signatureBase64,
+            timestamp,
+            nonce,
+        });
+        // 9. 保存到本地存储
+        // 使用底层 Signal Protocol 消息类型（1 或 3），通过 zipMetadata 标识这是 ZIP 文件
+        const message = {
+            messageId: response.messageId,
+            fromAddress: this.userAddress,
+            toAddress: recipientAddress,
+            plaintextHash,
+            plaintext: zipBase64, // 保存 ZIP 数据的 base64 编码，方便本地查看
+            guardAddress: options?.guardAddress,
+            passportAddress: options?.passportAddress,
+            lastReceivedLeafIndex, // 【新增】保存消息确认字段
+            direction: types_js_1.MessageDirection.SENT,
+            status: response.status === "confirmed"
+                ? types_js_1.MessageStatus.CONFIRMED
+                : types_js_1.MessageStatus.PENDING,
+            msgType: encrypted.type, // 使用底层 Signal Protocol 消息类型（1 或 3）
+            zipMetadata,
+            createdAt,
+        };
+        if (response.merkleData) {
+            message.leafIndex = response.merkleData.leafIndex;
+            message.prevRoot = response.merkleData.prevRoot;
+            message.newRoot = response.merkleData.newRoot;
+            message.serverSignature = response.merkleData.serverSignature;
+            message.serverTimestamp = response.merkleData.serverTimestamp;
+            message.serverPublicKey = response.merkleData.serverPublicKey;
+            // 更新会话状态
+            this.sessionStateStorage.updateSessionState(this.userAddress, recipientAddress, {
+                currentRoot: response.merkleData.newRoot,
+                prevRoot: response.merkleData.prevRoot,
+                lastLeafIndex: response.merkleData.leafIndex,
+                lastSyncAt: Date.now(),
+            });
+        }
+        this.messageStorage.saveMessage(message);
+        // 方案B：处理服务器返回的其他已验证消息的 Merkle 数据
+        // 这些消息可能之前因为发送方离线而没有收到 Merkle 数据
+        if (response.pendingMerkleData) {
+            for (const [msgId, merkleData] of Object.entries(response.pendingMerkleData)) {
+                // 检查本地是否已有该消息
+                const existingMsg = this.messageStorage.getMessage(msgId);
+                if (existingMsg &&
+                    existingMsg.status === types_js_1.MessageStatus.PENDING) {
+                    // 更新消息的 Merkle 数据
+                    this.messageStorage.updateMessageStatus(msgId, types_js_1.MessageStatus.CONFIRMED, {
+                        leafIndex: merkleData.leafIndex,
+                        newRoot: merkleData.newRoot,
+                        serverSignature: merkleData.serverSignature,
+                        serverTimestamp: merkleData.serverTimestamp,
+                        serverPublicKey: merkleData.serverPublicKey,
+                    });
+                    /*console.log(
+                        `[ForceSend] Updated pending message ${msgId} with merkle data from pendingMerkleData`,
+                    );*/
+                }
+            }
+        }
+        return {
+            messageId: response.messageId,
+            status: message.status,
+            merkleData: response.merkleData,
+            guardList: response.guard_list,
+        };
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "remove",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 加载文件数据（支持本地路径和网络 URL）
+     */
+    async loadFileData(source) {
+        // 判断是否为网络 URL
+        if (source.startsWith("http://") || source.startsWith("https://")) {
+            // 从网络加载
+            const response = await fetch(source);
+            if (!response.ok) {
+                throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.NETWORK_ERROR, `Failed to fetch file from ${source}: ${response.statusText}`);
+            }
+            const arrayBuffer = await response.arrayBuffer();
+            return new Uint8Array(arrayBuffer);
+        }
+        // 从本地文件加载
+        const resolvedPath = path.resolve(source);
+        if (!fs.existsSync(resolvedPath)) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.FILE_NOT_FOUND, `File not found: ${resolvedPath}`);
+        }
+        const buffer = fs.readFileSync(resolvedPath);
+        return new Uint8Array(buffer);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.removeFromBlacklist(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 黑名单 - 清空
-   */
-  async clearBlacklist() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 检测内容类型
+     */
+    detectContentType(fileName) {
+        const ext = path.extname(fileName).toLowerCase();
+        switch (ext) {
+            case ".wts":
+                return "wts";
+            case ".wip":
+                return "wip";
+            default:
+                return "zip";
+        }
     }
-    const data = {};
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.clearBlacklist(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 黑名单 - 获取列表
-   */
-  async getBlacklist() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 生成签名的请求
+     */
+    async _createSignedRequest(data) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const timestamp = Date.now();
+        const nonce = this.generateNonce();
+        const dataJson = (0, utils_js_1.canonicalizeJson)(data);
+        const signMessage = `${timestamp}:${nonce}:${dataJson}`;
+        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, signMessage);
+        const signatureBuffer = Buffer.from(signResult.signature.slice(2), "hex");
+        const signatureBase64 = (0, crypto_js_1.bytesToBase64)(new Uint8Array(signatureBuffer));
+        // 获取公钥（带标志位）用于服务器验证
+        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        if (!account || !account.pubkey) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "Account public key not found");
+        }
+        return {
+            userAddress: this.userAddress,
+            publicKey: account.pubkey,
+            signatureScheme: "ED25519",
+            signature: signatureBase64,
+            timestamp,
+            nonce,
+            data,
+        };
     }
-    const signedRequest = await this._createSignedRequest({});
-    return this.serverClient.getBlacklist(this.userAddress, signedRequest);
-  }
-  /**
-   * 黑名单 - 检查存在
-   */
-  async existInBlacklist(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 验证地址列表
+     */
+    _validateAddresses(addresses) {
+        const valid = [];
+        const invalid = [];
+        for (const addr of addresses) {
+            if ((0, sui_types_js_1.isValidWowAddress)(addr)) {
+                valid.push(addr);
+            }
+            else {
+                invalid.push(addr);
+            }
+        }
+        return { valid, invalid };
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "exist",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 黑名单 - 添加地址
+     */
+    async addToBlacklist(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "add",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.addToBlacklist(this.userAddress, signedRequest);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.existInBlacklist(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 好友列表 - 添加地址
-   */
-  async addToFriendsList(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 黑名单 - 移除地址
+     */
+    async removeFromBlacklist(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "remove",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.removeFromBlacklist(this.userAddress, signedRequest);
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "add",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 黑名单 - 清空
+     */
+    async clearBlacklist() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const data = {};
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.clearBlacklist(this.userAddress, signedRequest);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.addToFriendsList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 好友列表 - 移除地址
-   */
-  async removeFromFriendsList(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 黑名单 - 获取列表
+     */
+    async getBlacklist() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const signedRequest = await this._createSignedRequest({});
+        return this.serverClient.getBlacklist(this.userAddress, signedRequest);
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "remove",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 黑名单 - 检查存在
+     */
+    async existInBlacklist(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "exist",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.existInBlacklist(this.userAddress, signedRequest);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.removeFromFriendsList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 好友列表 - 清空
-   */
-  async clearFriendsList() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 好友列表 - 添加地址
+     */
+    async addToFriendsList(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "add",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.addToFriendsList(this.userAddress, signedRequest);
     }
-    const data = {};
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.clearFriendsList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 好友列表 - 获取列表
-   */
-  async getFriendsList() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 好友列表 - 移除地址
+     */
+    async removeFromFriendsList(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "remove",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.removeFromFriendsList(this.userAddress, signedRequest);
     }
-    const signedRequest = await this._createSignedRequest({});
-    return this.serverClient.getFriendsList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * 好友列表 - 检查存在
-   */
-  async existInFriendsList(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 好友列表 - 清空
+     */
+    async clearFriendsList() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const data = {};
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.clearFriendsList(this.userAddress, signedRequest);
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "exist",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * 好友列表 - 获取列表
+     */
+    async getFriendsList() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const signedRequest = await this._createSignedRequest({});
+        return this.serverClient.getFriendsList(this.userAddress, signedRequest);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.existInFriendsList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * Guard 列表 - 添加
-   */
-  async addToGuardList(guards) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * 好友列表 - 检查存在
+     */
+    async existInFriendsList(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "exist",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.existInFriendsList(this.userAddress, signedRequest);
     }
-    const data = { guards };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.addToGuardList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * Guard 列表 - 移除
-   */
-  async removeFromGuardList(addresses) {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * Guard 列表 - 添加
+     */
+    async addToGuardList(guards) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const data = { guards };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.addToGuardList(this.userAddress, signedRequest);
     }
-    const { valid, invalid } = this._validateAddresses(addresses);
-    if (invalid.length > 0) {
-      return {
-        success: false,
-        operation: "remove",
-        modifiedCount: 0,
-        currentCount: 0,
-        maxCount: 0,
-        invalidAddresses: invalid,
-        message: `Invalid addresses: ${invalid.join(", ")}`
-      };
+    /**
+     * Guard 列表 - 移除
+     */
+    async removeFromGuardList(addresses) {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const { valid, invalid } = this._validateAddresses(addresses);
+        if (invalid.length > 0) {
+            return {
+                success: false,
+                operation: "remove",
+                modifiedCount: 0,
+                currentCount: 0,
+                maxCount: 0,
+                invalidAddresses: invalid,
+                message: `Invalid addresses: ${invalid.join(", ")}`,
+            };
+        }
+        const data = { addresses: valid };
+        const signedRequest = await this._createSignedRequest(data);
+        return this.serverClient.removeFromGuardList(this.userAddress, signedRequest);
     }
-    const data = { addresses: valid };
-    const signedRequest = await this._createSignedRequest(data);
-    return this.serverClient.removeFromGuardList(
-      this.userAddress,
-      signedRequest
-    );
-  }
-  /**
-   * Guard 列表 - 获取列表
-   */
-  async getGuardList() {
-    if (!this.userAddress) {
-      throw new import_types.MessengerError(
-        import_types.MessengerErrorCode.IDENTITY_NOT_FOUND,
-        "User address not set"
-      );
+    /**
+     * Guard 列表 - 获取列表
+     */
+    async getGuardList() {
+        if (!this.userAddress) {
+            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+        }
+        const signedRequest = await this._createSignedRequest({});
+        return this.serverClient.getGuardList(this.userAddress, signedRequest);
     }
-    const signedRequest = await this._createSignedRequest({});
-    return this.serverClient.getGuardList(this.userAddress, signedRequest);
-  }
 }
+exports.Messenger = Messenger;
+//# sourceMappingURL=messenger.js.map