Update node to 10.15.1 (coder#472)

* Update Node to 10.15.1

* Remove string replace that was used for oclif

* Update nbin

* Package node-pty and spdlog with nbin

* Label stderr/stdout from shared process

* Remove fork override

* Prevent "already disposed" errors when trying to kill disposed proxies

* Include spdlog dependencies

* Shim /node_modules

* Add node_modules to Docker ignore

It keeps using my already-built .node files which results in a
mismatching GLIBC version error.

* Update nbin

Author: code-asher

.dockerignore

@@ -7,3 +7,4 @@ doc/
 .travis.yml
 LICENSE
 README.md
+node_modules

.node-version

@@ -1 +1 @@
-8.15.0
+10.15.1

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- 8.15.0
+- 10.15.1
 env:
   - VSCODE_VERSION="1.33.1" MAJOR_VERSION="1" VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER-vsc$VSCODE_VERSION"
 matrix:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.15.0
+FROM node:10.15.1
 
 # Install VS Code's deps. These are the only two it seems we need.
 RUN apt-get update && apt-get install -y \

build/tasks.ts

@@ -48,19 +48,11 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
 	const bootstrapForkPath = path.join(pkgsPath, "vscode", "out", "bootstrap-fork.js");
 	const webOutputPath = path.join(pkgsPath, "web", "out");
 	const browserAppOutputPath = path.join(pkgsPath, "app", "browser", "out");
-	const nodePtyModule = path.join(pkgsPath, "protocol", "node_modules", "node-pty-prebuilt", "build", "Release", "pty.node");
-	const spdlogModule = path.join(pkgsPath, "protocol", "node_modules", "spdlog", "build", "Release", "spdlog.node");
 	let ripgrepPath = path.join(pkgsPath, "..", "lib", "vscode", "node_modules", "vscode-ripgrep", "bin", "rg");
 	if (isWin) {
 		ripgrepPath += ".exe";
 	}
 
-	if (!fs.existsSync(nodePtyModule)) {
-		throw new Error("Could not find pty.node. Ensure all packages have been installed");
-	}
-	if (!fs.existsSync(spdlogModule)) {
-		throw new Error("Could not find spdlog.node. Ensure all packages have been installed");
-	}
 	if (!fs.existsSync(webOutputPath)) {
 		throw new Error("Web bundle must be built");
 	}
@@ -91,8 +83,6 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
 	cpDir(webOutputPath, "auth", webOutputPath);
 	cpDir(browserAppOutputPath, "unauth", browserAppOutputPath);
 	fse.mkdirpSync(path.join(cliBuildPath, "dependencies"));
-	fse.copySync(nodePtyModule, path.join(cliBuildPath, "dependencies", "pty.node"));
-	fse.copySync(spdlogModule, path.join(cliBuildPath, "dependencies", "spdlog.node"));
 	fse.copySync(ripgrepPath, path.join(cliBuildPath, "dependencies", "rg"));
 });
 
@@ -204,9 +194,9 @@ register("package", async (runner, releaseTag) => {
 	});
 
 	runner.cwd = releasePath;
-	await os.platform() === "linux"
+	await (os.platform() === "linux"
 		? runner.execute("tar", ["-cvzf", `${archiveName}.tar.gz`, `${archiveName}`])
-		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]);
+		: runner.execute("zip", ["-r", `${archiveName}.zip`, `${archiveName}`]));
 });
 
 run();

package.json

@@ -56,8 +56,13 @@
     "webpack-hot-middleware": "^2.24.3",
     "write-file-webpack-plugin": "^4.5.0"
   },
+  "resolutions": {
+    "bindings": "1.3.0"
+  },
   "dependencies": {
     "node-loader": "^0.6.0",
+    "node-pty": "0.8.1",
+    "spdlog": "0.8.1",
     "webpack-merge": "^4.2.1"
   }
 }

packages/package.json

@@ -33,8 +33,7 @@
       "@coder/(.*)/test": "<rootDir>/$1/test",
       "@coder/(.*)": "<rootDir>/$1/src",
       "vs/(.*)": "<rootDir>/../lib/vscode/src/vs/$1",
-      "vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts",
-      "^node-pty": "node-pty-prebuilt"
+      "vszip": "<rootDir>/../lib/vscode/src/vs/base/node/zip.ts"
     },
     "transform": {
       "^.+\\.tsx?$": "ts-jest"

packages/protocol/package.json

@@ -4,8 +4,6 @@
     "dependencies": {
         "express": "^4.16.4",
         "google-protobuf": "^3.6.1",
-        "node-pty-prebuilt": "^0.7.6",
-        "spdlog": "^0.7.2",
         "trash": "^4.3.0",
         "ws": "^6.1.2"
     },

packages/protocol/src/browser/client.ts

@@ -174,9 +174,10 @@ export class Client {
 	 * Make a remote call for a proxy's method using proto.
 	 */
 	private remoteCall(proxyId: number | Module, method: string, args: any[]): Promise<any> {
-		if (this.disconnected && typeof proxyId === "number") {
-			// Can assume killing or closing works because a disconnected proxy
-			// is disposed on the server's side.
+		if (typeof proxyId === "number" && (this.disconnected || !this.proxies.has(proxyId))) {
+			// Can assume killing or closing works because a disconnected proxy is
+			// disposed on the server's side, and a non-existent proxy has already
+			// been disposed.
 			switch (method) {
 				case "close":
 				case "kill":