@koishi-ce/koishi 1.0.4 → 1.0.6

package/lib/cli/index.mjs

@@ -1,13 +1,13 @@
 #!/usr/bin/env bun
 import { cac } from "cac";
 import { hyphenate, isInteger } from "@koishi-ce/utils";
-import kleur from "kleur";
+import pc from "picocolors";
 //#region package.json
 var package_default = {
 	name: "@koishi-ce/koishi",
 	type: "module",
 	description: "Cross-Platform Chatbot Framework Made with Love",
-	version: "1.0.4",
+	version: "1.0.6",
 	main: "lib/index.mjs",
 	module: "lib/index.mjs",
 	types: "lib/index.d.ts",
@@ -59,7 +59,7 @@ var package_default = {
 		"@koishi-ce/plugin-server": "workspace:*",
 		"@koishi-ce/utils": "workspace:*",
 		"cac": "^7.0.0",
-		"kleur": "^4.1.5"
+		"picocolors": "^1.1.1"
 	}
 };
 //#endregion
@@ -105,14 +105,14 @@ function createWorker(options) {
 		if (message.type === "start") {
 			config = message.body;
 			timer = config.heartbeatTimeout ? setTimeout(() => {
-				console.log(kleur.red("daemon: heartbeat timeout"));
+				console.log(pc.red("daemon: heartbeat timeout"));
 				child.kill("SIGKILL");
 			}, config.heartbeatTimeout) : void 0;
 		} else if (message.type === "shared") process.env["KOISHI_SHARED"] = message.body;
 		else if (message.type === "heartbeat" && timer && config.heartbeatTimeout) {
 			clearTimeout(timer);
 			timer = setTimeout(() => {
-				console.log(kleur.red("daemon: heartbeat timeout"));
+				console.log(pc.red("daemon: heartbeat timeout"));
 				child.kill("SIGKILL");
 			}, config.heartbeatTimeout);
 		}
@@ -163,7 +163,7 @@ function start_default(cli) {
 	cli.command("start [file]", "start a koishi bot").alias("run").allowUnknownOptions().option("--debug [namespace]", "specify debug namespace").option("--log-level [level]", "specify log level (default: 2)").option("--log-time [format]", "show timestamp in logs").action((file, options) => {
 		const { logLevel, debug, logTime, ...rest } = options;
 		if (logLevel !== void 0 && (!isInteger(logLevel) || logLevel < 0)) {
-			console.warn(`${kleur.red("error")} log level should be a positive integer.`);
+			console.warn(`${pc.red("error")} log level should be a positive integer.`);
 			process.exit(1);
 		}
 		setEnvArg("KOISHI_LOG_TIME", logTime);

package/package.json

@@ -2,7 +2,7 @@
     "name": "@koishi-ce/koishi",
     "type": "module",
     "description": "Cross-Platform Chatbot Framework Made with Love",
-    "version": "1.0.4",
+    "version": "1.0.6",
     "main": "lib/index.mjs",
     "module": "lib/index.mjs",
     "types": "lib/index.d.ts",
@@ -61,13 +61,13 @@
         }
     },
     "dependencies": {
-        "@koishi-ce/core": "^1.0.0",
-        "@koishi-ce/loader": "^1.0.4",
+        "@koishi-ce/core": "^1.0.1",
+        "@koishi-ce/loader": "^1.0.5",
         "@koishi-ce/plugin-http": "^1.0.0",
         "@koishi-ce/plugin-proxy-agent": "^1.0.0",
-        "@koishi-ce/plugin-server": "^1.0.0",
+        "@koishi-ce/plugin-server": "^1.0.1",
         "@koishi-ce/utils": "^1.0.0",
         "cac": "^7.0.0",
-        "kleur": "^4.1.5"
+        "picocolors": "^1.1.1"
     }
 }

package/src/cli/start.ts

@@ -12,7 +12,7 @@
 
 import { hyphenate, isInteger } from "@koishi-ce/utils";
 import type { CAC } from "cac";
-import kleur from "kleur";
+import pc from "picocolors";
 import type { Config } from "../worker/daemon.ts";
 
 /** 子进程通过 IPC 通道发来的消息类型（并集） */
@@ -20,7 +20,9 @@ type Event = Event.Start | Event.Env | Event.Heartbeat;
 /** 单个命令行选项的取值形态 */
 type WorkerOption = boolean | string | string[] | undefined;
 /** 传递给 worker 的完整选项表；`--` 键对应 cac 收集的透传参数 */
-type WorkerOptions = Record<string, WorkerOption> & { "--"?: string[] };
+type WorkerOptions = Record<string, WorkerOption> & {
+	"--"?: string[];
+};
 
 /** 子进程 IPC 消息的具体结构定义 */
 namespace Event {
@@ -54,7 +56,9 @@ process.env["KOISHI_SHARED"] = JSON.stringify({
  * 单字母键转为 `-x`，其余转为 `--kebab-case`。
  */
 function toArg(key: string) {
-	return key.length === 1 ? `-${key}` : `--${hyphenate(key)}`;
+	return key.length === 1
+		? `-${key}`
+		: `--${hyphenate(key)}`;
 }
 
 /**
@@ -67,21 +71,23 @@ function toArg(key: string) {
  */
 function createWorker(options: WorkerOptions) {
 	// 将选项对象还原为 Node/Bun 可识别的 execArgv 数组
-	const execArgv = Object.entries(options).flatMap<string>(([key, value]) => {
-		if (key === "--") return [];
-		key = toArg(key);
-		if (value === true) {
-			return [key];
-		} else if (value === false) {
-			// 布尔假值转为 --no-xxx 形式
-			return [`--no-${key.slice(2)}`];
-		} else if (Array.isArray(value)) {
-			// 数组值展开为多组 "键 值" 对
-			return value.flatMap((value) => [key, value]);
-		} else {
-			return [key, String(value)];
-		}
-	});
+	const execArgv = Object.entries(options).flatMap<string>(
+		([key, value]) => {
+			if (key === "--") return [];
+			key = toArg(key);
+			if (value === true) {
+				return [key];
+			} else if (value === false) {
+				// 布尔假值转为 --no-xxx 形式
+				return [`--no-${key.slice(2)}`];
+			} else if (Array.isArray(value)) {
+				// 数组值展开为多组 "键 值" 对
+				return value.flatMap((value) => [key, value]);
+			} else {
+				return [key, String(value)];
+			}
+		},
+	);
 	execArgv.push(...(options["--"] ?? []));
 
 	// worker 入口为构建产物 index.mjs，而非本 TS 源文件
@@ -96,7 +102,9 @@ function createWorker(options: WorkerOptions) {
 			timer = config.heartbeatTimeout
 				? setTimeout(() => {
 						// eslint-disable-next-line no-console
-						console.log(kleur.red("daemon: heartbeat timeout"));
+						console.log(
+							pc.red("daemon: heartbeat timeout"),
+						);
 						child.kill("SIGKILL");
 					}, config.heartbeatTimeout)
 				: undefined;
@@ -110,25 +118,28 @@ function createWorker(options: WorkerOptions) {
 			clearTimeout(timer);
 			timer = setTimeout(() => {
 				// eslint-disable-next-line no-console
-				console.log(kleur.red("daemon: heartbeat timeout"));
+				console.log(pc.red("daemon: heartbeat timeout"));
 				child.kill("SIGKILL");
 			}, config.heartbeatTimeout);
 		}
 	};
 
-	child = Bun.spawn([process.execPath, worker, ...execArgv], {
-		ipc: handleMessage,
-		// Bun.spawn 的 stdio 默认为 ignore，须显式继承输出通道，
-		// 否则 worker 的全部日志都会被丢弃
-		stdout: "inherit",
-		stderr: "inherit",
-		onExit: (_, code, signal) => {
-			if (shouldExit(code, signal)) {
-				process.exit(code ?? 1);
-			}
-			createWorker(options);
+	child = Bun.spawn(
+		[process.execPath, worker, ...execArgv],
+		{
+			ipc: handleMessage,
+			// Bun.spawn 的 stdio 默认为 ignore，须显式继承输出通道，
+			// 否则 worker 的全部日志都会被丢弃
+			stdout: "inherit",
+			stderr: "inherit",
+			onExit: (_, code, signal) => {
+				if (shouldExit(code, signal)) {
+					process.exit(code ?? 1);
+				}
+				createWorker(options);
+			},
 		},
-	});
+	);
 
 	/**
 	 * 判断子进程退出后父进程应跟随退出还是重新拉起。
@@ -136,7 +147,10 @@ function createWorker(options: WorkerOptions) {
 	 * 退出码约定：0 表示正常退出；51 表示请求重启（如 loader 的整进程重载）；
 	 * 52 表示请求退出；收到信号一律视为外部终止，跟随退出。
 	 */
-	function shouldExit(code: number | null, signal: number | null) {
+	function shouldExit(
+		code: number | null,
+		signal: number | null,
+	) {
 		// 尚未收到 start 消息即退出，说明启动失败
 		if (!config) return true;
 
@@ -176,15 +190,24 @@ export default function (cli: CAC) {
 		.command("start [file]", "start a koishi bot")
 		.alias("run")
 		.allowUnknownOptions()
-		.option("--debug [namespace]", "specify debug namespace")
-		.option("--log-level [level]", "specify log level (default: 2)")
+		.option(
+			"--debug [namespace]",
+			"specify debug namespace",
+		)
+		.option(
+			"--log-level [level]",
+			"specify log level (default: 2)",
+		)
 		.option("--log-time [format]", "show timestamp in logs")
 		.action((file, options) => {
 			const { logLevel, debug, logTime, ...rest } = options;
-			if (logLevel !== undefined && (!isInteger(logLevel) || logLevel < 0)) {
+			if (
+				logLevel !== undefined &&
+				(!isInteger(logLevel) || logLevel < 0)
+			) {
 				// eslint-disable-next-line no-console
 				console.warn(
-					`${kleur.red("error")} log level should be a positive integer.`,
+					`${pc.red("error")} log level should be a positive integer.`,
 				);
 				process.exit(1);
 			}

package/src/worker/daemon.ts

@@ -25,8 +25,12 @@ export const Config: Schema<Config> = Schema.object({
 	autoRestart: Schema.boolean()
 		.description("在运行时崩溃自动重启。")
 		.default(true),
-	heartbeatInterval: Schema.number().description("心跳发送间隔。").default(0),
-	heartbeatTimeout: Schema.number().description("心跳超时时间。").default(0),
+	heartbeatInterval: Schema.number()
+		.description("心跳发送间隔。")
+		.default(0),
+	heartbeatTimeout: Schema.number()
+		.description("心跳超时时间。")
+		.default(0),
 })
 	.description("守护设置")
 	.hidden();
@@ -50,7 +54,9 @@ export function apply(ctx: Context, config: Config = {}) {
 			process.send?.({ type: "exit" });
 		}
 		ctx.logger("app").info(`terminated by ${signal}`);
-		ctx.parallel("exit", signal).finally(() => process.exit());
+		ctx
+			.parallel("exit", signal)
+			.finally(() => process.exit());
 	}
 
 	ctx.on("ready", () => {

package/src/worker/index.ts

@@ -14,7 +14,13 @@
 import { existsSync, readFileSync } from "node:fs";
 import net from "node:net";
 import { dirname, resolve } from "node:path";
-import { Context, type Dict, Logger, Schema, Time } from "@koishi-ce/core";
+import {
+	Context,
+	type Dict,
+	Logger,
+	Schema,
+	Time,
+} from "@koishi-ce/core";
 import Loader, { resolvePlugin } from "@koishi-ce/loader";
 import * as daemon from "./daemon.ts";
 import * as logger from "./logger.ts";
@@ -87,14 +93,19 @@ interface ServerPort {
 }
 
 /** 从模块入口路径向上查找最近的 package.json，返回其 name 字段 */
-function locatePackageName(filename: string): string | undefined {
+function locatePackageName(
+	filename: string,
+): string | undefined {
 	let dir = dirname(filename);
 	while (true) {
 		const file = resolve(dir, "package.json");
 		if (existsSync(file)) {
 			try {
-				const manifest = JSON.parse(readFileSync(file, "utf8"));
-				if (typeof manifest?.name === "string") return manifest.name;
+				const manifest = JSON.parse(
+					readFileSync(file, "utf8"),
+				);
+				if (typeof manifest?.name === "string")
+					return manifest.name;
 			} catch {}
 		}
 		const parent = dirname(dir);
@@ -107,9 +118,17 @@ function locatePackageName(filename: string): string | undefined {
  * 遍历插件配置表（含 group 嵌套），收集服务器插件声明的端口区间。
  * 引用键格式与 loader 一致：首个冒号前为插件名；`$` 开头为元属性。
  */
-function collectServerPorts(plugins: Dict, baseDir: string, out: ServerPort[]) {
+function collectServerPorts(
+	plugins: Dict,
+	baseDir: string,
+	out: ServerPort[],
+) {
 	for (const [key, source] of Object.entries(plugins)) {
-		if (key.startsWith("$") || source === null || typeof source !== "object") {
+		if (
+			key.startsWith("$") ||
+			source === null ||
+			typeof source !== "object"
+		) {
 			continue;
 		}
 		const [name = ""] = key.split(":", 1);
@@ -118,14 +137,21 @@ function collectServerPorts(plugins: Dict, baseDir: string, out: ServerPort[]) {
 			continue;
 		}
 		try {
-			const pkgName = locatePackageName(resolvePlugin(name, baseDir));
-			if (!pkgName || !serverPackages.has(pkgName)) continue;
-			const { host, port, maxPort } = source as Record<string, unknown>;
+			const pkgName = locatePackageName(
+				resolvePlugin(name, baseDir),
+			);
+			if (!pkgName || !serverPackages.has(pkgName))
+				continue;
+			const { host, port, maxPort } = source as Record<
+				string,
+				unknown
+			>;
 			if (typeof port !== "number") continue;
 			out.push({
 				host: typeof host === "string" ? host : "127.0.0.1",
 				port,
-				maxPort: typeof maxPort === "number" ? maxPort : port,
+				maxPort:
+					typeof maxPort === "number" ? maxPort : port,
 			});
 		} catch {}
 	}
@@ -136,7 +162,9 @@ function probePort(port: number, host: string) {
 	return new Promise<boolean>((promiseResolve) => {
 		const server = net.createServer();
 		server.once("error", () => promiseResolve(false));
-		server.once("listening", () => server.close(() => promiseResolve(true)));
+		server.once("listening", () =>
+			server.close(() => promiseResolve(true)),
+		);
 		server.listen(port, host);
 	});
 }
@@ -152,14 +180,19 @@ async function checkPorts(plugins: Dict, baseDir: string) {
 	collectServerPorts(plugins, baseDir, ports);
 	for (const { host, port, maxPort } of ports) {
 		let available = false;
-		for (let current = port; current <= maxPort; current++) {
+		for (
+			let current = port;
+			current <= maxPort;
+			current++
+		) {
 			if (await probePort(current, host)) {
 				available = true;
 				break;
 			}
 		}
 		if (available) continue;
-		const range = port === maxPort ? `${port}` : `${port}-${maxPort}`;
+		const range =
+			port === maxPort ? `${port}` : `${port}-${maxPort}`;
 		new Logger("app").error(
 			`端口 ${range} 已被占用（可能已有 Koishi 实例在运行），启动中止`,
 		);

package/src/worker/logger.ts

@@ -9,7 +9,12 @@
  * 完成全局 Logger 的等级、时间格式等设定。CLI 传入的环境变量优先级高于配置文件。
  */
 
-import { Context, defineProperty, Logger, Schema } from "@koishi-ce/core";
+import {
+	Context,
+	defineProperty,
+	Logger,
+	Schema,
+} from "@koishi-ce/core";
 
 /**
  * 配置文件形态的日志等级表。
@@ -33,11 +38,15 @@ function normalizeLevels(
 	config: LogLevelConfig,
 	base: number,
 ): Logger.LevelConfig {
-	const result: Logger.LevelConfig = { base: config.base ?? base };
+	const result: Logger.LevelConfig = {
+		base: config.base ?? base,
+	};
 	for (const [name, level] of Object.entries(config)) {
 		if (name === "base") continue;
 		result[name] =
-			typeof level === "number" ? level : normalizeLevels(level, result.base);
+			typeof level === "number"
+				? level
+				: normalizeLevels(level, result.base);
 	}
 	return result;
 }
@@ -54,7 +63,9 @@ export interface Config {
 
 export const Config: Schema<Config> = Schema.object({
 	levels: Schema.any().description("默认的日志输出等级。"),
-	showDiff: Schema.boolean().description("标注相邻两次日志输出的时间差。"),
+	showDiff: Schema.boolean().description(
+		"标注相邻两次日志输出的时间差。",
+	),
 	showTime: Schema.union([Boolean, String])
 		.default(true)
 		.description("输出日志所使用的时间格式。"),
@@ -101,7 +112,10 @@ export function prepare(config: Config = {}) {
 	}
 
 	/** 递归为所有子命名空间补全 base 等级（未显式设置时继承父级） */
-	function ensureBaseLevel(config: Logger.LevelConfig, base: number) {
+	function ensureBaseLevel(
+		config: Logger.LevelConfig,
+		base: number,
+	) {
 		config.base ??= base;
 		Object.values(config).forEach((value) => {
 			if (typeof value !== "object") return;
@@ -113,7 +127,9 @@ export function prepare(config: Config = {}) {
 
 	// KOISHI_DEBUG 指定的各个命名空间一律开启 DEBUG 级输出
 	if (process.env["KOISHI_DEBUG"]) {
-		for (const name of process.env["KOISHI_DEBUG"].split(",")) {
+		for (const name of process.env["KOISHI_DEBUG"].split(
+			",",
+		)) {
 			new Logger(name).level = Logger.DEBUG;
 		}
 	}