@alemonjs/qq-bot 0.0.4 → 0.0.6

package/README.md

@@ -23,18 +23,49 @@ qq-bot:
 ```
 
 ```sh
-qq-group-bot:
+qq-bot:
   master_key:
     - ''
   # 默认 推荐nginx进行代理 http://localhost:17157/webhook
+  route: '/webhook'
   port: 17157
   # 当配置ws的时候，会连接另一台hook机器人的消息。不会再启动本地端口。
   # 推荐nginx进行代理 http://localhost:17157/
-  ws: 'wss://xxxx/ws'
+  ws: 'wss://xxxx/websocket'
   # 频道沙盒
   sandbox: false
 ```
 
+```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;
+
+        location /webhook {
+          # 指向 webhook 服务的端口
+          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;
+        }
+
+        location /websocket {
+           # 指向 WebSocket 服务的端口
+           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;
+        }
+}
+```
+
 ## Community
 
 QQ Group 806943302

package/lib/api.js

@@ -83,7 +83,6 @@ class QQBotAPI {
      *   0 文本  1 图文 2 md 3 ark 4 embed
      */
     async usersOpenMessages(openid, data, msg_id) {
-        console.log('msg_id', msg_id);
         return this.groupService({
             url: `/v2/users/${openid}/messages`,
             method: 'post',
@@ -104,7 +103,8 @@ class QQBotAPI {
         // 如果映射表大小超过 100，则删除最早添加的 MessageId
         if (this.#map.size > 100) {
             const firstKey = this.#map.keys().next().value;
-            this.#map.delete(firstKey);
+            if (firstKey)
+                this.#map.delete(firstKey);
         }
         return seq;
     }

package/lib/client.js

@@ -1,210 +1,228 @@
-import { QQBotAPI } from './api.js'
-import bodyParser from 'koa-bodyparser'
-import Router from 'koa-router'
-import { WebhookAPI } from './webhook.js'
-import Koa from 'koa'
-import { config } from './config.js'
-import { v4 } from 'uuid'
-import { WebSocketServer, WebSocket } from 'ws'
+import { QQBotAPI } from './api.js';
+import bodyParser from 'koa-bodyparser';
+import Router from 'koa-router';
+import { WebhookAPI } from './webhook.js';
+import Koa from 'koa';
+import { config } from './config.js';
+import { v4 } from 'uuid';
+import { WebSocketServer, WebSocket } from 'ws';
 
 class QQBotClient extends QQBotAPI {
-  #events = {}
-  #app = null
-  #count = 0
-  #client = []
-  #ws = null
-  /**
-   * 设置配置
-   * @param opstion
-   */
-  constructor(opstion) {
-    super()
-    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)
-  }
-  /**
-   * 注册事件处理程序
-   * @param key 事件名称
-   * @param val 事件处理函数
-   */
-  on(key, val) {
-    if (!this.#events[key]) {
-      this.#events[key] = []
+    #events = {};
+    #app = null;
+    #count = 0;
+    #client = [];
+    #ws = null;
+    /**
+     * 设置配置
+     * @param opstion
+     */
+    constructor(opstion) {
+        super();
+        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);
     }
-    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
-   */
-  connect() {
-    try {
-      const ws = config.get('ws')
-      if (!ws) {
-        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
+    /**
+     * 注册事件处理程序
+     * @param key 事件名称
+     * @param val 事件处理函数
+     */
+    on(key, val) {
+        if (!this.#events[key]) {
+            this.#events[key] = [];
         }
-        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
-          }
-          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
-            // 根据事件类型，处理事件
-            for (const event of this.#events[body.t] || []) {
-              event(body.d)
-            }
-            const access_token = config.get('access_token')
-            // 也可以分法到客户端。 发送失败需要处理 或清理调
-            for (const client of this.#client) {
-              try {
-                if (access_token) body['access_token'] = access_token
-                client.ws.send(JSON.stringify(body))
-              } catch (e) {
-                this.#error(e)
-              }
-            }
-          }
-        })
-        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())
-              for (const event of this.#events[body.t] || []) {
-                event(body.d)
-              }
-            } catch (e) {
-              this.#error(e)
+        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
+     */
+    connect() {
+        try {
+            const ws = config.get('ws');
+            if (!ws) {
+                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 route = config.get('route') ?? '/webhook';
+                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(route, 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;
+                        // 根据事件类型，处理事件
+                        for (const event of this.#events[body.t] || []) {
+                            event(body.d);
+                        }
+                        const access_token = config.get('access_token');
+                        // 也可以分法到客户端。 发送失败需要处理 或清理调
+                        for (const client of this.#client) {
+                            try {
+                                if (access_token)
+                                    body['access_token'] = access_token;
+                                client.ws.send(JSON.stringify(body));
+                            }
+                            catch (e) {
+                                this.#error(e);
+                            }
+                        }
+                    }
+                });
+                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 + route);
+                });
+                // 创建 WebSocketServer 并监听同一个端口
+                const wss = new WebSocketServer({ server: server });
+                console.log('Server running at wss://localhost:' + cfg.port + '/');
+                // 处理客户端连接
+                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());
+                            for (const event of this.#events[body.t] || []) {
+                                event(body.d);
+                            }
+                        }
+                        catch (e) {
+                            this.#error(e);
+                        }
+                    });
+                    // 处理关闭事件
+                    ws.on('close', () => {
+                        console.log(`${clientId} disconnected`);
+                        this.#client = this.#client.filter(client => client.id !== clientId);
+                    });
+                });
             }
-          })
-          // 处理关闭事件
-          ws.on('close', () => {
-            console.log(`${clientId} disconnected`)
-            this.#client = this.#client.filter(client => client.id !== clientId)
-          })
-        })
-      }
-      const reconnect = () => {
-        if (!ws) return
-        // 使用了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())
-            const access_token = body['access_token']
-            if (access_token) config.set('access_token', access_token)
-            for (const event of this.#events[body.t] || []) {
-              event(body.d)
+            else {
+                const 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());
+                            const access_token = body['access_token'];
+                            if (access_token)
+                                config.set('access_token', access_token);
+                            for (const event of this.#events[body.t] || []) {
+                                event(body.d);
+                            }
+                        }
+                        catch (e) {
+                            this.#error(e);
+                        }
+                    });
+                    this.#ws.on('close', () => {
+                        console.log('ws closed');
+                        // 重连5次，超过5次不再重连
+                        if (this.#count > 5)
+                            return;
+                        // 1.3s 后重连
+                        setTimeout(() => {
+                            reconnect();
+                        }, 1300);
+                    });
+                    this.#ws.on('error', e => {
+                        this.#error(e);
+                    });
+                };
+                reconnect();
             }
-          } 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)
+        }
+        catch (e) {
+            this.#error(e);
+        }
     }
-  }
-  /**
-   *
-   * @param error
-   */
-  #error(error) {
-    if (this.#events['ERROR']) {
-      for (const event of this.#events['ERROR'] || []) {
-        event(error)
-      }
+    /**
+     *
+     * @param error
+     */
+    #error(error) {
+        if (this.#events['ERROR']) {
+            for (const event of this.#events['ERROR'] || []) {
+                event(error);
+            }
+        }
     }
-  }
 }
 
-export { QQBotClient }
+export { QQBotClient };

package/lib/from.js

@@ -21,18 +21,18 @@ async function createPicFrom(image, name = 'image.jpg') {
         // 是 buffer
     }
     else if (Buffer.isBuffer(image)) {
-        const { ext } = await fileTypeFromBuffer(image);
+        const file = await fileTypeFromBuffer(image);
         if (!name)
-            name = 'file.' + ext;
+            name = 'file.' + file?.ext;
         picData = new Readable();
         picData.push(image);
         picData.push(null);
         // 是 文件流
     }
     else if (isReadable(image)) {
-        const { ext } = await fileTypeFromStream(image);
+        const file = await fileTypeFromStream(image);
         if (!name)
-            name = 'file.' + ext;
+            name = 'file.' + file?.ext;
         picData = image;
     }
     else {

package/lib/index.d.ts

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

package/lib/index.js

@@ -1,5 +1,6 @@
 import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import { QQBotClient } from './client.js';
+import { GROUP_AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, AT_MESSAGE_CREATE, MESSAGE_CREATE } from './send/index.js';
 
 const client = new Proxy({}, {
     get: (_, prop) => {
@@ -11,17 +12,26 @@ const client = new Proxy({}, {
 });
 const platform = 'qq-bot';
 var index = defineBot(() => {
-    const value = getConfigValue();
-    const config = value['qq-bot'];
+    let value = getConfigValue();
+    if (!value)
+        value = {};
+    const config = value[platform];
     const client = new QQBotClient({
         secret: config?.secret,
         app_id: config?.app_id,
+        route: config?.route,
         token: config?.token,
         port: config?.port,
         ws: config?.ws
     });
     // 连接
     client.connect();
+    /**
+     * group
+     *
+     * GROUP_AT_MESSAGE_CREATE
+     * C2C_MESSAGE_CREATE
+     */
     // 监听消息
     client.on('GROUP_AT_MESSAGE_CREATE', async (event) => {
         const master_key = config?.master_key ?? [];
@@ -47,6 +57,7 @@ var index = defineBot(() => {
         });
         // 定义消
         const e = {
+            name: 'message.create',
             // 事件类型
             Platform: platform,
             // guild
@@ -63,7 +74,7 @@ var index = defineBot(() => {
             MessageText: event.content?.trim(),
             OpenId: event.author.member_openid,
             CreateAt: Date.now(),
-            tag: 'group',
+            tag: 'GROUP_AT_MESSAGE_CREATE',
             value: null
         };
         // 当访问的时候获取
@@ -99,6 +110,7 @@ var index = defineBot(() => {
         });
         // 定义消
         const e = {
+            name: 'private.message.create',
             // 事件类型
             Platform: platform,
             // 用户Id
@@ -111,9 +123,9 @@ var index = defineBot(() => {
             MessageId: event.id,
             MessageText: event.content?.trim(),
             CreateAt: Date.now(),
-            OpenId: '',
+            OpenId: event.author.user_openid,
             //
-            tag: 'group',
+            tag: 'C2C_MESSAGE_CREATE',
             value: null
         };
         // 当访问的时候获取
@@ -125,6 +137,9 @@ var index = defineBot(() => {
         // 处理消息
         OnProcessor(e, 'private.message.create');
     });
+    /**
+     * guild
+     */
     client.on('DIRECT_MESSAGE_CREATE', async (event) => {
         // 屏蔽其他机器人的消息
         if (event?.author?.bot)
@@ -152,11 +167,12 @@ var index = defineBot(() => {
         });
         // 定义消
         const e = {
+            name: 'private.message.create',
             // 事件类型
             Platform: platform,
             //
-            GuildId: event.guild_id,
-            ChannelId: event.channel_id,
+            // GuildId: event.guild_id,
+            // ChannelId: event.channel_id,
             // 用户Id
             UserId: event?.author?.id ?? '',
             UserKey,
@@ -170,7 +186,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'guild',
+            tag: 'DIRECT_MESSAGE_CREATE',
             //
             value: null
         };
@@ -211,6 +227,7 @@ var index = defineBot(() => {
         });
         // 定义消
         const e = {
+            name: 'message.create',
             // 事件类型
             Platform: platform,
             GuildId: event.guild_id,
@@ -228,7 +245,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'guild',
+            tag: 'AT_MESSAGE_CREATE',
             //
             value: null
         };
@@ -295,6 +312,7 @@ var index = defineBot(() => {
         });
         // 定义消
         const e = {
+            name: 'message.create',
             // 事件类型
             Platform: platform,
             //
@@ -312,7 +330,7 @@ var index = defineBot(() => {
             OpenId: event.guild_id,
             CreateAt: Date.now(),
             //
-            tag: 'guild',
+            tag: 'MESSAGE_CREATE',
             value: null
         };
         // 当访问的时候获取
@@ -330,118 +348,45 @@ var index = defineBot(() => {
     return {
         api: {
             use: {
-                send: (event, val) => {
+                send: async (event, val) => {
                     if (val.length < 0)
-                        return Promise.all([]);
+                        ;
                     // 打  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})`;
-                            }
-                            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 />`
-                            }
-                            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)
-                            })));
+                    try {
+                        if (tag == 'GROUP_AT_MESSAGE_CREATE') {
+                            return await GROUP_AT_MESSAGE_CREATE(client, event, val);
                         }
-                        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)
-                                });
-                            }));
+                        if (tag == 'C2C_MESSAGE_CREATE') {
+                            return await C2C_MESSAGE_CREATE(client, event, val);
                         }
-                    }
-                    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
-                            })));
+                        if (tag == 'DIRECT_MESSAGE_CREATE') {
+                            return await DIRECT_MESSAGE_CREATE(client, event, val);
+                        }
+                        if (tag == 'AT_MESSAGE_CREATE') {
+                            return await AT_MESSAGE_CREATE(client, event, val);
                         }
-                        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,
-                                image: item
-                            })));
+                        if (tag == 'MESSAGE_CREATE') {
+                            return await AT_MESSAGE_CREATE(client, event, val);
                         }
+                        if (tag == 'MESSAGE_CREATE') {
+                            return await MESSAGE_CREATE(client, event, val);
+                        }
+                    }
+                    catch (error) {
+                        return [error];
                     }
-                    return Promise.all([]);
+                    return [];
                 },
                 mention: async (e) => {
                     const event = e.value;
                     const tag = e.tag;
                     // const event = e.value
                     const Metions = [];
-                    if (tag == 'group') {
+                    // group
+                    if (tag == 'GROUP_AT_MESSAGE_CREATE' || 'C2C_MESSAGE_CREATE')
                         return Metions;
-                    }
+                    // guild
                     if (event.mentions) {
                         const mentions = e.value['mentions'];
                         // 艾特消息处理

package/lib/send/index.js

@@ -0,0 +1,222 @@
+const GROUP_AT_MESSAGE_CREATE = (client, event, val) => {
+    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 ``;
+            }
+            if (item.options?.belong == 'user') {
+                return `<@${item.value}>`;
+            }
+            return '';
+        }
+        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)
+        })));
+    }
+    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)
+            });
+        }));
+    }
+    return [];
+};
+const C2C_MESSAGE_CREATE = (client, event, val) => {
+    const content = val
+        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+        .map(item => {
+        if (item.type == 'Text') {
+            return item.value;
+        }
+        return '';
+    })
+        .join('');
+    if (content) {
+        return Promise.all([content].map(item => client.usersOpenMessages(event.OpenId, {
+            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
+                .postRichMediaByUsers(event.OpenId, {
+                file_type: 1,
+                file_data: msg.toString('base64')
+            })
+                .then(res => res?.file_info);
+            if (!file_info)
+                return Promise.resolve(null);
+            return client.usersOpenMessages(event.OpenId, {
+                content: '',
+                media: {
+                    file_info
+                },
+                msg_id: event.MessageId,
+                msg_type: 7,
+                msg_seq: client.getMessageSeq(event.MessageId)
+            });
+        }));
+    }
+    return [];
+};
+/**
+ * 频道私聊
+ * @param client
+ * @param event
+ * @param val
+ * @returns
+ */
+const DIRECT_MESSAGE_CREATE = (client, event, val) => {
+    const content = val
+        .filter(item => item.type == 'Link' || item.type == 'Mention' || item.type == 'Text')
+        .map(item => {
+        if (item.type == 'Text') {
+            return item.value;
+        }
+        return '';
+    })
+        .join('');
+    if (content) {
+        return Promise.all([content].map(item => client.dmsMessage(event.OpenId, {
+            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.postDirectImage(event.OpenId, {
+            msg_id: event.MessageId,
+            image: item
+        })));
+    }
+    return [];
+};
+const AT_MESSAGE_CREATE = (client, event, val) => {
+    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,
+            image: item
+        })));
+    }
+    return [];
+};
+/**
+ *
+ * @param event
+ * @param val
+ * @returns
+ */
+const MESSAGE_CREATE = (client, event, val) => {
+    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,
+            image: item
+        })));
+    }
+    return [];
+};
+
+export { AT_MESSAGE_CREATE, C2C_MESSAGE_CREATE, DIRECT_MESSAGE_CREATE, GROUP_AT_MESSAGE_CREATE, MESSAGE_CREATE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alemonjs/qq-bot",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "qq-bot",
   "author": "lemonade",
   "license": "MIT",
@@ -26,7 +26,6 @@
     "@noble/curves": "^1.7.0"
   },
   "devDependencies": {
-    "alemonjs": "^2.0.0-rc.77",
     "@rollup/plugin-typescript": "^11.1.6",
     "lvyjs": "^0.2.13",
     "rollup": "^4.18.1",