@alemonjs/qq-bot 2.1.0-alpha.17 → 2.1.0-alpha.19

package/README.md

@@ -54,33 +54,3 @@ qq-bot:
   master_id:
      - 'yyy'
 ```
-
-```conf
- server {
-        listen       443 ssl http2;
-        server_name  bundle.com;
-        ssl_certificate /usr/local/nginx/bundle.crt;
-        ssl_certificate_key /usr/local/nginx/bundle.key;
-        # 对应 route: ''
-        location /webhook {
-          # 指向 webhook 服务的端口 17157
-          proxy_pass http://localhost:17157;
-          proxy_set_header Host $host;
-          proxy_set_header X-Real-IP $remote_addr;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header X-Forwarded-Proto $scheme;
-        }
-        # 对应 ws: ''
-        location /websocket {
-           # 指向 WebSocket 服务的端口 17157
-           proxy_pass http://localhost:17157;
-           proxy_http_version 1.1;
-           proxy_set_header Upgrade $http_upgrade;
-           proxy_set_header Connection "upgrade";
-           proxy_set_header Host $host;
-           proxy_set_header X-Real-IP $remote_addr;
-           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-           proxy_set_header X-Forwarded-Proto $scheme;
-        }
-}
-```

package/lib/desktop.js

@@ -20,7 +20,7 @@ const activate = context => {
         const scriptUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.js'));
         // 确保路径存在
         const html = readFileSync(dir, 'utf-8')
-            .replace(iconReg, ``)
+            .replace(iconReg, '')
             .replace(scriptReg, `<script type="module" crossorigin src="${scriptUri}"></script>`)
             .replace(styleReg, `<link rel="stylesheet" crossorigin href="${styleUri}">`);
         // 立即渲染 webview
@@ -43,8 +43,9 @@ const activate = context => {
             }
             else if (data.type === 'qq-bot.init') {
                 let config = getConfigValue();
-                if (!config)
+                if (!config) {
                     config = {};
+                }
                 // 发送消息
                 webView.postMessage({
                     type: 'qq-bot.init',

package/lib/hook.js

@@ -29,27 +29,27 @@ const useMode = (event) => {
     const tag = event.tag;
     let currentMode = 'group';
     // 群at
-    if (tag == 'GROUP_AT_MESSAGE_CREATE') {
+    if (tag === 'GROUP_AT_MESSAGE_CREATE') {
         currentMode = 'group';
     }
     // 私聊
-    if (tag == 'C2C_MESSAGE_CREATE') {
+    if (tag === 'C2C_MESSAGE_CREATE') {
         currentMode = 'group';
     }
     // 频道私聊
-    if (tag == 'DIRECT_MESSAGE_CREATE') {
+    if (tag === 'DIRECT_MESSAGE_CREATE') {
         currentMode = 'guild';
     }
     // 频道at
-    if (tag == 'AT_MESSAGE_CREATE') {
+    if (tag === 'AT_MESSAGE_CREATE') {
         currentMode = 'guild';
     }
     // 频道消息
-    if (tag == 'MESSAGE_CREATE') {
+    if (tag === 'MESSAGE_CREATE') {
         currentMode = 'guild';
     }
     const isMode = (mode) => {
-        return currentMode == mode;
+        return currentMode === mode;
     };
     return isMode;
 };

package/lib/index.d.ts

@@ -2,6 +2,6 @@ export { platform } from './config.js';
 export { useClient, useMode, useValue } from './hook.js';
 export { QQBotAPI as API } from './sdk/api.js';
 
-declare const _default: () => void;
+declare const main: () => void;
 
-export { _default as default };
+export { main as default };

package/lib/index.js

@@ -6,18 +6,47 @@ export { useClient, useMode, useValue } from './hook.js';
 export { QQBotAPI as API } from './sdk/api.js';
 
 // main
-var index = () => {
+const main = () => {
     let value = getConfigValue();
-    if (!value)
+    if (!value) {
         value = {};
+    }
     const config = value[platform];
     if (config?.route || config?.port || config?.ws) {
         start();
-        return;
     }
     else {
         start$1();
     }
 };
+const mainProcess = () => {
+    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+        process?.on?.(sig, () => {
+            logger?.info?.(`[@alemonjs/qq-bot][${sig}] 收到信号，正在关闭...`);
+            setImmediate(() => process.exit(0));
+        });
+    });
+    process?.on?.('exit', code => {
+        logger?.info?.(`[@alemonjs/qq-bot][exit] 进程退出，code=${code}`);
+    });
+    // 监听主进程消息
+    process.on('message', msg => {
+        try {
+            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
+            if (data?.type === 'start') {
+                main();
+            }
+            else if (data?.type === 'stop') {
+                process.exit(0);
+            }
+        }
+        catch { }
+    });
+    // 主动发送 ready 消息
+    if (process.send) {
+        process.send(JSON.stringify({ type: 'ready' }));
+    }
+};
+mainProcess();
 
-export { index as default, platform };
+export { main as default, platform };

package/lib/index.webhook.js

@@ -4,7 +4,7 @@ import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();
-    const { master_id, master_key, ...cfgConfig } = config;
+    const { master_id: _, master_key: __, ...cfgConfig } = config;
     const client = new QQBotClient({
         ...cfgConfig
     });

package/lib/index.websoket.js

@@ -22,7 +22,7 @@ const start = () => {
     const isGroupIntents = ['GROUP_AND_C2C_EVENT'];
     const pubIntents = ['INTERACTION'];
     const intents = [];
-    if (config?.mode == 'guild') {
+    if (config?.mode === 'guild') {
         if (config?.is_private) {
             intents.push(...isPrivateIntents, ...pubIntents);
         }
@@ -30,7 +30,7 @@ const start = () => {
             intents.push(...notPrivateIntents, ...pubIntents);
         }
     }
-    else if (config?.mode == 'group') {
+    else if (config?.mode === 'group') {
         intents.push(...isGroupIntents, ...pubIntents);
     }
     else {
@@ -50,7 +50,7 @@ const start = () => {
         mode: config?.mode ?? 'group'
     });
     // 连接
-    client.connect(config?.gatewayURL);
+    void client.connect(config?.gatewayURL);
     register(client);
 };
 

package/lib/register.js

@@ -20,7 +20,7 @@ const register = (client) => {
     const createUserAvatarURL = (author_id) => {
         return `https://q.qlogo.cn/qqapp/${config.app_id}/${author_id}/640`;
     };
-    client.on('GROUP_ADD_ROBOT', async (event) => {
+    client.on('GROUP_ADD_ROBOT', event => {
         // 机器人加入群组
         const e = {
             name: 'guild.join',
@@ -41,7 +41,7 @@ const register = (client) => {
         };
         cbp.send(e);
     });
-    client.on('GROUP_DEL_ROBOT', async (event) => {
+    client.on('GROUP_DEL_ROBOT', event => {
         // 机器人离开群组
         const e = {
             name: 'guild.exit',
@@ -63,7 +63,7 @@ const register = (client) => {
         cbp.send(e);
     });
     // 监听消息
-    client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
+    client.on('GROUP_AT_MESSAGE_CREATE', event => {
         const UserId = event.author.id;
         const [isMaster, UserKey] = getMaster(UserId);
         const UserAvatar = createUserAvatarURL(event.author.id);
@@ -91,7 +91,7 @@ const register = (client) => {
         };
         cbp.send(e);
     });
-    client.on('C2C_MESSAGE_CREATE', async (event) => {
+    client.on('C2C_MESSAGE_CREATE', event => {
         const UserId = event.author.id;
         const [isMaster, UserKey] = getMaster(UserId);
         const UserAvatar = createUserAvatarURL(event.author.id);
@@ -120,11 +120,12 @@ const register = (client) => {
     /**
      * guild
      */
-    client.on('DIRECT_MESSAGE_CREATE', async (event) => {
+    client.on('DIRECT_MESSAGE_CREATE', event => {
         // 屏蔽其他机器人的消息
-        if (event?.author?.bot)
+        if (event?.author?.bot) {
             return;
-        let msg = event?.content ?? '';
+        }
+        const msg = event?.content ?? '';
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
         const [isMaster, UserKey] = getMaster(UserId);
@@ -152,11 +153,12 @@ const register = (client) => {
         cbp.send(e);
     });
     // 监听消息
-    client.on('AT_MESSAGE_CREATE', async (event) => {
+    client.on('AT_MESSAGE_CREATE', event => {
         // 屏蔽其他机器人的消息
-        if (event?.author?.bot)
+        if (event?.author?.bot) {
             return;
-        let msg = getMessageContent(event);
+        }
+        const msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
         const UserId = event.author.id;
         const [isMaster, UserKey] = getMaster(UserId);
@@ -194,29 +196,31 @@ const register = (client) => {
     const getMessageContent = event => {
         let msg = event?.content ?? '';
         // 艾特消息处理
-        const at_users = [];
+        const atUsers = [];
         if (event.mentions) {
             // 去掉@ 转为纯消息
             for (const item of event.mentions) {
-                at_users.push({
+                atUsers.push({
                     id: item.id
                 });
             }
             // 循环删除文本中的at信息并去除前后空格
-            at_users.forEach(item => {
+            atUsers.forEach(item => {
                 msg = msg.replace(`<@!${item.id}>`, '').trim();
             });
         }
         return msg;
     };
     // 私域 -
-    client.on('MESSAGE_CREATE', async (event) => {
+    client.on('MESSAGE_CREATE', event => {
         // 屏蔽其他机器人的消息
-        if (event.author?.bot)
+        if (event.author?.bot) {
             return;
+        }
         // 撤回消息
-        if (new RegExp(/DELETE$/).test(event.eventType))
+        if (new RegExp(/DELETE$/).test(event.eventType)) {
             return;
+        }
         const UserId = event.author.id;
         const msg = getMessageContent(event);
         const UserAvatar = event?.author?.avatar;
@@ -247,7 +251,7 @@ const register = (client) => {
         };
         cbp.send(e);
     });
-    client.on('INTERACTION_CREATE', async (event) => {
+    client.on('INTERACTION_CREATE', event => {
         // try {
         //   if (event.scene === 'group' || event.scene === 'c2c') {
         //     await client.interactionResponse('group', event.id)
@@ -392,54 +396,79 @@ const register = (client) => {
         },
         use: {
             send: async (event, val) => {
-                if (val.length < 0)
+                if (val.length < 0) {
                     return [];
+                }
                 // 打  tag
                 const tag = event.tag;
                 // 群at
-                if (tag == 'GROUP_AT_MESSAGE_CREATE') {
+                if (tag === 'GROUP_AT_MESSAGE_CREATE') {
                     return await GROUP_AT_MESSAGE_CREATE(client, event, val);
                 }
                 // 私聊
-                if (tag == 'C2C_MESSAGE_CREATE') {
+                if (tag === 'C2C_MESSAGE_CREATE') {
                     return await C2C_MESSAGE_CREATE(client, event, val);
                 }
                 // 频道私聊
-                if (tag == 'DIRECT_MESSAGE_CREATE') {
+                if (tag === 'DIRECT_MESSAGE_CREATE') {
                     return await DIRECT_MESSAGE_CREATE(client, event, val);
                 }
                 // 频道at
-                if (tag == 'AT_MESSAGE_CREATE') {
+                if (tag === 'AT_MESSAGE_CREATE') {
                     return await AT_MESSAGE_CREATE(client, event, val);
                 }
                 // 频道消息
-                if (tag == 'MESSAGE_CREATE') {
+                if (tag === 'MESSAGE_CREATE') {
                     return await MESSAGE_CREATE(client, event, val);
                 }
                 // 交互
-                if (tag == 'INTERACTION_CREATE_GROUP') {
+                if (tag === 'INTERACTION_CREATE_GROUP') {
                     return await GROUP_AT_MESSAGE_CREATE(client, event, val);
                 }
-                if (tag == 'INTERACTION_CREATE_C2C') {
+                if (tag === 'INTERACTION_CREATE_C2C') {
                     return await C2C_MESSAGE_CREATE(client, event, val);
                 }
-                if (tag == 'INTERACTION_CREATE_GUILD') {
+                if (tag === 'INTERACTION_CREATE_GUILD') {
                     return await AT_MESSAGE_CREATE(client, event, val);
                 }
                 return [];
             },
-            mention: async (event) => {
-                event.value || {};
-                event.tag;
+            mention: event => {
+                const value = event.value || {};
+                const tag = event.tag;
                 // const event = e.value
                 const Metions = [];
                 // group
-                return Metions;
+                if (tag === 'GROUP_AT_MESSAGE_CREATE' || tag === 'C2C_MESSAGE_CREATE') {
+                    // return Metions;
+                    return new Promise(resolve => resolve(Metions));
+                }
+                // guild
+                if (value.mentions) {
+                    const mentions = event.value['mentions'];
+                    // 艾特消息处理
+                    const MessageMention = mentions.map(item => {
+                        const UserId = item.id;
+                        const [isMaster, UserKey] = getMaster(UserId);
+                        return {
+                            UserId: item.id,
+                            IsMaster: isMaster,
+                            UserName: item.username,
+                            IsBot: item.bot,
+                            UserKey: UserKey
+                        };
+                    });
+                    // return MessageMention;
+                    return new Promise(resolve => resolve(MessageMention));
+                }
+                else {
+                    // return Metions;
+                    return new Promise(resolve => resolve(Metions));
+                }
             }
         }
     };
-    // 处理行为
-    cbp.onactions(async (data, consume) => {
+    const onactions = async (data, consume) => {
         if (data.action === 'message.send') {
             // 消息发送
             const event = data.payload.event;
@@ -469,9 +498,10 @@ const register = (client) => {
             const res = await api.active.send.user(user_id, paramFormat);
             consume(res);
         }
-    });
-    // 处理 api 调用
-    cbp.onapis(async (data, consume) => {
+    };
+    // 处理行为
+    cbp.onactions((data, consume) => void onactions(data, consume));
+    const onapis = async (data, consume) => {
         const key = data.payload?.key;
         if (client[key]) {
             // 如果 client 上有对应的 key，直接调用。
@@ -479,7 +509,9 @@ const register = (client) => {
             const res = await client[key](...params);
             consume([createResult(ResultCode.Ok, '请求完成', res)]);
         }
-    });
+    };
+    // 处理 api 调用
+    cbp.onapis((data, consume) => void onapis(data, consume));
 };
 
 export { register };

package/lib/sdk/api.d.ts

@@ -15,13 +15,13 @@ declare class QQBotAPI {
      * @param config
      * @returns
      */
-    groupService(options: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    groupService(options: AxiosRequestConfig): Promise<any>;
     /**
      * guild
      * @param opstion
      * @returns
      */
-    guildServer(opstion: AxiosRequestConfig): Promise<axios.AxiosResponse<any, any>>;
+    guildServer(opstion: AxiosRequestConfig): Promise<any>;
     /**
      * 得到鉴权
      * @returns
@@ -531,12 +531,12 @@ declare class QQBotAPI {
      * @param end_timestamp 日程结束时间戳
      * @param jump_channel_id 日程开始时跳转的子频道id
      * @param remind_type 日程提醒类型
-     *  0	不提醒
-     *  1	开始时提醒
-     *  2	开始前 5 分钟提醒
-     *  3	开始前 15 分钟提醒
-     *  4	开始前 30 分钟提醒
-     *  5	开始前 60 分钟提醒
+     *  0不提醒
+     *  1开始时提醒
+     *  2开始前 5 分钟提醒
+     *  3开始前 15 分钟提醒
+     *  4开始前 30 分钟提醒
+     *  5开始前 60 分钟提醒
      * @returns 返回 Schedule 对象(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     channelsSchedulesPost(channel_id: string, data: {
@@ -559,12 +559,12 @@ declare class QQBotAPI {
      * @param end_timestamp 日程结束时间戳
      * @param jump_channel_id 日程开始时跳转的子频道id
      * @param remind_type 日程提醒类型
-     * 0	不提醒
-     * 1	开始时提醒
-     * 2	开始前 5 分钟提醒
-     * 3	开始前 15 分钟提醒
-     * 4	开始前 30 分钟提醒
-     * 5	开始前 60 分钟提醒
+     * 0不提醒
+     * 1开始时提醒
+     * 2开始前 5 分钟提醒
+     * 3开始前 15 分钟提醒
+     * 4开始前 30 分钟提醒
+     * 5开始前 60 分钟提醒
      * @returns 返回 Schedule 对象(详见https://bot.q.qq.com/wiki/develop/api-v2/server-inter/channel/content/schedule/model.html#schedule)
      */
     channelsSchedulesSchedulePatch(channel_id: string, schedule_id: string, data: {