@mpis/run 0.0.3 → 0.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mpis/run",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "keywords": [],
   "bin": {
     "run": "./loader/bin.js",
@@ -13,27 +13,21 @@
   "dependencies": {
     "execa": "^9.6.0",
     "source-map-support": "^0.5.21",
-    "@build-script/rushstack-config-loader": "^0.0.21",
-    "@idlebox/common": "^1.4.15",
-    "@idlebox/logger": "^0.0.3",
-    "@idlebox/args": "^0.0.10",
-    "@mpis/client": "^0.0.3",
-    "@idlebox/node": "^1.4.8",
-    "@mpis/server": "^0.0.2",
-    "@mpis/shared": "^0.0.3"
+    "@idlebox/node": "^1.4.10",
+    "@idlebox/args": "^0.0.12",
+    "@idlebox/common": "^1.4.17",
+    "@idlebox/logger": "^0.0.5",
+    "@mpis/client": "^0.0.5",
+    "@build-script/rushstack-config-loader": "^0.0.23",
+    "@mpis/shared": "^0.0.5",
+    "@mpis/server": "^0.0.4"
   },
   "devDependencies": {
     "@types/node": "^24.0.14",
-    "@build-script/single-dog-asset": "^1.0.36",
-    "@idlebox/esbuild-executer": "^0.0.3",
+    "@build-script/single-dog-asset": "^1.0.38",
+    "@idlebox/esbuild-executer": "^0.0.5",
     "@internal/local-rig": "^1.0.1"
   },
-  "publishConfig": {
-    "packCommand": [
-      "publisher",
-      "pack"
-    ]
-  },
   "license": "MIT",
   "author": "GongT <admin@gongt.me>",
   "repository": "https://github.com/GongT/baobao",

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,6 +1,6 @@
 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';
@@ -46,12 +46,18 @@ switch (context.command) {
 		{
 			if (context.withCleanup) executeClean();
 
-			await executeBuild();
+			await executeBuild().catch((e: Error) => {
+				logger.error`failed ${context.command} project: ${e.message}`;
+				shutdown(1);
+			});
 		}
 		break;
 	case 'watch':
 		initializeStdin();
-		await executeBuild();
+		await executeBuild().catch((e: Error) => {
+			logger.error`failed ${context.command} project: ${e.message}`;
+			shutdown(1);
+		});
 		break;
 }
 
@@ -61,14 +67,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,7 +88,10 @@ async function executeBuild() {
 		}
 	});
 
-	workersManager.finalize();
+	if (workersManager.nodeNames.length === 0) {
+		logger.fatal`No workers to execute, check your config file.`;
+		return;
+	}
 
 	channelClient.start();
 
@@ -89,7 +101,9 @@ async function executeBuild() {
 		return;
 	}
 	logger.verbose`Workers initialized, starting execution...`;
-	await workersManager.startup();
+	await graph.startup();
+
+	logger.verbose`Startup returned.`;
 
 	reprintWatchModeError();
 }
@@ -148,36 +162,32 @@ function printFailedRunError(worker: ProcessIPCClient, message: string) {
 	const text = worker.outputStream.toString().trimEnd();
 
 	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), `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), `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), `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() {
@@ -185,7 +195,7 @@ function addDebugCommand() {
 		name: ['continue', 'c'],
 		description: '开始执行',
 		callback: () => {
-			workersManager.startup();
+			workersManager.finalize().startup();
 		},
 	});
 	registerCommand({
@@ -193,7 +203,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}`;
@@ -225,8 +235,15 @@ function sendStatus() {
 	if (noError) {
 		channelClient.success(`All 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());
 	}
 }
 
@@ -265,8 +282,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/common/config-file.ts

@@ -15,7 +15,7 @@ interface IPackageBinary {
 interface ICommandInput {
 	title?: string;
 	command: string | readonly string[] | IPackageBinary;
-	watch?: string | readonly string[];
+	watch?: string | readonly string[] | boolean;
 	cwd?: string;
 	env?: Record<string, string>;
 }
@@ -38,14 +38,13 @@ export interface IConfigFile {
 	additionalPaths: readonly string[];
 }
 
-function watchModeCmd(
-	command: string | readonly string[],
-	watch?: string | readonly string[],
-	watchMode?: boolean,
-): string | readonly string[] {
+function watchModeCmd(command: string | readonly string[], watch?: string | readonly string[] | boolean, watchMode?: boolean): string | readonly string[] {
 	if (!watchMode) {
 		return command;
 	}
+	if (typeof watch === 'boolean') {
+		throw new Error(`Invalid watch value: ${watch}. Expected string or array.`);
+	}
 
 	if (typeof command === 'string') {
 		if (!watch) watch = '-w';
@@ -66,8 +65,19 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 	logger.debug`using config file long<${configFile.effective}>`;
 
 	const input: IConfigFileInput = config.loadBothJson('commands', schemaFile, {
-		arrayMerge(target, _source) {
-			return target;
+		array(left, right, keyPath) {
+			switch (keyPath[0]) {
+				case 'build':
+				case 'clean': {
+					if (!Array.isArray(right)) {
+						return left;
+					}
+					const s = new Set([...left, ...right]);
+					return [...s.values()];
+				}
+				default:
+					return right;
+			}
 		},
 	});
 
@@ -83,10 +93,26 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 
 	for (let item of input.build) {
 		if (typeof item === 'string') {
-			item = input.commands[item];
-			if (!item) {
-				logger.fatal`command "${item}" not found in commands`;
+			const found = input.commands[item];
+			if (!found) {
+				logger.fatal`command ${input.build.indexOf(item)} "${item}" not found in "commands" list<${Object.keys(input.commands)}>`;
+			}
+			item = found;
+		}
+
+		if (item.watch === false && watchMode) {
+			let debug_title = item.title;
+			if (!debug_title) {
+				if (Array.isArray(item.command)) {
+					debug_title = item.command[0];
+				} else if (typeof item.command === 'string') {
+					debug_title = item.command;
+				} else if (typeof item.command === 'object' && 'package' in item.command) {
+					debug_title = item.command.package;
+				}
 			}
+			logger.log`command "${debug_title}" watch mode is disabled.`;
+			continue;
 		}
 
 		const cmd = item.command;
@@ -111,9 +137,7 @@ export function loadConfigFile(watchMode: boolean): IConfigFile {
 	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'));
 	}

package/src/common/paths.ts

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