@alemonjs/qq-bot 0.0.3 → 0.0.4

package/README.md

@@ -26,10 +26,11 @@ qq-bot:
 qq-group-bot:
   master_key:
     - ''
-  # 默认（请使用nginx进行代理）
+  # 默认 推荐nginx进行代理 http://localhost:17157/webhook
   port: 17157
-  # 如果在服务器也启动了机器人，可以进行互相调用
-  ws: 'ws://...'
+  # 当配置ws的时候，会连接另一台hook机器人的消息。不会再启动本地端口。
+  # 推荐nginx进行代理 http://localhost:17157/
+  ws: 'wss://xxxx/ws'
   # 频道沙盒
   sandbox: false
 ```

package/lib/client.js

@@ -1,218 +1,210 @@
-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);
+  #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] = []
     }
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on(key, val) {
-        if (!this.#events[key]) {
-            this.#events[key] = [];
-        }
-        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();
+    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)
     }
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
-    connect() {
-        try {
-            this.#setTimeoutBotConfig();
-            this.#app = new Koa();
-            this.#app.use(bodyParser());
-            const router = new Router();
-            const port = config.get('port');
-            const secret = config.get('secret');
-            const cfg = {
-                secret: secret ?? '',
-                port: port ? Number(port) : 17157
-            };
-            const ntqqWebhook = new WebhookAPI({
-                secret: cfg.secret
-            });
-            this.#app.use(async (ctx, next) => {
-                let rawData = '';
-                ctx.req.on('data', chunk => (rawData += chunk));
-                ctx.req.on('end', () => (ctx.request.rawBody = rawData));
-                await next();
-            });
-            // 启动服务
-            router.post('/webhook', async (ctx) => {
-                const sign = ctx.req.headers['x-signature-ed25519'];
-                const timestamp = ctx.req.headers['x-signature-timestamp'];
-                const rawBody = ctx.request.rawBody;
-                const isValid = ntqqWebhook.validSign(timestamp, rawBody, String(sign));
-                if (!isValid) {
-                    ctx.status = 400;
-                    ctx.body = { msg: 'invalid signature' };
-                    return;
-                }
-                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);
-                    }
-                    // 也可以分法到客户端。 发送失败需要处理 或清理调
-                    for (const client of this.#client) {
-                        try {
-                            client.ws.send(JSON.stringify(body.d));
-                        }
-                        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);
-                        }
-                    }
-                    catch (e) {
-                        this.#error(e);
-                    }
-                });
-                // 处理关闭事件
-                ws.on('close', () => {
-                    console.log(`Client ${clientId} disconnected`);
-                    this.#client = this.#client.filter(client => client.id !== clientId);
-                });
-            });
-            const reconnect = () => {
-                const ws = config.get('ws');
-                if (!ws)
-                    return;
-                // 使用了ws服务器
-                this.#ws = new WebSocket(ws);
-                this.#ws.on('open', () => {
-                    this.#count = 0;
-                    console.log('ws connected');
-                });
-                this.#ws.on('message', data => {
-                    try {
-                        // 拿到消息
-                        const body = JSON.parse(data.toString());
-                        for (const event of this.#events[body.t] || []) {
-                            event(body);
-                        }
-                    }
-                    catch (e) {
-                        this.#error(e);
-                    }
-                });
-                this.#ws.on('close', () => {
-                    console.log('ws closed');
-                    // 重连5次，超过5次不再重连
-                    if (this.#count > 5)
-                        return;
-                    // 23s 后重连
-                    setTimeout(() => {
-                        reconnect();
-                    }, 23000);
-                });
-                this.#ws.on('error', e => {
-                    this.#error(e);
-                });
-            };
-            reconnect();
-        }
-        catch (e) {
-            this.#error(e);
+    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 error
-     */
-    #error(error) {
-        if (this.#events['ERROR']) {
-            for (const event of this.#events['ERROR'] || []) {
-                event(error);
+        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)
+            }
+          })
+          // 处理关闭事件
+          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)
+            }
+          } catch (e) {
+            this.#error(e)
+          }
+        })
+        this.#ws.on('close', () => {
+          console.log('ws closed')
+          // 重连5次，超过5次不再重连
+          if (this.#count > 5) return
+          // 23s 后重连
+          setTimeout(() => {
+            reconnect()
+          }, 23000)
+        })
+        this.#ws.on('error', e => {
+          this.#error(e)
+        })
+      }
+      reconnect()
+    } catch (e) {
+      this.#error(e)
+    }
+  }
+  /**
+   *
+   * @param error
+   */
+  #error(error) {
+    if (this.#events['ERROR']) {
+      for (const event of this.#events['ERROR'] || []) {
+        event(error)
+      }
     }
+  }
 }
 
-export { QQBotClient };
+export { QQBotClient }

package/lib/index.js

@@ -1,6 +1,14 @@
 import { defineBot, getConfigValue, useUserHashKey, OnProcessor } from 'alemonjs';
 import { QQBotClient } from './client.js';
 
+const client = new Proxy({}, {
+    get: (_, prop) => {
+        if (prop in global.client) {
+            return global.client[prop];
+        }
+        return undefined;
+    }
+});
 const platform = 'qq-bot';
 var index = defineBot(() => {
     const value = getConfigValue();
@@ -319,7 +327,6 @@ var index = defineBot(() => {
     client.on('ERROR', console.error);
     // FRIEND_ADD
     global.client = client;
-    //
     return {
         api: {
             use: {
@@ -461,4 +468,4 @@ var index = defineBot(() => {
     };
 });
 
-export { index as default, platform };
+export { client, index as default, platform };

package/package.json

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