@alemonjs/qq-bot 0.0.1 → 0.0.3

package/README.md

@@ -30,6 +30,8 @@ qq-group-bot:
   port: 17157
   # 如果在服务器也启动了机器人，可以进行互相调用
   ws: 'ws://...'
+  # 频道沙盒
+  sandbox: false
 ```
 
 ## Community

package/lib/api.js

@@ -23,36 +23,54 @@ class QQBotAPI {
      * @param url
      * @returns
      */
-    getAuthentication(appId, clientSecret) {
+    getAuthentication(app_id, clientSecret) {
         return axios.post(`${this.BOTS_API_RUL}/app/getAppAccessToken`, {
-            appId: appId,
+            appId: app_id,
             clientSecret: clientSecret
         });
     }
     /**
-     * 创建axios实例
+     * group
      * @param config
      * @returns
      */
-    async GroupService(options) {
-        const appId = config.get('appId');
-        const token = config.get('token');
+    async groupService(options) {
+        const app_id = config.get('app_id');
+        const token = config.get('access_token');
         const service = await axios.create({
             baseURL: this.API_URL,
             timeout: 20000,
             headers: {
-                'X-Union-Appid': appId,
+                'X-Union-Appid': app_id,
                 'Authorization': `QQBot ${token}`
             }
         });
         return service(options);
     }
+    /**
+     * guild
+     * @param opstion
+     * @returns
+     */
+    async guildServer(opstion) {
+        const app_id = config.get('app_id');
+        const token = config.get('token');
+        const sandbox = config.get('sandbox');
+        const service = await axios.create({
+            baseURL: sandbox ? this.API_URL_SANDBOX : this.API_URL,
+            timeout: 20000,
+            headers: {
+                Authorization: `Bot ${app_id}.${token}`
+            }
+        });
+        return service(opstion);
+    }
     /**
      * 得到鉴权
      * @returns
      */
     async gateway() {
-        return this.GroupService({
+        return this.groupService({
             url: '/gateway'
         }).then(res => res?.data);
     }
@@ -66,7 +84,7 @@ class QQBotAPI {
      */
     async usersOpenMessages(openid, data, msg_id) {
         console.log('msg_id', msg_id);
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/users/${openid}/messages`,
             method: 'post',
             data: data
@@ -98,7 +116,7 @@ class QQBotAPI {
      * @returns
      */
     async groupOpenMessages(group_openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/groups/${group_openid}/messages`,
             method: 'post',
             data: data
@@ -114,7 +132,7 @@ class QQBotAPI {
      * 图片：png/jpg，视频：mp4，语音：silk
      */
     async postRichMediaByUsers(openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/users/${openid}/files`,
             method: 'post',
             data: data
@@ -130,7 +148,7 @@ class QQBotAPI {
      * 图片：png/jpg，视频：mp4，语音：silk
      */
     async userFiles(openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/users/${openid}/files`,
             method: 'post',
             data: data
@@ -146,7 +164,7 @@ class QQBotAPI {
      * 图片：png/jpg，视频：mp4，语音：silk
      */
     async postRichMediaByGroup(openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/groups/${openid}/files`,
             method: 'post',
             data: {
@@ -162,7 +180,7 @@ class QQBotAPI {
      * @returns
      */
     async groupsFiles(openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/groups/${openid}/files`,
             method: 'post',
             data: {
@@ -283,7 +301,7 @@ class QQBotAPI {
      * @returns
      */
     userMessageDelete(openid, message_id) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/users/${openid}/messages/${message_id}`,
             method: 'delete'
         }).then(res => res?.data);
@@ -295,29 +313,11 @@ class QQBotAPI {
      * @returns
      */
     grouMessageDelte(group_openid, message_id) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/groups/${group_openid}/messages/${message_id}`,
             method: 'delete'
         }).then(res => res?.data);
     }
-    /**
-     * 基础请求
-     * @param opstion
-     * @returns
-     */
-    async request(opstion) {
-        const appId = config.get('appId');
-        const token = config.get('token');
-        const sandbox = config.get('sandbox');
-        const service = await axios.create({
-            baseURL: sandbox ? this.API_URL_SANDBOX : this.API_URL,
-            timeout: 20000,
-            headers: {
-                Authorization: `Bot ${appId}.${token}`
-            }
-        });
-        return service(opstion);
-    }
     /**
      * 创建form
      * @param image
@@ -353,7 +353,7 @@ class QQBotAPI {
     async postImage(channel_id, message) {
         const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
         const dary = formdata != false ? formdata.getBoundary() : '';
-        return this.request({
+        return this.guildServer({
             method: 'post',
             url: `/channels/${channel_id}/messages`,
             headers: {
@@ -371,7 +371,7 @@ class QQBotAPI {
     async postDirectImage(guild_id, message) {
         const formdata = await this.createFrom(message.image, message.msg_id, message.content, message.name);
         const dary = formdata != false ? formdata.getBoundary() : '';
-        return this.request({
+        return this.guildServer({
             method: 'post',
             url: `/dms/${guild_id}/messages`,
             headers: {
@@ -391,7 +391,7 @@ class QQBotAPI {
      * @returns
      */
     async usersMe() {
-        return this.request({
+        return this.guildServer({
             method: 'get',
             url: `/users/@me`
         }).then(res => res?.data);
@@ -402,7 +402,7 @@ class QQBotAPI {
      * @returns
      */
     async usersMeGuilds(params) {
-        return this.request({
+        return this.guildServer({
             method: 'get',
             url: `/users/@me/guilds`,
             params
@@ -419,7 +419,7 @@ class QQBotAPI {
      * @returns
      */
     async guilds(guild_id) {
-        return this.request({
+        return this.guildServer({
             method: 'get',
             url: `/guilds/${guild_id}`
         }).then(res => res?.data);
@@ -435,7 +435,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsChannels(guild_id) {
-        return this.request({
+        return this.guildServer({
             method: 'get',
             url: `/guilds/${guild_id}/channels`
         }).then(res => res?.data);
@@ -446,7 +446,7 @@ class QQBotAPI {
      * @returns
      */
     async channels(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'get',
             url: `/channels/${channel_id}`
         }).then(res => res?.data);
@@ -457,7 +457,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsChannelsCreate(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'post',
             url: `/guilds/${guild_id}/channels`,
             data
@@ -469,7 +469,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsChannelsUpdate(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/channels/${channel_id}`,
             data
@@ -482,7 +482,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsChannelsdelete(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}`,
             data
@@ -494,7 +494,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsChannelOnlineNums(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/online_nums`
         }).then(res => res?.data);
@@ -510,7 +510,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsMembers(guild_id, params) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/guilds/${guild_id}/members`,
             params
@@ -524,7 +524,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRolesMembers(guild_id, role_id, params) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/guilds/${guild_id}/roles/${role_id}/members`,
             params
@@ -537,7 +537,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsMembersMessage(guild_id, user_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/guilds/${guild_id}/members/${user_id}`
         }).then(res => res?.data);
@@ -549,7 +549,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsMembersDelete(guild_id, user_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/guilds/${guild_id}/members/${user_id}`
         }).then(res => res?.data);
@@ -561,7 +561,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsMessages(channel_id, message_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/messages/${message_id}`
         }).then(res => res?.data);
@@ -574,7 +574,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsMessagesPost(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/channels/${channel_id}/messages`,
             data
@@ -588,7 +588,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsMessagesDelete(channel_id, message_id, hidetip = true) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/messages/${message_id}?hidetip=${hidetip}`
         }).then(res => res?.data);
@@ -604,7 +604,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRoles(guild_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/guilds/${guild_id}/roles`
         }).then(res => res?.data);
@@ -619,7 +619,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRolesPost(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/guilds/${guild_id}/roles`,
             data
@@ -635,7 +635,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRolesPatch(guild_id, role_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/guilds/${guild_id}/roles/${role_id}`,
             data
@@ -647,7 +647,7 @@ class QQBotAPI {
      * @param role_id 身份组id
      */
     async guildsRolesDelete(guild_id, role_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/guilds/${guild_id}/roles/${role_id}`
         }).then(res => res?.data);
@@ -661,7 +661,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRolesMembersPut(guild_id, channel_id, user_id, role_id) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/guilds/${guild_id}/members/${user_id}/roles/${role_id}`,
             data: {
@@ -680,7 +680,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsRolesMembersDelete(guild_id, channel_id, user_id, role_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/guilds/${guild_id}/members/${user_id}/roles/${role_id}`,
             data: {
@@ -701,7 +701,7 @@ class QQBotAPI {
      * @param user_id 用户id
      */
     async channelsPermissions(channel_id, user_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/members/${user_id}/permissions`
         }).then(res => res?.data);
@@ -713,7 +713,7 @@ class QQBotAPI {
      * @param 参数包括add和remove两个字段分别表示授予的权限以及删除的权限。要授予用户权限即把add对应位置 1，删除用户权限即把remove对应位置 1。当两个字段同一位都为 1，表现为删除权限。
      */
     async channelsPermissionsPut(channel_id, user_id, add, remove) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/channels/${channel_id}/members/${user_id}/permissions`,
             data: {
@@ -738,7 +738,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsMessageSetting(guild_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/guilds/${guild_id}/message/setting`
         }).then(res => res?.data);
@@ -755,7 +755,7 @@ class QQBotAPI {
      * @returns
      */
     async usersMeDms() {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/users/@me/dms`
         }).then(res => res?.data);
@@ -766,7 +766,7 @@ class QQBotAPI {
      * @returns
      */
     async dmsMessage(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/dms/${guild_id}/messages`,
             data
@@ -779,7 +779,7 @@ class QQBotAPI {
      * @returns
      */
     async dmsMessageDelete(guild_id, message_id, hidetip = true) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/dms/${guild_id}/messages/${message_id}?hidetip=${hidetip}`
         }).then(res => res?.data);
@@ -796,7 +796,7 @@ class QQBotAPI {
      * 将mute_end_timestamp或mute_seconds传值为字符串'0'，则表示解除全体禁言
      */
     async guildsMuteAll(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/guilds/${guild_id}/mute`,
             data
@@ -811,7 +811,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsMemberMute(guild_id, user_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/guilds/${guild_id}/members/${user_id}/mute`,
             data
@@ -824,7 +824,7 @@ class QQBotAPI {
      * 将mute_end_timestamp或mute_seconds传值为字符串'0'，则表示解除禁言
      */
     async guildsMute(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/guilds/${guild_id}/mute`,
             data
@@ -847,7 +847,7 @@ class QQBotAPI {
      * @returns 返回Announces 对象 （https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/announces/model.html#Announces）
      */
     async guildsAnnounces(guild_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/guilds/${guild_id}/announces`,
             data
@@ -860,7 +860,7 @@ class QQBotAPI {
      * @returns
      */
     async guildsAnnouncesDelete(guild_id, message_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/guilds/${guild_id}/announces/${message_id}`
         }).then(res => res?.data);
@@ -878,7 +878,7 @@ class QQBotAPI {
      * @returns message_ids 为当前请求后子频道内所有精华消息 message_id 数组
      */
     async channelsPinsPut(channel_id, message_id) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/channels/${channel_id}/pins/${message_id}`
         }).then(res => res?.data);
@@ -891,7 +891,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsPinsDelete(channel_id, message_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/pins/${message_id}`
         }).then(res => res?.data);
@@ -903,7 +903,7 @@ class QQBotAPI {
      * @returns message_ids 为当前请求后子频道内所有精华消息 message_id 数组
      */
     async channelsPins(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/pins`
         }).then(res => res?.data);
@@ -919,7 +919,7 @@ class QQBotAPI {
      * @returns 返回 Schedule 对象数组(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     async channelsSchedules(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/schedules`
         }).then(res => res?.data);
@@ -931,7 +931,7 @@ class QQBotAPI {
      * @returns 返回 Schedule 对象(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     async channelsSchedulesSchedule(channel_id, schedule_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/schedules/${schedule_id}`
         }).then(res => res?.data);
@@ -954,7 +954,7 @@ class QQBotAPI {
      * @returns 返回 Schedule 对象(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     async channelsSchedulesPost(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/channels/${channel_id}/schedules`,
             data
@@ -979,7 +979,7 @@ class QQBotAPI {
      * @returns 返回 Schedule 对象(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     async channelsSchedulesSchedulePatch(channel_id, schedule_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PATCH',
             url: `/channels/${channel_id}/schedules/${schedule_id}`,
             data
@@ -992,7 +992,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsSchedulesScheduleDelete(channel_id, schedule_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/schedules/${schedule_id}`
         }).then(res => res?.data);
@@ -1011,7 +1011,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsMessagesReactionsPut(channel_id, message_id, type, id) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/channels/${channel_id}/messages/${message_id}/reactions/${type}/${id}`
         }).then(res => res?.data);
@@ -1025,7 +1025,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsMessagesReactionsDelete(channel_id, message_id, type, id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/messages/${message_id}/reactions/${type}/${id}`
         }).then(res => res?.data);
@@ -1042,7 +1042,7 @@ class QQBotAPI {
      * @returns data:{ users:User[], cookie:string,is_end:true|false }
      */
     async channelsMessagesReactionsUsers(channel_id, message_id, type, id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/messages/${message_id}/reactions/${type}/${id}`,
             data
@@ -1063,7 +1063,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsAudioPost(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'POST',
             url: `/channels/${channel_id}/audio`,
             data
@@ -1075,7 +1075,7 @@ class QQBotAPI {
      * @returns {}
      */
     async channelsMicPut(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/channels/${channel_id}/mic`
         }).then(res => res?.data);
@@ -1086,7 +1086,7 @@ class QQBotAPI {
      * @returns {}
      */
     async channelsMicDelete(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/mic`
         }).then(res => res?.data);
@@ -1107,7 +1107,7 @@ class QQBotAPI {
      * @returns is_finish 为 1 时，表示已拉取完 为 0 时，表示未拉取完
      */
     async channelsThreads(channel_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/threads`
         }).then(res => res?.data);
@@ -1120,7 +1120,7 @@ class QQBotAPI {
      * 其中content字段可参考 https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/forum/model.html#RichText
      */
     async channelsThreadsThread(channel_id, thread_id) {
-        return this.request({
+        return this.guildServer({
             method: 'GET',
             url: `/channels/${channel_id}/threads/${thread_id}`
         }).then(res => res?.data);
@@ -1134,7 +1134,7 @@ class QQBotAPI {
      * @returns 返回 {task_id:string,create_time:string} 其中 task_id 为帖子id，create_time 发帖时间戳
      */
     async channelsThreadsPut(channel_id, data) {
-        return this.request({
+        return this.guildServer({
             method: 'PUT',
             url: `/channels/${channel_id}/threads`,
             data
@@ -1147,7 +1147,7 @@ class QQBotAPI {
      * @returns
      */
     async channelsThreadsDelete(channel_id, thread_id) {
-        return this.request({
+        return this.guildServer({
             method: 'DELETE',
             url: `/channels/${channel_id}/threads/${thread_id}`
         }).then(res => res?.data);
@@ -1163,7 +1163,7 @@ class QQBotAPI {
      * @returns
      */
     async guildApiPermission(guild_id) {
-        return this.request({
+        return this.guildServer({
             url: `/guilds/${guild_id}/api_permission`
         }).then(res => res?.data);
     }

package/lib/client.js

@@ -19,11 +19,16 @@ class QQBotClient extends QQBotAPI {
      */
     constructor(opstion) {
         super();
-        config.set('secret', opstion.secret);
-        config.set('appId', opstion.appId);
-        config.set('token', opstion.token);
-        config.set('port', opstion.port);
-        config.set('ws', opstion.ws);
+        if (opstion.secret)
+            config.set('secret', opstion.secret);
+        if (opstion.app_id)
+            config.set('app_id', opstion.app_id);
+        if (opstion.token)
+            config.set('token', opstion.token);
+        if (opstion.port)
+            config.set('port', opstion.port);
+        if (opstion.ws)
+            config.set('ws', opstion.ws);
     }
     /**
      * 注册事件处理程序
@@ -37,139 +42,176 @@ class QQBotClient extends QQBotAPI {
         this.#events[key].push(val);
         return this;
     }
+    /**
+     * 定时鉴权
+     * @param cfg
+     * @returns
+     */
+    async #setTimeoutBotConfig() {
+        const callBack = async () => {
+            const app_id = config.get('app_id');
+            if (!app_id)
+                return;
+            const secret = config.get('secret');
+            if (!secret)
+                return;
+            // 发送请求
+            const data = await this.getAuthentication(app_id, secret).then(res => res.data);
+            config.set('access_token', data.access_token);
+            console.info('refresh', data.expires_in, 's');
+            setTimeout(callBack, data.expires_in * 1000);
+        };
+        await callBack();
+    }
     /**
      *
      * @param cfg
      * @param conversation
      */
-    async connect() {
-        this.#app = new Koa();
-        this.#app.use(bodyParser());
-        const router = new Router();
-        const port = config.get('port');
-        const cfg = {
-            secret: config.get('secret'),
-            port: port ? Number(port) : 17157
-        };
-        const ntqqWebhook = new WebhookAPI({
-            secret: 'YI2mWG0lWH2nYJ4qcOAwiUH4reRE1pdR'
-        });
-        this.#app.use(async (ctx, next) => {
-            let rawData = '';
-            ctx.req.on('data', chunk => (rawData += chunk));
-            ctx.req.on('end', () => (ctx.request.rawBody = rawData));
-            await next();
-        });
-        // 启动服务
-        router.post('/webhook', async (ctx) => {
-            const sign = ctx.req.headers['x-signature-ed25519'];
-            const timestamp = ctx.req.headers['x-signature-timestamp'];
-            const rawBody = ctx.request.rawBody;
-            const isValid = ntqqWebhook.validSign(timestamp, rawBody, String(sign));
-            if (!isValid) {
-                ctx.status = 400;
-                ctx.body = { msg: 'invalid signature' };
-                return;
-            }
-            const body = ctx.request.body;
-            if (body.op == 13) {
-                ctx.status = 200;
-                ctx.body = {
-                    // 返回明文 token
-                    plain_token: body.d.plain_token,
-                    // 生成签名
-                    signature: ntqqWebhook.getSign(body.d.event_ts, body.d.plain_token)
-                };
-            }
-            else if (body.op == 0) {
-                ctx.status = 204;
-                console.log('body', body.d);
-                // 根据事件类型，处理事件
-                for (const event of this.#events[body.t] || []) {
-                    event(body.d);
+    connect() {
+        try {
+            this.#setTimeoutBotConfig();
+            this.#app = new Koa();
+            this.#app.use(bodyParser());
+            const router = new Router();
+            const port = config.get('port');
+            const secret = config.get('secret');
+            const cfg = {
+                secret: secret ?? '',
+                port: port ? Number(port) : 17157
+            };
+            const ntqqWebhook = new WebhookAPI({
+                secret: cfg.secret
+            });
+            this.#app.use(async (ctx, next) => {
+                let rawData = '';
+                ctx.req.on('data', chunk => (rawData += chunk));
+                ctx.req.on('end', () => (ctx.request.rawBody = rawData));
+                await next();
+            });
+            // 启动服务
+            router.post('/webhook', async (ctx) => {
+                const sign = ctx.req.headers['x-signature-ed25519'];
+                const timestamp = ctx.req.headers['x-signature-timestamp'];
+                const rawBody = ctx.request.rawBody;
+                const isValid = ntqqWebhook.validSign(timestamp, rawBody, String(sign));
+                if (!isValid) {
+                    ctx.status = 400;
+                    ctx.body = { msg: 'invalid signature' };
+                    return;
                 }
-                // 也可以分法到客户端。 发送失败需要处理 或清理调
-                for (const client of this.#client) {
-                    try {
-                        client.ws.send(JSON.stringify(body.d));
-                    }
-                    catch (error) {
-                        console.error('send error', error);
-                    }
+                const body = ctx.request.body;
+                if (body.op == 13) {
+                    ctx.status = 200;
+                    ctx.body = {
+                        // 返回明文 token
+                        plain_token: body.d.plain_token,
+                        // 生成签名
+                        signature: ntqqWebhook.getSign(body.d.event_ts, body.d.plain_token)
+                    };
                 }
-            }
-        });
-        this.#app.use(router.routes());
-        this.#app.use(router.allowedMethods());
-        // 启动服务
-        const server = this.#app.listen(cfg.port, () => {
-            console.log('Server running at http://localhost:' + cfg.port + '/webhook');
-        });
-        // 创建 WebSocketServer 并监听同一个端口
-        const wss = new WebSocketServer({ server: server });
-        // 处理客户端连接
-        wss.on('connection', ws => {
-            const clientId = v4();
-            ws['clientId'] = clientId;
-            console.log(clientId, 'connection');
-            this.#client.push({ id: clientId, ws });
-            // 处理消息事件
-            ws.on('message', (message) => {
-                // 拿到消息
-                try {
-                    const body = JSON.parse(message.toString());
+                else if (body.op == 0) {
+                    ctx.status = 204;
+                    // 根据事件类型，处理事件
                     for (const event of this.#events[body.t] || []) {
-                        event(body);
+                        event(body.d);
+                    }
+                    // 也可以分法到客户端。 发送失败需要处理 或清理调
+                    for (const client of this.#client) {
+                        try {
+                            client.ws.send(JSON.stringify(body.d));
+                        }
+                        catch (e) {
+                            this.#error(e);
+                        }
                     }
                 }
-                catch (e) {
-                    console.error('parse error', e);
-                }
-            });
-            // 处理关闭事件
-            ws.on('close', () => {
-                console.log(`Client ${clientId} disconnected`);
-                this.#client = this.#client.filter(client => client.id !== clientId);
             });
-        });
-        const reconnect = () => {
-            const ws = config.get('ws');
-            if (!ws)
-                return;
-            // 使用了ws服务器
-            this.#ws = new WebSocket(ws);
-            this.#ws.on('open', () => {
-                this.#count = 0;
-                console.log('ws connected');
+            this.#app.use(router.routes());
+            this.#app.use(router.allowedMethods());
+            // 启动服务
+            const server = this.#app.listen(cfg.port, () => {
+                console.log('Server running at http://localhost:' + cfg.port + '/webhook');
             });
-            this.#ws.on('message', data => {
-                try {
+            // 创建 WebSocketServer 并监听同一个端口
+            const wss = new WebSocketServer({ server: server });
+            // 处理客户端连接
+            wss.on('connection', ws => {
+                const clientId = v4();
+                ws['clientId'] = clientId;
+                console.log(clientId, 'connection');
+                this.#client.push({ id: clientId, ws });
+                // 处理消息事件
+                ws.on('message', (message) => {
                     // 拿到消息
-                    const body = JSON.parse(data.toString());
-                    for (const event of this.#events[body.t] || []) {
-                        event(body);
+                    try {
+                        const body = JSON.parse(message.toString());
+                        for (const event of this.#events[body.t] || []) {
+                            event(body);
+                        }
                     }
-                }
-                catch (e) {
-                    console.error('parse error', e);
-                }
+                    catch (e) {
+                        this.#error(e);
+                    }
+                });
+                // 处理关闭事件
+                ws.on('close', () => {
+                    console.log(`Client ${clientId} disconnected`);
+                    this.#client = this.#client.filter(client => client.id !== clientId);
+                });
             });
-            this.#ws.on('close', () => {
-                console.log('ws closed');
-                // 重连5次，超过5次不再重连
-                if (this.#count > 5) {
+            const reconnect = () => {
+                const ws = config.get('ws');
+                if (!ws)
                     return;
-                }
-                // 23s 后重连
-                setTimeout(() => {
-                    reconnect();
-                }, 23000);
-            });
-            this.#ws.on('error', () => {
-                console.log('ws error ');
-            });
-        };
-        reconnect();
+                // 使用了ws服务器
+                this.#ws = new WebSocket(ws);
+                this.#ws.on('open', () => {
+                    this.#count = 0;
+                    console.log('ws connected');
+                });
+                this.#ws.on('message', data => {
+                    try {
+                        // 拿到消息
+                        const body = JSON.parse(data.toString());
+                        for (const event of this.#events[body.t] || []) {
+                            event(body);
+                        }
+                    }
+                    catch (e) {
+                        this.#error(e);
+                    }
+                });
+                this.#ws.on('close', () => {
+                    console.log('ws closed');
+                    // 重连5次，超过5次不再重连
+                    if (this.#count > 5)
+                        return;
+                    // 23s 后重连
+                    setTimeout(() => {
+                        reconnect();
+                    }, 23000);
+                });
+                this.#ws.on('error', e => {
+                    this.#error(e);
+                });
+            };
+            reconnect();
+        }
+        catch (e) {
+            this.#error(e);
+        }
+    }
+    /**
+     *
+     * @param error
+     */
+    #error(error) {
+        if (this.#events['ERROR']) {
+            for (const event of this.#events['ERROR'] || []) {
+                event(error);
+            }
+        }
     }
 }
 

package/lib/index.d.ts

@@ -0,0 +1,6 @@
+import * as alemonjs from 'alemonjs';
+
+declare const platform = "qq-bot";
+declare const _default: () => alemonjs.ClientAPI;
+
+export { _default as default, platform };

package/lib/index.js

@@ -1,17 +1,15 @@
-import { defineBot, getConfig, useUserHashKey, OnProcessor } from 'alemonjs';
+import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import { QQBotClient } from './client.js';
 
 const platform = 'qq-bot';
 var index = defineBot(() => {
-    const cfg = getConfig();
-    const config = cfg.value['qq-bot'];
-    if (!config)
-        return;
+    const value = getConfigValue();
+    const config = value['qq-bot'];
     const client = new QQBotClient({
-        secret: config.secret,
-        appId: config.appId,
-        token: config.token,
-        port: config.port,
+        secret: config?.secret,
+        app_id: config?.app_id,
+        token: config?.token,
+        port: config?.port,
         ws: config?.ws
     });
     // 连接
@@ -57,8 +55,7 @@ var index = defineBot(() => {
             MessageText: event.content?.trim(),
             OpenId: event.author.member_openid,
             CreateAt: Date.now(),
-            //
-            tag: 'GROUP_AT_MESSAGE_CREATE',
+            tag: 'group',
             value: null
         };
         // 当访问的时候获取
@@ -108,7 +105,7 @@ var index = defineBot(() => {
             CreateAt: Date.now(),
             OpenId: '',
             //
-            tag: 'GROUP_AT_MESSAGE_CREATE',
+            tag: 'group',
             value: null
         };
         // 当访问的时候获取
@@ -165,7 +162,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'AT_MESSAGE_CREATE',
+            tag: 'guild',
             //
             value: null
         };
@@ -223,7 +220,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'AT_MESSAGE_CREATE',
+            tag: 'guild',
             //
             value: null
         };
@@ -307,7 +304,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'AT_MESSAGE_CREATE',
+            tag: 'guild',
             value: null
         };
         // 当访问的时候获取
@@ -319,74 +316,145 @@ var index = defineBot(() => {
         // 处理消息
         OnProcessor(e, 'message.create');
     });
+    client.on('ERROR', console.error);
     // FRIEND_ADD
     global.client = client;
+    //
     return {
         api: {
             use: {
                 send: (event, val) => {
                     if (val.length < 0)
                         return Promise.all([]);
-                    const content = val
-                        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
-                        .map(item => {
-                        if (item.type == 'Link') {
-                            return `[${item.options?.title ?? item.value}](${item.value})`;
-                        }
-                        else if (item.type == 'Mention') {
-                            if (item.value == 'everyone' ||
-                                item.value == 'all' ||
-                                item.value == '' ||
-                                typeof item.value != 'string') {
-                                return ``;
+                    // 打  tag
+                    const tag = event.tag;
+                    if (tag == 'group') {
+                        const content = val
+                            .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                            .map(item => {
+                            if (item.type == 'Link') {
+                                return `[${item.options?.title ?? item.value}](${item.value})`;
                             }
-                            if (item.options?.belong == 'user') {
-                                return `<@${item.value}>`;
+                            else if (item.type == 'Mention') {
+                                if (item.value == 'everyone' ||
+                                    item.value == 'all' ||
+                                    item.value == '' ||
+                                    typeof item.value != 'string') {
+                                    return ``;
+                                }
+                                if (item.options?.belong == 'user') {
+                                    return `<@${item.value}>`;
+                                }
+                                return '';
+                                // return `<qqbot-at-everyone />`
                             }
-                            return '';
-                            // return `<qqbot-at-everyone />`
+                            else if (item.type == 'Text') {
+                                return item.value;
+                            }
+                        })
+                            .join('');
+                        if (content) {
+                            return Promise.all([content].map(item => client.groupOpenMessages(event.GuildId, {
+                                content: item,
+                                msg_id: event.MessageId,
+                                msg_type: 0,
+                                msg_seq: client.getMessageSeq(event.MessageId)
+                            })));
                         }
-                        else if (item.type == 'Text') {
-                            return item.value;
+                        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+                        if (images) {
+                            return Promise.all(images.map(async (msg) => {
+                                const file_info = await client
+                                    .postRichMediaByGroup(event.GuildId, {
+                                    file_type: 1,
+                                    file_data: msg.toString('base64')
+                                })
+                                    .then(res => res?.file_info);
+                                if (!file_info)
+                                    return Promise.resolve(null);
+                                return client.groupOpenMessages(event.GuildId, {
+                                    content: '',
+                                    media: {
+                                        file_info
+                                    },
+                                    msg_id: event.MessageId,
+                                    msg_type: 7,
+                                    msg_seq: client.getMessageSeq(event.MessageId)
+                                });
+                            }));
                         }
-                    })
-                        .join('');
-                    if (content) {
-                        return Promise.all([content].map(item => client.groupOpenMessages(event.GuildId, {
-                            content: item,
-                            msg_id: event.MessageId,
-                            msg_type: 0,
-                            msg_seq: client.getMessageSeq(event.MessageId)
-                        })));
                     }
-                    const images = val.filter(item => item.type == 'Image').map(item => item.value);
-                    if (images) {
-                        return Promise.all(images.map(async (msg) => {
-                            const file_info = await client
-                                .postRichMediaByGroup(event.GuildId, {
-                                file_type: 1,
-                                file_data: msg.toString('base64')
-                            })
-                                .then(res => res?.file_info);
-                            if (!file_info)
-                                return Promise.resolve(null);
-                            return client.groupOpenMessages(event.GuildId, {
-                                content: '',
-                                media: {
-                                    file_info
-                                },
+                    else {
+                        const content = val
+                            .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+                            .map(item => {
+                            if (item.type == 'Link') {
+                                return `[${item.options?.title ?? item.value}](${item.value})`;
+                            }
+                            else if (item.type == 'Mention') {
+                                if (item.value == 'everyone' ||
+                                    item.value == 'all' ||
+                                    item.value == '' ||
+                                    typeof item.value != 'string') {
+                                    return `@everyone`;
+                                }
+                                if (item.options?.belong == 'user') {
+                                    return `<@!${item.value}>`;
+                                }
+                                else if (item.options?.belong == 'channel') {
+                                    return `<#${item.value}>`;
+                                }
+                                return '';
+                            }
+                            else if (item.type == 'Text') {
+                                return item.value;
+                            }
+                        })
+                            .join('');
+                        if (content) {
+                            return Promise.all([content].map(item => client.channelsMessagesPost(event.ChannelId, {
+                                content: item,
+                                msg_id: event.MessageId
+                            })));
+                        }
+                        const images = val.filter(item => item.type == 'Image').map(item => item.value);
+                        if (images) {
+                            return Promise.all(images.map(item => client.postImage(event.ChannelId, {
                                 msg_id: event.MessageId,
-                                msg_type: 7,
-                                msg_seq: client.getMessageSeq(event.MessageId)
-                            });
-                        }));
+                                image: item
+                            })));
+                        }
                     }
                     return Promise.all([]);
                 },
-                mention: async () => {
+                mention: async (e) => {
+                    const event = e.value;
+                    const tag = e.tag;
                     // const event = e.value
                     const Metions = [];
-                    return Metions;
+                    if (tag == 'group') {
+                        return Metions;
+                    }
+                    if (event.mentions) {
+                        const mentions = e.value['mentions'];
+                        // 艾特消息处理
+                        const MessageMention = mentions.map(item => {
+                            return {
+                                UserId: item.id,
+                                IsMaster: false,
+                                UserName: item.username,
+                                IsBot: item.bot,
+                                UserKey: useUserHashKey({
+                                    Platform: 'qq-guild-bot',
+                                    UserId: item.id
+                                })
+                            };
+                        }) ?? [];
+                        return MessageMention;
+                    }
+                    else {
+                        return Metions;
+                    }
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "qq-bot",
   "author": "lemonade",
   "license": "MIT",