mioku 0.9.6 → 0.9.7

package/dist/index.cjs

@@ -178,6 +178,125 @@ function getOrCreate(key, factory) {
 	return s[key];
 }
 
+//#endregion
+//#region src/core/plugin-manifest.ts
+const PLUGIN_CONFIG_KEYS = new Set([
+	"services",
+	"help",
+	"accessHooks"
+]);
+const ACCESS_HOOK_KEYS = new Set([
+	"id",
+	"match",
+	"event",
+	"description"
+]);
+const HELP_COMMAND_KEYS = new Set([
+	"cmd",
+	"desc",
+	"usage",
+	"role"
+]);
+function warnUnknownFields(prefix, obj, allowed) {
+	for (const key of Object.keys(obj)) if (!allowed.has(key)) logger.warn(`[plugin-manifest] ${prefix} 含未知字段 "${key}"（将被忽略）`);
+}
+function isPlainObject(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function validateHelp(value, pluginName) {
+	if (value === void 0) return void 0;
+	if (!isPlainObject(value)) {
+		logger.warn(`[plugin-manifest] ${pluginName}.help 必须是对象，已忽略`);
+		return void 0;
+	}
+	warnUnknownFields(`${pluginName}.help`, value, HELP_COMMAND_KEYS);
+	const title = String(value.title ?? "").trim();
+	const description = String(value.description ?? "").trim();
+	const rawCommands = value.commands;
+	if (!title) logger.warn(`[plugin-manifest] ${pluginName}.help.title 缺失或为空`);
+	if (!description) logger.warn(`[plugin-manifest] ${pluginName}.help.description 缺失或为空`);
+	if (!Array.isArray(rawCommands)) {
+		logger.warn(`[plugin-manifest] ${pluginName}.help.commands 必须是数组`);
+		return {
+			title,
+			description,
+			commands: []
+		};
+	}
+	const commands = [];
+	for (const cmd of rawCommands) {
+		if (!isPlainObject(cmd)) {
+			logger.warn(`[plugin-manifest] ${pluginName}.help.commands 项不是对象`);
+			continue;
+		}
+		warnUnknownFields(`${pluginName}.help.commands[]`, cmd, HELP_COMMAND_KEYS);
+		const cmdName = String(cmd.cmd ?? "").trim();
+		const desc = String(cmd.desc ?? "").trim();
+		if (!cmdName || !desc) {
+			logger.warn(`[plugin-manifest] ${pluginName}.help.commands 项缺少 cmd 或 desc`);
+			continue;
+		}
+		commands.push({
+			cmd: cmdName,
+			desc,
+			usage: typeof cmd.usage === "string" ? cmd.usage : void 0,
+			role: typeof cmd.role === "string" ? cmd.role : void 0
+		});
+	}
+	return {
+		title,
+		description,
+		commands
+	};
+}
+function validateAccessHooks(value, pluginName) {
+	if (value === void 0) return void 0;
+	if (!Array.isArray(value)) {
+		logger.warn(`[plugin-manifest] ${pluginName}.accessHooks 必须是数组`);
+		return void 0;
+	}
+	const hooks = [];
+	for (const hook of value) {
+		if (!isPlainObject(hook)) {
+			logger.warn(`[plugin-manifest] ${pluginName}.accessHooks 项不是对象`);
+			continue;
+		}
+		warnUnknownFields(`${pluginName}.accessHooks[]`, hook, ACCESS_HOOK_KEYS);
+		const id = String(hook.id ?? "").trim();
+		if (!id) {
+			logger.warn(`[plugin-manifest] ${pluginName}.accessHooks 项缺少 id，已忽略`);
+			continue;
+		}
+		hooks.push({
+			id,
+			match: typeof hook.match === "string" ? hook.match : void 0,
+			event: typeof hook.event === "string" ? hook.event : void 0,
+			description: typeof hook.description === "string" ? hook.description : void 0
+		});
+	}
+	return hooks;
+}
+function validatePluginPackageConfig(raw, pluginName) {
+	const config = {};
+	if (raw === void 0 || raw === null) return config;
+	if (!isPlainObject(raw)) {
+		logger.warn(`[plugin-manifest] ${pluginName} 的 mioku 字段必须是对象，已使用空配置`);
+		return config;
+	}
+	warnUnknownFields(`${pluginName}.mioku`, raw, PLUGIN_CONFIG_KEYS);
+	if (raw.services !== void 0) if (Array.isArray(raw.services)) {
+		const services = raw.services.filter((s) => typeof s === "string" && s.length > 0);
+		const dropped = raw.services.length - services.length;
+		if (dropped > 0) logger.warn(`[plugin-manifest] ${pluginName}.services 丢弃 ${dropped} 个非字符串项`);
+		config.services = services;
+	} else logger.warn(`[plugin-manifest] ${pluginName}.services 必须是字符串数组`);
+	const help = validateHelp(raw.help, pluginName);
+	if (help) config.help = help;
+	const hooks = validateAccessHooks(raw.accessHooks, pluginName);
+	if (hooks) config.accessHooks = hooks;
+	return config;
+}
+
 //#endregion
 //#region src/core/plugin-manager.ts
 const PLUGIN_PREFIX = "mioku-plugin-";
@@ -212,7 +331,7 @@ var PluginManager = class PluginManager {
 		} catch (error) {
 			logger.warn(`[plugin-manager] 读取 ${name} 的 package.json 失败: ${error}`);
 		}
-		const config = packageJson?.mioku ?? {};
+		const config = validatePluginPackageConfig(packageJson?.mioku, name);
 		return {
 			name,
 			version: packageJson?.version ?? "0.0.0",
@@ -382,68 +501,49 @@ async function bootstrapMioku(deps) {
 }
 
 //#endregion
-//#region src/core/plugin-artifact-registry.ts
-function isAISkill(value) {
-	return !!value && typeof value === "object" && typeof value.name === "string" && Array.isArray(value.tools);
-}
-function extractSkills(moduleExports) {
-	const candidates = [
-		moduleExports?.default,
-		moduleExports?.skills,
-		moduleExports
-	];
-	for (const candidate of candidates) {
-		if (Array.isArray(candidate)) return candidate.filter(isAISkill);
-		if (isAISkill(candidate)) return [candidate];
-	}
-	return [];
-}
-async function resolveSkillsEntry(pluginPath) {
-	const tsPath = path.join(pluginPath, "skills.ts");
-	if (await pathExists(tsPath)) return tsPath;
-	const jsPath = path.join(pluginPath, "skills.js");
-	if (await pathExists(jsPath)) return jsPath;
-	return null;
+//#region src/core/service.ts
+function defineService(id) {
+	return { id };
+}
+function getService(ctx, ref) {
+	return ctx.services[ref.id];
 }
+function requireService(ctx, ref) {
+	const svc = ctx.services[ref.id];
+	if (svc === void 0) throw new Error(`[mioku] required service "${ref.id}" is not available`);
+	return svc;
+}
+function hasService(ctx, ref) {
+	return ctx.services[ref.id] !== void 0;
+}
+
+//#endregion
+//#region src/core/services.ts
+const Services = {
+	AI: defineService("ai"),
+	Config: defineService("config"),
+	Screenshot: defineService("screenshot"),
+	Help: defineService("help")
+};
+
+//#endregion
+//#region src/core/plugin-artifact-registry.ts
 function hasPublicKeyword(keywords) {
 	return Array.isArray(keywords) && keywords.includes("mioku");
 }
 async function registerPluginArtifacts(ctx) {
 	const enabledPlugins = new Set(mioki.botConfig.plugins ?? []);
 	const pluginMetadata = plugin_manager_default.getAllMetadata().filter((metadata) => enabledPlugins.size > 0 ? enabledPlugins.has(metadata.name) : true);
-	const helpService = ctx.services.help;
-	const aiService = ctx.services.ai;
-	if (helpService) {
-		let helpCount = 0;
-		for (const metadata of pluginMetadata) {
-			if (!metadata.config.help) continue;
-			if (!hasPublicKeyword(metadata.packageJson?.keywords)) continue;
-			helpService.registerHelp(metadata.name, metadata.config.help);
-			helpCount += 1;
-		}
-		logger.info(`[plugin-artifacts] Registered ${helpCount} help manifest(s)`);
-	}
-	if (!aiService) return;
-	let skillCount = 0;
+	const helpService = getService(ctx, Services.Help);
+	if (!helpService) return;
+	let helpCount = 0;
 	for (const metadata of pluginMetadata) {
-		const skillsEntry = await resolveSkillsEntry(metadata.path);
-		if (!skillsEntry) continue;
-		try {
-			const moduleExports = await import(toImportPath(skillsEntry));
-			const skills = extractSkills(moduleExports);
-			if (skills.length === 0) {
-				logger.warn(`[plugin-artifacts] Plugin ${metadata.name} has ${path.basename(skillsEntry)} but exported no valid skill`);
-				continue;
-			}
-			for (const skill of skills) {
-				aiService.registerSkill(skill);
-				skillCount += 1;
-			}
-		} catch (error) {
-			logger.error(`[plugin-artifacts] Failed to load skills for plugin ${metadata.name}: ${error}`);
-		}
+		if (!metadata.config.help) continue;
+		if (!hasPublicKeyword(metadata.packageJson?.keywords)) continue;
+		helpService.registerHelp(metadata.name, metadata.config.help);
+		helpCount += 1;
 	}
-	logger.info(`[plugin-artifacts] Registered ${skillCount} skill(s)`);
+	logger.info(`[plugin-artifacts] Registered ${helpCount} help manifest(s)`);
 }
 
 //#endregion
@@ -499,6 +599,11 @@ async function deleteServiceConfig(serviceName, configName) {
 
 //#endregion
 //#region src/types.ts
+function normalizeSkillPermissionRole(role) {
+	const normalized = String(role ?? "").trim().toLowerCase();
+	if (normalized === "master" || normalized === "owner" || normalized === "admin" || normalized === "member") return normalized;
+	return "member";
+}
 const TOOL_RESULT_FOLLOWUP_KEY = "__miokuFollowup";
 
 //#endregion
@@ -530,17 +635,36 @@ function ensureDataDir(pluginName) {
 //#endregion
 //#region src/core/plugin-runtime-state.ts
 const store = getOrCreate("plugin-runtime-state", () => ({}));
-function getPluginRuntimeState(pluginName) {
-	if (!store[pluginName]) store[pluginName] = {};
-	return store[pluginName];
+function defineState(name, initial) {
+	return {
+		name,
+		get() {
+			const current = store[name];
+			return current === void 0 ? initial : current;
+		},
+		set(next) {
+			store[name] = next;
+		},
+		reset() {
+			delete store[name];
+		}
+	};
+}
+function hasPluginState(name) {
+	return store[name] !== void 0;
+}
+function getPluginRuntimeState(name) {
+	if (!store[name]) store[name] = {};
+	return store[name];
+}
+function setPluginRuntimeState(name, state) {
+	store[name] = state;
 }
-function setPluginRuntimeState(pluginName, state) {
-	if (!store[pluginName]) store[pluginName] = {};
-	Object.assign(store[pluginName], state);
-	return store[pluginName];
+function resetPluginRuntimeState(name) {
+	delete store[name];
 }
-function resetPluginRuntimeState(pluginName) {
-	delete store[pluginName];
+function getAllPluginRuntimeStates() {
+	return { ...store };
 }
 
 //#endregion
@@ -553,6 +677,23 @@ async function start(options = {}) {
 	if (cwd) process.chdir(cwd);
 	const { start: startMioki, logger: logger$1, botConfig: botConfig$1 } = await import("mioki");
 	setMiokuLogger(logger$1);
+	let shuttingDown = false;
+	const shutdown = async (signal) => {
+		if (shuttingDown) return;
+		shuttingDown = true;
+		logger$1.info(`收到 ${signal} 信号，正在关闭服务...`);
+		const timer = setTimeout(() => {
+			logger$1.error("服务关闭超时，强制退出");
+			process.exit(1);
+		}, 15e3);
+		timer.unref();
+		await service_manager_default.disposeAll();
+		clearTimeout(timer);
+		logger$1.info("Mioku 服务已完全关闭");
+		process.exit(0);
+	};
+	process.on("SIGINT", () => shutdown("SIGINT"));
+	process.on("SIGTERM", () => shutdown("SIGTERM"));
 	logger$1.info("こんにちは..");
 	logger$1.info("---------------------------------------");
 	logger$1.info("----------  Mioku 正在启动 ------------");
@@ -575,24 +716,33 @@ function readVersion() {
 const version = readVersion();
 
 //#endregion
+exports.Services = Services;
 exports.TOOL_RESULT_FOLLOWUP_KEY = TOOL_RESULT_FOLLOWUP_KEY;
 exports.buildSpawnPlan = require_exec.buildSpawnPlan;
 exports.commandExists = require_exec.commandExists;
 exports.definePlugin = definePlugin;
+exports.defineService = defineService;
+exports.defineState = defineState;
 exports.deleteServiceConfig = deleteServiceConfig;
 exports.ensureDataDir = ensureDataDir;
+exports.getAllPluginRuntimeStates = getAllPluginRuntimeStates;
 exports.getConfigDir = getConfigDir;
 exports.getDataDir = getDataDir;
 exports.getPluginConfigDir = getPluginConfigDir;
 exports.getPluginDataDir = getPluginDataDir;
 exports.getPluginRuntimeState = getPluginRuntimeState;
+exports.getService = getService;
 exports.getServiceConfig = getServiceConfig;
 exports.getServiceConfigDir = getServiceConfigDir;
 exports.getServiceConfigs = getServiceConfigs;
 exports.getServiceDataDir = getServiceDataDir;
+exports.hasPluginState = hasPluginState;
+exports.hasService = hasService;
+exports.normalizeSkillPermissionRole = normalizeSkillPermissionRole;
 exports.pluginManager = plugin_manager_default;
 exports.registerPluginArtifacts = registerPluginArtifacts;
 exports.registerServiceConfig = registerServiceConfig;
+exports.requireService = requireService;
 exports.resetPluginRuntimeState = resetPluginRuntimeState;
 exports.resolveCommand = require_exec.resolveCommand;
 exports.runCommand = require_exec.runCommand;