Use async for command processing

Author: BalaM314

build/scripts/commands.js

@@ -548,14 +548,14 @@ export function register(commands:Record<string, FishCommandData<string, any> |
 				}
 
 				//Recursively resolve unresolved args (such as players that need to be determined through a menu)
-				resolveArgsRecursive(output.processedArgs, output.unresolvedArgs, fishSender, () => {
+				resolveArgsRecursive(output.processedArgs, output.unresolvedArgs, fishSender).then(async (resolvedArgs) => {
 					//Run the command handler
 					const usageData = fishSender.getUsageData(name);
 					let failed = false;
 					try {
 						const args:FishCommandHandlerData<string, any> & FishCommandHandlerUtils = {
 							rawArgs,
-							args: output.processedArgs,
+							args: resolvedArgs,
 							sender: fishSender,
 							data: data.data,
 							outputFail: message => {outputFail(message, sender); failed = true;},
@@ -577,11 +577,11 @@ export function register(commands:Record<string, FishCommandData<string, any> |
 									fishSender.tapInfo.commandName = name;
 									fishSender.tapInfo.mode = mode;
 								}
-								fishSender.tapInfo.lastArgs = output.processedArgs;
+								fishSender.tapInfo.lastArgs = resolvedArgs;
 							},
 						};
 						data.requirements?.forEach(r => r(args));
-						data.handler(args);
+						await data.handler(args);
 						//Update usage data
 						if(!failed){
 							usageData.lastUsedSuccessfully = globalUsageData[name].lastUsedSuccessfully = Date.now();
@@ -665,9 +665,9 @@ export function registerConsole(commands:Record<string, FishConsoleCommandData<s
 }
 
 /** Recursively resolves args. This function is necessary to handle cases such as a command that accepts multiple players that all need to be selected through menus. */
-function resolveArgsRecursive(processedArgs: Record<string, FishCommandArgType>, unresolvedArgs:CommandArg[], sender:FishPlayer, callback:(args:Record<string, FishCommandArgType>) => void){
+async function resolveArgsRecursive(processedArgs: Record<string, FishCommandArgType>, unresolvedArgs:CommandArg[], sender:FishPlayer){
 	if(unresolvedArgs.length == 0){
-		callback(processedArgs);
+		return processedArgs;
 	} else {
 		const argToResolve = unresolvedArgs.shift()!;
 		let optionsList:mindustryPlayer[] = [];
@@ -676,18 +676,15 @@ function resolveArgsRecursive(processedArgs: Record<string, FishCommandArgType>,
 			case "player": Groups.player.each(player => optionsList.push(player)); break;
 			default: crash(`Unable to resolve arg of type ${argToResolve.type}`);
 		}
-		Menu.menu(`Select a player`, `Select a player for the argument "${argToResolve.name}"`, optionsList, sender, {
+		const option = await Menu.menu(`Select a player`, `Select a player for the argument "${argToResolve.name}"`, optionsList, sender, {
 			includeCancel: true,
 			optionStringifier: player => Strings.stripColors(player.name).length >= 3 ?
 				Strings.stripColors(player.name)
 			: escapeStringColorsClient(player.name)
-		}).then((option) => {
-			processedArgs[argToResolve.name] = FishPlayer.get(option);
-			resolveArgsRecursive(processedArgs, unresolvedArgs, sender, callback);
 		});
-
+		processedArgs[argToResolve.name] = FishPlayer.get(option);
+		return await resolveArgsRecursive(processedArgs, unresolvedArgs, sender);
 	}
-
 }
 
 export function initialize(){

src/commands.ts

@@ -120,7 +120,7 @@ export type FishCommandHandlerUtils = {
 	handleTaps(mode:TapHandleMode):void;
 };
 export type FishCommandHandler<ArgType extends string, StoredData> =
-	(fish:FishCommandHandlerData<ArgType, StoredData> & FishCommandHandlerUtils) => unknown;
+	(fish:FishCommandHandlerData<ArgType, StoredData> & FishCommandHandlerUtils) => void | Promise<void>;
 
 export interface FishConsoleCommandRunner<ArgType extends string, StoredData> {
 	(_:{