llonebot-dist 7.12.4 → 7.12.5

package/llbot.js

@@ -15,6 +15,7 @@ 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";
@@ -11384,7 +11385,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$2 = "7.12.4";
+var version$2 = "7.12.5";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -17256,6 +17257,12 @@ 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$1.createReadStream(filePath);
@@ -21202,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);
@@ -21218,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
@@ -21273,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;
@@ -21286,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 = [];
@@ -21335,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);
@@ -22283,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) {
@@ -22473,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;
@@ -22526,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;
@@ -22673,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);
 }
@@ -22912,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;
 	}
@@ -25399,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);
@@ -25414,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;
 	}
 };
@@ -25705,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;
@@ -28892,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;
@@ -29043,7 +28910,6 @@ var SatoriServer = class {
 	wsClients = [];
 	actionMap;
 	routesRegistered = false;
-	injectWebSocket;
 	constructor(ctx, config) {
 		this.ctx = ctx;
 		this.config = config;
@@ -29077,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;
@@ -42366,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) => {
@@ -42407,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();
@@ -46434,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
 * 
@@ -46586,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
 *
@@ -46759,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.
 *
@@ -54186,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();
@@ -54212,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) {
@@ -54425,101 +54298,152 @@ var NTQQWebApi = class extends Service {
 			const filePath = filePathList[i];
 			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",
@@ -54529,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 {
@@ -54539,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 {
@@ -54547,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
@@ -58044,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.6";
+	version = "8.0.7";
 	description = "Easy as cake e-mail sending from your Node.js applications";
 	main = "lib/nodemailer.js";
 	scripts = {
@@ -58067,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 = {
@@ -63478,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;