@meet-im/meet-bot-jssdk 1.0.0 → 1.2.0

package/dist/index.js

@@ -44,16 +44,34 @@ var init_error = __esm({
     };
     NetworkError = class extends 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;
       }
     };
     TimeoutError = class extends 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;
       }
     };
     ValidationError = class extends MeetBotError {
@@ -196,8 +214,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) {
@@ -207,10 +225,27 @@ function buildUrl(baseUrl, path, params) {
   }
   return url.toString();
 }
+function sanitizeHeaders(headers) {
+  return {
+    ...headers,
+    Authorization: headers.Authorization ? "Bot ***" : ""
+  };
+}
 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,
+    userAgent,
+    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 = {
@@ -218,7 +253,11 @@ async function request(options) {
     Accept: "application/json",
     Authorization: `Bot ${extractBotToken(token)}`
   };
+  if (userAgent) {
+    headers["User-Agent"] = userAgent;
+  }
   logger.info("[Request]", method, url);
+  logger.info("[Headers]", sanitizeHeaders(headers));
   if (body) {
     logger.info("[Body]", JSON.stringify(body));
   }
@@ -239,18 +278,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 NetworkError(`Server returned non-JSON response (status ${response.status})`, void 0);
+      if (response.status === 504) {
+        throw new TimeoutError(`Gateway timeout (status ${response.status})`, false);
+      }
+      throw new 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 NetworkError("Failed to parse server response", void 0);
+      throw new 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 TimeoutError(
+          errorData.description || `Gateway timeout (status ${response.status})`,
+          false
+        );
+      }
       throw new ApiError(
         errorData.description || `HTTP ${response.status}`,
         response.status,
@@ -266,7 +327,7 @@ async function request(options) {
     }
     if (error instanceof Error) {
       if (error.name === "AbortError") {
-        throw new TimeoutError(`Request timeout after ${timeout}ms`);
+        throw new TimeoutError(`Request timeout after ${timeout}ms`, true);
       }
       throw new NetworkError(`Network error: ${error.message}`, error);
     }
@@ -294,10 +355,11 @@ function mapStatusCodeToErrorCode(status) {
 
 // src/api/file.ts
 async function getUploadURL(params) {
-  const { token, baseUrl, ...body } = params;
+  const { token, baseUrl, userAgent, ...body } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "getUploadURL",
     body: {
@@ -315,10 +377,11 @@ async function getUploadURL(params) {
   });
 }
 async function getMultiPartUploadURL(params) {
-  const { token, baseUrl, ...body } = params;
+  const { token, baseUrl, userAgent, ...body } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "getMultiPartUploadURL",
     body: {
@@ -334,10 +397,11 @@ async function getMultiPartUploadURL(params) {
   });
 }
 async function completeMultipartUpload(params) {
-  const { token, baseUrl, ...body } = params;
+  const { token, baseUrl, userAgent, ...body } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "completeMultipartUpload",
     body: {
@@ -349,10 +413,11 @@ async function completeMultipartUpload(params) {
   });
 }
 async function getAccessURL(params) {
-  const { token, baseUrl, ...queryParams } = params;
+  const { token, baseUrl, userAgent, ...queryParams } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "GET",
     path: "getAccessURL",
     params: {
@@ -430,21 +495,22 @@ function formatSpeed(bytesPerSecond) {
     return `${(bytesPerSecond / 1024 / 1024).toFixed(2)}MB/s`;
   }
 }
-async function uploadFile(token, buffer, options, baseUrl) {
+async function uploadFile(token, buffer, options, baseUrl, userAgent) {
   const { fileName, contentType, onProgress } = options;
   const size = buffer.length;
   const md5 = await computeMD5(buffer);
   logger.info(`[uploadFile] Starting upload: ${fileName}, size: ${size}, md5: ${md5}`);
   if (size < UPLOAD.MULTIPART_THRESHOLD) {
-    return uploadSingleFile(token, buffer, fileName, contentType, md5, baseUrl, onProgress);
+    return uploadSingleFile(token, buffer, fileName, contentType, md5, baseUrl, userAgent, onProgress);
   } else {
-    return uploadMultipartFile(token, buffer, fileName, contentType, md5, baseUrl, onProgress);
+    return uploadMultipartFile(token, buffer, fileName, contentType, md5, baseUrl, userAgent, onProgress);
   }
 }
-async function uploadSingleFile(token, buffer, fileName, contentType, md5, baseUrl, onProgress) {
+async function uploadSingleFile(token, buffer, fileName, contentType, md5, baseUrl, userAgent, onProgress) {
   const result = await getUploadURL({
     token,
     baseUrl,
+    userAgent,
     originFileName: fileName,
     contentType,
     md5,
@@ -457,13 +523,14 @@ async function uploadSingleFile(token, buffer, fileName, contentType, md5, baseU
   const ossResult = await uploadToOSS(result.signedUrl, buffer, contentType, result.callback || "", onProgress);
   return { fileID: ossResult.id, path: ossResult.path, size: ossResult.size };
 }
-async function uploadMultipartFile(token, buffer, fileName, contentType, md5, baseUrl, onProgress) {
+async function uploadMultipartFile(token, buffer, fileName, contentType, md5, baseUrl, userAgent, onProgress) {
   const size = buffer.length;
   const chunkNum = getChunkNum(size);
   logger.info(`[uploadMultipartFile] Starting multipart upload: ${chunkNum} chunks`);
   const result = await getMultiPartUploadURL({
     token,
     baseUrl,
+    userAgent,
     originFileName: fileName,
     contentType,
     md5,
@@ -511,6 +578,7 @@ async function uploadMultipartFile(token, buffer, fileName, contentType, md5, ba
   const complete = await completeMultipartUpload({
     token,
     baseUrl,
+    userAgent,
     originFileName: fileName,
     md5,
     UploadParts: uploadParts
@@ -518,13 +586,14 @@ async function uploadMultipartFile(token, buffer, fileName, contentType, md5, ba
   logger.info(`[uploadMultipartFile] Upload complete: ${complete.ID}`);
   return { fileID: complete.ID, path: complete.path, size };
 }
-async function sendMediaMessage(token, sessionInfo, options, baseUrl) {
+async function sendMediaMessage(token, sessionInfo, options, baseUrl, userAgent) {
   const { buffer, fileName, contentType, content, onProgress } = options;
-  const { fileID, path } = await uploadFile(token, buffer, { fileName, contentType, onProgress }, baseUrl);
+  const { fileID, path } = await uploadFile(token, buffer, { fileName, contentType, onProgress }, baseUrl, userAgent);
   logger.info(`[sendMediaMessage] fileID=${fileID}, path=${path}`);
   return sendMessage({
     token,
     baseUrl,
+    userAgent,
     sessionInfo,
     msgContent: {
       content: content || "",
@@ -541,12 +610,33 @@ async function sendMediaMessage(token, sessionInfo, options, baseUrl) {
   });
 }
 
+// src/api/user.ts
+async function getUsers(params) {
+  const { token, baseUrl, userAgent } = params;
+  const result = await request({
+    token,
+    baseUrl,
+    userAgent,
+    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;
+  const { token, baseUrl, userAgent, timeout = API.DEFAULT_TIMEOUT, offset, limit = API.DEFAULT_LIMIT } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "getUpdates",
     body: {
@@ -558,10 +648,11 @@ async function getUpdates(params) {
   });
 }
 async function getUpdatesV2(params) {
-  const { token, baseUrl, timeout = API.DEFAULT_TIMEOUT, limit = API.DEFAULT_LIMIT } = params;
+  const { token, baseUrl, userAgent, timeout = API.DEFAULT_TIMEOUT, limit = API.DEFAULT_LIMIT } = params;
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "getUpdatesV2",
     body: {
@@ -572,7 +663,7 @@ async function getUpdatesV2(params) {
   });
 }
 async function sendMessage(params) {
-  const { token, baseUrl, sessionInfo, msgContent } = params;
+  const { token, baseUrl, userAgent, sessionInfo, msgContent } = params;
   const hasContent = msgContent.content && msgContent.content.trim() !== "";
   const hasAttachment = msgContent.extraInfo?.attechmentInfo || msgContent.extraInfo?.attechmentInfos && msgContent.extraInfo.attechmentInfos.length > 0;
   if (!hasContent && !hasAttachment) {
@@ -582,6 +673,7 @@ async function sendMessage(params) {
   return request({
     token,
     baseUrl,
+    userAgent,
     method: "POST",
     path: "sendMessage",
     body: {
@@ -593,16 +685,127 @@ 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;
+  userAgent;
   eventHandlers = /* @__PURE__ */ new Map();
   polling = false;
   offset = 0;
   abortController = null;
+  userCache;
   constructor(config) {
     if (config.token) {
       if (!config.token.includes(":")) {
@@ -618,6 +821,8 @@ var MeetBot = class {
     this.pollingLimit = config.pollingLimit ?? POLLING.DEFAULT_LIMIT;
     this.longPollingTimeout = config.longPollingTimeout ?? POLLING.DEFAULT_TIMEOUT;
     this.useV2 = config.useV2 ?? false;
+    this.userAgent = config.userAgent;
+    this.userCache = new UserCache(config.userCacheOptions);
     logger.setLevel(config.logLevel ?? "silent");
   }
   on(event, handler) {
@@ -669,6 +874,7 @@ var MeetBot = class {
           const result = await getUpdatesV2({
             token: this.token,
             baseUrl: this.baseUrl,
+            userAgent: this.userAgent,
             timeout,
             limit
           });
@@ -682,6 +888,7 @@ var MeetBot = class {
           const updates = await getUpdates({
             token: this.token,
             baseUrl: this.baseUrl,
+            userAgent: this.userAgent,
             timeout,
             offset: this.offset,
             limit
@@ -721,6 +928,7 @@ var MeetBot = class {
     return getUpdates({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...options
     });
   }
@@ -728,6 +936,7 @@ var MeetBot = class {
     return getUpdatesV2({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...options
     });
   }
@@ -735,6 +944,7 @@ var MeetBot = class {
     return sendMessage({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       sessionInfo,
       msgContent
     });
@@ -746,6 +956,7 @@ var MeetBot = class {
     return getUploadURL({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...params
     });
   }
@@ -756,6 +967,7 @@ var MeetBot = class {
     return getMultiPartUploadURL({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...params
     });
   }
@@ -766,6 +978,7 @@ var MeetBot = class {
     return completeMultipartUpload({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...params
     });
   }
@@ -784,6 +997,7 @@ var MeetBot = class {
     return getAccessURL({
       token: this.token,
       baseUrl: this.baseUrl,
+      userAgent: this.userAgent,
       ...apiParams
     });
   }
@@ -791,13 +1005,63 @@ var MeetBot = class {
    * 上传文件（自动选择单文件或分片上传）
    */
   async uploadFile(buffer, options) {
-    return uploadFile(this.token, buffer, options, this.baseUrl);
+    return uploadFile(this.token, buffer, options, this.baseUrl, this.userAgent);
   }
   /**
    * 发送媒体消息（上传并发送）
    */
   async sendMedia(sessionInfo, options) {
-    return sendMediaMessage(this.token, sessionInfo, options, this.baseUrl);
+    return sendMediaMessage(this.token, sessionInfo, options, this.baseUrl, this.userAgent);
+  }
+  /**
+   * 刷新用户缓存
+   */
+  async refreshUserCache() {
+    await this.userCache.load(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl, userAgent: this.userAgent });
+    });
+  }
+  /**
+   * 根据用户 ID 获取用户信息
+   */
+  async getUserById(userId) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl, userAgent: this.userAgent });
+    });
+    return this.userCache.getById(userId);
+  }
+  /**
+   * 批量根据用户 ID 获取用户信息
+   */
+  async getUserByIds(userIds) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl, userAgent: this.userAgent });
+    });
+    return this.userCache.getByIds(userIds);
+  }
+  /**
+   * 根据昵称或别名精确查找用户
+   */
+  async getUserByName(name) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl, userAgent: this.userAgent });
+    });
+    return this.userCache.getByName(name);
+  }
+  /**
+   * 根据昵称或别名模糊搜索用户
+   */
+  async searchUserByName(query) {
+    await this.userCache.ensureLoaded(async () => {
+      return getUsers({ token: this.token, baseUrl: this.baseUrl, userAgent: this.userAgent });
+    });
+    return this.userCache.searchByName(query);
+  }
+  /**
+   * 获取缓存用户数
+   */
+  get userCacheSize() {
+    return this.userCache.size;
   }
   sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -807,6 +1071,4 @@ var MeetBot = class {
 // src/index.ts
 init_error();
 
-export { API, ApiError, CHUNK_RULES, DEFAULT_BASE_URL, HTTP, MeetBot, MeetBotError, NetworkError, POLLING, SESSION_TYPE, TimeoutError, UPLOAD, ValidationError, completeMultipartUpload, computeMD5, getAccessURL, getChunkNum, getConvID, getMultiPartUploadURL, getQuoteMsgKey, getUpdates, getUpdatesV2, getUploadURL, sendMediaMessage, sendMessage, uploadFile };
-//# sourceMappingURL=index.js.map
-//# sourceMappingURL=index.js.map
+export { API, ApiError, CHUNK_RULES, DEFAULT_BASE_URL, HTTP, MeetBot, MeetBotError, NetworkError, POLLING, SESSION_TYPE, TimeoutError, UPLOAD, UserCache, ValidationError, completeMultipartUpload, computeMD5, getAccessURL, getChunkNum, getConvID, getMultiPartUploadURL, getQuoteMsgKey, getUpdates, getUpdatesV2, getUploadURL, getUsers, sendMediaMessage, sendMessage, uploadFile };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meet-im/meet-bot-jssdk",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "MeetIM Chatbot JavaScript SDK - 支持 Long Polling 消息获取和消息发送",
   "type": "module",
   "main": "./dist/index.cjs",