llonebot-dist 7.12.0 → 7.12.2

package/default_config.json

@@ -0,0 +1,85 @@
+{
+  "webui": {
+    "enable": true,
+    "host": "127.0.0.1",
+    "port": 3080
+  },
+  "milky": {
+    "enable": false,
+    "reportSelfMessage": false,
+    "http": {
+      "host": "127.0.0.1",
+      "port": 3010,
+      "prefix": "",
+      "accessToken": ""
+    },
+    "webhook": {
+      "urls": [],
+      "accessToken": ""
+    }
+  },
+  "satori": {
+    "enable": false,
+    "host": "127.0.0.1",
+    "port": 5600,
+    "token": ""
+  },
+  "ob11": {
+    "enable": true,
+    "connect": [
+      {
+        "type": "ws",
+        "enable": false,
+        "host": "127.0.0.1",
+        "port": 3001,
+        "heartInterval": 60000,
+        "token": "",
+        "reportSelfMessage": false,
+        "reportOfflineMessage": false,
+        "messageFormat": "array",
+        "debug": false
+      },
+      {
+        "type": "ws-reverse",
+        "enable": false,
+        "url": "",
+        "heartInterval": 60000,
+        "token": "",
+        "reportSelfMessage": false,
+        "reportOfflineMessage": false,
+        "messageFormat": "array",
+        "debug": false
+      },
+      {
+        "type": "http",
+        "enable": false,
+        "host": "127.0.0.1",
+        "port": 3000,
+        "token": "",
+        "reportSelfMessage": false,
+        "reportOfflineMessage": false,
+        "messageFormat": "array",
+        "debug": false
+      },
+      {
+        "type": "http-post",
+        "enable": false,
+        "url": "",
+        "enableHeart": false,
+        "heartInterval": 60000,
+        "token": "",
+        "reportSelfMessage": false,
+        "reportOfflineMessage": false,
+        "messageFormat": "array",
+        "debug": false
+      }
+    ]
+  },
+  "enableLocalFile2Url": false,
+  "log": true,
+  "autoDeleteFile": false,
+  "autoDeleteFileSecond": 60,
+  "musicSignUrl": "https://llob.linyuchen.net/sign/music",
+  "msgCacheExpire": 120,
+  "ffmpeg": ""
+}

package/llbot.js

@@ -11292,7 +11292,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.0";
+var version$2 = "7.12.2";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -12123,7 +12123,7 @@ var OB11WebSocket = class {
 			} catch (e) {
 				this.ctx.logger.error("发送生命周期失败", e);
 			}
-			const disposeHeartBeat = this.ctx.setInterval(() => {
+			const disposeHeartBeat = this.ctx.interval(() => {
 				const event = new OB11HeartbeatEvent(selfInfo.online, true, this.config.heartInterval);
 				if (!matchEventFilter(this.config.filter, event)) return;
 				this.reply(socket, event);
@@ -12245,7 +12245,7 @@ var OB11WebSocketReverse = class {
 		this.wsClient.on("ping", () => {
 			this.wsClient?.pong();
 		});
-		const disposeHeartBeat = this.ctx.setInterval(() => {
+		const disposeHeartBeat = this.ctx.interval(() => {
 			if (this.wsClient) {
 				const event = new OB11HeartbeatEvent(selfInfo.online, true, this.config.heartInterval);
 				if (!matchEventFilter(this.config.filter, event)) return;
@@ -12255,7 +12255,7 @@ var OB11WebSocketReverse = class {
 		this.wsClient.on("close", (code) => {
 			disposeHeartBeat();
 			this.ctx.logger.info(`The websocket connection: ${this.config.url} closed, code ${code}${this.activated ? ", trying reconnecting..." : ""}`);
-			if (this.activated) this.ctx.setTimeout(() => this.tryConnect(), 3e3);
+			if (this.activated) this.ctx.timeout(() => this.tryConnect(), 3e3);
 		});
 	}
 };
@@ -20839,8 +20839,9 @@ var OB11Http = class {
 		return new Promise((resolve) => {
 			if (this.server) {
 				this.ctx.logger.info("OneBot V11 HTTP Server closing...");
-				this.server.closeAllConnections();
-				this.server.close((err) => {
+				const server = this.server;
+				server.closeAllConnections();
+				server.close((err) => {
 					if (err) this.ctx.logger.error(`OneBot V11 HTTP Server closing ${err}`);
 					else this.ctx.logger.info("OneBot V11 HTTP Server closed");
 					this.server = void 0;
@@ -20925,7 +20926,7 @@ var OB11HttpPost = class {
 	}
 	start() {
 		this.activated = this.config.enable;
-		if (this.config.enableHeart && !this.disposeInterval) this.disposeInterval = this.ctx.setInterval(() => {
+		if (this.config.enableHeart && !this.disposeInterval) this.disposeInterval = this.ctx.interval(() => {
 			this.emitEvent(new OB11HeartbeatEvent(selfInfo.online, true, this.config.heartInterval));
 		}, this.config.heartInterval);
 	}
@@ -51829,6 +51830,7 @@ var RkeyManager = class {
 		private_rkey: "",
 		expired_time: 0
 	};
+	pull;
 	constructor(ctx, serverUrl) {
 		this.ctx = ctx;
 		this.serverUrl = serverUrl;
@@ -51845,6 +51847,9 @@ var RkeyManager = class {
 		return (/* @__PURE__ */ new Date()).getTime() / 1e3 > this.rkeyData.expired_time;
 	}
 	async refreshRkey() {
+		if (this.pull) return this.pull;
+		const { promise, resolve } = Promise.withResolvers();
+		this.pull = promise;
 		try {
 			const { privateRKey, groupRKey, expiredTime } = await this.ctx.pmhq.getRKey();
 			this.rkeyData = {
@@ -51852,14 +51857,14 @@ var RkeyManager = class {
 				group_rkey: groupRKey,
 				expired_time: expiredTime
 			};
+			resolve();
+			this.pull = void 0;
 			this.ctx.logger.info(`发包获取rkey成功, private:${privateRKey}, group:${groupRKey}`);
 		} catch (e) {
 			this.ctx.logger.warn(`发包获取rkey失败 ${e}，开始获取远程rkey`);
-			try {
-				this.rkeyData = await this.fetchServerRkey();
-			} catch (e) {
-				this.ctx.logger.error("获取远程rkey失败", e);
-			}
+			this.rkeyData = await this.fetchServerRkey();
+			resolve();
+			this.pull = void 0;
 		}
 	}
 	async fetchServerRkey() {
@@ -69632,7 +69637,7 @@ async function onLoad() {
 	if (!existsSync$1(LOG_DIR)) mkdirSync(LOG_DIR);
 	if (!existsSync$1(TEMP_DIR)) mkdirSync(TEMP_DIR);
 	const ctx = new Context$1();
-	ctx.plugin(index_default$3);
+	ctx.plugin(index_default$3, { bufferSize: 0 });
 	ctx.plugin(index_default);
 	ctx.plugin(Config);
 	ctx.plugin(PMHQ);