@alemonjs/qq-bot 2.1.0-alpha.14 → 2.1.0-alpha.16

package/lib/index.js

@@ -1,8 +1,6 @@
 import { getConfigValue } from 'alemonjs';
-import { start } from './index.group.js';
-import { start as start$1 } from './index.guild.js';
-import { start as start$2 } from './index.webhook.js';
-import { start as start$3 } from './index.websoket.js';
+import { start } from './index.webhook.js';
+import { start as start$1 } from './index.websoket.js';
 import { platform } from './config.js';
 export { useClient, useMode, useValue } from './hook.js';
 export { QQBotAPI as API } from './sdk/api.js';
@@ -13,20 +11,12 @@ var index = () => {
     if (!value)
         value = {};
     const config = value[platform];
-    if (config?.mode == 'guild') {
+    if (config?.route || config?.port || config?.ws) {
         start();
         return;
     }
-    else if (config?.mode == 'group') {
-        start$1();
-        return;
-    }
-    else if (config?.route || config?.port || config?.ws) {
-        start$2();
-        return;
-    }
     else {
-        start$3();
+        start$1();
     }
 };
 

package/lib/index.webhook.js

@@ -1,11 +1,12 @@
-import { QQBotClient } from './sdk/client.js';
+import { QQBotClient } from './sdk/client.webhook.js';
 import { register } from './register.js';
 import { getQQBotConfig } from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();
+    const { master_id, master_key, ...cfgConfig } = config;
     const client = new QQBotClient({
-        ...config
+        ...cfgConfig
     });
     // 连接
     client.connect();

package/lib/index.websoket.js

@@ -1,30 +1,54 @@
-import { QQBotClients } from './sdk/client.websoket.js';
-import { register } from './register.js';
-import { getQQBotConfig } from './config.js';
+import {QQBotClients} from './sdk/client.websoket.js';
+import {register} from './register.js';
+import {getQQBotConfig} from './config.js';
 
 const start = () => {
     const config = getQQBotConfig();
+    const notPrivateIntents = [
+        'GUILDS', // base
+        'GUILD_MEMBERS', // base
+        'GUILD_MESSAGE_REACTIONS',
+        'DIRECT_MESSAGE',
+        'PUBLIC_GUILD_MESSAGES'
+    ];
+    const isPrivateIntents = [
+        'GUILDS', // base
+        'GUILD_MEMBERS', // base
+        'GUILD_MESSAGES',
+        'GUILD_MESSAGE_REACTIONS',
+        'DIRECT_MESSAGE',
+        'FORUMS_EVENT'
+    ];
+    const isGroupIntents = [
+        'GROUP_AND_C2C_EVENT'
+    ];
+    const pubIntents = [
+        'INTERACTION',
+    ];
+    const intents = [];
+    if (config?.mode == 'guild') {
+        if (config?.is_private) {
+            intents.push(...isPrivateIntents, ...pubIntents);
+        }
+        else {
+            intents.push(...notPrivateIntents, ...pubIntents);
+        }
+    }
+    else if (config?.mode == 'group') {
+        intents.push(...isGroupIntents, ...pubIntents);
+    }
+    else {
+        if (config?.is_private) {
+            intents.push(...isPrivateIntents, ...pubIntents);
+        }
+        else {
+            intents.push(...notPrivateIntents, ...isGroupIntents, ...pubIntents);
+        }
+    }
+    const curI = config?.intents || intents;
     const client = new QQBotClients({
         ...config,
-        intents: config?.intents ?? config?.is_private
-            ? [
-                'GUILDS', // base
-                'GUILD_MEMBERS', // base
-                'GUILD_MESSAGES',
-                'GUILD_MESSAGE_REACTIONS',
-                'DIRECT_MESSAGE',
-                'INTERACTION',
-                'FORUMS_EVENT'
-            ]
-            : [
-                'GUILDS', // base
-                'GUILD_MEMBERS', // base
-                'GUILD_MESSAGE_REACTIONS',
-                'DIRECT_MESSAGE',
-                'INTERACTION',
-                'PUBLIC_GUILD_MESSAGES',
-                'GROUP_AND_C2C_EVENT'
-            ],
+        intents: curI,
         is_private: config?.is_private ?? false,
         sandbox: config?.sandbox ?? false,
         shard: config?.shard ?? [0, 1],
@@ -35,4 +59,4 @@ const start = () => {
     register(client);
 };
 
-export { start };
+export {start};

package/lib/register.js

@@ -1,6 +1,6 @@
 import { cbpPlatform, ResultCode, createResult } from 'alemonjs';
 import { GROUP_AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, AT_MESSAGE_CREATE, MESSAGE_CREATE } from './sends.js';
-import { getQQBotConfig, getMaster, platform } from './config.js';
+import { getQQBotConfig, platform, getMaster } from './config.js';
 
 const register = (client) => {
     const config = getQQBotConfig();
@@ -20,6 +20,48 @@ 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) => {
+        // 机器人加入群组
+        const e = {
+            name: 'guild.join',
+            Platform: platform,
+            GuildId: event.group_openid,
+            ChannelId: event.group_openid,
+            SpaceId: `GROUP:${event.group_openid}`,
+            UserId: event.op_member_openid,
+            UserKey: event.op_member_openid,
+            UserAvatar: createUserAvatarURL(event.op_member_openid),
+            IsMaster: false,
+            IsBot: false,
+            OpenId: `C2C:${event.op_member_openid}`,
+            MessageId: '',
+            CreateAt: Date.now(),
+            tag: 'GROUP_DEL_ROBOT',
+            value: event
+        };
+        cbp.send(e);
+    });
+    client.on('GROUP_DEL_ROBOT', async (event) => {
+        // 机器人离开群组
+        const e = {
+            name: 'guild.exit',
+            Platform: platform,
+            GuildId: event.group_openid,
+            ChannelId: event.group_openid,
+            SpaceId: `GROUP:${event.group_openid}`,
+            UserId: event.op_member_openid,
+            UserKey: event.op_member_openid,
+            UserAvatar: createUserAvatarURL(event.op_member_openid),
+            IsMaster: false,
+            IsBot: false,
+            OpenId: `C2C:${event.op_member_openid}`,
+            MessageId: '',
+            CreateAt: Date.now(),
+            tag: 'GROUP_DEL_ROBOT',
+            value: event
+        };
+        cbp.send(e);
+    });
     // 监听消息
     client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
         const UserId = event.author.id;

package/lib/sdk/api.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import { config } from './config.js';
 import FormData from 'form-data';
-import { createPicFrom } from './from.js';
+import { createPicFrom } from 'alemonjs/utils';
 
 const BOTS_API_RUL = 'https://bots.qq.com';
 const API_URL_SANDBOX = 'https://sandbox.api.sgroup.qq.com';
@@ -250,7 +250,7 @@ class QQBotAPI {
             }
         }
         if (image) {
-            const from = await createPicFrom(image);
+            const from = await createPicFrom({ image });
             if (from) {
                 const { picData, name } = from;
                 formdata.append('file_image', picData, name);
@@ -280,7 +280,7 @@ class QQBotAPI {
             }
         }
         if (image) {
-            const from = await createPicFrom(image);
+            const from = await createPicFrom({ image });
             if (from) {
                 const { picData, name } = from;
                 formdata.append('file_image', picData, name);

package/lib/sdk/client.websoket.js

@@ -2,7 +2,7 @@ import WebSocket from 'ws';
 import { QQBotAPI } from './api.js';
 import { config } from './config.js';
 import { getIntentsMask } from './intents.js';
-import { Counter } from './counter.js';
+import { Counter } from 'alemonjs/utils';
 
 /**
  * 连接
@@ -99,7 +99,7 @@ class QQBotClients extends QQBotAPI {
             return;
         // 重新连接的逻辑
         const reconnect = async () => {
-            if (this.#counter.get() >= 5) {
+            if (this.#counter.value >= 5) {
                 console.info('The maximum number of reconnections has been reached, cancel reconnection');
                 return;
             }
@@ -108,7 +108,7 @@ class QQBotClients extends QQBotAPI {
                 // 重新starrt
                 start();
                 // 记录
-                this.#counter.getNextId();
+                this.#counter.next();
             }, 5000);
         };
         const start = () => {

package/lib/sends.js

@@ -216,7 +216,14 @@ const createMarkdownText = (data) => {
             });
             return `${listStr}\n`;
         }
-        return;
+        else if (mdItem.type === 'MD.code') {
+            const language = mdItem?.options?.language || '';
+            return `\`\`\`${language}\n${mdItem.value}\n\`\`\`\n`;
+        }
+        else {
+            const value = mdItem['value'] || '';
+            return String(value);
+        }
     })
         .join('');
     return content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "2.1.0-alpha.14",
+  "version": "2.1.0-alpha.16",
   "description": "阿柠檬qqbot平台连接",
   "author": "lemonade",
   "license": "MIT",

package/lib/index.group.js

@@ -1,20 +0,0 @@
-import { QQBotGroupClient } from './sdk/client.websoket.group.js';
-import { register } from './register.js';
-import { getQQBotConfig } from './config.js';
-
-const start = () => {
-    const config = getQQBotConfig();
-    // intents 需要默认值
-    const client = new QQBotGroupClient({
-        ...config,
-        intents: config?.intents ?? ['GROUP_AND_C2C_EVENT'],
-        is_private: config?.is_private ?? false,
-        sandbox: config?.sandbox ?? false,
-        shard: config?.shard ?? [0, 1]
-    });
-    // 连接
-    client.connect(config?.gatewayURL);
-    register(client);
-};
-
-export { start };

package/lib/index.guild.js

@@ -1,37 +0,0 @@
-import { getQQBotConfig } from './config.js';
-import { register } from './register.js';
-import { QQBotGuildClient } from './sdk/client.websoket.guild.js';
-
-const start = () => {
-    const config = getQQBotConfig();
-    // intents 需要默认值
-    const client = new QQBotGuildClient({
-        ...config,
-        intents: config?.intents ?? config?.is_private
-            ? [
-                'GUILDS', // base
-                'GUILD_MEMBERS', // base
-                'GUILD_MESSAGES',
-                'GUILD_MESSAGE_REACTIONS',
-                'DIRECT_MESSAGE',
-                'INTERACTION',
-                'FORUMS_EVENT'
-            ]
-            : [
-                'GUILDS', // base
-                'GUILD_MEMBERS', // base
-                'GUILD_MESSAGE_REACTIONS',
-                'DIRECT_MESSAGE',
-                'INTERACTION',
-                'PUBLIC_GUILD_MESSAGES'
-            ],
-        is_private: config?.is_private ?? false,
-        sandbox: config?.sandbox ?? false,
-        shard: config?.shard ?? [0, 1]
-    });
-    // 连接
-    client.connect(config?.gatewayURL);
-    register(client);
-};
-
-export { start };

package/lib/register.d.ts

@@ -1,3 +0,0 @@
-declare const platform = "qq-bot";
-
-export { platform };

package/lib/sdk/client.websoket.group.js

@@ -1,221 +0,0 @@
-import WebSocket from 'ws';
-import { QQBotAPI } from './api.js';
-import { config } from './config.js';
-import { getIntentsMask } from './intents.js';
-import { Counter } from './counter.js';
-
-/**
- * 连接
- */
-class QQBotGroupClient extends QQBotAPI {
-    //
-    #counter = new Counter(1); // 初始值为1
-    // 标记是否已连接
-    #isConnected = false;
-    // 存储最新的消息序号
-    #heartbeat_interval = 30000;
-    // 鉴权
-    #IntervalId = null;
-    // url
-    #gatewayUrl = null;
-    /**
-     * 设置配置
-     * @param opstion
-     */
-    constructor(opstion) {
-        super();
-        for (const key in opstion) {
-            config.set(key, opstion[key]);
-        }
-    }
-    /**
-     * 定时鉴权
-     * @param cfg
-     * @returns
-     */
-    async #setTimeoutBotConfig() {
-        const accessToken = async () => {
-            const app_id = config.get('app_id');
-            const secret = config.get('secret');
-            if (!app_id || !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(accessToken, data.expires_in * 1000);
-        };
-        await accessToken();
-        return;
-    }
-    /**
-     * 鉴权数据
-     * @returns
-     */
-    #aut() {
-        const token = config.get('access_token');
-        const intents = config.get('intents');
-        const shard = config.get('shard');
-        return {
-            op: 2, // op = 2
-            d: {
-                token: `QQBot ${token}`,
-                intents: getIntentsMask(intents),
-                shard: shard,
-                properties: {
-                    $os: process.platform,
-                    $browser: 'alemonjs',
-                    $device: 'alemonjs'
-                }
-            }
-        };
-    }
-    #ws = null;
-    #events = {};
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on(key, val) {
-        if (!this.#events[key])
-            this.#events[key] = [];
-        this.#events[key].push(val);
-        return this;
-    }
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
-    async connect(gatewayURL) {
-        // 定时模式
-        await this.#setTimeoutBotConfig();
-        // 请求url
-        if (!this.#gatewayUrl) {
-            this.#gatewayUrl = gatewayURL ?? (await this.gateway().then(res => res?.url));
-        }
-        if (!this.#gatewayUrl)
-            return;
-        // 重新连接的逻辑
-        const reconnect = async () => {
-            if (this.#counter.get() >= 5) {
-                console.info('The maximum number of reconnections has been reached, cancel reconnection');
-                return;
-            }
-            setTimeout(() => {
-                console.info('[ws] reconnecting...');
-                // 重新starrt
-                start();
-                // 记录
-                this.#counter.getNextId();
-            }, 5000);
-        };
-        const start = () => {
-            if (this.#gatewayUrl) {
-                const map = {
-                    0: async ({ t, d }) => {
-                        if (this.#events[t]) {
-                            try {
-                                for (const event of this.#events[t]) {
-                                    // 是否是函数
-                                    if (typeof event != 'function')
-                                        continue;
-                                    event(d);
-                                }
-                            }
-                            catch (err) {
-                                if (this.#events['ERROR']) {
-                                    for (const event of this.#events['ERROR']) {
-                                        // 是否是函数
-                                        if (typeof event != 'function')
-                                            continue;
-                                        event(err);
-                                    }
-                                }
-                            }
-                        }
-                        // Ready Event，鉴权成功
-                        if (t === 'READY') {
-                            this.#IntervalId = setInterval(() => {
-                                if (this.#isConnected) {
-                                    this.#ws &&
-                                        this.#ws.send(JSON.stringify({
-                                            op: 1, //  op = 1
-                                            d: null // 如果是第一次连接，传null
-                                        }));
-                                }
-                            }, this.#heartbeat_interval);
-                        }
-                        // Resumed Event，恢复连接成功
-                        if (t === 'RESUMED') {
-                            console.info('[ws] restore connection');
-                            // 重制次数
-                            this.#counter.reStart();
-                        }
-                        return;
-                    },
-                    6: ({ d }) => {
-                        console.info('[ws] connection attempt', d);
-                        return;
-                    },
-                    7: async ({ d }) => {
-                        // 执行重新连接
-                        console.info('[ws] reconnect', d);
-                        // 取消鉴权发送
-                        if (this.#IntervalId)
-                            clearInterval(this.#IntervalId);
-                        return;
-                    },
-                    9: ({ d }) => {
-                        console.info('[ws] parameter error', d);
-                        return;
-                    },
-                    10: ({ d }) => {
-                        // 重制次数
-                        this.#isConnected = true;
-                        // 记录新循环
-                        this.#heartbeat_interval = d.heartbeat_interval;
-                        // 发送鉴权
-                        this.#ws && this.#ws.send(JSON.stringify(this.#aut()));
-                        return;
-                    },
-                    11: () => {
-                        // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                        console.info('[ws] heartbeat transmission');
-                        // 重制次数
-                        this.#counter.reStart();
-                        return;
-                    },
-                    12: ({ d }) => {
-                        console.info('[ws] platform data', d);
-                        return;
-                    }
-                };
-                // 连接
-                this.#ws = new WebSocket(this.#gatewayUrl);
-                this.#ws.on('open', () => {
-                    console.info('[ws] open');
-                });
-                // 监听消息
-                this.#ws.on('message', async (msg) => {
-                    const message = JSON.parse(msg.toString('utf8'));
-                    if (process.env.NTQQ_WS == 'dev')
-                        console.info('message', message);
-                    // 根据 opcode 进行处理
-                    if (map[message.op]) {
-                        map[message.op](message);
-                    }
-                });
-                // 关闭
-                this.#ws.on('close', async (err) => {
-                    await reconnect();
-                    console.info('[ws] close', err);
-                });
-            }
-        };
-        start();
-    }
-}
-
-export { QQBotGroupClient };

package/lib/sdk/client.websoket.guild.js

@@ -1,205 +0,0 @@
-import WebSocket from 'ws';
-import { config } from './config.js';
-import { getIntentsMask } from './intents.js';
-import { QQBotAPI } from './api.js';
-import { Counter } from './counter.js';
-
-/**
- * 连接
- */
-class QQBotGuildClient extends QQBotAPI {
-    //
-    #counter = new Counter(1); // 初始值为1
-    // 标记是否已连接
-    #isConnected = false;
-    // 存储最新的消息序号
-    #heartbeat_interval = 30000;
-    // 鉴权
-    #IntervalId = null;
-    // url
-    #gatewayUrl = null;
-    #ws;
-    /**
-     *
-     * @param opstion
-     */
-    constructor(opstion) {
-        super();
-        for (const key in opstion) {
-            config.set(key, opstion[key]);
-        }
-    }
-    /**
-     * 鉴权数据
-     * @returns
-     */
-    #aut() {
-        const app_id = config.get('app_id');
-        const token = config.get('token');
-        const intents = config.get('intents');
-        const shard = config.get('shard');
-        return {
-            op: 2, // op = 2
-            d: {
-                token: `Bot ${app_id}.${token}`,
-                intents: getIntentsMask(intents),
-                shard,
-                properties: {
-                    $os: process.platform,
-                    $browser: 'alemonjs',
-                    $device: 'alemonjs'
-                }
-            }
-        };
-    }
-    #events = {};
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on(key, val) {
-        if (!this.#events[key])
-            this.#events[key] = [];
-        this.#events[key].push(val);
-        return this;
-    }
-    /**
-     *
-     * @param cfg
-     */
-    async connect(gatewayURL) {
-        //
-        this.#gatewayUrl =
-            gatewayURL ??
-                (await this.gateway()
-                    .then(res => res.url)
-                    .catch(err => {
-                    if (this.#events['ERROR']) {
-                        for (const item of this.#events['ERROR']) {
-                            item(err);
-                        }
-                    }
-                }));
-        // 请求url
-        if (!this.#gatewayUrl)
-            return this;
-        // 重新连接的逻辑
-        const reconnect = async () => {
-            if (this.#counter.get() >= 5) {
-                console.info('The maximum number of reconnections has been reached, cancel reconnection');
-                return;
-            }
-            setTimeout(() => {
-                console.info('[ws] reconnecting...');
-                // 重新starrt
-                start();
-                // 记录
-                this.#counter.getNextId();
-            }, 5000);
-        };
-        const start = () => {
-            if (this.#gatewayUrl) {
-                const map = {
-                    0: async ({ t, d }) => {
-                        // 执行
-                        if (this.#events[t]) {
-                            try {
-                                for (const event of this.#events[t]) {
-                                    // 是否是函数
-                                    if (typeof event != 'function')
-                                        continue;
-                                    event(d);
-                                }
-                            }
-                            catch (err) {
-                                if (this.#events['ERROR']) {
-                                    for (const item of this.#events['ERROR']) {
-                                        item(err);
-                                    }
-                                }
-                            }
-                        }
-                        // Ready Event，鉴权成功
-                        if (t === 'READY') {
-                            this.#IntervalId = setInterval(() => {
-                                if (this.#isConnected) {
-                                    this.#ws.send(JSON.stringify({
-                                        op: 1, //  op = 1
-                                        d: null // 如果是第一次连接，传null
-                                    }));
-                                }
-                            }, this.#heartbeat_interval);
-                        }
-                        // Resumed Event，恢复连接成功
-                        if (t === 'RESUMED') {
-                            console.info('[ws] restore connection');
-                            // 重制次数
-                            this.#counter.reStart();
-                        }
-                        return;
-                    },
-                    6: ({ d }) => {
-                        console.info('[ws] connection attempt', d);
-                        return;
-                    },
-                    7: async ({ d }) => {
-                        // 执行重新连接
-                        console.info('[ws] reconnect', d);
-                        // 取消鉴权发送
-                        if (this.#IntervalId)
-                            clearInterval(this.#IntervalId);
-                        return;
-                    },
-                    9: ({ d }) => {
-                        console.info('[ws] parameter error', d);
-                        return;
-                    },
-                    10: ({ d }) => {
-                        // 重制次数
-                        this.#isConnected = true;
-                        // 记录新循环
-                        this.#heartbeat_interval = d.heartbeat_interval;
-                        // 发送鉴权
-                        this.#ws.send(JSON.stringify(this.#aut()));
-                        return;
-                    },
-                    11: () => {
-                        // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                        console.info('[ws] heartbeat transmission');
-                        // 重制次数
-                        this.#counter.reStart();
-                        return;
-                    },
-                    12: ({ d }) => {
-                        console.info('[ws] platform data', d);
-                        return;
-                    }
-                };
-                // 连接
-                this.#ws = new WebSocket(this.#gatewayUrl);
-                this.#ws.on('open', () => {
-                    console.info('[ws] open');
-                });
-                // 监听消息
-                this.#ws.on('message', async (msg) => {
-                    const message = JSON.parse(msg.toString('utf8'));
-                    if (process.env.QQ_WS == 'dev')
-                        console.info('message', message);
-                    if (map[message.op]) {
-                        map[message.op](message);
-                    }
-                });
-                // 关闭
-                this.#ws.on('close', async (err) => {
-                    await reconnect();
-                    console.info('[ws] close', err);
-                });
-            }
-        };
-        start();
-        return this;
-    }
-}
-
-export { QQBotGuildClient };

package/lib/sdk/counter.js

@@ -1,19 +0,0 @@
-class Counter {
-    #counter = 1;
-    #val = 0;
-    constructor(initialValue) {
-        this.#counter = initialValue;
-        this.#val = initialValue;
-    }
-    getNextId() {
-        return ++this.#counter;
-    }
-    get() {
-        return this.#counter;
-    }
-    reStart() {
-        this.#counter = this.#val;
-    }
-}
-
-export { Counter };

package/lib/sdk/from.js

@@ -1,44 +0,0 @@
-import { existsSync, createReadStream } from 'fs';
-import { Readable, isReadable } from 'stream';
-import { basename } from 'path';
-import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
-
-/**
- * 创建form
- * @param image
- * @param name
- * @returns
- */
-async function createPicFrom(image, name = 'image.jpg') {
-    let picData;
-    // 是 string
-    if (typeof image === 'string') {
-        if (!existsSync(image))
-            return false;
-        if (!name)
-            name = basename(image);
-        picData = createReadStream(image);
-        // 是 buffer
-    }
-    else if (Buffer.isBuffer(image)) {
-        const file = await fileTypeFromBuffer(image);
-        if (!name)
-            name = 'file.' + file?.ext;
-        picData = new Readable();
-        picData.push(image);
-        picData.push(null);
-        // 是 文件流
-    }
-    else if (isReadable(image)) {
-        const file = await fileTypeFromStream(image);
-        if (!name)
-            name = 'file.' + file?.ext;
-        picData = image;
-    }
-    else {
-        return false;
-    }
-    return { picData, image, name };
-}
-
-export { createPicFrom };