llonebot-dist 8.0.1 → 8.0.2

package/llbot.js

@@ -10933,16 +10933,35 @@ var Msg;
 			buf: ProtoField(11, "bytes", "optional")
 		}, "optional"),
 		notOnlineImage: ProtoField(4, {
-			filePath: ProtoField(1, "string", "optional"),
-			fileLen: ProtoField(2, "uint32", "optional"),
-			downloadPath: ProtoField(3, "string", "optional"),
-			picMd5: ProtoField(7, "bytes", "optional"),
-			picHeight: ProtoField(8, "uint32", "optional"),
-			picWidth: ProtoField(9, "uint32", "optional"),
-			resId: ProtoField(10, "string", "optional"),
-			thumbUrl: ProtoField(12, "string", "optional"),
-			bigUrl: ProtoField(14, "string", "optional"),
-			origUrl: ProtoField(15, "string", "optional")
+			filePath: ProtoField(1, "string"),
+			fileLen: ProtoField(2, "uint32"),
+			downloadPath: ProtoField(3, "bytes"),
+			oldVerSendFile: ProtoField(4, "bytes"),
+			imgType: ProtoField(5, "uint32"),
+			previewsImage: ProtoField(6, "bytes"),
+			picMd5: ProtoField(7, "bytes"),
+			picHeight: ProtoField(8, "uint32"),
+			picWidth: ProtoField(9, "uint32"),
+			resId: ProtoField(10, "string"),
+			flag: ProtoField(11, "bytes"),
+			thumbUrl: ProtoField(12, "string"),
+			original: ProtoField(13, "uint32"),
+			bigUrl: ProtoField(14, "string"),
+			origUrl: ProtoField(15, "string"),
+			bizType: ProtoField(16, "uint32"),
+			result: ProtoField(17, "uint32"),
+			index: ProtoField(18, "uint32"),
+			opFaceBuf: ProtoField(19, "bytes"),
+			oldPicMd5: ProtoField(20, "bool"),
+			thumbWidth: ProtoField(21, "uint32"),
+			thumbHeight: ProtoField(22, "uint32"),
+			fileId: ProtoField(23, "uint32"),
+			showLen: ProtoField(24, "uint32"),
+			downloadLen: ProtoField(25, "uint32"),
+			url400: ProtoField(26, "string"),
+			width400: ProtoField(27, "uint32"),
+			height400: ProtoField(28, "uint32"),
+			pbReserve: ProtoField(29, "bytes")
 		}, "optional"),
 		transElemInfo: ProtoField(5, {
 			elemType: ProtoField(1, "uint32"),
@@ -10960,15 +10979,55 @@ var Msg;
 			height: ProtoField(11, "uint32", "optional")
 		}, "optional"),
 		customFace: ProtoField(8, {
-			filePath: ProtoField(2, "string", "optional"),
-			fileId: ProtoField(7, "uint32", "optional"),
-			md5: ProtoField(13, "bytes", "optional"),
-			thumbUrl: ProtoField(14, "string", "optional"),
-			bigUrl: ProtoField(15, "string", "optional"),
-			origUrl: ProtoField(16, "string", "optional"),
-			width: ProtoField(22, "uint32", "optional"),
-			height: ProtoField(23, "uint32", "optional"),
-			size: ProtoField(25, "uint32", "optional")
+			guid: ProtoField(1, "bytes"),
+			filePath: ProtoField(2, "string"),
+			shortcut: ProtoField(3, "string"),
+			buffer: ProtoField(4, "bytes"),
+			flag: ProtoField(5, "bytes"),
+			oldData: ProtoField(6, "bytes", "optional"),
+			fileId: ProtoField(7, "uint32"),
+			serverIp: ProtoField(8, "int32", "optional"),
+			serverPort: ProtoField(9, "int32", "optional"),
+			fileType: ProtoField(10, "int32"),
+			signature: ProtoField(11, "bytes"),
+			useful: ProtoField(12, "int32"),
+			md5: ProtoField(13, "bytes"),
+			thumbUrl: ProtoField(14, "string"),
+			bigUrl: ProtoField(15, "string"),
+			origUrl: ProtoField(16, "string"),
+			bizType: ProtoField(17, "int32"),
+			repeatIndex: ProtoField(18, "int32"),
+			repeatImage: ProtoField(19, "int32"),
+			imageType: ProtoField(20, "int32"),
+			index: ProtoField(21, "int32"),
+			width: ProtoField(22, "int32"),
+			height: ProtoField(23, "int32"),
+			source: ProtoField(24, "int32"),
+			size: ProtoField(25, "uint32"),
+			origin: ProtoField(26, "int32"),
+			thumbWidth: ProtoField(27, "int32", "optional"),
+			thumbHeight: ProtoField(28, "int32", "optional"),
+			showLen: ProtoField(29, "int32"),
+			downloadLen: ProtoField(30, "int32"),
+			x400Url: ProtoField(31, "string", "optional"),
+			x400Width: ProtoField(32, "int32"),
+			x400Height: ProtoField(33, "int32"),
+			pbReserve: ProtoField(34, {
+				subType: ProtoField(1, "int32"),
+				field3: ProtoField(3, "int32"),
+				field4: ProtoField(4, "int32"),
+				summary: ProtoField(9, "string"),
+				field10: ProtoField(10, "int32"),
+				field21: ProtoField(21, {
+					field1: ProtoField(1, "int32"),
+					field2: ProtoField(2, "string"),
+					field3: ProtoField(3, "int32"),
+					field4: ProtoField(4, "int32"),
+					field5: ProtoField(5, "int32"),
+					md5Str: ProtoField(7, "string")
+				}),
+				field31: ProtoField(31, "string")
+			}, "optional")
 		}, "optional"),
 		richMsg: ProtoField(12, {
 			template: ProtoField(1, "bytes"),
@@ -17248,6 +17307,46 @@ function parseElements(elems) {
 			});
 			continue;
 		}
+		if (elem.notOnlineImage) {
+			const img = elem.notOnlineImage;
+			result.push({
+				elementType: ElementType.Pic,
+				picElement: {
+					fileName: img.filePath,
+					fileSize: img.fileLen,
+					picWidth: img.picWidth,
+					picHeight: img.picHeight,
+					md5HexStr: img.picMd5.toString("hex"),
+					sourcePath: "",
+					picType: img.imgType,
+					picSubType: img.bizType,
+					fileUuid: img.resId.split("-")[1],
+					originImageUrl: img.origUrl,
+					summary: ""
+				}
+			});
+			continue;
+		}
+		if (elem.customFace) {
+			const cf = elem.customFace;
+			result.push({
+				elementType: ElementType.Pic,
+				picElement: {
+					fileName: cf.filePath,
+					fileSize: cf.size,
+					picWidth: cf.width,
+					picHeight: cf.height,
+					md5HexStr: cf.md5.toString("hex"),
+					sourcePath: "",
+					picSubType: cf.bizType,
+					fileUuid: cf.fileId.toString(),
+					originImageUrl: cf.origUrl,
+					picType: cf.imageType,
+					summary: ""
+				}
+			});
+			continue;
+		}
 		if (elem.marketFace) {
 			const mf = elem.marketFace;
 			result.push({
@@ -18857,7 +18956,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$3 = "8.0.1";
+var version$3 = "8.0.2";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -55974,16 +56073,16 @@ var MessageBuilding = class MessageBuilding {
 				attr6Buf: attr6
 			} });
 		} else if (textElement.atType === 2) {
-			const attr6 = Buffer.alloc(20);
-			attr6.writeUInt16BE(1, 0);
-			attr6.writeUInt16BE(0, 2);
-			attr6.writeUInt16BE(textElement.content.length, 4);
-			attr6.writeUInt8(0, 6);
-			attr6.writeUInt32BE(textElement.atUin, 7);
-			attr6.writeUInt16BE(0, 11);
+			const attr6Buf = Buffer.alloc(20);
+			attr6Buf.writeUInt16BE(1, 0);
+			attr6Buf.writeUInt16BE(0, 2);
+			attr6Buf.writeUInt16BE(textElement.content.length, 4);
+			attr6Buf.writeUInt8(0, 6);
+			attr6Buf.writeUInt32BE(textElement.atUin, 7);
+			attr6Buf.writeUInt16BE(0, 11);
 			this.outputElems.push({ text: {
 				str: textElement.content,
-				attr6Buf: attr6
+				attr6Buf
 			} });
 		} else this.outputElems.push({ text: { str: textElement.content } });
 	}
@@ -56071,6 +56170,19 @@ var MessageBuilding = class MessageBuilding {
 			attr: { ntMsgSeq: replyElement.replyMsgClientSeq ? replyElement.replyMsgSeq : void 0 },
 			srcMsg: replyElement.srcMsg
 		} });
+		const attr6Buf = Buffer.alloc(20);
+		attr6Buf.writeUInt16BE(1, 0);
+		attr6Buf.writeUInt16BE(0, 2);
+		attr6Buf.writeUInt16BE(1, 4);
+		attr6Buf.writeUInt8(0, 6);
+		attr6Buf.writeUInt32BE(replyElement.senderUin, 7);
+		attr6Buf.writeUInt16BE(0, 11);
+		const pbReserve = Msg.TextResvAttr.encode({ atMemberUin: 0 });
+		this.outputElems.push({ text: {
+			str: "@",
+			attr6Buf,
+			pbReserve
+		} }, { text: { str: " " } });
 	}
 	async [ElementType.Pic](data) {
 		const { picElement: p } = data;
@@ -56272,6 +56384,7 @@ var NTMsgApi = class extends Service {
 		}
 		const random = randomBytes(4).readUInt32BE(0);
 		const echoP = peer.chatType === ChatType.Group ? this.waitForSelfEcho(peer, random, 7e3) : null;
+		echoP?.catch(() => {});
 		const ret = await this.ctx.qqProtocol.sendMessage({
 			chatType,
 			groupCode,
@@ -73252,7 +73365,34 @@ var DirectProtocolClient = class extends EventEmitter {
 		"trpc.o3.ecdh_access.EcdhAccess.SsoEstablishShareKey",
 		"trpc.o3.ecdh_access.EcdhAccess.SsoSecureAccess",
 		"MessageSvc.PbSendMsg",
-		"OidbSvcTrpcTcp.0x6d9_4"
+		"OidbSvcTrpcTcp.0x6d9_4",
+		"OidbSvcTrpcTcp.0x929b_0",
+		"OidbSvcTrpcTcp.0xfe1_2",
+		"OidbSvcTrpcTcp.0xfe1_8",
+		"OidbSvcTrpcTcp.0x102a_1",
+		"OidbSvcTrpcTcp.0x102a_0",
+		"OidbSvcTrpcTcp.0xfd4_1",
+		"OidbSvcTrpcTcp.0xfe5_2",
+		"OidbSvcTrpcTcp.0x5cf_11",
+		"OidbSvcTrpcTcp.0x10c0_1",
+		"OidbSvcTrpcTcp.0x10c0_2",
+		"OidbSvcTrpcTcp.0x10c8_1",
+		"OidbSvcTrpcTcp.0x972_6",
+		"OidbSvcTrpcTcp.0x8fc_3",
+		"OidbSvcTrpcTcp.0x6d6_2",
+		"OidbSvcTrpcTcp.0x6d6_3",
+		"OidbSvcTrpcTcp.0xe37_1700",
+		"OidbSvcTrpcTcp.0xe37_1200",
+		"OidbSvcTrpcTcp.0x11c5_100",
+		"OidbSvcTrpcTcp.0x11c5_200",
+		"OidbSvcTrpcTcp.0x11c4_100",
+		"OidbSvcTrpcTcp.0x11c4_200",
+		"OidbSvcTrpcTcp.0x11e9_100",
+		"OidbSvcTrpcTcp.0x11e9_200",
+		"OidbSvcTrpcTcp.0x126d_200",
+		"OidbSvcTrpcTcp.0x126e_200",
+		"trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg",
+		"OidbSvcTrpcTcp.0x88d_0"
 	]);
 	async sendCommand(cmd, payload, encryptType, timeout = 15e3) {
 		const seq = this.nextSeq();
@@ -74348,14 +74488,6 @@ function handleLine(socket, line) {
 }
 //#endregion
 //#region src/main/qqProtocol/base.ts
-var requireForVersion = createRequire(import.meta.url);
-function readBotVersion() {
-	try {
-		return requireForVersion("../../../../package.json").version ?? "unknown";
-	} catch {
-		return "unknown";
-	}
-}
 var QQProtocolBase = class extends Service {
 	ctx;
 	static inject = ["config"];
@@ -74700,7 +74832,7 @@ var QQProtocolBase = class extends Service {
 		const uinForInit = persisted ? Number(persisted.uin) : void 0;
 		this.directClient = new DirectProtocolClient({
 			authToken,
-			botVersion: readBotVersion(),
+			botVersion: `LLBot_${version$3}`,
 			uin: Number.isFinite(uinForInit) && uinForInit > 0 ? uinForInit : void 0
 		});
 		this.directClient.on("error", (err) => {
@@ -77218,8 +77350,7 @@ function UserMixin(Base) {
 			const data = Oidb.Base.encode({
 				command: 4065,
 				subCommand: 2,
-				body,
-				...process.env.QQ_USE_PMHQ ? { isReserved: 1 } : {}
+				body
 			});
 			const res = await this.sendPB("OidbSvcTrpcTcp.0xfe1_2", data);
 			const decoded = Oidb.Base.decode(Buffer.from(res.pb, "hex"));
@@ -77738,6 +77869,12 @@ async function onLoad() {
 		else ctx.qqProtocol.startHook();
 	});
 }
+process.on("unhandledRejection", (reason) => {
+	console.error("[unhandledRejection]", reason);
+});
+process.on("uncaughtException", (err) => {
+	console.error("[uncaughtException]", err);
+});
 onLoad().catch((e) => console.error(e));
 //#endregion
 export {};