wowok 2.1.13 → 2.1.15

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

@@ -1,41 +1,5 @@
-"use strict";
 // 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;
-});
-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 核心模块
  *
@@ -50,27 +14,27 @@ exports.Messenger = void 0;
  * - 加密信任：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");
+import { createHash } from "crypto";
+import * as fs from "fs";
+import * as path from "path";
+import { CallProof } from "../call/proof.js";
+import { MessengerSession } from "./session.js";
+import { MessengerServerClient } from "./server.js";
+import { MessageStorage, SessionStateStorage } from "./storage.js";
+import { hashPlaintext, verifyMessage, bytesToBase64 } from "./crypto.js";
+import { canonicalizeJson } from "./utils.js";
+import { DEFAULT_MESSENGER_CONFIG, MessengerError, MessengerErrorCode, MessageDirection, MessageStatus, WTS_FILE_BYTES_LIMIT, NORMAL_MESSAGE_BYTES_LIMIT, CHAIN_PROOF_TYPE, } from "./types.js";
+import { isValidWowAddress } from "../../utils/sui-types.js";
+import { Account } from "../local/account.js";
+import { EventSource as EventSourcePolyfill } from "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;
+    globalThis.EventSource = EventSourcePolyfill;
     console.log("[EventSource] Successfully polyfilled EventSource");
 }
-class Messenger {
+export class Messenger {
     session;
     serverClient;
     config;
@@ -82,11 +46,11 @@ class Messenger {
     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);
+        this.config = { ...DEFAULT_MESSENGER_CONFIG, ...config };
+        this.session = new MessengerSession(userAddress, this.config);
+        this.serverClient = new MessengerServerClient(this.config);
+        this.messageStorage = new MessageStorage(userAddress);
+        this.sessionStateStorage = new SessionStateStorage(userAddress);
     }
     /**
      * 获取用户地址
@@ -94,7 +58,7 @@ class Messenger {
      */
     getUserAddress() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         return this.userAddress;
     }
@@ -104,9 +68,9 @@ class Messenger {
      */
     async getPublicKey() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
-        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const account = await Account.Instance().get(this.userAddress, false);
         return account?.pubkey || "";
     }
     /**
@@ -118,8 +82,8 @@ class Messenger {
     isValidGuardMessage(guardAddress, passportAddress) {
         return Boolean(guardAddress &&
             passportAddress &&
-            (0, sui_types_js_1.isValidWowAddress)(guardAddress) &&
-            (0, sui_types_js_1.isValidWowAddress)(passportAddress));
+            isValidWowAddress(guardAddress) &&
+            isValidWowAddress(passportAddress));
     }
     /**
      * 生成签名参数
@@ -127,11 +91,11 @@ class Messenger {
      */
     async generateSignatureParams(operation) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
-        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const account = await 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}`);
+            throw new MessengerError(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);
@@ -166,7 +130,7 @@ class Messenger {
      */
     async initialize() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         // 确保身份并注册设备
         await this.session.ensureIdentity(this.userAddress);
@@ -222,15 +186,15 @@ class Messenger {
      */
     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");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         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 (plaintextBytes > NORMAL_MESSAGE_BYTES_LIMIT) {
+            throw new MessengerError(MessengerErrorCode.INVALID_INPUT, `Message size (${plaintextBytes} bytes) exceeds maximum allowed size (${NORMAL_MESSAGE_BYTES_LIMIT} bytes). Consider using sendZipFile for large content.`);
         }
         // 【新增】获取最后收到的消息序号（用于消息确认）
         const lastReceivedLeafIndex = this.messageStorage.getLastReceivedLeafIndex(this.userAddress, recipientAddress);
@@ -239,12 +203,12 @@ class Messenger {
         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);
+        const plaintextHash = 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);
+        const account = await 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");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User account not found");
         }
         const publicKey = account.pubkey;
         const guardAddr = options?.guardAddress || "";
@@ -254,9 +218,9 @@ class Messenger {
         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 signResult = await 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 signatureBase64 = bytesToBase64(new Uint8Array(signatureBuffer));
         // 使用统一的 sendMessage API
         const response = await this.serverClient.sendMessage({
             sender: signResult.publicKey,
@@ -287,10 +251,10 @@ class Messenger {
             guardAddress: options?.guardAddress,
             passportAddress: options?.passportAddress,
             lastReceivedLeafIndex, // 【新增】保存消息确认字段
-            direction: types_js_1.MessageDirection.SENT,
+            direction: MessageDirection.SENT,
             status: response.status === "confirmed"
-                ? types_js_1.MessageStatus.CONFIRMED
-                : types_js_1.MessageStatus.PENDING,
+                ? MessageStatus.CONFIRMED
+                : MessageStatus.PENDING,
             msgType: encrypted.type,
             createdAt,
         };
@@ -317,9 +281,9 @@ class Messenger {
                 // 检查本地是否已有该消息
                 const existingMsg = this.messageStorage.getMessage(msgId);
                 if (existingMsg &&
-                    existingMsg.status === types_js_1.MessageStatus.PENDING) {
+                    existingMsg.status === MessageStatus.PENDING) {
                     // 更新消息的 Merkle 数据
-                    this.messageStorage.updateMessageStatus(msgId, types_js_1.MessageStatus.CONFIRMED, {
+                    this.messageStorage.updateMessageStatus(msgId, MessageStatus.CONFIRMED, {
                         leafIndex: merkleData.leafIndex,
                         newRoot: merkleData.newRoot,
                         serverSignature: merkleData.serverSignature,
@@ -350,20 +314,20 @@ class Messenger {
      */
     async pullMessages(limit) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(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 account = await Account.Instance().get(this.userAddress, false);
         const publicKey = account?.pubkey || "";
-        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, message);
+        const signResult = await Account.Instance().signData(this.userAddress, message);
         const signature = Buffer.from(signResult.signature.slice(2), "hex");
         const signatureParams = {
             signatureScheme: "ED25519",
-            signature: (0, crypto_js_1.bytesToBase64)(signature),
+            signature: bytesToBase64(signature),
             timestamp,
             nonce,
         };
@@ -428,7 +392,7 @@ class Messenger {
                         throw new Error(`Message ${serverMsg.id} missing newRoot in merkleMetadata`);
                     }
                 }
-                const verificationResult = (0, crypto_js_1.verifyMessage)({
+                const verificationResult = verifyMessage({
                     messageId: serverMsg.id,
                     plaintext,
                     plaintextHash: serverMsg.plaintextHash,
@@ -463,8 +427,8 @@ class Messenger {
                     guardAddress: serverMsg.guardAddress,
                     passportAddress: serverMsg.passportAddress,
                     lastReceivedLeafIndex: serverMsg.lastReceivedLeafIndex, // 【新增】保存消息确认字段
-                    direction: types_js_1.MessageDirection.RECEIVED,
-                    status: types_js_1.MessageStatus.CONFIRMED,
+                    direction: MessageDirection.RECEIVED,
+                    status: MessageStatus.CONFIRMED,
                     msgType: serverMsg.msgType,
                     leafIndex: serverMsg.merkleMetadata?.leafIndex,
                     prevRoot: serverMsg.merkleMetadata?.prevRoot,
@@ -513,12 +477,12 @@ class Messenger {
             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);
+            const account = await 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 signResult = await 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));
+                const signatureBase64 = bytesToBase64(new Uint8Array(signatureBuffer));
                 await this.serverClient.acknowledgeMessages(acknowledgedIds, signResult.publicKey, {
                     publicKey: signResult.publicKey,
                     signatureScheme: "ED25519",
@@ -541,7 +505,7 @@ class Messenger {
         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 &&
+        const sentMessages = messages.filter((m) => m.direction === MessageDirection.SENT &&
             m.leafIndex !== undefined);
         if (sentMessages.length === 0)
             return -1;
@@ -576,12 +540,12 @@ class Messenger {
      */
     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");
+            throw new MessengerError(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");
+            throw new MessengerError(MessengerErrorCode.SESSION_NOT_ESTABLISHED, "No session state found");
         }
         // 从会话消息中获取服务器公钥和签名
         const messages = this.messageStorage.getMessagesBySession(this.userAddress, peerAddress);
@@ -589,7 +553,7 @@ class Messenger {
         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");
+            throw new MessengerError(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;
@@ -601,11 +565,11 @@ class Messenger {
             timestamp: Date.now(),
         };
         // 使用 CallProof 提交到链上
-        const callProof = new proof_js_1.CallProof({
+        const callProof = new CallProof({
             proof: JSON.stringify(proofData),
             server_pubkey: serverPubKey,
             server_signature: serverSignature,
-            proof_type: types_js_1.CHAIN_PROOF_TYPE, // 1 = Messenger Session Proof
+            proof_type: CHAIN_PROOF_TYPE, // 1 = Messenger Session Proof
             description: description ||
                 `Messenger session proof for ${this.userAddress} <-> ${peerAddress}`,
             item_count: sessionState.messageCount,
@@ -630,7 +594,7 @@ class Messenger {
      */
     async connectEventSource(onMessage, signatureParams) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         // 关闭已有连接
         this.disconnectEventSource();
@@ -639,16 +603,16 @@ class Messenger {
         }
         // 如果没有提供签名参数，自动生成
         // 签名格式: event_stream:{address}:{timestamp}:{nonce}
-        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const account = await 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 signResult = await 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));
+            const signatureBase64 = bytesToBase64(new Uint8Array(signatureBuffer));
             params = {
                 signatureScheme: "ED25519",
                 signature: signatureBase64,
@@ -802,7 +766,7 @@ class Messenger {
                         );*/
                         // 直接使用 updateMessageStatus 更新消息的 Merkle 数据
                         // 因为 message_id 已经包含 nonce，不需要再更新消息 ID
-                        this.messageStorage.updateMessageStatus(message_id, types_js_1.MessageStatus.CONFIRMED, {
+                        this.messageStorage.updateMessageStatus(message_id, MessageStatus.CONFIRMED, {
                             leafIndex: merkle_data.leafIndex,
                             newRoot: merkle_data.newRoot,
                             serverSignature: merkle_data.serverSignature,
@@ -844,7 +808,7 @@ class Messenger {
                         // 首先尝试通过 message_id 查找消息
                         const existingMsg = this.messageStorage.getMessage(message_id);
                         if (existingMsg) {
-                            existingMsg.status = types_js_1.MessageStatus.REJECTED;
+                            existingMsg.status = MessageStatus.REJECTED;
                             this.messageStorage.saveMessage(existingMsg);
                             /*console.log(
                                 `Guard message ${message_id} marked as rejected`,
@@ -918,7 +882,7 @@ class Messenger {
      */
     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");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         // 1. 加载文件内容
         const fileData = await this.loadFileData(source);
@@ -930,11 +894,11 @@ class Messenger {
         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)`);
+        if (zipBlob.length > WTS_FILE_BYTES_LIMIT) {
+            throw new MessengerError(MessengerErrorCode.INVALID_INPUT, `ZIP file size (${zipBlob.length} bytes) exceeds local maximum allowed size (${WTS_FILE_BYTES_LIMIT} bytes)`);
         }
         // 4. 计算 ZIP 文件哈希（用于 zipMetadata）
-        const zipFileHash = "0x" + (0, crypto_1.createHash)("sha256").update(zipBlob).digest("hex");
+        const zipFileHash = "0x" + createHash("sha256").update(zipBlob).digest("hex");
         // 4. 将 ZIP 数据转为 base64
         const zipBase64 = Buffer.from(zipBlob).toString("base64");
         // 5. 构造 ZIP 元数据
@@ -954,13 +918,13 @@ class Messenger {
         // 【更新】包含 lastReceivedLeafIndex 在哈希计算中
         const guardAddr = options?.guardAddress || "";
         const passportAddr = options?.passportAddress || "";
-        const plaintextHash = (0, crypto_js_1.hashPlaintext)(zipBase64, createdAt, guardAddr, passportAddr, lastReceivedLeafIndex);
+        const plaintextHash = 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);
+        const account = await 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");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User account not found");
         }
         const publicKey = account.pubkey;
         // 统一发送模式（合并 send 和 send_force）
@@ -968,9 +932,9 @@ class Messenger {
         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 signResult = await 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 signatureBase64 = bytesToBase64(new Uint8Array(signatureBuffer));
         // 使用统一的 sendMessage API
         const response = await this.serverClient.sendMessage({
             sender: signResult.publicKey,
@@ -1003,10 +967,10 @@ class Messenger {
             guardAddress: options?.guardAddress,
             passportAddress: options?.passportAddress,
             lastReceivedLeafIndex, // 【新增】保存消息确认字段
-            direction: types_js_1.MessageDirection.SENT,
+            direction: MessageDirection.SENT,
             status: response.status === "confirmed"
-                ? types_js_1.MessageStatus.CONFIRMED
-                : types_js_1.MessageStatus.PENDING,
+                ? MessageStatus.CONFIRMED
+                : MessageStatus.PENDING,
             msgType: encrypted.type, // 使用底层 Signal Protocol 消息类型（1 或 3）
             zipMetadata,
             createdAt,
@@ -1034,9 +998,9 @@ class Messenger {
                 // 检查本地是否已有该消息
                 const existingMsg = this.messageStorage.getMessage(msgId);
                 if (existingMsg &&
-                    existingMsg.status === types_js_1.MessageStatus.PENDING) {
+                    existingMsg.status === MessageStatus.PENDING) {
                     // 更新消息的 Merkle 数据
-                    this.messageStorage.updateMessageStatus(msgId, types_js_1.MessageStatus.CONFIRMED, {
+                    this.messageStorage.updateMessageStatus(msgId, MessageStatus.CONFIRMED, {
                         leafIndex: merkleData.leafIndex,
                         newRoot: merkleData.newRoot,
                         serverSignature: merkleData.serverSignature,
@@ -1065,7 +1029,7 @@ class Messenger {
             // 从网络加载
             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}`);
+                throw new MessengerError(MessengerErrorCode.NETWORK_ERROR, `Failed to fetch file from ${source}: ${response.statusText}`);
             }
             const arrayBuffer = await response.arrayBuffer();
             return new Uint8Array(arrayBuffer);
@@ -1073,7 +1037,7 @@ class Messenger {
         // 从本地文件加载
         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}`);
+            throw new MessengerError(MessengerErrorCode.FILE_NOT_FOUND, `File not found: ${resolvedPath}`);
         }
         const buffer = fs.readFileSync(resolvedPath);
         return new Uint8Array(buffer);
@@ -1097,19 +1061,19 @@ class Messenger {
      */
     async _createSignedRequest(data) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(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 dataJson = canonicalizeJson(data);
         const signMessage = `${timestamp}:${nonce}:${dataJson}`;
-        const signResult = await account_js_1.Account.Instance().signData(this.userAddress, signMessage);
+        const signResult = await 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 signatureBase64 = bytesToBase64(new Uint8Array(signatureBuffer));
         // 获取公钥（带标志位）用于服务器验证
-        const account = await account_js_1.Account.Instance().get(this.userAddress, false);
+        const account = await 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");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "Account public key not found");
         }
         return {
             userAddress: this.userAddress,
@@ -1128,7 +1092,7 @@ class Messenger {
         const valid = [];
         const invalid = [];
         for (const addr of addresses) {
-            if ((0, sui_types_js_1.isValidWowAddress)(addr)) {
+            if (isValidWowAddress(addr)) {
                 valid.push(addr);
             }
             else {
@@ -1142,7 +1106,7 @@ class Messenger {
      */
     async addToBlacklist(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1165,7 +1129,7 @@ class Messenger {
      */
     async removeFromBlacklist(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1188,7 +1152,7 @@ class Messenger {
      */
     async clearBlacklist() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const data = {};
         const signedRequest = await this._createSignedRequest(data);
@@ -1199,7 +1163,7 @@ class Messenger {
      */
     async getBlacklist() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const signedRequest = await this._createSignedRequest({});
         return this.serverClient.getBlacklist(this.userAddress, signedRequest);
@@ -1209,7 +1173,7 @@ class Messenger {
      */
     async existInBlacklist(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1232,7 +1196,7 @@ class Messenger {
      */
     async addToFriendsList(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1255,7 +1219,7 @@ class Messenger {
      */
     async removeFromFriendsList(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1278,7 +1242,7 @@ class Messenger {
      */
     async clearFriendsList() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const data = {};
         const signedRequest = await this._createSignedRequest(data);
@@ -1289,7 +1253,7 @@ class Messenger {
      */
     async getFriendsList() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const signedRequest = await this._createSignedRequest({});
         return this.serverClient.getFriendsList(this.userAddress, signedRequest);
@@ -1299,7 +1263,7 @@ class Messenger {
      */
     async existInFriendsList(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1322,7 +1286,7 @@ class Messenger {
      */
     async addToGuardList(guards) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const data = { guards };
         const signedRequest = await this._createSignedRequest(data);
@@ -1333,7 +1297,7 @@ class Messenger {
      */
     async removeFromGuardList(addresses) {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const { valid, invalid } = this._validateAddresses(addresses);
         if (invalid.length > 0) {
@@ -1356,11 +1320,10 @@ class Messenger {
      */
     async getGuardList() {
         if (!this.userAddress) {
-            throw new types_js_1.MessengerError(types_js_1.MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
+            throw new MessengerError(MessengerErrorCode.IDENTITY_NOT_FOUND, "User address not set");
         }
         const signedRequest = await this._createSignedRequest({});
         return this.serverClient.getGuardList(this.userAddress, signedRequest);
     }
 }
-exports.Messenger = Messenger;
 //# sourceMappingURL=messenger.js.map