@alemonjs/qq-bot 2.1.0-alpha.9 → 2.1.1

package/lib/sdk/client.webhook.d.ts

@@ -0,0 +1,9 @@
+import { QQBotAPI } from './api.js';
+import { QQBotEventMap } from './message.js';
+import { Options } from '../config.js';
+export declare class QQBotClient extends QQBotAPI {
+    #private;
+    constructor(opstion: Options);
+    on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this;
+    connect(): void;
+}

package/lib/sdk/{client.js → client.webhook.js}

@@ -13,21 +13,12 @@ class QQBotClient extends QQBotAPI {
     #count = 0;
     #client = [];
     #ws = null;
-    /**
-     * 设置配置
-     * @param opstion
-     */
     constructor(opstion) {
         super();
         for (const key in opstion) {
             config.set(key, opstion[key]);
         }
     }
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
     on(key, val) {
         if (!this.#events[key]) {
             this.#events[key] = [];
@@ -35,37 +26,25 @@ class QQBotClient extends QQBotAPI {
         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)
+            if (!app_id || !secret) {
                 return;
-            // 发送请求
-            const data = await this.getAuthentication(app_id, secret).then(res => res.data);
+            }
+            const data = await this.getAuthentication();
             config.set('access_token', data.access_token);
             console.info('refresh', data.expires_in, 's');
-            setTimeout(callBack, data.expires_in * 1000);
+            setTimeout(() => void callBack(), data.expires_in * 1000);
         };
         await callBack();
     }
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
     connect() {
         try {
             const ws = config.get('ws');
             if (!ws) {
-                this.#setTimeoutBotConfig();
+                void this.#setTimeoutBotConfig();
                 this.#app = new Koa();
                 this.#app.use(bodyParser());
                 const router = new Router();
@@ -85,8 +64,7 @@ class QQBotClient extends QQBotAPI {
                     ctx.req.on('end', () => (ctx.request.rawBody = rawData));
                     await next();
                 });
-                // 启动服务
-                router.post(route, async (ctx) => {
+                router.post(route, ctx => {
                     const sign = ctx.req.headers['x-signature-ed25519'];
                     const timestamp = ctx.req.headers['x-signature-timestamp'];
                     const rawBody = ctx.request.rawBody;
@@ -97,27 +75,24 @@ class QQBotClient extends QQBotAPI {
                         return;
                     }
                     const body = ctx.request.body;
-                    if (body.op == 13) {
+                    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) {
+                    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');
-                        // 也可以分法到客户端。 发送失败需要处理 或清理调
+                        const accessToken = config.get('access_token');
                         for (const client of this.#client) {
                             try {
-                                if (access_token)
-                                    body['access_token'] = access_token;
+                                if (accessToken) {
+                                    body['access_token'] = accessToken;
+                                }
                                 client.ws.send(JSON.stringify(body));
                             }
                             catch (e) {
@@ -128,22 +103,17 @@ class QQBotClient extends QQBotAPI {
                 });
                 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 ws://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] || []) {
@@ -154,7 +124,6 @@ class QQBotClient extends QQBotAPI {
                             this.#error(e);
                         }
                     });
-                    // 处理关闭事件
                     ws.on('close', () => {
                         console.log(`${clientId} disconnected`);
                         this.#client = this.#client.filter(client => client.id !== clientId);
@@ -163,7 +132,6 @@ class QQBotClient extends QQBotAPI {
             }
             else {
                 const reConnect = () => {
-                    // 使用了ws服务器
                     this.#ws = new WebSocket(ws);
                     this.#ws.on('open', () => {
                         this.#count = 0;
@@ -171,11 +139,11 @@ class QQBotClient extends QQBotAPI {
                     });
                     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);
+                            const accessToken = body['access_token'];
+                            if (accessToken) {
+                                config.set('access_token', accessToken);
+                            }
                             for (const event of this.#events[body.t] || []) {
                                 event(body.d);
                             }
@@ -186,10 +154,9 @@ class QQBotClient extends QQBotAPI {
                     });
                     this.#ws.on('close', () => {
                         console.log('ws closed');
-                        // 重连5次，超过5次不再重连
-                        if (this.#count > 5)
+                        if (this.#count > 5) {
                             return;
-                        // 1.3s 后重连
+                        }
                         setTimeout(() => {
                             reConnect();
                         }, 1300);
@@ -205,10 +172,6 @@ class QQBotClient extends QQBotAPI {
             this.#error(e);
         }
     }
-    /**
-     *
-     * @param error
-     */
     #error(error) {
         if (this.#events['ERROR']) {
             for (const event of this.#events['ERROR'] || []) {

package/lib/sdk/client.websoket.d.ts

@@ -0,0 +1,9 @@
+import { QQBotAPI } from './api.js';
+import { QQBotEventMap } from './message.js';
+import { Options } from './typing.js';
+export declare class QQBotClients extends QQBotAPI {
+    #private;
+    constructor(opstion: Options);
+    on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this;
+    connect(gatewayURL?: string): Promise<void>;
+}

package/lib/sdk/client.websoket.js

@@ -2,62 +2,40 @@ import WebSocket from 'ws';
 import { QQBotAPI } from './api.js';
 import { config } from './config.js';
 import { getIntentsMask } from './intents.js';
-import { Counter } from './counter.js';
+import { Counter } from 'alemonjs/utils';
 
-/**
- * 连接
- */
 class QQBotClients extends QQBotAPI {
-    //
-    #counter = new Counter(1); // 初始值为1
-    // 标记是否已连接
+    #counter = new Counter(1);
     #isConnected = false;
-    // 存储最新的消息序号
     #heartbeat_interval = 30000;
-    // 鉴权
     #IntervalId = null;
-    // url
     #gatewayUrl = null;
-    /**
-     * 设置配置
-     * @param opstion
-     */
     constructor(opstion) {
         super();
         for (const key in opstion) {
             config.set(key, opstion[key]);
         }
     }
-    /**
-     * 定时鉴权
-     * @param cfg
-     * @returns
-     */
     async #setTimeoutBotConfig() {
         const accessToken = async () => {
             const app_id = config.get('app_id');
             const secret = config.get('secret');
-            if (!app_id || !secret)
+            if (!app_id || !secret) {
                 return;
-            // 发送请求
-            const data = await this.getAuthentication(app_id, secret).then(res => res.data);
+            }
+            const data = await this.getAuthentication();
             config.set('access_token', data.access_token);
             console.info('refresh', data.expires_in, 's');
-            setTimeout(accessToken, data.expires_in * 1000);
+            setTimeout(() => void accessToken(), data.expires_in * 1000);
         };
         await accessToken();
-        return;
     }
-    /**
-     * 鉴权数据
-     * @returns
-     */
     #aut() {
         const token = config.get('access_token');
         const intents = config.get('intents');
         const shard = config.get('shard');
         return {
-            op: 2, // op = 2
+            op: 2,
             d: {
                 token: `QQBot ${token}`,
                 intents: getIntentsMask(intents),
@@ -72,145 +50,122 @@ class QQBotClients extends QQBotAPI {
     }
     #ws = null;
     #events = {};
-    /**
-     * 注册事件处理程序
-     * @param key 事件名称
-     * @param val 事件处理函数
-     */
     on(key, val) {
-        if (!this.#events[key])
+        if (!this.#events[key]) {
             this.#events[key] = [];
+        }
         this.#events[key].push(val);
         return this;
     }
-    /**
-     *
-     * @param cfg
-     * @param conversation
-     */
     async connect(gatewayURL) {
-        // 定时模式
         await this.#setTimeoutBotConfig();
-        // 请求url
         if (!this.#gatewayUrl) {
             this.#gatewayUrl = gatewayURL ?? (await this.gateway().then(res => res?.url));
         }
-        if (!this.#gatewayUrl)
+        if (!this.#gatewayUrl) {
             return;
-        // 重新连接的逻辑
-        const reconnect = async () => {
-            if (this.#counter.get() >= 5) {
+        }
+        const reconnect = () => {
+            if (this.#counter.value >= 5) {
                 console.info('The maximum number of reconnections has been reached, cancel reconnection');
                 return;
             }
             setTimeout(() => {
-                console.info('[ws] reconnecting...');
-                // 重新starrt
+                console.info('[ws-qqbot] reconnecting...');
                 start();
-                // 记录
-                this.#counter.getNextId();
+                this.#counter.next();
             }, 5000);
         };
         const start = () => {
             if (this.#gatewayUrl) {
                 const map = {
-                    0: async ({ t, d }) => {
+                    0: ({ t, d }) => {
                         if (this.#events[t]) {
                             try {
                                 for (const event of this.#events[t]) {
-                                    // 是否是函数
-                                    if (typeof event != 'function')
+                                    if (typeof event !== 'function') {
                                         continue;
+                                    }
                                     event(d);
                                 }
                             }
                             catch (err) {
                                 if (this.#events['ERROR']) {
                                     for (const event of this.#events['ERROR']) {
-                                        // 是否是函数
-                                        if (typeof event != 'function')
+                                        if (typeof event !== 'function') {
                                             continue;
+                                        }
                                         event(err);
                                     }
                                 }
                             }
                         }
-                        // Ready Event，鉴权成功
                         if (t === 'READY') {
+                            if (this.#IntervalId) {
+                                clearInterval(this.#IntervalId);
+                            }
                             this.#IntervalId = setInterval(() => {
-                                if (this.#isConnected) {
-                                    this.#ws &&
-                                        this.#ws.send(JSON.stringify({
-                                            op: 1, //  op = 1
-                                            d: null // 如果是第一次连接，传null
-                                        }));
+                                if (this.#isConnected && this.#ws) {
+                                    this.#ws.send(JSON.stringify({
+                                        op: 1,
+                                        d: null
+                                    }));
                                 }
                             }, this.#heartbeat_interval);
                         }
-                        // Resumed Event，恢复连接成功
                         if (t === 'RESUMED') {
-                            console.info('[ws] restore connection');
-                            // 重制次数
+                            console.info('[ws-qqbot] restore connection');
                             this.#counter.reStart();
                         }
-                        return;
                     },
                     6: ({ d }) => {
-                        console.info('[ws] connection attempt', d);
-                        return;
+                        console.info('[ws-qqbot] connection attempt', d);
                     },
-                    7: async ({ d }) => {
-                        // 执行重新连接
-                        console.info('[ws] reconnect', d);
-                        // 取消鉴权发送
-                        if (this.#IntervalId)
+                    7: ({ d }) => {
+                        console.info('[ws-qqbot] reconnect', d);
+                        if (this.#IntervalId) {
                             clearInterval(this.#IntervalId);
-                        return;
+                        }
                     },
                     9: ({ d }) => {
-                        console.info('[ws] parameter error', d);
-                        return;
+                        console.info('[ws-qqbot] parameter error', d);
                     },
                     10: ({ d }) => {
-                        // 重制次数
                         this.#isConnected = true;
-                        // 记录新循环
                         this.#heartbeat_interval = d.heartbeat_interval;
-                        // 发送鉴权
-                        this.#ws && this.#ws.send(JSON.stringify(this.#aut()));
-                        return;
+                        if (this.#ws) {
+                            this.#ws.send(JSON.stringify(this.#aut()));
+                        }
                     },
                     11: () => {
-                        // OpCode 11 Heartbeat ACK 消息，心跳发送成功
-                        console.info('[ws] heartbeat transmission');
-                        // 重制次数
+                        console.info('[ws-qqbot] heartbeat transmission');
                         this.#counter.reStart();
-                        return;
                     },
                     12: ({ d }) => {
-                        console.info('[ws] platform data', d);
-                        return;
+                        console.debug('[ws-qqbot] platform data', d);
                     }
                 };
-                // 连接
                 this.#ws = new WebSocket(this.#gatewayUrl);
                 this.#ws.on('open', () => {
-                    console.info('[ws] open');
+                    console.info('[ws-qqbot] open');
                 });
-                // 监听消息
-                this.#ws.on('message', async (msg) => {
+                this.#ws.on('message', msg => {
                     const message = JSON.parse(msg.toString('utf8'));
-                    if (process.env.NTQQ_WS == 'dev')
+                    if (process.env.NTQQ_WS === 'dev') {
                         console.info('message', message);
-                    // 根据 opcode 进行处理
+                    }
                     if (map[message.op]) {
                         map[message.op](message);
                     }
                 });
-                // 关闭
-                this.#ws.on('close', async (err) => {
-                    await reconnect();
-                    console.info('[ws] close', err);
+                this.#ws.on('close', err => {
+                    this.#isConnected = false;
+                    if (this.#IntervalId) {
+                        clearInterval(this.#IntervalId);
+                        this.#IntervalId = null;
+                    }
+                    void reconnect();
+                    console.info('[ws-qqbot] close', err);
                 });
             }
         };

package/lib/sdk/config.d.ts

@@ -0,0 +1 @@
+export declare const config: Map<string, any>;

package/lib/sdk/instance.d.ts

@@ -0,0 +1,3 @@
+import { AxiosInstance } from 'axios';
+import { type AxiosRequestConfig } from 'axios';
+export declare const createAxiosInstance: (service: AxiosInstance, options: AxiosRequestConfig) => Promise<any>;

package/lib/sdk/instance.js

@@ -0,0 +1,93 @@
+const filterHeaders = (headers = {}) => {
+    if (!headers) {
+        return headers;
+    }
+    const filtered = {};
+    const sensitiveKeys = [/^authorization$/i, /^cookie$/i, /^set-cookie$/i, /token/i, /key/i, /jwt/i, /^session[-_]id$/i, /^uid$/i, /^user[-_]id$/i];
+    for (const key in headers) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof headers[key] === 'function') {
+            continue;
+        }
+        if (sensitiveKeys.some(re => re.test(key))) {
+            filtered[key] = '******';
+        }
+        else {
+            filtered[key] = headers[key];
+        }
+    }
+    return filtered;
+};
+const filterConfig = (config = {}) => {
+    if (!config) {
+        return config;
+    }
+    const filtered = {};
+    for (const key in config) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof config[key] === 'function') {
+            continue;
+        }
+        filtered[key] = config[key];
+    }
+    return filtered;
+};
+const filterRequest = (request = {}) => {
+    if (!request) {
+        return request;
+    }
+    const filtered = {};
+    for (const key in request) {
+        if (/^_/.test(key)) {
+            continue;
+        }
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        if (typeof request[key] === 'function') {
+            continue;
+        }
+        filtered[key] = request[key];
+    }
+    return filtered;
+};
+const loggerError = err => {
+    logger.error('[axios] error', {
+        config: {
+            headers: filterHeaders(err?.config?.headers),
+            params: err?.config?.params,
+            data: err?.config?.data
+        },
+        response: {
+            status: err?.response?.status,
+            statusText: err?.response?.statusText,
+            headers: filterHeaders(err?.response?.headers),
+            config: filterConfig(err?.response?.config),
+            request: filterRequest(err?.response?.request),
+            data: err?.response?.data
+        },
+        message: err?.message
+    });
+};
+const createAxiosInstance = async (service, options) => {
+    try {
+        const res = await service(options);
+        return res?.data ?? {};
+    }
+    catch (err) {
+        loggerError(err);
+        throw err?.response?.data ?? err;
+    }
+};
+
+export { createAxiosInstance };

package/lib/sdk/intents.d.ts

@@ -0,0 +1,3 @@
+export declare const AvailableIntentsEventsEnum: readonly ["GUILDS", "GUILD_MEMBERS", "GUILD_MESSAGES", "GUILD_MESSAGE_REACTIONS", "DIRECT_MESSAGE", "INTERACTION", "MESSAGE_AUDIT", "FORUMS_EVENT", "AUDIO_ACTION", "PUBLIC_GUILD_MESSAGES", "GROUP_AND_C2C_EVENT"];
+export type IntentsEnum = (typeof AvailableIntentsEventsEnum)[number];
+export declare function getIntentsMask(intents: IntentsEnum[]): number;