@karinjs/adapter-qqbot 1.2.1 → 1.2.3

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;
         });

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/package.json

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