remove explicitly specifying longRunning command and infer from command itself

Author: ashfame

src/lib/import-export/export/export-database.ts

@@ -21,7 +21,6 @@ export async function exportDatabaseToFile(
 		`sqlite export ${ tempFileName } --require=/tmp/sqlite-command/command.php`,
 		{
 			skipPluginsAndThemes: true,
-			longRunning: true,
 		}
 	);
 
@@ -89,7 +88,6 @@ export async function exportDatabaseToMultipleFiles(
 			`sqlite export ${ fileName } --tables=${ table } --require=/tmp/sqlite-command/command.php`,
 			{
 				skipPluginsAndThemes: true,
-				longRunning: true,
 			}
 		);
 

src/lib/import-export/import/importers/importer.ts

@@ -57,7 +57,7 @@ abstract class BaseImporter extends EventEmitter implements Importer {
 				const { stderr, exitCode } = await server.executeWpCliCommand(
 					`sqlite import ${ sqlTempFile } --require=/tmp/sqlite-command/command.php`,
 					// SQLite plugin requires PHP 8+
-					{ targetPhpVersion: DEFAULT_PHP_VERSION, skipPluginsAndThemes: true, longRunning: true }
+					{ targetPhpVersion: DEFAULT_PHP_VERSION, skipPluginsAndThemes: true }
 				);
 
 				if ( stderr ) {

src/lib/import-export/tests/export/exporters/sql-exporter.test.ts

@@ -61,7 +61,7 @@ platformTestSuite( 'SqlExporter', ( { normalize } ) => {
 		const siteServer = SiteServer.get( '123' );
 		expect( siteServer?.executeWpCliCommand ).toHaveBeenCalledWith(
 			'sqlite export studio-backup-db-export-2024-08-01-12-00-00.sql --require=/tmp/sqlite-command/command.php',
-			{ skipPluginsAndThemes: true, longRunning: true }
+			{ skipPluginsAndThemes: true }
 		);
 	} );
 

src/lib/import-export/tests/import/importer/jetpack-importer.test.ts

@@ -87,12 +87,10 @@ platformTestSuite( 'JetpackImporter', ( { normalize } ) => {
 			expect( siteServer?.executeWpCliCommand ).toHaveBeenNthCalledWith( 1, expectedCommand, {
 				targetPhpVersion: '8.2',
 				skipPluginsAndThemes: true,
-				longRunning: true,
 			} );
 			expect( siteServer?.executeWpCliCommand ).toHaveBeenNthCalledWith( 2, expectedCommand, {
 				targetPhpVersion: '8.2',
 				skipPluginsAndThemes: true,
-				longRunning: true,
 			} );
 
 			const expectedUnlinkPath = normalize(

src/lib/wp-cli-process.ts

@@ -55,25 +55,19 @@ export default class WpCliProcess {
 
 	async execute(
 		args: string[],
-		{
-			phpVersion,
-			longRunning = false,
-		}: {
-			phpVersion?: string;
-			longRunning?: boolean;
-		} = {}
+		{ phpVersion }: { phpVersion?: string } = {}
 	): Promise< WpCliResult > {
 		const message = 'execute';
 		const messageId = this.sendMessage( message, {
 			projectPath: this.projectPath,
 			args,
 			phpVersion,
 		} );
-		return await this.waitForResponse(
-			message,
-			messageId,
-			longRunning ? IMPORT_EXPORT_RESPONSE_TIMEOUT : DEFAULT_RESPONSE_TIMEOUT
-		);
+		const timeout =
+			args[ 0 ] === 'sqlite' && ( args[ 1 ] === 'import' || args[ 1 ] === 'export' )
+				? IMPORT_EXPORT_RESPONSE_TIMEOUT
+				: DEFAULT_RESPONSE_TIMEOUT;
+		return await this.waitForResponse( message, messageId, timeout );
 	}
 
 	async stop() {

src/site-server.ts

@@ -170,11 +170,9 @@ export class SiteServer {
 		{
 			targetPhpVersion,
 			skipPluginsAndThemes = false,
-			longRunning = false,
 		}: {
 			targetPhpVersion?: string;
 			skipPluginsAndThemes?: boolean;
-			longRunning?: boolean;
 		} = {}
 	): Promise< WpCliResult > {
 		const projectPath = this.details.path;
@@ -201,7 +199,7 @@ export class SiteServer {
 		}
 
 		try {
-			return await this.wpCliExecutor.execute( wpCliArgs as string[], { phpVersion, longRunning } );
+			return await this.wpCliExecutor.execute( wpCliArgs as string[], { phpVersion } );
 		} catch ( error ) {
 			if ( ( error as MessageCanceled )?.canceled ) {
 				return {