Chrome e2e tests

.travis.yml

@@ -2,15 +2,18 @@ language: node_js
 node_js:
 - 10.15.1
 env:
+  matrix:
   - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
 matrix:
   include:
   - os: linux
     dist: trusty
   - os: osx
 before_install:
-- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install libxkbfile-dev
-  libsecret-1-dev; fi
+- openssl aes-256-cbc -K $encrypted_31e0a178b4fd_key -iv $encrypted_31e0a178b4fd_iv
+  -in test/.coder-gcp-credentials.json.enc -out test/.coder-gcp-credentials.json -d
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+  sudo apt-get install -y libxkbfile-dev libsecret-1-dev; fi
 - npm install -g yarn@1.12.3
 script:
 - scripts/build.sh
@@ -31,13 +34,13 @@ deploy:
   api_key:
     secure: YL/x24KjYjgYXPcJWk3FV7FGxI79Mh6gBECQEcdlf3fkLEoKFVgzHBoUNWrFPzyR4tgLyWNAgcpD9Lkme1TRWTom7UPjXcwMNyLcLa+uec7ciSAnYD9ntLTpiCuPDD1u0LtRGclSi/EHQ+F8YVq+HZJpXTsJeAmOmihma3GVbGKSZr+BRum+0YZSG4w+o4TOlYzw/4bLWS52MogZcwpjd+hemBbgXLuGU2ziKv2vEKCZFbEeA16II4x1WLI4mutDdCeh7+3aLzGLwDa49NxtsVYNjyNFF75JhCTCNA55e2YMiLz9Uq69IXe/mi5F7xUaFfhIqqLNyKBnKeEOzu3dYnc+8n3LjnQ+00PmkF05nx9kBn3UfV1kwQGh6QbyDmTtBP07rtUMyI14aeQqHjxsaVRdMnwj9Q2DjXRr8UDqESZF0rmK3pHCXS2fBhIzLE8tLVW5Heiba2pQRFMHMZW+KBE97FzcFh7is90Ait3T8enfcd/PWFPYoBejDAdjwxwOkezh5N5ZkYquEfDYuWrFi6zRFCktsruaAcA+xGtTf9oilBBzUqu8Ie+YFWH5me83xakcblJWdaW/D2rLJAJH3m6LFm8lBqyUgDX5t/etob6CpDuYHu5D1J3XINOj/+aLAcadq6qlh70PMZS3zYffUu3JlzaD2amlSHIT8b5YXFc=
   file:
-    - release/*.tar.gz
-    - release/*.zip
+  - release/*.tar.gz
+  - release/*.zip
   on:
     repo: codercom/code-server
     branch: master
 cache:
   yarn: true
   timeout: 1000
   directories:
-  - .cache
+  - ".cache"

build/tasks.ts

@@ -14,6 +14,7 @@ const defaultExtensionsPath = path.join(libPath, "extensions");
 const pkgsPath = path.join(__dirname, "../packages");
 const vscodeVersion = process.env.VSCODE_VERSION || "1.33.1";
 const vsSourceUrl = `https://codesrv-ci.cdr.sh/vstar-${vscodeVersion}.tar.gz`;
+const binaryPath = path.join(__dirname, `../packages/server/cli-${os.platform()}-${os.arch()}`);
 
 const buildServerBinary = register("build:server:binary", async (runner) => {
 	await ensureInstalled();
@@ -185,7 +186,6 @@ register("package", async (runner, releaseTag) => {
 	fse.removeSync(archiveDir);
 	fse.mkdirpSync(archiveDir);
 
-	const binaryPath = path.join(__dirname, `../packages/server/cli-${os.platform()}-${os.arch()}`);
 	const binaryDestination = path.join(archiveDir, "code-server");
 	fse.copySync(binaryPath, binaryDestination);
 	fs.chmodSync(binaryDestination, "755");
@@ -199,4 +199,23 @@ register("package", async (runner, releaseTag) => {
 		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]));
 });
 
+register("test:e2e", async (runner) => {
+	if (!fs.existsSync(binaryPath)) {
+		throw new Error("Binary must be built to test");
+	}
+
+	const test = await runner.execute(
+		isWin ? "npm.cmd" : "npm",
+		[
+			"--scripts-prepend-node-path",
+			"--",
+			"run",
+			"test:e2e",
+		],
+	);
+	if (test.exitCode !== 0) {
+		throw new Error(`Tests failed: \n${test.stderr}`);
+	}
+});
+
 run();

code-server-e2e.dockerfile

@@ -0,0 +1,51 @@
+FROM node:10.15.1
+
+# Install puppeteer deps.
+RUN apt-get update && apt-get install -qy gconf-service \
+	libnss3 \
+	libasound2 \
+	libatk1.0-0 \
+	libatk-bridge2.0-0 \
+	libcairo2 \
+	libcups2 \
+	libdbus-1-3 \
+	libexpat1 \
+	libfontconfig1 \
+	libgconf-2-4 \
+	libgdk-pixbuf2.0-0 \
+	libglib2.0-0 \
+	libgtk-3-0 \
+	libnspr4 \
+	libpango-1.0-0 \
+	libpangocairo-1.0-0 \
+	libx11-6 \
+	libx11-xcb1 \
+	libxcb1 \
+	libxcomposite1 \
+	libxcursor1 \
+	libxdamage1 \
+	libxext6 \
+	libxfixes3 \
+	libxi6 \
+	libxrandr2 \
+	libxrender1 \
+	libxss1 \
+	libxtst6 \
+	ca-certificates \
+	fonts-liberation \
+	libappindicator1 \
+	lsb-release \
+	xdg-utils \
+	wget
+
+# Get libc6 v2.28.x
+RUN echo "deb http://ftp.de.debian.org/debian buster main" >> /etc/apt/sources.list && \
+	apt-get update && \
+	apt-get install -y libc6
+
+# Ensure that yarn is installed.
+RUN npm i -g yarn@1.12.3 npx
+
+# Copy CI environment variables, if they exist.
+ARG env_vars
+RUN if [ "$env_vars" != "" ]; then echo $env_vars | base64 -d >> ~/.bashrc && . ~/.bashrc; fi

package.json

@@ -10,7 +10,8 @@
     "postinstall": "npm-run-all --parallel packages:install build:rules",
     "start": "cd ./packages/server && yarn start",
     "task": "ts-node -r tsconfig-paths/register build/tasks.ts",
-    "test": "cd ./packages && yarn test"
+    "test": "cd ./packages && yarn test",
+    "test:e2e": "cd ./test && yarn test"
   },
   "devDependencies": {
     "@types/fs-extra": "^5.0.4",
@@ -28,16 +29,19 @@
     "html-webpack-plugin": "^3.2.0",
     "http-browserify": "^1.7.0",
     "ignore-loader": "^0.1.2",
+    "jest": "^24.7.1",
     "mini-css-extract-plugin": "^0.5.0",
     "node-sass": "^4.11.0",
     "npm-run-all": "^4.1.5",
     "path-browserify": "^1.0.0",
     "preload-webpack-plugin": "^3.0.0-beta.2",
+    "puppeteer": "^1.14.0",
     "sass-loader": "^7.1.0",
     "string-replace-loader": "^2.1.1",
     "style-loader": "^0.23.1",
     "tar": "^4.4.8",
     "terser-webpack-plugin": "^1.2.3",
+    "ts-jest": "^24.0.2",
     "ts-loader": "^5.3.3",
     "ts-node": "^7.0.1",
     "tsconfig-paths": "^3.8.0",
@@ -56,7 +60,8 @@
     "webpack-hot-middleware": "^2.24.3",
     "webpack-pwa-manifest": "^4.0.0",
     "workbox-webpack-plugin": "^4.1.0",
-    "write-file-webpack-plugin": "^4.5.0"
+    "write-file-webpack-plugin": "^4.5.0",
+    "xml2js": "^0.4.19"
   },
   "resolutions": {
     "bindings": "1.3.0"

packages/app/chrome/package.json

@@ -6,4 +6,4 @@
 	"scripts": {
 		"build": "../../../node_modules/.bin/webpack --config ./webpack.config.js"
 	}
-}
+}

packages/package.json

@@ -1,12 +1,10 @@
 {
   "scripts": {
     "postinstall": "../node_modules/.bin/ts-node ../scripts/install-packages.ts",
-    "test": "jest"
+    "test": "npx jest --verbose"
   },
   "devDependencies": {
-    "@types/jest": "^23.3.12",
-    "jest": "^23.6.0",
-    "ts-jest": "^23.10.5"
+    "@types/jest": "^23.3.12"
   },
   "dependencies": {
     "xmlhttprequest": "1.8.0"
@@ -44,4 +42,4 @@
     ],
     "testRegex": ".*\\.test\\.tsx?"
   }
-}
+}

packages/protocol/src/node/modules/child_process.ts

@@ -8,7 +8,7 @@ import { WritableProxy, ReadableProxy } from "./stream";
 export type ForkProvider = (modulePath: string, args?: string[], options?: cp.ForkOptions) => cp.ChildProcess;
 
 export class ChildProcessProxy implements ServerProxy {
-	public constructor(private readonly process: cp.ChildProcess) {}
+	public constructor(private readonly process: cp.ChildProcess) { }
 
 	public async kill(signal?: string): Promise<void> {
 		this.process.kill(signal);
@@ -70,7 +70,8 @@ export interface ChildProcessProxies {
 }
 
 export class ChildProcessModuleProxy {
-	public constructor(private readonly forkProvider?: ForkProvider) {}
+	public readonly processes: Map<number, cp.ChildProcess> = new Map();
+	public constructor(private readonly forkProvider?: ForkProvider) { }
 
 	public async exec(
 		command: string,
@@ -94,7 +95,14 @@ export class ChildProcessModuleProxy {
 		return this.returnProxies(cp.spawn(command, args, options));
 	}
 
+	public async dispose(): Promise<void> {
+		this.processes.forEach((p) => p.kill("SIGTERM"));
+	}
+
 	private returnProxies(process: cp.ChildProcess): ChildProcessProxies {
+		process.on("exit", () => this.processes.delete(process.pid));
+		this.processes.set(process.pid, process);
+
 		return {
 			childProcess: new ChildProcessProxy(process),
 			stdin: process.stdin && new WritableProxy(process.stdin),

packages/protocol/src/node/server.ts

@@ -1,6 +1,6 @@
 import { mkdirp } from "fs-extra";
 import * as os from "os";
-import { field, logger} from "@coder/logger";
+import { field, logger } from "@coder/logger";
 import { ReadWriteConnection } from "../common/connection";
 import { Module, ServerProxy } from "../common/proxy";
 import { isPromise, isProxy, moduleToProto, protoToArgument, platformToProto, protoToModule, argumentToProto } from "../common/util";
@@ -60,8 +60,8 @@ export class Server {
 			]);
 
 			this.proxies.forEach((proxy, proxyId) => {
-				if (isProxy(proxy.instance)) {
-					proxy.instance.dispose().catch((error) => {
+				if (typeof proxy.instance.dispose === "function") {
+					(proxy.instance.dispose() as Promise<void>).catch((error) => {
 						logger.error(error.message);
 					});
 				}
@@ -196,7 +196,7 @@ export class Server {
 			callbackMessage = new Callback.Named();
 			callbackMessage.setModule(moduleToProto(proxyId));
 			message.setNamedCallback(callbackMessage);
-		} else  {
+		} else {
 			callbackMessage = new Callback.Numbered();
 			callbackMessage.setProxyId(proxyId);
 			message.setNumberedCallback(callbackMessage);
@@ -279,7 +279,7 @@ export class Server {
 			eventMessage = new Event.Named();
 			eventMessage.setModule(moduleToProto(proxyId));
 			message.setNamedEvent(eventMessage);
-		} else  {
+		} else {
 			eventMessage = new Event.Numbered();
 			eventMessage.setProxyId(proxyId);
 			message.setNumberedEvent(eventMessage);
@@ -316,7 +316,7 @@ export class Server {
 	private sendException(id: number, error: Error): void {
 		logger.trace(() => [
 			"sending reject",
-			field("id", id) ,
+			field("id", id),
 			field("message", error.message),
 		]);
 

packages/server/src/cli.ts

@@ -8,7 +8,7 @@ import * as os from "os";
 import * as path from "path";
 import * as WebSocket from "ws";
 import { buildDir, cacheHome, dataHome, isCli, serveStatic } from "./constants";
-import { createApp } from "./server";
+import { createApp, connections } from "./server";
 import { forkModule, requireModule } from "./vscode/bootstrapFork";
 import { SharedProcess, SharedProcessState } from "./vscode/sharedProcess";
 import opn = require("opn");
@@ -178,11 +178,11 @@ const bold = (text: string | number): string | number => {
 			"--extensions-dir", extensionsDir,
 			"--install-extension", options.installExtension,
 		], {
-			env: {
-				VSCODE_ALLOW_IO: "true",
-				VSCODE_LOGS: process.env.VSCODE_LOGS,
-			},
-		}, dataDir);
+				env: {
+					VSCODE_ALLOW_IO: "true",
+					VSCODE_LOGS: process.env.VSCODE_LOGS,
+				},
+			}, dataDir);
 
 		fork.stdout.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.info(l)));
 		fork.stderr.on("data", (d: Buffer) => d.toString().split("\n").forEach((l) => logger.error(l)));
@@ -265,6 +265,11 @@ const bold = (text: string | number): string | number => {
 			cert: certData,
 		} : undefined,
 	});
+	process.on("SIGTERM", () => {
+		connections.forEach((c) => c.close());
+		sharedProcess.dispose();
+		process.exit(1);
+	});
 
 	logger.info("Starting webserver...", field("host", options.host), field("port", options.port));
 	app.server.listen(options.port, options.host);

packages/server/src/server.ts

@@ -33,10 +33,13 @@ interface CreateAppOptions {
 	bypassAuth?: boolean;
 }
 
+let connectionID = 0;
+export const connections: Map<number, ReadWriteConnection> = new Map();
+
 export const createApp = async (options: CreateAppOptions): Promise<{
 	readonly express: express.Application;
 	readonly server: http.Server;
-	readonly wss: ws.Server;
+	readonly wss: ws.Server
 }> => {
 	const parseCookies = (req: http.IncomingMessage): { [key: string]: string } => {
 		const cookies: { [key: string]: string } = {};
@@ -166,6 +169,7 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 			return ws.send(JSON.stringify({ ports: portScanner.ports }));
 		}
 
+		const localConnectionID = connectionID++;
 		const connection: ReadWriteConnection = {
 			onMessage: (cb): void => {
 				ws.addEventListener("message", (event) => cb(event.data));
@@ -183,8 +187,12 @@ export const createApp = async (options: CreateAppOptions): Promise<{
 			},
 			onUp: (): void => undefined, // This can't come back up.
 			onDown: (cb): void => ws.addEventListener("close", () => cb()),
-			onClose: (cb): void => ws.addEventListener("close", () => cb()),
+			onClose: (cb): void => ws.addEventListener("close", () => {
+				connections.delete(localConnectionID);
+				cb();
+			}),
 		};
+		connections.set(localConnectionID, connection);
 
 		// tslint:disable-next-line no-unused-expression
 		new Server(connection, options.serverOptions);

packages/server/src/vscode/sharedProcess.ts

@@ -55,6 +55,10 @@ export class SharedProcess {
 			this.ipcHandler.send("handshake:goodbye");
 		}
 		this.ipcHandler = undefined;
+		retry.block();
+		if (this.activeProcess && !this.activeProcess.killed) {
+			this.activeProcess.kill("SIGTERM");
+		}
 	}
 
 	/**