@alemonjs/qq-bot 0.0.12 → 0.0.13

package/lib/client.d.ts

@@ -1,26 +1,26 @@
-import { QQBotAPI } from './api.js';
-import { QQBotEventMap } from './message.js';
-import { Options } from './typing.js';
+import { QQBotAPI } from './api.js'
+import { QQBotEventMap } from './message.js'
+import { Options } from './typing.js'
 
 declare class QQBotClient extends QQBotAPI {
-    #private;
-    /**
-     * 设置配置
-     * @param opstion
-     */
-    constructor(opstion: Options);
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
-    on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this;
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
-    connect(): void;
+  #private
+  /**
+   * 设置配置
+   * @param opstion
+   */
+  constructor(opstion: Options)
+  /**
+   * 注册事件处理程序
+   * @param key 事件名称
+   * @param val 事件处理函数
+   */
+  on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this
+  /**
+   *
+   * @param cfg
+   * @param conversation
+   */
+  connect(): void
 }
 
-export { QQBotClient };
+export { QQBotClient }

package/lib/client.js

@@ -1,228 +1,212 @@
-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 {
-            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);
-                    });
-                });
+    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 {
-                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();
+          } else if (body.op == 0) {
+            ctx.status = 204
+            // 根据事件类型，处理事件
+            for (const event of this.#events[body.t] || []) {
+              event(body.d)
             }
-        }
-        catch (e) {
-            this.#error(e);
-        }
-    }
-    /**
-     *
-     * @param error
-     */
-    #error(error) {
-        if (this.#events['ERROR']) {
-            for (const event of this.#events['ERROR'] || []) {
-                event(error);
+            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)
+          })
+        })
+      } 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)
+    }
+  }
+  /**
+   *
+   * @param error
+   */
+  #error(error) {
+    if (this.#events['ERROR']) {
+      for (const event of this.#events['ERROR'] || []) {
+        event(error)
+      }
     }
+  }
 }
 
-export { QQBotClient };
+export { QQBotClient }

package/lib/config.js

@@ -1,3 +1,3 @@
-const config = new Map();
+const config = new Map()
 
-export { config };
+export { config }

package/lib/desktop.js

@@ -13,12 +13,14 @@ const activate = context => {
     context.onCommand('open.qq-bot', () => {
         const dir = join(__dirname, '../', 'dist', 'index.html');
         const scriptReg = /<script.*?src="(.+?)".*?>/;
-        const styleReg = /<link.*?href="(.+?)".*?>/;
+        const styleReg = /<link.*?rel="stylesheet".*?href="(.+?)".*?>/;
+        const iconReg = /<link.*?rel="icon".*?href="(.+?)".*?>/g;
         // 创建 webview 路径
         const styleUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.css'));
         const scriptUri = context.createExtensionDir(join(__dirname, '../', 'dist', 'assets', 'index.js'));
         // 确保路径存在
         const html = readFileSync(dir, 'utf-8')
+            .replace(iconReg, ``)
             .replace(scriptReg, `<script type="module" crossorigin src="${scriptUri}"></script>`)
             .replace(styleReg, `<link rel="stylesheet" crossorigin href="${styleUri}">`);
         // 立即渲染 webview

package/lib/from.js

@@ -1,7 +1,7 @@
-import { existsSync, createReadStream } from 'fs';
-import { Readable, isReadable } from 'stream';
-import { basename } from 'path';
-import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
+import { existsSync, createReadStream } from 'fs'
+import { Readable, isReadable } from 'stream'
+import { basename } from 'path'
+import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type'
 
 /**
  * 创建form
@@ -10,35 +10,28 @@ import { fileTypeFromBuffer, fileTypeFromStream } from 'file-type';
  * @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 };
+  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 };
+export { createPicFrom }

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 import * as alemonjs from 'alemonjs';
-import { QQBotClient } from './client.js';
+import { QQBotAPI } from './sdk/api.js';
 
-type Client = typeof QQBotClient.prototype;
+type Client = typeof QQBotAPI.prototype;
 declare const client: Client;
 declare const platform = "qq-bot";
-declare const _default: () => alemonjs.ClientAPI;
+declare const _default: alemonjs.DefineBotValue;
 
 export { type Client, client, _default as default, platform };