timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-24 11:50:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(update): update isLatestVersion() to compare versions (#2777)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-04-17 02:30:41 +02:00
committed by GitHub
parent 1f18978fd4
commit 7a41cce96d
1 changed files with 167 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
patches/version-1-update.patch
View File

@@ -49,17 +49,18 @@ index bc90a03..f8885b9 100644
+ | "user"; + | "user";
\ No newline at end of file \ No newline at end of file
diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts
index c943bca..1395594 100644 index c943bca..d216af7 100644
--- a/src/vs/platform/update/electron-main/abstractUpdateService.ts --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts
+++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts
@@ -17,4 +17,4 @@ import { ILogService } from '../../log/common/log.js'; @@ -17,4 +17,5 @@ import { ILogService } from '../../log/common/log.js';
import { IProductService } from '../../product/common/productService.js'; import { IProductService } from '../../product/common/productService.js';
-import { IRequestService } from '../../request/common/request.js'; -import { IRequestService } from '../../request/common/request.js';
-import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js'; -import { AvailableForDownload, DisablementReason, IUpdateService, State, StateType, UpdateType } from '../common/update.js';
+import { IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js'; +import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
+import { Architecture, AvailableForDownload, DisablementReason, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js'; +import { Architecture, AvailableForDownload, DisablementReason, IUpdate, IUpdateService, Platform, State, StateType, Target, UpdateType } from '../common/update.js';
+import * as semver from 'semver';
@@ -25,12 +25,8 @@ export interface IUpdateURLOptions { @@ -25,12 +26,8 @@ export interface IUpdateURLOptions {
-export function createUpdateURL(baseUpdateUrl: string, platform: string, quality: string, commit: string, options?: IUpdateURLOptions): string { -export function createUpdateURL(baseUpdateUrl: string, platform: string, quality: string, commit: string, options?: IUpdateURLOptions): string {
- const url = new URL(`${baseUpdateUrl}/api/update/${platform}/${quality}/${commit}`); - const url = new URL(`${baseUpdateUrl}/api/update/${platform}/${quality}/${commit}`);
@@ -77,18 +78,64 @@ index c943bca..1395594 100644
- -
- return url.toString(); - return url.toString();
} }
@@ -322,3 +318,3 @@ export abstract class AbstractUpdateService implements IUpdateService { @@ -322,3 +319,3 @@ export abstract class AbstractUpdateService implements IUpdateService {
- if (mode === 'none') { - if (mode === 'none') {
+ if (mode === 'none' || mode === 'manual') { + if (mode === 'none' || mode === 'manual') {
return undefined; return undefined;
@@ -336,3 +332,3 @@ export abstract class AbstractUpdateService implements IUpdateService { @@ -332,18 +329,37 @@ export abstract class AbstractUpdateService implements IUpdateService {
try {
+ return this._isLatestVersion(url, false)
+ .then((result) => {
+ return Promise.resolve(result ? result.lastest : result);
+ })
+ .then(undefined, (error) => {
+ this.logService.error('update#isLatestVersion(): failed to check for updates');
+ this.logService.error(error);
+
+ return Promise.resolve(undefined);
+ });
+ }
+
+ _isLatestVersion(url: string, explicit: boolean): Promise<{lastest: boolean, update: IUpdate} | undefined> {
const headers = getUpdateRequestHeaders(this.productService.version);
- this.logService.trace('update#isLatestVersion() - checking update server', { url, headers });
- try {
- const context = await this.requestService.request({ url, headers, callSite: 'updateService.isLatestVersion' }, token); - const context = await this.requestService.request({ url, headers, callSite: 'updateService.isLatestVersion' }, token);
+ const context = await this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, token); - const statusCode = context.res.statusCode;
const statusCode = context.res.statusCode; - this.logService.trace('update#isLatestVersion() - response', { statusCode });
- // The update server replies with 204 (No Content) when no
- // update is available - that's all we want to know.
- return statusCode === 204;
+ this.logService.info('update#isLatestVersion() - checking update server', { url, headers });
- } catch (error) {
- this.logService.error('update#isLatestVersion(): failed to check for updates');
- this.logService.error(error);
- return undefined;
- }
+ return this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
+ .then<IUpdate | null>(asJson)
+ .then(update => {
+ if (!update || !update.url || !update.version || !update.productVersion) {
+ this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined));
+
+ return Promise.resolve(undefined);
+ }
+
+ const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3');
+ const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3');
+
+ this.logService.info('update#isLatestVersion() - found version', fetchedVersion, currentVersion);
+
+ const lastest = semver.compareBuild(currentVersion, fetchedVersion) >= 0;
+
+ return Promise.resolve({ lastest, update });
+ })
}
diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
index 40b38a2..323919e 100644 index 40b38a2..81f772d 100644
--- a/src/vs/platform/update/electron-main/updateService.darwin.ts --- a/src/vs/platform/update/electron-main/updateService.darwin.ts
+++ b/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts
@@ -16,3 +16,3 @@ import { ILogService } from '../../log/common/log.js'; @@ -16,3 +16,3 @@ import { ILogService } from '../../log/common/log.js';
@@ -96,11 +143,7 @@ index 40b38a2..323919e 100644
-import { asJson, IRequestService } from '../../request/common/request.js'; -import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js'; +import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
import { ITelemetryService } from '../../telemetry/common/telemetry.js'; import { ITelemetryService } from '../../telemetry/common/telemetry.js';
@@ -22,2 +22,3 @@ import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdat @@ -99,15 +99,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
import { INodeProcess } from '../../../base/common/platform.js';
+import * as semver from 'semver';
@@ -99,15 +100,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
- protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined { - protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
- const assetID = this.productService.darwinUniversalAssetId ?? (process.arch === 'x64' ? 'darwin' : 'darwin-arm64'); - const assetID = this.productService.darwinUniversalAssetId ?? (process.arch === 'x64' ? 'darwin' : 'darwin-arm64');
@@ -118,107 +161,127 @@ index 40b38a2..323919e 100644
+ protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string | undefined { + protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string | undefined {
+ return createUpdateURL(this.productService, quality, process.platform, process.arch); + return createUpdateURL(this.productService, quality, process.platform, process.arch);
} }
@@ -154,3 +144,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @@ -153,4 +142,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
this.logService.trace('update#doCheckForUpdates - using Electron autoUpdater', { url, explicit, background });
- this.logService.trace('update#doCheckForUpdates - using Electron autoUpdater', { url, explicit, background });
- electron.autoUpdater.checkForUpdates(); - electron.autoUpdater.checkForUpdates();
+ this.requestService.request({ url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None) + this.logService.info('update#doCheckForUpdates', { url, explicit, background });
+ .then<IUpdate | null>(asJson)
+ .then(update => {
+ if (!update || !update.url || !update.version || !update.productVersion) {
+ this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined));
+ +
+ this._isLatestVersion(url, explicit)
+ .then((result) => {
+ if(!result) {
+ return Promise.resolve(null); + return Promise.resolve(null);
+ } + }
+ +
+ const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') + if(result.lastest) {
+ const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3')
+
+ if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
+ this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined)); + this.setState(State.Idle(UpdateType.Setup, undefined, explicit || undefined));
+ } + }
+ else { + else {
+ this.logService.info('update#doCheckForUpdates - using Electron autoUpdater');
+
+ electron.autoUpdater.setFeedURL({ url }); + electron.autoUpdater.setFeedURL({ url });
+ electron.autoUpdater.checkForUpdates(); + electron.autoUpdater.checkForUpdates();
+ } + }
+ +
+ return Promise.resolve(null); + return Promise.resolve(null);
+ }) + })
+ .then(undefined, err => { + .then(undefined, (error) => {
+ this.logService.error(err); + this.logService.error(error);
+
+ // only show message when explicitly checking for updates + // only show message when explicitly checking for updates
+ const message: string | undefined = explicit ? (err.message || err) : undefined; + const message: string | undefined = explicit ? (error.message || error) : undefined;
+
+ this.setState(State.Idle(UpdateType.Setup, message)); + this.setState(State.Idle(UpdateType.Setup, message));
+ }); + });
} }
@@ -167,3 +184,3 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau @@ -167,3 +182,3 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau
try { try {
- const context = await this.requestService.request({ url, headers, callSite: 'updateService.darwin.checkForUpdates' }, CancellationToken.None); - const context = await this.requestService.request({ url, headers, callSite: 'updateService.darwin.checkForUpdates' }, CancellationToken.None);
+ const context = await this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None); + const context = await this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None);
const statusCode = context.res.statusCode; const statusCode = context.res.statusCode;
diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
index 0eb5d74..8ce708e 100644 index 0eb5d74..16bd215 100644
--- a/src/vs/platform/update/electron-main/updateService.linux.ts --- a/src/vs/platform/update/electron-main/updateService.linux.ts
+++ b/src/vs/platform/update/electron-main/updateService.linux.ts +++ b/src/vs/platform/update/electron-main/updateService.linux.ts
@@ -13,5 +13,6 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai @@ -5,3 +5,2 @@
-import { CancellationToken } from '../../../base/common/cancellation.js';
import { IConfigurationService } from '../../configuration/common/configuration.js';
@@ -13,4 +12,4 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai
import { IProductService } from '../../product/common/productService.js'; import { IProductService } from '../../product/common/productService.js';
-import { asJson, IRequestService } from '../../request/common/request.js'; -import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js'; -import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js';
import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/update.js'; +import { IRequestService } from '../../request/common/request.js';
+import { AvailableForDownload, State, UpdateType } from '../common/update.js';
import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js'; import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js';
+import * as semver from 'semver'; @@ -32,4 +31,4 @@ export class LinuxUpdateService extends AbstractUpdateService {
@@ -32,4 +33,4 @@ export class LinuxUpdateService extends AbstractUpdateService {
- protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string { - protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string {
- return createUpdateURL(this.productService.updateUrl!, `linux-${process.arch}`, quality, commit, options); - return createUpdateURL(this.productService.updateUrl!, `linux-${process.arch}`, quality, commit, options);
+ protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string { + protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string {
+ return createUpdateURL(this.productService, quality, process.platform, process.arch); + return createUpdateURL(this.productService, quality, process.platform, process.arch);
} }
@@ -46,3 +47,3 @@ export class LinuxUpdateService extends AbstractUpdateService { @@ -41,2 +40,4 @@ export class LinuxUpdateService extends AbstractUpdateService {
+ this.setState(State.CheckingForUpdates(explicit));
+
const internalOrg = this.getInternalOrg();
@@ -44,17 +45,26 @@ export class LinuxUpdateService extends AbstractUpdateService {
const url = this.buildUpdateFeedUrl(this.quality, this.productService.commit!, { background, internalOrg });
- this.setState(State.CheckingForUpdates(explicit));
- this.requestService.request({ url, callSite: 'updateService.linux.checkForUpdates' }, CancellationToken.None) - this.requestService.request({ url, callSite: 'updateService.linux.checkForUpdates' }, CancellationToken.None)
+ this.requestService.request({ url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None) - .then<IUpdate | null>(asJson)
.then<IUpdate | null>(asJson) - .then(update => {
@@ -51,5 +52,17 @@ export class LinuxUpdateService extends AbstractUpdateService { - if (!update || !update.url || !update.version || !update.productVersion) {
this.setState(State.Idle(UpdateType.Archive, undefined, explicit || undefined)); + this.logService.info('update#doCheckForUpdates', { url, explicit, background });
- } else {
+ +
+ this._isLatestVersion(url, explicit)
+ .then((result) => {
+ if(!result) {
+ return Promise.resolve(null); + return Promise.resolve(null);
+ } + }
+ +
+ const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') + if(result.lastest) {
+ const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') this.setState(State.Idle(UpdateType.Archive, undefined, explicit || undefined));
+ - } else {
+ if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) { - this.setState(State.AvailableForDownload(update));
+ this.setState(State.Idle(UpdateType.Archive, undefined, explicit || undefined));
+ }
+ else {
this.setState(State.AvailableForDownload(update));
} }
+ else {
+ this.setState(State.AvailableForDownload(result.update));
+ }
+ +
+ return Promise.resolve(null); + return Promise.resolve(null);
}) })
- .then(undefined, err => {
- this.logService.error(err);
+ .then(undefined, (error) => {
+ this.logService.error(error);
+
// only show message when explicitly checking for updates
- const message: string | undefined = explicit ? (err.message || err) : undefined;
+ const message: string | undefined = explicit ? (error.message || error) : undefined;
+
this.setState(State.Idle(UpdateType.Archive, message));
diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
index d02d7c3..4e8c541 100644 index d02d7c3..d934da1 100644
--- a/src/vs/platform/update/electron-main/updateService.win32.ts --- a/src/vs/platform/update/electron-main/updateService.win32.ts
+++ b/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts
@@ -14,3 +14,2 @@ import { CancellationToken, CancellationTokenSource } from '../../../base/common @@ -14,3 +14,2 @@ import { CancellationToken, CancellationTokenSource } from '../../../base/common
import { memoize } from '../../../base/common/decorators.js'; import { memoize } from '../../../base/common/decorators.js';
-import { hash } from '../../../base/common/hash.js'; -import { hash } from '../../../base/common/hash.js';
import * as path from '../../../base/common/path.js'; import * as path from '../../../base/common/path.js';
@@ -31,7 +30,8 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai @@ -31,6 +30,6 @@ import { INativeHostMainService } from '../../native/electron-main/nativeHostMai
import { IProductService } from '../../product/common/productService.js'; import { IProductService } from '../../product/common/productService.js';
-import { asJson, IRequestService } from '../../request/common/request.js'; -import { asJson, IRequestService } from '../../request/common/request.js';
+import { asJson, IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js'; +import { IRequestService, NO_FETCH_TELEMETRY } from '../../request/common/request.js';
import { ITelemetryService } from '../../telemetry/common/telemetry.js'; import { ITelemetryService } from '../../telemetry/common/telemetry.js';
-import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js'; -import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
-import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js'; -import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions, UpdateErrorClassification } from './abstractUpdateService.js';
+import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js'; +import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js';
+import { AbstractUpdateService, createUpdateURL, getUpdateRequestHeaders, IUpdateURLOptions } from './abstractUpdateService.js'; +import { AbstractUpdateService, createUpdateURL, IUpdateURLOptions } from './abstractUpdateService.js';
import { INodeProcess } from '../../../base/common/platform.js'; import { INodeProcess } from '../../../base/common/platform.js';
+import * as semver from 'semver'; @@ -49,5 +48,9 @@ function getUpdateType(): UpdateType {
@@ -49,5 +49,9 @@ function getUpdateType(): UpdateType {
if (typeof _updateType === 'undefined') { if (typeof _updateType === 'undefined') {
- _updateType = existsSync(path.join(path.dirname(process.execPath), 'unins000.exe')) - _updateType = existsSync(path.join(path.dirname(process.execPath), 'unins000.exe'))
- ? UpdateType.Setup - ? UpdateType.Setup
@@ -231,12 +294,12 @@ index d02d7c3..4e8c541 100644
+ _updateType = UpdateType.Archive; + _updateType = UpdateType.Archive;
+ } + }
} }
@@ -164,3 +168,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -164,3 +167,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
} else { } else {
- const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); - const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
+ const fastUpdatesEnabled = getUpdateType() === UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); + const fastUpdatesEnabled = getUpdateType() === UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates');
// GC for background updates in system setup happens via inno_setup since it requires // GC for background updates in system setup happens via inno_setup since it requires
@@ -182,12 +186,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -182,12 +185,22 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined { - protected buildUpdateFeedUrl(quality: string, commit: string, options?: IUpdateURLOptions): string | undefined {
- let platform = `win32-${process.arch}`; - let platform = `win32-${process.arch}`;
@@ -245,7 +308,7 @@ index d02d7c3..4e8c541 100644
- platform += '-archive'; - platform += '-archive';
- } else if (this.productService.target === 'user') { - } else if (this.productService.target === 'user') {
- platform += '-user'; - platform += '-user';
+ protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string | undefined { + protected buildUpdateFeedUrl(quality: string, _commit: string, _options?: IUpdateURLOptions): string {
+ let target: Target; + let target: Target;
+ +
+ switch (getUpdateType()) { + switch (getUpdateType()) {
@@ -267,32 +330,60 @@ index d02d7c3..4e8c541 100644
- return createUpdateURL(this.productService.updateUrl!, platform, quality, commit, options); - return createUpdateURL(this.productService.updateUrl!, platform, quality, commit, options);
+ return createUpdateURL(this.productService, quality, process.platform, process.arch, target); + return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
} }
@@ -209,3 +223,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -199,6 +212,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
const headers = getUpdateRequestHeaders(this.productService.version);
- this.requestService.request({ url, headers, callSite: 'updateService.win32.checkForUpdates' }, CancellationToken.None)
+ this.requestService.request({ url, headers, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
.then<IUpdate | null>(asJson)
@@ -226,2 +240,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') - const internalOrg = this.getInternalOrg();
+ const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') - const background = !explicit && !internalOrg;
- const url = this.buildUpdateFeedUrl(this.quality, pendingCommit ?? this.productService.commit!, { background, internalOrg });
-
// Only set CheckingForUpdates if we're not already in Overwriting state
@@ -208,9 +217,13 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- const headers = getUpdateRequestHeaders(this.productService.version);
- this.requestService.request({ url, headers, callSite: 'updateService.win32.checkForUpdates' }, CancellationToken.None)
- .then<IUpdate | null>(asJson)
- .then(update => {
+ const internalOrg = this.getInternalOrg();
+ const background = !explicit && !internalOrg;
+ const url = this.buildUpdateFeedUrl(this.quality, pendingCommit ?? this.productService.commit!, { background, internalOrg });
+ +
+ if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) { + this.logService.info('update#doCheckForUpdates', { url, explicit, background });
+
+ this._isLatestVersion(url, explicit)
+ .then((result) => {
const updateType = getUpdateType();
- if (!update || !update.url || !update.version || !update.productVersion) {
+ if(!result) {
// If we were checking for an overwrite update and found nothing newer,
@@ -226,2 +239,9 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ const { lastest, update } = result;
+
+ if(lastest) {
+ this.setState(State.Idle(updateType, undefined, explicit || undefined)); + this.setState(State.Idle(updateType, undefined, explicit || undefined));
+ return Promise.resolve(null); + return Promise.resolve(null);
+ } + }
+ +
if (updateType === UpdateType.Archive) { if (updateType === UpdateType.Archive) {
@@ -258,3 +280,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -258,3 +278,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- return this.requestService.request({ url: update.url, callSite: 'updateService.win32.downloadUpdate' }, CancellationToken.None) - return this.requestService.request({ url: update.url, callSite: 'updateService.win32.downloadUpdate' }, CancellationToken.None)
+ return this.requestService.request({ url: update.url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None) + return this.requestService.request({ url: update.url, callSite: NO_FETCH_TELEMETRY }, CancellationToken.None)
.then(context => { .then(context => {
@@ -304,3 +326,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun @@ -303,8 +323,7 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
.then(undefined, err => { })
- .then(undefined, err => {
- this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) }); - this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) });
this.logService.error(err); - this.logService.error(err);
@@ -368,20 +389,31 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun + .then(undefined, (error) => {
+ this.logService.error(error);
// only show message when explicitly checking for updates
- const message: string | undefined = explicit ? (err.message || err) : undefined;
+ const message: string | undefined = explicit ? (error.message || error) : undefined;
@@ -368,20 +387,31 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag'); await pfs.Promises.writeFile(this.availableUpdate.updateFilePath, 'flag');
- const child = spawn(this.availableUpdate.packagePath, - const child = spawn(this.availableUpdate.packagePath,
- [ - [