mirai-js 2.7.2 → 2.8.0-1

package/README.md

@@ -27,14 +27,6 @@ QQ 群: 730757181
 
 如果觉得这个项目还不错的话，就动动小手给个 star 吧！
 
-## Star
-
-[![Stargazers repo roster for @Drincann/Mirai-js](https://reporoster.com/stars/Drincann/Mirai-js)](https://github.com/Drincann/Mirai-js/stargazers)
-
-## Fork
-
-[![Forkers repo roster for @Drincann/Mirai-js](https://reporoster.com/forks/Drincann/Mirai-js)](https://github.com/Drincann/Mirai-js/network/members)
-
 ## 支持这个项目
 
 <a href="https://opencollective.com/mirai-js#sponsors" target="_blank"><img src="https://opencollective.com/mirai-js/sponsors.svg?width=890"></a>

package/dist/node/BaseType.d.ts

@@ -1,17 +1,20 @@
+import { Bot } from './Bot';
+import { ArrayToValuesUnion } from './typeHelpers';
+
 /**
  * 消息链的元素，是 mirai-api-http 接口需要的原始类型
  * 有多种消息类型实现了该接口，已经全部列出
- * 
+ *
  * @see https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md
  */
 interface MessageType {
-    type: string;
+    type: MessageChainElementTypes;
 
     // Quote
-    id?: number,
-    groupId?: number,
-    senderId?: number,
-    targetId?: number,
+    id?: number;
+    groupId?: number;
+    senderId?: number;
+    targetId?: number;
     origin?: MessageType[];
 
     // At
@@ -71,7 +74,6 @@ interface BotConfigGetable {
     getSessionKey(): string;
 }
 
-
 // 图片 id
 type ImageId = string;
 // 语音 id
@@ -81,41 +83,291 @@ type MessageId = number;
 
 /**
  * 消息类型
- * 
+ *
  * @see https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md
- */
-type EventType =
-    // WebSocket 事件
-    | 'error' | 'close' | 'unexpected-response'
-    // mirai 事件
-    | 'GroupMessage' | 'FriendMessage'
-    | 'BotOnlineEvent' | 'BotOfflineEventActive'
-    | 'BotOfflineEventForce' | 'BotOfflineEventDropped'
-    | 'BotReloginEvent' | 'BotGroupPermissionChangeEvent'
-    | 'BotMuteEvent' | 'BotUnmuteEvent'
-    | 'BotJoinGroupEvent' | 'BotLeaveEventActive'
-    | 'BotLeaveEventKick' | 'GroupRecallEvent'
-    | 'FriendRecallEvent' | 'GroupNameChangeEvent'
-    | 'GroupEntranceAnnouncementChangeEvent' | 'GroupMuteAllEvent'
-    | 'GroupAllowAnonymousChatEvent' | 'GroupAllowConfessTalkEvent'
-    | 'GroupAllowMemberInviteEvent' | 'MemberJoinEvent'
-    | 'MemberLeaveEventKick' | 'MemberLeaveEventQuit'
-    | 'MemberCardChangeEvent' | 'MemberSpecialTitleChangeEvent'
-    | 'MemberPermissionChangeEvent' | 'MemberMuteEvent'
-    | 'MemberUnmuteEvent' | 'NewFriendRequestEvent'
-    | 'MemberJoinRequestEvent' | 'BotInvitedJoinGroupRequestEvent';
+*/
+
+type MessageChainElementTypes =
+    | 'Source'
+    | 'Quote'
+    | 'At'
+    | 'AtAll'
+    | 'Face'
+    | 'Plain'
+    | 'Image'
+    | 'FlashImage'
+    | 'Voice'
+    | 'Xml'
+    | 'Json'
+    | 'App'
+    | 'Poke'
+    | 'Dice'
+    | 'MarketFace'
+    | 'MusicShare'
+    | 'ForwardMessage'
+    | 'File'
+    | 'MiraiCode';
+
+interface EventBaseType {
+    bot: Bot;
+}
+
+// Middleware
+interface MessageExtendType {
+    text?: string;
+    classified?: {
+        [key in MessageChainElementTypes]?: any[];
+    };
+    messageId?: number;
+    waitFor?: any
+    unlock?: () => void;
+}
+type RequestEventMethods =
+    | 'agree'
+    | 'refuse'
+    | 'ignore'
+    | 'refuseAndAddBlacklist'
+    | 'ignoreAndAddBlacklist';
+
+type RequestEventExtendType = {
+    [key in RequestEventMethods]?: () => void;
+};
+
+interface Member {
+    id: number;
+    memberName: string;
+    specialTitle: string;
+    permission: GroupPermission;
+    joinTimestamp: number;
+    lastSpeakTimestamp: number;
+    muteTimeRemaining: number;
+}
+
+interface GroupSenderType {
+    id: number;
+    name: string;
+    permission: GroupPermission;
+}
+
+interface Friend {
+    id: number,
+    nickname: string,
+    remark: string;
+}
+
+interface EventEntityMap {
+    error: {
+        code: number;
+    } & EventBaseType,
+    close: {
+        reason: string;
+    } & EventBaseType,
+    'unexpected-response': {
+        reason: string;
+    } & EventBaseType,
+    GroupMessage: {
+        type: 'GroupMessage';
+        sender: Member & { group: GroupSenderType },
+        messageChain: MessageType[];
+    } & EventBaseType &
+    MessageExtendType,
+    FriendMessage: {
+        type: 'FriendMessage';
+        messageChain: MessageType[];
+        sender: Friend
+    } & EventBaseType &
+    MessageExtendType,
+    BotOnlineEvent: {
+        type: 'BotOnlineEvent',
+        qq: number
+    } & EventBaseType,
+    BotOfflineEventActive: {
+        type: 'BotOfflineEventActive',
+        qq: number
+    } & EventBaseType,
+    BotOfflineEventForce: {
+        type: 'BotOfflineEventForce',
+        qq: number
+    } & EventBaseType,
+    BotOfflineEventDropped: {
+        type: 'BotOfflineEventDropped',
+        qq: number
+    } & EventBaseType,
+    BotReloginEvent: {
+        type: 'BotReloginEvent',
+        qq: number
+    } & EventBaseType,
+    BotGroupPermissionChangeEvent: {
+        type: 'BotGroupPermissionChangeEvent';
+        origin: Exclude<GroupPermission, 'OWNER'>;
+        current: GroupPermission;
+        group: GroupSenderType;
+    } & EventBaseType,
+    BotMuteEvent: {
+        type: 'BotMuteEvent',
+        durationSeconds: number,
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType,
+    BotUnmuteEvent: {
+        type: 'BotUnmuteEvent',
+        durationSeconds: number,
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType,
+    BotJoinGroupEvent: {
+        type: 'BotJoinGroupEvent',
+        group: GroupSenderType
+        operator?: null | Member & { group: GroupSenderType };
+    };
+    BotLeaveEventActive: {
+        type: 'BotLeaveEventActive',
+        group: GroupSenderType
+    };
+    BotLeaveEventKick: {
+        type: 'BotLeaveEventKick',
+        group: GroupSenderType
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    GroupRecallEvent: {
+        type: 'GroupRecallEvent'
+        authorId: number,
+        messageId: number,
+        time: number,
+        group: GroupSenderType
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    FriendRecallEvent: {
+        type: 'GroupRecallEvent'
+        authorId: number,
+        messageId: number,
+        time: number,
+        operator: number
+    } & EventBaseType;
+    GroupNameChangeEvent: {
+        type: 'GroupNameChangeEvent',
+        origin: string,
+        current: string,
+        group: GroupSenderType;
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    GroupEntranceAnnouncementChangeEvent: {
+        type: 'GroupEntranceAnnouncementChangeEvent',
+        origin: string,
+        current: string,
+        group: GroupSenderType;
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    GroupMuteAllEvent: {
+        type: 'GroupMuteAllEvent',
+        origin: boolean,
+        current: boolean,
+        group: GroupSenderType;
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    GroupAllowAnonymousChatEvent: {
+        type: 'GroupAllowAnonymousChatEvent',
+        origin: boolean,
+        current: boolean,
+        group: GroupSenderType,
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    GroupAllowConfessTalkEvent: {
+        type: 'GroupAllowAnonymousChatEvent',
+        origin: boolean,
+        current: boolean,
+        group: GroupSenderType,
+        isByBot: boolean
+    } & EventBaseType;
+    GroupAllowMemberInviteEvent: EventBaseType;
+    MemberJoinEvent: {
+        type: 'MemberJoinEvent',
+        member: Member & { group: GroupSenderType },
+        invitor: Member;
+    } & EventBaseType;
+    MemberLeaveEventKick: {
+        type: 'MemberLeaveEventKick',
+        member: Member & { group: GroupSenderType },
+        operator: Member & { group: GroupSenderType },
+    } & EventBaseType;
+    MemberLeaveEventQuit: {
+        type: 'MemberLeaveEventQuit',
+        member: Member & { group: GroupSenderType },
+    } & EventBaseType;
+    MemberCardChangeEvent: {
+        type: 'MemberCardChangeEvent',
+        origin: string,
+        current: string,
+        member: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    MemberSpecialTitleChangeEvent: {
+        type: 'MemberSpecialTitleChangeEvent',
+        origin: string,
+        current: string,
+        member: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    MemberPermissionChangeEvent: {
+        type: 'MemberPermissionChangeEvent',
+        origin: string,
+        current: string,
+        member: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    MemberMuteEvent: {
+        type: 'MemberMuteEvent',
+        durationSeconds: number,
+        member: Member & { group: GroupSenderType };
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    MemberUnmuteEvent: {
+        type: 'MemberUnmuteEvent',
+        member: Member & { group: GroupSenderType };
+        operator: Member & { group: GroupSenderType };
+    } & EventBaseType;
+    MemberHonorChangeEvent: {
+        type: 'MemberHonorChangeEvent',
+        member: Member & { group: GroupSenderType }
+        action: 'achieve' | 'lose',
+        honor: string;
+    }
+    NewFriendRequestEvent: {
+        type: 'NewFriendRequestEvent',
+        eventId: number,
+        fromId: number,
+        groupId: number,
+        nick: string,
+        message: string
+    } & RequestEventExtendType & EventBaseType;
+    MemberJoinRequestEvent: {
+        type: 'MemberJoinRequestEvent',
+        eventId: number,
+        fromId: number,
+        groupId: number,
+        groupName: string,
+        nick: string,
+        message: string
+    } & RequestEventExtendType & EventBaseType;
+    BotInvitedJoinGroupRequestEvent: {
+        type: 'MemberJoinRequestEvent',
+        eventId: number,
+        fromId: number,
+        groupId: number,
+        groupName: string,
+        nick: string,
+        message: string
+    } & RequestEventExtendType & EventBaseType;
+}
+
+type EventType = keyof EventEntityMap;
+
+type Awaitable<T> = T | PromiseLike<T>;
 
 // 群成员权限
-type GroupPermission =
-    | 'OWNER'
-    | 'ADMINISTRATOR'
-    | 'MEMBER';
+type GroupPermission = 'OWNER' | 'ADMINISTRATOR' | 'MEMBER';
 
 // 性别
-type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE'
+type SEX = 'UNKNOWN' | 'MALE' | 'FEMALE';
 
 // 消息处理器
-type Processor = (data: any) => Promise<any> | any;
+type Processor<U extends EventType[] | 'UnknownEventType' = 'UnknownEventType'> =
+    (data: U extends 'UnknownEventType' ? EventBaseType : EventEntityMap[ArrayToValuesUnion<U extends 'UnknownEventType' ? never : U>]) => Awaitable<void | any>;
 
 // QQ 自带表情
 type FaceType =
@@ -175,22 +427,16 @@ type FaceType =
 export {
     // 接口
     MessageChainGetable, BotConfigGetable,
-
     // 消息类型
     MessageType,
-
     // MessageType.nodeList 的元素类型
     ForwardNode,
-
     // 图片 id  语音 id  消息 id
     ImageId, VoiceId, MessageId,
-
-    // 事件类型    群成员权限      性别
-    EventType, GroupPermission, SEX,
-
-    // 消息处理器
-    Processor,
-
+    // 事件类型            群成员权限        性别
+    EventType, EventEntityMap, GroupPermission, SEX,
     // QQ 自带表情
-    FaceType
-};
+    FaceType,
+    Processor,
+    Awaitable,
+};

package/dist/node/Bot.d.ts

@@ -3,10 +3,14 @@ import {
     ImageId, VoiceId, MessageId,
 
     // 事件类型    群成员权限      性别
-    EventType, GroupPermission, SEX,
+    EventType, EventEntityMap, GroupPermission, SEX,
 
     // 接口               原始消息类型  事件处理器类型
-    MessageChainGetable, BotConfigGetable, MessageType, Processor
+    MessageChainGetable, BotConfigGetable, MessageType,
+
+    Awaitable,
+    Processor,
+
 } from './BaseType';
 
 // 等待器
@@ -19,9 +23,7 @@ export class Bot implements BotConfigGetable {
 
     // 类属性
     public static groupPermission: {
-        OWNER: GroupPermission;
-        ADMINISTRATOR: GroupPermission;
-        MEMBER: GroupPermission;
+        [k in GroupPermission]: k
     };
 
     // 一些私有的实例属性
@@ -91,7 +93,8 @@ export class Bot implements BotConfigGetable {
      * @param callback  必选，回调函数
      * @returns handle 事件处理器的标识，用于移除该处理器
      */
-    on(eventType: EventType | EventType[], processor: Processor): number | number[];
+    on<U extends EventType>(eventType: U, callback: Processor<[U]>): number;
+    on<U extends EventType[]>(eventType: U, callback: Processor<U>): number[];
 
     /**
      * @description 添加一个一次性事件处理器，回调一次后自动移除
@@ -101,7 +104,8 @@ export class Bot implements BotConfigGetable {
      *                  当为 true 时，只有开发者的处理器结束后才会移除该处理器
      *                  当为 false 时，即使消息被拦截，也会移除该处理器
      */
-    one(eventType: EventType | EventType[], processor: Processor, strict: boolean,): void;
+    one<U extends EventType>(eventType: U, callback: Processor<[U]>, strict: boolean): void;
+    one<U extends EventType[]>(eventType: U, callback: Processor<U>, strict: boolean): void;
 
     /**
      * @description 移除一个事件处理器
@@ -314,11 +318,12 @@ declare namespace Bot {
         verifyKey: string;
         sessionKey: string;
     }
+
     // An index signature parameter type cannot be a union type. Consider using a mapped object type instead.
-    interface EventProcessorMap {
+    type EventProcessorMap = {
         // 索引不能使用联合类型
-        [eventType: string /* EventType */]: {
-            [handle: number]: Processor;
+        [eventType in EventType]: {
+            [handler: number]: (data: EventEntityMap[eventType]) => Awaitable<void | any>;
         };
     }
 

package/dist/node/Message.d.ts

@@ -58,9 +58,9 @@ export class ForwardMessage implements MessageChainGetable {
         time,
         senderName,
         messageChain
-    }: ForwardNode): Message;
-    addForwardNode(messageId: MessageId): ForwardMessage;
+    }: ForwardNode): this;
+    addForwardNode(messageId: MessageId): this;
 
     // implements MessageChainGetable
     getMessageChain(): MessageType[];
-}
+}

package/dist/node/index.d.ts

@@ -1,6 +1,8 @@
-import { Bot as BotType } from './Bot';
-import { Message as MessageType } from './Message';
-import { Middleware as MiddlewareType } from './Middleware';
+import { Bot, Bot as BotType } from './Bot';
+import { Message, Message as MessageType } from './Message';
+import { Middleware, Middleware as MiddlewareType } from './Middleware';
+
+export { Bot, Message, Middleware };
 declare module 'mirai-js' {
     export const Bot: typeof BotType;
     export const Message: typeof MessageType;

package/dist/node/typeHelpers.d.ts

@@ -0,0 +1,2 @@
+// 将数组转换为
+export type ArrayToValuesUnion<T extends string[]> = T extends (infer E)[] ? E : never;

package/index.ts

@@ -0,0 +1,7 @@
+import { Bot } from './src';
+const bot = new Bot();
+bot.on(['FriendMessage', 'NewFriendRequestEvent'], e => {
+
+
+
+})

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "mirai-js",
-    "version": "2.7.2",
+    "version": "2.8.0-1",
     "description": "QQ robot development framework based on Mirai-api-http.",
     "main": "dist/node/index.js",
     "scripts": {
         "lint": "eslint --fix .",
-        "build": "tsc --noEmit src/*.d.ts && webpack && babel src --out-dir dist/node --copy-files",
+        "build": "rm -rf dist && tsc --noEmit src/*.d.ts && webpack && babel src --out-dir dist/node --copy-files",
         "prepare": "husky install"
     },
     "lint-staged": {
@@ -31,22 +31,22 @@
     "license": "AGPL-3.0",
     "dependencies": {
         "axios": "^0.24.0",
-        "form-data": "^3.0.0",
-        "ws": "^8.4.0"
+        "form-data": "^3.0.1",
+        "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.13.14",
-        "@babel/core": "^7.13.14",
-        "@babel/preset-env": "^7.13.12",
-        "@typescript-eslint/eslint-plugin": "^5.4.0",
-        "@typescript-eslint/parser": "^5.5.0",
-        "eslint": "^8.2.0",
+        "@babel/cli": "^7.18.9",
+        "@babel/core": "^7.18.9",
+        "@babel/preset-env": "^7.18.9",
+        "@typescript-eslint/eslint-plugin": "^5.30.7",
+        "@typescript-eslint/parser": "^5.30.7",
+        "eslint": "^8.20.0",
         "husky": "^6.0.0",
-        "lint-staged": "^12.0.2",
+        "lint-staged": "^12.5.0",
         "path-browserify": "^1.0.1",
         "process": "^0.11.10",
-        "typescript": "^4.2.2",
-        "webpack": "^5.30.0",
-        "webpack-cli": "^4.6.0"
+        "typescript": "^4.7.4",
+        "webpack": "^5.73.0",
+        "webpack-cli": "^4.10.0"
     }
 }