a1af9e2a56
* Move integration types into code-server
This will be easier to maintain than to have it as a patch.
* Disable connection token
Using a flag means we will not need to patch it out. I think this is
new from 1.64?
* Add product.json to build process
This way we do not have to patch it.
* Ship with remote agent package.json
Instead of the root one. This contains fewer dependencies.
* Let Code handle errors
This way we will not have to patch Code to make this work and I think it
makes sense to let Code handle the request.
If we do want to handle errors we can do it cleanly by patching their
error handler to throw instead.
* Move manifest override into code-server
This way we will not have to patch it.
* Move to patches
- Switch submodule to track upstream
- Add quilt to the process
- Add patches
The node-* ignore was ignoring one of the diffs so I removed it. This
was added when we were curling Node as node-v{version}-darwin-x64 for
the macOS build but this no longer happens (we use the Node action to
install a specific version now so we just use the system-wide Node).
* Use pre-packaged Code
133 lines
5.0 KiB
Diff
133 lines
5.0 KiB
Diff
Add a notification that lets you know when an update is out
|
|
|
|
The easiest way to test this is probably to change the version in your
|
|
package.json and delete the last notification storage item.
|
|
|
|
Index: code-server/lib/vscode/src/vs/workbench/browser/client.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/workbench/browser/client.ts
|
|
+++ code-server/lib/vscode/src/vs/workbench/browser/client.ts
|
|
@@ -1,10 +1,16 @@
|
|
import { Disposable } from 'vs/base/common/lifecycle';
|
|
import { localize } from 'vs/nls';
|
|
+import { ILogService } from 'vs/platform/log/common/log';
|
|
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
|
|
+import { IProductService } from 'vs/platform/product/common/productService';
|
|
+import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
|
|
|
|
export class CodeServerClient extends Disposable {
|
|
constructor (
|
|
+ @ILogService private logService: ILogService,
|
|
@INotificationService private notificationService: INotificationService,
|
|
+ @IProductService private productService: IProductService,
|
|
+ @IStorageService private storageService: IStorageService,
|
|
) {
|
|
super();
|
|
}
|
|
@@ -72,5 +78,59 @@ export class CodeServerClient extends Di
|
|
},
|
|
});
|
|
}
|
|
+
|
|
+ if (this.productService.updateEndpoint) {
|
|
+ this.checkUpdates(this.productService.updateEndpoint)
|
|
+ }
|
|
+ }
|
|
+
|
|
+ private checkUpdates(updateEndpoint: string) {
|
|
+ const getUpdate = async (updateCheckEndpoint: string): Promise<void> => {
|
|
+ this.logService.debug('Checking for update...');
|
|
+
|
|
+ const response = await fetch(updateCheckEndpoint, {
|
|
+ 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 = this.storageService.getNumber('csLastUpdateNotification', StorageScope.GLOBAL);
|
|
+ if (lastNoti) {
|
|
+ // Only remind them again after 1 week.
|
|
+ const timeout = 1000 * 60 * 60 * 24 * 7;
|
|
+ const threshold = lastNoti + timeout;
|
|
+ if (Date.now() < threshold) {
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ this.storageService.store('csLastUpdateNotification', Date.now(), StorageScope.GLOBAL, StorageTarget.MACHINE);
|
|
+
|
|
+ this.notificationService.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(updateEndpoint)
|
|
+ .catch(error => {
|
|
+ this.logService.debug(`failed to check for update: ${error}`);
|
|
+ })
|
|
+ .finally(() => {
|
|
+ // Check again every 6 hours.
|
|
+ setTimeout(updateLoop, 1000 * 60 * 60 * 6);
|
|
+ });
|
|
+ };
|
|
+
|
|
+ updateLoop();
|
|
}
|
|
}
|
|
Index: code-server/lib/vscode/src/vs/base/common/product.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/base/common/product.ts
|
|
+++ code-server/lib/vscode/src/vs/base/common/product.ts
|
|
@@ -33,6 +33,7 @@ export type ExtensionVirtualWorkspaceSup
|
|
export interface IProductConfiguration {
|
|
readonly codeServerVersion?: string
|
|
readonly rootEndpoint?: string
|
|
+ readonly updateEndpoint?: string
|
|
|
|
readonly version: string;
|
|
readonly date?: string;
|
|
Index: code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
+++ code-server/lib/vscode/src/vs/server/node/webClientServer.ts
|
|
@@ -286,6 +286,7 @@ export class WebClientServer {
|
|
settingsSyncOptions: !this._environmentService.isBuilt && this._environmentService.args['enable-sync'] ? { enabled: true } : undefined,
|
|
productConfiguration: <Partial<IProductConfiguration>>{
|
|
rootEndpoint: base,
|
|
+ updateEndpoint: !this._environmentService.args['disable-update-check'] ? base + '/update/check' : undefined,
|
|
extensionsGallery: {
|
|
...this._productService.extensionsGallery,
|
|
'resourceUrlTemplate': this._webExtensionResourceUrlTemplate ? this._webExtensionResourceUrlTemplate.with({
|
|
Index: code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
===================================================================
|
|
--- code-server.orig/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
+++ code-server/lib/vscode/src/vs/server/node/serverEnvironmentService.ts
|
|
@@ -11,6 +11,8 @@ import { refineServiceDecorator } from '
|
|
import { IEnvironmentService, INativeEnvironmentService } from 'vs/platform/environment/common/environment';
|
|
|
|
export const serverOptions: OptionDescriptions<ServerParsedArgs> = {
|
|
+ /* ----- code-server ----- */
|
|
+ 'disable-update-check': { type: 'boolean' },
|
|
|
|
/* ----- server setup ----- */
|
|
|
|
@@ -84,6 +86,8 @@ export const serverOptions: OptionDescri
|
|
};
|
|
|
|
export interface ServerParsedArgs {
|
|
+ /* ----- code-server ----- */
|
|
+ 'disable-update-check'?: boolean;
|
|
|
|
/* ----- server setup ----- */
|
|
|