llonebot-dist 8.0.5 → 8.0.6

package/llbot.js

@@ -19144,7 +19144,17 @@ function parseElements(elems, isGroup) {
 			const svcType = elem.commonElem.serviceType;
 			const bizType = elem.commonElem.businessType;
 			const pbElem = elem.commonElem.pbElem;
-			if (svcType === 37) {
+			if (svcType === 33) {
+				const ext = Msg.QSmallFaceExtra.decode(pbElem);
+				result.push({
+					elementType: ElementType.Face,
+					faceElement: {
+						faceIndex: ext.faceId,
+						faceType: 2,
+						faceText: ext.text
+					}
+				});
+			} else if (svcType === 37) {
 				const ext = Msg.LargeFaceExtra.decode(pbElem);
 				const faceIndex = Number(ext.faceId ?? 0);
 				const face = face_config_default.sysface.find((f) => f.QSid === String(faceIndex));
@@ -19262,13 +19272,6 @@ function registerDispatcher(ctx) {
 		try {
 			switch (cmd) {
 				case MSG_PUSH_CMD:
-					if (process.env.DEBUG_RAW_PUSH) try {
-						const m = Msg.PushMsg.decode(payload).message;
-						const rh = m?.routingHead;
-						console.log(`[RawPush] MsgPush msgType=${m?.contentHead.msgType} subType=${m?.contentHead.subType} fromUid=${rh?.fromUid ?? "?"} fromUin=${rh?.fromUin ?? "?"} groupCode=${rh?.group?.groupCode ?? "?"}`);
-					} catch (e) {
-						console.log(`[RawPush] MsgPush decode failed: ${e.message}`);
-					}
 					handleMsgPush(ctx, payload);
 					break;
 				case KICK_CMD:
@@ -19285,6 +19288,11 @@ function registerDispatcher(ctx) {
 }
 function handleMsgPush(ctx, payload) {
 	const msg = Msg.PushMsg.decode(payload).message;
+	if (process.env.DEBUG_RAW_PUSH) {
+		const m = msg;
+		const rh = m?.routingHead;
+		console.log(`[RawPush] MsgPush msgType=${m?.contentHead.msgType} subType=${m?.contentHead.subType} fromUid=${rh?.fromUid ?? "?"} fromUin=${rh?.fromUin ?? "?"} groupCode=${rh?.group?.groupCode ?? "?"}`);
+	}
 	if (!msg) return;
 	const msgType = msg.contentHead.msgType;
 	const subType = msg.contentHead.subType;
@@ -20669,7 +20677,7 @@ var OB11HeartbeatEvent = class extends OB11BaseMetaEvent {
 };
 //#endregion
 //#region src/version.ts
-var version$3 = "8.0.5";
+var version$3 = "8.0.6";
 //#endregion
 //#region node_modules/sift/es5m/index.js
 /******************************************************************************
@@ -31546,7 +31554,7 @@ var UploadPrivateFile$1 = class extends BaseAction {
 		if (name.includes("/") || name.includes("\\")) throw new Error(`文件名 ${name} 不合法`);
 		const uid = await this.ctx.ntUserApi.getUidByUin(+payload.user_id);
 		if (!uid) throw new Error("无法获取用户信息");
-		const info = await this.ctx.ntFileApi.uploadPrivateFile(uid, path, name);
+		const info = await this.ctx.ntFileApi.uploadPrivateFile(ChatType.C2C, uid, path, name);
 		if (!isLocal) unlink(path).catch(noop);
 		const result = await this.ctx.ntMsgApi.sendPrivateFileMessage({
 			toUin: +payload.user_id,
@@ -31671,7 +31679,7 @@ var OCRImage = class extends BaseAction {
 				const { errMsg, isLocal, path, success } = await uri2local(this.ctx, payload.image);
 				if (!success) throw new Error(errMsg);
 				const size = await getImageSize(path);
-				const result = await this.ctx.ntFileApi.uploadPrivateImage(selfInfo.uid, path, size.width, size.height, "", 0);
+				const result = await this.ctx.ntFileApi.uploadPrivateImage(ChatType.C2C, selfInfo.uid, path, size.width, size.height, "", 0);
 				if (!isLocal) unlink(path).catch(noop);
 				const msgInfoBytes = result.msgInfo instanceof Uint8Array || Buffer.isBuffer(result.msgInfo) ? Buffer.from(result.msgInfo) : null;
 				if (!msgInfoBytes) throw new Error("uploadC2CImage 返回的 msgInfo 不是 bytes");
@@ -50920,7 +50928,7 @@ var FileApi = [
 		await writeFile(tempPath, data);
 		const uid = await ctx.ntUserApi.getUidByUin(payload.user_id);
 		if (!uid) return Failed(-404, "User not found");
-		const info = await ctx.ntFileApi.uploadPrivateFile(uid, tempPath, payload.file_name);
+		const info = await ctx.ntFileApi.uploadPrivateFile(ChatType.C2C, uid, tempPath, payload.file_name);
 		unlink(tempPath).catch(noop);
 		const result = await ctx.ntMsgApi.sendPrivateFileMessage({
 			toUin: payload.user_id,
@@ -56211,7 +56219,7 @@ var MessageBuilding = class MessageBuilding {
 	}
 	async [ElementType.Face](data) {
 		const { faceElement } = data;
-		if (faceElement.stickerType && faceElement.stickerId) {
+		if (faceElement.faceType === 3) {
 			const f = faceElement;
 			const pbElem = Msg.LargeFaceExtra.encode({
 				aniStickerPackId: f.packId ? String(f.packId) : "1",
@@ -56225,9 +56233,19 @@ var MessageBuilding = class MessageBuilding {
 				pbElem,
 				businessType: f.stickerType ?? 1
 			} });
-			return;
-		}
-		this.outputElems.push({ face: { index: faceElement.faceIndex } });
+		} else if (faceElement.faceType === 2) {
+			const f = faceElement;
+			const pbElem = Msg.QSmallFaceExtra.encode({
+				faceId: f.faceIndex,
+				text: f.faceText,
+				compatText: f.faceText
+			});
+			this.outputElems.push({ commonElem: {
+				serviceType: 33,
+				pbElem,
+				businessType: f.stickerType ?? 1
+			} });
+		} else this.outputElems.push({ face: { index: faceElement.faceIndex } });
 	}
 	async [ElementType.MarketFace](data) {
 		const { marketFaceElement } = data;
@@ -59371,6 +59389,10 @@ function isDockerEnvironment() {
 		return false;
 	}
 }
+/** PMHQ 模式必须传 --pmhq-port (CLI/Desktop/docker 启动脚本都会带), 以此区分直连模式 */
+function isPmhqMode() {
+	return process.argv.some((arg) => arg.startsWith("--pmhq-port="));
+}
 //#endregion
 //#region src/webui/BE/routes/config.ts
 function isListenAllInterfaces(host) {
@@ -59755,7 +59777,7 @@ function createMessagesRoutes(ctx, createPicElement) {
 					}, 500);
 					sentMsgIds.push(info.fileId);
 				} else {
-					const info = await ctx.ntFileApi.uploadPrivateFile(peerUid, f.filePath, f.fileName);
+					const info = await ctx.ntFileApi.uploadPrivateFile(ChatType.C2C, peerUid, f.filePath, f.fileName);
 					const result = await ctx.ntMsgApi.sendPrivateFileMessage({
 						toUin: +peerId,
 						toUid: peerUid,
@@ -73579,39 +73601,538 @@ var DirectProtocolClient = class extends EventEmitter {
 		};
 	}
 	SIGN_ALLOWLIST = new Set([
-		"wtlogin.trans_emp",
-		"wtlogin.login",
-		"trpc.o3.ecdh_access.EcdhAccess.SsoEstablishShareKey",
-		"trpc.o3.ecdh_access.EcdhAccess.SsoSecureAccess",
+		"AvatarInfoSvr.QQHeadUrlReq",
+		"CertifiedAccountSvc.certified_account_read.GetFollowList",
+		"ConfigPushSvc.PushResp",
+		"ConnAuthSvr.fast_qq_login",
+		"ConnAuthSvr.get_app_info",
+		"ConnAuthSvr.get_app_info_emp",
+		"ConnAuthSvr.get_auth_api_list",
+		"ConnAuthSvr.get_auth_api_list_emp",
+		"ConnAuthSvr.sdk_auth_api",
+		"ConnAuthSvr.sdk_auth_api_emp",
+		"FeedCloudSvr.trpc.circlesearch.exhibition.ExhibitionSvr.ExhibitionSuggestion",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetBusiInfo",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetCommentList",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetFeedList",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetMainPageBasicData",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetMainPageCommData",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetRelationGroupList",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetReplyList",
+		"FeedCloudSvr.trpc.feedcloud.commreader.ComReader.GetRerankedFeedList",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoBarrage",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoComment",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoFollow",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoLike",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoPush",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.DoReply",
+		"FeedCloudSvr.trpc.feedcloud.commwriter.ComWriter.PublishFeed",
+		"FeedCloudSvr.trpc.videocircle.circleprofile.CircleProfile.SetProfile",
+		"GameCenterMsg.GetUserInfo",
+		"HttpConn.0x6ff_501",
+		"IncreaseURLSvr.QQHeadUrlReq",
+		"LightAppSvc.mini_app_cloudstorage.GetUserCloudStorage",
+		"LightAppSvc.mini_app_privacy.GetPrivacyInfo",
+		"LightAppSvc.mini_app_userapp.GetDropdownAppList",
+		"MQUpdateSvc_com_qq_qzone_act.web.OidbSvcTrpcJsapiTcp.0x9377_0",
+		"MQUpdateSvc_com_qq_ti.web.OidbSvcTrpcJsapiTcp.0x9044_0",
+		"MQUpdateSvc_com_qq_ti.web.OidbSvcTrpcJsapiTcp.0x9047_0",
+		"MQUpdateSvc_com_qq_ti.web.OidbSvcTrpcJsapiTcp.0x9172_0",
+		"MessageSvc.PbBindUinGetMsg",
+		"MessageSvc.PbGetGroupMsg",
+		"MessageSvc.PbGetMsg",
+		"MessageSvc.PbGetRoamMsg",
 		"MessageSvc.PbSendMsg",
-		"OidbSvcTrpcTcp.0x6d9_4",
-		"OidbSvcTrpcTcp.0x929b_0",
-		"OidbSvcTrpcTcp.0xfe1_2",
-		"OidbSvcTrpcTcp.0xfe1_8",
-		"OidbSvcTrpcTcp.0x102a_1",
+		"MsgProxy.SendMsg",
+		"NowSummaryCard.NearbyMiniCardReq",
+		"OidbSvc.0x42d",
+		"OidbSvc.0x42d_4",
+		"OidbSvc.0x480_9",
+		"OidbSvc.0x480_9_IMCore",
+		"OidbSvc.0x4ff_9",
+		"OidbSvc.0x4ff_9_IMCore",
+		"OidbSvc.0x515_2",
+		"OidbSvc.0x53c_2",
+		"OidbSvc.0x56c_6",
+		"OidbSvc.0x570_8",
+		"OidbSvc.0x580_1",
+		"OidbSvc.0x587_123",
+		"OidbSvc.0x587_normalNightSet",
+		"OidbSvc.0x58b",
+		"OidbSvc.0x592",
+		"OidbSvc.0x592_1",
+		"OidbSvc.0x592_10",
+		"OidbSvc.0x592_11",
+		"OidbSvc.0x592_12",
+		"OidbSvc.0x592_13",
+		"OidbSvc.0x592_15",
+		"OidbSvc.0x592_16",
+		"OidbSvc.0x592_17",
+		"OidbSvc.0x592_18",
+		"OidbSvc.0x592_19",
+		"OidbSvc.0x592_2",
+		"OidbSvc.0x592_3",
+		"OidbSvc.0x592_4",
+		"OidbSvc.0x592_5",
+		"OidbSvc.0x592_6",
+		"OidbSvc.0x592_7",
+		"OidbSvc.0x592_8",
+		"OidbSvc.0x592_9",
+		"OidbSvc.0x59f",
+		"OidbSvc.0x5d0_1",
+		"OidbSvc.0x5eb_15",
+		"OidbSvc.0x5eb_22",
+		"OidbSvc.0x5eb_42073",
+		"OidbSvc.0x5eb_42261",
+		"OidbSvc.0x5eb_43",
+		"OidbSvc.0x5eb_96",
+		"OidbSvc.0x5eb_99",
+		"OidbSvc.0x5eb_ForTheme",
+		"OidbSvc.0x5eb_cn_switch",
+		"OidbSvc.0x5eb_common",
+		"OidbSvc.0x6d6_0",
+		"OidbSvc.0x6d6_2",
+		"OidbSvc.0x6d6_3",
+		"OidbSvc.0x6d7_0",
+		"OidbSvc.0x6d9_4",
+		"OidbSvc.0x6de",
+		"OidbSvc.0x758",
+		"OidbSvc.0x758_0",
+		"OidbSvc.0x758_1",
+		"OidbSvc.0x787_0",
+		"OidbSvc.0x787_1",
+		"OidbSvc.0x787_11",
+		"OidbSvc.0x7a2_0",
+		"OidbSvc.0x7df_3",
+		"OidbSvc.0x852_35",
+		"OidbSvc.0x852_48",
+		"OidbSvc.0x88d_0",
+		"OidbSvc.0x88d_1",
+		"OidbSvc.0x88d_1_2",
+		"OidbSvc.0x88d_7",
+		"OidbSvc.0x899_0",
+		"OidbSvc.0x899_9",
+		"OidbSvc.0x89a_0",
+		"OidbSvc.0x89b_1",
+		"OidbSvc.0x8a0_0",
+		"OidbSvc.0x8a1_0",
+		"OidbSvc.0x8a1_7",
+		"OidbSvc.0x8a4",
+		"OidbSvc.0x8a8",
+		"OidbSvc.0x8ba",
+		"OidbSvc.0x8f1",
+		"OidbSvc.0x9fa",
+		"OidbSvc.0xb3c",
+		"OidbSvc.0xb3c_1",
+		"OidbSvc.0xb3c_2",
+		"OidbSvc.0xb3c_3",
+		"OidbSvc.0xb3c_4",
+		"OidbSvc.0xb3c_5",
+		"OidbSvc.0xb3c_6",
+		"OidbSvc.0xb3c_7",
+		"OidbSvc.0xb3c_8",
+		"OidbSvc.0xb3c_add",
+		"OidbSvc.0xb3c_delete",
+		"OidbSvc.0xb3c_get_by_id",
+		"OidbSvc.0xb3c_get_done",
+		"OidbSvc.0xb3c_get_done_count",
+		"OidbSvc.0xb3c_get_undone",
+		"OidbSvc.0xb3c_share",
+		"OidbSvc.0xb3c_update",
+		"OidbSvc.0xb3c_update_5",
+		"OidbSvc.0xb77_34",
+		"OidbSvc.0xb77_46",
+		"OidbSvc.0xb77_48",
+		"OidbSvc.0xb77_9",
+		"OidbSvc.0xbbb",
+		"OidbSvc.0xbcb",
+		"OidbSvc.0xbe8",
+		"OidbSvc.0xc26_0",
+		"OidbSvc.0xc33_42220",
+		"OidbSvc.0xc6b",
+		"OidbSvc.0xcd5",
+		"OidbSvc.0xcdd",
+		"OidbSvc.0xd69",
+		"OidbSvc.0xdc2_34",
+		"OidbSvc.0xdc2_9",
+		"OidbSvc.0xe27",
+		"OidbSvc.0xe3e",
+		"OidbSvc.0xe61",
+		"OidbSvc.0xe63_1",
+		"OidbSvc.0xe72",
+		"OidbSvc.0xef0_1",
+		"OidbSvc.0xf7e_1",
+		"OidbSvc.oidb_0x758",
+		"OidbSvcTRPCTcp.0x758_1",
+		"OidbSvcTRPCTcp.0xf67_1",
+		"OidbSvcTcp.0x102a",
+		"OidbSvcTcp.0x88d_0",
+		"OidbSvcTcp.0x88d_1",
+		"OidbSvcTcp.0xef0_1",
+		"OidbSvcTrpcTcp.0x1017_1",
+		"OidbSvcTrpcTcp.0x101b_1",
+		"OidbSvcTrpcTcp.0x101e_1",
+		"OidbSvcTrpcTcp.0x101e_2",
 		"OidbSvcTrpcTcp.0x102a_0",
-		"OidbSvcTrpcTcp.0xfd4_1",
-		"OidbSvcTrpcTcp.0xfe5_2",
-		"OidbSvcTrpcTcp.0x5cf_11",
+		"OidbSvcTrpcTcp.0x102a_1",
+		"OidbSvcTrpcTcp.0x102a_3",
+		"OidbSvcTrpcTcp.0x105b_1",
+		"OidbSvcTrpcTcp.0x1092_0",
 		"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.0x10c8_2",
+		"OidbSvcTrpcTcp.0x10d8_1",
+		"OidbSvcTrpcTcp.0x10db_1",
+		"OidbSvcTrpcTcp.0x10e4_1",
+		"OidbSvcTrpcTcp.0x10ed_1",
+		"OidbSvcTrpcTcp.0x10f4_1",
+		"OidbSvcTrpcTcp.0x1100_1",
+		"OidbSvcTrpcTcp.0x1102_1",
+		"OidbSvcTrpcTcp.0x1103_1",
+		"OidbSvcTrpcTcp.0x1105_1",
+		"OidbSvcTrpcTcp.0x1107_1",
+		"OidbSvcTrpcTcp.0x110d_1",
+		"OidbSvcTrpcTcp.0x112a_1",
+		"OidbSvcTrpcTcp.0x112a_2",
+		"OidbSvcTrpcTcp.0x112e_1",
+		"OidbSvcTrpcTcp.0x1130_1",
+		"OidbSvcTrpcTcp.0x116c_1",
+		"OidbSvcTrpcTcp.0x116d_1",
+		"OidbSvcTrpcTcp.0x1194_1",
 		"OidbSvcTrpcTcp.0x11c4_100",
 		"OidbSvcTrpcTcp.0x11c4_200",
+		"OidbSvcTrpcTcp.0x11c5_100",
+		"OidbSvcTrpcTcp.0x11c5_200",
 		"OidbSvcTrpcTcp.0x11e9_100",
 		"OidbSvcTrpcTcp.0x11e9_200",
+		"OidbSvcTrpcTcp.0x11ea_200",
+		"OidbSvcTrpcTcp.0x11ec_1",
+		"OidbSvcTrpcTcp.0x121e_0",
+		"OidbSvcTrpcTcp.0x1224_0",
+		"OidbSvcTrpcTcp.0x1225_0",
+		"OidbSvcTrpcTcp.0x123c_1",
+		"OidbSvcTrpcTcp.0x1250_0",
+		"OidbSvcTrpcTcp.0x1258_1",
+		"OidbSvcTrpcTcp.0x125b_500",
+		"OidbSvcTrpcTcp.0x1262_19",
 		"OidbSvcTrpcTcp.0x126d_200",
 		"OidbSvcTrpcTcp.0x126e_200",
+		"OidbSvcTrpcTcp.0x1277_0",
+		"OidbSvcTrpcTcp.0x127a_0",
+		"OidbSvcTrpcTcp.0x1289_1",
+		"OidbSvcTrpcTcp.0x12a9_200",
+		"OidbSvcTrpcTcp.0x12b1_0",
+		"OidbSvcTrpcTcp.0x55f_0",
+		"OidbSvcTrpcTcp.0x587_74",
+		"OidbSvcTrpcTcp.0x5cf_11",
+		"OidbSvcTrpcTcp.0x644_1",
+		"OidbSvcTrpcTcp.0x6d6_2",
+		"OidbSvcTrpcTcp.0x6d6_3",
+		"OidbSvcTrpcTcp.0x6d8_1",
+		"OidbSvcTrpcTcp.0x6d9_2",
+		"OidbSvcTrpcTcp.0x6d9_4",
+		"OidbSvcTrpcTcp.0x758_1",
+		"OidbSvcTrpcTcp.0x787_1",
+		"OidbSvcTrpcTcp.0x7c1_1",
+		"OidbSvcTrpcTcp.0x7c2_5",
+		"OidbSvcTrpcTcp.0x88d_0",
+		"OidbSvcTrpcTcp.0x88d_111",
+		"OidbSvcTrpcTcp.0x88d_14",
+		"OidbSvcTrpcTcp.0x899_0",
+		"OidbSvcTrpcTcp.0x899_1",
+		"OidbSvcTrpcTcp.0x899_9",
+		"OidbSvcTrpcTcp.0x89a_0",
+		"OidbSvcTrpcTcp.0x89a_15",
+		"OidbSvcTrpcTcp.0x8a0_1",
+		"OidbSvcTrpcTcp.0x8a1_7",
+		"OidbSvcTrpcTcp.0x8f9_14",
+		"OidbSvcTrpcTcp.0x8fc_3",
+		"OidbSvcTrpcTcp.0x901f_1",
+		"OidbSvcTrpcTcp.0x902e_1",
+		"OidbSvcTrpcTcp.0x9076_1",
+		"OidbSvcTrpcTcp.0x9078_1",
+		"OidbSvcTrpcTcp.0x9079_1",
+		"OidbSvcTrpcTcp.0x911a_19",
+		"OidbSvcTrpcTcp.0x911a_22",
+		"OidbSvcTrpcTcp.0x9124_0",
+		"OidbSvcTrpcTcp.0x9127_1",
+		"OidbSvcTrpcTcp.0x9144_1",
+		"OidbSvcTrpcTcp.0x9176_1",
+		"OidbSvcTrpcTcp.0x917b_1",
+		"OidbSvcTrpcTcp.0x91b6_1",
+		"OidbSvcTrpcTcp.0x929b_0",
+		"OidbSvcTrpcTcp.0x92d5_0",
+		"OidbSvcTrpcTcp.0x92e3_0",
+		"OidbSvcTrpcTcp.0x92e4_0",
+		"OidbSvcTrpcTcp.0x92eb_0",
+		"OidbSvcTrpcTcp.0x930d_0",
+		"OidbSvcTrpcTcp.0x930e_0",
+		"OidbSvcTrpcTcp.0x93d7_1",
+		"OidbSvcTrpcTcp.0x9409_10",
+		"OidbSvcTrpcTcp.0x9409_11",
+		"OidbSvcTrpcTcp.0x9409_12",
+		"OidbSvcTrpcTcp.0x9409_13",
+		"OidbSvcTrpcTcp.0x9409_14",
+		"OidbSvcTrpcTcp.0x9409_15",
+		"OidbSvcTrpcTcp.0x9409_16",
+		"OidbSvcTrpcTcp.0x9409_18",
+		"OidbSvcTrpcTcp.0x9409_7",
+		"OidbSvcTrpcTcp.0x9559_0",
+		"OidbSvcTrpcTcp.0x955f_1",
+		"OidbSvcTrpcTcp.0x9560_1",
+		"OidbSvcTrpcTcp.0x962a_1",
+		"OidbSvcTrpcTcp.0x9689_1",
+		"OidbSvcTrpcTcp.0x972_6",
+		"OidbSvcTrpcTcp.0x9a2_12",
+		"OidbSvcTrpcTcp.0x9a2_8",
+		"OidbSvcTrpcTcp.0xa80_1",
+		"OidbSvcTrpcTcp.0xaf6_0",
+		"OidbSvcTrpcTcp.0xb77_57",
+		"OidbSvcTrpcTcp.0xcd5",
+		"OidbSvcTrpcTcp.0xdc2_34",
+		"OidbSvcTrpcTcp.0xe37_1200",
+		"OidbSvcTrpcTcp.0xe37_1700",
+		"OidbSvcTrpcTcp.0xe37_700",
+		"OidbSvcTrpcTcp.0xe37_800",
+		"OidbSvcTrpcTcp.0xf55_1",
+		"OidbSvcTrpcTcp.0xf57_1",
+		"OidbSvcTrpcTcp.0xf57_106",
+		"OidbSvcTrpcTcp.0xf57_9",
+		"OidbSvcTrpcTcp.0xf59_1",
+		"OidbSvcTrpcTcp.0xf59_2",
+		"OidbSvcTrpcTcp.0xf5b_1",
+		"OidbSvcTrpcTcp.0xf5d_1",
+		"OidbSvcTrpcTcp.0xf5d_11",
+		"OidbSvcTrpcTcp.0xf65_1",
+		"OidbSvcTrpcTcp.0xf65_10",
+		"OidbSvcTrpcTcp.0xf67_1",
+		"OidbSvcTrpcTcp.0xf67_5",
+		"OidbSvcTrpcTcp.0xf6e_1",
+		"OidbSvcTrpcTcp.0xf88_1",
+		"OidbSvcTrpcTcp.0xf89_1",
+		"OidbSvcTrpcTcp.0xfa5_1",
+		"OidbSvcTrpcTcp.0xfc9_1",
+		"OidbSvcTrpcTcp.0xfd4_1",
+		"OidbSvcTrpcTcp.0xfe1",
+		"OidbSvcTrpcTcp.0xfe1_2",
+		"OidbSvcTrpcTcp.0xfe1_8",
+		"OidbSvcTrpcTcp.0xfe4_2",
+		"OidbSvcTrpcTcp.0xfe5_2",
+		"OidbSvcTrpcTcp.0xfe7_2",
+		"OidbSvcTrpcTcp.0xfe7_3",
+		"OidbSvcTrpcTcp.0xfe7_4",
+		"OidbSvc_device.0x633",
+		"OidbSvc_device.0x9f5",
+		"PbMessageSvc.PbUnReadMsgSeq",
+		"ProfileService.GetSimpleInfo",
+		"ProfileService.GroupMngReq",
+		"ProfileService.Pb.ReqSystemMsgAction.Group",
+		"ProfileService.Pb.ReqSystemMsgNew.Group",
+		"ProfileService.ReqBatchProcess",
+		"ProfileService.SimpleInfo",
+		"ProfileService.getGroupInfoReq",
+		"PttStore.GroupPttDown",
+		"PubAccountSvc.get_follow_list",
+		"PushService.settoken",
+		"QChannelSvr.trpc.qchannel.commreader.ComReader.BatchGetFeedDetail",
+		"QChannelSvr.trpc.qchannel.commwriter.ComWriter.DoComment",
+		"QChannelSvr.trpc.qchannel.commwriter.ComWriter.DoReply",
+		"QChannelSvr.trpc.qchannel.commwriter.ComWriter.PublishFeed",
+		"QQAIOMediaSvc.share_trans_check",
+		"QQConnectLogin.auth",
+		"QQConnectLogin.auth_emp",
+		"QQConnectLogin.get_promote_page",
+		"QQConnectLogin.get_promote_page_emp",
+		"QQConnectLogin.pre_auth",
+		"QQConnectLogin.pre_auth_emp",
+		"QQConnectLogin.submit_promote_page",
+		"QQConnectLogin.submit_promote_page_emp",
+		"QQLBSShareSvc.room_operation",
+		"QQRTCSvc.RoomManager-GetRoomInfo",
+		"QQStranger.FeedPlazaSvr.SsoFeedPublish",
+		"QQStranger.FeedSvr.SsoFeedPublish",
+		"QQStranger.InteractiveMsgSvr.SsoSendInterMsg",
+		"QQStranger.UserInfo.SsoBatchGetMiniUserInfo",
+		"QQStranger.UserInfo.SsoGetMiniUserInfo",
+		"QQStranger.UserInfo.SsoSetMiniUserInfo",
+		"QQStranger.login_svr.SsoLoginInfoReport",
+		"QSec.AVEng",
+		"RegPrxySvc.infoLogin",
+		"RegPrxySvc.infoSync",
+		"ResourceConfig.ClientReq",
+		"ResourceConfig.GetResourceReq",
+		"SQQzoneSvc.Custom.getFacade",
+		"SQQzoneSvc.GetCate",
+		"SQQzoneSvc.addComment",
+		"SQQzoneSvc.addReply",
+		"SQQzoneSvc.elaborateFeedReport",
+		"SQQzoneSvc.forward",
+		"SQQzoneSvc.get",
+		"SQQzoneSvc.getAIONewestFeeds",
+		"SQQzoneSvc.getActiveFeeds",
+		"SQQzoneSvc.getMainPage",
+		"SQQzoneSvc.getPhotoComment",
+		"SQQzoneSvc.getPhotoWall",
+		"SQQzoneSvc.getProfile",
+		"SQQzoneSvc.getProfileFeeds",
+		"SQQzoneSvc.getUndealCount",
+		"SQQzoneSvc.getVisitorNotify",
+		"SQQzoneSvc.get_all_feedsphoto_ex",
+		"SQQzoneSvc.like",
+		"SQQzoneSvc.mobileqboss.get",
+		"SQQzoneSvc.photo",
+		"SQQzoneSvc.preGetPassiveFeeds",
+		"SQQzoneSvc.publishmood",
+		"SQQzoneSvc.shuoshuo",
+		"SecuritySvc.GetConfig",
+		"SsoSnsSession.Cmd0x3_SubCmd0x1_FuncGetBlockList",
+		"StatSvc.GetDevLoginInfo",
+		"StatSvc.GetOnlineStatus",
+		"StatSvc.SetStatusFromClient",
+		"StatSvc.SimpleGet",
+		"StatSvc.register",
+		"SummaryCard.ReqSummaryCard",
+		"VisitorSvc.ReqDeleteVisitorRecord",
+		"VisitorSvc.ReqFavorite",
+		"WalletGestureSvc.GetPassword",
+		"WalletGestureSvc.GetSignV2",
+		"WalletGestureSvc.SetPassword",
+		"account.RequestQueryQQMobileContactsV3",
+		"friendlist.AddFriendReq",
+		"friendlist.GetFriendListReq",
+		"friendlist.GetLastLoginInfoReq",
+		"friendlist.GetMultiTroopInfoReq",
+		"friendlist.GetSimpleOnlineFriendInfoReq",
+		"friendlist.GetTroopAppointRemarkReq",
+		"friendlist.GetTroopListReqV2",
+		"friendlist.GetTroopMemberList",
+		"friendlist.GetTroopMemberListReq",
+		"friendlist.ModifyGroupInfoReq",
+		"friendlist.addFriend",
+		"friendlist.getFriendGroupList",
+		"friendlist.getTroopMemberList",
+		"gcbindgroupsso.get_appid",
+		"gcbindgroupsso.unbind_group",
+		"group_member_card.get_group_member_card_info",
+		"group_member_statistic.get_group_member_statistic",
+		"miniapp.trpc.minigame.sdk_qgroup_svr.sdk_qgroup_svr.JoinGroup",
+		"oidb_0x42e_3",
+		"oidb_0x43c_4",
+		"oidb_0x43c_5",
+		"oidb_0x5d0_1",
+		"oidb_0x5d6_19",
+		"oidb_0x5d6_21",
+		"oidb_0x7a2_0",
+		"oidb_0x7c4_0",
+		"oidb_0x7df_3",
+		"oidb_0x9045_1",
+		"oidb_0x9072_0",
+		"oidb_0xcf3_0",
+		"oidb_0xcf4_0",
+		"oidb_0xd9c_11",
+		"oidb_0xdc2_34",
+		"oidb_0xe37_1200",
+		"oidb_0xe37_800",
+		"oidb_0xe61_1",
+		"oidb_0xe8c_0",
+		"oidb_0xeb1_1",
+		"oidb_0xf7e_1",
+		"oidb_0xfd4_1",
+		"qidianservice.135",
+		"qidianservice.207",
+		"qidianservice.269",
+		"qidianservice.290",
+		"qzoneh5.h5.wnshtml",
+		"trpc.QQService.CommonLogic.StatusService.SsoGetLikeList",
+		"trpc.commercial.dataworks.UserActionReport_sso.SsoReport",
+		"trpc.down.intercept.Intercept.SsoGetDownloadTips",
+		"trpc.down.intercept.Intercept.SsoGetInterceptFile",
+		"trpc.down.joint_operation_game_intercept.JointOperationGameIntercept.SsoCheck",
+		"trpc.down.joint_operation_game_intercept.JointOperationGameIntercept.SsoQueryConfig",
+		"trpc.ecom.api_gateway.ApiGateway.SsoForward",
+		"trpc.g_qqrtc.qq_mav_room_state_read.GetRoomState.SsoGetInfoByUin",
+		"trpc.gc_indust.device_report.SsoHome.SsoHomeReport",
 		"trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg",
-		"OidbSvcTrpcTcp.0x88d_0"
+		"trpc.group.long_msg_interface.MsgService.SsoSendLongMsg",
+		"trpc.group_pro.msgproxy.sendmsg",
+		"trpc.group_pro.synclogic.SyncLogic.SyncFirstView",
+		"trpc.login.ecdh.EcdhService.SsoKeyExchange",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginAuthCodeLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginAuthLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginAuthNewDevice",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginCheckA1List",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginCheckGateWayCode",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginCheckSms",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginCheckThirdCode",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginEasyLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginEasyLoginUnusualDevice",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginGetSaltList",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginGetSms",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginOptimusLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginPasswordLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginPasswordLoginNewDevice",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginPasswordLoginUnusualDevice",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginRapidLogin",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginRefreshA2",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginRefreshTicket",
+		"trpc.login.ecdh.EcdhService.SsoNTLoginTGTExchangeFastLogin",
+		"trpc.login.ecdh.EcdhService.SsoOIDB0x916a",
+		"trpc.login.ecdh.EcdhService.SsoOIDB0x916b",
+		"trpc.login.ecdh.EcdhService.SsoOIDB0x916c",
+		"trpc.login.ecdh.EcdhService.SsoOIDB0x916d",
+		"trpc.login.ecdh.EcdhService.SsoQRLoginAuthQr",
+		"trpc.login.ecdh.EcdhService.SsoQRLoginCancleQr",
+		"trpc.login.ecdh.EcdhService.SsoQRLoginGenQr",
+		"trpc.login.ecdh.EcdhService.SsoQRLoginRejectQr",
+		"trpc.login.ecdh.EcdhService.SsoQRLoginScanQr",
+		"trpc.lplan.feed_svr.StatusWrite.SsoComment",
+		"trpc.lplan.feed_svr.StatusWrite.SsoPostStatus",
+		"trpc.lplan.feed_svr.StatusWrite.SsoReply",
+		"trpc.lplan.like_svr.Like.SsoDoLike",
+		"trpc.lplan.map_svr.Map.SsoReportLocation",
+		"trpc.lplan.user_manager_svr.User.SsoLogin",
+		"trpc.lplan.user_manager_svr.User.SsoSetProfile",
+		"trpc.metaverse.mob_proxy_svr.MobProxy.SsoHandle",
+		"trpc.msg.msg_svc.MsgService.SsoC2CRecallMsg",
+		"trpc.msg.msg_svc.MsgService.SsoGetPeerSeq",
+		"trpc.msg.msg_svc.MsgService.SsoReadedReport",
+		"trpc.msg.olpush.OlPushService.SsoPushAck",
+		"trpc.msg.register_proxy.RegisterProxy.PushParams",
+		"trpc.msg.register_proxy.RegisterProxy.SsoInfoSync",
+		"trpc.o3.ecdh_access.EcdhAccess.SsoEstablishShareKey",
+		"trpc.o3.ecdh_access.EcdhAccess.SsoSecureA2Access",
+		"trpc.o3.ecdh_access.EcdhAccess.SsoSecureA2Establish",
+		"trpc.o3.ecdh_access.EcdhAccess.SsoSecureAccess",
+		"trpc.o3.report.Report.SsoReport",
+		"trpc.passwd.manager.PasswdManager.SetPasswd",
+		"trpc.passwd.manager.PasswdManager.VerifyPasswd",
+		"trpc.qlive.qlive_proxy_svr.TrpcProxy.*",
+		"trpc.qlive.relationchain_svr.RelationchainSvr.Follow",
+		"trpc.qlive.word_svr.WordSvr.NewPublicChat",
+		"trpc.qmeta.mob_proxy_svr.MobProxy.SsoHandle",
+		"trpc.qpay.encryptedtransfer.Encryption.SsoUINEncrypt",
+		"trpc.qpay.midas_order.Order.SsoMakeOrder",
+		"trpc.qpay.red_pack_skin.Skin.SsoAddSkin",
+		"trpc.qpay.sso.web.Do",
+		"trpc.qq_new_tech.status_svc.StatusService.Register",
+		"trpc.qq_new_tech.status_svc.StatusService.SetStatus",
+		"trpc.qq_new_tech.status_svc.StatusService.SsoHeartBeat",
+		"trpc.qq_new_tech.status_svc.StatusService.UnRegister",
+		"trpc.qqhb.qqhb_proxy.Handler.sso_handle",
+		"trpc.qqstranger.common_proxy.CommonProxy.SsoHandle",
+		"trpc.qqva.vipdata.Vipdata.SsoGetUserData",
+		"trpc.springfestival.redpacket.LuckyBag.SsoSubmitGrade",
+		"wtlogin.device_lock",
+		"wtlogin.exchange_emp",
+		"wtlogin.log_report",
+		"wtlogin.login",
+		"wtlogin.name2uin",
+		"wtlogin.qrlogin",
+		"wtlogin.register",
+		"wtlogin.trans_emp",
+		"wtlogin_device.login",
+		"wtlogin_device.tran_sim_emp"
 	]);
 	async sendCommand(cmd, payload, encryptType, timeout = 15e3) {
 		const seq = this.nextSeq();
@@ -74763,7 +75284,7 @@ var QQProtocolBase = class extends Service {
 		const { pmhqHost, pmhqPort } = this.getPMHQHostPort();
 		this.httpUrl = `http://${pmhqHost}:${pmhqPort}/`;
 		this.wsUrl = `ws://${pmhqHost}:${pmhqPort}/ws`;
-		if (process.env.QQ_USE_PMHQ) this.connectWebSocket().then();
+		if (isPmhqMode()) this.connectWebSocket().then();
 	}
 	maybeEmitOnline() {
 		if (this.onlineEmitted) return;
@@ -74773,6 +75294,22 @@ var QQProtocolBase = class extends Service {
 		this.ctx.parallel("qq/online");
 	}
 	/**
+	* emit qq/online 之后 ntUserApi 才会随插件加载. 用 ctx.inject 等它 ready 再拉一次 nick;
+	* 拿到就写 selfInfo.nick, 失败就 warn 一下留空。
+	*/
+	scheduleFetchSelfNick(myToken) {
+		this.ctx.inject(["ntUserApi"], async (ctx) => {
+			if (this.pmhqProbeToken !== myToken) return;
+			try {
+				const nick = await ctx.ntUserApi.getSelfNick(false);
+				this.logger.info(`getSelfNick -> ${JSON.stringify(nick)}`);
+				if (nick) selfInfo.nick = nick;
+			} catch (e) {
+				this.logger.warn(`getSelfNick threw: ${e.message}`);
+			}
+		});
+	}
+	/**
 	* PMHQ 模式下 LLBot 是寄生在 QQ NT 上的，QQ NT 早就登录过了，开机时的 InfoSyncPush 也早处理完。
 	* LLBot 想要群最新 seq（拉历史用）就得自己主动触发一次：发 SsoInfoSync，server 看到注册请求就回一发 InfoSyncPush。
 	* isFirstRegisterProxyOnline=0 + 派生 guid（基于 uid，每个号固定）尽量避免和 QQ NT 的注册项冲突。
@@ -74794,7 +75331,9 @@ var QQProtocolBase = class extends Service {
 		if (wasOnline) this.ctx.parallel("protocol/disconnect");
 	}
 	/**
-	* PMHQ 模式：周期 SsoHeartBeat 探测登录；同时挂 recv listener 抠 self uid/uin。
+	* PMHQ 模式：轮询 /health 拿 self uin/uid（DLL 从 QQ 内存直接读 uin,
+	* injector 侧扫 recv pb 抠 uid, 都写到 /health）。拿到 uin+uid 立即 emit online,
+	* nick 通过 scheduleFetchSelfNick 异步等 ntUserApi 服务 ready 后再拉。
 	* 重连后会被 onopen 再次调用，所以必须先 reset 旧状态再启动新一轮。
 	*/
 	startPmhqLoginProbe() {
@@ -74803,20 +75342,27 @@ var QQProtocolBase = class extends Service {
 		let warnedNotLoggedIn = false;
 		const probe = async () => {
 			if (this.pmhqProbeToken !== myToken) return;
-			const ntFriendApi = this.ctx.get("ntFriendApi");
-			if (ntFriendApi) try {
-				const info = (await ntFriendApi.getFriends(true)).friends.find((e) => e.isSelf);
+			try {
+				const resp = await fetch(`${this.httpUrl}health`);
+				if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
+				const health = await resp.json();
 				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;
-				this.maybeEmitOnline();
+				if (health.uin && health.uid) {
+					selfInfo.uid = health.uid;
+					selfInfo.uin = String(health.uin);
+					this.ctx.logger.info(`Self info ${selfInfo.nick || "<pending>"}(${selfInfo.uin}) uid=${selfInfo.uid}`);
+					if (!selfInfo.online) this.logger.info("QQ 登录成功");
+					selfInfo.online = true;
+					this.maybeEmitOnline();
+					this.scheduleFetchSelfNick(myToken);
+				} else if (!warnedNotLoggedIn) {
+					this.logger.info("QQ 未登录，等待登录中...");
+					warnedNotLoggedIn = true;
+				}
 			} catch (e) {
 				if (this.pmhqProbeToken !== myToken) return;
-				if (!warnedNotLoggedIn && !e.message.includes("(QQ DLL not connected)")) {
-					this.logger.info("QQ 未登录，等待登录中...");
+				if (!warnedNotLoggedIn) {
+					this.logger.info("PMHQ /health probe failed (QQ 未启动?), 继续等待: %s", e.message);
 					warnedNotLoggedIn = true;
 				}
 			}
@@ -78040,7 +78586,7 @@ async function onLoad() {
 	};
 	let lastQrCodeTime = 0;
 	isDockerEnvironment();
-	const useDirectProtocol = !process.env.QQ_USE_PMHQ;
+	const useDirectProtocol = !isPmhqMode();
 	const printLoginQrCode = async () => {
 		try {
 			const data = await ctx.qqProtocol.getDirectLoginQrCode();