@naplink/naplink 0.0.2 → 0.0.4

package/README.md

@@ -1,8 +1,8 @@
 # NapLink
 
-> 现代化的 NapCat WebSocket 客户端 SDK
+> 现代化的 NapCat WebSocket TypeScript/JavaScript 客户端 SDK
 
-[![npm version](https://img.shields.io/npm/v/naplink)](https://www.npmjs.com/package/naplink)
+[![npm](https://img.shields.io/npm/v/@naplink/naplink?logo=npm)](https://www.npmjs.com/package/@naplink/naplink)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.4+-blue)](https://www.typescriptlang.org/)
 [![Node.js](https://img.shields.io/badge/Node.js-18+-green)](https://nodejs.org/)
 [![Documentation](https://img.shields.io/badge/docs-naplink.github.io-blue)](https://naplink.github.io/)
@@ -27,16 +27,12 @@
 - [事件处理](https://naplink.github.io/guide/events) - 事件系统详解
 - [最佳实践](https://naplink.github.io/guide/best-practices) - 生产环境建议
 - [架构设计](https://naplink.github.io/guide/architecture) - 内部实现
-- 最佳实践项目：[NapGram](https://github.com/NapLink/NapGram) - 基于 NapLink 的 QQ ↔ Telegram 消息桥接
+- 最佳实践项目：[NapGram](https://github.com/NapGram/NapGram) - 基于 NapLink 的 QQ ↔ Telegram 消息桥接
 
 ## 📦 安装
 
 ```bash
-npm install naplink
-# 或
 pnpm add naplink
-# 或
-yarn add naplink
 ```
 
 ## 🔧 配置示例
@@ -68,19 +64,19 @@ const client = new NapLink({
 
 ```bash
 # 安装依赖
-npm install
+pnpm install
 
 # 开发模式
-npm run dev
+pnpm dev
 
 # 构建
-npm run build
+pnpm build
 
 # 测试
-npm test
+pnpm test
 
 # 类型检查
-npm run typecheck
+pnpm typecheck
 ```
 
 ## 📄 许可证

package/dist/index.d.ts

@@ -101,13 +101,15 @@ declare class ConnectionManager {
     private logger;
     private onMessage;
     private onStateChange;
+    private emitter?;
     private ws?;
     private state;
     private reconnectService;
     private heartbeatService?;
     private connectPromise?;
     private connectTimeout?;
-    constructor(config: NapLinkConfig, logger: Logger, onMessage: (data: string) => void, onStateChange: (state: ConnectionState) => void);
+    private wasReconnecting;
+    constructor(config: NapLinkConfig, logger: Logger, onMessage: (data: string) => void, onStateChange: (state: ConnectionState, wasReconnecting?: boolean) => void, emitter?: any | undefined);
     /**
      * 连接到WebSocket服务器
      */
@@ -350,6 +352,15 @@ interface PokeNotice extends NotifyNotice {
     user_id: number;
     group_id?: number;
 }
+interface GroupGrayTipNotice extends NotifyNotice {
+    sub_type: 'gray_tip';
+    group_id: number;
+    user_id: number;
+    message_id: number;
+    busi_id: string;
+    content: string;
+    raw_info: unknown;
+}
 
 interface RequestEvent extends BaseEvent {
     post_type: 'request';
@@ -439,6 +450,7 @@ type MessageApi = {
         group_id?: number | string;
         user_id?: number | string;
         count?: number;
+        cookie?: string;
     }): Promise<any>;
     sendGroupPoke(groupId: number | string, userId: number | string): Promise<any>;
     sendFriendPoke(userId: number | string): Promise<any>;
@@ -479,8 +491,8 @@ type GroupApi = {
 };
 
 type FileApi = {
-    uploadGroupFile(groupId: number | string, file: string | Buffer | Uint8Array | NodeJS.ReadableStream, name: string): Promise<any>;
-    uploadPrivateFile(userId: number | string, file: string | Buffer | Uint8Array | NodeJS.ReadableStream, name: string): Promise<any>;
+    uploadGroupFile(groupId: number | string, file: string | Buffer | Uint8Array | NodeJS.ReadableStream, name: string, folder?: string, uploadFile?: boolean): Promise<any>;
+    uploadPrivateFile(userId: number | string, file: string | Buffer | Uint8Array | NodeJS.ReadableStream, name: string, uploadFile?: boolean): Promise<any>;
     setGroupPortrait(groupId: number | string, file: string | Buffer | Uint8Array | NodeJS.ReadableStream): Promise<any>;
     getGroupFileSystemInfo(groupId: number | string): Promise<any>;
     getGroupRootFiles(groupId: number | string): Promise<any>;
@@ -650,6 +662,13 @@ type NapCatApi = {
     setGroupSign(groupId: number | string): Promise<any>;
     sendGroupSign(groupId: number | string): Promise<any>;
     fetchCustomFace(params?: any): Promise<any>;
+    getEmojiLikes(params: {
+        message_id: string;
+        emoji_id: string;
+        emoji_type?: string;
+        group_id?: string;
+        count?: number;
+    }): Promise<any>;
     getClientkey(): Promise<any>;
     clickInlineKeyboardButton(params: {
         group_id: number | string;
@@ -800,6 +819,14 @@ type OneBotApiMethods = {
         group_id?: number | string;
         user_id?: number | string;
         count?: number;
+        cookie?: string;
+    }): Promise<any>;
+    getEmojiLikes(params: {
+        message_id: string;
+        emoji_id: string;
+        emoji_type?: string;
+        group_id?: string;
+        count?: number;
     }): Promise<any>;
     fetchCustomFace(params?: any): Promise<any>;
     sendGroupPoke(groupId: number | string, userId: number | string): Promise<any>;
@@ -827,8 +854,8 @@ type OneBotApiMethods = {
     deleteEssenceMessage(messageId: number | string): Promise<any>;
     setGroupSpecialTitle(groupId: number | string, userId: number | string, specialTitle: string, duration?: number): Promise<any>;
     sendLike(userId: number | string, times?: number): Promise<any>;
-    uploadGroupFile(groupId: number | string, file: string, name: string): Promise<any>;
-    uploadPrivateFile(userId: number | string, file: string, name: string): Promise<any>;
+    uploadGroupFile(groupId: number | string, file: string, name: string, folder?: string, uploadFile?: boolean): Promise<any>;
+    uploadPrivateFile(userId: number | string, file: string, name: string, uploadFile?: boolean): Promise<any>;
     getStrangerInfo(userId: number | string, noCache?: boolean): Promise<any>;
     getVersionInfo(): Promise<any>;
     handleFriendRequest(flag: string, approve?: boolean, remark?: string): Promise<any>;
@@ -1098,4 +1125,4 @@ type MarkdownSegment = {
 };
 type OneBotMessageSegment = TextSegment | AtSegment | FaceSegment | ReplySegment | ImageSegment | RecordSegment | VideoSegment | FileSegment | JsonSegment | XmlSegment | MarkdownSegment;
 
-export { type Anonymous, ApiError, ApiTimeoutError, type AtSegment, type BaseEvent, ConnectionClosedError, ConnectionError, ConnectionState, type FaceSegment, type FileInfo, type FileSegment, type FriendAddNotice, type FriendRecallNotice, type FriendRequest, type GroupAdminNotice, type GroupDecreaseNotice, type GroupHonorInfo, type GroupIncreaseNotice, type GroupInviteRequest, type GroupJoinRequest, type GroupMessageEvent, type GroupRecallNotice, type GroupRequest, type GroupSystemMessages, type GroupUploadNotice, type HeartbeatMetaEvent, type ImageSegment, InvalidConfigError, type JsonSegment, type LifecycleMetaEvent, type Logger, type MarkdownSegment, MaxReconnectAttemptsError, type MessageEvent, type MessageSegment, type MetaEvent, NapLink, type NapLinkConfig, NapLinkError, type NoticeEvent, type NotifyNotice, OneBotApi, type OneBotMessageSegment, type PartialNapLinkConfig, type PokeNotice, type PostType, type PrivateMessageEvent, type RecordSegment, type ReplySegment, type RequestEvent, type Sender, type TextSegment, type VideoSegment, type XmlSegment, NapLink as default };
+export { type Anonymous, ApiError, ApiTimeoutError, type AtSegment, type BaseEvent, ConnectionClosedError, ConnectionError, ConnectionState, type FaceSegment, type FileInfo, type FileSegment, type FriendAddNotice, type FriendRecallNotice, type FriendRequest, type GroupAdminNotice, type GroupDecreaseNotice, type GroupGrayTipNotice, type GroupHonorInfo, type GroupIncreaseNotice, type GroupInviteRequest, type GroupJoinRequest, type GroupMessageEvent, type GroupRecallNotice, type GroupRequest, type GroupSystemMessages, type GroupUploadNotice, type HeartbeatMetaEvent, type ImageSegment, InvalidConfigError, type JsonSegment, type LifecycleMetaEvent, type Logger, type MarkdownSegment, MaxReconnectAttemptsError, type MessageEvent, type MessageSegment, type MetaEvent, NapLink, type NapLinkConfig, NapLinkError, type NoticeEvent, type NotifyNotice, OneBotApi, type OneBotMessageSegment, type PartialNapLinkConfig, type PokeNotice, type PostType, type PrivateMessageEvent, type RecordSegment, type ReplySegment, type RequestEvent, type Sender, type TextSegment, type VideoSegment, type XmlSegment, NapLink as default };

package/dist/index.js

@@ -328,11 +328,14 @@ function startHeartbeat(deps) {
 
 // src/core/connection/retry-handler.ts
 function handleReconnect(deps) {
-  const { config, logger, reconnectService, setState, connect } = deps;
+  const { config, logger, reconnectService, setState, connect, onMaxAttemptsReached } = deps;
   if (!reconnectService.hasRemainingAttempts()) {
     setState("disconnected" /* DISCONNECTED */);
     const err = new MaxReconnectAttemptsError(reconnectService.getMaxAttempts());
     logger.error("\u81EA\u52A8\u91CD\u8FDE\u5DF2\u8FBE\u4E0A\u9650\uFF0C\u505C\u6B62\u91CD\u8FDE", err);
+    if (onMaxAttemptsReached) {
+      onMaxAttemptsReached();
+    }
     return false;
   }
   setState("reconnecting" /* RECONNECTING */);
@@ -341,6 +344,9 @@ function handleReconnect(deps) {
     setState("disconnected" /* DISCONNECTED */);
     const err = new MaxReconnectAttemptsError(config.reconnect.maxAttempts);
     logger.error("\u81EA\u52A8\u91CD\u8FDE\u5DF2\u8FBE\u4E0A\u9650\uFF0C\u505C\u6B62\u91CD\u8FDE", err);
+    if (onMaxAttemptsReached) {
+      onMaxAttemptsReached();
+    }
     return false;
   }
   return true;
@@ -348,7 +354,7 @@ function handleReconnect(deps) {
 
 // src/core/connection/close-handler.ts
 function handleCloseEvent(deps, event) {
-  const { getState, setState, stopHeartbeat, logger, config, reconnectService, reconnect } = deps;
+  const { getState, setState, stopHeartbeat, logger, config, reconnectService, reconnect, onMaxAttemptsReached } = deps;
   stopHeartbeat();
   logger.info(`\u8FDE\u63A5\u5173\u95ED (code: ${event.code}, reason: ${event.reason})`);
   if (event.code === 1e3) {
@@ -362,7 +368,9 @@ function handleCloseEvent(deps, event) {
       logger,
       reconnectService,
       setState,
-      connect: reconnect
+      connect: reconnect,
+      onMaxAttemptsReached
+      // 传递回调
     });
   } else {
     setState("disconnected" /* DISCONNECTED */);
@@ -412,11 +420,13 @@ function attachWebSocketHandlers(ws, deps, resolve, reject) {
 
 // src/core/connection/manager.ts
 var ConnectionManager = class {
-  constructor(config, logger, onMessage, onStateChange) {
+  // 跟踪是否处于重连状态
+  constructor(config, logger, onMessage, onStateChange, emitter) {
     this.config = config;
     this.logger = logger;
     this.onMessage = onMessage;
     this.onStateChange = onStateChange;
+    this.emitter = emitter;
     this.reconnectService = new ReconnectService(config.reconnect, logger);
   }
   ws;
@@ -425,6 +435,7 @@ var ConnectionManager = class {
   heartbeatService;
   connectPromise;
   connectTimeout;
+  wasReconnecting = false;
   /**
    * 连接到WebSocket服务器
    */
@@ -480,7 +491,15 @@ var ConnectionManager = class {
             logger: this.logger,
             config: this.config,
             reconnectService: this.reconnectService,
-            reconnect: () => this.connect()
+            reconnect: () => this.connect(),
+            onMaxAttemptsReached: () => {
+              if (this.emitter) {
+                this.emitter.emit("connection:lost", {
+                  timestamp: Date.now(),
+                  attempts: this.reconnectService.getMaxAttempts()
+                });
+              }
+            }
           }, event),
           clearConnectTimeout: () => this.clearConnectTimeout()
         },
@@ -540,7 +559,14 @@ var ConnectionManager = class {
     if (this.state !== state) {
       this.state = state;
       this.logger.debug(`\u72B6\u6001\u53D8\u66F4: ${state}`);
-      this.onStateChange(state);
+      if (state === "reconnecting" /* RECONNECTING */) {
+        this.wasReconnecting = true;
+      } else if (state === "connected" /* CONNECTED */) {
+        this.onStateChange(state, this.wasReconnecting);
+        this.wasReconnecting = false;
+        return;
+      }
+      this.onStateChange(state, false);
     }
   }
   /**
@@ -1050,11 +1076,14 @@ var MessageDispatcher = class {
 };
 
 // src/core/connection/state-handler.ts
-function handleConnectionStateChange(emitter, state) {
+function handleConnectionStateChange(emitter, state, wasReconnecting = false) {
   emitter.emit("state_change", state);
   switch (state) {
     case "connected" /* CONNECTED */:
       emitter.emit("connect");
+      if (wasReconnecting) {
+        emitter.emit("connection:restored", { timestamp: Date.now() });
+      }
       break;
     case "disconnected" /* DISCONNECTED */:
       emitter.emit("disconnect");
@@ -1308,13 +1337,13 @@ function createFileApi(client) {
     return tempPath;
   };
   return {
-    async uploadGroupFile(groupId, file, name) {
+    async uploadGroupFile(groupId, file, name, folder, uploadFile = true) {
       const normalized = await normalizeFileInput(file, name);
-      return client.call("upload_group_file", { group_id: groupId, file: normalized, name });
+      return client.call("upload_group_file", { group_id: groupId, file: normalized, name, folder, upload_file: uploadFile });
     },
-    async uploadPrivateFile(userId, file, name) {
+    async uploadPrivateFile(userId, file, name, uploadFile = true) {
       const normalized = await normalizeFileInput(file, name);
-      return client.call("upload_private_file", { user_id: userId, file: normalized, name });
+      return client.call("upload_private_file", { user_id: userId, file: normalized, name, upload_file: uploadFile });
     },
     async setGroupPortrait(groupId, file) {
       return this.uploadGroupFile(groupId, file, "portrait");
@@ -1677,6 +1706,9 @@ function createNapCatApi(client) {
     fetchCustomFace(params) {
       return client.call("fetch_custom_face", params ?? {});
     },
+    getEmojiLikes(params) {
+      return client.call("get_emoji_likes", params);
+    },
     getClientkey() {
       return client.call("get_clientkey");
     },
@@ -1938,6 +1970,7 @@ function bindOneBotApiMethods(api, target) {
     getRecentContact: (count) => api.getRecentContact(count),
     setMsgEmojiLike: (messageId, emojiId, set) => api.setMsgEmojiLike(messageId, emojiId, set),
     fetchEmojiLike: (params) => api.fetchEmojiLike(params),
+    getEmojiLikes: (params) => api.getEmojiLikes(params),
     sendGroupPoke: (groupId, userId) => api.sendGroupPoke(groupId, userId),
     sendFriendPoke: (userId) => api.sendFriendPoke(userId),
     sendPoke: (targetId, groupId) => api.sendPoke(targetId, groupId),
@@ -1963,8 +1996,8 @@ function bindOneBotApiMethods(api, target) {
     deleteEssenceMessage: (messageId) => api.deleteEssenceMessage(messageId),
     setGroupSpecialTitle: (groupId, userId, specialTitle, duration = -1) => api.setGroupSpecialTitle(groupId, userId, specialTitle, duration),
     sendLike: (userId, times = 1) => api.sendLike(userId, times),
-    uploadGroupFile: (groupId, file, name) => api.uploadGroupFile(groupId, file, name),
-    uploadPrivateFile: (userId, file, name) => api.uploadPrivateFile(userId, file, name),
+    uploadGroupFile: (groupId, file, name, folder, uploadFile) => api.uploadGroupFile(groupId, file, name, folder, uploadFile),
+    uploadPrivateFile: (userId, file, name, uploadFile) => api.uploadPrivateFile(userId, file, name, uploadFile),
     getStrangerInfo: (userId, noCache = false) => api.getStrangerInfo(userId, noCache),
     getVersionInfo: () => api.getVersionInfo(),
     handleFriendRequest: (flag, approve = true, remark) => api.handleFriendRequest(flag, approve, remark),
@@ -2097,7 +2130,9 @@ var NapLink = class extends EventEmitter2 {
       this.config,
       this.logger,
       (message) => this.dispatcher.dispatch(message),
-      (state) => handleConnectionStateChange(this, state)
+      (state, wasReconnecting) => handleConnectionStateChange(this, state, wasReconnecting || false),
+      this
+      // 传递 emitter 用于发送 connection:lost 事件
     );
     this.apiClient = new ApiClient(this.connection, this.config, this.logger);
     this.dispatcher = new MessageDispatcher(this.apiClient, this.eventRouter, this.logger);