Merge branch 'master' of github.com:cdr/code-server

Ayane Satomi · Ayane Satomi · commit 93a0c72e0e95 · 2019-10-01T00:51:51.000+08:00
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 remote server, accessible through the browser.
 
 Try it out:
+
 ```bash
 docker run -it -p 127.0.0.1:8080:8080 -v "${HOME}/.local/share/code-server:/home/coder/.local/share/code-server" -v "$PWD:/home/coder/project" codercom/code-server:v2
 ```
@@ -18,10 +19,21 @@ docker run -it -p 127.0.0.1:8080:8080 -v "${HOME}/.local/share/code-server:/home
 ![Screenshot](/doc/assets/ide.gif)
 
 ## Getting Started
+
+### Requirements
+
+- Minimum GLIBC version of 2.17 and a minimum version of GLIBCXX of 3.4.15.
+  - This is the main requirement for building Visual Studio Code. We cannot go lower than this.
+- A 64-bit host with at least 1GB RAM and 2 cores.
+  - 1 core hosts would work but not optimally.
+- Docker (for Docker versions of `code-server`).
+
 ### Run over SSH
+
 Use [sshcode](https://github.com/codercom/sshcode) for a simple setup.
 
 ### Docker
+
 See the Docker one-liner mentioned above. Dockerfile is at [/Dockerfile](/Dockerfile).
 
 To debug Golang using the
@@ -31,18 +43,21 @@ arguments when launching code-server with Docker. See
 [#725](https://github.com/cdr/code-server/issues/725) for details.
 
 ### Digital Ocean
+
 [![Create a Droplet](./doc/assets/droplet.svg)](https://marketplace.digitalocean.com/apps/code-server?action=deploy)
 
 ### Binaries
+
 1. [Download a binary](https://github.com/cdr/code-server/releases). (Linux and
-    OS X supported. Windows coming soon)
+   OS X supported. Windows coming soon)
 2. Unpack the downloaded file then run the binary.
 3. In your browser navigate to `localhost:8080`.
 
 - For self-hosting and other information see [doc/quickstart.md](doc/quickstart.md).
 - For hosting on cloud platforms see [doc/deploy.md](doc/deploy.md).
 
 ### Build
+
 - If you also plan on developing, set the `OUT` environment variable. Otherwise
   it will build in this directory which will cause issues because `yarn watch`
   will try to compile the build directory as well.
@@ -56,29 +71,41 @@ arguments when launching code-server with Docker. See
   code into a single binary.
 
 ## Known Issues
+
 - Creating custom VS Code extensions and debugging them doesn't work.
 - Extension profiling and tips are currently disabled.
 
 ## Future
+
 - **Stay up to date!** Get notified about new releases of code-server.
   ![Screenshot](/doc/assets/release.gif)
 - Windows support.
 - Electron and Chrome OS applications to bridge the gap between local<->remote.
 - Run VS Code unit tests against our builds to ensure features work as expected.
 
 ## Extensions
-At the moment we can't use the official VS Code Marketplace. We've created a
-custom extension marketplace focused around open-sourced extensions. However,
-you can manually download the extension to your extensions directory. It's also
-possible to set your own marketplace URLs by setting the `SERVICE_URL` and
-`ITEM_URL` environment variables.
+
+code-server does not provide access to the official
+[Visual Studio Marketplace](https://marketplace.visualstudio.com/vscode). Instead,
+Coder has created a custom extension marketplace that we manage for open-source
+extensions. If you want to use an extension with code-server that we do not have
+in our marketplace please look for a release in the extension’s repository,
+contact us to see if we have one in the works or, if you build an extension
+locally from open source, you can copy it to the `extensions` folder. If you
+build one locally from open-source please contribute it to the project and let
+us know so we can give you props! If you have your own custom marketplace, it is
+possible to point code-server to it by setting the `SERVICE_URL` and `ITEM_URL`
+environment variables.
 
 ## Telemetry
+
 Use the `--disable-telemetry` flag to completely disable telemetry. We use the
 data collected to improve code-server.
 
 ## Contributing
+
 ### Development
+
 ```shell
 git clone https://github.com/microsoft/vscode
 cd vscode
@@ -99,6 +126,7 @@ If you run into issues about a different version of Node being used, try running
 `vscode-ripgrep`.
 
 ### Upgrading VS Code
+
 We patch VS Code to provide and fix some functionality. As the web portion of VS
 Code matures, we'll be able to shrink and maybe even entirely eliminate our
 patch. In the meantime, however, upgrading the VS Code version requires ensuring
@@ -109,6 +137,7 @@ the patch in the VS Code source, then run `yarn patch:generate` in this
 directory.
 
 Our changes include:
+
 - Change the remote schema to `code-server`.
 - Allow multiple extension directories (both user and built-in).
 - Modify the loader, websocket, webview, service worker, and asset requests to
@@ -123,12 +152,15 @@ Our changes include:
 - Modify the build process to include our code.
 
 ## License
+
 [MIT](LICENSE)
 
 ## Enterprise
+
 Visit [our enterprise page](https://coder.com/enterprise) for more information
 about our enterprise offering.
 
 ## Commercialization
+
 If you would like to commercialize code-server, please contact
 contact@coder.com.
diff --git a/doc/examples/kubernetes.aws.yaml b/doc/examples/kubernetes.aws.yaml
@@ -58,7 +58,7 @@ spec:
         app: code-server
     spec:
       containers:
-      - image: codercom/code-server
+      - image: codercom/code-server:v2
         imagePullPolicy: Always
         name: code-servery
         ports:
diff --git a/doc/examples/kubernetes.yaml b/doc/examples/kubernetes.yaml
@@ -35,7 +35,7 @@ spec:
         app: code-server
     spec:
       containers:
-      - image: codercom/code-server
+      - image: codercom/code-server:v2
         imagePullPolicy: Always
         name: code-server
         ports:
diff --git a/scripts/vscode.patch b/scripts/vscode.patch
@@ -132,6 +132,19 @@ index 07759dffe5..9148d7c1f0 100644
  } else if (typeof process === 'object') {
  	_isWindows = (process.platform === 'win32');
  	_isMacintosh = (process.platform === 'darwin');
+diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
+index 3ae24454cb..d637d02855 100644
+--- a/src/vs/base/node/languagePacks.js
++++ b/src/vs/base/node/languagePacks.js
+@@ -146,7 +146,7 @@ function factory(nodeRequire, path, fs, perf) {
+ 	function getLanguagePackConfigurations(userDataPath) {
+ 		const configFile = path.join(userDataPath, 'languagepacks.json');
+ 		try {
+-			return nodeRequire(configFile);
++			return JSON.parse(fs.readFileSync(configFile, "utf8"));
+ 		} catch (err) {
+ 			// Do nothing. If we can't read the file we have no
+ 			// language pack config.
 diff --git a/src/vs/code/browser/workbench/workbench.html b/src/vs/code/browser/workbench/workbench.html
 index 44f67f0a0b..00fc1deea8 100644
 --- a/src/vs/code/browser/workbench/workbench.html
diff --git a/src/cli.ts b/src/cli.ts
@@ -120,7 +120,7 @@ const startVscode = async (): Promise<void | void[]> => {
 
 	const server = new MainServer({
 		...options,
-		port: typeof args.port !== "undefined" && parseInt(args.port, 10) || 8080,
+		port: typeof args.port !== "undefined" ? parseInt(args.port, 10) : 8080,
 		socket: args.socket,
 	}, args);
 
@@ -151,7 +151,7 @@ const startVscode = async (): Promise<void | void[]> => {
 
 	if (!server.options.socket && args.open) {
 		// The web socket doesn't seem to work if browsing with 0.0.0.0.
-		const openAddress = `http://localhost:${server.options.port}`;
+		const openAddress = serverAddress.replace(/:\/\/0.0.0.0/, "://localhost");
 		await open(openAddress).catch(console.error);
 		logger.info(`  - Opened ${openAddress}`);
 	}
diff --git a/src/connection.ts b/src/connection.ts
@@ -123,6 +123,7 @@ export class ExtensionHostConnection extends Connection {
 					VSCODE_EXTHOST_WILL_SEND_SOCKET: "true",
 					VSCODE_HANDLES_UNCAUGHT_ERRORS: "true",
 					VSCODE_LOG_STACK: "false",
+					VSCODE_LOG_LEVEL: this.environment.verbose ? "trace" : this.environment.log,
 					VSCODE_NLS_CONFIG: JSON.stringify(config),
 				},
 				silent: true,
diff --git a/src/marketplace.ts b/src/marketplace.ts
@@ -79,52 +79,55 @@ export const buffer = (targetPath: string, filePath: string): Promise<Buffer> =>
 };
 
 const extractAssets = async (tarPath: string, match: RegExp, callback: (path: string, data: Buffer) => void): Promise<void> => {
-	const buffer = await util.promisify(fs.readFile)(tarPath);
-	return new Promise<void>(async (resolve, reject): Promise<void> => {
+	return new Promise<void>((resolve, reject): void => {
 		const extractor = tarStream.extract();
-		extractor.once("error", reject);
+		const fail = (error: Error) => {
+			extractor.destroy();
+			reject(error);
+		};
+		extractor.once("error", fail);
 		extractor.on("entry", async (header, stream, next) => {
 			const name = header.name;
 			if (match.test(name)) {
 				extractData(stream).then((data) => {
 					callback(name, data);
 					next();
-				}).catch(reject);
-				stream.resume();
+				}).catch(fail);
 			} else {
 				stream.on("end", () => next());
-				stream.resume();
+				stream.resume(); // Just drain it.
 			}
 		});
 		extractor.on("finish", resolve);
-		extractor.write(buffer);
-		extractor.end();
+		fs.createReadStream(tarPath).pipe(extractor);
 	});
 };
 
 const extractData = (stream: NodeJS.ReadableStream): Promise<Buffer> => {
 	return new Promise((resolve, reject): void => {
 		const fileData: Buffer[] = [];
-		stream.on("data", (data) => fileData.push(data));
-		stream.on("end", () => resolve(Buffer.concat(fileData)));
 		stream.on("error", reject);
+		stream.on("end", () => resolve(Buffer.concat(fileData)));
+		stream.on("data", (data) => fileData.push(data));
 	});
 };
 
 const extractTar = async (tarPath: string, targetPath: string, options: IExtractOptions = {}, token: CancellationToken): Promise<void> => {
-	const buffer = await util.promisify(fs.readFile)(tarPath);
-	return new Promise<void>(async (resolve, reject): Promise<void> => {
+	return new Promise<void>((resolve, reject): void => {
 		const sourcePathRegex = new RegExp(options.sourcePath ? `^${options.sourcePath}` : "");
 		const extractor = tarStream.extract();
-		extractor.once("error", reject);
+		const fail = (error: Error) => {
+			extractor.destroy();
+			reject(error);
+		};
+		extractor.once("error", fail);
 		extractor.on("entry", async (header, stream, next) => {
-			const rawName = path.normalize(header.name);
-
 			const nextEntry = (): void => {
+				stream.on("end", () => next());
 				stream.resume();
-				next();
 			};
 
+			const rawName = path.normalize(header.name);
 			if (token.isCancellationRequested || !sourcePathRegex.test(rawName)) {
 				return nextEntry();
 			}
@@ -138,20 +141,18 @@ const extractTar = async (tarPath: string, targetPath: string, options: IExtract
 			const dirName = path.dirname(fileName);
 			const targetDirName = path.join(targetPath, dirName);
 			if (targetDirName.indexOf(targetPath) !== 0) {
-				return reject(nls.localize("invalid file", "Error extracting {0}. Invalid file.", fileName));
+				return fail(new Error(nls.localize("invalid file", "Error extracting {0}. Invalid file.", fileName)));
 			}
 
-			return mkdirp(targetDirName, undefined, token).then(() => {
-				const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
-				fstream.once("close", () => next());
-				fstream.once("error", reject);
-				stream.pipe(fstream);
-				stream.resume();
-			});
+			await mkdirp(targetDirName, undefined, token);
+
+			const fstream = fs.createWriteStream(targetFileName, { mode: header.mode });
+			fstream.once("close", () => next());
+			fstream.once("error", fail);
+			stream.pipe(fstream);
 		});
 		extractor.once("finish", resolve);
-		extractor.write(buffer);
-		extractor.end();
+		fs.createReadStream(tarPath).pipe(extractor);
 	});
 };
 
diff --git a/src/server.ts b/src/server.ts
@@ -531,30 +531,45 @@ export class MainServer extends Server {
 			util.promisify(fs.readFile)(filePath, "utf8"),
 			this.servicesPromise,
 		]);
+
 		const logger = this.services.get(ILogService) as ILogService;
 		logger.info("request.url", `"${request.url}"`);
-		const environment = this.services.get(IEnvironmentService) as IEnvironmentService;
-		const locale = environment.args.locale || await getLocaleFromConfig(environment.userDataPath);
+
 		const cwd = process.env.VSCODE_CWD || process.cwd();
-		const workspacePath = parsedUrl.query.workspace as string | undefined;
-		const folderPath = !workspacePath ? parsedUrl.query.folder as string | undefined || this.options.folderUri : undefined;
+
 		const remoteAuthority = request.headers.host as string;
 		const transformer = getUriTransformer(remoteAuthority);
+		const validatePath = async (filePath: string[] | string | undefined, isDirectory: boolean, unsetFallback?: string): Promise<UriComponents | undefined> => {
+			if (!filePath || filePath.length === 0) {
+				if (!unsetFallback) {
+					return undefined;
+				}
+				filePath = unsetFallback;
+			} else if (Array.isArray(filePath)) {
+				filePath = filePath[0];
+			}
+			const uri = URI.file(sanitizeFilePath(filePath, cwd));
+			try {
+				const stat = await util.promisify(fs.stat)(uri.fsPath);
+				if (isDirectory !== stat.isDirectory()) {
+					return undefined;
+				}
+			} catch (error) {
+				return undefined;
+			}
+			return transformer.transformOutgoing(uri);
+		};
+
+		const environment = this.services.get(IEnvironmentService) as IEnvironmentService;
 		const options: Options = {
 			WORKBENCH_WEB_CONGIGURATION: {
-				workspaceUri: workspacePath
-					? transformer.transformOutgoing(URI.file(sanitizeFilePath(workspacePath, cwd)))
-					: undefined,
-				folderUri: folderPath
-					? transformer.transformOutgoing(URI.file(sanitizeFilePath(folderPath, cwd)))
-					: undefined,
+				workspaceUri: await validatePath(parsedUrl.query.workspace, false),
+				folderUri: !parsedUrl.query.workspace ? await validatePath(parsedUrl.query.folder, true, this.options.folderUri) : undefined,
 				remoteAuthority,
 				productConfiguration: product,
 			},
-			REMOTE_USER_DATA_URI: transformer.transformOutgoing(
-				(this.services.get(IEnvironmentService) as EnvironmentService).webUserDataHome,
-			),
-			NLS_CONFIGURATION: await getNlsConfiguration(locale, environment.userDataPath),
+			REMOTE_USER_DATA_URI: transformer.transformOutgoing((<EnvironmentService>environment).webUserDataHome),
+			NLS_CONFIGURATION: await getNlsConfiguration(environment.args.locale || await getLocaleFromConfig(environment.userDataPath), environment.userDataPath),
 		};
 
 		content = content.replace(/\/static\//g, `/static${product.commit ? `-${product.commit}` : ""}/`).replace("{{WEBVIEW_ENDPOINT}}", "");
