llonebot-dist 7.12.11 → 7.12.14

package/llbot.js

@@ -1,10 +1,10 @@
 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 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";
+import fs, { copyFile, mkdir, readFile, stat, unlink, writeFile } from "node:fs/promises";
+import fs$1, { existsSync } from "fs";
+import * as fs$6 from "node:fs";
+import fs$2, { appendFile, appendFileSync, createReadStream, existsSync as existsSync$1, mkdirSync, promises, stat as stat$1, statSync, watch } from "node:fs";
 import os from "node:os";
 import { Binary, Time, camelize, clone, deduplicate, deepEqual, defineProperty, difference, filterKeys, hyphenate, is, isNonNullable, isNullable, isPlainObject, makeArray, mapValues, noop, omit, pick, remove, valueMap } from "cosmokit";
 import { Exporter, Factory } from "reggol";
@@ -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";
@@ -3973,7 +3973,7 @@ var require_utils$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#endregion
 //#region node_modules/qrcode/lib/renderer/png.js
 var require_png = /* @__PURE__ */ __commonJSMin(((exports) => {
-	var fs$10 = __require("fs");
+	var fs$11 = __require("fs");
 	var PNG = require_png$1().PNG;
 	var Utils = require_utils$1();
 	exports.render = function render(qrData, options) {
@@ -4025,7 +4025,7 @@ var require_png = /* @__PURE__ */ __commonJSMin(((exports) => {
 			called = true;
 			cb.apply(null, args);
 		};
-		const stream = fs$10.createWriteStream(path);
+		const stream = fs$11.createWriteStream(path);
 		stream.on("error", done);
 		stream.on("close", done);
 		exports.renderToFileStream(stream, qrData, options);
@@ -6475,19 +6475,6 @@ var ChatType = /* @__PURE__ */ function(ChatType) {
 	ChatType[ChatType["TempC2CFromGroup"] = 100] = "TempC2CFromGroup";
 	return ChatType;
 }({});
-var RMBizType = /* @__PURE__ */ function(RMBizType) {
-	RMBizType[RMBizType["Unknown"] = 0] = "Unknown";
-	RMBizType[RMBizType["C2CFile"] = 1] = "C2CFile";
-	RMBizType[RMBizType["GroupFile"] = 2] = "GroupFile";
-	RMBizType[RMBizType["C2CPic"] = 3] = "C2CPic";
-	RMBizType[RMBizType["GroupPic"] = 4] = "GroupPic";
-	RMBizType[RMBizType["DiscPic"] = 5] = "DiscPic";
-	RMBizType[RMBizType["C2CVideo"] = 6] = "C2CVideo";
-	RMBizType[RMBizType["GroupVideo"] = 7] = "GroupVideo";
-	RMBizType[RMBizType["C2CPtt"] = 8] = "C2CPtt";
-	RMBizType[RMBizType["GroupPtt"] = 9] = "GroupPtt";
-	return RMBizType;
-}({});
 var MsgType = /* @__PURE__ */ function(MsgType) {
 	MsgType[MsgType["ArkStruct"] = 11] = "ArkStruct";
 	MsgType[MsgType["FaceBubble"] = 24] = "FaceBubble";
@@ -6624,7 +6611,7 @@ async function logSummaryMessage(ctx, message) {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$9 = __require("fs");
+	var fs$10 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -6641,12 +6628,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$9.stat(path, function(er, stat) {
+		fs$10.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$9.statSync(path), path, options);
+		return checkStat(fs$10.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -6654,14 +6641,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$8 = __require("fs");
+	var fs$9 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$8.stat(path, function(er, stat) {
+		fs$9.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$8.statSync(path), options);
+		return checkStat(fs$9.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -9153,7 +9140,7 @@ var require_processor = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/fluent-ffmpeg/lib/capabilities.js
 var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$7 = __require("fs");
+	var fs$8 = __require("fs");
 	var path$7 = __require("path");
 	var async = require_async();
 	var utils = require_utils();
@@ -9229,7 +9216,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		proto._getFfmpegPath = function(callback) {
 			if ("ffmpegPath" in cache) return callback(null, cache.ffmpegPath);
 			async.waterfall([function(cb) {
-				if (process.env.FFMPEG_PATH) fs$7.exists(process.env.FFMPEG_PATH, function(exists) {
+				if (process.env.FFMPEG_PATH) fs$8.exists(process.env.FFMPEG_PATH, function(exists) {
 					if (exists) cb(null, process.env.FFMPEG_PATH);
 					else cb(null, "");
 				});
@@ -9260,7 +9247,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if ("ffprobePath" in cache) return callback(null, cache.ffprobePath);
 			async.waterfall([
 				function(cb) {
-					if (process.env.FFPROBE_PATH) fs$7.exists(process.env.FFPROBE_PATH, function(exists) {
+					if (process.env.FFPROBE_PATH) fs$8.exists(process.env.FFPROBE_PATH, function(exists) {
 						cb(null, exists ? process.env.FFPROBE_PATH : "");
 					});
 					else cb(null, "");
@@ -9278,7 +9265,7 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						else if (ffmpeg.length) {
 							var name = utils.isWindows ? "ffprobe.exe" : "ffprobe";
 							var ffprobe = path$7.join(path$7.dirname(ffmpeg), name);
-							fs$7.exists(ffprobe, function(exists) {
+							fs$8.exists(ffprobe, function(exists) {
 								cb(null, exists ? ffprobe : "");
 							});
 						} else cb(null, "");
@@ -9303,14 +9290,14 @@ var require_capabilities = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if ("flvtoolPath" in cache) return callback(null, cache.flvtoolPath);
 			async.waterfall([
 				function(cb) {
-					if (process.env.FLVMETA_PATH) fs$7.exists(process.env.FLVMETA_PATH, function(exists) {
+					if (process.env.FLVMETA_PATH) fs$8.exists(process.env.FLVMETA_PATH, function(exists) {
 						cb(null, exists ? process.env.FLVMETA_PATH : "");
 					});
 					else cb(null, "");
 				},
 				function(flvtool, cb) {
 					if (flvtool.length) return cb(null, flvtool);
-					if (process.env.FLVTOOL2_PATH) fs$7.exists(process.env.FLVTOOL2_PATH, function(exists) {
+					if (process.env.FLVTOOL2_PATH) fs$8.exists(process.env.FLVTOOL2_PATH, function(exists) {
 						cb(null, exists ? process.env.FLVTOOL2_PATH : "");
 					});
 					else cb(null, "");
@@ -9815,7 +9802,7 @@ var require_ffprobe = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#endregion
 //#region node_modules/fluent-ffmpeg/lib/recipes.js
 var require_recipes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	var fs$6 = __require("fs");
+	var fs$7 = __require("fs");
 	var path$6 = __require("path");
 	var PassThrough$4 = __require("stream").PassThrough;
 	var async = require_async();
@@ -10021,8 +10008,8 @@ var require_recipes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					next(null, filenames);
 				},
 				function createDirectory(filenames, next) {
-					fs$6.exists(config.folder, function(exists) {
-						if (!exists) fs$6.mkdir(config.folder, function(err) {
+					fs$7.exists(config.folder, function(exists) {
+						if (!exists) fs$7.mkdir(config.folder, function(err) {
 							if (err) next(err);
 							else next(null, filenames);
 						});
@@ -10270,7 +10257,7 @@ function setFFMpegPath(ffmpegPath) {
 		path.join(import.meta.dirname, "ffmpeg.exe"),
 		process.env["FFMPEG_PATH"] || ""
 	];
-	for (const p of paths) if (fs$1.existsSync(p)) {
+	for (const p of paths) if (fs$2.existsSync(p)) {
 		import_fluent_ffmpeg.default.setFfmpegPath(p);
 		console.log("set ffmpeg successfully", p);
 		break;
@@ -10801,7 +10788,7 @@ function encodeCQCode(input) {
 }
 //#endregion
 //#region src/onebot11/transform/message/incoming.ts
-async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
+async function transformIncomingSegments$1(ctx, message) {
 	const segments = [];
 	let cqCode = "";
 	for (const element of message.elements) {
@@ -10873,28 +10860,22 @@ async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
 				data: {
 					file: picElement.fileName,
 					subType: picElement.picSubType,
-					url: await ctx.ntFileApi.getImageUrl(picElement),
+					url: await ctx.ntFileApi.getImageUrl(picElement.originImageUrl, picElement.md5HexStr),
 					file_size: fileSize
 				}
 			};
 			ctx.store.addFileCache({
-				peerUid: message.peerUid,
-				msgId: message.msgId,
 				msgTime: +message.msgTime,
 				chatType: message.chatType,
-				elementId: element.elementId,
 				elementType: element.elementType,
 				fileName: picElement.fileName,
 				fileUuid: picElement.fileUuid,
-				fileSize
-			}).then();
+				fileSize,
+				md5HexStr: picElement.md5HexStr
+			});
 		} else if (element.videoElement) {
 			const { videoElement } = element;
-			const videoUrl = await ctx.ntFileApi.getVideoUrl(peer ?? {
-				chatType: message.chatType,
-				peerUid: message.peerUid,
-				guildId: ""
-			}, rootMsgID ?? message.msgId, element.elementId);
+			const videoUrl = await ctx.ntFileApi.getVideoUrl(videoElement.fileUuid, message.chatType === ChatType.Group);
 			const fileSize = videoElement.fileSize ?? "0";
 			messageSegment = {
 				type: OB11MessageDataType.Video,
@@ -10906,16 +10887,14 @@ async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
 				}
 			};
 			ctx.store.addFileCache({
-				peerUid: message.peerUid,
-				msgId: message.msgId,
 				msgTime: +message.msgTime,
 				chatType: message.chatType,
-				elementId: element.elementId,
 				elementType: element.elementType,
 				fileName: videoElement.fileName,
 				fileUuid: videoElement.fileUuid,
-				fileSize
-			}).then();
+				fileSize,
+				md5HexStr: videoElement.videoMd5
+			});
 		} else if (element.fileElement) {
 			const { fileElement } = element;
 			const fileSize = fileElement.fileSize ?? "0";
@@ -10930,16 +10909,14 @@ async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
 				}
 			};
 			ctx.store.addFileCache({
-				peerUid: message.peerUid,
-				msgId: message.msgId,
 				msgTime: +message.msgTime,
 				chatType: message.chatType,
-				elementId: element.elementId,
 				elementType: element.elementType,
 				fileName: fileElement.fileName,
 				fileUuid: fileElement.fileUuid,
-				fileSize
-			}).then();
+				fileSize,
+				md5HexStr: fileElement.fileMd5
+			});
 		} else if (element.pttElement) {
 			const { pttElement } = element;
 			const fileSize = pttElement.fileSize ?? "0";
@@ -10953,16 +10930,14 @@ async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
 				}
 			};
 			ctx.store.addFileCache({
-				peerUid: message.peerUid,
-				msgId: message.msgId,
 				msgTime: +message.msgTime,
 				chatType: message.chatType,
-				elementId: element.elementId,
 				elementType: element.elementType,
 				fileName: pttElement.fileName,
 				fileUuid: pttElement.fileUuid,
-				fileSize
-			}).then();
+				fileSize,
+				md5HexStr: pttElement.md5HexStr
+			});
 		} else if (element.arkElement) {
 			const { arkElement } = element;
 			try {
@@ -11081,11 +11056,11 @@ async function transformIncomingSegments$1(ctx, message, rootMsgID, peer) {
 //#region src/onebot11/entities.ts
 var OB11Entities;
 (function(_OB11Entities) {
-	async function message(ctx, msg, rootMsgID, peer, config) {
+	async function message(ctx, msg, config) {
 		if (!msg.senderUin || msg.senderUin === "0" || msg.msgType === 1) return;
 		const selfUin = selfInfo.uin;
 		const msgShortId = ctx.store.createMsgShortId(msg);
-		const { segments, cqCode } = await transformIncomingSegments$1(ctx, msg, rootMsgID, peer);
+		const { segments, cqCode } = await transformIncomingSegments$1(ctx, msg);
 		const resMsg = {
 			self_id: Number(selfUin),
 			user_id: Number(msg.senderUin),
@@ -11251,16 +11226,16 @@ var OB11Entities;
 	_OB11Entities.recallEvent = recallEvent;
 	function friend(raw) {
 		return {
-			user_id: +raw.coreInfo.uin,
-			nickname: raw.coreInfo.nick,
-			remark: raw.coreInfo.remark || raw.coreInfo.nick,
-			sex: sex(raw.baseInfo.sex),
-			birthday_year: raw.baseInfo.birthday_year,
-			birthday_month: raw.baseInfo.birthday_month,
-			birthday_day: raw.baseInfo.birthday_day,
-			age: raw.baseInfo.age,
-			qid: raw.baseInfo.qid,
-			long_nick: raw.baseInfo.longNick
+			user_id: raw.uin,
+			nickname: raw.nick,
+			remark: raw.remark,
+			sex: sex(raw.sex),
+			birthday_year: raw.birthdayYear,
+			birthday_month: raw.birthdayMonth,
+			birthday_day: raw.birthdayDay,
+			age: raw.age,
+			qid: raw.qid,
+			long_nick: raw.longNick
 		};
 	}
 	_OB11Entities.friend = friend;
@@ -11389,7 +11364,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.11";
+var version$2 = "7.12.14";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -12223,7 +12198,6 @@ var OB11WebSocket = class {
 			}
 			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);
 			}, this.config.heartInterval);
 			socket.on("close", () => {
@@ -12346,7 +12320,6 @@ var OB11WebSocketReverse = class {
 		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;
 				this.reply(this.wsClient, event);
 			}
 		}, this.config.heartInterval);
@@ -17049,7 +17022,7 @@ var processQueue = async () => {
 	const promises = queue.splice(0, concurrency).map(async ({ filePath, resolve, reject }) => {
 		let handle;
 		try {
-			handle = await fs$5.promises.open(path$4.resolve(filePath), "r");
+			handle = await fs$6.promises.open(path$4.resolve(filePath), "r");
 		} catch (err) {
 			return reject(err);
 		}
@@ -17096,7 +17069,7 @@ function checkUriType(uri) {
 	if (uri.startsWith("data:")) return { type: FileUriType.DataURL };
 	if (uri.startsWith("http://") || uri.startsWith("https://")) return { type: FileUriType.RemoteURL };
 	if (uri.startsWith("file://")) return { type: FileUriType.FileURL };
-	if (fs$1.existsSync(uri)) return { type: FileUriType.Path };
+	if (fs$2.existsSync(uri)) return { type: FileUriType.Path };
 	return { type: FileUriType.Unknown };
 }
 async function fetchFile(url, headersInit) {
@@ -17126,7 +17099,7 @@ async function uri2local(ctx, uri, needExt) {
 	const { type } = checkUriType(uri);
 	if (type === FileUriType.FileURL) {
 		const filePath = fileURLToPath(uri);
-		if (!fs$1.existsSync(filePath)) return {
+		if (!fs$2.existsSync(filePath)) return {
 			success: false,
 			errMsg: "路径不存在",
 			fileName: "",
@@ -17152,12 +17125,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 fs.writeFile(filePath, res.data);
 		if (needExt) {
-			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
+			const ext = (await getFileType(filePath)).ext;
 			fileName += `.${ext}`;
 			const newPath = `${filePath}.${ext}`;
-			await fsPromise.rename(filePath, newPath);
+			await fs.rename(filePath, newPath);
 			filePath = newPath;
 		}
 		return {
@@ -17180,11 +17153,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 fs.writeFile(filePath, base64, "base64");
 		if (needExt) {
-			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
+			const ext = (await getFileType(filePath)).ext;
 			filename += `.${ext}`;
-			await fsPromise.rename(filePath, `${filePath}.${ext}`);
+			await fs.rename(filePath, `${filePath}.${ext}`);
 			filePath = `${filePath}.${ext}`;
 		}
 		return {
@@ -17201,11 +17174,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 fs.writeFile(filePath, base64, "base64");
 			if (needExt) {
-				const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
+				const ext = (await getFileType(filePath)).ext;
 				filename += `.${ext}`;
-				await fsPromise.rename(filePath, `${filePath}.${ext}`);
+				await fs.rename(filePath, `${filePath}.${ext}`);
 				filePath = `${filePath}.${ext}`;
 			}
 			return {
@@ -17221,13 +17194,20 @@ async function uri2local(ctx, uri, needExt) {
 		let fileCache = await ctx.store.getFileCacheById(uri);
 		if (!fileCache?.length) fileCache = await ctx.store.getFileCacheByName(uri);
 		if (fileCache?.length) {
-			const downloadPath = await ctx.ntFileApi.downloadMedia(fileCache[0].msgId, fileCache[0].chatType, fileCache[0].peerUid, fileCache[0].elementId, "", "");
-			return {
-				success: true,
-				errMsg: "",
-				fileName: fileCache[0].fileName,
-				path: downloadPath,
-				isLocal: true
+			const isGroup = fileCache[0].chatType === ChatType.Group;
+			let url;
+			if (fileCache[0].elementType === ElementType.Pic) {
+				const originImageUrl = `/download?appid=${isGroup ? 1407 : 1406}&fileid=${fileCache[0].fileUuid}&spec=0`;
+				url = await ctx.ntFileApi.getImageUrl(originImageUrl, fileCache[0].md5HexStr);
+			} else if (fileCache[0].elementType === ElementType.Video) url = await ctx.ntFileApi.getVideoUrl(fileCache[0].fileUuid, isGroup);
+			else if (fileCache[0].elementType === ElementType.Ptt) url = await ctx.ntFileApi.getPttUrl(fileCache[0].fileUuid, isGroup);
+			if (url) return await uri2local(ctx, url, needExt);
+			else return {
+				success: false,
+				errMsg: `不支持的文件类型: ${fileCache[0].elementType}`,
+				fileName: "",
+				path: "",
+				isLocal: false
 			};
 		}
 	}
@@ -17269,13 +17249,13 @@ function getSha1HexFromBuffer(buf) {
 }
 async function getMd5HexFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$1.createReadStream(filePath);
+	const stream = fs$2.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest("hex");
 }
 async function getSha1HexFromFile(filePath) {
 	const hash = createHash("sha1");
-	const stream = fs$1.createReadStream(filePath);
+	const stream = fs$2.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest("hex");
 }
@@ -17284,13 +17264,13 @@ function getMd5BufferFromBuffer(buf) {
 }
 async function getMd5BufferFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$1.createReadStream(filePath);
+	const stream = fs$2.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest();
 }
 async function getSha1BufferFromFile(filePath) {
 	const hash = createHash("sha1");
-	const stream = fs$1.createReadStream(filePath);
+	const stream = fs$2.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest();
 }
@@ -17526,7 +17506,7 @@ async function calculateSha1StreamBytes(filePath) {
 	let bytesRead = 0;
 	let nextBlockBoundary = blockSize;
 	const byteArrayList = [];
-	const readable = fs$1.createReadStream(filePath);
+	const readable = fs$2.createReadStream(filePath);
 	for await (const chunk of readable) {
 		let buf;
 		if (tail.length > 0) {
@@ -17551,7 +17531,7 @@ async function calculateSha1StreamBytes(filePath) {
 }
 async function readAndHash10M(filePath) {
 	const maxSize = 10002432;
-	const fd = await fsPromise.open(filePath, "r");
+	const fd = await fs.open(filePath, "r");
 	const buffer = Buffer.allocUnsafe(maxSize);
 	const { bytesRead } = await fd.read(buffer, 0, maxSize, 0);
 	await fd.close();
@@ -17593,13 +17573,13 @@ var TriSha1 = class {
 };
 async function calculateTriSha1(filePath, fileSize) {
 	const hash = new TriSha1(fileSize);
-	const stream = fs$1.createReadStream(filePath);
+	const stream = fs$2.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.finalize();
 }
 var defaultVideoThumb = Buffer.from("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", "base64");
 async function getVideoInfo(filePath) {
-	const size = fs$1.statSync(filePath).size;
+	const size = fs$2.statSync(filePath).size;
 	return new Promise((resolve, reject) => {
 		(0, import_fluent_ffmpeg.default)(filePath).ffprobe((err, metadata) => {
 			if (err) reject(err);
@@ -17676,7 +17656,7 @@ function convert(ctx, input, options, outputPath) {
 	});
 }
 async function encodeSilk(ctx, filePath) {
-	const file = await fsPromise.readFile(filePath);
+	const file = await fs.readFile(filePath);
 	if (!isSilk(file)) {
 		ctx.logger.info(`语音文件${filePath}需要转换成silk`);
 		let result;
@@ -17695,7 +17675,7 @@ async function encodeSilk(ctx, filePath) {
 			"-f s16le"
 		] }), 24e3);
 		const pttPath = path.join(TEMP_DIR, randomUUID());
-		await fsPromise.writeFile(pttPath, result.data);
+		await fs.writeFile(pttPath, result.data);
 		ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration);
 		return {
 			converted: true,
@@ -17718,11 +17698,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 fs.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 fs.writeFile(pcmFilePath, data);
 	return convert(ctx, pcmFilePath, { input: [
 		"-f s16le",
 		"-ar 24000",
@@ -17778,16 +17758,17 @@ var SendElement;
 		const fileSize = (await stat(picPath)).size;
 		if (fileSize === 0) throw new Error(`文件异常，大小为 0: ${picPath}`);
 		const { md5, fileName, path } = await ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, subType);
-		const imageSize = await ctx.ntFileApi.getImageSize(picPath);
+		const fileType = await getFileType(picPath);
+		const size = await getImageSize(picPath);
 		const picElement = {
 			md5HexStr: md5,
 			fileSize: fileSize.toString(),
-			picWidth: imageSize.width,
-			picHeight: imageSize.height,
+			picWidth: size.width,
+			picHeight: size.height,
 			fileName,
 			sourcePath: path,
 			original: true,
-			picType: imageSize.type === "gif" ? PicType.GIF : PicType.JPEG,
+			picType: fileType.ext === "gif" ? PicType.GIF : PicType.JPEG,
 			picSubType: subType,
 			fileUuid: "",
 			fileSubId: "",
@@ -18068,6 +18049,9 @@ function uint32ToIPV4Addr(value) {
 function sleep(ms = 0) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function isHttpUrl(str) {
+	return /^https?:\/\/.+/.test(str);
+}
 //#endregion
 //#region src/common/utils/sign.ts
 var MusicSign = class {
@@ -18200,7 +18184,7 @@ async function createSendElements(ctx, messageData, peer, ignoreTypes = []) {
 			case OB11MessageDataType.Contact:
 				{
 					const { type, id } = segment.data;
-					const data = type === "qq" ? ctx.ntFriendApi.getBuddyRecommendContact(id) : ctx.ntGroupApi.getGroupRecommendContact(id);
+					const data = type === "qq" ? ctx.ntFriendApi.getFriendRecommendContactArk(+id) : ctx.ntGroupApi.getGroupRecommendContact(id);
 					sendElements.push(SendElement.ark(await data));
 				}
 				break;
@@ -18316,7 +18300,7 @@ async function createPeer(ctx, payload, mode = CreatePeerMode.Normal) {
 	if ((mode === CreatePeerMode.Private || mode === CreatePeerMode.Normal) && payload.user_id) {
 		const uid = await ctx.ntUserApi.getUidByUin(payload.user_id.toString(), payload.group_id?.toString());
 		if (!uid) throw new Error("无法获取用户信息");
-		if (!await ctx.ntFriendApi.isBuddy(uid)) {
+		if (!await ctx.ntFriendApi.isFriend(uid)) {
 			if ((await ctx.ntMsgApi.getTempChatInfo(ChatType.TempC2CFromGroup, uid)).tmpChatInfo.groupCode) return {
 				chatType: ChatType.TempC2CFromGroup,
 				peerUid: uid,
@@ -18393,12 +18377,8 @@ async function handleMsg(ctx, msg, quickAction) {
 }
 async function handleFriendRequest$1(ctx, request, quickAction) {
 	if (!isNullable(quickAction.approve)) {
-		const data = request.flag.split("|");
-		if (data.length < 2) return;
-		const uid = data[0];
-		const reqTime = data[1];
-		await ctx.ntFriendApi.handleFriendRequest(uid, reqTime, quickAction.approve).catch((e) => ctx.logger.error(e));
-		if (!isNullable(quickAction.remark)) ctx.ntFriendApi.setBuddyRemark(uid, quickAction.remark).catch((e) => ctx.logger.error(e));
+		await ctx.ntFriendApi.approvalFriendRequest(request.flag, quickAction.approve).catch((e) => ctx.logger.error(e));
+		if (!isNullable(quickAction.remark)) ctx.ntFriendApi.setBuddyRemark(request.flag, quickAction.remark).catch((e) => ctx.logger.error(e));
 	}
 }
 async function handleGroupRequest(ctx, request, quickAction) {
@@ -21236,10 +21216,31 @@ var CloseEvent = globalThis.CloseEvent ?? class extends Event {
 var generateConnectionSymbol = () => Symbol("connection");
 var CONNECTION_SYMBOL_KEY = Symbol("CONNECTION_SYMBOL_KEY");
 var WAIT_FOR_WEBSOCKET_SYMBOL = Symbol("WAIT_FOR_WEBSOCKET_SYMBOL");
-var rejectUpgradeRequest = (socket, status) => {
-	socket.end(`HTTP/1.1 ${status.toString()} ${STATUS_CODES[status] ?? ""}\r\nConnection: close\r
-Content-Length: 0\r
-\r
+var responseHeadersToSkip = new Set([
+	"connection",
+	"content-length",
+	"keep-alive",
+	"proxy-authenticate",
+	"proxy-authorization",
+	"te",
+	"trailer",
+	"transfer-encoding",
+	"upgrade",
+	"sec-websocket-accept",
+	"sec-websocket-extensions",
+	"sec-websocket-protocol"
+]);
+var appendResponseHeaders = (headers, responseHeaders) => {
+	if (!responseHeaders) return;
+	responseHeaders.forEach((value, key) => {
+		if (responseHeadersToSkip.has(key.toLowerCase())) return;
+		headers.push(`${key}: ${value}`);
+	});
+};
+var rejectUpgradeRequest = (socket, status, responseHeaders) => {
+	const responseLines = ["Connection: close", "Content-Length: 0"];
+	appendResponseHeaders(responseLines, responseHeaders);
+	socket.end(`HTTP/1.1 ${status.toString()} ${STATUS_CODES[status] ?? ""}\r\n${responseLines.join("\r\n")}\r\n\r
 `);
 };
 var createUpgradeRequest = (request) => {
@@ -21280,9 +21281,13 @@ var setupWebSocket = (options) => {
 			[WAIT_FOR_WEBSOCKET_SYMBOL]: waitForWebSocket
 		};
 		let status = 400;
+		let responseHeaders;
 		try {
 			const response = await fetchCallback(createUpgradeRequest(request), env);
-			if (response instanceof Response) status = response.status;
+			if (response instanceof Response) {
+				status = response.status;
+				responseHeaders = response.headers;
+			}
 		} catch {
 			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, 500);
 			return;
@@ -21290,12 +21295,20 @@ var setupWebSocket = (options) => {
 		const waiter = waiterMap.get(request);
 		if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
 			waiterMap.delete(request);
-			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status);
+			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status, responseHeaders);
 			return;
 		}
-		wss.handleUpgrade(request, socket, head, (ws) => {
-			wss.emit("connection", ws, request);
-		});
+		const addResponseHeaders = (headers) => {
+			appendResponseHeaders(headers, responseHeaders);
+		};
+		wss.on("headers", addResponseHeaders);
+		try {
+			wss.handleUpgrade(request, socket, head, (ws) => {
+				wss.emit("connection", ws, request);
+			});
+		} finally {
+			wss.off("headers", addResponseHeaders);
+		}
 	});
 	server.on("close", () => {
 		wss.close();
@@ -21775,7 +21788,7 @@ var GetMsg = class extends BaseAction {
 				status = "deleted";
 			}
 		} else msg = res.msgList[0];
-		const retMsg = await OB11Entities.message(this.ctx, msg, void 0, void 0, config);
+		const retMsg = await OB11Entities.message(this.ctx, msg, config);
 		if (!retMsg) throw new Error("消息为空");
 		retMsg.real_id = retMsg.message_seq;
 		retMsg.status = status;
@@ -21804,8 +21817,8 @@ var GetLoginInfo$1 = class extends BaseAction {
 var GetFriendList$1 = class extends BaseAction {
 	actionName = ActionName.GetFriendList;
 	async _handle() {
-		const buddyList = await this.ctx.ntFriendApi.getBuddyList();
-		return OB11Entities.friends(buddyList);
+		const result = await this.ctx.ntFriendApi.getFriendList(true);
+		return OB11Entities.friends(result.friends);
 	}
 };
 //#endregion
@@ -23671,6 +23684,103 @@ var Oidb;
 		allFileCount: ProtoField(7, "uint32"),
 		nextIndex: ProtoField(13, "uint32")
 	}) });
+	_Oidb.ImageOcrReq = ProtoMessage.of({
+		version: ProtoField(1, "uint32"),
+		client: ProtoField(2, "uint32"),
+		entrance: ProtoField(3, "uint32"),
+		ocrReqBody: ProtoField(10, {
+			imageUrl: ProtoField(1, "string"),
+			languageType: ProtoField(2, "uint32"),
+			scene: ProtoField(3, "uint32"),
+			originMd5: ProtoField(10, "string"),
+			afterCompressMd5: ProtoField(11, "string"),
+			afterCompressFileSize: ProtoField(12, "string"),
+			afterCompressWeight: ProtoField(13, "string"),
+			afterCompressHeight: ProtoField(14, "string"),
+			isCut: ProtoField(15, "bool")
+		})
+	});
+	_Oidb.ImageOcrResp = ProtoMessage.of({
+		retCode: ProtoField(1, "int32", "optional"),
+		errMsg: ProtoField(2, "string"),
+		wording: ProtoField(3, "string", "optional"),
+		ocrRspBody: ProtoField(10, {
+			textDetections: ProtoField(1, {
+				detectedText: ProtoField(1, "string"),
+				confidence: ProtoField(2, "uint32"),
+				polygon: ProtoField(3, { coordinates: ProtoField(1, {
+					x: ProtoField(1, "int32"),
+					y: ProtoField(2, "int32")
+				}, "repeated") }),
+				advancedInfo: ProtoField(4, "string")
+			}, "repeated"),
+			language: ProtoField(2, "string"),
+			requestId: ProtoField(3, "string"),
+			ocrLanguageList: ProtoField(101, "string", "repeated"),
+			dstTranslateLanguageList: ProtoField(102, "string", "repeated"),
+			languageList: ProtoField(103, {
+				languageCode: ProtoField(1, "string"),
+				languageDesc: ProtoField(2, "string")
+			}, "repeated"),
+			afterCompressWeight: ProtoField(111, "uint32"),
+			afterCompressHeight: ProtoField(112, "uint32")
+		})
+	});
+	_Oidb.SetFriendRequestReq = ProtoMessage.of({
+		accept: ProtoField(1, "uint32"),
+		targetUid: ProtoField(2, "string")
+	});
+	_Oidb.SetFilteredFriendRequestReq = ProtoMessage.of({
+		selfUid: ProtoField(1, "string"),
+		requestUid: ProtoField(2, "string")
+	});
+	_Oidb.IncPullReq = ProtoMessage.of({
+		reqCount: ProtoField(2, "uint32"),
+		time: ProtoField(3, "uint32"),
+		localSeq: ProtoField(4, "uint32"),
+		cookie: ProtoField(5, "bytes", "optional"),
+		flag: ProtoField(6, "int32"),
+		proxySeq: ProtoField(7, "uint32"),
+		requestBiz: ProtoField(10001, {
+			bizType: ProtoField(1, "int32"),
+			bizData: ProtoField(2, { extBusi: ProtoField(1, "int32", "repeated") })
+		}, "repeated"),
+		extSnsFlagKey: ProtoField(10002, "uint32", "repeated"),
+		extPrivateIdListKey: ProtoField(10003, "uint32", "repeated")
+	});
+	_Oidb.IncPullResp = ProtoMessage.of({
+		seq: ProtoField(1, "uint32"),
+		cookie: ProtoField(2, "bytes", "optional"),
+		isEnd: ProtoField(3, "bool"),
+		time: ProtoField(6, "uint32"),
+		selfUin: ProtoField(7, "uint32"),
+		smallSeq: ProtoField(8, "uint32"),
+		friendList: ProtoField(101, {
+			uid: ProtoField(1, "string"),
+			categoryId: ProtoField(2, "int32"),
+			uin: ProtoField(3, "uint32"),
+			subBiz: ProtoField(10001, ["int32", {
+				numData: ProtoField(1, ["int32", "int32"]),
+				data: ProtoField(2, ["int32", "bytes"])
+			}])
+		}, "repeated"),
+		category: ProtoField(102, {
+			categoryId: ProtoField(1, "int32"),
+			categoryName: ProtoField(2, "string"),
+			categoryMemberCount: ProtoField(3, "int32"),
+			categorySortId: ProtoField(4, "int32")
+		}, "repeated")
+	});
+	_Oidb.FetchPinsResp = ProtoMessage.of({
+		friends: ProtoField(1, { uid: ProtoField(1, "string") }, "repeated"),
+		groups: ProtoField(3, { groupCode: ProtoField(1, "uint32") }, "repeated")
+	});
+	_Oidb.GetFriendRecommendContactArkReq = ProtoMessage.of({
+		uin: ProtoField(1, "uint32"),
+		phoneNumber: ProtoField(2, "string"),
+		jumpUrl: ProtoField(3, "string")
+	});
+	_Oidb.GetFriendRecommendContactArkResp = ProtoMessage.of({ ark: ProtoField(1, "string") });
 })(Oidb || (Oidb = {}));
 //#endregion
 //#region src/ntqqapi/proto/msg.ts
@@ -23958,53 +24068,10 @@ var MessageEncoder$1 = class MessageEncoder$1 {
 		this.content = void 0;
 		this.preview = "";
 	}
-	async packImage(data, busiType) {
-		const imageSize = await this.ctx.ntFileApi.getImageSize(data.filePath);
+	async packImage(msgInfo) {
 		return { commonElem: {
 			serviceType: 48,
-			pbElem: Media.MsgInfo.encode({
-				msgInfoBody: [{
-					index: {
-						info: {
-							fileSize: +data.commonFileInfo.fileSize,
-							md5HexStr: data.commonFileInfo.md5,
-							sha1HexStr: data.commonFileInfo.sha,
-							fileName: data.commonFileInfo.fileName,
-							fileType: {
-								type: 1,
-								picFormat: imageSize.type === "gif" ? 2e3 : 1e3
-							},
-							width: imageSize.width,
-							height: imageSize.height,
-							time: 0,
-							original: 1
-						},
-						fileUuid: data.fileId,
-						storeID: 1,
-						expire: this.isGroup ? 2678400 : 15768e4
-					},
-					pic: {
-						urlPath: `/download?appid=${this.isGroup ? 1407 : 1406}&fileid=${data.fileId}`,
-						ext: {
-							originalParam: "&spec=0",
-							bigParam: "&spec=720",
-							thumbParam: "&spec=198"
-						},
-						domain: "multimedia.nt.qq.com.cn"
-					},
-					fileExist: true
-				}],
-				extBizInfo: {
-					pic: {
-						bizType: 0,
-						summary: "",
-						fromScene: this.isGroup ? 2 : 1,
-						toScene: this.isGroup ? 2 : 1,
-						oldFileId: this.isGroup ? 574859779 : void 0
-					},
-					busiType
-				}
-			}),
+			pbElem: Media.MsgInfo.encode(msgInfo),
 			businessType: this.isGroup ? 20 : 10
 		} };
 	}
@@ -24086,11 +24153,11 @@ var MessageEncoder$1 = class MessageEncoder$1 {
 			const busiType = Number(segment.data.subType) || 0;
 			const { path: picPath } = await handleOb11RichMedia(this.ctx, segment, this.deleteAfterSentFiles);
 			if ((await stat(picPath)).size === 0) throw new Error(`文件异常，大小为 0: ${picPath}`);
-			const { path } = await this.ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, busiType);
-			const data = await this.ctx.ntFileApi.uploadRMFileWithoutMsg(path, this.isGroup ? 4 : 3, this.isGroup ? this.peer.peerUid : selfInfo.uid);
-			this.children.push(await this.packImage(data, busiType));
+			let data;
+			if (this.isGroup) data = await this.ctx.ntFileApi.uploadGroupImage(this.peer.peerUid, picPath);
+			else data = await this.ctx.ntFileApi.uploadC2CImage(this.peer.peerUid, picPath);
+			this.children.push(await this.packImage(data.msgInfo));
 			this.preview += busiType === 1 ? "[动画表情]" : "[图片]";
-			this.deleteAfterSentFiles.push(path);
 		} else if (type === OB11MessageDataType.Forward) {
 			const forwardData = data;
 			if (forwardData.id) this.children.push(this.packForwardMessage(forwardData.id, void 0, forwardData));
@@ -24609,14 +24676,9 @@ var SetFriendAddRequest = class extends BaseAction {
 		remark: lib_default$1.string()
 	});
 	async _handle(payload) {
-		const data = payload.flag.split("|");
-		if (data.length < 2) throw new Error("无效的flag");
-		const uid = data[0];
-		const reqTime = data[1];
-		const res = await this.ctx.ntFriendApi.handleFriendRequest(uid, reqTime, payload.approve);
-		if (res.result !== 0) throw new Error(res.errMsg);
+		await this.ctx.ntFriendApi.approvalFriendRequest(payload.flag, payload.approve);
 		if (payload.remark) {
-			const res = await this.ctx.ntFriendApi.setBuddyRemark(uid, payload.remark);
+			const res = await this.ctx.ntFriendApi.setBuddyRemark(payload.flag, payload.remark);
 			if (res.result !== 0) throw new Error(res.errMsg);
 		}
 		return null;
@@ -24742,26 +24804,23 @@ var GetFileBase = class extends BaseAction {
 		if (!fileCache?.length) fileCache = await this.ctx.store.getFileCacheByName(payload.file);
 		if (fileCache?.length) {
 			let downloadPath = "";
-			if (payload.download) downloadPath = await this.ctx.ntFileApi.downloadMedia(fileCache[0].msgId, fileCache[0].chatType, fileCache[0].peerUid, fileCache[0].elementId, "", "");
+			if (payload.download) {
+				const file = await uri2local(this.ctx, fileCache[0].fileUuid, true);
+				if (file.errMsg) throw new Error(file.errMsg);
+				downloadPath = file.path;
+			}
 			const res = {
 				file: downloadPath,
 				url: "",
 				file_size: fileCache[0].fileSize,
 				file_name: fileCache[0].fileName
 			};
-			const peer = {
-				chatType: fileCache[0].chatType,
-				peerUid: fileCache[0].peerUid,
-				guildId: ""
-			};
+			const isGroup = fileCache[0].chatType === ChatType.Group;
 			if (fileCache[0].elementType === ElementType.Pic) {
-				const msgList = await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId]);
-				if (msgList.msgList.length === 0) throw new Error("msg not found");
-				const findEle = msgList.msgList[0].elements.find((e) => e.elementId === fileCache[0].elementId);
-				if (!findEle) throw new Error("element not found");
-				res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement);
-			} else if (fileCache[0].elementType === ElementType.Video) res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId);
-			else if (fileCache[0].elementType === ElementType.Ptt) res.url = await this.ctx.ntFileApi.getPttUrl(fileCache[0].fileUuid, peer.chatType === 2);
+				const originImageUrl = `/download?appid=${isGroup ? 1407 : 1406}&fileid=${fileCache[0].fileUuid}&spec=0`;
+				res.url = await this.ctx.ntFileApi.getImageUrl(originImageUrl, fileCache[0].md5HexStr);
+			} else if (fileCache[0].elementType === ElementType.Video) res.url = await this.ctx.ntFileApi.getVideoUrl(fileCache[0].fileUuid, isGroup);
+			else if (fileCache[0].elementType === ElementType.Ptt) res.url = await this.ctx.ntFileApi.getPttUrl(fileCache[0].fileUuid, isGroup);
 			if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === void 0)) try {
 				res.base64 = await readFile(downloadPath, "base64");
 			} catch (e) {
@@ -24809,8 +24868,9 @@ var GetRecord = class extends BaseAction {
 	async _handle(payload) {
 		const fileCache = await this.ctx.store.getFileCacheByName(payload.file);
 		if (fileCache?.length) {
-			const downloadPath = await this.ctx.ntFileApi.downloadMedia(fileCache[0].msgId, fileCache[0].chatType, fileCache[0].peerUid, fileCache[0].elementId, "", "");
-			const file = await decodeSilk(this.ctx, downloadPath, payload.out_format);
+			const originFile = await uri2local(this.ctx, fileCache[0].fileUuid, true);
+			if (originFile.errMsg) throw new Error(originFile.errMsg);
+			const file = await decodeSilk(this.ctx, originFile.path, payload.out_format);
 			const res = {
 				file,
 				file_name: path.basename(file),
@@ -24909,17 +24969,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 (fs$1.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 };
@@ -24962,7 +25022,7 @@ var GetGroupMsgHistory = class extends BaseAction {
 					const msg = this.ctx.store.getMsgCache(rawMsg.msgId);
 					if (msg) rawMsg = msg;
 				}
-				return OB11Entities.message(this.ctx, rawMsg, void 0, void 0, config);
+				return OB11Entities.message(this.ctx, rawMsg, config);
 			}))),
 			seq: +msgList[0].msgSeq
 		};
@@ -24999,24 +25059,40 @@ async function decodeMultiMessage(ctx, items, messageFormat) {
 				type: OB11MessageDataType.Text,
 				data: { text: element.text.str }
 			};
-			else if (element.commonElem && element.commonElem.serviceType === 48) {
-				const richMediaInfo = Media.MsgInfo.decode(element.commonElem.pbElem);
-				const infoBody = richMediaInfo.msgInfoBody[0];
-				const parsedUrl = new URL("https://" + infoBody.pic.domain + infoBody.pic.urlPath + infoBody.pic.ext.originalParam);
-				const imageAppid = parsedUrl.searchParams.get("appid");
-				const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey();
-				const url = parsedUrl.href + (imageAppid === "1406" ? rkeyData.private_rkey : rkeyData.group_rkey);
-				const { info } = richMediaInfo.msgInfoBody[0].index;
-				const { pic } = richMediaInfo.extBizInfo;
-				segment = {
-					type: OB11MessageDataType.Image,
-					data: {
-						file: info.fileName,
-						subType: pic.bizType,
-						url,
-						file_size: info.fileSize.toString()
-					}
-				};
+			else if (element.commonElem) {
+				const { businessType, serviceType, pbElem } = element.commonElem;
+				if (serviceType === 48 && (businessType === 10 || businessType === 20)) {
+					const richMediaInfo = Media.MsgInfo.decode(pbElem);
+					const infoBody = richMediaInfo.msgInfoBody[0];
+					const parsedUrl = new URL("https://" + infoBody.pic.domain + infoBody.pic.urlPath + infoBody.pic.ext.originalParam);
+					const imageAppid = parsedUrl.searchParams.get("appid");
+					const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey();
+					const url = parsedUrl.href + (imageAppid === "1406" ? rkeyData.private_rkey : rkeyData.group_rkey);
+					const { info } = richMediaInfo.msgInfoBody[0].index;
+					const { pic } = richMediaInfo.extBizInfo;
+					segment = {
+						type: OB11MessageDataType.Image,
+						data: {
+							file: info.fileName,
+							subType: pic.bizType,
+							url,
+							file_size: info.fileSize.toString()
+						}
+					};
+				} else if (serviceType === 48 && (businessType === 11 || businessType === 21)) {
+					const { msgInfoBody } = Media.MsgInfo.decode(pbElem);
+					const { index } = msgInfoBody[0];
+					const url = await ctx.ntFileApi.getVideoUrl(index.fileUuid, businessType === 21);
+					segment = {
+						type: OB11MessageDataType.Video,
+						data: {
+							file: index.info.fileName,
+							url,
+							path: "",
+							file_size: index.info.fileSize.toString()
+						}
+					};
+				}
 			}
 			if (segment) if (typeof content === "string") content += encodeCQCode(segment);
 			else content.push(segment);
@@ -25073,7 +25149,7 @@ var GetForwardMsg = class extends BaseAction {
 			throw new Error(data.errMsg);
 		}
 		return { messages: filterNullable(await Promise.all(data.msgList.map(async (msg) => {
-			const res = await OB11Entities.message(this.ctx, msg, rootMsgId, peer, config);
+			const res = await OB11Entities.message(this.ctx, msg, config);
 			if (res) {
 				const segments = message2List(res.message);
 				for (const item of segments) if (item.type === OB11MessageDataType.Forward) this.ctx.store.addMultiMsgInfo(rootMsgId, item.data.id, peer);
@@ -25523,7 +25599,7 @@ var GetFriendMsgHistory = class extends BaseAction {
 					const msg = this.ctx.store.getMsgCache(rawMsg.msgId);
 					if (msg) rawMsg = msg;
 				}
-				return OB11Entities.message(this.ctx, rawMsg, void 0, void 0, config);
+				return OB11Entities.message(this.ctx, rawMsg, config);
 			}))),
 			seq: +msgList[0].msgSeq
 		};
@@ -25532,7 +25608,7 @@ var GetFriendMsgHistory = class extends BaseAction {
 		const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString());
 		if (!uid) throw new Error(`无法获取用户信息`);
 		const peer = {
-			chatType: await this.ctx.ntFriendApi.isBuddy(uid) ? ChatType.C2C : ChatType.TempC2CFromGroup,
+			chatType: await this.ctx.ntFriendApi.isFriend(uid) ? ChatType.C2C : ChatType.TempC2CFromGroup,
 			peerUid: uid,
 			guildId: ""
 		};
@@ -25595,32 +25671,16 @@ var GetGroupFilesByFolder = class extends BaseAction {
 var GetFriendWithCategory = class extends BaseAction {
 	actionName = ActionName.GetFriendsWithCategory;
 	async _handle() {
-		const res = await this.ctx.ntFriendApi.getBuddyV2(true);
-		if (res.result !== 0) throw new Error(res.errMsg);
-		const buddyList = await this.ctx.ntFriendApi.getBuddyList();
-		const buddyMap = /* @__PURE__ */ new Map();
-		for (const buddy of buddyList) buddyMap.set(buddy.uid, buddy);
-		const category = [];
-		for (const item of res.data) {
-			const buddyList = [];
-			for (const uid of item.buddyUids) buddyList.push(buddyMap.get(uid));
-			category.push({
-				...item,
-				buddyList
-			});
-		}
-		return category.map((item) => {
-			return {
-				categoryId: item.categoryId,
-				categorySortId: item.categorySortId,
-				categoryName: item.categroyName,
-				categoryMbCount: item.categroyMbCount,
-				onlineCount: item.onlineCount,
-				buddyList: item.buddyList.map((buddy) => {
-					return OB11Entities.friend(buddy);
-				})
-			};
-		});
+		const result = await this.ctx.ntFriendApi.getFriendList(true);
+		return result.categories.values().map((item) => ({
+			categoryId: item.categoryId,
+			categorySortId: item.categorySortId,
+			categoryName: item.categoryName,
+			categoryMbCount: item.categoryMemberCount,
+			buddyList: result.friends.filter((friend) => friend.categoryId === item.categoryId).map((friend) => {
+				return OB11Entities.friend(friend);
+			})
+		})).toArray();
 	}
 };
 //#endregion
@@ -25778,29 +25838,24 @@ var OCRImage = class extends BaseAction {
 	actionName = ActionName.GoCQHTTP_OCRImage;
 	payloadSchema = lib_default$1.object({ image: lib_default$1.string().required() });
 	async _handle(payload) {
-		const { errMsg, isLocal, path, success } = await uri2local(this.ctx, payload.image, true);
-		if (!success) throw new Error(errMsg);
-		await access(path);
-		const data = await this.ctx.ntFileApi.ocrImage(path);
-		if (!isLocal) unlink(path).catch(noop);
-		if (data.code !== 0) throw new Error(data.errMsg);
+		let url;
+		if (isHttpUrl(payload.image)) url = payload.image;
+		else {
+			const { errMsg, isLocal, path, success } = await uri2local(this.ctx, payload.image);
+			if (!success) throw new Error(errMsg);
+			const { msgInfo } = await this.ctx.ntFileApi.uploadC2CImage(selfInfo.uid, path);
+			if (!isLocal) unlink(path).catch(noop);
+			const { pic, index } = msgInfo.msgInfoBody[0];
+			url = await this.ctx.ntFileApi.getImageUrl(pic.urlPath + pic.ext.originalParam, index.info.md5HexStr);
+		}
+		const { textDetections, language } = await this.ctx.ntFileApi.ocrImage(url);
 		return {
-			texts: data.result.map((item) => {
-				const ret = {
-					text: item.text,
-					confidence: 1,
-					coordinates: []
-				};
-				for (let i = 0; i < 4; i++) {
-					const pt = item[`pt${i + 1}`];
-					ret.coordinates.push({
-						x: +pt.x,
-						y: +pt.y
-					});
-				}
-				return ret;
-			}),
-			language: ""
+			texts: textDetections.map((item) => ({
+				text: item.detectedText,
+				confidence: item.confidence,
+				coordinates: item.polygon.coordinates
+			})),
+			language
 		};
 	}
 };
@@ -26469,8 +26524,7 @@ var SetDoubtFriendsAddRequest = class extends BaseAction {
 	actionName = ActionName.SetDoubtFriendsAddRequest;
 	payloadSchema = lib_default$1.object({ flag: lib_default$1.string().required() });
 	async _handle(payload) {
-		const res = await this.ctx.ntFriendApi.approvalDoubtBuddyReq(payload.flag);
-		if (res.result !== 0) throw new Error(res.errMsg);
+		await this.ctx.ntFriendApi.approvalDoubtFriendRequest(payload.flag);
 		return null;
 	}
 };
@@ -26914,7 +26968,6 @@ var Onebot11Adapter = class extends Service {
 	static inject = [
 		"ntMsgApi",
 		"ntFileApi",
-		"ntFileCacheApi",
 		"ntFriendApi",
 		"ntGroupApi",
 		"ntUserApi",
@@ -27049,7 +27102,7 @@ var Onebot11Adapter = class extends Service {
 	}
 	async handleFriendRequest(req) {
 		const uin = await this.ctx.ntUserApi.getUinByUid(req.friendUid);
-		const flag = req.friendUid + "|" + req.reqTime;
+		const flag = req.friendUid;
 		const friendRequestEvent = new OB11FriendRequestEvent(+uin, req.extWords, flag, req.addSource ?? "");
 		this.dispatch(friendRequestEvent);
 	}
@@ -27999,10 +28052,10 @@ var robotUinRanges = [
 ];
 function decodeUser(user) {
 	return {
-		id: user.uin,
+		id: user.uin.toString(),
 		name: user.nick,
 		avatar: `http://q.qlogo.cn/headimg_dl?dst_uin=${user.uin}&spec=640`,
-		is_bot: robotUinRanges.some((e) => user.uin >= e.minUin && user.uin <= e.maxUin)
+		is_bot: robotUinRanges.some((e) => +user.uin >= +e.minUin && +user.uin <= +e.maxUin)
 	};
 }
 function decodeGuildChannelId(data) {
@@ -28045,7 +28098,7 @@ async function decodeElement(ctx, data, quoted = false) {
 			ctx.logger.error("获取不到引用的消息", e, v.replyElement, e.stack);
 		}
 	} else if (v.picElement) {
-		const src = await ctx.ntFileApi.getImageUrl(v.picElement);
+		const src = await ctx.ntFileApi.getImageUrl(v.picElement.originImageUrl, v.picElement.md5HexStr);
 		buffer.push(lib_default.img(src, {
 			width: v.picElement.picWidth,
 			height: v.picElement.picHeight,
@@ -28055,11 +28108,7 @@ async function decodeElement(ctx, data, quoted = false) {
 		const src = await ctx.ntFileApi.getPttUrl(v.pttElement.fileUuid, data.chatType === ChatType.Group);
 		buffer.push(lib_default.audio(src, { duration: v.pttElement.duration }));
 	} else if (v.videoElement) {
-		const src = await ctx.ntFileApi.getVideoUrl({
-			chatType: data.chatType,
-			peerUid: data.peerUid,
-			guildId: ""
-		}, data.msgId, v.elementId) || pathToFileURL(v.videoElement.filePath).href;
+		const src = await ctx.ntFileApi.getVideoUrl(v.videoElement.fileUuid, data.chatType === ChatType.Group);
 		buffer.push(lib_default.video(src));
 	} else if (v.marketFaceElement) {
 		const { emojiId, supportSize } = v.marketFaceElement;
@@ -28152,7 +28201,7 @@ async function getPeer(ctx, channelId) {
 		const uin = channelId.replace("private:", "");
 		const uid = await ctx.ntUserApi.getUidByUin(uin);
 		if (!uid) throw new Error("无法获取用户信息");
-		if (!await ctx.ntFriendApi.isBuddy(uid)) {
+		if (!await ctx.ntFriendApi.isFriend(uid)) {
 			if ((await ctx.ntMsgApi.getTempChatInfo(ChatType.TempC2CFromGroup, uid)).tmpChatInfo.groupCode) return {
 				chatType: ChatType.TempC2CFromGroup,
 				peerUid: uid,
@@ -28658,53 +28707,13 @@ async function ntToProto(ctx, input, peer) {
 	else if (input.elementType === ElementType.Pic) {
 		const isGroup = peer.chatType === ChatType.Group;
 		const path = input.picElement.sourcePath;
-		const data = await ctx.ntFileApi.uploadRMFileWithoutMsg(path, isGroup ? 4 : 3, peer.peerUid);
+		let data;
+		if (isGroup) data = await ctx.ntFileApi.uploadGroupImage(peer.peerUid, path);
+		else data = await ctx.ntFileApi.uploadC2CImage(peer.peerUid, path);
 		return {
 			element: { commonElem: {
 				serviceType: 48,
-				pbElem: Media.MsgInfo.encode({
-					msgInfoBody: [{
-						index: {
-							info: {
-								fileSize: +data.commonFileInfo.fileSize,
-								md5HexStr: data.commonFileInfo.md5,
-								sha1HexStr: data.commonFileInfo.sha,
-								fileName: data.commonFileInfo.fileName,
-								fileType: {
-									type: 1,
-									picFormat: input.picElement.picType
-								},
-								width: input.picElement.picWidth,
-								height: input.picElement.picHeight,
-								time: 0,
-								original: 1
-							},
-							fileUuid: data.fileId,
-							storeID: 1,
-							expire: isGroup ? 2678400 : 15768e4
-						},
-						pic: {
-							urlPath: `/download?appid=${isGroup ? 1407 : 1406}&fileid=${data.fileId}`,
-							ext: {
-								originalParam: "&spec=0",
-								bigParam: "&spec=720",
-								thumbParam: "&spec=198"
-							},
-							domain: "multimedia.nt.qq.com.cn"
-						},
-						fileExist: true
-					}],
-					extBizInfo: {
-						pic: {
-							bizType: 0,
-							summary: "",
-							fromScene: isGroup ? 2 : 1,
-							toScene: isGroup ? 2 : 1,
-							oldFileId: isGroup ? 574859779 : void 0
-						},
-						busiType: input.picElement.picSubType
-					}
-				}),
+				pbElem: Media.MsgInfo.encode(data.msgInfo),
 				businessType: isGroup ? 20 : 10
 			} },
 			preview: input.picElement.picSubType === 1 ? "[动画表情]" : "[图片]"
@@ -28884,20 +28893,15 @@ var getUser = async (ctx, payload) => {
 //#endregion
 //#region src/satori/api/friend/list.ts
 var getFriendList = async (ctx) => {
-	return { data: (await ctx.ntFriendApi.getBuddyList()).map((e) => ({
-		user: decodeUser(e.coreInfo),
-		nick: e.coreInfo.remark
+	return { data: (await ctx.ntFriendApi.getFriendList(true)).friends.map((e) => ({
+		user: decodeUser(e),
+		nick: e.remark
 	})) };
 };
 //#endregion
 //#region src/satori/api/friend/approve.ts
 var handleFriendRequest = async (ctx, payload) => {
-	const data = payload.message_id.split("|");
-	if (data.length < 2) throw new Error("无效的 message_id");
-	const uid = data[0];
-	const reqTime = data[1];
-	const res = await ctx.ntFriendApi.handleFriendRequest(uid, reqTime, payload.approve);
-	if (res.result !== 0) throw new Error(res.errMsg);
+	await ctx.ntFriendApi.approvalFriendRequest(payload.message_id, payload.approve);
 	return {};
 };
 //#endregion
@@ -29195,7 +29199,7 @@ async function parseGuildMemberRequest(bot, input, doubt) {
 //#endregion
 //#region src/satori/event/user.ts
 async function parseFriendRequest(bot, input) {
-	const flag = input.friendUid + "|" + input.reqTime;
+	const flag = input.friendUid;
 	const user = await bot.ctx.ntUserApi.getUserSimpleInfo(input.friendUid);
 	return bot.event("friend-request", {
 		user: decodeUser(user.coreInfo),
@@ -29265,7 +29269,6 @@ var SatoriAdapter = class extends Service {
 	static inject = [
 		"ntMsgApi",
 		"ntFileApi",
-		"ntFileCacheApi",
 		"ntFriendApi",
 		"ntGroupApi",
 		"ntUserApi",
@@ -40897,7 +40900,7 @@ function _null(params) {
 var ZodAny = /* @__PURE__ */ $constructor("ZodAny", (inst, def) => {
 	$ZodAny.init(inst, def);
 	ZodType.init(inst, def);
-	inst._zod.processJSONSchema = (ctx, json, params) => anyProcessor(inst, ctx, json, params);
+	inst._zod.processJSONSchema = (ctx, json, params) => void 0;
 });
 function any() {
 	return /* @__PURE__ */ _any(ZodAny);
@@ -40905,7 +40908,7 @@ function any() {
 var ZodUnknown = /* @__PURE__ */ $constructor("ZodUnknown", (inst, def) => {
 	$ZodUnknown.init(inst, def);
 	ZodType.init(inst, def);
-	inst._zod.processJSONSchema = (ctx, json, params) => unknownProcessor(inst, ctx, json, params);
+	inst._zod.processJSONSchema = (ctx, json, params) => void 0;
 });
 function unknown() {
 	return /* @__PURE__ */ _unknown(ZodUnknown);
@@ -42399,14 +42402,14 @@ function transformGender(gender) {
 }
 function transformFriend(friend, category) {
 	return {
-		user_id: +friend.uin,
-		nickname: friend.coreInfo.nick,
-		sex: transformGender(friend.baseInfo.sex),
-		qid: friend.baseInfo.qid,
-		remark: friend.coreInfo.remark,
+		user_id: friend.uin,
+		nickname: friend.nick,
+		sex: transformGender(friend.sex),
+		qid: friend.qid,
+		remark: friend.remark,
 		category: {
 			category_id: category.categoryId,
-			category_name: category.categroyName
+			category_name: category.categoryName
 		}
 	};
 }
@@ -43470,7 +43473,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 fs.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}`);
@@ -43513,22 +43516,16 @@ var SystemApi = [
 			school: info.school
 		});
 	}),
-	defineApi("get_friend_list", GetFriendListInput, GetFriendListOutput, async (ctx) => {
-		const friends = await ctx.ntFriendApi.getBuddyList();
-		const category = /* @__PURE__ */ new Map();
+	defineApi("get_friend_list", GetFriendListInput, GetFriendListOutput, async (ctx, payload) => {
+		const result = await ctx.ntFriendApi.getFriendList(payload.no_cache);
 		const friendList = [];
-		for (const friend of friends) {
-			const { categoryId } = friend.baseInfo;
-			if (!category.has(categoryId)) category.set(categoryId, await ctx.ntFriendApi.getCategoryById(categoryId));
-			friendList.push(transformFriend(friend, category.get(categoryId)));
-		}
+		for (const friend of result.friends) friendList.push(transformFriend(friend, result.categories.get(friend.categoryId)));
 		return Ok({ friends: friendList });
 	}),
 	defineApi("get_friend_info", GetFriendInfoInput, GetFriendInfoOutput, async (ctx, payload) => {
-		const uid = await ctx.ntUserApi.getUidByUin(payload.user_id.toString());
-		if (!uid) return Failed(-404, "User not found");
-		const friend = await ctx.ntUserApi.getUserSimpleInfo(uid, payload.no_cache);
-		return Ok({ friend: transformFriend(friend, await ctx.ntFriendApi.getCategoryById(friend.baseInfo.categoryId)) });
+		const result = await ctx.ntFriendApi.getFriendInfoByUin(payload.user_id, payload.no_cache);
+		if (!result) return Failed(-404, "Friend not found");
+		return Ok({ friend: transformFriend(result.friend, result.category) });
 	}),
 	defineApi("get_group_list", GetGroupListInput, GetGroupListOutput, async (ctx) => {
 		const { groups } = await ctx.pmhq.fetchGroups();
@@ -43584,28 +43581,15 @@ var SystemApi = [
 		return Ok({ member: transformGroupMember(await ctx.ntGroupApi.getGroupMember(groupCode, memberUid, payload.no_cache), payload.group_id) });
 	}),
 	defineApi("get_peer_pins", zod_default.object({}), GetPeerPinsOutput, async (ctx) => {
-		const friends = await ctx.ntFriendApi.getBuddyList();
-		const category = /* @__PURE__ */ new Map();
-		const { groups } = await ctx.pmhq.fetchGroups();
+		const result = await ctx.ntSystemApi.getPins();
 		return Ok({
-			friends: await Promise.all(friends.filter((e) => e.relationFlags && e.relationFlags.topTime !== "0").map(async (e) => {
-				const { categoryId } = e.baseInfo;
-				if (!category.has(categoryId)) category.set(categoryId, await ctx.ntFriendApi.getCategoryById(categoryId));
-				return transformFriend(e, category.get(categoryId));
+			friends: await Promise.all(result.friends.map(async (e) => {
+				const info = await ctx.ntFriendApi.getFriendInfoByUid(e.uid, false);
+				return transformFriend(info.friend, info.category);
 			})),
-			groups: groups.filter((e) => e.info.topTime).map((e) => {
-				return {
-					group_id: e.groupCode,
-					group_name: e.info.groupName,
-					member_count: e.info.memberCount,
-					max_member_count: e.info.memberMax,
-					remark: e.customInfo.remark ?? "",
-					created_time: e.info.createdTime,
-					description: e.info.richDescription ?? "",
-					question: e.info.question ?? "",
-					announcement: e.info.announcement ?? ""
-				};
-			})
+			groups: await Promise.all(result.groups.map(async (e) => {
+				return transformGroup(await ctx.ntGroupApi.getGroupDetailInfo(e.groupCode.toString()));
+			}))
 		});
 	}),
 	defineApi("set_peer_pin", SetPeerPinInput, zod_default.object({}), async (ctx, payload) => {
@@ -43859,53 +43843,10 @@ var ForwardMessageEncoder = class ForwardMessageEncoder {
 		this.children = [];
 		this.preview = "";
 	}
-	async packImage(data, busiType) {
-		const imageSize = await this.ctx.ntFileApi.getImageSize(data.filePath);
+	async packImage(msgInfo) {
 		return { commonElem: {
 			serviceType: 48,
-			pbElem: Media.MsgInfo.encode({
-				msgInfoBody: [{
-					index: {
-						info: {
-							fileSize: +data.commonFileInfo.fileSize,
-							md5HexStr: data.commonFileInfo.md5,
-							sha1HexStr: data.commonFileInfo.sha,
-							fileName: data.commonFileInfo.fileName,
-							fileType: {
-								type: 1,
-								picFormat: imageSize.type === "gif" ? 2e3 : 1e3
-							},
-							width: imageSize.width,
-							height: imageSize.height,
-							time: 0,
-							original: 1
-						},
-						fileUuid: data.fileId,
-						storeID: 1,
-						expire: this.isGroup ? 2678400 : 15768e4
-					},
-					pic: {
-						urlPath: `/download?appid=${this.isGroup ? 1407 : 1406}&fileid=${data.fileId}`,
-						ext: {
-							originalParam: "&spec=0",
-							bigParam: "&spec=720",
-							thumbParam: "&spec=198"
-						},
-						domain: "multimedia.nt.qq.com.cn"
-					},
-					fileExist: true
-				}],
-				extBizInfo: {
-					pic: {
-						bizType: 0,
-						summary: "",
-						fromScene: this.isGroup ? 2 : 1,
-						toScene: this.isGroup ? 2 : 1,
-						oldFileId: this.isGroup ? 574859779 : void 0
-					},
-					busiType
-				}
-			}),
+			pbElem: Media.MsgInfo.encode(msgInfo),
 			businessType: this.isGroup ? 20 : 10
 		} };
 	}
@@ -43962,9 +43903,11 @@ var ForwardMessageEncoder = class ForwardMessageEncoder {
 				const imageBuffer = await resolveMilkyUri(segment.data.uri);
 				const tempPath = path.join(TEMP_DIR, `image-${randomUUID()}`);
 				await writeFile(tempPath, imageBuffer);
-				const data = await this.ctx.ntFileApi.uploadRMFileWithoutMsg(tempPath, this.isGroup ? RMBizType.GroupPic : RMBizType.C2CPic, this.isGroup ? this.peerUid : selfInfo.uid);
+				let data;
+				if (this.isGroup) data = await this.ctx.ntFileApi.uploadGroupImage(this.peerUid, tempPath);
+				else data = await this.ctx.ntFileApi.uploadC2CImage(this.peerUid, tempPath);
 				const busiType = segment.data.sub_type === "sticker" ? 1 : 0;
-				this.children.push(await this.packImage(data, busiType));
+				this.children.push(await this.packImage(data.msgInfo));
 				this.preview += busiType === 1 ? "[动画表情]" : "[图片]";
 				unlink(tempPath).catch(noop);
 			} else if (type === "forward") {
@@ -47577,7 +47520,7 @@ function readStopNodeData(xmlData, tagName, i) {
 		else if (c1 === 33 && xmlData.charCodeAt(i + 2) === 45 && xmlData.charCodeAt(i + 3) === 45) i = findClosingIndex(xmlData, "-->", i + 3, "StopNode is not closed.");
 		else if (c1 === 33 && xmlData.charCodeAt(i + 2) === 91) i = findClosingIndex(xmlData, "]]>", i, "StopNode is not closed.") - 2;
 		else {
-			const tagData = readTagExp(xmlData, i, ">");
+			const tagData = readTagExp(xmlData, i, false);
 			if (tagData) {
 				if ((tagData && tagData.tagName) === tagName && tagData.tagExp[tagData.tagExp.length - 1] !== "/") openTagCount++;
 				i = tagData.closeIndex;
@@ -47662,6 +47605,7 @@ function compress(arr, options, matcher, readonlyMatcher) {
 		else if (tagObj[property]) {
 			let val = compress(tagObj[property], options, matcher, readonlyMatcher);
 			const isLeaf = isLeafTag(val, options);
+			if (Object.keys(val).length === 0 && options.alwaysCreateTextNode) val[options.textNodeName] = "";
 			if (tagObj[":@"]) assignAttributes(val, tagObj[":@"], readonlyMatcher, options);
 			else if (Object.keys(val).length === 1 && val[options.textNodeName] !== void 0 && !options.alwaysCreateTextNode) val = val[options.textNodeName];
 			else if (Object.keys(val).length === 0) if (options.alwaysCreateTextNode) val[options.textNodeName] = "";
@@ -47770,7 +47714,25 @@ async function transformIncomingPrivateMessage(ctx, friend, category, message) {
 		sender_id: +message.senderUin,
 		time: +message.msgTime,
 		segments: await transformIncomingSegments(ctx, message),
-		friend: transformFriend(friend, category)
+		friend: transformFriend({
+			uid: friend.uid,
+			uin: +friend.uin,
+			categoryId: friend.baseInfo.categoryId,
+			nick: friend.coreInfo.nick,
+			longNick: friend.baseInfo.longNick,
+			remark: friend.coreInfo.remark,
+			qid: friend.baseInfo.qid,
+			age: friend.baseInfo.age,
+			sex: friend.baseInfo.sex,
+			birthdayYear: friend.baseInfo.birthday_year,
+			birthdayMonth: friend.baseInfo.birthday_month,
+			birthdayDay: friend.baseInfo.birthday_day
+		}, {
+			categoryId: category.categoryId,
+			categoryName: category.categroyName,
+			categoryMemberCount: category.categroyMbCount,
+			categorySortId: category.categorySortId
+		})
 	};
 }
 async function transformIncomingGroupMessage(ctx, group, member, message) {
@@ -47841,7 +47803,7 @@ async function transformIncomingSegments(ctx, message) {
 				type: "image",
 				data: {
 					resource_id: element.picElement.fileUuid,
-					temp_url: await ctx.ntFileApi.getImageUrl(element.picElement),
+					temp_url: await ctx.ntFileApi.getImageUrl(element.picElement.originImageUrl, element.picElement.md5HexStr),
 					width: element.picElement.picWidth,
 					height: element.picElement.picHeight,
 					summary: element.picElement.summary || "[图片]",
@@ -47864,7 +47826,7 @@ async function transformIncomingSegments(ctx, message) {
 				type: "video",
 				data: {
 					resource_id: element.videoElement.fileUuid,
-					temp_url: await ctx.ntFileApi.getVideoUrlByPacket(element.videoElement.fileUuid, message.chatType === ChatType.Group),
+					temp_url: await ctx.ntFileApi.getVideoUrl(element.videoElement.fileUuid, message.chatType === ChatType.Group),
 					width: element.videoElement.thumbWidth,
 					height: element.videoElement.thumbHeight,
 					duration: element.videoElement.fileTime
@@ -47908,20 +47870,22 @@ async function transformIncomingSegments(ctx, message) {
 			break;
 		case ElementType.Ark: {
 			const { arkElement } = element;
-			const data = JSON.parse(arkElement.bytesData);
-			if (data.app === "com.tencent.multimsg" && data.meta.detail.resid) segments.push({
-				type: "forward",
-				data: {
-					forward_id: data.meta.detail.resid,
-					title: data.meta.detail.source,
-					preview: data.meta.detail.news.map((item) => item.text),
-					summary: data.meta.detail.summary
-				}
-			});
-			else segments.push({
+			const match = arkElement.bytesData.match(/"app"\s*:\s*"([^"]*)"/);
+			if (match?.[1]) if (match[1] === "com.tencent.multimsg") {
+				const data = JSON.parse(arkElement.bytesData);
+				segments.push({
+					type: "forward",
+					data: {
+						forward_id: data.meta.detail.resid,
+						title: data.meta.detail.source,
+						preview: data.meta.detail.news.map((item) => item.text),
+						summary: data.meta.detail.summary
+					}
+				});
+			} else segments.push({
 				type: "light_app",
 				data: {
-					app_name: data.app,
+					app_name: match[1],
 					json_payload: arkElement.bytesData
 				}
 			});
@@ -47969,7 +47933,7 @@ async function transformIncomingForwardedMessage(ctx, message) {
 			} else if (serviceType === 48 && (businessType === 11 || businessType === 21)) {
 				const { msgInfoBody } = Media.MsgInfo.decode(elem.commonElem.pbElem);
 				const { index } = msgInfoBody[0];
-				const url = await ctx.ntFileApi.getVideoUrlByPacket(index.fileUuid, businessType === 21);
+				const url = await ctx.ntFileApi.getVideoUrl(index.fileUuid, businessType === 21);
 				segments.push({
 					type: "video",
 					data: {
@@ -48030,7 +47994,7 @@ var SendPrivateMessage = defineApi("send_private_message", SendPrivateMessageInp
 		peerUid: uid,
 		guildId: ""
 	};
-	if (!await ctx.ntFriendApi.isBuddy(uid)) {
+	if (!await ctx.ntFriendApi.isFriend(uid)) {
 		if ((await ctx.ntMsgApi.getTempChatInfo(100, uid)).tmpChatInfo.groupCode) peer.chatType = 100;
 	}
 	const { elements, deleteAfterSentFiles } = await transformOutgoingMessage(ctx, payload.message, uid, false);
@@ -48062,7 +48026,7 @@ var RecallPrivateMessage = defineApi("recall_private_message", RecallPrivateMess
 		peerUid: uid,
 		guildId: ""
 	};
-	if (!await ctx.ntFriendApi.isBuddy(uid)) {
+	if (!await ctx.ntFriendApi.isFriend(uid)) {
 		if ((await ctx.ntMsgApi.getTempChatInfo(100, uid)).tmpChatInfo.groupCode) peer.chatType = 100;
 	}
 	const msg = await ctx.ntMsgApi.getMsgsBySeqAndCount(peer, payload.message_seq.toString(), 1, true, true);
@@ -48177,7 +48141,7 @@ var MessageApi = [
 			const rkeyData = await ctx.ntFileApi.rkeyManager.getRkey(true);
 			const rkey = appid === 1406 ? rkeyData.private_rkey : rkeyData.group_rkey;
 			return Ok({ url: `${IMAGE_HTTP_HOST_NT}/download?appid=${appid}&fileid=${payload.resource_id}&spec=0${rkey}` });
-		} else if (appid === 1413 || appid === 1415) return Ok({ url: await ctx.ntFileApi.getVideoUrlByPacket(payload.resource_id, appid === 1415) });
+		} else if (appid === 1413 || appid === 1415) return Ok({ url: await ctx.ntFileApi.getVideoUrl(payload.resource_id, appid === 1415) });
 		else {
 			ctx.logger.warn(`GetResourceTempUrl: not yet supported appid: ${appid}`);
 			return Ok({ url: "" });
@@ -48272,17 +48236,12 @@ var FriendApi = [
 		}
 	}),
 	defineApi("accept_friend_request", AcceptFriendRequestInput, zod_default.object({}), async (ctx, payload) => {
-		let result;
-		if (payload.is_filtered) result = await ctx.ntFriendApi.approvalDoubtBuddyReq(payload.initiator_uid);
-		else result = await ctx.ntFriendApi.handleFriendRequest(payload.initiator_uid, "0", true);
-		if (result.result !== 0) return Failed(-500, result.errMsg);
+		if (payload.is_filtered) await ctx.ntFriendApi.approvalDoubtFriendRequest(payload.initiator_uid);
+		else await ctx.ntFriendApi.approvalFriendRequest(payload.initiator_uid, true);
 		return Ok({});
 	}),
 	defineApi("reject_friend_request", RejectFriendRequestInput, zod_default.object({}), async (ctx, payload) => {
-		if (!payload.is_filtered) {
-			const result = await ctx.ntFriendApi.handleFriendRequest(payload.initiator_uid, "0", false);
-			if (result.result !== 0) return Failed(-500, result.errMsg);
-		}
+		if (!payload.is_filtered) await ctx.ntFriendApi.approvalFriendRequest(payload.initiator_uid, false);
 		return Ok({});
 	})
 ];
@@ -52243,16 +52202,14 @@ var Store = class extends Service {
 			uniqueMsgId: "string(64)",
 			peerUid: "string(24)"
 		}, { primary: "shortId" });
-		this.ctx.model.extend("file_v2", {
+		this.ctx.model.extend("file", {
 			fileName: "string",
 			fileSize: "string",
 			fileUuid: "string(128)",
-			msgId: "string(24)",
 			msgTime: "unsigned(10)",
-			peerUid: "string(24)",
 			chatType: "unsigned",
-			elementId: "string(24)",
-			elementType: "unsigned"
+			elementType: "unsigned",
+			md5HexStr: "string(32)"
 		}, {
 			primary: "fileUuid",
 			indexes: ["fileName"]
@@ -52334,15 +52291,15 @@ var Store = class extends Service {
 		return this.cache.getValue(cacheKey);
 	}
 	async addFileCache(data) {
-		const existingFile = await this.ctx.database.get("file_v2", { fileUuid: data.fileUuid });
+		const existingFile = await this.ctx.database.get("file", { fileUuid: data.fileUuid });
 		if (existingFile.length) return existingFile;
-		this.ctx.database.upsert("file_v2", [data], "fileUuid").then().catch((e) => this.ctx.logger.error("addFileCache database error:", e));
+		this.ctx.database.upsert("file", [data], "fileUuid").then().catch((e) => this.ctx.logger.error("addFileCache database error:", e));
 	}
 	getFileCacheByName(fileName) {
-		return this.ctx.database.get("file_v2", { fileName }, { sort: { msgTime: "desc" } });
+		return this.ctx.database.get("file", { fileName }, { sort: { msgTime: "desc" } });
 	}
 	getFileCacheById(fileUuid) {
-		return this.ctx.database.get("file_v2", { fileUuid });
+		return this.ctx.database.get("file", { fileUuid });
 	}
 	async addMsgCache(msg) {
 		const expire = this.config.msgCacheExpire;
@@ -52638,36 +52595,24 @@ var NTQQFileApi = class extends Service {
 		this.ctx = ctx;
 		this.rkeyManager = new RkeyManager(ctx, "https://llob.linyuchen.net/rkey");
 	}
-	async getVideoUrlByPacket(fileUuid, isGroup) {
-		if (isGroup) return await this.ctx.pmhq.getGroupVideoUrl(fileUuid);
-		else return await this.ctx.pmhq.getPrivateVideoUrl(fileUuid);
+	async getVideoUrl(fileUuid, isGroup) {
+		if (isGroup) {
+			const { download } = await this.ctx.pmhq.getGroupVideoUrl(fileUuid);
+			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+		} else {
+			const { download } = await this.ctx.pmhq.getPrivateVideoUrl(fileUuid);
+			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+		}
 	}
 	async getPttUrl(fileUuid, isGroup) {
-		if (isGroup) return await this.ctx.pmhq.getGroupPttUrl(fileUuid);
-		else return await this.ctx.pmhq.getPrivatePttUrl(fileUuid);
-	}
-	async getVideoUrl(peer, msgId, elementId) {
-		try {
-			const data = await this.ctx.pmhq.invoke("nodeIKernelRichMediaService/getVideoPlayUrlV2", [
-				peer,
-				msgId,
-				elementId,
-				0,
-				{
-					downSourceType: 1,
-					triggerType: 0
-				}
-			]);
-			if (data.result !== 0) this.ctx.logger.warn("getVideoUrl", data);
-			return data.urlResult.domainUrl[0]?.url ?? "";
-		} catch (e) {
-			this.ctx.logger.warn("getVideoUrl error", e);
-			return "";
+		if (isGroup) {
+			const { download } = await this.ctx.pmhq.getGroupPttUrl(fileUuid);
+			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+		} else {
+			const { download } = await this.ctx.pmhq.getPrivatePttUrl(fileUuid);
+			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
 		}
 	}
-	async getFileType(filePath) {
-		return await getFileType(filePath);
-	}
 	async getRichMediaFilePath(md5HexStr, fileName, elementType, elementSubType = 0) {
 		return await this.ctx.pmhq.invoke(NTMethod.MEDIA_FILE_PATH, [{
 			md5HexStr,
@@ -52685,7 +52630,7 @@ var NTQQFileApi = class extends Service {
 		const fileMd5 = await getMd5HexFromFile(filePath);
 		let fileName = path.basename(filePath);
 		if (!fileName.includes(".")) {
-			const ext = (await this.getFileType(filePath))?.ext;
+			const ext = (await getFileType(filePath))?.ext;
 			fileName += ext ? "." + ext : "";
 		}
 		const mediaPath = await this.getRichMediaFilePath(fileMd5, fileName, elementType, elementSubType);
@@ -52696,37 +52641,8 @@ var NTQQFileApi = class extends Service {
 			path: mediaPath
 		};
 	}
-	async downloadMedia(msgId, chatType, peerUid, elementId, thumbPath = "", sourcePath = "", timeout = 1e3 * 60 * 30, force = false) {
-		if (sourcePath && existsSync$1(sourcePath)) if (force) unlink(sourcePath).catch(noop);
-		else return sourcePath;
-		return (await this.ctx.pmhq.invoke("nodeIKernelMsgService/downloadRichMedia", [{
-			fileModelId: "0",
-			downloadSourceType: 0,
-			triggerType: 1,
-			msgId,
-			chatType,
-			peerUid,
-			elementId,
-			thumbSize: 0,
-			downloadType: 1,
-			filePath: thumbPath
-		}], {
-			resultCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-			resultCb: (payload) => payload.msgId === msgId,
-			timeout
-		})).filePath;
-	}
-	async getImageSize(filePath) {
-		const fileType = await getFileType(filePath);
-		const size = await getImageSize(filePath);
-		return {
-			type: fileType.ext,
-			...size
-		};
-	}
-	async getImageUrl(element) {
-		const url = element.originImageUrl;
-		const md5HexStr = element.md5HexStr;
+	async getImageUrl(originImageUrl, md5HexStr) {
+		const url = originImageUrl;
 		if (url) {
 			const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
 			const imageAppid = parsedUrl.searchParams.get("appid");
@@ -52740,31 +52656,10 @@ var NTQQFileApi = class extends Service {
 			else return IMAGE_HTTP_HOST + url;
 		} else return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${md5HexStr.toUpperCase()}/0`;
 	}
-	async downloadFileForModelId(peer, fileModelId, timeout = 2 * Time.minute) {
-		return (await this.ctx.pmhq.invoke("nodeIKernelRichMediaService/downloadFileForModelId", [
-			peer,
-			[fileModelId],
-			""
-		], {
-			resultCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-			resultCb: (payload) => payload.fileModelId === fileModelId,
-			timeout
-		})).filePath;
-	}
-	async ocrImage(path) {
-		return await this.ctx.pmhq.invoke("nodeIKernelNodeMiscService/wantWinScreenOCR", [path], { timeout: 2 * Time.minute });
-	}
-	async uploadRMFileWithoutMsg(filePath, bizType, peerUid) {
-		return await this.ctx.pmhq.invoke("nodeIKernelRichMediaService/uploadRMFileWithoutMsg", [{
-			filePath,
-			bizType,
-			peerUid,
-			useNTV2: true
-		}], {
-			resultCmd: ReceiveCmdS.MEDIA_UPLOAD_COMPLETE,
-			resultCb: (payload) => payload.filePath === filePath,
-			timeout: 20 * Time.second
-		});
+	async ocrImage(imageUrl) {
+		const res = await this.ctx.pmhq.imageOcr(imageUrl);
+		if (res.retCode) throw new Error(res.wording);
+		return res.ocrRspBody;
 	}
 	async uploadFlashFile(title, filePaths) {
 		return await this.ctx.pmhq.invoke("nodeIKernelFlashTransferService/createFlashTransferUploadTask", [(/* @__PURE__ */ new Date()).getTime(), {
@@ -53097,38 +52992,61 @@ var NTQQFileApi = class extends Service {
 			crcMedia: result.crcMedia
 		};
 	}
-};
-var NTQQFileCacheApi = class extends Service {
-	static inject = ["pmhq"];
-	constructor(ctx) {
-		super(ctx, "ntFileCacheApi");
-		this.ctx = ctx;
-	}
-	async setCacheSilentScan(isSilent = true) {
-		return await this.ctx.pmhq.invoke(NTMethod.CACHE_SET_SILENCE, [{ isSilent }]);
-	}
-	getCacheSessionPathList() {}
-	scanCache() {
-		this.ctx.pmhq.invoke(ReceiveCmdS.CACHE_SCAN_FINISH, []);
-		return this.ctx.pmhq.invoke(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second });
-	}
-	getHotUpdateCachePath() {}
-	getDesktopTmpPath() {}
-	getFileCacheInfo(fileType, pageSize = 1e3, lastRecord) {
-		const _lastRecord = lastRecord ? lastRecord : { fileType };
-		return this.ctx.pmhq.invoke(NTMethod.CACHE_FILE_GET, [{
-			fileType,
-			restart: true,
-			pageSize,
-			order: 1,
-			lastRecord: _lastRecord
-		}]);
+	async uploadGroupImage(groupCode, filePath) {
+		const result = await this.ctx.pmhq.getGroupImageUploadInfo(groupCode, filePath);
+		const highwaySession = await this.ctx.pmhq.getHighwaySession();
+		const maxBlockSize = 1024 * 1024;
+		if (result.ext.uKey) {
+			const { index } = result.ext.msgInfoBody[0];
+			const trans = {
+				uin: selfInfo.uin,
+				cmd: 1004,
+				readable: createReadStream(filePath, { highWaterMark: maxBlockSize }),
+				sum: Buffer.from(index.info.md5HexStr, "hex"),
+				size: index.info.fileSize,
+				ticket: highwaySession.sigSession,
+				ext: Media.NTV2RichMediaHighwayExt.encode(result.ext),
+				server: highwaySession.highwayHostAndPorts[1][0].host,
+				port: highwaySession.highwayHostAndPorts[1][0].port
+			};
+			try {
+				await new HighwayTcpSession(trans).upload();
+			} catch {
+				await new HighwayHttpSession(trans).upload();
+			}
+		}
+		return {
+			msgInfo: result.info,
+			compat: result.compat
+		};
 	}
-	async clearChatCache(chats = [], fileKeys = []) {
-		return await this.ctx.pmhq.invoke(NTMethod.CACHE_CHAT_CLEAR, [{
-			chats,
-			fileKeys
-		}]);
+	async uploadC2CImage(peerUid, filePath) {
+		const result = await this.ctx.pmhq.getC2CImageUploadInfo(peerUid, filePath);
+		const highwaySession = await this.ctx.pmhq.getHighwaySession();
+		const maxBlockSize = 1024 * 1024;
+		if (result.ext.uKey) {
+			const { index } = result.ext.msgInfoBody[0];
+			const trans = {
+				uin: selfInfo.uin,
+				cmd: 1003,
+				readable: createReadStream(filePath, { highWaterMark: maxBlockSize }),
+				sum: Buffer.from(index.info.md5HexStr, "hex"),
+				size: index.info.fileSize,
+				ticket: highwaySession.sigSession,
+				ext: Media.NTV2RichMediaHighwayExt.encode(result.ext),
+				server: highwaySession.highwayHostAndPorts[1][0].host,
+				port: highwaySession.highwayHostAndPorts[1][0].port
+			};
+			try {
+				await new HighwayTcpSession(trans).upload();
+			} catch {
+				await new HighwayHttpSession(trans).upload();
+			}
+		}
+		return {
+			msgInfo: result.info,
+			compat: result.compat
+		};
 	}
 };
 //#endregion
@@ -53139,37 +53057,81 @@ var NTQQFriendApi = class extends Service {
 		"ntSystemApi",
 		"pmhq"
 	];
+	friendsCache = [];
+	categoriesCache = /* @__PURE__ */ new Map();
 	constructor(ctx) {
 		super(ctx, "ntFriendApi");
 		this.ctx = ctx;
 	}
-	/** reqTime 可为 0 */
-	async handleFriendRequest(friendUid, reqTime, accept) {
-		return await this.ctx.pmhq.invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
-			friendUid,
-			reqTime,
-			accept
-		}]);
+	async approvalFriendRequest(friendUid, accept) {
+		await this.ctx.pmhq.setFriendRequest(friendUid, accept ? 3 : 5);
+	}
+	async getFriendList(forceUpdate) {
+		if (forceUpdate || this.friendsCache.length === 0) {
+			const res = await this.ctx.pmhq.fetchFriends();
+			this.friendsCache = res.friendList.map((friend) => {
+				const biz = friend.subBiz.get(1);
+				return {
+					uid: friend.uid,
+					uin: friend.uin,
+					categoryId: friend.categoryId,
+					nick: biz.data.get(20002).toString(),
+					longNick: biz.data.get(102).toString(),
+					remark: biz.data.get(103).toString(),
+					qid: biz.data.get(27394).toString(),
+					age: biz.numData.get(20037),
+					sex: biz.numData.get(20009),
+					birthdayYear: biz.data.get(20031)[0] << 8 | biz.data.get(20031)[1],
+					birthdayMonth: biz.data.get(20031)[2],
+					birthdayDay: biz.data.get(20031)[3]
+				};
+			});
+			this.categoriesCache.clear();
+			for (const cat of res.category) this.categoriesCache.set(cat.categoryId, cat);
+		}
+		return {
+			friends: this.friendsCache,
+			categories: this.categoriesCache
+		};
 	}
-	async getBuddyList() {
-		return await this.ctx.pmhq.invoke("getBuddyList", [], {});
+	async getFriendInfoByUin(uin, forceUpdate) {
+		const result = await this.getFriendList(forceUpdate);
+		let categories = result.categories;
+		let friend = result.friends.find((e) => e.uin === uin);
+		if (!friend) {
+			const result = await this.getFriendList(true);
+			categories = result.categories;
+			friend = result.friends.find((e) => e.uin === uin);
+		}
+		if (!friend) return;
+		const category = categories.get(friend.categoryId);
+		return {
+			friend,
+			category
+		};
 	}
-	async getBuddyV2(forceRefresh) {
-		const version = +(await this.ctx.ntSystemApi.getDeviceInfo()).buildVer.split("-")[1];
-		let result;
-		if (version >= 41679) result = await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyListV2", [
-			"",
-			forceRefresh,
-			0
-		]);
-		else result = await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyListV2", [forceRefresh, 0]);
-		return result;
+	async getFriendInfoByUid(uid, forceUpdate) {
+		const result = await this.getFriendList(forceUpdate);
+		let categories = result.categories;
+		let friend = result.friends.find((e) => e.uid === uid);
+		if (!friend) {
+			const result = await this.getFriendList(true);
+			categories = result.categories;
+			friend = result.friends.find((e) => e.uid === uid);
+		}
+		if (!friend) return;
+		const category = categories.get(friend.categoryId);
+		return {
+			friend,
+			category
+		};
 	}
-	async isBuddy(uid) {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/isBuddy", [uid]);
+	async isFriend(uid) {
+		return await this.getFriendInfoByUid(uid, false) !== void 0;
 	}
-	async getBuddyRecommendContact(uin) {
-		return (await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyRecommendContactArkJson", [uin, "-"])).arkMsg;
+	async getFriendRecommendContactArk(uin) {
+		const { ark } = await this.ctx.pmhq.getFriendRecommendContactArk(uin);
+		return ark;
 	}
 	async setBuddyRemark(uid, remark = "") {
 		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/setBuddyRemark", [{
@@ -53201,12 +53163,8 @@ var NTQQFriendApi = class extends Service {
 			resultCb: (payload) => payload.reqId === reqId
 		});
 	}
-	async approvalDoubtBuddyReq(uid) {
-		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/approvalDoubtBuddyReq", [
-			uid,
-			"",
-			""
-		]);
+	async approvalDoubtFriendRequest(requestUid) {
+		return await this.ctx.pmhq.setFilteredFriendRequestReq(selfInfo.uid, requestUid);
 	}
 	async getBuddyReq() {
 		return await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyReq", [], { resultCmd: "nodeIKernelBuddyListener/onBuddyReqChange" });
@@ -54337,7 +54295,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 fs.readFile(filePath);
 			const fileSize = fileBuffer.length;
 			const fileType = await fileTypeFromBuffer(fileBuffer);
 			const timestamp = Math.floor(Date.now() / 1e3);
@@ -54522,7 +54480,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 fs.readFile(filePath);
 				const fileSize = fileBuffer.length;
 				const timestamp = Math.floor(Date.now() / 1e3);
 				const checksum = getMd5HexFromBuffer(fileBuffer);
@@ -54690,6 +54648,9 @@ var NTQQSystemApi = class extends Service {
 	async scanQRCode(path) {
 		return await this.ctx.pmhq.invoke("nodeIKernelNodeMiscService/scanQBar", [path]);
 	}
+	async getPins() {
+		return await this.ctx.pmhq.fetchPins();
+	}
 };
 //#endregion
 //#region node_modules/get-port/index.js
@@ -56014,7 +55975,7 @@ var Config = class extends Service {
 		this.logger.info("配置文件位于", this.configPath);
 		this.config = this.get();
 		if (this.configPath) {
-			fs$1.watchFile(this.configPath, {
+			fs$2.watchFile(this.configPath, {
 				persistent: true,
 				interval: 1e3
 			}, () => {
@@ -56032,7 +55993,7 @@ var Config = class extends Service {
 	}
 	getDefaultConfig() {
 		const _defaultConfig = { ...defaultConfig };
-		const defaultConfigFromFile = fs$1.readFileSync(this.defaultConfigPath, "utf-8");
+		const defaultConfigFromFile = fs$2.readFileSync(this.defaultConfigPath, "utf-8");
 		try {
 			const parsedDefaultConfig = import_dist.default.parse(defaultConfigFromFile);
 			Object.assign(_defaultConfig, parsedDefaultConfig);
@@ -56043,12 +56004,12 @@ var Config = class extends Service {
 	}
 	reloadConfig() {
 		if (!this.configPath) return this.getDefaultConfig();
-		if (!fs$1.existsSync(this.configPath)) {
+		if (!fs$2.existsSync(this.configPath)) {
 			this.config = this.getDefaultConfig();
 			this.set(this.config);
 			return this.config;
 		} else {
-			const data = fs$1.readFileSync(this.configPath, "utf-8");
+			const data = fs$2.readFileSync(this.configPath, "utf-8");
 			let jsonData = defaultConfig;
 			try {
 				jsonData = import_dist.default.parse(data);
@@ -56074,7 +56035,7 @@ var Config = class extends Service {
 	writeConfig(config) {
 		if (!this.configPath) return;
 		this.watch = false;
-		fs$1.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+		fs$2.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
 		setTimeout(() => {
 			this.watch = true;
 		}, 1500);
@@ -56180,13 +56141,13 @@ var WebUITokenUtil = class {
 	}
 	getToken() {
 		if (!this.token) {
-			if (fs$1.existsSync(this.tokenPath)) this.token = fs$1.readFileSync(this.tokenPath, "utf-8").trim();
+			if (fs$2.existsSync(this.tokenPath)) this.token = fs$2.readFileSync(this.tokenPath, "utf-8").trim();
 		}
 		return this.token;
 	}
 	setToken(token) {
 		this.token = token.trim();
-		fs$1.writeFileSync(this.tokenPath, token, "utf-8");
+		fs$2.writeFileSync(this.tokenPath, token, "utf-8");
 	}
 };
 var webuiTokenUtil = new WebUITokenUtil(path.join(DATA_DIR, "webui_token.txt"));
@@ -56408,7 +56369,7 @@ function createDashboardRoutes(ctx) {
 				success: false,
 				message: "服务尚未就绪，请等待登录完成"
 			}, 503);
-			const friends = await ctx.ntFriendApi.getBuddyList();
+			const friends = await ctx.ntFriendApi.getFriendList(false);
 			const groups = await ctx.ntGroupApi.getGroups(false);
 			const qqInfo = await ctx.pmhq.getProcessInfo();
 			const qqMemory = qqInfo?.memory?.rss || 0;
@@ -56425,7 +56386,7 @@ function createDashboardRoutes(ctx) {
 			return c.json({
 				success: true,
 				data: {
-					friendCount: friends.length,
+					friendCount: friends.friends.length,
 					groupCount: groups.length,
 					messageReceived: app.messageReceivedCount,
 					messageSent: app.messageSentCount,
@@ -57191,7 +57152,7 @@ function createNotificationRoutes(ctx) {
 					isDecide: reqItem.isDecide,
 					reqType: reqItem.reqType,
 					addSource: reqItem.addSource || "",
-					flag: `${reqItem.friendUid}|${reqItem.reqTime}`
+					flag: reqItem.friendUid
 				};
 			}));
 			return c.json({
@@ -57242,7 +57203,7 @@ function createNotificationRoutes(ctx) {
 				success: false,
 				message: "缺少必要参数"
 			}, 400);
-			await ctx.ntFriendApi.approvalDoubtBuddyReq(uid);
+			await ctx.ntFriendApi.approvalDoubtFriendRequest(uid);
 			return c.json({ success: true });
 		} catch (e) {
 			ctx.logger.error("处理被过滤好友申请失败:", e);
@@ -57279,12 +57240,7 @@ function createNotificationRoutes(ctx) {
 				success: false,
 				message: "缺少必要参数"
 			}, 400);
-			const [friendUid, reqTime] = flag.split("|");
-			if (!friendUid) return c.json({
-				success: false,
-				message: "无效的 flag 参数"
-			}, 400);
-			await ctx.ntFriendApi.handleFriendRequest(friendUid, reqTime || "0", action === "approve");
+			await ctx.ntFriendApi.approvalFriendRequest(flag, action === "approve");
 			return c.json({ success: true });
 		} catch (e) {
 			ctx.logger.error("处理好友申请失败:", e);
@@ -57483,6 +57439,65 @@ function createEmailRoutes(ctx) {
 	return router;
 }
 //#endregion
+//#region node_modules/@hono/node-server/dist/utils/stream.mjs
+var pr54206Applied = () => {
+	const [major, minor] = versions.node.split(".").map((component) => parseInt(component));
+	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
+};
+var useReadableToWeb = pr54206Applied();
+var createStreamBody = (stream, useNativeReadableToWeb = useReadableToWeb) => {
+	if (useNativeReadableToWeb) return Readable.toWeb(stream);
+	let controller;
+	let settled = false;
+	const cleanup = () => {
+		stream.off("data", onData);
+		stream.off("error", onError);
+		stream.off("end", onTerminate);
+		stream.off("close", onTerminate);
+	};
+	const settle = (callback) => {
+		if (settled) return;
+		settled = true;
+		cleanup();
+		callback?.();
+	};
+	const onData = (chunk) => {
+		if (settled || !controller) return;
+		controller.enqueue(chunk);
+		if ((controller.desiredSize ?? 0) <= 0) stream.pause();
+	};
+	const onError = (error) => {
+		settle(() => {
+			controller?.error(error);
+		});
+	};
+	const onTerminate = () => {
+		settle(() => {
+			controller?.close();
+		});
+	};
+	return new ReadableStream({
+		start(streamController) {
+			controller = streamController;
+			stream.on("data", onData);
+			stream.on("error", onError);
+			stream.on("end", onTerminate);
+			stream.on("close", onTerminate);
+			stream.pause();
+		},
+		pull() {
+			if (!settled) stream.resume();
+		},
+		cancel() {
+			settle();
+			const ignoreError = () => {};
+			stream.on("error", ignoreError);
+			stream.once("close", () => stream.off("error", ignoreError));
+			stream.destroy();
+		}
+	});
+};
+//#endregion
 //#region node_modules/hono/dist/utils/mime.js
 var getMimeType = (filename, mimes = baseMimes) => {
 	const match = filename.match(/\.([a-zA-Z0-9]+?)$/);
@@ -57558,30 +57573,6 @@ var ENCODINGS = {
 	gzip: ".gz"
 };
 var ENCODINGS_ORDERED_KEYS = Object.keys(ENCODINGS);
-var pr54206Applied = () => {
-	const [major, minor] = versions.node.split(".").map((component) => parseInt(component));
-	return major >= 23 || major === 22 && minor >= 7 || major === 20 && minor >= 18;
-};
-var useReadableToWeb = pr54206Applied();
-var createStreamBody = (stream) => {
-	if (useReadableToWeb) return Readable.toWeb(stream);
-	return new ReadableStream({
-		start(controller) {
-			stream.on("data", (chunk) => {
-				controller.enqueue(chunk);
-			});
-			stream.on("error", (err) => {
-				controller.error(err);
-			});
-			stream.on("end", () => {
-				controller.close();
-			});
-		},
-		cancel() {
-			stream.destroy();
-		}
-	});
-};
 var getStats = (path) => {
 	let stats;
 	try {
@@ -57648,6 +57639,7 @@ var serveStatic = (options = { root: "" }) => {
 		let result;
 		const size = stats.size;
 		const range = c.req.header("range") || "";
+		c.header("Last-Modified", stats.mtime.toUTCString());
 		if (c.req.method == "HEAD" || c.req.method == "OPTIONS") {
 			c.header("Content-Length", size.toString());
 			c.status(200);
@@ -57657,7 +57649,6 @@ var serveStatic = (options = { root: "" }) => {
 			result = c.body(createStreamBody(createReadStream(path)), 200);
 		} else {
 			c.header("Accept-Ranges", "bytes");
-			c.header("Date", stats.birthtime.toUTCString());
 			const parts = range.replace(/bytes=/, "").split("-", 2);
 			const start = parseInt(parts[0], 10) || 0;
 			let end = parseInt(parts[1], 10) || size - 1;
@@ -57836,7 +57827,7 @@ var WebuiServer = class extends Service {
 						isDecide: req.isDecide,
 						reqType: req.reqType,
 						addSource: req.addSource || "",
-						flag: `${req.friendUid}|${req.reqTime}`
+						flag: req.friendUid
 					}
 				});
 			} catch (e) {
@@ -58461,7 +58452,7 @@ var require_fetch = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_shared = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var urllib$2 = __require("url");
 	var util$1 = __require("util");
-	var fs$4 = __require("fs");
+	var fs$5 = __require("fs");
 	var nmfetch = require_fetch();
 	var dns$1 = __require("dns");
 	var net$4 = __require("net");
@@ -58797,7 +58788,7 @@ var require_shared = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				const parsedDataUri = module.exports.parseDataURI(content.path || content.href);
 				if (!parsedDataUri || !parsedDataUri.data) return callback(null, Buffer.from(0));
 				return callback(null, parsedDataUri.data);
-			} else if (content.path) return resolveStream(fs$4.createReadStream(content.path), callback);
+			} else if (content.path) return resolveStream(fs$5.createReadStream(content.path), callback);
 		}
 		if (typeof data[key].content === "string" && ![
 			"utf8",
@@ -62737,7 +62728,7 @@ var require_le_unix = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region node_modules/nodemailer/lib/mime-node/index.js
 var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var crypto$8 = __require("crypto");
-	var fs$3 = __require("fs");
+	var fs$4 = __require("fs");
 	var punycode = require_punycode();
 	var { PassThrough: PassThrough$2 } = __require("stream");
 	var shared = require_shared();
@@ -63446,7 +63437,7 @@ var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					});
 					return contentStream;
 				}
-				return fs$3.createReadStream(content.path);
+				return fs$4.createReadStream(content.path);
 			}
 			if (content && typeof content.href === "string") {
 				if (this.disableUrlAccess) {
@@ -64285,7 +64276,7 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var RelaxedBody = require_relaxed_body();
 	var sign = require_sign();
 	var { PassThrough: PassThrough$1 } = __require("stream");
-	var fs$2 = __require("fs");
+	var fs$3 = __require("fs");
 	var path$2 = __require("path");
 	var crypto$5 = __require("crypto");
 	var DKIM_ALGO = "sha256";
@@ -64318,10 +64309,10 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		cleanup() {
 			if (!this.cache || !this.cachePath) return;
-			fs$2.unlink(this.cachePath, () => false);
+			fs$3.unlink(this.cachePath, () => false);
 		}
 		createReadCache() {
-			this.cache = fs$2.createReadStream(this.cachePath);
+			this.cache = fs$3.createReadStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.output.emit("error", err);
@@ -64367,7 +64358,7 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		createWriteCache() {
 			this.output.usingCache = true;
-			this.cache = fs$2.createWriteStream(this.cachePath);
+			this.cache = fs$3.createWriteStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.relaxedBody.unpipe(this.cache);
@@ -69648,6 +69639,71 @@ function FriendMixin(Base) {
 				url: `https://${download.downloadDns}/ftn_handler/${download.downloadUrl.toString("hex")}/?fname=${encodeURIComponent(fileName)}`
 			};
 		}
+		async setFriendRequest(targetUid, accept) {
+			const body = Oidb.SetFriendRequestReq.encode({
+				targetUid,
+				accept
+			});
+			const data = Oidb.Base.encode({
+				command: 2909,
+				subCommand: 44,
+				body
+			});
+			await this.httpSendPB("OidbSvcTrpcTcp.0xb5d_44", data);
+		}
+		async setFilteredFriendRequestReq(selfUid, requestUid) {
+			const body = Oidb.SetFilteredFriendRequestReq.encode({
+				selfUid,
+				requestUid
+			});
+			const data = Oidb.Base.encode({
+				command: 3442,
+				subCommand: 0,
+				body
+			});
+			await this.httpSendPB("OidbSvcTrpcTcp.0xd72_0", data);
+		}
+		async fetchFriends() {
+			const body = Oidb.IncPullReq.encode({
+				reqCount: 500,
+				flag: 1,
+				requestBiz: [{
+					bizType: 1,
+					bizData: { extBusi: [
+						102,
+						103,
+						20002,
+						20009,
+						20031,
+						20037,
+						27394
+					] }
+				}]
+			});
+			const data = Oidb.Base.encode({
+				command: 4052,
+				subCommand: 1,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0xfd4_1", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.IncPullResp.decode(oidbRespBody);
+		}
+		async getFriendRecommendContactArk(uin) {
+			const body = Oidb.GetFriendRecommendContactArkReq.encode({
+				uin,
+				phoneNumber: "-",
+				jumpUrl: `mqqapi://card/show_pslcard?src_type=internal&source=sharecard&version=1&uin=${uin}`
+			});
+			const data = Oidb.Base.encode({
+				command: 4790,
+				subCommand: 0,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x12b6_0", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.GetFriendRecommendContactArkResp.decode(oidbRespBody);
+		}
 	};
 }
 //#endregion
@@ -69859,7 +69915,7 @@ var NTV2RichMedia;
 			network: convertIPv4(subFileInfo.ipv4s),
 			msgInfoBody: upload.msgInfo.msgInfoBody,
 			blockSize,
-			hash: { fileSha1: [] }
+			hash: { fileSha1: [Buffer.alloc(0)] }
 		};
 		else return {
 			fileUuid: index.fileUuid,
@@ -69867,7 +69923,7 @@ var NTV2RichMedia;
 			network: convertIPv4(upload.ipv4s),
 			msgInfoBody: upload.msgInfo.msgInfoBody,
 			blockSize,
-			hash: { fileSha1: [] }
+			hash: { fileSha1: [Buffer.alloc(0)] }
 		};
 	}
 	_NTV2RichMedia.generateExt = generateExt;
@@ -69987,8 +70043,7 @@ function MediaMixin(Base) {
 			});
 			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x126d_200", data);
 			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
-			const { download } = Media.NTV2RichMediaResp.decode(oidbRespBody);
-			return `https://${download?.info?.domain}${download?.info?.urlPath}${download?.rKeyParam}`;
+			return Media.NTV2RichMediaResp.decode(oidbRespBody);
 		}
 		async getGroupPttUrl(fileUuid) {
 			const body = Media.NTV2RichMediaReq.encode({
@@ -70021,8 +70076,7 @@ function MediaMixin(Base) {
 			});
 			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x126e_200", data);
 			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
-			const { download } = Media.NTV2RichMediaResp.decode(oidbRespBody);
-			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+			return Media.NTV2RichMediaResp.decode(oidbRespBody);
 		}
 		async getGroupVideoUrl(fileUuid) {
 			const body = Media.NTV2RichMediaReq.encode({
@@ -70055,8 +70109,7 @@ function MediaMixin(Base) {
 			});
 			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x11ea_200", data);
 			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
-			const { download } = Media.NTV2RichMediaResp.decode(oidbRespBody);
-			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+			return Media.NTV2RichMediaResp.decode(oidbRespBody);
 		}
 		async getPrivateVideoUrl(fileUuid) {
 			const body = Media.NTV2RichMediaReq.encode({
@@ -70092,8 +70145,7 @@ function MediaMixin(Base) {
 			});
 			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x11e9_200", data);
 			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
-			const { download } = Media.NTV2RichMediaResp.decode(oidbRespBody);
-			return `https://${download.info.domain}${download.info.urlPath}${download.rKeyParam}`;
+			return Media.NTV2RichMediaResp.decode(oidbRespBody);
 		}
 		async getHighwaySession() {
 			const data = Media.HighwaySessionReq.encode({ reqBody: {
@@ -70277,6 +70329,152 @@ function MediaMixin(Base) {
 				sha3CheckSum
 			};
 		}
+		async getGroupImageUploadInfo(groupCode, filePath) {
+			const peer = {
+				chatType: ChatType.Group,
+				peerUid: groupCode,
+				guildId: ""
+			};
+			const body = await NTV2RichMedia.buildUploadReq(peer, {
+				type: "image",
+				filePath
+			}, { pic: {
+				summary: "[图片]",
+				bytesPbReserveC2c: Buffer.from([
+					8,
+					0,
+					24,
+					0,
+					32,
+					0,
+					74,
+					0,
+					80,
+					0,
+					98,
+					0,
+					146,
+					1,
+					0,
+					154,
+					1,
+					0,
+					170,
+					1,
+					12,
+					8,
+					0,
+					18,
+					0,
+					24,
+					0,
+					32,
+					0,
+					40,
+					0,
+					58,
+					0
+				])
+			} });
+			const data = Oidb.Base.encode({
+				command: 4548,
+				subCommand: 100,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x11c4_100", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			const { upload } = Media.NTV2RichMediaResp.decode(oidbRespBody);
+			return {
+				info: upload.msgInfo,
+				compat: upload.compatQMsg,
+				ext: NTV2RichMedia.generateExt(upload)
+			};
+		}
+		async getC2CImageUploadInfo(peerUid, filePath) {
+			const peer = {
+				chatType: ChatType.C2C,
+				peerUid,
+				guildId: ""
+			};
+			const body = await NTV2RichMedia.buildUploadReq(peer, {
+				type: "image",
+				filePath
+			}, { pic: {
+				summary: "[图片]",
+				bytesPbReserveC2c: Buffer.from([
+					8,
+					0,
+					24,
+					0,
+					32,
+					0,
+					74,
+					0,
+					80,
+					0,
+					98,
+					0,
+					146,
+					1,
+					0,
+					154,
+					1,
+					0,
+					170,
+					1,
+					12,
+					8,
+					0,
+					18,
+					0,
+					24,
+					0,
+					32,
+					0,
+					40,
+					0,
+					58,
+					0
+				])
+			} });
+			const data = Oidb.Base.encode({
+				command: 4549,
+				subCommand: 100,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x11c5_100", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			const { upload } = Media.NTV2RichMediaResp.decode(oidbRespBody);
+			return {
+				info: upload.msgInfo,
+				compat: upload.compatQMsg,
+				ext: NTV2RichMedia.generateExt(upload)
+			};
+		}
+		async imageOcr(imageUrl) {
+			const body = Oidb.ImageOcrReq.encode({
+				version: 1,
+				client: 0,
+				entrance: 1,
+				ocrReqBody: {
+					imageUrl,
+					originMd5: "",
+					afterCompressMd5: "",
+					afterCompressFileSize: "",
+					afterCompressWeight: "",
+					afterCompressHeight: "",
+					isCut: false
+				}
+			});
+			const data = Oidb.Base.encode({
+				command: 3591,
+				subCommand: 0,
+				body
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0xe07_0", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.ImageOcrResp.decode(oidbRespBody);
+		}
 	};
 }
 //#endregion
@@ -70441,6 +70639,22 @@ function UserMixin(Base) {
 	};
 }
 //#endregion
+//#region src/main/pmhq/mixins/system.ts
+function SystemMixin(Base) {
+	return class extends Base {
+		async fetchPins() {
+			const data = Oidb.Base.encode({
+				command: 4787,
+				subCommand: 0,
+				body: Buffer.alloc(0)
+			});
+			const res = await this.httpSendPB("OidbSvcTrpcTcp.0x12b3_0", data);
+			const oidbRespBody = Oidb.Base.decode(Buffer.from(res.pb, "hex")).body;
+			return Oidb.FetchPinsResp.decode(oidbRespBody);
+		}
+	};
+}
+//#endregion
 //#region src/main/pmhq/index.ts
 function applyMixins(Base, mixins) {
 	return mixins.reduce((acc, mixin) => mixin(acc), Base);
@@ -70450,7 +70664,8 @@ var PMHQ = applyMixins(PMHQBase, [
 	FriendMixin,
 	MediaMixin,
 	MessageMixin,
-	UserMixin
+	UserMixin,
+	SystemMixin
 ]);
 //#endregion
 //#region node_modules/@cordisjs/plugin-timer/lib/index.js
@@ -70599,7 +70814,6 @@ async function onLoad() {
 	ctx.plugin(Config);
 	ctx.plugin(PMHQ);
 	ctx.plugin(NTQQFileApi);
-	ctx.plugin(NTQQFileCacheApi);
 	ctx.plugin(NTQQFriendApi);
 	ctx.plugin(NTQQGroupApi);
 	ctx.plugin(NTLoginApi);