Revert "Add linkup command to improve link functionality"

This reverts commit 2504f6f.

Author: Joe

.gitignore

@@ -12,7 +12,6 @@ vendor/modules
 node-*
 /plugins
 /lib/coder-cloud-agent
-/lib/linkup
 .home
 coverage
 **/.DS_Store

ci/build/build-code-server.sh

@@ -15,30 +15,23 @@ main() {
     chmod +x out/node/entry.js
   fi
 
-  # for arch; we do not use OS from lib.sh and get our own.
-  # lib.sh normalizes macos to darwin - but cloud-agent's binaries do not
-  source ./ci/lib.sh
-  OS="$(uname | tr '[:upper:]' '[:lower:]')"
-
-  mkdir -p ./lib
-
   if ! [ -f ./lib/coder-cloud-agent ]; then
     echo "Downloading the cloud agent..."
 
+    # for arch; we do not use OS from lib.sh and get our own.
+    # lib.sh normalizes macos to darwin - but cloud-agent's binaries do not
+    source ./ci/lib.sh
+    OS="$(uname | tr '[:upper:]' '[:lower:]')"
+
     set +e
     curl -fsSL "https://github.com/cdr/cloud-agent/releases/latest/download/cloud-agent-$OS-$ARCH" -o ./lib/coder-cloud-agent
     chmod +x ./lib/coder-cloud-agent
     set -e
   fi
 
-  if ! [ -f ./lib/linkup ]; then
-    echo "Downloading Link agent..."
-
-    set +e
-    curl -fsSL "https://storage.googleapis.com/coder-link-releases/latest/linkup-$OS-$ARCH" -o ./lib/linkup
-    chmod +x ./lib/linkup
-    set -e
-  fi
+  yarn browserify out/browser/register.js -o out/browser/register.browserified.js
+  yarn browserify out/browser/pages/login.js -o out/browser/pages/login.browserified.js
+  yarn browserify out/browser/pages/vscode.js -o out/browser/pages/vscode.browserified.js
 }
 
 main "$@"

ci/build/build-release.sh

@@ -61,7 +61,6 @@ EOF
     rsync node_modules/ "$RELEASE_PATH/node_modules"
     mkdir -p "$RELEASE_PATH/lib"
     rsync ./lib/coder-cloud-agent "$RELEASE_PATH/lib"
-    rsync ./lib/linkup "$RELEASE_PATH/lib"
   fi
 }
 

ci/build/npm-postinstall.sh

@@ -66,12 +66,6 @@ main() {
     echo "Failed to download cloud agent; --link will not work"
   fi
 
-  if curl -fsSL "https://storage.googleapis.com/coder-link-releases/latest/linkup-$OS-$ARCH" -o ./lib/linkup; then
-    chmod +x ./lib/linkup
-  else
-    echo "Failed to download Link agent; the Link extension will not work"
-  fi
-
   if ! vscode_yarn; then
     echo "You may not have the required dependencies to build the native modules."
     echo "Please see https://github.com/cdr/code-server/blob/master/docs/npm.md"

src/node/link.ts

@@ -1,14 +1,12 @@
 import { field, logger } from "@coder/logger"
-import { ChildProcessWithoutNullStreams } from "child_process"
 import http from "http"
 import path from "path"
 import { Disposable } from "../common/emitter"
-import { plural, logError } from "../common/util"
+import { plural } from "../common/util"
 import { createApp, ensureAddress } from "./app"
 import { AuthType, DefaultedArgs, Feature } from "./cli"
 import { coderCloudBind } from "./coder_cloud"
 import { commit, version, vsRootPath } from "./constants"
-import { startLink } from "./link"
 import { register } from "./routes"
 import { humanPath, isFile, loadAMDModule, open } from "./util"
 
@@ -156,19 +154,6 @@ export const runCodeServer = async (
     logger.info("  - Connected to cloud agent")
   }
 
-  let linkAgent: undefined | ChildProcessWithoutNullStreams
-  try {
-    linkAgent = startLink(serverAddress)
-    linkAgent.on("error", (error) => {
-      logError(logger, "link daemon", error)
-    })
-    linkAgent.on("close", (code) => {
-      logger.debug("link daemon closed", field("code", code))
-    })
-  } catch (error) {
-    logError(logger, "link daemon", error)
-  }
-
   if (args.enable && args.enable.length > 0) {
     logger.info("Enabling the following experimental features:")
     args.enable.forEach((feature) => {
@@ -196,7 +181,6 @@ export const runCodeServer = async (
   return {
     server: app.server,
     dispose: async () => {
-      linkAgent?.kill()
       disposeRoutes()
       await app.dispose()
     },