Improve routing

Author: code-asher

package.json

@@ -22,13 +22,13 @@
   "devDependencies": {
     "@coder/nbin": "^1.2.7",
     "@types/fs-extra": "^8.0.1",
+    "@types/hookrouter": "^2.2.1",
     "@types/mocha": "^5.2.7",
     "@types/node": "^12.12.7",
     "@types/parcel-bundler": "^1.12.1",
     "@types/pem": "^1.9.5",
     "@types/react": "^16.9.18",
     "@types/react-dom": "^16.9.5",
-    "@types/react-router-dom": "^5.1.3",
     "@types/safe-compare": "^1.1.0",
     "@types/tar-fs": "^1.16.1",
     "@types/tar-stream": "^1.6.1",
@@ -58,11 +58,11 @@
   "dependencies": {
     "@coder/logger": "1.1.11",
     "fs-extra": "^8.1.0",
+    "hookrouter": "^1.2.3",
     "httpolyglot": "^0.1.2",
     "pem": "^1.14.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "react-router-dom": "^5.1.2",
     "safe-compare": "^1.1.4",
     "tar-fs": "^2.0.0",
     "tar-stream": "^2.1.0",

scripts/build.ts

@@ -173,6 +173,21 @@ class Builder {
     })
 
     await this.copyDependencies("code-server", this.rootPath, this.buildPath)
+
+    await this.task("writing final code-server package.json", async () => {
+      const json = JSON.parse(await fs.readFile(path.join(this.buildPath, "package.json"), "utf8"))
+      return fs.writeFile(
+        path.join(this.buildPath, "package.json"),
+        JSON.stringify(
+          {
+            ...json,
+            commit,
+          },
+          null,
+          2
+        )
+      )
+    })
   }
 
   private async buildVscode(commit: string): Promise<void> {
@@ -369,6 +384,9 @@ class Builder {
     bundler.on("buildEnd", () => {
       console.log("[parcel] bundled")
     })
+    bundler.on("buildError", (error) => {
+      console.error("[parcel]", error)
+    })
 
     vscode.stderr.on("data", (d) => process.stderr.write(d))
     tsc.stderr.on("data", (d) => process.stderr.write(d))

src/browser/app.css

@@ -12,7 +12,12 @@ iframe {
 
 body {
   background: #272727;
+  color: #f4f4f4;
   margin: 0;
   font-family: 'IBM Plex Sans', sans-serif;
   overflow: hidden;
 }
+
+button {
+  font-family: inherit;
+}

src/browser/app.tsx

@@ -1,35 +1,40 @@
+import { getBasepath, navigate } from "hookrouter"
 import * as React from "react"
-import { Application } from "../common/api"
-import { Route, Switch } from "react-router-dom"
+import { Application, isExecutableApplication } from "../common/api"
 import { HttpError } from "../common/http"
+import { normalize, Options } from "../common/util"
 import { Modal } from "./components/modal"
-import { getOptions } from "../common/util"
 
-const App: React.FunctionComponent = () => {
-  const [authed, setAuthed] = React.useState<boolean>(false)
-  const [app, setApp] = React.useState<Application>()
+export interface AppProps {
+  options: Options
+}
+
+const App: React.FunctionComponent<AppProps> = (props) => {
+  const [authed, setAuthed] = React.useState<boolean>(!!props.options.authed)
+  const [app, setApp] = React.useState<Application | undefined>(props.options.app)
   const [error, setError] = React.useState<HttpError | Error | string>()
 
   React.useEffect(() => {
-    getOptions()
-  }, [])
+    if (app && !isExecutableApplication(app)) {
+      navigate(normalize(`${getBasepath()}/${app.path}/`, true))
+    }
+  }, [app])
 
   if (typeof window !== "undefined") {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ;(window as any).setAuthed = setAuthed
+    ;(window as any).setAuthed = (a: boolean): void => {
+      if (authed !== a) {
+        setAuthed(a)
+      }
+    }
   }
 
   return (
     <>
-      <Switch>
-        <Route path="/vscode" render={(): React.ReactElement => <iframe id="iframe" src="/vscode-embed"></iframe>} />
-        <Route
-          path="/"
-          render={(): React.ReactElement => (
-            <Modal app={app} setApp={setApp} authed={authed} error={error} setError={setError} />
-          )}
-        />
-      </Switch>
+      <Modal app={app} setApp={setApp} authed={authed} error={error} setError={setError} />
+      {authed && app && app.embedPath ? (
+        <iframe id="iframe" src={normalize(`${getBasepath()}/${app.embedPath}/`, true)}></iframe>
+      ) : null}
     </>
   )
 }

src/browser/components/animate.tsx

@@ -5,6 +5,10 @@ export interface DelayProps {
   readonly delay: number
 }
 
+/**
+ * Animate a component before unmounting (by delaying unmounting) or after
+ * mounting.
+ */
 export const Animate: React.FunctionComponent<DelayProps> = (props) => {
   const [timer, setTimer] = React.useState<NodeJS.Timeout>()
   const [mount, setMount] = React.useState<boolean>(false)

src/browser/components/error.tsx

@@ -4,6 +4,7 @@ import { HttpError } from "../../common/http"
 export interface ErrorProps {
   error: HttpError | Error | string
   onClose?: () => void
+  onCloseText?: string
 }
 
 /**
@@ -15,7 +16,7 @@ export const RequestError: React.FunctionComponent<ErrorProps> = (props) => {
       <div className="error">{typeof props.error === "string" ? props.error : props.error.message}</div>
       {props.onClose ? (
         <button className="close" onClick={props.onClose}>
-          Go Back
+          {props.onCloseText || "Close"}
         </button>
       ) : (
         undefined

src/browser/components/list.css

@@ -20,7 +20,6 @@
 
 .app-row {
   color: #b6b6b6;
-  cursor: pointer;
   display: flex;
   font-size: 1em;
   line-height: 1em;
@@ -106,3 +105,7 @@
 .app-list > .loader {
   color: #b6b6b6;
 }
+
+.app-list > .app-row {
+  cursor: pointer;
+}

src/browser/components/list.tsx

@@ -4,6 +4,9 @@ import { HttpError } from "../../common/http"
 import { getSession, killSession } from "../api"
 import { RequestError } from "../components/error"
 
+/**
+ * An application's details (name and icon).
+ */
 export const AppDetails: React.FunctionComponent<Application> = (props) => {
   return (
     <>
@@ -23,6 +26,9 @@ export interface AppRowProps {
   open(app: Application): void
 }
 
+/**
+ * A single application row. Can be killed if it's a running application.
+ */
 export const AppRow: React.FunctionComponent<AppRowProps> = (props) => {
   const [killing, setKilling] = React.useState<boolean>(false)
   const [error, setError] = React.useState<HttpError>()
@@ -65,6 +71,11 @@ export interface AppListProps {
   onKilled(app: Application): void
 }
 
+/**
+ * A list of applications. If undefined, show loading text. If empty, show a
+ * message saying no items are found. Applications can be clicked and killed
+ * (when applicable).
+ */
 export const AppList: React.FunctionComponent<AppListProps> = (props) => {
   return (
     <div className="app-list">
@@ -92,11 +103,12 @@ export interface AppLoaderProps {
 }
 
 /**
- * Display provided applications or sessions and allow opening them.
+ * Application sections/groups. Handles loading of the application
+ * sections, errors, opening applications, and killing applications.
  */
 export const AppLoader: React.FunctionComponent<AppLoaderProps> = (props) => {
   const [apps, setApps] = React.useState<ReadonlyArray<ApplicationSection>>()
-  const [error, setError] = React.useState<HttpError>()
+  const [error, setError] = React.useState<HttpError | Error>()
 
   const refresh = (): void => {
     props
@@ -105,33 +117,51 @@ export const AppLoader: React.FunctionComponent<AppLoaderProps> = (props) => {
       .catch((e) => setError(e.message))
   }
 
+  // Every time the component loads go ahead and refresh the list.
   React.useEffect(() => {
     refresh()
   }, [props])
 
+  /**
+   * Open an application if not already open. For executable applications create
+   * a session first.
+   */
   function open(app: Application): void {
+    if (props.app && props.app.name === app.name) {
+      return setError(new Error(`${app.name} is already open`))
+    }
     props.setApp(app)
     if (!isRunningApplication(app) && isExecutableApplication(app)) {
       getSession(app)
         .then((session) => {
           props.setApp({ ...app, ...session })
         })
-        .catch(setError)
+        .catch((error) => {
+          props.setApp(undefined)
+          setError(error)
+        })
     }
   }
 
+  // In the case of an error fetching the apps, have the ability to try again.
+  // In the case of failing to load an app, have the ability to go back to the
+  // list (where the user can try again if they wish).
   if (error) {
-    props.setApp(undefined)
     return (
       <RequestError
         error={error}
+        onCloseText={props.app ? "Go Back" : "Try Again"}
         onClose={(): void => {
           setError(undefined)
+          if (!props.app) {
+            refresh()
+          }
         }}
       />
     )
   }
 
+  // If an app is currently loading, provide the option to cancel.
   if (props.app && !props.app.loaded) {
     return (
       <div className="app-loader">
@@ -151,14 +181,16 @@ export const AppLoader: React.FunctionComponent<AppLoaderProps> = (props) => {
     )
   }
 
+  // Apps are currently loading.
   if (!apps) {
     return (
       <div className="app-loader">
-        <div className="loader">loading</div>
+        <div className="loader">loading...</div>
       </div>
     )
   }
 
+  // Apps have loaded.
   return (
     <>
       {apps.map((section, i) => (

src/browser/components/modal.css

@@ -100,19 +100,22 @@
   width: 100%;
 }
 
-.modal-container > .modal > .sidebar {
-  border-right: 1.5px solid rgba(0, 0, 0, 0.37);
+.sidebar-nav {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  min-width: 145px;
 }
 
-.modal-container > .modal > .sidebar > .links {
+.sidebar-nav > .links {
   display: flex;
   flex-direction: column;
 }
 
-.modal-container > .modal > .sidebar > .links > .link {
+.sidebar-nav > .links > .link {
+  background-color: transparent;
+  border: none;
+  cursor: pointer;
   color: rgba(0, 0, 0, 0.37);
   font-size: 1.4em;
   height: 31px;
@@ -122,26 +125,28 @@
   transition: 150ms color ease, 150ms height ease, 150ms margin-bottom ease;
 }
 
-.modal-container > .modal > .sidebar > .footer > .close {
+.sidebar-nav > .footer > .close {
   background: transparent;
   border: none;
   color: #b6b6b6;
   cursor: pointer;
   width: 100%;
 }
 
-.modal-container > .modal > .sidebar > .footer > .close:hover {
+.sidebar-nav > .links > .link[aria-current="page"],
+.sidebar-nav > .links > .link:hover,
+.sidebar-nav > .footer > .close:hover {
   color: #000;
 }
 
-.modal-container > .modal > .links > .link[aria-current="page"] {
-  color: rgba(0, 0, 0, 1);
-}
-
 .modal-container > .modal > .content {
   display: flex;
   flex: 1;
   flex-direction: column;
   overflow: auto;
   padding: 0 20px;
 }
+
+.modal-container > .modal > .sidebar-nav {
+  border-right: 1.5px solid rgba(0, 0, 0, 0.37);
+}