llonebot-dist 7.12.9 → 7.12.10

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 fsPromise, { access, copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
+import fsp, { 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$1, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
+import fsPromise, { 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";
@@ -11385,7 +11385,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.9";
+var version$2 = "7.12.10";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -17148,12 +17148,12 @@ async function uri2local(ctx, uri, needExt) {
 		const res = await fetchFile(uri);
 		let fileName = randomUUID();
 		let filePath = path.join(TEMP_DIR, fileName);
-		await fsPromise.writeFile(filePath, res.data);
+		await fsp.writeFile(filePath, res.data);
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			fileName += `.${ext}`;
 			const newPath = `${filePath}.${ext}`;
-			await fsPromise.rename(filePath, newPath);
+			await fsp.rename(filePath, newPath);
 			filePath = newPath;
 		}
 		return {
@@ -17176,11 +17176,11 @@ async function uri2local(ctx, uri, needExt) {
 		let filename = randomUUID();
 		let filePath = path.join(TEMP_DIR, filename);
 		const base64 = uri.replace(/^base64:\/\//, "");
-		await fsPromise.writeFile(filePath, base64, "base64");
+		await fsp.writeFile(filePath, base64, "base64");
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			filename += `.${ext}`;
-			await fsPromise.rename(filePath, `${filePath}.${ext}`);
+			await fsp.rename(filePath, `${filePath}.${ext}`);
 			filePath = `${filePath}.${ext}`;
 		}
 		return {
@@ -17197,11 +17197,11 @@ async function uri2local(ctx, uri, needExt) {
 			let filename = randomUUID();
 			const [, _type, base64] = capture;
 			let filePath = path.join(TEMP_DIR, filename);
-			await fsPromise.writeFile(filePath, base64, "base64");
+			await fsp.writeFile(filePath, base64, "base64");
 			if (needExt) {
 				const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 				filename += `.${ext}`;
-				await fsPromise.rename(filePath, `${filePath}.${ext}`);
+				await fsp.rename(filePath, `${filePath}.${ext}`);
 				filePath = `${filePath}.${ext}`;
 			}
 			return {
@@ -17547,7 +17547,7 @@ async function calculateSha1StreamBytes(filePath) {
 }
 async function readAndHash10M(filePath) {
 	const maxSize = 10002432;
-	const fd = await fsPromise.open(filePath, "r");
+	const fd = await fsp.open(filePath, "r");
 	const buffer = Buffer.allocUnsafe(maxSize);
 	const { bytesRead } = await fd.read(buffer, 0, maxSize, 0);
 	await fd.close();
@@ -17672,7 +17672,7 @@ function convert(ctx, input, options, outputPath) {
 	});
 }
 async function encodeSilk(ctx, filePath) {
-	const file = await fsPromise.readFile(filePath);
+	const file = await fsp.readFile(filePath);
 	if (!isSilk(file)) {
 		ctx.logger.info(`语音文件${filePath}需要转换成silk`);
 		let result;
@@ -17691,7 +17691,7 @@ async function encodeSilk(ctx, filePath) {
 			"-f s16le"
 		] }), 24e3);
 		const pttPath = path.join(TEMP_DIR, randomUUID());
-		await fsPromise.writeFile(pttPath, result.data);
+		await fsp.writeFile(pttPath, result.data);
 		ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration);
 		return {
 			converted: true,
@@ -17714,11 +17714,11 @@ async function encodeSilk(ctx, filePath) {
 	}
 }
 async function decodeSilk(ctx, inputFilePath, outFormat) {
-	const { data } = await decode(await fsPromise.readFile(inputFilePath), 24e3);
+	const { data } = await decode(await fsp.readFile(inputFilePath), 24e3);
 	const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath));
 	const outFilePath = tmpPath + `.${outFormat}`;
 	const pcmFilePath = tmpPath + ".pcm";
-	await fsPromise.writeFile(pcmFilePath, data);
+	await fsp.writeFile(pcmFilePath, data);
 	return convert(ctx, pcmFilePath, { input: [
 		"-f s16le",
 		"-ar 24000",
@@ -18112,8 +18112,12 @@ async function createSendElements(ctx, messageData, peer, ignoreTypes = []) {
 						if (isAdmin && remainAtAllCount > 0) sendElements.push(SendElement.at(atQQ, atQQ, AtType.All, "@全体成员"));
 					} else if (peer.chatType === ChatType.Group) {
 						const uid = await ctx.ntUserApi.getUidByUin(atQQ, peer.peerUid);
-						let display = "";
+						let display;
 						if (segment.data.name) display = `@${segment.data.name}`;
+						else {
+							const info = await ctx.ntGroupApi.getGroupMember(peer.peerUid, uid);
+							display = `@${info.cardName || info.nick}`;
+						}
 						sendElements.push(SendElement.at(atQQ, uid, AtType.One, display));
 					}
 				}
@@ -24901,17 +24905,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$1.writeFile(filePath, payload.base64, "base64");
+		if (payload.base64) await fsPromise.writeFile(filePath, payload.base64, "base64");
 		else if (payload.url) {
 			const headers = this.getHeaders(payload.headers);
 			const res = await fetchFile(payload.url, headers);
-			await fsPromise$1.writeFile(filePath, res.data);
+			await fsPromise.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$1.rename(filePath, newPath);
+				await fsPromise.rename(filePath, newPath);
 				return { file: newPath };
 			}
 			return { file: filePath };
@@ -28540,7 +28544,12 @@ var MessageEncoder = class {
 			if (attrs.type === "all") this.elements.push(SendElement.at("", "", AtType.All, "@全体成员"));
 			else {
 				const uid = await this.ctx.ntUserApi.getUidByUin(attrs.id, this.peer.peerUid);
-				const display = attrs.name ? "@" + attrs.name : "";
+				let display;
+				if (attrs.name) display = `@${attrs.name}`;
+				else {
+					const info = await this.ctx.ntGroupApi.getGroupMember(this.peer.peerUid, uid);
+					display = `@${info.cardName || info.nick}`;
+				}
 				this.elements.push(SendElement.at(attrs.id, uid, AtType.One, display));
 			}
 		} else if (type === "a") {
@@ -43450,7 +43459,7 @@ async function download(url, headers) {
 	return Buffer.from(bytes);
 }
 async function resolveMilkyUri(uri) {
-	if (uri.startsWith("file://")) return await fsPromise.readFile(fileURLToPath(uri));
+	if (uri.startsWith("file://")) return await fsp.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}`);
@@ -43687,7 +43696,8 @@ async function transformOutgoingMessage(ctx, segments, peerUid, isGroup = false)
 		else if (segment.type === "mention" && isGroup) {
 			const memberUin = segment.data.user_id.toString();
 			const memberUid = await ctx.ntUserApi.getUidByUin(memberUin, peerUid);
-			elements.push(SendElement.at(memberUin, memberUid, AtType.One, ""));
+			const info = await ctx.ntGroupApi.getGroupMember(peerUid, memberUid);
+			elements.push(SendElement.at(memberUin, memberUid, AtType.One, `@${info.cardName || info.nick}`));
 		} else if (segment.type === "mention_all" && isGroup) elements.push(SendElement.at("", "", AtType.All, "@全体成员"));
 		else if (segment.type === "face") elements.push(SendElement.face(+segment.data.face_id, segment.data.is_large ? 3 : void 0));
 		else if (segment.type === "reply") {
@@ -53760,7 +53770,7 @@ var NTQQMsgApi = class extends Service {
 				chatInfo: peer,
 				filterMsgType: [],
 				filterSendersUid,
-				filterMsgToTime: filterMsgTime,
+				filterMsgToTime: String(filterMsgTime + 1),
 				filterMsgFromTime: filterMsgTime,
 				isReverseOrder: true,
 				isIncludeCurrent: true,
@@ -54040,7 +54050,7 @@ var NTQQUserApi = class extends Service {
 		const funcs = [async () => {
 			return (await this.ctx.pmhq.invoke("nodeIKernelUixConvertService/getUin", [[uid]])).uinInfo.get(uid);
 		}, async () => {
-			return (await this.fetchUserDetailInfo(uid)).detail.get(uid)?.uin;
+			return (await this.getUserSimpleInfo(uid)).uin;
 		}];
 		for (const f of funcs) try {
 			const result = await f();
@@ -54050,6 +54060,7 @@ var NTQQUserApi = class extends Service {
 		}
 		return "";
 	}
+	/** 始终会从服务器拉取 */
 	async fetchUserDetailInfo(uid) {
 		return await this.ctx.pmhq.invoke("nodeIKernelProfileService/fetchUserDetailInfo", [
 			"BuddyProfileStore",
@@ -54064,12 +54075,14 @@ var NTQQUserApi = class extends Service {
 			resultCb: (payload) => payload.simpleInfo.uid === uid
 		});
 	}
+	/** 无缓存时会从服务器拉取 */
 	async getUserSimpleInfo(uid, force = true) {
 		return (await this.ctx.pmhq.invoke("nodeIKernelProfileService/getUserSimpleInfo", [force, [uid]], {
 			resultCmd: ReceiveCmdS.USER_INFO,
 			resultCb: (payload) => payload.has(uid)
 		})).get(uid);
 	}
+	/** 无缓存时会获取不到用户信息 */
 	async getCoreAndBaseInfo(uids) {
 		return await this.ctx.pmhq.invoke("nodeIKernelProfileService/getCoreAndBaseInfo", ["nodeStore", uids]);
 	}
@@ -54313,7 +54326,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 fsPromise.readFile(filePath);
+			const fileBuffer = await fsp.readFile(filePath);
 			const fileSize = fileBuffer.length;
 			const fileType = await fileTypeFromBuffer(fileBuffer);
 			const timestamp = Math.floor(Date.now() / 1e3);
@@ -54498,7 +54511,7 @@ var NTQQWebApi = class extends Service {
 			}
 			if (sVid) {
 				const filePath = await createThumb(this.ctx, filePathList[i]);
-				const fileBuffer = await fsPromise.readFile(filePath);
+				const fileBuffer = await fsp.readFile(filePath);
 				const fileSize = fileBuffer.length;
 				const timestamp = Math.floor(Date.now() / 1e3);
 				const checksum = getMd5HexFromBuffer(fileBuffer);
@@ -70377,7 +70390,7 @@ function UserMixin(Base) {
 			const info = Oidb.FetchUserInfoResp.decode(oidbRespBody);
 			const numbers = Object.fromEntries(info.body.properties.numberProperties.map((p) => [p.key, p.value]));
 			const bytes = Object.fromEntries(info.body.properties.bytesProperties.map((p) => [p.key, p.value]));
-			const business = bytes[107] ? Misc.UserInfoBusiness.decode(bytes[107]) : void 0;
+			const vipInfo = (bytes[107] ? Misc.UserInfoBusiness.decode(bytes[107]) : void 0)?.body.lists.find((e) => e.type === 1);
 			return {
 				uin: info.body.uin,
 				nick: bytes[20002]?.toString() ?? "",
@@ -70395,9 +70408,9 @@ function UserMixin(Base) {
 				labels: bytes[104] ? Misc.UserInfoLabel.decode(bytes[104]).labels.map((e) => e.content) : [],
 				school: bytes[20021]?.toString() ?? "",
 				remark: bytes[103]?.toString() ?? "",
-				isVip: !!business?.body.lists[0],
-				isYearsVip: !!business?.body.lists[0]?.isYear,
-				vipLevel: business?.body.lists[0]?.level ?? 0
+				isVip: !!vipInfo,
+				isYearsVip: !!vipInfo?.isYear,
+				vipLevel: vipInfo?.level ?? 0
 			};
 		}
 		async fetchUserLoginDays(uin) {