@mpis/run 0.0.4 → 0.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mpis/run",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "keywords": [],
   "bin": {
     "run": "./loader/bin.js",
@@ -11,22 +11,23 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "split-cmd": "^1.1.0",
     "execa": "^9.6.0",
     "source-map-support": "^0.5.21",
-    "@build-script/rushstack-config-loader": "^0.0.22",
-    "@idlebox/args": "^0.0.11",
-    "@idlebox/logger": "^0.0.4",
-    "@idlebox/node": "^1.4.8",
-    "@idlebox/common": "^1.4.16",
-    "@mpis/client": "^0.0.4",
-    "@mpis/shared": "^0.0.4",
-    "@mpis/server": "^0.0.3"
+    "@build-script/rushstack-config-loader": "^0.0.24",
+    "@idlebox/args": "^0.0.13",
+    "@mpis/client": "^0.0.6",
+    "@idlebox/common": "^1.4.18",
+    "@idlebox/node": "^1.4.11",
+    "@mpis/server": "^0.0.5",
+    "@mpis/shared": "^0.0.6",
+    "@idlebox/logger": "^0.0.6"
   },
   "devDependencies": {
     "@types/node": "^24.0.14",
-    "@build-script/single-dog-asset": "^1.0.37",
-    "@idlebox/esbuild-executer": "^0.0.4",
-    "@internal/local-rig": "^1.0.1"
+    "@idlebox/esbuild-executer": "^0.0.6",
+    "@internal/local-rig": "^1.0.1",
+    "@build-script/single-dog-asset": "^1.0.38"
   },
   "license": "MIT",
   "author": "GongT <admin@gongt.me>",

package/src/autoindex.ts

@@ -3,16 +3,16 @@
 /* eslint-disable */
 
 /* common/args.ts */
-	// Identifiers
-	export { printUsage } from "./common/args.js";
+// Identifiers
+export { printUsage } from './common/args.js';
 /* common/paths.ts */
-	// Identifiers
-	export { projectRoot } from "./common/paths.js";
-	export { selfRoot } from "./common/paths.js";
+// Identifiers
+export { projectRoot } from './common/paths.js';
+export { selfRoot } from './common/paths.js';
 /* common/config-file.ts */
-	// Identifiers
-	export type { ICommand } from "./common/config-file.js";
-	export type { IConfigFile } from "./common/config-file.js";
-	export { loadConfigFile } from "./common/config-file.js";
+// Identifiers
+export type { ICommand } from './common/config-file.js';
+export type { IConfigFile } from './common/config-file.js';
+export { loadConfigFile } from './common/config-file.js';
 /* bin.ts */
-	// Identifiers
+// Identifiers

package/src/bin.ts

@@ -1,9 +1,10 @@
 import { humanDate, prettyFormatError, registerGlobalLifecycle, toDisposable } from '@idlebox/common';
 import { logger } from '@idlebox/logger';
-import { registerNodejsExitHandler } from '@idlebox/node';
+import { registerNodejsExitHandler, shutdown } from '@idlebox/node';
 import { channelClient } from '@mpis/client';
 import { CompileError, ModeKind, ProcessIPCClient, WorkersManager } from '@mpis/server';
 import { rmSync } from 'node:fs';
+import { dumpConfig } from './commands/config.js';
 import { context, parseCliArgs } from './common/args.js';
 import { loadConfigFile } from './common/config-file.js';
 import { projectRoot } from './common/paths.js';
@@ -31,7 +32,7 @@ process.title = `MpisRun`;
 
 logger.info`Running command "${context.command}" in ${projectRoot}`;
 
-const defaultNoClear = logger.debug.isEnabled;
+const defaultNoClear = logger.debug.isEnabled || !process.stderr.isTTY;
 let workersManager: WorkersManager;
 
 const config = loadConfigFile(context.watchMode);
@@ -43,15 +44,29 @@ switch (context.command) {
 		executeClean();
 		break;
 	case 'build':
+		if (context.dumpConfig) {
+			dumpConfig(config);
+			break;
+		}
 		{
 			if (context.withCleanup) executeClean();
 
-			await executeBuild();
+			await executeBuild().catch((e: Error) => {
+				logger.error`failed ${context.command} project: ${e.message}`;
+				shutdown(1);
+			});
 		}
 		break;
 	case 'watch':
+		if (context.dumpConfig) {
+			dumpConfig(config);
+			break;
+		}
 		initializeStdin();
-		await executeBuild();
+		await executeBuild().catch((e: Error) => {
+			logger.error`failed ${context.command} project: ${e.message}`;
+			shutdown(1);
+		});
 		break;
 }
 
@@ -61,14 +76,17 @@ async function executeBuild() {
 	workersManager = new WorkersManager(context.watchMode ? ModeKind.Watch : ModeKind.Build);
 
 	initializeWorkers();
+	const graph = workersManager.finalize();
+
+	workersManager.onTerminate((trans) => {
+		const w = trans.worker;
 
-	workersManager.onTerminate((w) => {
 		if (!ProcessIPCClient.is(w)) {
 			logger.fatal`worker "${w._id}" is not a ProcessIPCClient, this is a bug.`;
 			return;
 		}
 
-		const times = `(+${humanDate.delta(w.time.executeEnd! - w.time.executeStart!)})`;
+		const times = `(+${humanDate.delta(w.time.executeStart!, w.time.executeEnd!)})`;
 
 		if (context.watchMode) {
 			printFailedRunError(w, `unexpected exit in watch mode ${times}`);
@@ -79,9 +97,7 @@ async function executeBuild() {
 		}
 	});
 
-	workersManager.finalize();
-
-	if (workersManager.allWorkers.length === 0) {
+	if (workersManager.nodeNames.length === 0) {
 		logger.fatal`No workers to execute, check your config file.`;
 		return;
 	}
@@ -94,7 +110,9 @@ async function executeBuild() {
 		return;
 	}
 	logger.verbose`Workers initialized, starting execution...`;
-	await workersManager.startup();
+	await graph.startup();
+
+	logger.verbose`Startup returned.`;
 
 	reprintWatchModeError();
 }
@@ -121,8 +139,7 @@ function initializeWorkers() {
 			worker.pathvar.add(path);
 		}
 
-		const cmd0 = typeof cmds.command === 'string' ? cmds.command.split(' ')[0] : cmds.command[0];
-		worker.displayTitle = `run:${cmd0}`;
+		worker.displayTitle = `run:${cmds.command[0]}`;
 
 		workersManager.addWorker(worker, last ? [last._id] : []);
 
@@ -147,42 +164,40 @@ function initializeWorkers() {
 	}
 }
 
+const cls = /\x1Bc/g;
+
 function printFailedRunError(worker: ProcessIPCClient, message: string) {
-	if (context.watchMode) process.stderr.write('\x1Bc');
+	if (context.watchMode && process.stderr.isTTY) process.stderr.write('\x1Bc');
 
-	const text = worker.outputStream.toString().trimEnd();
+	const text = worker.outputStream.toString().trimEnd().replace(cls, '');
 
 	if (text) {
-		console.error(
-			'\n\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m',
-			' '.repeat(process.stderr.columns || 80),
-			`below is output of ${worker._id}`,
-		);
+		console.error('\n\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run] below is output of ${worker._id}`);
 		console.error(text);
 
-		console.error(
-			'\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m\n',
-			' '.repeat(process.stderr.columns || 80),
-			`ending output of ${worker._id}`,
-		);
+		console.error('\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m\n', ' '.repeat(process.stderr.columns || 80), `[@mpis/run] ending output of ${worker._id}`);
 	} else {
-		console.error(
-			'\n\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m',
-			' '.repeat(process.stderr.columns || 80),
-			`no output from ${worker._id}`,
-		);
+		console.error('\n\x1B[48;5;1m%s\r    \x1B[0;38;5;9;1m  %s  \x1B[0m', ' '.repeat(process.stderr.columns || 80), `[@mpis/run] no output from ${worker._id}`);
 	}
 
-	console.error(workersManager.formatDebugGraph());
+	const graph = workersManager.finalize();
+	console.error('%s\n%s', graph.debugFormatGraph(), graph.debugFormatSummary());
 	logger.fatal`"${worker._id}" ${message}`;
 }
 
+let printTo: NodeJS.Timeout | undefined;
 function reprintWatchModeError(noClear?: boolean) {
-	if (context.watchMode) {
-		if (!noClear && !defaultNoClear) process.stderr.write('\x1Bc');
-	}
-	console.error(workersManager.formatDebugList());
-	printAllErrors();
+	if (printTo) clearTimeout(printTo);
+	printTo = setTimeout(() => {
+		printTo = undefined;
+
+		if (context.watchMode) {
+			if (!noClear && !defaultNoClear) process.stderr.write('\x1Bc');
+		}
+		const graph = workersManager.finalize();
+		console.error('%s\n%s', graph.debugFormatList(), graph.debugFormatSummary());
+		printAllErrors();
+	}, 50);
 }
 
 function addDebugCommand() {
@@ -190,7 +205,7 @@ function addDebugCommand() {
 		name: ['continue', 'c'],
 		description: '开始执行',
 		callback: () => {
-			workersManager.startup();
+			workersManager.finalize().startup();
 		},
 	});
 	registerCommand({
@@ -198,7 +213,7 @@ function addDebugCommand() {
 		description: '切换调试模式（仅在启动前有效）',
 		callback: (text: string) => {
 			const [_, index, on_off] = text.split(/\s+/);
-			const list: ProcessIPCClient[] = workersManager.allWorkers as ProcessIPCClient[];
+			const list = workersManager._allWorkers as ProcessIPCClient[];
 			const worker = list[Number(index)];
 			if (!worker) {
 				logger.error`worker index out of range: ${index}`;
@@ -228,10 +243,17 @@ function addDebugCommand() {
 function sendStatus() {
 	const noError = errors.values().every((e) => !e);
 	if (noError) {
-		channelClient.success(`All workers completed successfully.`);
+		channelClient.success(`all ${workersManager.size()} workers completed successfully.`);
 	} else {
-		const errorCnt = errors.values().filter((e) => !!e);
-		channelClient.failed(`${errorCnt} (of ${workersManager.size}) workers error.`, formatAllErrors());
+		let errorCnt = 0;
+		const arr: string[] = [];
+		for (const [client, err] of errors.entries()) {
+			if (err) {
+				errorCnt++;
+				arr.push(client._id);
+			}
+		}
+		channelClient.failed(`mpis-run: ${arr.join(', ')} (${errorCnt} / ${workersManager.size()})`, formatAllErrors());
 	}
 }
 
@@ -270,8 +292,8 @@ function printAllErrors() {
 	if (numFailed !== 0) {
 		console.error(formatAllErrors());
 
-		logger.error(`💥 ${numFailed} of ${workersManager.size} worker failed (${execTip})`);
+		logger.error(`💥 ${numFailed} of ${workersManager.size()} worker failed (${execTip})`);
 	} else {
-		logger.success(`✅ no error in ${workersManager.size} workers (${execTip})`);
+		logger.success(`✅ no error in ${workersManager.size()} workers (${execTip})`);
 	}
 }

package/src/commands/config.ts

@@ -0,0 +1,78 @@
+import { ProjectConfig } from '@build-script/rushstack-config-loader';
+import { CSI, logger } from '@idlebox/logger';
+import { realpathSync } from 'node:fs';
+import { projectRoot } from '../autoindex.js';
+import type { ICommand, IConfigFile } from '../common/config-file.js';
+
+export function dumpConfig(config: IConfigFile) {
+	const buildObject: Record<string, ICommand> = {};
+	for (const [key, value] of config.build.entries()) {
+		buildObject[key] = value;
+	}
+	const mapRaw = {
+		buildTitles: config.buildTitles,
+		build: buildObject,
+		clean: config.clean,
+		additionalPaths: config.additionalPaths,
+	};
+
+	if (!process.stdout.isTTY) {
+		console.log(JSON.stringify(mapRaw, null, 2));
+		return;
+	}
+
+	console.log('');
+	console.log(`🏗️  构建命令 🏗️`);
+
+	for (const [key, value] of [...config.build.entries(), ...Object.entries(config.unusedBuild)]) {
+		if (config.build.has(key)) {
+			console.log(` ${CSI}38;5;10m✓ ${key}${CSI}0m`);
+		} else {
+			console.log(` ${CSI}38;5;9m✗ ${key}${CSI}0m`);
+		}
+		const cmdDump = value.command.map((e) => {
+			return `${CSI}3m${JSON.stringify(e)}${CSI}0m`;
+		});
+		console.log(`     命令: ${cmdDump.join(' ')}`);
+		console.log(`     工作目录: ${CSI}3m${JSON.stringify(value.cwd)}${CSI}0m`);
+		if (Object.keys(value.env).length > 0) {
+			console.log(`     额外环境变量:`);
+			for (const [key, val] of Object.entries(value.env)) {
+				console.log(`       ${key}: ${CSI}2m${JSON.stringify(val)}${CSI}0m`);
+			}
+		} else {
+			console.log(`     额外环境变量: 无`);
+		}
+		console.log('');
+	}
+
+	console.log(`🧹 清理目录 🧹`);
+	for (const path of config.clean) {
+		console.log(` ${CSI}38;5;10m-${CSI}0m ${path}`);
+	}
+
+	console.log('');
+	console.log(`🔍 附加路径 🔍`);
+	for (const path of config.additionalPaths) {
+		console.log(` ${CSI}38;5;10m-${CSI}0m ${path}`);
+	}
+
+	const cfgObj = new ProjectConfig(projectRoot, undefined, logger);
+	const cfgInfo = cfgObj.getJsonConfigInfo('commands');
+
+	console.log('');
+	console.log(`🔧 配置文件信息 🔧`);
+	if (cfgInfo.project.exists) {
+		console.log(`  项目: ${cfgInfo.project.path}`);
+	} else {
+		console.log(`  项目: (不存在) ${CSI}2m${cfgInfo.project.path}${CSI}0m`);
+	}
+	if (cfgInfo.rig.exists) {
+		console.log(`  脚手架: ${realpathSync(cfgInfo.rig.path)}`);
+	} else {
+		console.log(`  脚手架: (不存在) ${CSI}2m${cfgInfo.rig.path}${CSI}0m`);
+	}
+
+	console.log('');
+	console.log('');
+}

package/src/common/args.ts

@@ -5,10 +5,10 @@ export function printUsage() {
 	console.log('Usage: my-cli <command>');
 	console.log();
 	console.log('Commands:');
-	console.log('  build   run build');
-	console.log('  watch   start watch mode');
+	console.log('  build   run build [--dump]');
+	console.log('  watch   start watch mode [--dump]');
 	console.log('  clean   cleanup the project');
-	console.log('  init    create config/commands.json');
+	// console.log('     init create config file if not');
 }
 
 export function parseCliArgs() {
@@ -26,7 +26,7 @@ export function parseCliArgs() {
 
 	createRootLogger('', level);
 
-	const command = argv.command(['build', 'watch', 'clean', 'init']);
+	const command = argv.command(['build', 'watch', 'clean', 'config']);
 	if (!command) {
 		printUsage();
 		throw logger.fatal`No command provided. Please specify a command to run.`;
@@ -35,32 +35,53 @@ export function parseCliArgs() {
 	const watchMode = command.value === 'watch';
 	const buildMode = command.value === 'build';
 
+	let dumpConfig = false;
+
 	let breakMode = false;
 	if (watchMode) {
+		dumpConfig = argv.flag('--dump') > 0;
 		breakMode = argv.flag('--break') > 0;
 	}
 
 	let withCleanup = false;
 	if (buildMode) {
+		dumpConfig = argv.flag('--dump') > 0;
 		withCleanup = argv.flag('--clean') > 0;
 	}
 
-	if (argv.unused().length > 0) {
-		throw logger.fatal`Unknown arguments: ${argv.unused().join(' ')}`;
+	let configCommand;
+	if (command.value === 'config') {
+		const cfg = command.command(['dump']);
+		if (!cfg) {
+			printUsage();
+			throw logger.fatal`No sub command for "config"`;
+		}
+
+		configCommand = cfg.value;
+		// will do dump
+	} else {
+		configCommand = undefined;
 	}
 
 	const r = {
 		command: command.value,
+		configCommand,
 		debugMode,
 		verboseMode,
 		watchMode,
 		buildMode,
 		breakMode,
 		withCleanup,
+		dumpConfig,
 	};
 
 	context = r;
 
+	if (argv.unused().length) {
+		printUsage();
+		console.error('');
+		throw logger.fatal`Unknown arguments: ${argv.unused().join(' ')}`;
+	}
 	return r;
 }
 

package/src/common/config-file.ts

@@ -4,6 +4,7 @@ import { findUpUntilSync } from '@idlebox/node';
 import { readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { split as splitCmd } from 'split-cmd';
 import { projectRoot, selfRoot } from './paths.js';
 
 interface IPackageBinary {
@@ -27,38 +28,30 @@ interface IConfigFileInput {
 
 export interface ICommand {
 	title: string;
-	command: string | readonly string[];
+	command: readonly string[];
 	cwd: string;
 	env: Record<string, string>;
 }
 export interface IConfigFile {
 	buildTitles: readonly string[];
 	build: ReadonlyMap<string, ICommand>;
+	unusedBuild: Record<string, ICommand>;
 	clean: readonly string[];
 	additionalPaths: readonly string[];
 }
 
-function watchModeCmd(
-	command: string | readonly string[],
-	watch?: string | readonly string[] | boolean,
-	watchMode?: boolean,
-): string | readonly string[] {
+function watchModeCmd(command: string | readonly string[], watch?: string | readonly string[] | boolean, watchMode?: boolean): readonly string[] {
+	const cmdArr = typeof command === 'string' ? splitCmd(command) : command;
+
 	if (!watchMode) {
-		return command;
+		return cmdArr;
 	}
 	if (typeof watch === 'boolean') {
 		throw new Error(`Invalid watch value: ${watch}. Expected string or array.`);
 	}
 
-	if (typeof command === 'string') {
-		if (!watch) watch = '-w';
-
-		return `${command} ${watch}`;
-	} else {
-		if (!watch) watch = ['-w'];
-
-		return [...command, ...watch];
-	}
+	if (!watch) watch = ['-w'];
+	return [...cmdArr, ...watch];
 }
 
 export function loadConfigFile(watchMode: boolean): IConfigFile {
@@ -72,6 +65,11 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 		array(left, right, keyPath) {
 			switch (keyPath[0]) {
 				case 'build':
+					if (Array.isArray(right)) {
+						return right;
+					} else {
+						return left;
+					}
 				case 'clean': {
 					if (!Array.isArray(right)) {
 						return left;
@@ -87,13 +85,6 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 
 	const buildMap = new Map<string, ICommand>();
 	const buildTitles: string[] = [];
-	function set(cmd: ICommand) {
-		if (buildMap.has(cmd.title)) {
-			throw new Error(`duplicate command "${cmd.title}", rename it before continue`);
-		}
-		buildMap.set(cmd.title, cmd);
-		buildTitles.push(cmd.title);
-	}
 
 	for (let item of input.build) {
 		if (typeof item === 'string') {
@@ -119,31 +110,30 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 			continue;
 		}
 
-		const cmd = item.command;
-		if (Array.isArray(cmd)) {
-			const copy = cmd.slice();
-			resolveCommandIsFile(config, copy);
-			set({
-				title: item.title ?? guessTitle(cmd),
-				command: watchModeCmd(copy, item.watch, watchMode),
-				cwd: resolve(projectRoot, item.cwd || '.'),
-				env: item.env ?? {},
-			});
-		} else if (typeof cmd === 'object' && 'package' in cmd) {
-			const obj = parsePackagedBinary(config, item, watchMode);
-			set(obj);
-		} else {
-			throw TypeError(`Invalid command type: ${typeof cmd}. Expected string or array or object.`);
+		const cmd = resolveCommand(config, item, watchMode);
+
+		if (buildMap.has(cmd.title)) {
+			throw new Error(`duplicate command "${cmd.title}", rename it before continue`);
+		}
+		buildMap.set(cmd.title, cmd);
+		buildTitles.push(cmd.title);
+	}
+
+	const unused: Record<string, ICommand> = {};
+	for (const [name, item] of Object.entries(input.commands)) {
+		const title = item.title ?? name;
+		if (buildMap.has(title)) {
+			continue;
 		}
+
+		unused[title] = resolveCommand(config, item, watchMode);
 	}
 
 	const additionalPaths: string[] = [];
 	if (config.rigConfig.rigFound) {
 		const nmPath = findUpUntilSync({ file: 'node_modules', from: config.rigConfig.getResolvedProfileFolder() });
 		if (!nmPath) {
-			throw new Error(
-				`Failed to find "node_modules" folder in rig profile "${config.rigConfig.getResolvedProfileFolder()}".`,
-			);
+			throw new Error(`Failed to find "node_modules" folder in rig profile "${config.rigConfig.getResolvedProfileFolder()}".`);
 		}
 		additionalPaths.push(resolve(nmPath, '.bin'));
 	}
@@ -160,11 +150,31 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 	return {
 		buildTitles,
 		build: buildMap,
+		unusedBuild: unused,
 		clean,
 		additionalPaths: additionalPaths.toReversed(),
 	};
 }
 
+function resolveCommand(config: ProjectConfig, input: ICommandInput, watchMode: boolean): ICommand {
+	const cmd = input.command;
+	if (Array.isArray(cmd)) {
+		const copy = cmd.slice();
+		resolveCommandIsFile(config, copy);
+		return {
+			title: input.title ?? guessTitle(cmd),
+			command: watchModeCmd(copy, input.watch, watchMode),
+			cwd: resolve(projectRoot, input.cwd || '.'),
+			env: input.env ?? {},
+		};
+	} else if (typeof cmd === 'object' && 'package' in cmd) {
+		const obj = parsePackagedBinary(config, input, watchMode);
+		return obj;
+	} else {
+		throw TypeError(`Invalid command type: ${typeof cmd}. Expected string or array or object.`);
+	}
+}
+
 function guessTitle(command: string | readonly string[]): string {
 	if (typeof command === 'string') {
 		return command.split(' ')[0];

package/src/common/paths.ts

@@ -12,4 +12,3 @@ if (!self) {
 	throw new Error('Could not find self directory');
 }
 export const selfRoot = dirname(self);
-