@karinjs/adapter-qqbot 1.2.1 → 1.2.4

package/lib/core/api.d.ts

@@ -1,6 +1,7 @@
 import WebSocket from 'ws';
-import { LoggerLevel } from 'node-karin';
+import EventEmitter from 'events';
 import { AccountCfgType } from '../utils/index.js';
+import { LoggerLevel } from 'node-karin';
 import { IdType, FileType, PathType, V2ApiType, UploadMediaOptions, SendMessageOptions, UploadMediaResponse, SubEvent } from '../types/index.js';
 export interface SendMessageResponse {
     /** 消息唯一ID */
@@ -15,7 +16,7 @@ export type Params = Array<{
     key: string;
     values: string[];
 }>;
-export declare class QQBotApi {
+export declare class QQBotApi extends EventEmitter {
     #private;
     /** 开发者的appId */
     appId: string;
@@ -57,13 +58,9 @@ export declare class QQBotApi {
      * @param isRefresh 是否是刷新凭证
      */
     getAccessToken(isRefresh?: boolean): Promise<{
-        /**
-         * 凭证有效时间，单位：秒 需要在倒计时50秒内刷新凭证
-         */
+        /** 凭证有效时间，单位：秒 需要在倒计时50秒内刷新凭证 */
         expires_in: string;
-        /**
-         * 调用凭证
-         */
+        /** 调用凭证 */
         access_token: string;
     }>;
     /**

package/lib/core/api.js

@@ -1,8 +1,9 @@
 import got from 'got';
 import WebSocket from 'ws';
+import EventEmitter from 'events';
 import { Intents } from './intents.js';
 import { common, logger } from 'node-karin';
-export class QQBotApi {
+export class QQBotApi extends EventEmitter {
     /** 开发者的appId */
     appId;
     /** Bot头像 */
@@ -29,6 +30,7 @@ export class QQBotApi {
     host;
     #config;
     constructor(config) {
+        super();
         this.#config = config;
         this.appId = String(this.#config.appId);
         this.avatar = '';
@@ -78,7 +80,6 @@ export class QQBotApi {
         const time = Number(expires_in) * 1000 - 50000;
         setTimeout(async () => {
             this.getAccessToken(true);
-            /** 重新鉴权 */
         }, time);
         return data;
     }
@@ -210,17 +211,17 @@ export class QQBotApi {
                 const info = await this.getBotInfo();
                 this.avatar = info.avatar;
                 this.nick = data.d.user.username;
-                this.wss.emit('start');
+                this.emit('start');
                 break;
             }
             case "GROUP_AT_MESSAGE_CREATE" /* EventType.GROUP_AT_MESSAGE_CREATE */: {
                 this.heartbeat.d = data.s;
-                this.wss.emit("GROUP_AT_MESSAGE_CREATE" /* EventType.GROUP_AT_MESSAGE_CREATE */, data);
+                this.emit("GROUP_AT_MESSAGE_CREATE" /* EventType.GROUP_AT_MESSAGE_CREATE */, data);
                 break;
             }
             case "C2C_MESSAGE_CREATE" /* EventType.C2C_MESSAGE_CREATE */: {
                 this.heartbeat.d = data.s;
-                this.wss.emit("C2C_MESSAGE_CREATE" /* EventType.C2C_MESSAGE_CREATE */, data);
+                this.emit("C2C_MESSAGE_CREATE" /* EventType.C2C_MESSAGE_CREATE */, data);
                 break;
             }
             // case 'GUILD_CREATE':

package/lib/core/index.js

@@ -1,7 +1,7 @@
 import { QQBotApi } from './api.js';
 import { markdownTemplate, markdownRaw } from './markdown.js';
 import { common, common as Common, config as Config, } from '../utils/index.js';
-import { logger, listener, segment, KarinMessage, } from 'node-karin';
+import { logger, karin, segment, KarinMessage, } from 'node-karin';
 /**
  * - QQBot适配器
  */
@@ -47,7 +47,7 @@ export class AdapterQQBot {
         await this.super.getAccessToken();
         await this.super.getWssUrl();
         this.super.createWss();
-        this.super.wss.on("GROUP_AT_MESSAGE_CREATE" /* QQBotEventType.GROUP_AT_MESSAGE_CREATE */, (data) => {
+        this.super.on("GROUP_AT_MESSAGE_CREATE" /* QQBotEventType.GROUP_AT_MESSAGE_CREATE */, (data) => {
             const user_id = data.d.author.id;
             const group_id = data.d.group_id;
             const time = new Date(data.d.timestamp).getTime();
@@ -79,9 +79,9 @@ export class AdapterQQBot {
             const e = new KarinMessage(message);
             e.bot = this;
             e.replyCallback = async (elements) => await this._sendNsg(elements, "groups" /* PathType.Groups */, e.contact.peer, e.message_id);
-            listener.emit('message', e);
+            karin.emit('adapter.message', e);
         });
-        this.super.wss.on("C2C_MESSAGE_CREATE" /* QQBotEventType.C2C_MESSAGE_CREATE */, (data) => {
+        this.super.on("C2C_MESSAGE_CREATE" /* QQBotEventType.C2C_MESSAGE_CREATE */, (data) => {
             const user_id = data.d.author.user_openid;
             const time = new Date(data.d.timestamp).getTime();
             const message = {
@@ -112,14 +112,14 @@ export class AdapterQQBot {
             const e = new KarinMessage(message);
             e.bot = this;
             e.replyCallback = async (elements) => await this._sendNsg(elements, "users" /* PathType.Friends */, e.contact.peer, e.message_id);
-            listener.emit('message', e);
+            karin.emit('adapter.message', e);
         });
         /** 等待建立连接 注册Bot */
-        this.super.wss.on('start', () => {
+        this.super.on('start', () => {
             this.account.name = this.super.nick;
             this.logger('info', `建立连接成功: ${this.account.name}`);
             /** 注册bot */
-            const index = listener.addBot({ type: this.adapter.type, bot: this });
+            const index = karin.addBot({ type: this.adapter.type, bot: this });
             if (index)
                 this.adapter.index = index;
         });
@@ -163,11 +163,12 @@ export class AdapterQQBot {
                 elements.push(segment.face(Number(Match[1])));
             }
             else {
-                const BotConfig = Config.getBotConfig(this.account.uid) || { regex: [] };
-                for (const reg of BotConfig.regex) {
-                    if (typeof v === 'string') {
-                        v = v.trim().replace(new RegExp(reg.reg), reg.rep);
-                    }
+                const { regex } = Config.getBotConfig(this.account.uid) || { regex: [] };
+                for (const r of regex) {
+                    const reg = r.reg;
+                    if (typeof reg !== 'string')
+                        continue;
+                    v = v.replace(reg, r.rep);
                 }
                 elements.push(segment.text(v));
             }

package/lib/core/markdown.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { common, common as Common } from '../utils/common.js';
-import { handler, common as karinCommon, } from 'node-karin';
+import { handler, common as karinCommon, segment, } from 'node-karin';
 /**
  * 图文模板
  */
@@ -26,8 +26,9 @@ export async function markdownTemplate(Opt) {
     const textFn = async () => {
         text.sort((a, b) => a.index - b.index);
         const data = Common.getQQBotButton(text.map(v => v.data.text).join(''));
+        const val = type === "users" /* PathType.Friends */ ? Common.formatText(data.text, true) : Common.formatText(data.text);
         /** 去除at全体 */
-        params.push({ key: bot.markdown.oldTemplate.textStartKey, values: [data.text.replace(/everyone/g, '').replace(/\n/g, '\r')] });
+        params.push({ key: bot.markdown.oldTemplate.textStartKey, values: [val] });
         /** 按钮 */
         buttons.push(...data.data);
     };
@@ -50,6 +51,12 @@ export async function markdownTemplate(Opt) {
             case 'image':
                 image.push({ index, data });
                 break;
+            case 'at': {
+                if (type === "users" /* PathType.Friends */)
+                    break;
+                text.push({ index, data: segment.text(`<qqbot-at-user id="${data.uid || data.uin}" />`) });
+                break;
+            }
             case 'record': {
                 const file = await common.voiceToSilk(data.file);
                 list.push(mediaFn(file, type, '0.silk', 3 /* FileType.Record */));
@@ -176,12 +183,19 @@ export async function markdownRaw(Opt) {
                 /** 先提取掉url 随后放出按钮中 */
                 const res = Common.getQQBotButton(data.text);
                 buttons.push(...res.data);
-                message.push({ index, data: res.text.replace(/everyone/g, '').replace(/\n/g, '\r') });
+                const text = type === "users" /* PathType.Friends */ ? Common.formatText(res.text, true) : Common.formatText(res.text);
+                message.push({ index, data: text });
                 break;
             }
             case 'image':
                 imageFn(index, data);
                 break;
+            case 'at': {
+                if (type === "users" /* PathType.Friends */)
+                    break;
+                message.push({ index, data: `<qqbot-at-user id="${data.uid || data.uin}" />` });
+                break;
+            }
             case 'record': {
                 const file = await common.voiceToSilk(data.file);
                 list.push(mediaFn(file, type, '0.silk', 3 /* FileType.Record */));

package/lib/index.js

@@ -1,7 +1,7 @@
 import './core/index.js';
+import Jimp from 'jimp';
 import { logger, common } from 'node-karin';
 import { basename, dirPath } from './utils/dir.js';
-import Jimp from 'jimp';
 const pkg = common.readJson(dirPath + '/package.json');
 logger.info(`${logger.violet(`[插件:${pkg.version}]`)} ${logger.green(basename)} 初始化完成~`);
 export default Jimp;

package/lib/utils/common.d.ts

@@ -54,6 +54,13 @@ declare class Common {
         text: string;
         data: ButtonElement[];
     };
+    /**
+     * 传入文本 将文本一些特殊字符转义去除 用于处理markdown
+     * @param text - 文本
+     * @param isC2C - 是否是C2C
+     * @returns 处理后的文本
+     */
+    formatText(text: string, isC2C?: boolean): string;
 }
 export declare const common: Common;
 export {};

package/lib/utils/common.js

@@ -194,5 +194,17 @@ class Common {
             data,
         };
     }
+    /**
+     * 传入文本 将文本一些特殊字符转义去除 用于处理markdown
+     * @param text - 文本
+     * @param isC2C - 是否是C2C
+     * @returns 处理后的文本
+     */
+    formatText(text, isC2C = false) {
+        text = text.replace(/everyone/g, '').replace(/\n/g, '\r');
+        if (isC2C)
+            text = text.replace(/<qqbot-at-user id=".+" \/>/gm, '').replace(/<@.+>/gm, '');
+        return text;
+    }
 }
 export const common = new Common();

package/lib/utils/config.d.ts

@@ -50,7 +50,7 @@ export interface GlobalCfgType {
     /** 接受到消息后对文本进行表达式处理，优先级高于全局配置 */
     regex: Array<{
         /** 匹配的正则表达式 */
-        reg: string;
+        reg: RegExp;
         /** 替换为的内容 */
         rep: string;
     }>;

package/lib/utils/config.js

@@ -107,12 +107,24 @@ class Cfg {
         const botCfg = allCfg.accounts[appID];
         /** 全局默认配置 */
         const defCfg = allCfg.default;
-        return {
+        /** 对regex进行处理 */
+        const regex = Array.isArray(botCfg.regex) ? botCfg.regex : defCfg.regex;
+        /** 对表达式进行new RegExp处理 */
+        const regexData = regex.map(({ reg, rep }) => {
+            return {
+                reg: reg instanceof RegExp ? reg : new RegExp(reg),
+                rep,
+            };
+        });
+        const data = {
             ...defCfg,
             ...botCfg,
             sendMode: Number(botCfg.sendMode) || defCfg.sendMode,
-            regex: Array.isArray(botCfg.regex) ? botCfg.regex : defCfg.regex,
+            regex: regexData,
         };
+        /** 缓存 */
+        this.change.set(key, data);
+        return data;
     }
     /**
      * package
@@ -153,18 +165,6 @@ class Cfg {
         watcher.on('change', () => {
             this.change.delete(key);
             logger.mark(`[修改配置文件][${type}][${name}]`);
-            /** 文件修改后调用对应的方法 请自行使用 */
-            // switch (`change_${name}`) {
-            //   case 'change_App':
-            //     this.change_App()
-            //     break
-            //   case 'change_config':
-            //     this.change_config()
-            //     break
-            //   case 'change_group':
-            //     this.change_group()
-            //     break
-            // }
         });
         /** 缓存 防止重复监听 */
         this.watcher.set(key, watcher);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@karinjs/adapter-qqbot",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "author": "shijin",
   "type": "module",
   "description": "karin plugin template",