Integrate update notifications into VS Code

code-asher · code-asher · commit ccd01c49b9ea · 2020-03-02T15:01:24.000-06:00
diff --git a/ci/vscode.patch b/ci/vscode.patch
@@ -444,17 +444,18 @@ index d0f6e6b18a..1966fd297d 100644
 -
 diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts
 new file mode 100644
-index 0000000000..3a62205b38
+index 0000000000..1e6bca3b52
 --- /dev/null
 +++ b/src/vs/server/browser/client.ts
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,224 @@
 +import { Emitter } from 'vs/base/common/event';
 +import { URI } from 'vs/base/common/uri';
 +import { localize } from 'vs/nls';
 +import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 +import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 +import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 +import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
++import { ILogService } from 'vs/platform/log/common/log';
 +import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
 +import { Registry } from 'vs/platform/registry/common/platform';
 +import { PersistentConnectionEventType } from 'vs/platform/remote/common/remoteAgentConnection';
@@ -575,6 +576,67 @@ index 0000000000..3a62205b38
 +			}
 +		});
 +	}
++
++	const applyUpdate = async (): Promise<void> => {
++		(services.get(ILogService) as ILogService).debug("Applying update...");
++
++		const response = await fetch("./update/apply", {
++			headers: { "content-type": "application/json" },
++		});
++		if (response.status !== 200) {
++			throw new Error("Unexpected response");
++		}
++
++		const json = await response.json();
++		if (!json.isLatest) {
++			throw new Error("Update failed");
++		}
++
++		(services.get(INotificationService) as INotificationService).info(`Updated to ${json.version}`);
++	};
++
++	const getUpdate = async (): Promise<void> => {
++		(services.get(ILogService) as ILogService).debug("Checking for update...");
++
++		const response = await fetch("./update", {
++			headers: { "content-type": "application/json" },
++		});
++		if (response.status !== 200) {
++			throw new Error("unexpected response");
++		}
++
++		const json = await response.json();
++		if (json.isLatest) {
++			return;
++		}
++
++		(services.get(INotificationService) as INotificationService).notify({
++			severity: Severity.Info,
++			message: `code-server has an update: ${json.version}`,
++			actions: {
++				primary: [{
++					id: 'update',
++					label: 'Apply Update',
++					tooltip: '',
++					class: undefined,
++					enabled: true,
++					checked: true,
++					dispose: () => undefined,
++					run: applyUpdate,
++				}],
++			}
++		});
++	};
++
++	const updateLoop = (): void => {
++		getUpdate().catch((error) => {
++			(services.get(ILogService) as ILogService).warn(error);
++		}).finally(() => {
++			setTimeout(updateLoop, 300000);
++		});
++	};
++
++	updateLoop();
 +};
 +
 +export interface Query {
@@ -2968,7 +3030,7 @@ index bbb72e9511..0785d3391d 100644
 -registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy(IExtensionStoragePaths) { whenReady = Promise.resolve(); });
 +registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
 diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
-index 79455414c0..a407593b4d 100644
+index 79455414c0..8931c1355a 100644
 --- a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
 +++ b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
 @@ -14,7 +14,11 @@
@@ -2978,8 +3040,8 @@ index 79455414c0..a407593b4d 100644
 -		catchError: true
 +		catchError: true,
 +		paths: {
-+			'@coder/node-browser': `../node_modules/@coder/node-browser/out/client/client.js`,
-+			'@coder/requirefs': `../node_modules/@coder/requirefs/out/requirefs.js`,
++			'@coder/node-browser': `{{BASE}}/static/{{COMMIT}}/lib/vscode/node_modules/@coder/node-browser/out/client/client.js`,
++			'@coder/requirefs': `{{BASE}}/static/{{COMMIT}}/lib/vscode/node_modules/@coder/requirefs/out/requirefs.js`,
 +		}
  	});
 
diff --git a/src/browser/pages/app.html b/src/browser/pages/app.html
@@ -15,7 +15,7 @@
       crossorigin="use-credentials"
     />
     <link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
-    <link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
+    <link href="{{BASE}}/static/{{COMMIT}}/dist/pages/app.css" rel="stylesheet" />
     <meta id="coder-options" data-settings="{{OPTIONS}}" />
   </head>
   <body>
diff --git a/src/browser/pages/error.html b/src/browser/pages/error.html
@@ -15,7 +15,7 @@
       crossorigin="use-credentials"
     />
     <link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
-    <link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
+    <link href="{{BASE}}/static/{{COMMIT}}/dist/pages/app.css" rel="stylesheet" />
     <meta id="coder-options" data-settings="{{OPTIONS}}" />
   </head>
   <body>
@@ -26,7 +26,7 @@ <h2 class="header">{{ERROR_HEADER}}</h2>
           {{ERROR_BODY}}
         </div>
         <div class="links">
-          <a class="link" href="{{BASE}}">go home</a>
+          <a class="link" href="{{BASE}}{{TO}}">go home</a>
         </div>
       </div>
     </div>
diff --git a/src/browser/pages/home.html b/src/browser/pages/home.html
@@ -15,7 +15,7 @@
       crossorigin="use-credentials"
     />
     <link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
-    <link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
+    <link href="{{BASE}}/static/{{COMMIT}}/dist/pages/app.css" rel="stylesheet" />
     <meta id="coder-options" data-settings="{{OPTIONS}}" />
   </head>
   <body>
diff --git a/src/browser/pages/login.html b/src/browser/pages/login.html
@@ -18,7 +18,7 @@
       crossorigin="use-credentials"
     />
     <link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
-    <link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
+    <link href="{{BASE}}/static/{{COMMIT}}/dist/pages/app.css" rel="stylesheet" />
     <meta id="coder-options" data-settings="{{OPTIONS}}" />
   </head>
   <body>
diff --git a/src/browser/pages/update.css b/src/browser/pages/update.css
@@ -10,3 +10,17 @@
   color: red;
   margin-top: 16px;
 }
+
+.update-form > .links {
+  margin-top: 20px;
+}
+
+.update-form > .links > .link {
+  color: rgb(87, 114, 245);
+  text-align: center;
+  text-decoration: none;
+}
+
+.update-form > .links > .link:hover {
+  text-decoration: underline;
+}
diff --git a/src/browser/pages/update.html b/src/browser/pages/update.html
@@ -15,7 +15,7 @@
       crossorigin="use-credentials"
     />
     <link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
-    <link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
+    <link href="{{BASE}}/static/{{COMMIT}}/dist/pages/app.css" rel="stylesheet" />
     <meta id="coder-options" data-settings="{{OPTIONS}}" />
   </head>
   <body>
@@ -26,9 +26,11 @@ <h1 class="main">Update</h1>
           <div class="sub">Update code-server.</div>
         </div>
         <div class="content">
-          <form class="update-form" method="post">
+          <form class="update-form" action="{{BASE}}/update/apply">
             {{UPDATE_STATUS}} {{ERROR}}
-            <a class="cancel -button" href="{{BASE}}">Cancel</a>
+            <div class="links">
+              <a class="link" href="{{BASE}}{{TO}}">go home</a>
+            </div>
           </form>
         </div>
       </div>
diff --git a/src/node/app/api.ts b/src/node/app/api.ts
@@ -59,6 +59,9 @@ export class ApiHttpProvider extends HttpProvider {
 
   public async handleRequest(route: Route, request: http.IncomingMessage): Promise<HttpResponse> {
     this.ensureAuthenticated(request)
+    if (route.requestPath !== "/index.html") {
+      throw new HttpError("Not found", HttpCode.NotFound)
+    }
 
     switch (route.base) {
       case ApiEndpoint.applications:
diff --git a/src/node/app/app.ts b/src/node/app/app.ts
@@ -16,6 +16,11 @@ export class AppHttpProvider extends HttpProvider {
       return { redirect: "/login", query: { to: route.fullPath } }
     }
 
+    this.ensureMethod(request)
+    if (route.requestPath !== "/index.html") {
+      throw new HttpError("Not found", HttpCode.NotFound)
+    }
+
     // Run an existing app, but if it doesn't exist go ahead and start it.
     let app = this.api.getRunningApplication(route.base)
     let sessionId = app && app.sessionId
@@ -38,8 +43,4 @@ export class AppHttpProvider extends HttpProvider {
     response.content = response.content.replace(/{{APP_NAME}}/, name)
     return this.replaceTemplates(route, response, sessionId)
   }
-
-  public async handleWebSocket(): Promise<true> {
-    throw new HttpError("Not found", HttpCode.NotFound)
-  }
 }
diff --git a/src/node/app/dashboard.ts b/src/node/app/dashboard.ts
@@ -20,10 +20,14 @@ export class DashboardHttpProvider extends HttpProvider {
   }
 
   public async handleRequest(route: Route, request: http.IncomingMessage): Promise<HttpResponse> {
+    if (route.requestPath !== "/index.html") {
+      throw new HttpError("Not found", HttpCode.NotFound)
+    }
+
     switch (route.base) {
       case "/delete": {
-        this.ensureMethod(request, "POST")
         this.ensureAuthenticated(request)
+        this.ensureMethod(request, "POST")
         const data = await this.getData(request)
         const p = data ? querystring.parse(data) : {}
         this.api.deleteSession(p.sessionId as string)
@@ -32,9 +36,7 @@ export class DashboardHttpProvider extends HttpProvider {
 
       case "/": {
         this.ensureMethod(request)
-        if (route.requestPath !== "/index.html") {
-          throw new HttpError("Not found", HttpCode.NotFound)
-        } else if (!this.authenticated(request)) {
+        if (!this.authenticated(request)) {
           return { redirect: "/login", query: { to: this.options.base } }
         }
         return this.getRoot(route)
@@ -69,10 +71,6 @@ export class DashboardHttpProvider extends HttpProvider {
     return this.replaceTemplates(route, response)
   }
 
-  public async handleWebSocket(): Promise<true> {
-    throw new HttpError("Not found", HttpCode.NotFound)
-  }
-
   private getRecentProjectRows(base: string, recents: RecentResponse): string {
     return recents.paths.length > 0 || recents.workspaces.length > 0
       ? recents.paths.map((recent) => this.getRecentProjectRow(base, recent)).join("\n") +
@@ -151,7 +149,7 @@ export class DashboardHttpProvider extends HttpProvider {
       </div>
       <div class="item">
         ${humanize(update.checked)}
-        <a class="sub -link" href="${base}/update">Update now</a>
+        <a class="sub -link" href="${base}/update?to=${this.options.base}">Update now</a>
       </div>
       <div class="item" >Current: ${this.update.currentVersion}</div>
     </div>`
diff --git a/src/node/app/login.ts b/src/node/app/login.ts
@@ -18,17 +18,14 @@ interface LoginPayload {
  */
 export class LoginHttpProvider extends HttpProvider {
   public async handleRequest(route: Route, request: http.IncomingMessage): Promise<HttpResponse> {
-    if (this.options.auth !== AuthType.Password) {
+    if (this.options.auth !== AuthType.Password || route.requestPath !== "/index.html") {
       throw new HttpError("Not found", HttpCode.NotFound)
     }
     switch (route.base) {
       case "/":
-        if (route.requestPath !== "/index.html") {
-          throw new HttpError("Not found", HttpCode.NotFound)
-        }
-
         switch (request.method) {
           case "POST":
+            this.ensureMethod(request, ["GET", "POST"])
             return this.tryLogin(route, request)
           default:
             this.ensureMethod(request)
@@ -110,8 +107,4 @@ export class LoginHttpProvider extends HttpProvider {
 
     throw new Error("Missing password")
   }
-
-  public async handleWebSocket(): Promise<undefined> {
-    return undefined
-  }
 }
diff --git a/src/node/app/static.ts b/src/node/app/static.ts
@@ -1,5 +1,4 @@
 import * as http from "http"
-import { HttpCode, HttpError } from "../../common/http"
 import { HttpProvider, HttpResponse, Route } from "../http"
 
 /**
@@ -32,8 +31,4 @@ export class StaticHttpProvider extends HttpProvider {
     }
     return this.getResource(this.rootPath, ...split)
   }
-
-  public async handleWebSocket(): Promise<true> {
-    throw new HttpError("Not found", HttpCode.NotFound)
-  }
 }
diff --git a/src/node/app/update.ts b/src/node/app/update.ts
diff --git a/src/node/http.ts b/src/node/http.ts
diff --git a/test/update.test.ts b/test/update.test.ts

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ export class AppHttpProvider extends HttpProvider {`
`16`	`16`	`return { redirect: "/login", query: { to: route.fullPath } }`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ this.ensureMethod(request)`
	`20`	`+ if (route.requestPath !== "/index.html") {`
	`21`	`+ throw new HttpError("Not found", HttpCode.NotFound)`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`// Run an existing app, but if it doesn't exist go ahead and start it.`
`20`	`25`	`let app = this.api.getRunningApplication(route.base)`
`21`	`26`	`let sessionId = app && app.sessionId`
`@@ -38,8 +43,4 @@ export class AppHttpProvider extends HttpProvider {`
`38`	`43`	`response.content = response.content.replace(/{{APP_NAME}}/, name)`
`39`	`44`	`return this.replaceTemplates(route, response, sessionId)`
`40`	`45`	`}`
`41`		`-`
`42`		`- public async handleWebSocket(): Promise<true> {`
`43`		`- throw new HttpError("Not found", HttpCode.NotFound)`
`44`		`- }`
`45`	`46`	`}`