@meet-im/meet-bot-jssdk 0.0.7 → 1.1.0

package/dist/index.cjs

@@ -50,16 +50,34 @@ var init_error = __esm({
     };
     exports.NetworkError = class extends exports.MeetBotError {
       cause;
-      constructor(message, cause) {
+      /**
+       * HTTP 状态码（如果有的话）
+       * 例如：504 表示网关超时，0 表示无 HTTP 响应
+       */
+      httpStatus;
+      /**
+       * 响应内容片段（用于调试）
+       */
+      responseSnippet;
+      constructor(message, cause, httpStatus, responseSnippet) {
         super(message, "NETWORK_ERROR");
         this.name = "NetworkError";
         this.cause = cause;
+        this.httpStatus = httpStatus;
+        this.responseSnippet = responseSnippet;
       }
     };
     exports.TimeoutError = class extends exports.MeetBotError {
-      constructor(message) {
+      /**
+       * 是否为本地客户端超时（AbortController 触发）
+       * true: 本地 HTTP 请求超时
+       * false: 服务端/网关返回的超时（如 504 Gateway Timeout）
+       */
+      isLocal;
+      constructor(message, isLocal = true) {
         super(message, "TIMEOUT_ERROR");
         this.name = "TimeoutError";
+        this.isLocal = isLocal;
       }
     };
     exports.ValidationError = class extends exports.MeetBotError {
@@ -128,6 +146,11 @@ var CHUNK_RULES = [
   { maxSize: Infinity, chunks: 50 }
   // > 100MB: 50 片
 ];
+var SESSION_TYPE = {
+  PRIVATE: 1,
+  GROUP: 3,
+  CHANNEL: 4
+};
 function getChunkNum(size) {
   for (const rule of CHUNK_RULES) {
     if (size < rule.maxSize) {
@@ -136,6 +159,31 @@ function getChunkNum(size) {
   }
   return 50;
 }
+function getConvID(firstID, secondID, sessionType, companyID = 1) {
+  let convID;
+  if (sessionType === SESSION_TYPE.PRIVATE) {
+    const min = Math.min(firstID, secondID);
+    const max = Math.max(firstID, secondID);
+    convID = `${min}:${max}`;
+    if (companyID > 1) {
+      convID += `:${companyID}`;
+    }
+  } else if (sessionType === SESSION_TYPE.GROUP) {
+    convID = `${firstID}+${secondID}`;
+    if (companyID > 1) {
+      convID += `+${companyID}`;
+    }
+  } else {
+    convID = `${firstID}_${secondID}`;
+    if (companyID > 1) {
+      convID += `_${companyID}`;
+    }
+  }
+  return convID;
+}
+function getQuoteMsgKey(convID, seqID) {
+  return `${convID}:${seqID}`;
+}
 
 // src/utils/logger.ts
 var Logger = class {
@@ -172,8 +220,8 @@ function extractBotToken(token) {
   const parts = token.split(":");
   return parts.length >= 2 ? parts.slice(1).join(":") : token;
 }
-function buildUrl(baseUrl, path, params) {
-  const url = new URL(`/im/bot/${path}`, baseUrl);
+function buildUrl(baseUrl, path, pathPrefix, params) {
+  const url = new URL(`${pathPrefix}${path}`, baseUrl);
   if (params) {
     for (const [key, value] of Object.entries(params)) {
       if (value !== void 0) {
@@ -184,9 +232,19 @@ function buildUrl(baseUrl, path, params) {
   return url.toString();
 }
 async function request(options) {
-  const { token, baseUrl, method = "GET", path, params, body, timeout = HTTP.DEFAULT_TIMEOUT } = options;
+  const {
+    token,
+    baseUrl,
+    method = "GET",
+    path,
+    pathPrefix = "/im/bot/",
+    params,
+    body,
+    timeout = HTTP.DEFAULT_TIMEOUT,
+    raw = false
+  } = options;
   validateToken(token);
-  const url = buildUrl(baseUrl || DEFAULT_BASE_URL, path, method === "GET" ? params : void 0);
+  const url = buildUrl(baseUrl || DEFAULT_BASE_URL, path, pathPrefix, method === "GET" ? params : void 0);
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
   const headers = {
@@ -215,18 +273,40 @@ async function request(options) {
     const responseText = await response.text();
     if (!contentType.includes("application/json")) {
       logger.error("[Response] Non-JSON response:", responseText.substring(0, 500));
-      throw new exports.NetworkError(`Server returned non-JSON response (status ${response.status})`, void 0);
+      if (response.status === 504) {
+        throw new exports.TimeoutError(`Gateway timeout (status ${response.status})`, false);
+      }
+      throw new exports.NetworkError(
+        `Server returned non-JSON response (status ${response.status})`,
+        void 0,
+        response.status,
+        responseText.substring(0, 200)
+      );
     }
     let data;
     try {
       data = JSON.parse(responseText);
     } catch {
       logger.error("[Response] Failed to parse JSON:", responseText.substring(0, 500));
-      throw new exports.NetworkError("Failed to parse server response", void 0);
+      throw new exports.NetworkError(
+        "Failed to parse server response",
+        void 0,
+        response.status,
+        responseText.substring(0, 200)
+      );
     }
     logger.info("[Response Body]", JSON.stringify(data));
+    if (raw) {
+      return data;
+    }
     if (!response.ok || !data.ok) {
       const errorData = data;
+      if (response.status === 504) {
+        throw new exports.TimeoutError(
+          errorData.description || `Gateway timeout (status ${response.status})`,
+          false
+        );
+      }
       throw new exports.ApiError(
         errorData.description || `HTTP ${response.status}`,
         response.status,
@@ -242,7 +322,7 @@ async function request(options) {
     }
     if (error instanceof Error) {
       if (error.name === "AbortError") {
-        throw new exports.TimeoutError(`Request timeout after ${timeout}ms`);
+        throw new exports.TimeoutError(`Request timeout after ${timeout}ms`, true);
       }
       throw new exports.NetworkError(`Network error: ${error.message}`, error);
     }
@@ -337,9 +417,8 @@ async function getAccessURL(params) {
       sessionType: queryParams.sessionType,
       seqId: queryParams.seqId,
       fileId: queryParams.fileId,
+      companyId: queryParams.companyId,
       "x-oss-process": queryParams["x-oss-process"],
-      origin: queryParams.origin,
-      bestDomain: queryParams.bestDomain,
       printResult: queryParams.printResult ?? "1"
     }
   });
@@ -518,6 +597,25 @@ async function sendMediaMessage(token, sessionInfo, options, baseUrl) {
   });
 }
 
+// src/api/user.ts
+async function getUsers(params) {
+  const { token, baseUrl } = params;
+  const result = await request({
+    token,
+    baseUrl,
+    method: "POST",
+    path: "general/SyncCompanyUser",
+    pathPrefix: "/",
+    body: { syncAt: 0 },
+    timeout: HTTP.DEFAULT_TIMEOUT,
+    raw: true
+  });
+  return Object.values(result.users).map((user) => ({
+    userID: user.userID,
+    nickName: user.nickName
+  }));
+}
+
 // src/api/index.ts
 async function getUpdates(params) {
   const { token, baseUrl, timeout = API.DEFAULT_TIMEOUT, offset, limit = API.DEFAULT_LIMIT } = params;
@@ -534,6 +632,20 @@ async function getUpdates(params) {
     timeout: (timeout || 0) * 1e3 + HTTP.POLLING_TIMEOUT_BUFFER
   });
 }
+async function getUpdatesV2(params) {
+  const { token, baseUrl, timeout = API.DEFAULT_TIMEOUT, limit = API.DEFAULT_LIMIT } = params;
+  return request({
+    token,
+    baseUrl,
+    method: "POST",
+    path: "getUpdatesV2",
+    body: {
+      timeout,
+      limit
+    },
+    timeout: (timeout || 0) * 1e3 + HTTP.POLLING_TIMEOUT_BUFFER
+  });
+}
 async function sendMessage(params) {
   const { token, baseUrl, sessionInfo, msgContent } = params;
   const hasContent = msgContent.content && msgContent.content.trim() !== "";
@@ -556,15 +668,126 @@ async function sendMessage(params) {
 
 // src/client.ts
 init_error();
+
+// src/user-cache.ts
+var UserCache = class {
+  byId = /* @__PURE__ */ new Map();
+  byNickName = /* @__PURE__ */ new Map();
+  byAliasName = /* @__PURE__ */ new Map();
+  loadedAt = 0;
+  ttl;
+  loading = null;
+  constructor(options) {
+    this.ttl = options?.ttl ?? 60 * 60 * 1e3;
+  }
+  isExpired() {
+    return this.byId.size === 0 || this.ttl > 0 && Date.now() - this.loadedAt > this.ttl;
+  }
+  async load(fetchAll) {
+    if (this.loading) {
+      return this.loading;
+    }
+    this.loading = (async () => {
+      try {
+        const users = await fetchAll();
+        this.rebuild(users);
+        logger.info(`\u7528\u6237\u7F13\u5B58\u5DF2\u52A0\u8F7D\uFF0C\u5171 ${users.length} \u4E2A\u7528\u6237`);
+      } finally {
+        this.loading = null;
+      }
+    })();
+    return this.loading;
+  }
+  rebuild(users) {
+    this.byId.clear();
+    this.byNickName.clear();
+    this.byAliasName.clear();
+    for (const user of users) {
+      this.byId.set(user.userID, user);
+      const nickKey = user.nickName.toLowerCase();
+      let nickList = this.byNickName.get(nickKey);
+      if (!nickList) {
+        nickList = [];
+        this.byNickName.set(nickKey, nickList);
+      }
+      nickList.push(user);
+      if (user.aliasName) {
+        const aliasKey = user.aliasName.toLowerCase();
+        let aliasList = this.byAliasName.get(aliasKey);
+        if (!aliasList) {
+          aliasList = [];
+          this.byAliasName.set(aliasKey, aliasList);
+        }
+        aliasList.push(user);
+      }
+    }
+    this.loadedAt = Date.now();
+  }
+  async ensureLoaded(fetchAll) {
+    if (!this.isExpired()) return;
+    await this.load(fetchAll);
+  }
+  getById(userId) {
+    return this.byId.get(userId);
+  }
+  getByIds(userIds) {
+    const result = /* @__PURE__ */ new Map();
+    for (const id of userIds) {
+      const user = this.byId.get(id);
+      if (user) {
+        result.set(id, user);
+      }
+    }
+    return result;
+  }
+  getByName(name) {
+    const key = name.toLowerCase();
+    const byNick = this.byNickName.get(key);
+    const byAlias = this.byAliasName.get(key);
+    if (!byNick && !byAlias) return [];
+    if (!byNick) return [...byAlias];
+    if (!byAlias) return [...byNick];
+    const seen = /* @__PURE__ */ new Set();
+    const result = [];
+    for (const u of [...byNick, ...byAlias]) {
+      if (!seen.has(u.userID)) {
+        seen.add(u.userID);
+        result.push(u);
+      }
+    }
+    return result;
+  }
+  searchByName(query) {
+    const q = query.toLowerCase();
+    const result = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const user of this.byId.values()) {
+      if (user.nickName.toLowerCase().includes(q) || user.aliasName && user.aliasName.toLowerCase().includes(q) || user.nickNamePinyin && user.nickNamePinyin.toLowerCase().includes(q) || user.aliasNamePinyin && user.aliasNamePinyin.toLowerCase().includes(q)) {
+        if (!seen.has(user.userID)) {
+          seen.add(user.userID);
+          result.push(user);
+        }
+      }
+    }
+    return result;
+  }
+  get size() {
+    return this.byId.size;
+  }
+};
+
+// src/client.ts
 var MeetBot = class {
   token;
   baseUrl;
   pollingLimit;
   longPollingTimeout;
+  useV2;
   eventHandlers = /* @__PURE__ */ new Map();
   polling = false;
   offset = 0;
   abortController = null;
+  userCache;
   constructor(config) {
     if (config.token) {
       if (!config.token.includes(":")) {
@@ -579,6 +802,8 @@ var MeetBot = class {
     this.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
     this.pollingLimit = config.pollingLimit ?? POLLING.DEFAULT_LIMIT;
     this.longPollingTimeout = config.longPollingTimeout ?? POLLING.DEFAULT_TIMEOUT;
+    this.useV2 = config.useV2 ?? false;
+    this.userCache = new UserCache(config.userCacheOptions);
     logger.setLevel(config.logLevel ?? "silent");
   }
   on(event, handler) {
@@ -618,7 +843,7 @@ var MeetBot = class {
     this.abortController = new AbortController();
     const limit = options?.limit ?? this.pollingLimit;
     const timeout = options?.timeout ?? this.longPollingTimeout;
-    logger.info(`\u5F00\u59CB\u957F\u8F6E\u8BE2\u6D88\u606F... (\u6761\u6570: ${limit}, \u8D85\u65F6: ${timeout}s)`);
+    logger.info(`\u5F00\u59CB\u957F\u8F6E\u8BE2\u6D88\u606F... (\u6761\u6570: ${limit}, \u8D85\u65F6: ${timeout}s, V2: ${this.useV2})`);
     this.emit("polling_start", void 0);
     const retryDelay = options?.retryDelay ?? POLLING.DEFAULT_RETRY_DELAY;
     const maxRetries = options?.maxRetries ?? POLLING.DEFAULT_MAX_RETRIES;
@@ -626,20 +851,35 @@ var MeetBot = class {
     let retryCount = 0;
     while (this.polling) {
       try {
-        const updates = await getUpdates({
-          token: this.token,
-          baseUrl: this.baseUrl,
-          timeout,
-          offset: this.offset,
-          limit
-        });
-        retryCount = 0;
-        for (const update of updates) {
-          if (update.message) {
-            this.emit("message", update.message);
-            this.offset = (update.message.seqId || 0) + 1;
+        if (this.useV2) {
+          const result = await getUpdatesV2({
+            token: this.token,
+            baseUrl: this.baseUrl,
+            timeout,
+            limit
+          });
+          retryCount = 0;
+          for (const msgUpdate of result.msgs) {
+            this.emit("message", { message: msgUpdate.message, quoteMsgMap: result.quoteMsgMap });
+            this.offset = (msgUpdate.message.seqId || 0) + 1;
             onOffsetUpdate?.(this.offset);
           }
+        } else {
+          const updates = await getUpdates({
+            token: this.token,
+            baseUrl: this.baseUrl,
+            timeout,
+            offset: this.offset,
+            limit
+          });
+          retryCount = 0;
+          for (const update of updates) {
+            if (update.message) {
+              this.emit("message", { message: update.message, quoteMsgMap: {} });
+              this.offset = (update.message.seqId || 0) + 1;
+              onOffsetUpdate?.(this.offset);
+            }
+          }
         }
         await this.sleep(POLLING.SUCCESS_DELAY);
       } catch (error) {
@@ -670,6 +910,13 @@ var MeetBot = class {
       ...options
     });
   }
+  async getUpdatesV2(options) {
+    return getUpdatesV2({
+      token: this.token,
+      baseUrl: this.baseUrl,
+      ...options
+    });
+  }
   async sendMessage(sessionInfo, msgContent) {
     return sendMessage({
       token: this.token,
@@ -712,10 +959,18 @@ var MeetBot = class {
    * 获取文件下载地址
    */
   async getAccessURL(params) {
+    const apiParams = "sessionInfo" in params ? {
+      firstId: params.sessionInfo.firstID,
+      secondId: params.sessionInfo.secondID,
+      sessionType: params.sessionInfo.sessionType,
+      seqId: params.seqId,
+      fileId: params.fileId,
+      printResult: params.printResult
+    } : params;
     return getAccessURL({
       token: this.token,
       baseUrl: this.baseUrl,
-      ...params
+      ...apiParams
     });
   }
   /**
@@ -730,6 +985,56 @@ var MeetBot = class {
   async sendMedia(sessionInfo, options) {
     return sendMediaMessage(this.token, sessionInfo, options, this.baseUrl);
   }
+  /**
+   * 刷新用户缓存
+   */
+  async refreshUserCache() {
+    await this.userCache.load(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl });
+    });
+  }
+  /**
+   * 根据用户 ID 获取用户信息
+   */
+  async getUserById(userId) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl });
+    });
+    return this.userCache.getById(userId);
+  }
+  /**
+   * 批量根据用户 ID 获取用户信息
+   */
+  async getUserByIds(userIds) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl });
+    });
+    return this.userCache.getByIds(userIds);
+  }
+  /**
+   * 根据昵称或别名精确查找用户
+   */
+  async getUserByName(name) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl });
+    });
+    return this.userCache.getByName(name);
+  }
+  /**
+   * 根据昵称或别名模糊搜索用户
+   */
+  async searchUserByName(query) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl });
+    });
+    return this.userCache.searchByName(query);
+  }
+  /**
+   * 获取缓存用户数
+   */
+  get userCacheSize() {
+    return this.userCache.size;
+  }
   sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
@@ -744,16 +1049,20 @@ exports.DEFAULT_BASE_URL = DEFAULT_BASE_URL;
 exports.HTTP = HTTP;
 exports.MeetBot = MeetBot;
 exports.POLLING = POLLING;
+exports.SESSION_TYPE = SESSION_TYPE;
 exports.UPLOAD = UPLOAD;
+exports.UserCache = UserCache;
 exports.completeMultipartUpload = completeMultipartUpload;
 exports.computeMD5 = computeMD5;
 exports.getAccessURL = getAccessURL;
 exports.getChunkNum = getChunkNum;
+exports.getConvID = getConvID;
 exports.getMultiPartUploadURL = getMultiPartUploadURL;
+exports.getQuoteMsgKey = getQuoteMsgKey;
 exports.getUpdates = getUpdates;
+exports.getUpdatesV2 = getUpdatesV2;
 exports.getUploadURL = getUploadURL;
+exports.getUsers = getUsers;
 exports.sendMediaMessage = sendMediaMessage;
 exports.sendMessage = sendMessage;
 exports.uploadFile = uploadFile;
-//# sourceMappingURL=index.cjs.map
-//# sourceMappingURL=index.cjs.map