From de568d446beba423c0e4787ec22401fcdeb76394 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:01:18 -0500
Subject: [PATCH 1/7] Add cookie domain debug logs

To help debug login issues.
---
 src/node/http.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/node/http.ts b/src/node/http.ts
index bcd464bd..5c8346f7 100644
--- a/src/node/http.ts
+++ b/src/node/http.ts
@@ -868,6 +868,7 @@ export class HttpServer {
       // isn't setting the host header to match the access domain.
       host === "localhost"
     ) {
+      logger.debug("no valid cookie doman", field("host", host))
       return undefined
     }
 
@@ -877,6 +878,7 @@ export class HttpServer {
       }
     })
 
+    logger.debug("got cookie doman", field("host", host))
     return host ? `Domain=${host}` : undefined
   }
 

From 751a5ea3ad6bec3e32201a37cfccdc0c2f31f462 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:03:11 -0500
Subject: [PATCH 2/7] Move login JS to a separate file

Mostly so the base URL resolution code can be shared.
---
 ci/build/build-code-server.sh | 1 +
 ci/dev/watch.ts               | 6 +++++-
 src/browser/pages/login.html  | 7 +------
 src/browser/pages/login.ts    | 7 +++++++
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 src/browser/pages/login.ts

diff --git a/ci/build/build-code-server.sh b/ci/build/build-code-server.sh
index f0e4ddc3..1d2942d9 100755
--- a/ci/build/build-code-server.sh
+++ b/ci/build/build-code-server.sh
@@ -21,6 +21,7 @@ main() {
     --public-url "." \
     --out-dir dist \
     $([[ $MINIFY ]] || echo --no-minify) \
+    src/browser/login.ts \
     src/browser/register.ts \
     src/browser/serviceWorker.ts
 }
diff --git a/ci/dev/watch.ts b/ci/dev/watch.ts
index ba386b75..7e56c186 100644
--- a/ci/dev/watch.ts
+++ b/ci/dev/watch.ts
@@ -164,7 +164,11 @@ class Watcher {
 
   private createBundler(out = "dist"): Bundler {
     return new Bundler(
-      [path.join(this.rootPath, "src/browser/register.ts"), path.join(this.rootPath, "src/browser/serviceWorker.ts")],
+      [
+        path.join(this.rootPath, "src/browser/login.ts"),
+        path.join(this.rootPath, "src/browser/register.ts"),
+        path.join(this.rootPath, "src/browser/serviceWorker.ts"),
+      ],
       {
         outDir: path.join(this.rootPath, out),
         cacheDir: path.join(this.rootPath, ".cache"),
diff --git a/src/browser/pages/login.html b/src/browser/pages/login.html
index 586c9c66..f2b26299 100644
--- a/src/browser/pages/login.html
+++ b/src/browser/pages/login.html
@@ -47,10 +47,5 @@
     </div>
   </body>
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.js"></script>
-  <script>
-    const parts = window.location.pathname.replace(/^\//g, "").split("/")
-    parts[parts.length - 1] = "{{BASE}}"
-    const url = new URL(window.location.origin + "/" + parts.join("/"))
-    document.getElementById("base").value = url.pathname
-  </script>
+  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/login.js"></script>
 </html>
diff --git a/src/browser/pages/login.ts b/src/browser/pages/login.ts
new file mode 100644
index 00000000..c7fc92d4
--- /dev/null
+++ b/src/browser/pages/login.ts
@@ -0,0 +1,7 @@
+import { getOptions } from "../../common/util"
+
+const options = getOptions()
+const el = document.getElementById("base") as HTMLInputElement
+if (el) {
+  el.value = options.base
+}

From d6d24966be4cf51b2860751db9e4842ca7cc4038 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:03:22 -0500
Subject: [PATCH 3/7] Move vscode JS to a separate file

Mostly to match everything else.
---
 ci/build/build-code-server.sh |  5 ++--
 ci/dev/watch.ts               |  3 +-
 src/browser/pages/vscode.html | 49 +-------------------------------
 src/browser/pages/vscode.ts   | 53 +++++++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 src/browser/pages/vscode.ts

diff --git a/ci/build/build-code-server.sh b/ci/build/build-code-server.sh
index 1d2942d9..e1bb0558 100755
--- a/ci/build/build-code-server.sh
+++ b/ci/build/build-code-server.sh
@@ -21,9 +21,10 @@ main() {
     --public-url "." \
     --out-dir dist \
     $([[ $MINIFY ]] || echo --no-minify) \
-    src/browser/login.ts \
     src/browser/register.ts \
-    src/browser/serviceWorker.ts
+    src/browser/serviceWorker.ts \
+    src/browser/pages/login.ts \
+    src/browser/pages/vscode.ts
 }
 
 main "$@"
diff --git a/ci/dev/watch.ts b/ci/dev/watch.ts
index 7e56c186..73823d03 100644
--- a/ci/dev/watch.ts
+++ b/ci/dev/watch.ts
@@ -165,9 +165,10 @@ class Watcher {
   private createBundler(out = "dist"): Bundler {
     return new Bundler(
       [
-        path.join(this.rootPath, "src/browser/login.ts"),
         path.join(this.rootPath, "src/browser/register.ts"),
         path.join(this.rootPath, "src/browser/serviceWorker.ts"),
+        path.join(this.rootPath, "src/browser/pages/login.ts"),
+        path.join(this.rootPath, "src/browser/pages/vscode.ts"),
       ],
       {
         outDir: path.join(this.rootPath, out),
diff --git a/src/browser/pages/vscode.html b/src/browser/pages/vscode.html
index 4653698b..e846ec0d 100644
--- a/src/browser/pages/vscode.html
+++ b/src/browser/pages/vscode.html
@@ -43,47 +43,7 @@
   <body aria-label=""></body>
 
   <!-- Startup (do not modify order of script tags!) -->
-  <script>
-    let nlsConfig
-    try {
-      nlsConfig = JSON.parse(document.getElementById("vscode-remote-nls-configuration").getAttribute("data-settings"))
-      if (nlsConfig._resolvedLanguagePackCoreLocation) {
-        const bundles = Object.create(null)
-        nlsConfig.loadBundle = (bundle, language, cb) => {
-          let result = bundles[bundle]
-          if (result) {
-            return cb(undefined, result)
-          }
-          // FIXME: Only works if path separators are /.
-          const path = nlsConfig._resolvedLanguagePackCoreLocation + "/" + bundle.replace(/\//g, "!") + ".nls.json"
-          fetch(`{{BASE}}/resource/?path=${encodeURIComponent(path)}`)
-            .then((response) => response.json())
-            .then((json) => {
-              bundles[bundle] = json
-              cb(undefined, json)
-            })
-            .catch(cb)
-        }
-      }
-    } catch (error) {
-      /* Probably fine. */
-    }
-    self.require = {
-      baseUrl: "{{CS_STATIC_BASE}}/lib/vscode/out",
-      paths: {
-        "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
-        "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,
-        xterm: `../node_modules/xterm/lib/xterm.js`,
-        "xterm-addon-search": `../node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
-        "xterm-addon-unicode11": `../node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
-        "xterm-addon-webgl": `../node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
-        "semver-umd": `../node_modules/semver-umd/lib/semver-umd.js`,
-        "iconv-lite-umd": `../node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
-        jschardet: `../node_modules/jschardet/dist/jschardet.min.js`,
-      },
-      "vs/nls": nlsConfig,
-    }
-  </script>
+  <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/pages/vscode.js"></script>
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/dist/register.js"></script>
   <script data-cfasync="false" src="{{CS_STATIC_BASE}}/lib/vscode/out/vs/loader.js"></script>
   <!-- PROD_ONLY
@@ -93,11 +53,4 @@
   <script>
     require(["vs/code/browser/workbench/workbench"], function () {})
   </script>
-  <script>
-    try {
-      document.body.style.background = JSON.parse(localStorage.getItem("colorThemeData")).colorMap["editor.background"]
-    } catch (error) {
-      // Oh well.
-    }
-  </script>
 </html>
diff --git a/src/browser/pages/vscode.ts b/src/browser/pages/vscode.ts
new file mode 100644
index 00000000..d2fcdde3
--- /dev/null
+++ b/src/browser/pages/vscode.ts
@@ -0,0 +1,53 @@
+import { getOptions } from "../../common/util"
+
+const options = getOptions()
+
+// TODO: Add proper types.
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+let nlsConfig: any
+try {
+  nlsConfig = JSON.parse(document.getElementById("vscode-remote-nls-configuration")!.getAttribute("data-settings")!)
+  if (nlsConfig._resolvedLanguagePackCoreLocation) {
+    const bundles = Object.create(null)
+    nlsConfig.loadBundle = (bundle: any, _language: any, cb: any): void => {
+      const result = bundles[bundle]
+      if (result) {
+        return cb(undefined, result)
+      }
+      // FIXME: Only works if path separators are /.
+      const path = nlsConfig._resolvedLanguagePackCoreLocation + "/" + bundle.replace(/\//g, "!") + ".nls.json"
+      fetch(`{{BASE}}/resource/?path=${encodeURIComponent(path)}`)
+        .then((response) => response.json())
+        .then((json) => {
+          bundles[bundle] = json
+          cb(undefined, json)
+        })
+        .catch(cb)
+    }
+  }
+} catch (error) {
+  /* Probably fine. */
+}
+
+;(self.require as any) = {
+  baseUrl: `${options.csStaticBase}/lib/vscode/out`,
+  paths: {
+    "vscode-textmate": `../node_modules/vscode-textmate/release/main`,
+    "vscode-oniguruma": `../node_modules/vscode-oniguruma/release/main`,
+    xterm: `../node_modules/xterm/lib/xterm.js`,
+    "xterm-addon-search": `../node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
+    "xterm-addon-unicode11": `../node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
+    "xterm-addon-webgl": `../node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
+    "semver-umd": `../node_modules/semver-umd/lib/semver-umd.js`,
+    "iconv-lite-umd": `../node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
+    jschardet: `../node_modules/jschardet/dist/jschardet.min.js`,
+  },
+  "vs/nls": nlsConfig,
+}
+
+try {
+  document.body.style.background = JSON.parse(localStorage.getItem("colorThemeData")!).colorMap["editor.background"]
+} catch (error) {
+  // Oh well.
+}

From 8590f80c319ec37172610b01a4467fa278e101fa Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:05:13 -0500
Subject: [PATCH 4/7] Remove unnecessary tsc settings

---
 ci/build/build-code-server.sh | 3 ++-
 tsconfig.json                 | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ci/build/build-code-server.sh b/ci/build/build-code-server.sh
index e1bb0558..df085280 100755
--- a/ci/build/build-code-server.sh
+++ b/ci/build/build-code-server.sh
@@ -9,7 +9,8 @@ MINIFY=${MINIFY-true}
 main() {
   cd "$(dirname "${0}")/../.."
 
-  tsc --outDir out --tsBuildInfoFile .cache/out.tsbuildinfo
+  tsc
+
   # If out/node/entry.js does not already have the shebang,
   # we make sure to add it and make it executable.
   if ! grep -q -m1 "^#!/usr/bin/env node" out/node/entry.js; then
diff --git a/tsconfig.json b/tsconfig.json
index 2c7db3ea..ac3a1df5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,17 +8,15 @@
     "noUnusedLocals": true,
     "forceConsistentCasingInFileNames": true,
     "outDir": "./out",
-    "allowJs": false,
-    "jsx": "react",
     "declaration": true,
     "experimentalDecorators": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
-    "tsBuildInfoFile": "./.tsbuildinfo",
+    "tsBuildInfoFile": "./.cache/tsbuildinfo",
     "incremental": true,
     "rootDir": "./src",
     "typeRoots": ["./node_modules/@types", "./typings"]
   },
-  "include": ["./src/**/*.ts", "./src/**/*.tsx"]
+  "include": ["./src/**/*.ts"]
 }

From 150d37868a1f9923ae05d78231d671af10835cd3 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:08:45 -0500
Subject: [PATCH 5/7] Enforce strict equals

---
 .eslintrc.yaml  | 1 +
 src/node/cli.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index a06f1d76..96931d55 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -23,6 +23,7 @@ rules:
   no-dupe-class-members: off
   "@typescript-eslint/no-use-before-define": off
   "@typescript-eslint/no-non-null-assertion": off
+  eqeqeq: error
 
 settings:
   # Does not work with CommonJS unfortunately.
diff --git a/src/node/cli.ts b/src/node/cli.ts
index e3072b1d..e900fdff 100644
--- a/src/node/cli.ts
+++ b/src/node/cli.ts
@@ -172,7 +172,7 @@ export const parse = (
     const arg = argv[i]
 
     // -- signals the end of option parsing.
-    if (!ended && arg == "--") {
+    if (!ended && arg === "--") {
       ended = true
       continue
     }
@@ -220,7 +220,7 @@ export const parse = (
         throw error(`--${key} requires a value`)
       }
 
-      if (option.type == OptionalString && value == "false") {
+      if (option.type === OptionalString && value === "false") {
         continue
       }
 

From f7790c9719d0948fcb2c94e62fb4c1646200d6aa Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:12:15 -0500
Subject: [PATCH 6/7] Remove unused deep merge code

---
 src/node/settings.ts |  8 ++++----
 src/node/util.ts     | 19 -------------------
 test/util.test.ts    | 36 ------------------------------------
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/src/node/settings.ts b/src/node/settings.ts
index 7564b531..213cd1a2 100644
--- a/src/node/settings.ts
+++ b/src/node/settings.ts
@@ -1,6 +1,6 @@
 import * as fs from "fs-extra"
 import * as path from "path"
-import { extend, paths } from "./util"
+import { paths } from "./util"
 import { logger } from "@coder/logger"
 import { Route } from "./http"
 
@@ -30,12 +30,12 @@ export class SettingsProvider<T> {
 
   /**
    * Write settings combined with current settings. On failure log a warning.
-   * Settings can be shallow or deep merged.
+   * Settings will be merged shallowly.
    */
-  public async write(settings: Partial<T>, shallow = true): Promise<void> {
+  public async write(settings: Partial<T>): Promise<void> {
     try {
       const oldSettings = await this.read()
-      const nextSettings = shallow ? Object.assign({}, oldSettings, settings) : extend(oldSettings, settings)
+      const nextSettings = { ...oldSettings, ...settings }
       await fs.writeFile(this.settingsPath, JSON.stringify(nextSettings, null, 2))
     } catch (error) {
       logger.warn(error.message)
diff --git a/src/node/util.ts b/src/node/util.ts
index a6f8f9b5..a70d7ef6 100644
--- a/src/node/util.ts
+++ b/src/node/util.ts
@@ -199,25 +199,6 @@ export const isObject = <T extends object>(obj: T): obj is T => {
   return !Array.isArray(obj) && typeof obj === "object" && obj !== null
 }
 
-/**
- * Extend a with b and return a new object. Properties with objects will be
- * recursively merged while all other properties are just overwritten.
- */
-export function extend<A, B>(a: A, b: B): A & B
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function extend(...args: any[]): any {
-  const c = {} as any // eslint-disable-line @typescript-eslint/no-explicit-any
-  for (const obj of args) {
-    if (!isObject(obj)) {
-      continue
-    }
-    for (const key in obj) {
-      c[key] = isObject(obj[key]) ? extend(c[key], obj[key]) : obj[key]
-    }
-  }
-  return c
-}
-
 /**
  * Taken from vs/base/common/charCode.ts. Copied for now instead of importing so
  * we don't have to set up a `vs` alias to be able to import with types (since
diff --git a/test/util.test.ts b/test/util.test.ts
index 28fb9fc8..978d3ee5 100644
--- a/test/util.test.ts
+++ b/test/util.test.ts
@@ -1,43 +1,7 @@
 import * as assert from "assert"
 import { normalize } from "../src/common/util"
-import { extend } from "../src/node/util"
 
 describe("util", () => {
-  describe("extend", () => {
-    it("should extend", () => {
-      const a = { foo: { bar: 0, baz: 2 }, garply: 4, waldo: 6 }
-      const b = { foo: { bar: 1, qux: 3 }, garply: "5", fred: 7 }
-      const extended = extend(a, b)
-      assert.deepEqual(extended, {
-        foo: { bar: 1, baz: 2, qux: 3 },
-        garply: "5",
-        waldo: 6,
-        fred: 7,
-      })
-    })
-
-    it("should make deep copies of the original objects", () => {
-      const a = { foo: 0, bar: { frobnozzle: 2 }, mumble: { qux: { thud: 4 } } }
-      const b = { foo: 1, bar: { chad: 3 } }
-      const extended = extend(a, b)
-      assert.notEqual(a.bar, extended.bar)
-      assert.notEqual(b.bar, extended.bar)
-      assert.notEqual(a.mumble, extended.mumble)
-      assert.notEqual(a.mumble.qux, extended.mumble.qux)
-    })
-
-    it("should handle mismatch in type", () => {
-      const a = { foo: { bar: 0, baz: 2, qux: { mumble: 11 } }, garply: 4, waldo: { thud: 10 } }
-      const b = { foo: { bar: [1], baz: { plugh: 8 }, qux: 12 }, garply: { nox: 9 }, waldo: 7 }
-      const extended = extend(a, b)
-      assert.deepEqual(extended, {
-        foo: { bar: [1], baz: { plugh: 8 }, qux: 12 },
-        garply: { nox: 9 },
-        waldo: 7,
-      })
-    })
-  })
-
   describe("normalize", () => {
     it("should remove multiple slashes", () => {
       assert.equal(normalize("//foo//bar//baz///mumble"), "/foo/bar/baz/mumble")

From d8568ebaa90b3f0b8cb0fbf1281225b6d5153c7d Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Tue, 4 Aug 2020 15:51:39 -0500
Subject: [PATCH 7/7] Enforce import order

---
 .eslintrc.yaml       | 2 ++
 src/node/settings.ts | 4 ++--
 src/node/util.ts     | 2 +-
 test/socket.test.ts  | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 96931d55..bb76a91a 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -24,6 +24,8 @@ rules:
   "@typescript-eslint/no-use-before-define": off
   "@typescript-eslint/no-non-null-assertion": off
   eqeqeq: error
+  import/order:
+    [error, { alphabetize: { order: "asc" }, groups: [["builtin", "external", "internal"], "parent", "sibling"] }]
 
 settings:
   # Does not work with CommonJS unfortunately.
diff --git a/src/node/settings.ts b/src/node/settings.ts
index 213cd1a2..d68e8e3b 100644
--- a/src/node/settings.ts
+++ b/src/node/settings.ts
@@ -1,8 +1,8 @@
+import { logger } from "@coder/logger"
 import * as fs from "fs-extra"
 import * as path from "path"
-import { paths } from "./util"
-import { logger } from "@coder/logger"
 import { Route } from "./http"
+import { paths } from "./util"
 
 export type Settings = { [key: string]: Settings | string | boolean | number }
 
diff --git a/src/node/util.ts b/src/node/util.ts
index a70d7ef6..c0f37f74 100644
--- a/src/node/util.ts
+++ b/src/node/util.ts
@@ -1,10 +1,10 @@
 import * as cp from "child_process"
 import * as crypto from "crypto"
+import envPaths from "env-paths"
 import * as fs from "fs-extra"
 import * as os from "os"
 import * as path from "path"
 import * as util from "util"
-import envPaths from "env-paths"
 import xdgBasedir from "xdg-basedir"
 
 export const tmpdir = path.join(os.tmpdir(), "code-server")
diff --git a/test/socket.test.ts b/test/socket.test.ts
index c1312d82..7d4de985 100644
--- a/test/socket.test.ts
+++ b/test/socket.test.ts
@@ -6,8 +6,8 @@ import * as net from "net"
 import * as path from "path"
 import * as tls from "tls"
 import { Emitter } from "../src/common/emitter"
-import { generateCertificate, tmpdir } from "../src/node/util"
 import { SocketProxyProvider } from "../src/node/socket"
+import { generateCertificate, tmpdir } from "../src/node/util"
 
 describe("SocketProxyProvider", () => {
   const provider = new SocketProxyProvider()