@napuketto/loader 0.0.31 → 0.0.32

package/dist/host/self-host.cjs

@@ -1236,6 +1236,7 @@ function loadProtocolSections(kernel, uin) {
 	const cfgFile = env.NAPKETTO_CONFIG || (0, node_path.join)(env.NAPUTO_CFG_DIR || ".", "napuketto.toml");
 	let ob11Section = {};
 	let satoriSection = {};
+	let kurobotSection = {};
 	try {
 		const raw = (0, node_fs.readFileSync)(cfgFile, "utf8");
 		const accounts = kernel.parseToml(raw)["accounts"];
@@ -1244,6 +1245,7 @@ function loadProtocolSections(kernel, uin) {
 			if (mine !== void 0) {
 				ob11Section = sectionOf(mine, "onebot11") ?? {};
 				satoriSection = sectionOf(mine, "satori") ?? {};
+				kurobotSection = sectionOf(mine, "kurobot") ?? {};
 			}
 		}
 	} catch (e) {
@@ -1252,7 +1254,8 @@ function loadProtocolSections(kernel, uin) {
 	return {
 		cfgFile,
 		ob11Section,
-		satoriSection
+		satoriSection,
+		kurobotSection
 	};
 }
 //#endregion
@@ -1287,13 +1290,15 @@ async function assembleOb11AndSatori(kernel, services, loginResult) {
 		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 kurobotEntry = adapterEntry.replace(INDEX_MJS_RE, "kurobot/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 kurobotAdapter = await import(`file://${kurobotEntry.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);
+		const { cfgFile, ob11Section, satoriSection, kurobotSection } = loadProtocolSections(kernel, loginResult.uin);
 		const ob11Config = new adapterCore.ProtocolConfig({
 			path: cfgFile,
 			schema: adapter.ob11ConfigSchema,
@@ -1366,9 +1371,28 @@ async function assembleOb11AndSatori(kernel, services, loginResult) {
 		});
 		await satori.start();
 		log("bootstrap: satori adapter started");
+		let kurobot = null;
+		if (Object.keys(kurobotSection).length > 0) {
+			const kurobotConfig = new adapterCore.ProtocolConfig({
+				path: cfgFile,
+				schema: kurobotAdapter.kurobotConfigSchema,
+				defaults: kurobotAdapter.kurobotConfigDefaults(),
+				seed: kurobotAdapter.kurobotConfigSchema.parse(kurobotSection)
+			});
+			kurobot = new kurobotAdapter.NapukettoKurobotAdapter({
+				config: kurobotConfig,
+				msgChannel: channel,
+				msgApi: services.msgApi,
+				self: services.self,
+				logger: services.logger
+			});
+			await kurobot.start();
+			log("bootstrap: kurobot adapter started");
+		}
 		return async () => {
 			await ob11.stop();
 			await satori.stop();
+			if (kurobot !== null) await kurobot.stop();
 		};
 	} catch (e) {
 		log(`bootstrap: 协议装配失败: ${errMsg(e)}`);
@@ -1681,6 +1705,7 @@ function createLoginControlHandler(core, Appid, control, deps) {
 		const opts = {
 			appid: String(Appid),
 			initTimeoutMs: 2e4,
+			quickLoginTimeoutMs: 2e4,
 			qrFallback: true,
 			...payload.uin !== void 0 ? { quickUin: payload.uin } : {},
 			...payload.qr === true ? { qrOnly: true } : {},

package/package.json

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