@napuketto/loader 0.0.11 → 0.0.12

package/dist/host/self-host.cjs

@@ -223,6 +223,14 @@ function createState() {
 * workspace 依赖——见 types.ts 注释）。错误码提取用宽松结构判断。
 */
 /**
+* 注册 login.refreshQr 动作（登录期即可用——不依赖 session 服务，只依赖
+* core.refreshQr）。bootstrap 提前启动 IPC 服务端时先注册本动作，登录完成后
+* 再把 kernel 服务的完整动作并入同一张表。
+*/
+function registerLoginRefreshAction(actions, refreshQr) {
+	actions.set("login.refreshQr", async () => refreshQr());
+}
+/**
 * 从宽松 params 构造 Peer（缺省 chatType=1 群聊）。
 * 优先 peerUid（uid 直通）；缺省时 peerUin 经 uinToUid 转换。
 *
@@ -500,13 +508,14 @@ function sendStatus(phase, message, error) {
 	});
 }
 /** 登录状态（QR 状态机 idle/waiting_scan/scanned/logged_in/failed）。 */
-function sendLogin(state, selfInfo) {
+function sendLogin(state, selfInfo, message) {
 	sendIpc({
 		v: 1,
 		type: "login",
 		payload: {
 			state,
-			...selfInfo !== void 0 ? { selfInfo } : {}
+			...selfInfo !== void 0 ? { selfInfo } : {},
+			...message !== void 0 ? { message } : {}
 		}
 	});
 }
@@ -557,6 +566,51 @@ function sendPing() {
 	});
 }
 //#endregion
+//#region src/host/ipc/ipc-bootstrap.ts
+/** 订阅事件通道 → event 消息转发（事件名 "Service/method" 拆分）。 */
+function forwardChannel(channel, stops) {
+	if (typeof channel.onAny !== "function") return;
+	const off = channel.onAny((event, ...args) => {
+		const slash = event.indexOf("/");
+		sendEvent(slash >= 0 ? event.slice(0, slash) : event, slash >= 0 ? event.slice(slash + 1) : "", args);
+	});
+	if (typeof off === "function") stops.push(off);
+}
+/**
+* 登录期动作表：只含 login.refreshQr（依赖 core.refreshQr，不依赖 session 服务）。
+* bootstrap-core 在登录前用它启动 IPC 服务端——登录中前端即可刷新二维码。
+*/
+function createIpcActionsForCore(core) {
+	const actions = /* @__PURE__ */ new Map();
+	if (typeof core.refreshQr === "function") registerLoginRefreshAction(actions, () => core.refreshQr?.() ?? false);
+	return actions;
+}
+/**
+* 把 kernel 服务动作并入共享动作表 + 事件通道转发（登录成功后调用）。
+* 返回停止函数（清理事件转发订阅；stdin 服务端由 bootstrap-core 独立管理）。
+*/
+function attachIpcServices(actions, services) {
+	const groupApi = services.groupApi;
+	const full = createIpcActions({
+		msgApi: services.msgApi,
+		groupApi: services.groupApi,
+		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 } : {}
+	});
+	for (const [name, handler] of full) actions.set(name, handler);
+	const stops = [];
+	forwardChannel(services.channel, stops);
+	forwardChannel(services.groupChannel, stops);
+	return () => {
+		for (const stop of stops) stop();
+	};
+}
+//#endregion
 //#region src/host/ipc/ipc-codec.ts
 /**
 * ipc-codec.ts：IPC 消息编解码（JSON 行协议，与 koishi 插件侧 src/ipc/codec.ts 对齐）。
@@ -617,40 +671,6 @@ function handleControl(payload, onExit) {
 	if (payload.command === "stop" || payload.command === "restart") onExit();
 }
 //#endregion
-//#region src/host/ipc/ipc-bootstrap.ts
-/** 订阅事件通道 → event 消息转发（事件名 "Service/method" 拆分）。 */
-function forwardChannel(channel, stops) {
-	if (typeof channel.onAny !== "function") return;
-	const off = channel.onAny((event, ...args) => {
-		const slash = event.indexOf("/");
-		sendEvent(slash >= 0 ? event.slice(0, slash) : event, slash >= 0 ? event.slice(slash + 1) : "", args);
-	});
-	if (typeof off === "function") stops.push(off);
-}
-/** IPC 模式装配（enableIpc + 动作表 + 服务端 + 事件转发）。返回停止函数。 */
-function startIpcMode(services) {
-	enableIpc();
-	const groupApi = services.groupApi;
-	const stopServer = startIpcServer({ actions: createIpcActions({
-		msgApi: services.msgApi,
-		groupApi: services.groupApi,
-		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 = [];
-	forwardChannel(services.channel, stops);
-	forwardChannel(services.groupChannel, stops);
-	return () => {
-		stopServer();
-		for (const stop of stops) stop();
-	};
-}
-//#endregion
 //#region src/host/core/login.ts
 /** 打印可用快速登录账号 + 返回目标账号（启动横幅）。forcedUin（cli `-q` / NAPUTO_QUICK_UIN）优先。 */
 async function pickLoginAccount(kernel, ctx, loginResultRef, forcedUin) {
@@ -1274,7 +1294,7 @@ function buildLoginOpts(Appid, forcedUin, ref) {
 				qrcodeUrl: progress.qr.qrcodeUrl
 			})}\n`);
 		}
-		if (ipcMode && isLoginState(progress.state)) sendLogin(progress.state, progress.selfInfo);
+		if (ipcMode && isLoginState(progress.state)) sendLogin(progress.state, progress.selfInfo, progress.message);
 	};
 	return opts;
 }
@@ -1363,6 +1383,11 @@ async function bootstrapWithCore(kernel, state, bootEnv, Appid) {
 		paths: { dataRoot: bootEnv.dataDir },
 		logLevel: "info"
 	});
+	let ipcActions = null;
+	if (env.NAPUTO_IPC === "1") {
+		ipcActions = createIpcActionsForCore(core);
+		startIpcServer({ actions: ipcActions });
+	}
 	const ctx = core.attachWrapper(state.wrapperExports, { ...bootEnv });
 	log(`bootstrap: attachWrapper OK, engine=${typeof ctx.engine}, session=${ctx.session !== null}`);
 	probeCreatedSession(state, ctx);
@@ -1396,7 +1421,7 @@ async function bootstrapWithCore(kernel, state, bootEnv, Appid) {
 	if (env.NAPUTO_IPC === "1") sendStatus("sessioning");
 	await runSmokeIfEnabled(kernel, ctx, loginResult);
 	const services = await startProtocols(kernel, ctx, loginResult);
-	if (env.NAPUTO_IPC === "1" && services !== null) startIpcMode(services);
+	if (env.NAPUTO_IPC === "1" && services !== null && ipcActions !== null) attachIpcServices(ipcActions, services);
 	runProbePhase(kernel, ctx);
 }
 //#endregion

package/package.json

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