@napuketto/loader 0.0.7 → 0.0.8

package/dist/host/self-host.cjs

@@ -287,8 +287,135 @@ function createIpcActions(ctx) {
 		return ctx.groupCache.listGroupsRefreshed();
 	});
 	actions.set("friend.getFriendList", async () => ctx.friendApi.getFriendList());
+	actions.set("diag.richMediaTmpPaths", async () => runRichMediaDiag(ctx.session));
+	actions.set("diag.flashCall", async (params) => {
+		const sess = ctx.session;
+		if (sess === void 0) return { error: "session 未注入" };
+		const flash = typeof sess.getFlashTransferService === "function" ? sess.getFlashTransferService() : null;
+		if (flash === null || flash === void 0) return { error: "flash 服务为 null" };
+		return callDiagnosticMethod(flash, params);
+	});
+	actions.set("diag.sessionCall", async (params) => {
+		if (ctx.session === void 0) return { error: "session 未注入" };
+		return callDiagnosticMethod(ctx.session, params);
+	});
+	actions.set("diag.engineCall", async (params) => {
+		if (ctx.engine === void 0) return { error: "engine 未注入" };
+		return callDiagnosticMethod(ctx.engine, params);
+	});
+	actions.set("diag.richMediaCall", async (params) => {
+		const sess = ctx.session;
+		if (sess === void 0) return { error: "session 未注入" };
+		const svc = typeof sess.getRichMediaService === "function" ? sess.getRichMediaService() : null;
+		if (svc === null || svc === void 0) return { error: "richMedia 服务为 null" };
+		return callDiagnosticMethod(svc, params);
+	});
+	actions.set("diag.msgServiceCall", async (params) => {
+		const sess = ctx.session;
+		if (sess === void 0) return { error: "session 未注入" };
+		const svc = typeof sess.getMsgService === "function" ? sess.getMsgService() : null;
+		if (svc === null || svc === void 0) return { error: "msgService 为 null" };
+		return callDiagnosticMethod(svc, params);
+	});
+	actions.set("diag.utilCall", async (params) => {
+		const util = ctx.util;
+		if (util === void 0) return { error: "util 未注入" };
+		const instance = typeof util.get === "function" ? util.get() : util;
+		if (instance === null || instance === void 0) return { error: "util 实例为 null" };
+		return callDiagnosticMethod(instance, params);
+	});
 	return actions;
 }
+/** 诊断：按方法名 + 参数数组调用对象任意方法（返回结构化结果，不抛）。
+* ⚠️ NAPI 对象方法挂在实例自身（非原型），__methods 须枚举实例 ownKeys。 */
+async function callDiagnosticMethod(obj, params) {
+	const method = typeof params["method"] === "string" ? params["method"] : "";
+	const args = Array.isArray(params["args"]) ? params["args"] : [];
+	const target = obj;
+	if (method === "__methods") {
+		const own = Object.getOwnPropertyNames(obj);
+		const proto = Object.getOwnPropertyNames(Object.getPrototypeOf(obj) ?? {});
+		return { methods: [.../* @__PURE__ */ new Set([...own, ...proto])] };
+	}
+	const fn = target[method];
+	if (typeof fn !== "function") return { error: `方法不存在: ${method}` };
+	try {
+		return {
+			ok: true,
+			ret: await fn.apply(obj, args)
+		};
+	} catch (e) {
+		return {
+			ok: false,
+			err: e instanceof Error ? e.message : String(e)
+		};
+	}
+}
+/** 诊断：枚举富媒体临时路径（getPicTmpPath 等 0 参方法）。 */
+async function enumerateTmpPaths(svc) {
+	const tmp = {};
+	for (const name of [
+		"getPicTmpPath",
+		"getRichMeidaTmpPath",
+		"getPttTmpPath",
+		"getVideoTmpPath",
+		"getFileTmpPath",
+		"getTransferingTmpPath"
+	]) {
+		const fn = svc[name];
+		if (typeof fn === "function") try {
+			tmp[name] = await fn.call(svc);
+		} catch (e) {
+			tmp[name] = `调用失败: ${e instanceof Error ? e.message : String(e)}`;
+		}
+		else tmp[name] = "方法缺失";
+	}
+	return tmp;
+}
+/** 诊断：闪传服务候选 side-effect 触发（§5.3 候选动作 1，参数宽松猜测）。 */
+async function probeFlashSideEffects(flash) {
+	const flashObj = flash;
+	const sideEffects = {};
+	const candidates = [
+		["addFileSetSimpleStatusListener", [() => void 0]],
+		["setFlashTransferDir", [""]],
+		["setFileSetDownloadDir", [""]],
+		["getFileSetIdByCode", [""]]
+	];
+	for (const [name, args] of candidates) {
+		const fn = flashObj[name];
+		if (typeof fn === "function") try {
+			sideEffects[name] = {
+				ok: true,
+				ret: await fn.apply(flash, args)
+			};
+		} catch (e) {
+			sideEffects[name] = {
+				ok: false,
+				err: e instanceof Error ? e.message : String(e)
+			};
+		}
+		else sideEffects[name] = { missing: true };
+	}
+	return sideEffects;
+}
+/** 诊断主流程：session → 富媒体服务 + 闪传服务的方法面与触发结果。 */
+async function runRichMediaDiag(session) {
+	const sess = session;
+	if (sess === void 0) return { error: "session 未注入（IPC 上下文缺 session）" };
+	const out = {};
+	const svc = typeof sess.getRichMediaService === "function" ? sess.getRichMediaService() : null;
+	if (svc !== null && svc !== void 0) {
+		out["richMediaTmpPaths"] = await enumerateTmpPaths(svc);
+		out["richMediaMethods"] = Object.getOwnPropertyNames(Object.getPrototypeOf(svc));
+	} else out["richMediaService"] = "null";
+	const flash = typeof sess.getFlashTransferService === "function" ? sess.getFlashTransferService() : null;
+	if (flash !== null && flash !== void 0) {
+		out["flashMethods"] = Object.getOwnPropertyNames(Object.getPrototypeOf(flash));
+		out["flashSideEffects"] = await probeFlashSideEffects(flash);
+	} else out["flashService"] = "null";
+	return out;
+}
 /** 统一动作调用：查找动作表 → 执行 → 返回结果或错误（不抛，调用方转 result）。 */
 async function callIpcAction(actions, action, params) {
 	const handler = actions.get(action);
@@ -510,6 +637,9 @@ function startIpcMode(services) {
 		groupCache: services.groupCache,
 		friendApi: services.friendApi,
 		self: services.self,
+		session: services.session,
+		engine: services.engine,
+		util: services.util,
 		...groupApi.uinToUid !== void 0 ? { uinToUid: groupApi.uinToUid } : {}
 	}) });
 	const stops = [];
@@ -612,6 +742,10 @@ function loadProtocolSections(kernel, uin) {
 * assemble-protocols.ts：OB11 / Satori 协议装配（非 IPC 模式，cli pnpm start）。
 * 2026-08-08：从 protocols.ts 拆分——protocols.ts 只留入口 + IPC 分支。
 */
+/** Windows 反斜杠（file:// URL 化时替换）。 */
+const BACKSLASH_RE = /\\/g;
+/** adapter 入口 index.mjs 后缀（子路径导出替换用）。 */
+const INDEX_MJS_RE = /index\.mjs$/;
 /** 装配 OB11 + Satori 适配器（登录成功后，非 IPC 模式）。 */
 async function assembleOb11AndSatori(kernel, services, loginResult) {
 	const adapterEntry = env.NAPUTO_ADAPTER_ENTRY;
@@ -621,13 +755,13 @@ async function assembleOb11AndSatori(kernel, services, loginResult) {
 		return;
 	}
 	try {
-		const network = await import(`file://${networkEntry.replace(/\\/g, "/")}`);
-		const onebot11Entry = adapterEntry.replace(/index\.mjs$/, "onebot11/index.mjs");
-		const satoriEntry = adapterEntry.replace(/index\.mjs$/, "satori/index.mjs");
-		const coreEntry = adapterEntry.replace(/index\.mjs$/, "core/index.mjs");
-		const adapter = await import(`file://${onebot11Entry.replace(/\\/g, "/")}`);
-		const satoriAdapter = await import(`file://${satoriEntry.replace(/\\/g, "/")}`);
-		const adapterCore = await import(`file://${coreEntry.replace(/\\/g, "/")}`);
+		const network = await import(`file://${networkEntry.replace(BACKSLASH_RE, "/")}`);
+		const onebot11Entry = adapterEntry.replace(INDEX_MJS_RE, "onebot11/index.mjs");
+		const satoriEntry = adapterEntry.replace(INDEX_MJS_RE, "satori/index.mjs");
+		const coreEntry = adapterEntry.replace(INDEX_MJS_RE, "core/index.mjs");
+		const adapter = await import(`file://${onebot11Entry.replace(BACKSLASH_RE, "/")}`);
+		const satoriAdapter = await import(`file://${satoriEntry.replace(BACKSLASH_RE, "/")}`);
+		const adapterCore = await import(`file://${coreEntry.replace(BACKSLASH_RE, "/")}`);
 		const { channel, groupCache } = services;
 		const broadcaster = new network.EventBroadcaster();
 		const { cfgFile, ob11Section, satoriSection } = loadProtocolSections(kernel, loginResult.uin);
@@ -772,7 +906,8 @@ async function createKernelServices(kernel, ctx, loginResult) {
 	new kernel.MsgBridge(session, channel).register();
 	setupMsgLogging(kernel, channel, logger);
 	const groupApi = new kernel.GroupApi(session);
-	const msgApi = new kernel.MsgApi(session);
+	const util = ctx.exports?.NodeQQNTWrapperUtil;
+	const msgApi = new kernel.MsgApi(session, channel, util);
 	const friendApi = new kernel.FriendApi(session, { uidToUin: (uids) => groupApi.uidToUin(uids) });
 	const groupChannel = new kernel.NTEventChannel("Group");
 	new kernel.GroupBridge(session, groupChannel).register();
@@ -802,7 +937,10 @@ async function createKernelServices(kernel, ctx, loginResult) {
 		self: {
 			uin: loginResult.uin,
 			nickname: loginResult.nick ?? ""
-		}
+		},
+		session,
+		engine: ctx.engine,
+		util: ctx.exports?.NodeQQNTWrapperUtil
 	};
 }
 //#endregion
@@ -855,32 +993,32 @@ function isSessionUsable(s) {
 		return false;
 	}
 }
+/** 描述单个 session 对象（探测日志用；无效对象返回带断言信息的占位）。 */
+function describeSession(s) {
+	if (!s) return "null";
+	try {
+		const sess = s;
+		const id = typeof sess.getSessionId === "function" ? String(sess.getSessionId()) : "?";
+		const svc = typeof sess.getMsgService === "function" ? sess.getMsgService() : null;
+		return `id=${id} msgSvc=${svc !== null && svc !== void 0 ? "READY" : "null"}`;
+	} catch (e) {
+		return `id=? msgSvc=断言(${errMsg(e).slice(0, 60)})`;
+	}
+}
+/** 非空候选才追加探测描述。 */
+function pushProbe(out, label, candidate) {
+	if (candidate) out.push(`${label}[${describeSession(candidate)}]`);
+}
 /** session 就绪探测（5s 间隔，60s 上限）——观察 qqSession / get() 状态。 */
 function startSessionProbe(state, _ctx, durationMs = 6e4) {
 	const sessionProbe = setInterval(() => {
 		try {
 			const S2 = state.wrapperExports?.["NodeIQQNTWrapperSession"];
 			const out = [];
-			const describe = (s) => {
-				if (!s) return "null";
-				try {
-					const sess = s;
-					const id = typeof sess.getSessionId === "function" ? String(sess.getSessionId()) : "?";
-					const svc = typeof sess.getMsgService === "function" ? sess.getMsgService() : null;
-					return `id=${id} msgSvc=${svc !== null && svc !== void 0 ? "READY" : "null"}`;
-				} catch (e) {
-					return `id=? msgSvc=断言(${errMsg(e).slice(0, 60)})`;
-				}
-			};
-			if (state.qqSession && typeof state.qqSession.getMsgService === "function") out.push(`qqSession[${describe(state.qqSession)}]`);
-			if (S2 && typeof S2.get === "function") {
-				const got = S2.get();
-				out.push(`get()[${describe(got)}]`);
-			}
-			if (S2 && typeof S2.getNTWrapperSession === "function") {
-				const gotNT = S2.getNTWrapperSession("Session");
-				if (gotNT) out.push(`getNT("Session")[${describe(gotNT)}]`);
-			}
+			const qqSession = state.qqSession;
+			if (qqSession && typeof qqSession.getMsgService === "function") pushProbe(out, "qqSession", qqSession);
+			if (S2 && typeof S2.get === "function") pushProbe(out, "get()", S2.get());
+			if (S2 && typeof S2.getNTWrapperSession === "function") pushProbe(out, "getNT(\"Session\")", S2.getNTWrapperSession("Session"));
 			log(`BOOT: session 探测: ${out.join(" | ")}`);
 		} catch (e) {
 			log(`BOOT: session 探测失败: ${errMsg(e)}`);
@@ -1129,11 +1267,13 @@ function buildLoginOpts(Appid, forcedUin, ref) {
 	};
 	const ipcMode = env.NAPUTO_IPC === "1";
 	opts["onLoginProgress"] = (progress) => {
-		if (progress.qr !== void 0) if (ipcMode) sendQr(progress.qr.pngBase64, progress.qr.qrcodeUrl);
-		else node_process.default.stdout.write(`${QR_LINE_PREFIX}${JSON.stringify({
-			pngBase64: progress.qr.pngBase64,
-			qrcodeUrl: progress.qr.qrcodeUrl
-		})}\n`);
+		if (progress.qr !== void 0) {
+			if (ipcMode) sendQr(progress.qr.pngBase64, progress.qr.qrcodeUrl);
+			else node_process.default.stdout.write(`${QR_LINE_PREFIX}${JSON.stringify({
+				pngBase64: progress.qr.pngBase64,
+				qrcodeUrl: progress.qr.qrcodeUrl
+			})}\n`);
+		}
 		if (ipcMode && isLoginState(progress.state)) sendLogin(progress.state, progress.selfInfo);
 	};
 	return opts;
@@ -1284,6 +1424,43 @@ async function bootstrapWithCore(kernel, state, bootEnv, Appid) {
 function resolveAppid(kernel, bootEnv) {
 	return typeof kernel.parseAppidFromMajor === "function" && bootEnv.wrapperPath && kernel.parseAppidFromMajor((0, node_path.join)((0, node_path.dirname)(bootEnv.wrapperPath), "major.node")) || typeof kernel.resolveAppidQua === "function" && kernel.resolveAppidQua(bootEnv.qqVersion || "").appid || "537237765";
 }
+/** 快速登录 + session 初始化（kernel lifecycle 路径；生命周期方法缺失则跳过）。 */
+async function quickLoginAndStartSession(kernel, ctx, Appid, bootEnv) {
+	if (typeof kernel.quickLogin !== "function" || typeof kernel.initAndStartSession !== "function") {
+		log("bootstrap: kernel missing lifecycle fns (quickLogin/initAndStartSession)");
+		return;
+	}
+	if (typeof kernel.buildLoginConfig === "function" && ctx.loginService) {
+		const loginCfg = kernel.buildLoginConfig(Appid, bootEnv.qqVersion || "", bootEnv.dataDir || ".");
+		if (typeof ctx.loginService.initConfig === "function") {
+			ctx.loginService.initConfig(loginCfg);
+			log("bootstrap: loginService.initConfig OK");
+		}
+	}
+	const loginResult = await kernel.quickLogin(ctx, {});
+	log(`bootstrap: quickLogin OK, uin=${loginResult.uin}, uid=${loginResult.uid}`);
+	const sessionConfig = kernel.buildSessionConfig({
+		appid: Appid,
+		fullVersion: bootEnv.qqVersion || "",
+		selfUin: loginResult.uin,
+		selfUid: loginResult.uid,
+		accountPath: bootEnv.dataDir || ".",
+		downloadPath: (0, node_path.join)(bootEnv.dataDir || ".", "temp")
+	});
+	const listener = kernel.createLifecycleSessionListener();
+	await kernel.initAndStartSession(ctx, sessionConfig, listener, { timeoutMs: 2e4 });
+	log("bootstrap: session init + startNT OK!");
+}
+/** 冒烟探测（NAPUTO_PROBE=1 时运行）。 */
+async function probeRuntime(kernel, ctx) {
+	if (env.NAPUTO_PROBE !== "1" || typeof kernel.probeRuntime !== "function") return;
+	try {
+		const probe = kernel.probeRuntime(ctx);
+		log(`bootstrap: probe done, session=${probe.session ? "ok" : "null"}, services=${Object.keys(probe.services ?? {}).length}`);
+	} catch (e) {
+		log(`bootstrap: probe error: ${errMsg(e)}`);
+	}
+}
 /** 回退：旧装配路径（startNapuketto + 手工 lifecycle）。 */
 async function bootstrapFallback(kernel, state, bootEnv, Appid) {
 	log("bootstrap: kernel has no NapukettoCore, falling back");
@@ -1296,34 +1473,8 @@ async function bootstrapFallback(kernel, state, bootEnv, Appid) {
 		return;
 	}
 	log(`bootstrap: startNapuketto OK, engine=${typeof ctx.engine}, session=${ctx.session !== null}`);
-	if (typeof kernel.quickLogin === "function" && typeof kernel.initAndStartSession === "function") {
-		if (typeof kernel.buildLoginConfig === "function" && ctx.loginService) {
-			const loginCfg = kernel.buildLoginConfig(Appid, bootEnv.qqVersion || "", bootEnv.dataDir || ".");
-			if (typeof ctx.loginService.initConfig === "function") {
-				ctx.loginService.initConfig(loginCfg);
-				log("bootstrap: loginService.initConfig OK");
-			}
-		}
-		const loginResult = await kernel.quickLogin(ctx, {});
-		log(`bootstrap: quickLogin OK, uin=${loginResult.uin}, uid=${loginResult.uid}`);
-		const sessionConfig = kernel.buildSessionConfig({
-			appid: Appid,
-			fullVersion: bootEnv.qqVersion || "",
-			selfUin: loginResult.uin,
-			selfUid: loginResult.uid,
-			accountPath: bootEnv.dataDir || ".",
-			downloadPath: (0, node_path.join)(bootEnv.dataDir || ".", "temp")
-		});
-		const listener = kernel.createLifecycleSessionListener();
-		await kernel.initAndStartSession(ctx, sessionConfig, listener, { timeoutMs: 2e4 });
-		log("bootstrap: session init + startNT OK!");
-	} else log("bootstrap: kernel missing lifecycle fns (quickLogin/initAndStartSession)");
-	if (env.NAPUTO_PROBE === "1" && typeof kernel.probeRuntime === "function") try {
-		const probe = kernel.probeRuntime(ctx);
-		log(`bootstrap: probe done, session=${probe.session ? "ok" : "null"}, services=${Object.keys(probe.services ?? {}).length}`);
-	} catch (e) {
-		log(`bootstrap: probe error: ${errMsg(e)}`);
-	}
+	await quickLoginAndStartSession(kernel, ctx, Appid, bootEnv);
+	await probeRuntime(kernel, ctx);
 }
 /** 核心引导：import kernel → 装配 → 登录 → 替换 session → 等待就绪 → 协议装配。 */
 async function bootstrap(state) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@napuketto/loader",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "NapukettoQQ 引导组件：自建宿主（标准 Node + stub QQNT.dll）dlopen wrapper.node 并启动 kernel，不拉起 QQ / 不注入",
   "type": "module",
   "files": [