Merge pull request coder#1 from codercom/master

test

Author: lucacasonato

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug Report
 about: Report problems and unexpected behavior.
 title: ''
-labels: ''
+labels: 'bug'
 assignees: ''
 ---
 
@@ -12,7 +12,11 @@ assignees: ''
 - `code-server` version: <!-- The version of code-server -->
 - OS Version: <!-- OS version, cloud provider,  -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->

.github/ISSUE_TEMPLATE/extension_bug.md

@@ -12,7 +12,11 @@ assignees: ''
 - OS Version: <!-- OS version, cloud provider,  -->
 - Extension: <!-- Link to extension -->
 
-#### Steps to Reproduce
+## Description
 
-1.
-2.
+<!-- Describes the problem here -->
+
+## Steps to Reproduce
+
+1. <!-- step 1: click ... -->
+1. <!-- step 2: ... -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature Request
 about: Suggest an idea for this project.
 title: ''
-labels: ''
+labels: 'feature'
 assignees: ''
 ---
 

.github/ISSUE_TEMPLATE/question.md

@@ -2,16 +2,16 @@
 name: Question
 about: Ask a question.
 title: ''
-labels: ''
+labels: 'question'
 assignees: ''
 ---
 
 <!-- Please search existing issues to avoid creating duplicates. -->
 
-#### Description
+## Description
 
 <!-- A description of the the question. -->
 
-#### Related Issues
+## Related Issues
 
 <!-- Any issues related to your question. -->

Dockerfile

@@ -15,7 +15,7 @@ COPY . .
 # directly which should be fast as it is slow because it populates its own cache every time.
 RUN yarn && yarn task build:server:binary
 
-# We deploy with ubuntu so that devs have a familiar environemnt.
+# We deploy with ubuntu so that devs have a familiar environment.
 FROM ubuntu:18.10
 WORKDIR /root/project
 COPY --from=0 /src/packages/server/cli-linux-x64 /usr/local/bin/code-server
@@ -28,5 +28,5 @@ RUN apt-get install -y locales && \
 # We unfortunately cannot use update-locale because docker will not use the env variables
 # configured in /etc/default/locale so we need to set it manually.
 ENV LANG=en_US.UTF-8
-# Unfortunately `.` does not work with code-server.
-CMD code-server $PWD
+ENTRYPOINT code-server
+CMD ["."]

README.md

@@ -9,7 +9,7 @@
 
 Try it out:
 ```bash
-docker run -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server code-server --allow-http --no-auth
+docker run -t -p 127.0.0.1:8443:8443 -v "${PWD}:/root/project" codercom/code-server --allow-http --no-auth
 ```
 
 - Code on your Chromebook, tablet, and laptop with a consistent dev environment.

build/tasks.ts

@@ -10,6 +10,7 @@ const libPath = path.join(__dirname, "../lib");
 const vscodePath = path.join(libPath, "vscode");
 const pkgsPath = path.join(__dirname, "../packages");
 const defaultExtensionsPath = path.join(libPath, "VSCode-linux-x64/resources/app/extensions");
+const vscodeVersion = "1.32";
 
 const buildServerBinary = register("build:server:binary", async (runner) => {
 	await ensureInstalled();
@@ -219,17 +220,11 @@ const ensureCloned = register("vscode:clone", async (runner) => {
 	} else {
 		fse.mkdirpSync(libPath);
 		runner.cwd = libPath;
-		const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode"]);
+		const clone = await runner.execute("git", ["clone", "https://github.com/microsoft/vscode", "--branch", `release/${vscodeVersion}`, "--single-branch", "--depth=1"]);
 		if (clone.exitCode !== 0) {
 			throw new Error(`Failed to clone: ${clone.exitCode}`);
 		}
 	}
-
-	runner.cwd = vscodePath;
-	const checkout = await runner.execute("git", ["checkout", "tags/1.32.0"]);
-	if (checkout.exitCode !== 0) {
-		throw new Error(`Failed to checkout: ${checkout.stderr}`);
-	}
 });
 
 const ensureClean = register("vscode:clean", async (runner) => {
@@ -246,6 +241,10 @@ const ensureClean = register("vscode:clean", async (runner) => {
 			throw new Error(`Failed to remove unstaged files: ${removeUnstaged.stderr}`);
 		}
 	}
+	const fetch = await runner.execute("git", ["fetch", "--prune"]);
+	if (fetch.exitCode !== 0) {
+		throw new Error(`Failed to fetch latest changes: ${fetch.stderr}`);
+	}
 });
 
 const ensurePatched = register("vscode:patch", async (runner) => {

doc/self-hosted/index.md

@@ -74,5 +74,20 @@ OPTIONS
 
 > To ensure the connection between you and your server is encrypted view our guide on [securing your setup](../security/ssl.md)
 
+  ### Nginx Reverse Proxy
+  Nginx is for reverse proxy. Here is a example virtual host that works with code-server. Please also pass --allow-http. You can also use certbot by EFF to get a ssl certificates for free.
+  ```
+  server {
+    listen 80;
+    listen [::]:80;
+    server_name code.example.com code.example.org;
+      location / {
+         proxy_pass http://localhost:8443/;
+         proxy_set_header Upgrade $http_upgrade;
+         proxy_set_header Connection upgrade;
+      }
+   }
+  ```
+
   ### Help
   Use `code-server -h` or `code-server --help` to view the usage for the cli. This is also shown at the beginning of this section.

packages/ide/src/fill/client.ts

@@ -91,8 +91,9 @@ class WebsocketConnection implements ReadWriteConnection {
 	 */
 	private async openSocket(): Promise<WebSocket> {
 		this.dispose();
+		const wsProto = location.protocol === "https:" ? "wss" : "ws";
 		const socket = new WebSocket(
-			`${location.protocol === "https:" ? "wss" : "ws"}://${location.host}`,
+			`${wsProto}://${location.host}${location.pathname}`,
 		);
 		socket.binaryType = "arraybuffer";
 		this.activeSocket = socket;

packages/server/package.json

@@ -19,6 +19,7 @@
 		"node-netstat": "^1.6.0",
 		"pem": "^1.14.1",
 		"promise.prototype.finally": "^3.1.0",
+		"safe-compare": "^1.1.4",
 		"ws": "^6.1.2",
 		"xhr2": "^0.1.4"
 	},
@@ -28,6 +29,7 @@
 		"@types/mime-types": "^2.1.0",
 		"@types/opn": "^5.1.0",
 		"@types/pem": "^1.9.4",
+		"@types/safe-compare": "^1.1.0",
 		"@types/ws": "^6.0.1",
 		"fs-extra": "^7.0.1",
 		"nexe": "^2.0.0-rc.34",