llonebot-dist 7.12.10 → 7.12.11

package/llbot.js

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import * as path$4 from "node:path";
 import path, { dirname, join } from "node:path";
-import fsp, { access, copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
+import fsPromise, { access, copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
 import fs, { existsSync } from "fs";
 import * as fs$5 from "node:fs";
 import fs$1, { appendFile, appendFileSync, createReadStream, existsSync as existsSync$1, mkdirSync, promises, stat as stat$1, statSync, watch } from "node:fs";
@@ -21,7 +21,7 @@ import http, { STATUS_CODES, createServer, request } from "node:http";
 import { Http2ServerRequest, constants as constants$1 } from "node:http2";
 import { Readable, Transform } from "node:stream";
 import { deflateSync, gunzipSync, gzipSync, inflateSync } from "node:zlib";
-import fsPromise, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
+import fsPromise$1, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
 import { inspect, isDeepStrictEqual } from "node:util";
 import net, { connect } from "node:net";
 import https from "node:https";
@@ -11240,8 +11240,12 @@ var OB11Entities;
 			let operatorUin;
 			if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) operatorUin = msg.senderUin;
 			else operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid);
-			if (msg.senderUin === "0" || !msg.senderUin) ctx.logger.warn(`发生异常 senderUin: ${msg.senderUin}`);
-			return new OB11GroupRecallNoticeEvent(Number(msg.peerUid), Number(msg.senderUin), Number(operatorUin), shortId);
+			let senderUin = msg.senderUin;
+			if (msg.senderUin === "0") {
+				senderUin = await ctx.ntUserApi.getUinByUid(revokeElement.origMsgSenderUid);
+				if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) operatorUin = senderUin;
+			}
+			return new OB11GroupRecallNoticeEvent(Number(msg.peerUid), Number(senderUin), Number(operatorUin), shortId);
 		} else return new OB11FriendRecallNoticeEvent(+msg.senderUin, shortId);
 	}
 	_OB11Entities.recallEvent = recallEvent;
@@ -11385,7 +11389,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.10";
+var version$2 = "7.12.11";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -17148,12 +17152,12 @@ async function uri2local(ctx, uri, needExt) {
 		const res = await fetchFile(uri);
 		let fileName = randomUUID();
 		let filePath = path.join(TEMP_DIR, fileName);
-		await fsp.writeFile(filePath, res.data);
+		await fsPromise.writeFile(filePath, res.data);
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			fileName += `.${ext}`;
 			const newPath = `${filePath}.${ext}`;
-			await fsp.rename(filePath, newPath);
+			await fsPromise.rename(filePath, newPath);
 			filePath = newPath;
 		}
 		return {
@@ -17176,11 +17180,11 @@ async function uri2local(ctx, uri, needExt) {
 		let filename = randomUUID();
 		let filePath = path.join(TEMP_DIR, filename);
 		const base64 = uri.replace(/^base64:\/\//, "");
-		await fsp.writeFile(filePath, base64, "base64");
+		await fsPromise.writeFile(filePath, base64, "base64");
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			filename += `.${ext}`;
-			await fsp.rename(filePath, `${filePath}.${ext}`);
+			await fsPromise.rename(filePath, `${filePath}.${ext}`);
 			filePath = `${filePath}.${ext}`;
 		}
 		return {
@@ -17197,11 +17201,11 @@ async function uri2local(ctx, uri, needExt) {
 			let filename = randomUUID();
 			const [, _type, base64] = capture;
 			let filePath = path.join(TEMP_DIR, filename);
-			await fsp.writeFile(filePath, base64, "base64");
+			await fsPromise.writeFile(filePath, base64, "base64");
 			if (needExt) {
 				const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 				filename += `.${ext}`;
-				await fsp.rename(filePath, `${filePath}.${ext}`);
+				await fsPromise.rename(filePath, `${filePath}.${ext}`);
 				filePath = `${filePath}.${ext}`;
 			}
 			return {
@@ -17547,7 +17551,7 @@ async function calculateSha1StreamBytes(filePath) {
 }
 async function readAndHash10M(filePath) {
 	const maxSize = 10002432;
-	const fd = await fsp.open(filePath, "r");
+	const fd = await fsPromise.open(filePath, "r");
 	const buffer = Buffer.allocUnsafe(maxSize);
 	const { bytesRead } = await fd.read(buffer, 0, maxSize, 0);
 	await fd.close();
@@ -17672,7 +17676,7 @@ function convert(ctx, input, options, outputPath) {
 	});
 }
 async function encodeSilk(ctx, filePath) {
-	const file = await fsp.readFile(filePath);
+	const file = await fsPromise.readFile(filePath);
 	if (!isSilk(file)) {
 		ctx.logger.info(`语音文件${filePath}需要转换成silk`);
 		let result;
@@ -17691,7 +17695,7 @@ async function encodeSilk(ctx, filePath) {
 			"-f s16le"
 		] }), 24e3);
 		const pttPath = path.join(TEMP_DIR, randomUUID());
-		await fsp.writeFile(pttPath, result.data);
+		await fsPromise.writeFile(pttPath, result.data);
 		ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration);
 		return {
 			converted: true,
@@ -17714,11 +17718,11 @@ async function encodeSilk(ctx, filePath) {
 	}
 }
 async function decodeSilk(ctx, inputFilePath, outFormat) {
-	const { data } = await decode(await fsp.readFile(inputFilePath), 24e3);
+	const { data } = await decode(await fsPromise.readFile(inputFilePath), 24e3);
 	const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath));
 	const outFilePath = tmpPath + `.${outFormat}`;
 	const pcmFilePath = tmpPath + ".pcm";
-	await fsp.writeFile(pcmFilePath, data);
+	await fsPromise.writeFile(pcmFilePath, data);
 	return convert(ctx, pcmFilePath, { input: [
 		"-f s16le",
 		"-ar 24000",
@@ -24905,17 +24909,17 @@ var DownloadFile = class extends BaseAction {
 		const isRandomName = !payload.name;
 		const name = payload.name ? path.basename(payload.name) : randomUUID();
 		const filePath = path.join(TEMP_DIR, name);
-		if (payload.base64) await fsPromise.writeFile(filePath, payload.base64, "base64");
+		if (payload.base64) await fsPromise$1.writeFile(filePath, payload.base64, "base64");
 		else if (payload.url) {
 			const headers = this.getHeaders(payload.headers);
 			const res = await fetchFile(payload.url, headers);
-			await fsPromise.writeFile(filePath, res.data);
+			await fsPromise$1.writeFile(filePath, res.data);
 		} else throw new Error("不存在任何文件, 无法下载");
 		if (fs.existsSync(filePath)) {
 			if (isRandomName) {
 				const md5 = await getMd5HexFromFile(filePath);
 				const newPath = path.join(TEMP_DIR, md5);
-				await fsPromise.rename(filePath, newPath);
+				await fsPromise$1.rename(filePath, newPath);
 				return { file: newPath };
 			}
 			return { file: filePath };
@@ -26415,8 +26419,15 @@ var SendGroupAiRecord = class extends BaseAction {
 		chat_type: lib_default$1.union([Number, String]).default(1)
 	});
 	async _handle(payload) {
-		await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type);
-		return { message_id: 0 };
+		const targetMsgRandom = (await this.ctx.pmhq.getGroupGenerateAiRecord(+payload.group_id, payload.character, payload.text, +payload.chat_type)).msgRandom.toString();
+		const { promise, resolve } = Promise.withResolvers();
+		const dispose = this.ctx.on("nt/message-created", (msg) => {
+			if (msg.msgRandom === targetMsgRandom) {
+				dispose();
+				resolve({ message_id: this.ctx.store.createMsgShortId(msg) });
+			}
+		});
+		return promise;
 	}
 };
 //#endregion
@@ -43459,7 +43470,7 @@ async function download(url, headers) {
 	return Buffer.from(bytes);
 }
 async function resolveMilkyUri(uri) {
-	if (uri.startsWith("file://")) return await fsp.readFile(fileURLToPath(uri));
+	if (uri.startsWith("file://")) return await fsPromise.readFile(fileURLToPath(uri));
 	if (uri.startsWith("http://") || uri.startsWith("https://")) return await download(uri);
 	if (uri.startsWith("base64://")) return Buffer.from(uri.slice(9), "base64");
 	throw new Error(`Unsupported URI scheme: ${uri}`);
@@ -54326,7 +54337,7 @@ var NTQQWebApi = class extends Service {
 		const iBatchID = Math.floor(Date.now() / 1e3);
 		for (let i = 0; i < filePathList.length; i++) {
 			const filePath = filePathList[i];
-			const fileBuffer = await fsp.readFile(filePath);
+			const fileBuffer = await fsPromise.readFile(filePath);
 			const fileSize = fileBuffer.length;
 			const fileType = await fileTypeFromBuffer(fileBuffer);
 			const timestamp = Math.floor(Date.now() / 1e3);
@@ -54511,7 +54522,7 @@ var NTQQWebApi = class extends Service {
 			}
 			if (sVid) {
 				const filePath = await createThumb(this.ctx, filePathList[i]);
-				const fileBuffer = await fsp.readFile(filePath);
+				const fileBuffer = await fsPromise.readFile(filePath);
 				const fileSize = fileBuffer.length;
 				const timestamp = Math.floor(Date.now() / 1e3);
 				const checksum = getMd5HexFromBuffer(fileBuffer);
@@ -70339,12 +70350,13 @@ function MessageMixin(Base) {
 			return Oidb.FetchAiCharacterListResp.decode(oidbRespBody);
 		}
 		async getGroupGenerateAiRecord(groupId, character, text, chatType) {
+			const msgRandom = randomBytes(4).readUInt32BE(0);
 			const body = Oidb.GetGroupGenerateAiRecordReq.encode({
 				groupId,
 				voiceId: character,
 				text,
 				chatType,
-				clientMsgInfo: { msgRandom: randomBytes(4).readUInt32BE(0) }
+				clientMsgInfo: { msgRandom }
 			});
 			const data = Oidb.Base.encode({
 				command: 37531,
@@ -70352,6 +70364,7 @@ function MessageMixin(Base) {
 				body
 			});
 			await this.httpSendPB("OidbSvcTrpcTcp.0x929b_0", data);
+			return { msgRandom };
 		}
 	};
 }