Fix cli PUT and DELETE methods

Author: jeanp413

extensions/gitpod-shared/src/features.ts

@@ -1044,7 +1044,7 @@ async function updateIpcHookCli(context: GitpodExtensionContext): Promise<void>
 				hostname: 'localhost',
 				port: context.devMode ? 9888 /* From code-web.js */ : context.info.getIdePort(),
 				protocol: 'http:',
-				path: '/cli',
+				path: `/cli/ipcHookCli/${encodeURIComponent(context.ipcHookCli!)}`,
 				method: vscode.window.state.focused ? 'PUT' : 'DELETE'
 			}, res => {
 				const chunks: string[] = [];
@@ -1060,7 +1060,6 @@ async function updateIpcHookCli(context: GitpodExtensionContext): Promise<void>
 				});
 			});
 			req.on('error', err => reject(err));
-			req.write(context.ipcHookCli);
 			req.end();
 		});
 	} catch (e) {

src/vs/gitpod/node/customServerIntegration.ts

@@ -52,32 +52,24 @@ function setActiveCliIpcHook(cliIpcHook: string): void {
 }
 
 export function handleGitpodCLIRequest(pathname: string, req: http.IncomingMessage, res: http.ServerResponse) {
-	if (pathname === '/cli') {
+	if (pathname.startsWith('/cli')) {
 		if (req.method === 'GET') {
 			res.writeHead(200, { 'Content-Type': 'text/plain' });
 			res.end(activeCliIpcHook);
 			return true;
 		}
 		if (req.method === 'DELETE') {
-			let cliIpcHook = '';
-			req.setEncoding('utf8');
-			req.on('data', (chunk: string) => cliIpcHook += chunk);
-			req.on('end', () => {
-				deleteActiveCliIpcHook(cliIpcHook);
-				res.writeHead(200);
-				res.end();
-			});
+			const cliIpcHook = decodeURIComponent(pathname.substring('/cli/ipcHookCli/'.length));
+			deleteActiveCliIpcHook(cliIpcHook);
+			res.writeHead(200);
+			res.end();
 			return true;
 		}
 		if (req.method === 'PUT') {
-			let cliIpcHook = '';
-			req.setEncoding('utf8');
-			req.on('data', (chunk: string) => cliIpcHook += chunk);
-			req.on('end', () => {
-				setActiveCliIpcHook(cliIpcHook);
-				res.writeHead(200);
-				res.end();
-			});
+			const cliIpcHook = decodeURIComponent(pathname.substring('/cli/ipcHookCli/'.length));
+			setActiveCliIpcHook(cliIpcHook);
+			res.writeHead(200);
+			res.end();
 			return true;
 		}
 		if (req.method === 'POST') {