@alemonjs/qq-bot 2.1.33 → 2.1.35

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

@@ -1,9 +1,26 @@
-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;
+import { Options } from "../config.js";
+import { QQBotAPI } from "./api.js";
+import { QQBotEventMap } from "./message.js";
+//#region src/sdk/client.webhook.d.ts
+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;
 }
+//#endregion
+export { QQBotClient };

package/lib/sdk/client.webhook.js

@@ -1,193 +1,189 @@
-import { QQBotAPI } from './api.js';
-import bodyParser from 'koa-bodyparser';
-import Router from 'koa-router';
-import { WebhookAPI } from './webhook.secret.js';
-import Koa from 'koa';
-import { v4 } from 'uuid';
-import { WebSocketServer, WebSocket } from 'ws';
+import { QQBotAPI } from "./api.js";
+import { WebhookAPI } from "./webhook.secret.js";
+import { WebSocket, WebSocketServer } from "ws";
+import bodyParser from "koa-bodyparser";
+import Router from "koa-router";
+import Koa from "koa";
+import { v4 } from "uuid";
 
+//#region src/sdk/client.webhook.ts
 const normalizeGatewayMessage = (message) => {
-    if (!message?.id || !message?.d || typeof message.d !== 'object' || Array.isArray(message.d)) {
-        return message;
-    }
-    if (message.d.id === undefined || message.d.id === null || message.d.id === '') {
-        message.d.id = message.id;
-    }
-    return message;
+	if (!message?.id || !message?.d || typeof message.d !== "object" || Array.isArray(message.d)) return message;
+	if (message.d.id === void 0 || message.d.id === null || message.d.id === "") message.d.id = message.id;
+	return message;
+};
+var QQBotClient = class extends QQBotAPI {
+	#events = {};
+	#app = null;
+	#count = 0;
+	#client = [];
+	#ws = null;
+	/**
+	* 设置配置
+	* @param opstion
+	*/
+	constructor(opstion) {
+		super(opstion);
+	}
+	/**
+	* 注册事件处理程序
+	* @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 = this.config.get("app_id");
+			const secret = this.config.get("secret");
+			if (!app_id || !secret) return;
+			const data = await this.getAuthentication();
+			this.config.set("access_token", data.access_token);
+			console.info("refresh", data.expires_in, "s");
+			setTimeout(() => void callBack(), data.expires_in * 1e3);
+		};
+		await callBack();
+	}
+	/**
+	*
+	* @param cfg
+	* @param conversation
+	*/
+	connect() {
+		try {
+			const ws = this.config.get("ws");
+			this.updateConnectionStatus({
+				state: "connecting",
+				transport: ws ? "proxy" : "webhook"
+			});
+			if (!ws) {
+				this.#setTimeoutBotConfig();
+				this.#app = new Koa();
+				this.#app.use(bodyParser());
+				const router = new Router();
+				const port = this.config.get("port");
+				const secret = this.config.get("secret");
+				const route = this.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, (ctx) => {
+					const sign = ctx.req.headers["x-signature-ed25519"];
+					const timestamp = ctx.req.headers["x-signature-timestamp"];
+					const rawBody = ctx.request.rawBody;
+					if (!ntqqWebhook.validSign(timestamp, rawBody, String(sign))) {
+						ctx.status = 400;
+						ctx.body = { msg: "invalid signature" };
+						return;
+					}
+					const body = normalizeGatewayMessage(ctx.request.body);
+					if (+body.op === 13) {
+						ctx.status = 200;
+						ctx.body = {
+							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 accessToken = this.config.get("access_token");
+						for (const client of this.#client) try {
+							if (accessToken) body["access_token"] = accessToken;
+							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);
+					this.updateConnectionStatus({ state: "ready" });
+				});
+				const wss = new WebSocketServer({ 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 = normalizeGatewayMessage(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 = () => {
+					this.#ws = new WebSocket(ws);
+					this.#ws.on("open", () => {
+						this.#count = 0;
+						this.updateConnectionStatus({ state: "ready" });
+						console.log("ws connected");
+					});
+					this.#ws.on("message", (data) => {
+						try {
+							const body = normalizeGatewayMessage(JSON.parse(data.toString()));
+							const accessToken = body["access_token"];
+							if (accessToken) this.config.set("access_token", accessToken);
+							for (const event of this.#events[body.t] || []) event(body.d);
+						} catch (e) {
+							this.#error(e);
+						}
+					});
+					this.#ws.on("close", () => {
+						this.updateConnectionStatus({ state: "offline" });
+						console.log("ws closed");
+						if (this.#count > 5) return;
+						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);
+	}
 };
-class QQBotClient extends QQBotAPI {
-    #events = {};
-    #app = null;
-    #count = 0;
-    #client = [];
-    #ws = null;
-    constructor(opstion) {
-        super(opstion);
-    }
-    on(key, val) {
-        if (!this.#events[key]) {
-            this.#events[key] = [];
-        }
-        this.#events[key].push(val);
-        return this;
-    }
-    async #setTimeoutBotConfig() {
-        const callBack = async () => {
-            const app_id = this.config.get('app_id');
-            const secret = this.config.get('secret');
-            if (!app_id || !secret) {
-                return;
-            }
-            const data = await this.getAuthentication();
-            this.config.set('access_token', data.access_token);
-            console.info('refresh', data.expires_in, 's');
-            setTimeout(() => void callBack(), data.expires_in * 1000);
-        };
-        await callBack();
-    }
-    connect() {
-        try {
-            const ws = this.config.get('ws');
-            this.updateConnectionStatus({ state: 'connecting', transport: ws ? 'proxy' : 'webhook' });
-            if (!ws) {
-                void this.#setTimeoutBotConfig();
-                this.#app = new Koa();
-                this.#app.use(bodyParser());
-                const router = new Router();
-                const port = this.config.get('port');
-                const secret = this.config.get('secret');
-                const route = this.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, 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 = normalizeGatewayMessage(ctx.request.body);
-                    if (+body.op === 13) {
-                        ctx.status = 200;
-                        ctx.body = {
-                            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 accessToken = this.config.get('access_token');
-                        for (const client of this.#client) {
-                            try {
-                                if (accessToken) {
-                                    body['access_token'] = accessToken;
-                                }
-                                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);
-                    this.updateConnectionStatus({ state: 'ready' });
-                });
-                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 = normalizeGatewayMessage(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 = () => {
-                    this.#ws = new WebSocket(ws);
-                    this.#ws.on('open', () => {
-                        this.#count = 0;
-                        this.updateConnectionStatus({ state: 'ready' });
-                        console.log('ws connected');
-                    });
-                    this.#ws.on('message', data => {
-                        try {
-                            const body = normalizeGatewayMessage(JSON.parse(data.toString()));
-                            const accessToken = body['access_token'];
-                            if (accessToken) {
-                                this.config.set('access_token', accessToken);
-                            }
-                            for (const event of this.#events[body.t] || []) {
-                                event(body.d);
-                            }
-                        }
-                        catch (e) {
-                            this.#error(e);
-                        }
-                    });
-                    this.#ws.on('close', () => {
-                        this.updateConnectionStatus({ state: 'offline' });
-                        console.log('ws closed');
-                        if (this.#count > 5) {
-                            return;
-                        }
-                        setTimeout(() => {
-                            reConnect();
-                        }, 1300);
-                    });
-                    this.#ws.on('error', e => {
-                        this.#error(e);
-                    });
-                };
-                reConnect();
-            }
-        }
-        catch (e) {
-            this.#error(e);
-        }
-    }
-    #error(error) {
-        if (this.#events['ERROR']) {
-            for (const event of this.#events['ERROR'] || []) {
-                event(error);
-            }
-        }
-    }
-}
 
-export { QQBotClient };
+//#endregion
+export { QQBotClient };

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

@@ -1,10 +1,32 @@
-import { QQBotAPI } from './api.js';
-import { QQBotEventMap } from './message.js';
-import { Options } from './typing.js';
-export declare class QQBotClients extends QQBotAPI {
-    #private;
-    constructor(option: Options);
-    disconnect(): void;
-    on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this;
-    connect(gatewayURL?: string): Promise<void>;
+import { Options } from "./typing.js";
+import { QQBotAPI } from "./api.js";
+import { QQBotEventMap } from "./message.js";
+//#region src/sdk/client.websoket.d.ts
+/**
+ * QQ 机器人网关连接。
+ *
+ * 网关会主动发送 op=7 要求客户端重新连接，也可能因网络或重复连接被关闭。
+ * 因此重连必须由客户端统一调度，避免旧 socket 的 close 事件重复创建连接。
+ */
+declare class QQBotClients extends QQBotAPI {
+  #private;
+  /**
+   * 设置配置
+   * @param option
+   */
+  constructor(option: Options);
+  /** Stops reconnecting and releases the active gateway socket. */
+  disconnect(): void;
+  /**
+   * 注册事件处理程序
+   * @param key 事件名称
+   * @param val 事件处理函数
+   */
+  on<T extends keyof QQBotEventMap>(key: T, val: (event: QQBotEventMap[T]) => any): this;
+  /**
+   * 建立或恢复网关连接。
+   */
+  connect(gatewayURL?: string): Promise<void>;
 }
+//#endregion
+export { QQBotClients };