llonebot-dist 7.12.3 → 7.12.5

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 fs, { access, 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 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 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";
@@ -15,12 +15,13 @@ import { WebSocket as WebSocket$1, WebSocketServer } from "ws";
 import { constants } from "node:buffer";
 import crypto$1, { createHash, randomBytes, randomInt, randomUUID } from "node:crypto";
 import * as fileType from "file-type";
+import { fileTypeFromBuffer } from "file-type";
 import { decode, encode, getDuration, getWavFileInfo, isSilk, isWav } from "silk-wasm";
 import http, { STATUS_CODES, createServer, request } from "node:http";
 import { Http2ServerRequest, constants as constants$1 } from "node:http2";
 import { Readable, Transform } from "node:stream";
 import { deflateSync, gunzipSync, gzipSync, inflateSync } from "node:zlib";
-import fsPromise, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
+import fsPromise$1, { stat as stat$2, unlink as unlink$1 } from "fs/promises";
 import { inspect, isDeepStrictEqual } from "node:util";
 import net, { connect } from "node:net";
 import https from "node:https";
@@ -3972,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$11 = __require("fs");
+	var fs$10 = __require("fs");
 	var PNG = require_png$1().PNG;
 	var Utils = require_utils$1();
 	exports.render = function render(qrData, options) {
@@ -4024,7 +4025,7 @@ var require_png = /* @__PURE__ */ __commonJSMin(((exports) => {
 			called = true;
 			cb.apply(null, args);
 		};
-		const stream = fs$11.createWriteStream(path);
+		const stream = fs$10.createWriteStream(path);
 		stream.on("error", done);
 		stream.on("close", done);
 		exports.renderToFileStream(stream, qrData, options);
@@ -6462,7 +6463,8 @@ var FaceIndex = /* @__PURE__ */ function(FaceIndex) {
 	return FaceIndex;
 }({});
 var FaceType = /* @__PURE__ */ function(FaceType) {
-	FaceType[FaceType["Normal"] = 1] = "Normal";
+	FaceType[FaceType["Old"] = 1] = "Old";
+	FaceType[FaceType["Normal"] = 2] = "Normal";
 	FaceType[FaceType["Super"] = 3] = "Super";
 	FaceType[FaceType["Poke"] = 5] = "Poke";
 	return FaceType;
@@ -6622,7 +6624,7 @@ async function logSummaryMessage(ctx, message) {
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$10 = __require("fs");
+	var fs$9 = __require("fs");
 	function checkPathExt(path, options) {
 		var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
 		if (!pathext) return true;
@@ -6639,12 +6641,12 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		return checkPathExt(path, options);
 	}
 	function isexe(path, options, cb) {
-		fs$10.stat(path, function(er, stat) {
+		fs$9.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, path, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$10.statSync(path), path, options);
+		return checkStat(fs$9.statSync(path), path, options);
 	}
 }));
 //#endregion
@@ -6652,14 +6654,14 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 var require_mode = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = isexe;
 	isexe.sync = sync;
-	var fs$9 = __require("fs");
+	var fs$8 = __require("fs");
 	function isexe(path, options, cb) {
-		fs$9.stat(path, function(er, stat) {
+		fs$8.stat(path, function(er, stat) {
 			cb(er, er ? false : checkStat(stat, options));
 		});
 	}
 	function sync(path, options) {
-		return checkStat(fs$9.statSync(path), options);
+		return checkStat(fs$8.statSync(path), options);
 	}
 	function checkStat(stat, options) {
 		return stat.isFile() && checkMode(stat, options);
@@ -9151,7 +9153,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$8 = __require("fs");
+	var fs$7 = __require("fs");
 	var path$7 = __require("path");
 	var async = require_async();
 	var utils = require_utils();
@@ -9227,7 +9229,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$8.exists(process.env.FFMPEG_PATH, function(exists) {
+				if (process.env.FFMPEG_PATH) fs$7.exists(process.env.FFMPEG_PATH, function(exists) {
 					if (exists) cb(null, process.env.FFMPEG_PATH);
 					else cb(null, "");
 				});
@@ -9258,7 +9260,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$8.exists(process.env.FFPROBE_PATH, function(exists) {
+					if (process.env.FFPROBE_PATH) fs$7.exists(process.env.FFPROBE_PATH, function(exists) {
 						cb(null, exists ? process.env.FFPROBE_PATH : "");
 					});
 					else cb(null, "");
@@ -9276,7 +9278,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$8.exists(ffprobe, function(exists) {
+							fs$7.exists(ffprobe, function(exists) {
 								cb(null, exists ? ffprobe : "");
 							});
 						} else cb(null, "");
@@ -9301,14 +9303,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$8.exists(process.env.FLVMETA_PATH, function(exists) {
+					if (process.env.FLVMETA_PATH) fs$7.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$8.exists(process.env.FLVTOOL2_PATH, function(exists) {
+					if (process.env.FLVTOOL2_PATH) fs$7.exists(process.env.FLVTOOL2_PATH, function(exists) {
 						cb(null, exists ? process.env.FLVTOOL2_PATH : "");
 					});
 					else cb(null, "");
@@ -9813,7 +9815,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$7 = __require("fs");
+	var fs$6 = __require("fs");
 	var path$6 = __require("path");
 	var PassThrough$4 = __require("stream").PassThrough;
 	var async = require_async();
@@ -10019,8 +10021,8 @@ var require_recipes = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					next(null, filenames);
 				},
 				function createDirectory(filenames, next) {
-					fs$7.exists(config.folder, function(exists) {
-						if (!exists) fs$7.mkdir(config.folder, function(err) {
+					fs$6.exists(config.folder, function(exists) {
+						if (!exists) fs$6.mkdir(config.folder, function(err) {
 							if (err) next(err);
 							else next(null, filenames);
 						});
@@ -10268,7 +10270,7 @@ function setFFMpegPath(ffmpegPath) {
 		path.join(import.meta.dirname, "ffmpeg.exe"),
 		process.env["FFMPEG_PATH"] || ""
 	];
-	for (const p of paths) if (fs$2.existsSync(p)) {
+	for (const p of paths) if (fs$1.existsSync(p)) {
 		import_fluent_ffmpeg.default.setFfmpegPath(p);
 		console.log("set ffmpeg successfully", p);
 		break;
@@ -11235,10 +11237,11 @@ var OB11Entities;
 	async function recallEvent(ctx, msg, shortId) {
 		const revokeElement = msg.elements[0].grayTipElement.revokeElement;
 		if (msg.chatType === ChatType.Group) {
-			const operator = await ctx.ntGroupApi.getGroupMember(msg.peerUid, revokeElement.operatorUid);
-			let uin = msg.senderUin;
-			if (uin === "0" || !uin) uin = await ctx.ntUserApi.getUinByUid(revokeElement.origMsgSenderUid);
-			return new OB11GroupRecallNoticeEvent(Number(msg.peerUid), Number(uin), Number(operator.uin || msg.senderUin), shortId);
+			let operatorUin;
+			if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) operatorUin = msg.senderUin;
+			else operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid);
+			if (msg.senderUin === "0" || !msg.senderUin) ctx.logger.warn(`发生异常 senderUin: ${msg.senderUin}`);
+			return new OB11GroupRecallNoticeEvent(Number(msg.peerUid), Number(msg.senderUin), Number(operatorUin), shortId);
 		} else return new OB11FriendRecallNoticeEvent(+msg.senderUin, shortId);
 	}
 	_OB11Entities.recallEvent = recallEvent;
@@ -11382,7 +11385,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.3";
+var version$2 = "7.12.5";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -12126,7 +12129,7 @@ var OB11WebSocket = class {
 			if (emitEvent && socket.readyState === WebSocket$1.OPEN) {
 				socket.send(JSON.stringify(event));
 				const eventName = event.getSummaryEventName();
-				this.ctx.logger.info("WebSocket 事件上报", socket.url ?? "", eventName);
+				this.ctx.logger.info("WebSocket 事件上报", eventName);
 			}
 		});
 	}
@@ -12150,7 +12153,7 @@ var OB11WebSocket = class {
 	reply(socket, data) {
 		if (socket.readyState !== WebSocket$1.OPEN) return;
 		socket.send(JSON.stringify(data));
-		if ("post_type" in data) this.ctx.logger.info("WebSocket 事件上报", socket.url ?? "", data.post_type);
+		if ("post_type" in data) this.ctx.logger.info("WebSocket 事件上报", data.post_type);
 	}
 	authorize(socket, req) {
 		const url = req.url?.split("?").shift();
@@ -17042,7 +17045,7 @@ var processQueue = async () => {
 	const promises = queue.splice(0, concurrency).map(async ({ filePath, resolve, reject }) => {
 		let handle;
 		try {
-			handle = await fs$6.promises.open(path$4.resolve(filePath), "r");
+			handle = await fs$5.promises.open(path$4.resolve(filePath), "r");
 		} catch (err) {
 			return reject(err);
 		}
@@ -17089,7 +17092,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$2.existsSync(uri)) return { type: FileUriType.Path };
+	if (fs$1.existsSync(uri)) return { type: FileUriType.Path };
 	return { type: FileUriType.Unknown };
 }
 async function fetchFile(url, headersInit) {
@@ -17119,7 +17122,7 @@ async function uri2local(ctx, uri, needExt) {
 	const { type } = checkUriType(uri);
 	if (type === FileUriType.FileURL) {
 		const filePath = fileURLToPath(uri);
-		if (!fs$2.existsSync(filePath)) return {
+		if (!fs$1.existsSync(filePath)) return {
 			success: false,
 			errMsg: "路径不存在",
 			fileName: "",
@@ -17145,12 +17148,12 @@ async function uri2local(ctx, uri, needExt) {
 		const res = await fetchFile(uri);
 		let fileName = randomUUID();
 		let filePath = path.join(TEMP_DIR, fileName);
-		await fs.writeFile(filePath, res.data);
+		await fsPromise.writeFile(filePath, res.data);
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			fileName += `.${ext}`;
 			const newPath = `${filePath}.${ext}`;
-			await fs.rename(filePath, newPath);
+			await fsPromise.rename(filePath, newPath);
 			filePath = newPath;
 		}
 		return {
@@ -17173,11 +17176,11 @@ async function uri2local(ctx, uri, needExt) {
 		let filename = randomUUID();
 		let filePath = path.join(TEMP_DIR, filename);
 		const base64 = uri.replace(/^base64:\/\//, "");
-		await fs.writeFile(filePath, base64, "base64");
+		await fsPromise.writeFile(filePath, base64, "base64");
 		if (needExt) {
 			const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 			filename += `.${ext}`;
-			await fs.rename(filePath, `${filePath}.${ext}`);
+			await fsPromise.rename(filePath, `${filePath}.${ext}`);
 			filePath = `${filePath}.${ext}`;
 		}
 		return {
@@ -17194,11 +17197,11 @@ async function uri2local(ctx, uri, needExt) {
 			let filename = randomUUID();
 			const [, _type, base64] = capture;
 			let filePath = path.join(TEMP_DIR, filename);
-			await fs.writeFile(filePath, base64, "base64");
+			await fsPromise.writeFile(filePath, base64, "base64");
 			if (needExt) {
 				const ext = (await ctx.ntFileApi.getFileType(filePath)).ext;
 				filename += `.${ext}`;
-				await fs.rename(filePath, `${filePath}.${ext}`);
+				await fsPromise.rename(filePath, `${filePath}.${ext}`);
 				filePath = `${filePath}.${ext}`;
 			}
 			return {
@@ -17254,15 +17257,21 @@ async function getFileType(filePath) {
 async function getImageSize(path) {
 	return await imageSizeFromFile(path);
 }
+function getMd5HexFromBuffer(buf) {
+	return createHash("md5").update(buf).digest("hex");
+}
+function getSha1HexFromBuffer(buf) {
+	return createHash("sha1").update(buf).digest("hex");
+}
 async function getMd5HexFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.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$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest("hex");
 }
@@ -17271,13 +17280,13 @@ function getMd5BufferFromBuffer(buf) {
 }
 async function getMd5BufferFromFile(filePath) {
 	const hash = createHash("md5");
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.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$2.createReadStream(filePath);
+	const stream = fs$1.createReadStream(filePath);
 	for await (const chunk of stream) hash.update(chunk);
 	return hash.digest();
 }
@@ -17513,7 +17522,7 @@ async function calculateSha1StreamBytes(filePath) {
 	let bytesRead = 0;
 	let nextBlockBoundary = blockSize;
 	const byteArrayList = [];
-	const readable = fs$2.createReadStream(filePath);
+	const readable = fs$1.createReadStream(filePath);
 	for await (const chunk of readable) {
 		let buf;
 		if (tail.length > 0) {
@@ -17538,7 +17547,7 @@ async function calculateSha1StreamBytes(filePath) {
 }
 async function readAndHash10M(filePath) {
 	const maxSize = 10002432;
-	const fd = await fs.open(filePath, "r");
+	const fd = await fsPromise.open(filePath, "r");
 	const buffer = Buffer.allocUnsafe(maxSize);
 	const { bytesRead } = await fd.read(buffer, 0, maxSize, 0);
 	await fd.close();
@@ -17580,13 +17589,13 @@ var TriSha1 = class {
 };
 async function calculateTriSha1(filePath, fileSize) {
 	const hash = new TriSha1(fileSize);
-	const stream = fs$2.createReadStream(filePath);
+	const stream = fs$1.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$2.statSync(filePath).size;
+	const size = fs$1.statSync(filePath).size;
 	return new Promise((resolve, reject) => {
 		(0, import_fluent_ffmpeg.default)(filePath).ffprobe((err, metadata) => {
 			if (err) reject(err);
@@ -17663,7 +17672,7 @@ function convert(ctx, input, options, outputPath) {
 	});
 }
 async function encodeSilk(ctx, filePath) {
-	const file = await fs.readFile(filePath);
+	const file = await fsPromise.readFile(filePath);
 	if (!isSilk(file)) {
 		ctx.logger.info(`语音文件${filePath}需要转换成silk`);
 		let result;
@@ -17682,7 +17691,7 @@ async function encodeSilk(ctx, filePath) {
 			"-f s16le"
 		] }), 24e3);
 		const pttPath = path.join(TEMP_DIR, randomUUID());
-		await fs.writeFile(pttPath, result.data);
+		await fsPromise.writeFile(pttPath, result.data);
 		ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration);
 		return {
 			converted: true,
@@ -17705,11 +17714,11 @@ async function encodeSilk(ctx, filePath) {
 	}
 }
 async function decodeSilk(ctx, inputFilePath, outFormat) {
-	const { data } = await decode(await fs.readFile(inputFilePath), 24e3);
+	const { data } = await decode(await fsPromise.readFile(inputFilePath), 24e3);
 	const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath));
 	const outFilePath = tmpPath + `.${outFormat}`;
 	const pcmFilePath = tmpPath + ".pcm";
-	await fs.writeFile(pcmFilePath, data);
+	await fsPromise.writeFile(pcmFilePath, data);
 	return convert(ctx, pcmFilePath, { input: [
 		"-f s16le",
 		"-ar 24000",
@@ -21200,7 +21209,7 @@ var getRequestListener = (fetchCallback, options = {}) => {
 /**
 * @link https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
 */
-var CloseEvent$1 = globalThis.CloseEvent ?? class extends Event {
+var CloseEvent = globalThis.CloseEvent ?? class extends Event {
 	#eventInitDict;
 	constructor(type, eventInitDict = {}) {
 		super(type, eventInitDict);
@@ -21216,8 +21225,8 @@ var CloseEvent$1 = globalThis.CloseEvent ?? class extends Event {
 		return this.#eventInitDict.reason ?? "";
 	}
 };
-var generateConnectionSymbol$1 = () => Symbol("connection");
-var CONNECTION_SYMBOL_KEY$1 = Symbol("CONNECTION_SYMBOL_KEY");
+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
@@ -21271,7 +21280,7 @@ var setupWebSocket = (options) => {
 			return;
 		}
 		const waiter = waiterMap.get(request);
-		if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY$1]) {
+		if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
 			waiterMap.delete(request);
 			if (server.listenerCount("upgrade") === 1) rejectUpgradeRequest(socket, status);
 			return;
@@ -21284,13 +21293,13 @@ var setupWebSocket = (options) => {
 		wss.close();
 	});
 };
-defineWebSocketHelper(async (c, events, options) => {
+var upgradeWebSocket = defineWebSocketHelper(async (c, events, options) => {
 	if (c.req.header("upgrade")?.toLowerCase() !== "websocket") return;
 	const env = c.env;
 	const waitForWebSocket = env[WAIT_FOR_WEBSOCKET_SYMBOL];
 	if (!waitForWebSocket || !env.incoming) return new Response(null, { status: 500 });
-	const connectionSymbol = generateConnectionSymbol$1();
-	env[CONNECTION_SYMBOL_KEY$1] = connectionSymbol;
+	const connectionSymbol = generateConnectionSymbol();
+	env[CONNECTION_SYMBOL_KEY] = connectionSymbol;
 	(async () => {
 		const ws = await waitForWebSocket(env.incoming, connectionSymbol);
 		const messagesReceivedInStarting = [];
@@ -21333,7 +21342,7 @@ defineWebSocketHelper(async (c, events, options) => {
 		});
 		ws.on("close", (code, reason) => {
 			try {
-				events?.onClose?.(new CloseEvent$1("close", {
+				events?.onClose?.(new CloseEvent("close", {
 					code,
 					reason: reason.toString()
 				}), ctx);
@@ -22281,18 +22290,18 @@ var ScalarDeserializerCompiler = {
 	sfixed32: (key, spec) => spec.repeated ? (draft, reader, wireType) => {
 		if (wireType === WireType$2.LengthDelimited) {
 			const count = reader.readVarint() / Fixed32Size;
-			for (let i = 0; i < count; i++) draft[key].push(Converter.zigzagDecode32(reader.readFixed32()));
-		} else draft[key].push(Converter.zigzagDecode32(reader.readFixed32()));
+			for (let i = 0; i < count; i++) draft[key].push(Converter.toSigned32(reader.readFixed32()));
+		} else draft[key].push(Converter.toSigned32(reader.readFixed32()));
 	} : (draft, reader) => {
-		draft[key] = Converter.zigzagDecode32(reader.readFixed32());
+		draft[key] = Converter.toSigned32(reader.readFixed32());
 	},
 	sfixed64: (key, spec) => spec.repeated ? (draft, reader, wireType) => {
 		if (wireType === WireType$2.LengthDelimited) {
 			const count = reader.readVarint() / Fixed64Size;
-			for (let i = 0; i < count; i++) draft[key].push(Converter.zigzagDecode64(reader.readFixed64()));
-		} else draft[key].push(Converter.zigzagDecode64(reader.readFixed64()));
+			for (let i = 0; i < count; i++) draft[key].push(Converter.toSigned64(reader.readFixed64()));
+		} else draft[key].push(Converter.toSigned64(reader.readFixed64()));
 	} : (draft, reader) => {
-		draft[key] = Converter.zigzagDecode64(reader.readFixed64());
+		draft[key] = Converter.toSigned64(reader.readFixed64());
 	},
 	sint32: (key, spec) => spec.repeated ? (draft, reader, wireType) => {
 		if (wireType === WireType$2.LengthDelimited) {
@@ -22471,29 +22480,29 @@ var ScalarSerializerCompiler = {
 		const length = data.length * Fixed32Size;
 		writer.writeVarint(spec[kTag]);
 		writer.writeVarint(length);
-		for (const value of data) writer.writeFixed32(Converter.zigzagEncode32(value));
+		for (const value of data) writer.writeFixed32(Converter.toUnsigned32(value));
 	}) : defineSerializer((data, writer) => {
 		for (const value of data) {
 			writer.writeVarint(spec[kTag]);
-			writer.writeFixed32(Converter.zigzagEncode32(value));
+			writer.writeFixed32(Converter.toUnsigned32(value));
 		}
 	}) : defineSerializer((data, writer) => {
 		writer.writeVarint(spec[kTag]);
-		writer.writeFixed32(Converter.zigzagEncode32(data));
+		writer.writeFixed32(Converter.toUnsigned32(data));
 	}),
 	sfixed64: (spec) => spec.repeated ? spec.packed ? defineSerializer((data, writer) => {
 		const length = data.length * Fixed64Size;
 		writer.writeVarint(spec[kTag]);
 		writer.writeVarint(length);
-		for (const value of data) writer.writeFixed64(Converter.zigzagEncode64(value));
+		for (const value of data) writer.writeFixed64(Converter.toUnsigned64(value));
 	}) : defineSerializer((data, writer) => {
 		for (const value of data) {
 			writer.writeVarint(spec[kTag]);
-			writer.writeFixed64(Converter.zigzagEncode64(value));
+			writer.writeFixed64(Converter.toUnsigned64(value));
 		}
 	}) : defineSerializer((data, writer) => {
 		writer.writeVarint(spec[kTag]);
-		writer.writeFixed64(Converter.zigzagEncode64(data));
+		writer.writeFixed64(Converter.toUnsigned64(data));
 	}),
 	sint32: (spec) => spec.repeated ? spec.packed ? defineSerializer((data, writer) => {
 		const length = data.length * Fixed32Size;
@@ -22524,23 +22533,6 @@ var ScalarSerializerCompiler = {
 		writer.writeBigVarint(Converter.zigzagEncode64(data));
 	})
 };
-var ScalarTypeDefaultValue = {
-	double: 0,
-	float: 0,
-	int64: BigInt(0),
-	uint64: BigInt(0),
-	int32: 0,
-	fixed64: BigInt(0),
-	fixed32: 0,
-	bool: false,
-	string: "",
-	bytes: Buffer.alloc(0),
-	uint32: 0,
-	sfixed32: 0,
-	sfixed64: BigInt(0),
-	sint32: 0,
-	sint64: BigInt(0)
-};
 var VARINT32_BYTE_2 = 128;
 var VARINT32_BYTE_3 = 16384;
 var VARINT32_BYTE_4 = 2097152;
@@ -22671,6 +22663,23 @@ var ScalarSizeCalculatorCompiler = {
 		return spec[kTagLength] + SizeOf.varint32(bodySize) + bodySize;
 	} : (data) => sumVarint64Array(data, Converter.zigzagEncode64) + spec[kTagLength] * data.length : (data) => spec[kTagLength] + SizeOf.varint64(Converter.zigzagEncode64(data))
 };
+var ScalarTypeDefaultValue = {
+	double: 0,
+	float: 0,
+	int64: BigInt(0),
+	uint64: BigInt(0),
+	int32: 0,
+	fixed64: BigInt(0),
+	fixed32: 0,
+	bool: false,
+	string: "",
+	bytes: Buffer.alloc(0),
+	uint32: 0,
+	sfixed32: 0,
+	sfixed64: BigInt(0),
+	sint32: 0,
+	sint64: BigInt(0)
+};
 function isMapFieldType(type) {
 	return Array.isArray(type);
 }
@@ -22910,10 +22919,10 @@ var ProtoMessage = class ProtoMessage {
 		return draft;
 	}
 	static of(model) {
-		let message = this.compiledMessages.get(model);
+		let message = ProtoMessage.compiledMessages.get(model);
 		if (message === void 0) {
 			message = new ProtoMessage(model);
-			this.compiledMessages.set(model, message);
+			ProtoMessage.compiledMessages.set(model, message);
 		}
 		return message;
 	}
@@ -23855,7 +23864,8 @@ var MessageEncoder$1 = class MessageEncoder$1 {
 		"node",
 		"video",
 		"file",
-		"at"
+		"at",
+		"reply"
 	];
 	results;
 	children;
@@ -24162,6 +24172,28 @@ var MessageEncoder$1 = class MessageEncoder$1 {
 			}
 			this.children.push({ text: { str } });
 			this.preview += str;
+		} else if (type === OB11MessageDataType.Reply) {
+			const msgInfo = await this.ctx.store.getMsgInfoByShortId(+data.id);
+			if (!msgInfo) throw new Error(`消息 ${data.id} 不存在`);
+			const res = await this.ctx.ntMsgApi.getMsgsByMsgId(msgInfo.peer, [msgInfo.msgId]);
+			if (res.msgList.length === 0) throw new Error(`无法获取消息 ${data.id} 的内容`);
+			const msg = res.msgList[0];
+			const elems = [];
+			for (const element of msg.elements) if (element.elementType === ElementType.Text) elems.push({ text: { str: element.textElement.content } });
+			else if (element.elementType === ElementType.Pic) elems.push({ text: { str: element.picElement.summary } });
+			else if (element.elementType === ElementType.Video) elems.push({ text: { str: "[视频]" } });
+			else if (element.elementType === ElementType.Face) {
+				const { faceType, faceIndex, faceText } = element.faceElement;
+				if (faceType === FaceType.Old || faceType === FaceType.Normal) elems.push({ face: { index: faceIndex } });
+				else elems.push({ text: { str: faceText } });
+			} else if (element.elementType === ElementType.File) elems.push({ text: { str: "[文件]" } });
+			this.children.push({ srcMsg: {
+				origSeqs: [+msg.msgSeq],
+				senderUin: +msg.senderUin,
+				time: +msg.msgTime,
+				elems: elems.map((e) => Msg.Elem.encode(e)),
+				toUin: 0
+			} });
 		}
 	}
 	async render(segments) {
@@ -24849,17 +24881,17 @@ var DownloadFile = class extends BaseAction {
 		const isRandomName = !payload.name;
 		const name = payload.name ? path.basename(payload.name) : randomUUID();
 		const filePath = path.join(TEMP_DIR, name);
-		if (payload.base64) await fsPromise.writeFile(filePath, payload.base64, "base64");
+		if (payload.base64) await fsPromise$1.writeFile(filePath, payload.base64, "base64");
 		else if (payload.url) {
 			const headers = this.getHeaders(payload.headers);
 			const res = await fetchFile(payload.url, headers);
-			await fsPromise.writeFile(filePath, res.data);
+			await fsPromise$1.writeFile(filePath, res.data);
 		} else throw new Error("不存在任何文件, 无法下载");
-		if (fs$1.existsSync(filePath)) {
+		if (fs.existsSync(filePath)) {
 			if (isRandomName) {
 				const md5 = await getMd5HexFromFile(filePath);
 				const newPath = path.join(TEMP_DIR, md5);
-				await fsPromise.rename(filePath, newPath);
+				await fsPromise$1.rename(filePath, newPath);
 				return { file: newPath };
 			}
 			return { file: filePath };
@@ -25374,12 +25406,16 @@ var SendGroupNotice = class extends BaseAction {
 		content: lib_default$1.string().required(),
 		image: lib_default$1.string(),
 		pinned: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false),
-		confirm_required: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(true)
+		confirm_required: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(true),
+		is_show_edit_card: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false),
+		tip_window: lib_default$1.union([Boolean, lib_default$1.transform(String, parseBool)]).default(false)
 	});
 	async _handle(payload) {
 		const groupCode = payload.group_id.toString();
 		const pinned = +payload.pinned;
 		const confirmRequired = +payload.confirm_required;
+		const isShowEditCard = +payload.is_show_edit_card;
+		const tipWindowType = +!payload.tip_window;
 		let picInfo;
 		if (payload.image) {
 			const { path, isLocal, success, errMsg } = await uri2local(this.ctx, payload.image, true);
@@ -25389,14 +25425,8 @@ var SendGroupNotice = class extends BaseAction {
 			if (!isLocal) unlink$1(path).catch(noop);
 			picInfo = result.picInfo;
 		}
-		const res = await this.ctx.ntGroupApi.publishGroupBulletin(groupCode, {
-			text: encodeURIComponent(payload.content),
-			oldFeedsId: "",
-			pinned,
-			confirmRequired,
-			picInfo
-		});
-		if (res.result !== 0) throw new Error(`设置群公告失败, 错误信息: ${res.errMsg}`);
+		const res = await this.ctx.ntWebApi.publishGroupBulletin(groupCode, payload.content, pinned, 1, isShowEditCard, tipWindowType, confirmRequired, picInfo?.id, picInfo?.width, picInfo?.height);
+		if (res.ec !== 0) throw new Error(`设置群公告失败, 错误信息: ${res.em}`);
 		return null;
 	}
 };
@@ -25680,6 +25710,11 @@ var GetGroupNotice = class extends BaseAction {
 						id: image.id
 					};
 				})
+			},
+			settings: {
+				is_show_edit_card: !!feed.settings.isShowEditCard,
+				tip_window: !feed.settings.tipWindowType,
+				confirm_required: !!feed.settings.confirmRequired
 			}
 		});
 		return result;
@@ -28867,149 +28902,6 @@ var handlers = {
 	deleteFriend
 };
 //#endregion
-//#region node_modules/@hono/node-ws/dist/index.js
-/**
-* @link https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent
-*/
-var CloseEvent = globalThis.CloseEvent ?? class extends Event {
-	#eventInitDict;
-	constructor(type, eventInitDict = {}) {
-		super(type, eventInitDict);
-		this.#eventInitDict = eventInitDict;
-	}
-	get wasClean() {
-		return this.#eventInitDict.wasClean ?? false;
-	}
-	get code() {
-		return this.#eventInitDict.code ?? 0;
-	}
-	get reason() {
-		return this.#eventInitDict.reason ?? "";
-	}
-};
-var generateConnectionSymbol = () => Symbol("connection");
-/** @example `c.env[CONNECTION_SYMBOL_KEY]` */
-var CONNECTION_SYMBOL_KEY = Symbol("CONNECTION_SYMBOL_KEY");
-/**
-* Create WebSockets for Node.js
-* @param init Options
-* @returns NodeWebSocket
-*/
-var createNodeWebSocket = (init) => {
-	const wss = new WebSocketServer({ noServer: true });
-	const waiterMap = /* @__PURE__ */ new Map();
-	wss.on("connection", (ws, request) => {
-		const waiter = waiterMap.get(request);
-		if (waiter) {
-			waiter.resolve(ws);
-			waiterMap.delete(request);
-		}
-	});
-	const nodeUpgradeWebSocket = (request, connectionSymbol) => {
-		return new Promise((resolve) => {
-			waiterMap.set(request, {
-				resolve,
-				connectionSymbol
-			});
-		});
-	};
-	return {
-		wss,
-		injectWebSocket(server) {
-			server.on("upgrade", async (request, socket, head) => {
-				const url = new URL(request.url ?? "/", init.baseUrl ?? "http://localhost");
-				const headers = new Headers();
-				for (const key in request.headers) {
-					const value = request.headers[key];
-					if (!value) continue;
-					headers.append(key, Array.isArray(value) ? value[0] : value);
-				}
-				const env = {
-					incoming: request,
-					outgoing: void 0
-				};
-				const response = await init.app.request(url, { headers }, env);
-				const waiter = waiterMap.get(request);
-				if (!waiter || waiter.connectionSymbol !== env[CONNECTION_SYMBOL_KEY]) {
-					socket.end(`HTTP/1.1 ${response.status.toString()} ${STATUS_CODES[response.status] ?? ""}\r\nConnection: close\r
-Content-Length: 0\r
-\r
-`);
-					waiterMap.delete(request);
-					return;
-				}
-				wss.handleUpgrade(request, socket, head, (ws) => {
-					wss.emit("connection", ws, request);
-				});
-			});
-		},
-		upgradeWebSocket: defineWebSocketHelper(async (c, events, options) => {
-			if (c.req.header("upgrade")?.toLowerCase() !== "websocket") return;
-			const connectionSymbol = generateConnectionSymbol();
-			c.env[CONNECTION_SYMBOL_KEY] = connectionSymbol;
-			(async () => {
-				const ws = await nodeUpgradeWebSocket(c.env.incoming, connectionSymbol);
-				const messagesReceivedInStarting = [];
-				const bufferMessage = (data, isBinary) => {
-					messagesReceivedInStarting.push([data, isBinary]);
-				};
-				ws.on("message", bufferMessage);
-				const ctx = {
-					binaryType: "arraybuffer",
-					close(code, reason) {
-						ws.close(code, reason);
-					},
-					protocol: ws.protocol,
-					raw: ws,
-					get readyState() {
-						return ws.readyState;
-					},
-					send(source, opts) {
-						ws.send(source, { compress: opts?.compress });
-					},
-					url: new URL(c.req.url)
-				};
-				try {
-					events?.onOpen?.(new Event("open"), ctx);
-				} catch (e) {
-					(options?.onError ?? console.error)(e);
-				}
-				const handleMessage = (data, isBinary) => {
-					const datas = Array.isArray(data) ? data : [data];
-					for (const data$1 of datas) try {
-						events?.onMessage?.(new MessageEvent("message", { data: isBinary ? data$1 instanceof ArrayBuffer ? data$1 : data$1.buffer.slice(data$1.byteOffset, data$1.byteOffset + data$1.byteLength) : data$1.toString("utf-8") }), ctx);
-					} catch (e) {
-						(options?.onError ?? console.error)(e);
-					}
-				};
-				ws.off("message", bufferMessage);
-				for (const message of messagesReceivedInStarting) handleMessage(...message);
-				ws.on("message", (data, isBinary) => {
-					handleMessage(data, isBinary);
-				});
-				ws.on("close", (code, reason) => {
-					try {
-						events?.onClose?.(new CloseEvent("close", {
-							code,
-							reason: reason.toString()
-						}), ctx);
-					} catch (e) {
-						(options?.onError ?? console.error)(e);
-					}
-				});
-				ws.on("error", (error) => {
-					try {
-						events?.onError?.(new ErrorEvent("error", { error }), ctx);
-					} catch (e) {
-						(options?.onError ?? console.error)(e);
-					}
-				});
-			})();
-			return new Response();
-		})
-	};
-};
-//#endregion
 //#region src/satori/server.ts
 var SatoriServer = class {
 	app;
@@ -29018,7 +28910,6 @@ var SatoriServer = class {
 	wsClients = [];
 	actionMap;
 	routesRegistered = false;
-	injectWebSocket;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.config = config;
@@ -29052,18 +28943,20 @@ var SatoriServer = class {
 			this.routesRegistered = true;
 		}
 		const { host, port } = this.config;
+		const wss = new WebSocketServer({
+			noServer: true,
+			maxPayload: constants.MAX_STRING_LENGTH
+		});
 		this.httpServer = serve({
 			fetch: this.app.fetch,
+			websocket: { server: wss },
 			port,
 			hostname: host
 		}, () => {
 			this.ctx.logger.info(`Satori server started ${host || "0.0.0.0"}:${port}`);
 		});
-		this.injectWebSocket?.(this.httpServer);
 	}
 	registerRoutes() {
-		const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app: this.app });
-		this.injectWebSocket = injectWebSocket;
 		this.app.get("/v1/events", upgradeWebSocket((c) => {
 			return { onMessage: async (event, ws) => {
 				let payload;
@@ -29173,8 +29066,10 @@ async function parseMessageDeleted(bot, input) {
 	if (!origin) return;
 	const message = await decodeMessage(bot.ctx, origin);
 	if (!message) return;
-	const operatorUid = input.elements[0].grayTipElement.revokeElement.operatorUid;
-	const user = await bot.ctx.ntUserApi.getUserSimpleInfo(operatorUid);
+	const revokeElement = input.elements[0].grayTipElement.revokeElement;
+	let operator;
+	if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) operator = message.user;
+	else operator = decodeUser((await bot.ctx.ntUserApi.getUserSimpleInfo(revokeElement.operatorUid)).coreInfo);
 	return bot.event("message-deleted", {
 		message: omit(message, [
 			"member",
@@ -29186,7 +29081,7 @@ async function parseMessageDeleted(bot, input) {
 		user: message.user,
 		channel: message.channel,
 		guild: message.guild,
-		operator: omit(decodeUser(user.coreInfo), ["is_bot"])
+		operator: omit(operator, ["is_bot"])
 	});
 }
 //#endregion
@@ -42339,7 +42234,6 @@ var MilkyHttpHandler = class {
 			this.ctx.logger.info("MilkyHttp", `${c.env.incoming.socket.remoteAddress} -> ${c.req.path} (${response.retcode === 0 ? "OK" : response.retcode} ${end - start}ms)`, payload);
 			return c.json(response);
 		});
-		const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app: this.app });
 		this.app.get(`${this.config.prefix}/event`, upgradeWebSocket((c) => {
 			return {
 				onOpen: (event, ws) => {
@@ -42380,15 +42274,19 @@ var MilkyHttpHandler = class {
 				});
 			});
 		});
+		const wss = new WebSocketServer({
+			noServer: true,
+			maxPayload: constants.MAX_STRING_LENGTH
+		});
 		this.httpServer = serve({
 			fetch: this.app.fetch,
+			websocket: { server: wss },
 			port: this.config.port,
 			hostname: this.config.host
 		}, () => {
 			const displayHost = this.config.host || "0.0.0.0";
 			this.ctx.logger.info("MilkyHttp", `HTTP server started at ${displayHost}:${this.config.port}${this.config.prefix}`);
 		});
-		injectWebSocket(this.httpServer);
 	}
 	stop() {
 		for (const stream of this.sseClients) stream.abort();
@@ -43532,7 +43430,7 @@ async function download(url, headers) {
 	return Buffer.from(bytes);
 }
 async function resolveMilkyUri(uri) {
-	if (uri.startsWith("file://")) return await fs.readFile(fileURLToPath(uri));
+	if (uri.startsWith("file://")) return await fsPromise.readFile(fileURLToPath(uri));
 	if (uri.startsWith("http://") || uri.startsWith("https://")) return await download(uri);
 	if (uri.startsWith("base64://")) return Buffer.from(uri.slice(9), "base64");
 	throw new Error(`Unsupported URI scheme: ${uri}`);
@@ -46407,7 +46305,7 @@ function getIgnoreAttributesFn(ignoreAttributes) {
 	return () => false;
 }
 //#endregion
-//#region node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/Expression.js
+//#region node_modules/path-expression-matcher/src/Expression.js
 /**
 * Expression - Parses and stores a tag pattern expression
 * 
@@ -46559,7 +46457,7 @@ var Expression = class {
 	}
 };
 //#endregion
-//#region node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/ExpressionSet.js
+//#region node_modules/path-expression-matcher/src/ExpressionSet.js
 /**
 * ExpressionSet - An indexed collection of Expressions for efficient bulk matching
 *
@@ -46732,7 +46630,7 @@ var ExpressionSet = class {
 	}
 };
 //#endregion
-//#region node_modules/fast-xml-parser/node_modules/path-expression-matcher/src/Matcher.js
+//#region node_modules/path-expression-matcher/src/Matcher.js
 /**
 * MatcherView - A lightweight read-only view over a Matcher's internal state.
 *
@@ -47196,7 +47094,7 @@ function extractNamespace(rawTagName) {
 	}
 }
 var OrderedObjParser = class {
-	constructor(options) {
+	constructor(options, externalEntities) {
 		this.options = options;
 		this.currentNode = null;
 		this.tagsNodeStack = [];
@@ -47221,7 +47119,10 @@ var OrderedObjParser = class {
 				...CURRENCY
 			};
 			this.entityDecoder = new EntityDecoder({
-				namedEntities,
+				namedEntities: {
+					...namedEntities,
+					...externalEntities
+				},
 				numericAllowed: this.options.htmlEntities,
 				limit: {
 					maxTotalExpansions: this.options.processEntities.maxTotalExpansions,
@@ -47325,7 +47226,7 @@ function buildAttributesMap(attrStr, jPath, tagName, force = false) {
 			}
 		}
 		if (!hasAttrs) return;
-		if (options.attributesGroupName) {
+		if (options.attributesGroupName && !options.preserveOrder) {
 			const attrCollection = {};
 			attrCollection[options.attributesGroupName] = attrs;
 			return attrCollection;
@@ -47543,29 +47444,35 @@ function isItStopNode() {
 */
 function tagExpWithClosingIndex(xmlData, i, closingChar = ">") {
 	let attrBoundary = 0;
-	const chars = [];
 	const len = xmlData.length;
 	const closeCode0 = closingChar.charCodeAt(0);
 	const closeCode1 = closingChar.length > 1 ? closingChar.charCodeAt(1) : -1;
+	let result = "";
+	let segmentStart = i;
 	for (let index = i; index < len; index++) {
 		const code = xmlData.charCodeAt(index);
 		if (attrBoundary) {
 			if (code === attrBoundary) attrBoundary = 0;
 		} else if (code === 34 || code === 39) attrBoundary = code;
 		else if (code === closeCode0) if (closeCode1 !== -1) {
-			if (xmlData.charCodeAt(index + 1) === closeCode1) return {
-				data: String.fromCharCode(...chars),
+			if (xmlData.charCodeAt(index + 1) === closeCode1) {
+				result += xmlData.substring(segmentStart, index);
+				return {
+					data: result,
+					index
+				};
+			}
+		} else {
+			result += xmlData.substring(segmentStart, index);
+			return {
+				data: result,
 				index
 			};
-		} else return {
-			data: String.fromCharCode(...chars),
-			index
-		};
-		else if (code === 9) {
-			chars.push(32);
-			continue;
 		}
-		chars.push(code);
+		else if (code === 9 && !attrBoundary) {
+			result += xmlData.substring(segmentStart, index) + " ";
+			segmentStart = index + 1;
+		}
 	}
 }
 function findClosingIndex(xmlData, str, i, errMsg) {
@@ -47785,8 +47692,7 @@ var XMLParser = class {
 			const result = validate(xmlData, validationOption);
 			if (result !== true) throw Error(`${result.err.msg}:${result.err.line}:${result.err.col}`);
 		}
-		const orderedObjParser = new OrderedObjParser(this.options);
-		orderedObjParser.entityDecoder.setExternalEntities(this.externalEntities);
+		const orderedObjParser = new OrderedObjParser(this.options, this.externalEntities);
 		const orderedResult = orderedObjParser.parseXml(xmlData);
 		if (this.options.preserveOrder || orderedResult === void 0) return orderedResult;
 		else return prettify(orderedResult, this.options, orderedObjParser.matcher, orderedObjParser.readonlyMatcher);
@@ -48768,6 +48674,25 @@ async function transformTempMessageCreated(ctx, message) {
 	}
 }
 /**
+* Transform NTQQ message-deleted event to Milky message_recall event (temp)
+*/
+async function transformTempMessageDeleted(ctx, message) {
+	try {
+		const revokeElement = message.elements[0].grayTipElement.revokeElement;
+		return {
+			message_scene: "temp",
+			peer_id: Number(message.peerUin),
+			message_seq: Number(message.msgSeq),
+			sender_id: Number(message.senderUin),
+			operator_id: Number(message.senderUin),
+			display_suffix: revokeElement.wording
+		};
+	} catch (error) {
+		ctx.logger.error("Failed to transform temp message deleted event:", error);
+		return null;
+	}
+}
+/**
 * Transform NTQQ message-deleted event to Milky message_recall event (private)
 */
 async function transformPrivateMessageDeleted(ctx, message) {
@@ -48778,7 +48703,7 @@ async function transformPrivateMessageDeleted(ctx, message) {
 			peer_id: Number(message.peerUin),
 			message_seq: Number(message.msgSeq),
 			sender_id: Number(message.senderUin),
-			operator_id: Number(await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)),
+			operator_id: Number(message.senderUin),
 			display_suffix: revokeElement.wording
 		};
 	} catch (error) {
@@ -48792,12 +48717,15 @@ async function transformPrivateMessageDeleted(ctx, message) {
 async function transformGroupMessageDeleted(ctx, message) {
 	try {
 		const revokeElement = message.elements[0].grayTipElement.revokeElement;
+		let operatorUin;
+		if (revokeElement.operatorUid === revokeElement.origMsgSenderUid) operatorUin = message.senderUin;
+		else operatorUin = await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid);
 		return {
 			message_scene: "group",
 			peer_id: Number(message.peerUin),
 			message_seq: Number(message.msgSeq),
 			sender_id: Number(message.senderUin),
-			operator_id: Number(await ctx.ntUserApi.getUinByUid(revokeElement.operatorUid)),
+			operator_id: Number(operatorUin),
 			display_suffix: revokeElement.wording
 		};
 	} catch (error) {
@@ -49209,6 +49137,9 @@ var MilkyAdapter = class extends Service {
 			} else if (message.chatType === ChatType.Group) {
 				const eventData = await transformGroupMessageDeleted(this.ctx, message);
 				if (eventData) this.emitEvent("message_recall", eventData);
+			} else if (message.chatType === ChatType.TempC2CFromGroup) {
+				const eventData = await transformTempMessageDeleted(this.ctx, message);
+				if (eventData) this.emitEvent("message_recall", eventData);
 			}
 		});
 		this.ctx.on("nt/message-sent", async (message) => {
@@ -54126,9 +54057,7 @@ var NTQQUserApi = class extends Service {
 		return await this.ctx.pmhq.invoke("nodeIKernelProfileService/getCoreAndBaseInfo", ["nodeStore", uids]);
 	}
 	async getBuddyNick(uid) {
-		const nick = (await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyNick", [[uid]])).get(uid);
-		if (nick === void 0) this.ctx.logger.warn(`获取昵称失败, uid: ${uid}`);
-		return nick ?? "";
+		return (await this.ctx.pmhq.invoke("nodeIKernelBuddyService/getBuddyNick", [[uid]])).get(uid);
 	}
 	async getCookies(domain) {
 		const clientKeyData = await this.forceFetchClientKey();
@@ -54152,7 +54081,11 @@ var NTQQUserApi = class extends Service {
 		return await this.ctx.pmhq.invoke("nodeIKernelTicketService/forceFetchClientKey", [""]);
 	}
 	async getSelfNick(refresh = true) {
-		if ((refresh || !selfInfo.nick) && selfInfo.uid) selfInfo.nick = await this.getBuddyNick(selfInfo.uid);
+		if ((refresh || !selfInfo.nick) && selfInfo.uid) {
+			let nick = await this.getBuddyNick(selfInfo.uid);
+			if (nick === void 0) nick = (await this.getUserSimpleInfo(selfInfo.uid, refresh)).coreInfo.nick;
+			selfInfo.nick = nick;
+		}
 		return selfInfo.nick;
 	}
 	async setSelfStatus(status, extStatus, batteryStatus) {
@@ -54363,103 +54296,154 @@ 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 fs.readFile(filePath);
+			const fileBuffer = await fsPromise.readFile(filePath);
 			const fileSize = fileBuffer.length;
-			const checksum = await getMd5HexFromFile(filePath);
-			const getSessionUrl = `https://${domain}/webapp/json/sliceUpload/FileBatchControl/${checksum}?g_tk=${gtk}`;
+			const fileType = await fileTypeFromBuffer(fileBuffer);
 			const timestamp = Math.floor(Date.now() / 1e3);
-			const getSessionPostData = { "control_req": [{
-				"uin": selfInfo.uin,
-				"token": {
-					"type": 4,
-					"data": cookiesObject.p_skey,
-					"appid": 5
-				},
-				"appid": "qun",
-				"checksum": checksum,
-				"check_type": 0,
-				"file_len": fileSize,
-				"env": {
-					"refer": "qzone",
-					"deviceInfo": "h5"
-				},
-				"model": 0,
-				"biz_req": {
-					"sPicTitle": "",
-					"sPicDesc": "",
-					"sAlbumName": "",
-					"sAlbumID": albumID,
-					"iAlbumTypeID": 0,
-					"iBitmap": 0,
-					"iUploadType": 0,
-					"iUpPicType": 0,
-					"iBatchID": iBatchID,
-					"sPicPath": "",
-					"iPicWidth": 0,
-					"iPicHight": 0,
-					"iWaterType": 0,
-					"iDistinctUse": 0,
-					"iNeedFeeds": 1,
-					"iUploadTime": timestamp,
-					"mapExt": {
-						"appid": "qun",
-						"userid": groupCode
+			const isVideo = fileType?.mime.startsWith("video");
+			let res;
+			if (isVideo) {
+				const checksum = getSha1HexFromBuffer(fileBuffer);
+				const getSessionUrl = `https://${domain}/webapp/json/sliceUpload/FileBatchControl/${checksum}?g_tk=${gtk}`;
+				const getSessionPostData = { "control_req": [{
+					"uin": selfInfo.uin,
+					"token": {
+						"type": 4,
+						"data": cookiesObject.p_skey,
+						"appid": 5
 					},
-					"stExtendInfo": { "mapParams": {
-						"photo_num": fileLen,
-						"video_num": "0",
-						"batch_num": fileLen
-					} },
-					"mutliPicInfo": {
-						"iBatUploadNum": fileLen,
-						"iCurUpload": i,
-						"iSuccNum": 0,
-						"iFailNum": 0
-					}
-				},
-				"session": "",
-				"asy_upload": 0,
-				"cmd": "FileUpload"
-			}] };
-			const resJson = await (await HttpUtil.post(getSessionUrl, getSessionPostData, this.cookieToString(cookiesObject))).json();
+					"appid": "video_qun",
+					"checksum": checksum,
+					"check_type": 1,
+					"file_len": fileSize,
+					"env": {
+						"refer": "qzone",
+						"deviceInfo": "h5"
+					},
+					"model": 0,
+					"biz_req": {
+						"sPicTitle": "",
+						"sPicDesc": "",
+						"sAlbumName": "",
+						"sAlbumID": "",
+						"iAlbumTypeID": 0,
+						"iBitmap": 0,
+						"iUploadType": 3,
+						"iUpPicType": 0,
+						"iBatchID": 0,
+						"sPicPath": "",
+						"iPicWidth": 0,
+						"iPicHight": 0,
+						"iWaterType": 0,
+						"iDistinctUse": 0,
+						"sTitle": "",
+						"sDesc": "",
+						"iFlag": 0,
+						"iUploadTime": timestamp,
+						"iPlayTime": 0,
+						"sCoverUrl": "",
+						"iIsNew": 111,
+						"iIsOriginalVideo": 0,
+						"iIsFormatF20": 0,
+						"extend_info": {
+							"video_type": "3",
+							"domainid": "5",
+							"photo_num": "0",
+							"video_num": fileLen,
+							"batch_num": fileLen,
+							"qun_id": groupCode
+						}
+					},
+					"session": "",
+					"asy_upload": 0,
+					"cmd": "FileUploadVideo"
+				}] };
+				res = await HttpUtil.post(getSessionUrl, getSessionPostData, this.cookieToString(cookiesObject));
+			} else {
+				const checksum = getMd5HexFromBuffer(fileBuffer);
+				const getSessionUrl = `https://${domain}/webapp/json/sliceUpload/FileBatchControl/${checksum}?g_tk=${gtk}`;
+				const getSessionPostData = { "control_req": [{
+					"uin": selfInfo.uin,
+					"token": {
+						"type": 4,
+						"data": cookiesObject.p_skey,
+						"appid": 5
+					},
+					"appid": "qun",
+					"checksum": checksum,
+					"check_type": 0,
+					"file_len": fileSize,
+					"env": {
+						"refer": "qzone",
+						"deviceInfo": "h5"
+					},
+					"model": 0,
+					"biz_req": {
+						"sPicTitle": "",
+						"sPicDesc": "",
+						"sAlbumName": "",
+						"sAlbumID": albumID,
+						"iAlbumTypeID": 0,
+						"iBitmap": 0,
+						"iUploadType": 0,
+						"iUpPicType": 0,
+						"iBatchID": iBatchID,
+						"sPicPath": "",
+						"iPicWidth": 0,
+						"iPicHight": 0,
+						"iWaterType": 0,
+						"iDistinctUse": 0,
+						"iNeedFeeds": 1,
+						"iUploadTime": timestamp,
+						"mapExt": {
+							"appid": "qun",
+							"userid": groupCode
+						},
+						"stExtendInfo": { "mapParams": {
+							"photo_num": fileLen,
+							"video_num": "0",
+							"batch_num": fileLen
+						} },
+						"mutliPicInfo": {
+							"iBatUploadNum": fileLen,
+							"iCurUpload": i,
+							"iSuccNum": 0,
+							"iFailNum": 0
+						}
+					},
+					"session": "",
+					"asy_upload": 0,
+					"cmd": "FileUpload"
+				}] };
+				res = await HttpUtil.post(getSessionUrl, getSessionPostData, this.cookieToString(cookiesObject));
+			}
+			const resJson = await res.json();
 			if (resJson.ret !== 0) {
 				this.ctx.logger.error(`获取群相册上传 session 失败: ${resJson.msg}`);
 				errIndexList.push(i);
 				continue;
 			}
-			const sessionId = resJson.data.session;
 			const sliceSize = resJson.data.slice_size;
 			let offset = 0;
 			let seq = 1;
 			const concurrency = 10;
-			const slices = [];
-			while (offset < fileSize) {
-				const end = Math.min(offset + sliceSize, fileSize);
-				const chunk = fileBuffer.subarray(offset, end);
-				slices.push({
-					offset,
-					end,
-					seq,
-					chunk
-				});
-				offset = end;
-				seq++;
-			}
+			let sVid;
 			const uploadSlice = async (slice) => {
-				const uploadUrl = `https://${domain}/webapp/json/sliceUpload/FileUpload?seq=${slice.seq}&retry=0&offset=${slice.offset}&end=${slice.end}&total=${fileSize}&type=form&g_tk=${gtk}`;
+				const cmd = slice.isVideo ? "FileUploadVideo" : "FileUpload";
+				const uploadUrl = `https://${domain}/webapp/json/sliceUpload/${cmd}?seq=${slice.seq}&retry=0&offset=${slice.offset}&end=${slice.end}&total=${fileSize}&type=form&g_tk=${gtk}`;
 				const formData = new FormData();
 				formData.append("uin", selfInfo.uin);
-				formData.append("appid", "qun");
+				formData.append("appid", slice.isVideo ? "video_qun" : "qun");
 				formData.append("data", new Blob([Uint8Array.from(slice.chunk)]));
-				formData.append("session", sessionId);
+				formData.append("session", slice.sessionId);
 				formData.append("offset", slice.offset.toString());
 				formData.append("checksum", "");
 				formData.append("check_type", "0");
 				formData.append("retry", "0");
 				formData.append("seq", slice.seq.toString());
 				formData.append("end", slice.end.toString());
-				formData.append("cmd", "FileUpload");
-				formData.append("slice_size", sliceSize.toString());
+				formData.append("cmd", cmd);
+				formData.append("slice_size", slice.sliceSize);
 				formData.append("biz_req.iUploadType", "0");
 				const uploadResJson = await (await fetch(uploadUrl, {
 					method: "POST",
@@ -54469,8 +54453,24 @@ var NTQQWebApi = class extends Service {
 				if (uploadResJson.ret !== 0) {
 					if (!errIndexList.includes(i)) errIndexList.push(i);
 					throw new Error(`群相册分片上传失败 (seq: ${slice.seq}): ${uploadResJson.msg}, file: ${filePath}`);
-				}
+				} else if (uploadResJson.data.biz.sVid) sVid = uploadResJson.data.biz.sVid;
 			};
+			const slices = [];
+			while (offset < fileSize) {
+				const end = Math.min(offset + sliceSize, fileSize);
+				const chunk = fileBuffer.subarray(offset, end);
+				slices.push({
+					offset,
+					end,
+					seq,
+					chunk,
+					isVideo: !!isVideo,
+					sessionId: resJson.data.session,
+					sliceSize: sliceSize.toString()
+				});
+				offset = end;
+				seq++;
+			}
 			for (let i = 0; i < slices.length; i += concurrency) {
 				const batch = slices.slice(i, i + concurrency);
 				try {
@@ -54479,6 +54479,112 @@ var NTQQWebApi = class extends Service {
 					this.ctx.logger.error(e);
 				}
 			}
+			if (sVid) {
+				const filePath = await createThumb(this.ctx, filePathList[i]);
+				const fileBuffer = await fsPromise.readFile(filePath);
+				const fileSize = fileBuffer.length;
+				const timestamp = Math.floor(Date.now() / 1e3);
+				const checksum = getMd5HexFromBuffer(fileBuffer);
+				const getSessionUrl = `https://${domain}/webapp/json/sliceUpload/FileBatchControl/${checksum}?g_tk=${gtk}`;
+				const getSessionPostData = { "control_req": [{
+					"uin": selfInfo.uin,
+					"token": {
+						"type": 4,
+						"data": cookiesObject.p_skey,
+						"appid": 5
+					},
+					"appid": "qun",
+					"checksum": checksum,
+					"check_type": 0,
+					"file_len": fileSize,
+					"env": {
+						"refer": "huodong",
+						"deviceInfo": "h5"
+					},
+					"model": 0,
+					"biz_req": {
+						"sPicTitle": "",
+						"sPicDesc": "",
+						"sAlbumName": "",
+						"sAlbumID": albumID,
+						"iAlbumTypeID": 0,
+						"iBitmap": 0,
+						"iUploadType": 2,
+						"iUpPicType": 0,
+						"iBatchID": iBatchID,
+						"sPicPath": "",
+						"iPicWidth": 0,
+						"iPicHight": 0,
+						"iWaterType": 0,
+						"iDistinctUse": 0,
+						"mutliPicInfo": {
+							"iBatUploadNum": fileLen,
+							"iCurUpload": i,
+							"iSuccNum": 0,
+							"iFailNum": 0
+						},
+						"iNeedFeeds": 1,
+						"iUploadTime": timestamp,
+						"stExtendInfo": { "mapParams": {
+							"vid": sVid,
+							"photo_num": "0",
+							"video_num": fileLen,
+							"batch_num": fileLen
+						} },
+						"stExternalMapExt": {
+							"is_client_upload_cover": "1",
+							"is_pic_video_mix_feeds": "1"
+						},
+						"mapExt": {
+							"appid": "qun",
+							"userid": groupCode
+						},
+						"sExif_CameraMaker": "",
+						"sExif_CameraModel": "",
+						"sExif_Time": "",
+						"sExif_LatitudeRef": "",
+						"sExif_Latitude": "",
+						"sExif_LongitudeRef": "",
+						"sExif_Longitude": ""
+					},
+					"session": "",
+					"asy_upload": 0
+				}] };
+				const resJson = await (await HttpUtil.post(getSessionUrl, getSessionPostData, this.cookieToString(cookiesObject))).json();
+				if (resJson.ret !== 0) {
+					this.ctx.logger.error(`获取群相册上传 session 失败: ${resJson.msg}`);
+					errIndexList.push(i);
+					continue;
+				}
+				const sliceSize = resJson.data.slice_size;
+				let offset = 0;
+				let seq = 1;
+				const concurrency = 10;
+				const slices = [];
+				while (offset < fileSize) {
+					const end = Math.min(offset + sliceSize, fileSize);
+					const chunk = fileBuffer.subarray(offset, end);
+					slices.push({
+						offset,
+						end,
+						seq,
+						chunk,
+						isVideo: false,
+						sessionId: resJson.data.session,
+						sliceSize: sliceSize.toString()
+					});
+					offset = end;
+					seq++;
+				}
+				for (let i = 0; i < slices.length; i += concurrency) {
+					const batch = slices.slice(i, i + concurrency);
+					try {
+						await Promise.all(batch.map((slice) => uploadSlice(slice)));
+					} catch (e) {
+						this.ctx.logger.error(e);
+					}
+				}
+			}
 		}
 		this.ctx.logger.info("群相册上传完成");
 		return {
@@ -54487,6 +54593,37 @@ var NTQQWebApi = class extends Service {
 			fail_indexes: errIndexList
 		};
 	}
+	async publishGroupBulletin(groupCode, text, pinned, type, isShowEditCard, tipWindowType, confirmRequired, picId, imgWidth, imgHeight) {
+		const cookieObject = await this.ctx.ntUserApi.getCookies("qun.qq.com");
+		const bkn = this.genBkn(cookieObject.skey);
+		const picInfo = {
+			pic: picId,
+			imgWidth: imgWidth?.toString(),
+			imgHeight: imgHeight?.toString()
+		};
+		const res = await fetch("https://web.qun.qq.com/cgi-bin/announce/add_qun_notice", {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/x-www-form-urlencoded",
+				"Cookie": this.cookieToString(cookieObject)
+			},
+			body: new URLSearchParams({
+				qid: groupCode,
+				bkn,
+				text,
+				pinned: pinned.toString(),
+				type: type.toString(),
+				settings: JSON.stringify({
+					is_show_edit_card: isShowEditCard,
+					tip_window_type: tipWindowType,
+					confirm_required: confirmRequired
+				}),
+				...picId ? picInfo : {}
+			})
+		});
+		if (!res.ok) throw new Error(`HTTP error! Status: ${res.status}`);
+		return await res.json();
+	}
 };
 //#endregion
 //#region src/ntqqapi/api/system.ts
@@ -55836,7 +55973,7 @@ var Config = class extends Service {
 		this.logger.info("配置文件位于", this.configPath);
 		this.config = this.get();
 		if (this.configPath) {
-			fs$2.watchFile(this.configPath, {
+			fs$1.watchFile(this.configPath, {
 				persistent: true,
 				interval: 1e3
 			}, () => {
@@ -55854,7 +55991,7 @@ var Config = class extends Service {
 	}
 	getDefaultConfig() {
 		const _defaultConfig = { ...defaultConfig };
-		const defaultConfigFromFile = fs$2.readFileSync(this.defaultConfigPath, "utf-8");
+		const defaultConfigFromFile = fs$1.readFileSync(this.defaultConfigPath, "utf-8");
 		try {
 			const parsedDefaultConfig = import_dist.default.parse(defaultConfigFromFile);
 			Object.assign(_defaultConfig, parsedDefaultConfig);
@@ -55865,12 +56002,12 @@ var Config = class extends Service {
 	}
 	reloadConfig() {
 		if (!this.configPath) return this.getDefaultConfig();
-		if (!fs$2.existsSync(this.configPath)) {
+		if (!fs$1.existsSync(this.configPath)) {
 			this.config = this.getDefaultConfig();
 			this.set(this.config);
 			return this.config;
 		} else {
-			const data = fs$2.readFileSync(this.configPath, "utf-8");
+			const data = fs$1.readFileSync(this.configPath, "utf-8");
 			let jsonData = defaultConfig;
 			try {
 				jsonData = import_dist.default.parse(data);
@@ -55896,7 +56033,7 @@ var Config = class extends Service {
 	writeConfig(config) {
 		if (!this.configPath) return;
 		this.watch = false;
-		fs$2.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
+		fs$1.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8");
 		setTimeout(() => {
 			this.watch = true;
 		}, 1500);
@@ -56002,13 +56139,13 @@ var WebUITokenUtil = class {
 	}
 	getToken() {
 		if (!this.token) {
-			if (fs$2.existsSync(this.tokenPath)) this.token = fs$2.readFileSync(this.tokenPath, "utf-8").trim();
+			if (fs$1.existsSync(this.tokenPath)) this.token = fs$1.readFileSync(this.tokenPath, "utf-8").trim();
 		}
 		return this.token;
 	}
 	setToken(token) {
 		this.token = token.trim();
-		fs$2.writeFileSync(this.tokenPath, token, "utf-8");
+		fs$1.writeFileSync(this.tokenPath, token, "utf-8");
 	}
 };
 var webuiTokenUtil = new WebUITokenUtil(path.join(DATA_DIR, "webui_token.txt"));
@@ -57984,7 +58121,7 @@ var package_exports = /* @__PURE__ */ __exportAll({
 var name, version, description, main, scripts, repository, keywords, author, license, bugs, homepage, devDependencies, engines, package_default;
 var init_package = __esmMin((() => {
 	name = "nodemailer";
-	version = "8.0.5";
+	version = "8.0.7";
 	description = "Easy as cake e-mail sending from your Node.js applications";
 	main = "lib/nodemailer.js";
 	scripts = {
@@ -58007,20 +58144,19 @@ var init_package = __esmMin((() => {
 	bugs = { "url": "https://github.com/nodemailer/nodemailer/issues" };
 	homepage = "https://nodemailer.com/";
 	devDependencies = {
-		"@aws-sdk/client-sesv2": "3.1025.0",
+		"@aws-sdk/client-sesv2": "3.1037.0",
 		"bunyan": "1.8.15",
 		"c8": "11.0.0",
-		"eslint": "10.2.0",
+		"eslint": "10.2.1",
 		"eslint-config-prettier": "10.1.8",
-		"globals": "17.4.0",
+		"globals": "17.5.0",
 		"libbase64": "1.3.0",
-		"libmime": "5.3.7",
+		"libmime": "5.3.8",
 		"libqp": "2.1.1",
-		"nodemailer-ntlm-auth": "1.0.4",
-		"prettier": "3.8.1",
+		"prettier": "3.8.3",
 		"proxy": "1.0.2",
 		"proxy-test-server": "1.0.0",
-		"smtp-server": "3.18.3"
+		"smtp-server": "3.18.4"
 	};
 	engines = { "node": ">=6.0.0" };
 	package_default = {
@@ -58284,7 +58420,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$5 = __require("fs");
+	var fs$4 = __require("fs");
 	var nmfetch = require_fetch();
 	var dns$1 = __require("dns");
 	var net$4 = __require("net");
@@ -58620,7 +58756,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$5.createReadStream(content.path), callback);
+			} else if (content.path) return resolveStream(fs$4.createReadStream(content.path), callback);
 		}
 		if (typeof data[key].content === "string" && ![
 			"utf8",
@@ -61568,11 +61704,11 @@ var require_base64 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const chunkLength = lineLength * 1024;
 		const wrapRegex = new RegExp(".{" + lineLength + "}", "g");
 		while (pos < str.length) {
-			const wrappedLines = str.substr(pos, chunkLength).replace(wrapRegex, "$&\r\n");
+			const wrappedLines = str.substr(pos, chunkLength).replace(wrapRegex, "$&\r\n").trim();
 			result.push(wrappedLines);
 			pos += chunkLength;
 		}
-		return result.join("");
+		return result.join("\r\n").trim();
 	}
 	/**
 	* Creates a transform stream for encoding data to base64 encoding
@@ -61610,12 +61746,12 @@ var require_base64 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				if (lastLF < 0) {
 					this._curLine = b64;
 					b64 = "";
-				} else {
+				} else if (lastLF === b64.length - 1) this._curLine = "";
+				else {
 					this._curLine = b64.substring(lastLF + 1);
 					b64 = b64.substring(0, lastLF + 1);
-					if (b64 && !b64.endsWith("\r\n")) b64 += "\r\n";
 				}
-			} else this._curLine = "";
+			}
 			if (b64) {
 				this.outputBytes += b64.length;
 				this.push(Buffer.from(b64, "ascii"));
@@ -61625,6 +61761,7 @@ var require_base64 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		_flush(done) {
 			if (this._remainingBytes && this._remainingBytes.length) this._curLine += encode(this._remainingBytes);
 			if (this._curLine) {
+				this._curLine = wrap(this._curLine, this.options.lineLength);
 				this.outputBytes += this._curLine.length;
 				this.push(Buffer.from(this._curLine, "ascii"));
 				this._curLine = "";
@@ -62559,7 +62696,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$4 = __require("fs");
+	var fs$3 = __require("fs");
 	var punycode = require_punycode();
 	var { PassThrough: PassThrough$2 } = __require("stream");
 	var shared = require_shared();
@@ -63268,7 +63405,7 @@ var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					});
 					return contentStream;
 				}
-				return fs$4.createReadStream(content.path);
+				return fs$3.createReadStream(content.path);
 			}
 			if (content && typeof content.href === "string") {
 				if (this.disableUrlAccess) {
@@ -63417,9 +63554,10 @@ var require_mime_node = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (lastAt < 0) return address;
 			let user = address.substr(0, lastAt);
 			const domain = address.substr(lastAt + 1);
-			let encodedDomain;
+			let encodedDomain = domain;
 			try {
-				encodedDomain = punycode.toASCII(domain.toLowerCase());
+				if (/[\x80-\uFFFF]/.test(user)) encodedDomain = punycode.toUnicode(domain.toLowerCase());
+				else encodedDomain = punycode.toASCII(domain.toLowerCase());
 			} catch (_err) {}
 			if (user.indexOf(" ") >= 0) {
 				if (user.charAt(0) !== "\"") user = "\"" + user;
@@ -64106,7 +64244,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$3 = __require("fs");
+	var fs$2 = __require("fs");
 	var path$2 = __require("path");
 	var crypto$5 = __require("crypto");
 	var DKIM_ALGO = "sha256";
@@ -64139,10 +64277,10 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		cleanup() {
 			if (!this.cache || !this.cachePath) return;
-			fs$3.unlink(this.cachePath, () => false);
+			fs$2.unlink(this.cachePath, () => false);
 		}
 		createReadCache() {
-			this.cache = fs$3.createReadStream(this.cachePath);
+			this.cache = fs$2.createReadStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.output.emit("error", err);
@@ -64188,7 +64326,7 @@ var require_dkim = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		}
 		createWriteCache() {
 			this.output.usingCache = true;
-			this.cache = fs$3.createWriteStream(this.cachePath);
+			this.cache = fs$2.createWriteStream(this.cachePath);
 			this.cache.once("error", (err) => {
 				this.cleanup();
 				this.relaxedBody.unpipe(this.cache);
@@ -70227,7 +70365,7 @@ function UserMixin(Base) {
 				qid: bytes[27394]?.toString() ?? "",
 				level: numbers[105],
 				regTime: numbers[20026] ?? 0,
-				longNick: bytes[102].toString(),
+				longNick: bytes[102]?.toString() ?? "",
 				city: bytes[20020]?.toString() ?? "",
 				country: bytes[20003]?.toString() ?? "",
 				birthdayYear: bytes[20031]?.[0] << 8 | bytes[20031]?.[1],