Queue remote extension installation tasks (#19)

Author: jeanp413

gitpod-remote/package.json

@@ -3,7 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "gitpod",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "license": "MIT",
   "preview": true,
   "icon": "resources/gitpod.png",

gitpod-remote/src/extension.ts

@@ -10,6 +10,7 @@ import { tunnelPorts } from './ports';
 import { GitpodPortViewProvider } from './portViewProvider';
 import { initializeRemoteExtensions, installInitialExtensions, ISyncExtension } from './remoteExtensionInit';
 
+let initialExtensionsInstallPromise: Promise<void>;
 let gitpodContext: GitpodExtensionContext | undefined;
 export async function activate(context: vscode.ExtensionContext) {
 	gitpodContext = await setupGitpodContext(context);
@@ -19,7 +20,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	registerCommands(gitpodContext);
 	registerTasks(gitpodContext);
-	installInitialExtensions(gitpodContext);
+	initialExtensionsInstallPromise = installInitialExtensions(gitpodContext);
 
 	const portViewProvider = new GitpodPortViewProvider(gitpodContext);
 	context.subscriptions.push(vscode.window.registerWebviewViewProvider(GitpodPortViewProvider.viewType, portViewProvider, { webviewOptions: { retainContextWhenHidden: true } }));
@@ -86,5 +87,12 @@ function registerCommands(context: GitpodExtensionContext) {
 	}));
 
 	// Initialize remote extensions
-	context.subscriptions.push(vscode.commands.registerCommand('__gitpod.initializeRemoteExtensions', (extensions: ISyncExtension[]) => initializeRemoteExtensions(extensions, gitpodContext!)));
+	context.subscriptions.push(vscode.commands.registerCommand('__gitpod.initializeRemoteExtensions', async (extensions: ISyncExtension[]) => {
+		try {
+			// Await for initial extension instalation so we don't have too many extension installations tasks running
+			await initialExtensionsInstallPromise;
+		} catch {
+		}
+		return initializeRemoteExtensions(extensions, gitpodContext!);
+	}));
 }

gitpod-remote/src/remoteExtensionInit.ts

@@ -47,10 +47,8 @@ export async function initializeRemoteExtensions(extensions: ISyncExtension[], c
 	delete execEnv['ELECTRON_RUN_AS_NODE']
 	try {
 		context.logger.info('Trying to initialize remote extensions:', extensions.map(e => e.identifier.id).join('\n'));
-		const { stderr } = await util.promisify(cp.exec)(`${codeCliPath} ${args}`, { env: execEnv });
-		if (stderr) {
-			context.logger.error('Failed to initialize remote extensions:', stderr);
-		}
+		const { stdout, stderr } = await util.promisify(cp.exec)(`${codeCliPath} ${args}`, { env: execEnv });
+		context.logger.info(`Initialize remote extensions cli commamnd output:\nstdout: ${stdout}\nstderr: ${stderr}`);
 	} catch (e) {
 		context.logger.error('Error trying to initialize remote extensions:', e);
 	}
@@ -110,10 +108,8 @@ export async function installInitialExtensions(context: GitpodExtensionContext)
 	delete execEnv['ELECTRON_RUN_AS_NODE']
 	try {
 		context.logger.info('Trying to initialize remote extensions from gitpod.yml:', extensions.map(e => e.toString()).join('\n'));
-		const { stderr } = await util.promisify(cp.exec)(`${codeCliPath} ${args}`, { env: execEnv });
-		if (stderr) {
-			context.logger.error('Failed to initialize remote extensions from gitpod.yml:', stderr);
-		}
+		const { stdout, stderr } = await util.promisify(cp.exec)(`${codeCliPath} ${args}`, { env: execEnv });
+		context.logger.info(`Initialize remote extensions cli commamnd output:\nstdout: ${stdout}\nstderr: ${stderr}`);
 	} catch (e) {
 		context.logger.error('Error trying to initialize remote extensions from gitpod.yml:', e);
 	}