@alemonjs/qq-bot 0.0.2 → 0.0.3

package/README.md

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

package/lib/api.js

@@ -34,9 +34,9 @@ class QQBotAPI {
      * @param config
      * @returns
      */
-    async GroupService(options) {
+    async groupService(options) {
         const app_id = config.get('app_id');
-        const token = config.get('token');
+        const token = config.get('access_token');
         const service = await axios.create({
             baseURL: this.API_URL,
             timeout: 20000,
@@ -52,12 +52,12 @@ class QQBotAPI {
      * @param opstion
      * @returns
      */
-    async request(opstion) {
+    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.BOTS_API_RUL,
+            baseURL: sandbox ? this.API_URL_SANDBOX : this.API_URL,
             timeout: 20000,
             headers: {
                 Authorization: `Bot ${app_id}.${token}`
@@ -70,7 +70,7 @@ class QQBotAPI {
      * @returns
      */
     async gateway() {
-        return this.GroupService({
+        return this.groupService({
             url: '/gateway'
         }).then(res => res?.data);
     }
@@ -84,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
@@ -116,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
@@ -132,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
@@ -148,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
@@ -164,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: {
@@ -180,7 +180,7 @@ class QQBotAPI {
      * @returns
      */
     async groupsFiles(openid, data) {
-        return this.GroupService({
+        return this.groupService({
             url: `/v2/groups/${openid}/files`,
             method: 'post',
             data: {
@@ -301,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);
@@ -313,7 +313,7 @@ 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);
@@ -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

@@ -42,6 +42,27 @@ 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
@@ -49,6 +70,7 @@ class QQBotClient extends QQBotAPI {
      */
     connect() {
         try {
+            this.#setTimeoutBotConfig();
             this.#app = new Koa();
             this.#app.use(bodyParser());
             const router = new Router();
@@ -90,7 +112,6 @@ class QQBotClient extends QQBotAPI {
                 }
                 else if (body.op == 0) {
                     ctx.status = 204;
-                    console.log('body', body.d);
                     // 根据事件类型，处理事件
                     for (const event of this.#events[body.t] || []) {
                         event(body.d);
@@ -164,9 +185,8 @@ class QQBotClient extends QQBotAPI {
                 this.#ws.on('close', () => {
                     console.log('ws closed');
                     // 重连5次，超过5次不再重连
-                    if (this.#count > 5) {
+                    if (this.#count > 5)
                         return;
-                    }
                     // 23s 后重连
                     setTimeout(() => {
                         reconnect();

package/lib/index.js

@@ -319,6 +319,7 @@ var index = defineBot(() => {
     client.on('ERROR', console.error);
     // FRIEND_ADD
     global.client = client;
+    //
     return {
         api: {
             use: {

package/package.json

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