@alemonjs/qq-bot 2.1.0-alpha.17 → 2.1.0-alpha.18

package/lib/sdk/client.webhook.js

@@ -43,16 +43,18 @@ class QQBotClient extends QQBotAPI {
     async #setTimeoutBotConfig() {
         const callBack = async () => {
             const app_id = config.get('app_id');
-            if (!app_id)
+            if (!app_id) {
                 return;
+            }
             const secret = config.get('secret');
-            if (!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);
+            setTimeout(() => void callBack(), data.expires_in * 1000);
         };
         await callBack();
     }
@@ -65,7 +67,7 @@ class QQBotClient extends QQBotAPI {
         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();
@@ -86,7 +88,7 @@ class QQBotClient extends QQBotAPI {
                     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,7 +99,7 @@ class QQBotClient extends QQBotAPI {
                         return;
                     }
                     const body = ctx.request.body;
-                    if (body.op == 13) {
+                    if (+body.op === 13) {
                         ctx.status = 200;
                         ctx.body = {
                             // 返回明文 token
@@ -106,18 +108,19 @@ class QQBotClient extends QQBotAPI {
                             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) {
@@ -173,9 +176,10 @@ class QQBotClient extends QQBotAPI {
                         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);
                             }
@@ -187,8 +191,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();

package/lib/sdk/client.websoket.js

@@ -37,16 +37,16 @@ class QQBotClients extends QQBotAPI {
         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);
             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;
     }
     /**
      * 鉴权数据
@@ -78,8 +78,9 @@ class QQBotClients extends QQBotAPI {
      * @param val 事件处理函数
      */
     on(key, val) {
-        if (!this.#events[key])
+        if (!this.#events[key]) {
             this.#events[key] = [];
+        }
         this.#events[key].push(val);
         return this;
     }
@@ -95,16 +96,17 @@ class QQBotClients extends QQBotAPI {
         if (!this.#gatewayUrl) {
             this.#gatewayUrl = gatewayURL ?? (await this.gateway().then(res => res?.url));
         }
-        if (!this.#gatewayUrl)
+        if (!this.#gatewayUrl) {
             return;
+        }
         // 重新连接的逻辑
-        const reconnect = async () => {
+        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...');
+                console.info('[ws-qqbot] reconnecting...');
                 // 重新starrt
                 start();
                 // 记录
@@ -114,13 +116,14 @@ class QQBotClients extends QQBotAPI {
         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);
                                 }
                             }
@@ -128,8 +131,9 @@ class QQBotClients extends QQBotAPI {
                                 if (this.#events['ERROR']) {
                                     for (const event of this.#events['ERROR']) {
                                         // 是否是函数
-                                        if (typeof event != 'function')
+                                        if (typeof event !== 'function') {
                                             continue;
+                                        }
                                         event(err);
                                     }
                                 }
@@ -138,38 +142,34 @@ class QQBotClients extends QQBotAPI {
                         // Ready Event，鉴权成功
                         if (t === 'READY') {
                             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, //  op = 1
+                                        d: null // 如果是第一次连接，传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 }) => {
+                    7: ({ d }) => {
                         // 执行重新连接
-                        console.info('[ws] reconnect', d);
+                        console.info('[ws-qqbot] reconnect', d);
                         // 取消鉴权发送
-                        if (this.#IntervalId)
+                        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 }) => {
                         // 重制次数
@@ -177,40 +177,40 @@ class QQBotClients extends QQBotAPI {
                         // 记录新循环
                         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 => {
+                    void reconnect();
+                    console.info('[ws-qqbot] close', err);
                 });
             }
         };

package/lib/sdk/instance.js

@@ -0,0 +1,109 @@
+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; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        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; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        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; // 跳过 _ 开头
+        }
+        // 去掉 Symbol 类型的 key
+        if (typeof key === 'symbol') {
+            continue;
+        }
+        // 去掉函数
+        if (typeof request[key] === 'function') {
+            continue;
+        }
+        filtered[key] = request[key];
+    }
+    return filtered;
+};
+// 处理axios错误
+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
+    });
+};
+/**
+ * 基础请求
+ * @param service
+ * @param options
+ * @returns
+ */
+const createAxiosInstance = (service, options) => {
+    return new Promise((resolve, reject) => {
+        service(options)
+            .then(res => resolve(res?.data ?? {}))
+            .catch(err => {
+            loggerError(err);
+            // 丢出错误中携带的响应数据
+            reject(err?.response?.data);
+        });
+    });
+};
+
+export { createAxiosInstance };

package/lib/sdk/webhook.secret.js

@@ -37,10 +37,12 @@ class WebhookAPI {
      */
     getKey() {
         let seed = this.config.secret;
-        if (!seed)
+        if (!seed) {
             throw new Error("secret not set, can't calc ed25519 key");
-        while (seed.length < 32)
-            seed = seed.repeat(2); // Ed25519 的种子大小是 32 字节
+        }
+        while (seed.length < 32) {
+            seed = seed.repeat(2);
+        } // Ed25519 的种子大小是 32 字节
         seed = seed.slice(0, 32); // 修剪到 32 字节
         const privateKey = Buffer.from(seed);
         return {