llonebot-dist 8.0.0 → 8.0.2

package/llbot.js

@@ -6256,8 +6256,8 @@ async function logSummaryMessage(ctx, message) {
 		const userInfo = await ctx.ntFriendApi.getFriendByUid(userUid, false);
 		sender = userInfo.remark || userInfo.nick;
 		peerName = `私] ${sender}(${message.peerUin})`;
-	} catch (e) {
-		return;
+	} catch {
+		peerName = `私] ${sender}(${message.peerUin})`;
 	}
 	else if (message.chatType == ChatType.TempC2CFromGroup) peerName = `临] ${message.peerName}(${message.peerUin})`;
 	const logMsg = `[${direction}-${peerName}：${summary}`;
@@ -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.0";
+var version$3 = "8.0.2";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -31822,7 +31921,7 @@ var SendPB = class extends BaseAction {
 	});
 	async _handle(payload) {
 		try {
-			const result = await this.ctx.qqProtocol.sendPBHex(payload.cmd, payload.hex);
+			const result = await this.ctx.qqProtocol.sendPB(payload.cmd, payload.hex);
 			return {
 				cmd: result.cmd,
 				hex: result.pb,
@@ -55518,7 +55617,7 @@ var NTFriendApi = class extends Service {
 						uid: friend.uid,
 						uin: friend.uin,
 						categoryId: friend.categoryId,
-						categoryName: categories.get(friend.categoryId).categoryName,
+						categoryName: categories.get(friend.categoryId)?.categoryName ?? "",
 						nick: biz.data.get(20002)?.toString() ?? "",
 						bio: biz.data.get(102)?.toString() ?? "",
 						remark: biz.data.get(103)?.toString() ?? "",
@@ -55527,7 +55626,8 @@ var NTFriendApi = class extends Service {
 						gender: biz.numData.get(20009) ?? 0,
 						birthdayYear: biz.data.has(20031) ? biz.data.get(20031)[0] << 8 | biz.data.get(20031)[1] : 0,
 						birthdayMonth: biz.data.get(20031)?.[2] ?? 0,
-						birthdayDay: biz.data.get(20031)?.[3] ?? 0
+						birthdayDay: biz.data.get(20031)?.[3] ?? 0,
+						isSelf: friend.uin === res.selfUin
 					});
 				}
 				cookie = res.cookie;
@@ -55973,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 } });
 	}
@@ -56070,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;
@@ -56136,7 +56249,8 @@ var MessageBuilding = class MessageBuilding {
 					c2c: isGroup ? void 0 : { name: node.senderName },
 					group: isGroup ? {
 						groupCode: 284840486,
-						groupCard: node.senderName
+						groupCard: node.senderName,
+						groupCardType: 2
 					} : void 0
 				},
 				contentHead: {
@@ -56269,7 +56383,8 @@ var NTMsgApi = class extends Service {
 			else chatType = ChatType.C2C;
 		}
 		const random = randomBytes(4).readUInt32BE(0);
-		const echoP = peer.chatType === ChatType.Group ? this.waitForSelfEcho(peer, random, 5e3).catch(() => void 0) : null;
+		const echoP = peer.chatType === ChatType.Group ? this.waitForSelfEcho(peer, random, 7e3) : null;
+		echoP?.catch(() => {});
 		const ret = await this.ctx.qqProtocol.sendMessage({
 			chatType,
 			groupCode,
@@ -73250,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();
@@ -73261,6 +73403,7 @@ var DirectProtocolClient = class extends EventEmitter {
 			const uin = this.session?.uin ? Number(this.session.uin) : void 0;
 			await this.ensureSignTokenFresh(uin);
 			signResult = await requestSign(cmd, payload, seq, this.guid, AppInfo.qua, uin, this.session?.signToken12B);
+			if (signResult?.token.length === 0) signResult.token = Buffer.from(this.session?.signToken12B ?? "");
 			if (process.env.DEBUG_SIGN) console.log(`[Sign] ${cmd} seq=${seq}: result=${signResult ? `sign=${signResult.sign.length}B token=${signResult.token.length}B extra=${signResult.extra.length}B` : "null"}`);
 			if (!signResult) throw new Error(`sign failed for ${cmd}; see [Sign] log above`);
 		}
@@ -74345,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"];
@@ -74369,7 +74504,6 @@ var QQProtocolBase = class extends Service {
 	msgPBMap = /* @__PURE__ */ new Map();
 	logger;
 	pmhqProbeToken = 0;
-	pmhqProbeListenerId = "";
 	onlineEmitted = false;
 	directClient = null;
 	directQrResult = null;
@@ -74390,9 +74524,6 @@ var QQProtocolBase = class extends Service {
 		if (!selfInfo.uid && !selfInfo.uin) return;
 		this.onlineEmitted = true;
 		this.ctx.parallel("qq/online");
-		if (process.env.QQ_USE_PMHQ) this.triggerInfoSyncPush().catch((e) => {
-			this.logger.warn("triggerInfoSyncPush 失败", e.message);
-		});
 	}
 	/**
 	* PMHQ 模式下 LLBot 是寄生在 QQ NT 上的，QQ NT 早就登录过了，开机时的 InfoSyncPush 也早处理完。
@@ -74411,10 +74542,6 @@ var QQProtocolBase = class extends Service {
 		selfInfo.uid = "";
 		selfInfo.uin = "";
 		selfInfo.nick = "";
-		if (this.pmhqProbeListenerId) {
-			this.removeResListener(this.pmhqProbeListenerId);
-			this.pmhqProbeListenerId = "";
-		}
 		this.pmhqProbeToken++;
 		this.onlineEmitted = false;
 		if (wasOnline) this.ctx.parallel("protocol/disconnect");
@@ -74426,70 +74553,29 @@ var QQProtocolBase = class extends Service {
 	startPmhqLoginProbe() {
 		this.resetPmhqState();
 		const myToken = ++this.pmhqProbeToken;
-		const detach = () => {
-			if (this.pmhqProbeListenerId) {
-				this.removeResListener(this.pmhqProbeListenerId);
-				this.pmhqProbeListenerId = "";
-			}
-		};
-		this.pmhqProbeListenerId = this.addResListener((data) => {
-			if (this.pmhqProbeToken !== myToken) return;
-			if (data?.type !== "recv" || !data.data?.cmd || !data.data?.pb) return;
-			if (!selfInfo.uid || !selfInfo.uin) try {
-				const buf = Buffer.from(data.data.pb, "hex");
-				const rh = Msg.PushMsg.decode(buf)?.message?.routingHead;
-				if (rh?.toUid && !selfInfo.uid) selfInfo.uid = String(rh.toUid);
-				if (rh?.toUin && !selfInfo.uin) selfInfo.uin = String(rh.toUin);
-			} catch {
-				try {
-					const buf = Buffer.from(data.data.pb, "hex");
-					const rh = Msg.Message.decode(buf)?.routingHead;
-					if (rh?.toUid && !selfInfo.uid) selfInfo.uid = String(rh.toUid);
-					if (rh?.toUin && !selfInfo.uin) selfInfo.uin = String(rh.toUin);
-				} catch {}
-			}
-			if (!selfInfo.online) {
-				const cmd = data.data.cmd;
-				const isLoginPhase = cmd.startsWith("wtlogin.") || cmd.startsWith("trpc.login.");
-				const isPostLogin = cmd.includes("OlPushService.MsgPush") || cmd.includes("RegisterProxy.SsoInfoSync") || cmd.includes("RegisterProxy.PushParams") || cmd.includes("ConfigPushSvc.PushReq") || cmd.startsWith("OidbSvcTrpcTcp.") || cmd.includes("MessageSvc.");
-				if (!isLoginPhase && isPostLogin) {
-					this.logger.info("QQ 登录成功");
-					selfInfo.online = true;
-				}
-			}
-			this.maybeEmitOnline();
-			if (selfInfo.online && selfInfo.uid && selfInfo.uin) detach();
-		});
 		let warnedNotLoggedIn = false;
 		const probe = async () => {
 			if (this.pmhqProbeToken !== myToken) return;
-			try {
-				const payload = Buffer.from([8, 4]);
-				await this.sendPB("trpc.qq_new_tech.status_svc.StatusService.SsoHeartBeat", payload, 3e3);
+			const ntFriendApi = this.ctx.get("ntFriendApi");
+			if (ntFriendApi) try {
+				const info = (await ntFriendApi.getFriends(true)).friends.find((e) => e.isSelf);
 				if (this.pmhqProbeToken !== myToken) return;
+				selfInfo.uid = info.uid;
+				selfInfo.uin = info.uin.toString();
+				selfInfo.nick = info.nick;
 				if (!selfInfo.online) this.logger.info("QQ 登录成功");
 				selfInfo.online = true;
-				if (!selfInfo.uin) try {
-					const resp = await this.fetchFriends();
-					if (this.pmhqProbeToken === myToken && resp?.selfUin) selfInfo.uin = String(resp.selfUin);
-				} catch (e) {
-					this.logger.warn("fetchFriends 拿 selfUin 失败:", e.message);
-				}
 				this.maybeEmitOnline();
-			} catch {
+			} catch (e) {
 				if (this.pmhqProbeToken !== myToken) return;
-				if (selfInfo.online) {
-					detach();
-					return;
-				}
-				if (!warnedNotLoggedIn) {
+				if (!warnedNotLoggedIn && !e.message.includes("(QQ DLL not connected)")) {
 					this.logger.info("QQ 未登录，等待登录中...");
 					warnedNotLoggedIn = true;
 				}
 			}
 			if (this.pmhqProbeToken !== myToken) return;
 			if (selfInfo.online) return;
-			setTimeout(probe, 3e3);
+			setTimeout(probe, 600);
 		};
 		probe();
 	}
@@ -74673,13 +74759,13 @@ var QQProtocolBase = class extends Service {
 	}
 	async sendPB(cmd, pb, timeout = 15e3) {
 		if (this.directClient?.isLoggedIn) {
-			const buf = Buffer.from(pb);
+			const buf = Buffer.isBuffer(pb) ? pb : Buffer.from(pb, "hex");
 			return {
 				cmd,
 				pb: (await this.directClient.sendCommand(cmd, buf, void 0, timeout)).payload.toString("hex")
 			};
 		}
-		const hex = Buffer.from(pb).toString("hex");
+		const hex = Buffer.isBuffer(pb) ? pb.toString("hex") : pb;
 		if (this.ws?.readyState === WebSocket.OPEN) return this.unwrapPmhqRes(await this.wsSend({
 			type: "send",
 			data: {
@@ -74695,29 +74781,6 @@ var QQProtocolBase = class extends Service {
 			}
 		}), cmd);
 	}
-	async sendPBHex(cmd, hex) {
-		if (this.directClient?.isLoggedIn) {
-			const buf = Buffer.from(hex, "hex");
-			return {
-				cmd,
-				pb: (await this.directClient.sendCommand(cmd, buf)).payload.toString("hex")
-			};
-		}
-		if (this.ws?.readyState === WebSocket.OPEN) return this.unwrapPmhqRes(await this.wsSend({
-			type: "send",
-			data: {
-				cmd,
-				pb: hex
-			}
-		}), cmd);
-		return this.unwrapPmhqRes(await this.httpSend({
-			type: "send",
-			data: {
-				cmd,
-				pb: hex
-			}
-		}), cmd);
-	}
 	/**
 	* 发送 OIDB 命令，自动 encode Oidb.Base、发送、decode 响应。
 	*/
@@ -74769,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) => {
@@ -77287,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"));
@@ -77752,23 +77814,6 @@ async function onLoad() {
 			setTimeout(directLoginLoop, 1e3);
 		}
 	};
-	const ensurePmhqMissingFields = async (userCtx) => {
-		if (!selfInfo.uid && selfInfo.uin) for (let i = 0; i < 5; i++) try {
-			selfInfo.uid = String(await userCtx.ntUserApi.getUidByUin(+selfInfo.uin));
-			if (selfInfo.uid) break;
-		} catch (e) {
-			await sleep(1e3);
-		}
-		if (!selfInfo.uin && selfInfo.uid) for (let i = 0; i < 5; i++) try {
-			selfInfo.uin = String(await userCtx.ntUserApi.getUinByUid(selfInfo.uid));
-			if (selfInfo.uin) break;
-		} catch (e) {
-			await sleep(1e3);
-		}
-		if (!selfInfo.nick && selfInfo.uid) await userCtx.ntUserApi.getSelfNick(true).catch((e) => {
-			userCtx.logger.warn("获取登录号昵称失败", e);
-		});
-	};
 	ctx.inject(["qqProtocol", "config"], (ctx) => {
 		ctx.logger.info(`LLBot ${version$3}`);
 		ctx.logger.info(process.argv);
@@ -77789,7 +77834,7 @@ async function onLoad() {
 				uin: selfInfo.uin,
 				nickname: selfInfo.nick
 			});
-			if (useDirectProtocol && !selfInfo.nick && selfInfo.uid) ctx.inject(["ntUserApi"], async (userCtx) => {
+			if (useDirectProtocol && !selfInfo.nick) ctx.inject(["ntUserApi"], async (userCtx) => {
 				try {
 					const nick = await userCtx.ntUserApi.getSelfNick(true);
 					if (nick) {
@@ -77810,17 +77855,7 @@ async function onLoad() {
 			loadPluginAfterLogin();
 		};
 		ctx.on("qq/online", handleOnline);
-		if (selfInfo.online && (selfInfo.uid || selfInfo.uin)) handleOnline();
-		if (!useDirectProtocol) ctx.inject(["ntUserApi"], async (userCtx) => {
-			if (selfInfo.online) {
-				await ensurePmhqMissingFields(userCtx);
-				setLoginState({
-					state: "logged_in",
-					uin: selfInfo.uin,
-					nickname: selfInfo.nick
-				});
-			}
-		});
+		if (selfInfo.online && selfInfo.uid) handleOnline();
 		ctx.on("protocol/disconnect", () => {
 			ctx.logger.info("协议层断开，等待重连…");
 		});
@@ -77834,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 {};