[cli] wait for extension host to activate cli server

gitpod-io · Jun 28, 2021 · 6b591c2 · 6b591c2
1 parent 19c309e
commit 6b591c2
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 40 deletions.
diff --git a/extensions/gitpod/src/extension.ts b/extensions/gitpod/src/extension.ts
@@ -952,9 +952,9 @@ export async function activate(context: vscode.ExtensionContext) {
 	const vscodeIpcHookCli = process.env['VSCODE_IPC_HOOK_CLI'];
 	if (vscodeIpcHookCli) {
 		function updateIpcHookCli(): void {
-			if (vscode.window.state.focused) {
-				codeServerConnection.sendNotification('setActiveCliIpcHook', vscodeIpcHookCli!);
-			}
+			codeServerConnection.sendNotification('setActiveCliIpcHook',
+				vscode.window.state.focused ? vscodeIpcHookCli : undefined
+			);
 		}
 		updateIpcHookCli();
 		context.subscriptions.push(vscode.window.onDidChangeWindowState(() => updateIpcHookCli()));

diff --git a/src/vs/gitpod/node/cli.ts b/src/vs/gitpod/node/cli.ts
@@ -178,32 +178,40 @@ async function sendCommand(command: PipeCommand): Promise<string> {
 		port = Number(process.env.GITPOD_THEIA_PORT);
 	}
 	const http = await import('http');
-	return new Promise<string>((resolve, reject) => {
-		const req = http.request({
-			hostname: 'localhost',
-			port,
-			protocol: 'http:',
-			path: '/cli',
-			method: 'POST',
-			timeout: 5000
-		}, res => {
-			const chunks: string[] = [];
-			res.setEncoding('utf8');
-			res.on('data', d => chunks.push(d));
-			res.on('end', () => {
-				const result = chunks.join('');
-				if (res.statusCode !== 200) {
-					reject(new Error(`Bad status code: ${res.statusCode}: ${result}`));
-				} else {
-					resolve(result);
-				}
+	while (true) {
+		try {
+			return await new Promise<string>((resolve, reject) => {
+				const req = http.request({
+					hostname: 'localhost',
+					port,
+					protocol: 'http:',
+					path: '/cli',
+					method: 'POST'
+				}, res => {
+					const chunks: string[] = [];
+					res.setEncoding('utf8');
+					res.on('data', d => chunks.push(d));
+					res.on('end', () => {
+						const result = chunks.join('');
+						if (res.statusCode !== 200) {
+							reject(new Error(`Bad status code: ${res.statusCode}: ${result}`));
+						} else {
+							resolve(result);
+						}
+					});
+				});
+				req.on('error', err => reject(err));
+				req.write(JSON.stringify(command));
+				req.end();
 			});
-		});
-
-		req.on('error', err => reject(err));
-		req.write(JSON.stringify(command));
-		req.end();
-	});
+		} catch (e) {
+			// Code Server is not running yet, let's try again
+			if (e.code !== 'ECONNREFUSED') {
+				throw e;
+			}
+			await new Promise(resolve => setTimeout(resolve, 500));
+		}
+	}
 }
 
 function eventuallyExit(code: number): void {

diff --git a/src/vs/gitpod/node/server-extension-host-connection.d.ts b/src/vs/gitpod/node/server-extension-host-connection.d.ts
@@ -23,8 +23,10 @@ export type setActiveCliIpcHookMethod = 'setActiveCliIpcHook';
 export interface ServerExtensionHostConnection {
 	sendRequest(method: validateExtensionsMethod, param: ValidateExtensionsParam, token: rpc.CancellationToken): Promise<ValidateExtensionsResult>;
 	onRequest(method: validateExtensionsMethod, handler: (param: ValidateExtensionsParam, token: rpc.CancellationToken) => Promise<ValidateExtensionsResult>): void
-	sendNotification(method: setActiveCliIpcHookMethod, cliIpcHook: string): void;
-	onNotification(method: setActiveCliIpcHookMethod, handler: (cliIpcHook: string) => void): void;
+	sendNotification(method: setActiveCliIpcHookMethod, cliIpcHook: string | undefined): void;
+	onNotification(method: setActiveCliIpcHookMethod, handler: (cliIpcHook: string | undefined) => void): void;
 	listen(): void;
 	dispose(): void;
+	onClose: rpc.Event<void>;
+	onDispose: rpc.Event<void>;
 }
diff --git a/src/vs/gitpod/node/server.ts b/src/vs/gitpod/node/server.ts
@@ -687,6 +687,20 @@ async function main(): Promise<void> {
 
 		const clients = new Map<string, Client>();
 		let activeCliIpcHook: string | undefined;
+		const didChangeActiveCliIpcHookEmitter = new Emitter<void>();
+		function withActiveCliIpcHook(cb: (activeCliIpcHook: string) => void): IDisposable {
+			if (activeCliIpcHook) {
+				cb(activeCliIpcHook);
+				return { dispose: () => { } };
+			}
+			const listener = didChangeActiveCliIpcHookEmitter.event(() => {
+				if (activeCliIpcHook) {
+					listener.dispose();
+					cb(activeCliIpcHook);
+				}
+			});
+			return listener;
+		}
 
 		const server = http.createServer(async (req, res) => {
 			if (!req.url) {
@@ -707,18 +721,18 @@ async function main(): Promise<void> {
 				}
 
 				if (pathname === '/cli') {
-					if (!activeCliIpcHook) {
-						return serveError(req, res, 404, 'Not found.');
-					}
 					if (req.method !== 'POST') {
 						res.writeHead(200, { 'Content-Type': 'text/plain' });
 						return res.end(activeCliIpcHook);
 					}
-					req.pipe(http.request({
-						socketPath: activeCliIpcHook,
-						method: req.method,
-						headers: req.headers
-					}, res2 => res2.pipe(res)));
+					const listener = withActiveCliIpcHook(activeCliIpcHook =>
+						req.pipe(http.request({
+							socketPath: activeCliIpcHook,
+							method: req.method,
+							headers: req.headers
+						}, res2 => res2.pipe(res)))
+					);
+					req.on('close', () => listener.dispose());
 					return;
 				}
 
@@ -1025,9 +1039,27 @@ async function main(): Promise<void> {
 										warn: msg => logService.warn(msg)
 									}
 								) as any as ServerExtensionHostConnection;
-								extensionHostConnection.onNotification('setActiveCliIpcHook', (cliIpcHook: string) => {
-									activeCliIpcHook = cliIpcHook;
+
+								let extensionHostCliIpcHook: string | undefined;
+								function cleanActiveCliIpcHook(): void {
+									if (!activeCliIpcHook || activeCliIpcHook !== extensionHostCliIpcHook) {
+										return;
+									}
+									activeCliIpcHook = undefined;
+									didChangeActiveCliIpcHookEmitter.fire(undefined);
+								}
+								extensionHostConnection.onClose(cleanActiveCliIpcHook);
+								extensionHostConnection.onDispose(cleanActiveCliIpcHook);
+								extensionHostConnection.onNotification('setActiveCliIpcHook', (cliIpcHook: string | undefined) => {
+									if (!cliIpcHook) {
+										cleanActiveCliIpcHook();
+									} else if (activeCliIpcHook !== cliIpcHook) {
+										activeCliIpcHook = cliIpcHook;
+										didChangeActiveCliIpcHookEmitter.fire(undefined);
+									}
+									extensionHostCliIpcHook = cliIpcHook;
 								});
+
 								extensionHostConnection.onRequest('validateExtensions', async (param, token) => {
 									const links = new Set<string>();
 									const extensions = new Set<string>();