llonebot-dist 8.0.0 → 8.0.1

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}`;
@@ -18857,7 +18857,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$3 = "8.0.0";
+var version$3 = "8.0.1";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -31822,7 +31822,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 +55518,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 +55527,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;
@@ -56136,7 +56137,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 +56271,7 @@ 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;
 		const ret = await this.ctx.qqProtocol.sendMessage({
 			chatType,
 			groupCode,
@@ -73261,6 +73263,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`);
 		}
@@ -74369,7 +74372,6 @@ var QQProtocolBase = class extends Service {
 	msgPBMap = /* @__PURE__ */ new Map();
 	logger;
 	pmhqProbeToken = 0;
-	pmhqProbeListenerId = "";
 	onlineEmitted = false;
 	directClient = null;
 	directQrResult = null;
@@ -74390,9 +74392,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 +74410,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 +74421,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 +74627,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 +74649,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 响应。
 	*/
@@ -77752,23 +77683,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 +77703,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 +77724,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("协议层断开，等待重连…");
 		});