From fb63c0cd220d3f768e1d8d54741beff5657fc919 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 23 Nov 2020 21:06:45 -0500 Subject: [PATCH] vscode: Show notification when upgrade is available And link to the release notes. --- ci/dev/vscode.patch | 54 ++++++++++++++++++++++++++++++++++++--- src/node/routes/update.ts | 2 +- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch index 8d193980..54676c49 100644 --- a/ci/dev/vscode.patch +++ b/ci/dev/vscode.patch @@ -769,10 +769,10 @@ index 096b9e23493539c9937940a56e555d95bbae38d9..ef37e614004f550f7b64eacd362f6894 remove(key: string, scope: StorageScope): void { diff --git a/src/vs/server/browser/client.ts b/src/vs/server/browser/client.ts new file mode 100644 -index 0000000000000000000000000000000000000000..3c0703b7174ad792a4b42841e96ee93765d71601 +index 0000000000000000000000000000000000000000..667ca961830feaf6fc5e5bb7ef2df3b8be97b176 --- /dev/null +++ b/src/vs/server/browser/client.ts -@@ -0,0 +1,189 @@ +@@ -0,0 +1,237 @@ +import { Emitter } from 'vs/base/common/event'; +import { URI } from 'vs/base/common/uri'; +import { localize } from 'vs/nls'; @@ -791,6 +791,7 @@ index 0000000000000000000000000000000000000000..3c0703b7174ad792a4b42841e96ee937 +import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; +import { Options } from 'vs/server/ipc.d'; +import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; ++import { ILogService } from 'vs/platform/log/common/log'; + +class TelemetryService extends TelemetryChannelClient { + public constructor( @@ -922,8 +923,55 @@ index 0000000000000000000000000000000000000000..3c0703b7174ad792a4b42841e96ee937 + }); + } + ++ const logService = (services.get(ILogService) as ILogService); ++ const storageService = (services.get(IStorageService) as IStorageService) ++ const getUpdate = async (): Promise => { ++ logService.debug("Checking for update..."); ++ ++ const response = await fetch("update/check", { ++ headers: { "Accept": "application/json" }, ++ }); ++ if (!response.ok) { ++ throw new Error(response.statusText); ++ } ++ const json = await response.json(); ++ if (json.error) { ++ throw new Error(json.error); ++ } ++ if (json.isLatest) { ++ return; ++ } ++ ++ const lastNoti = storageService.getNumber("csLastUpdateNotification", StorageScope.GLOBAL); ++ if (lastNoti) { ++ // Only remind them again after two days. ++ const timeout = 1000*60*24*2 ++ const threshold = lastNoti + timeout; ++ if (Date.now() < threshold) { ++ return; ++ } ++ } ++ ++ storageService.store("csLastUpdateNotification", Date.now(), StorageScope.GLOBAL); ++ (services.get(INotificationService) as INotificationService).notify({ ++ severity: Severity.Info, ++ message: `[code-server v${json.latest}](https://github.com/cdr/code-server/releases/tag/v${json.latest}) has been released!`, ++ }); ++ }; ++ ++ const updateLoop = (): void => { ++ getUpdate().catch((error) => { ++ logService.debug(`failed to check for update: ${error}`); ++ }).finally(() => { ++ // Check again every 6 hours. ++ setTimeout(updateLoop, 1000*60*6); ++ }); ++ }; ++ ++ updateLoop(); ++ + // This will be used to set the background color while VS Code loads. -+ const theme = (services.get(IStorageService) as IStorageService).get("colorThemeData", StorageScope.GLOBAL); ++ const theme = storageService.get("colorThemeData", StorageScope.GLOBAL); + if (theme) { + localStorage.setItem("colorThemeData", theme); + } diff --git a/src/node/routes/update.ts b/src/node/routes/update.ts index ac1ddc41..5c9aa181 100644 --- a/src/node/routes/update.ts +++ b/src/node/routes/update.ts @@ -7,7 +7,7 @@ export const router = Router() const provider = new UpdateProvider() -router.get("/", ensureAuthenticated, async (req, res) => { +router.get("/check", ensureAuthenticated, async (req, res) => { const update = await provider.getUpdate(req.query.force === "true") res.json({ checked: update.checked,