Skip to content

fix(desktop): retry update downloads without rechecking feed #5642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jackwener wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(desktop): retry update downloads without rechecking feed #5642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/desktop/src/main/__tests__/about-update-status.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ test('the nightly steady states each read as themselves', () => {
});
});

test('a failure names the step that failed and offers the check again', () => {
test('a failure names the step and offers the corresponding recovery', () => {
const download = aboutUpdateRow(
{
state: 'error',
Expand All @@ -120,7 +120,7 @@ test('a failure names the step that failed and offers the check again', () => {
assert.deepEqual(download, {
label: '下载更新失败',
description: '网络错误：ECONNRESET',
action: 'check',
action: 'retry',
});

const check = aboutUpdateRow(
Expand Down
139 changes: 118 additions & 21 deletions apps/desktop/src/main/__tests__/app-update-service.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ function updateInfo(version: string) {
}

function createHarness(input: {
currentVersion?: string;
isPackaged?: boolean;
updater?: FakeUpdater;
clock?: FakeClock;
Expand All @@ -139,7 +140,7 @@ function createHarness(input: {
const updater = input.updater ?? new FakeUpdater();
const clock = input.clock ?? new FakeClock();
const service = createAppUpdateService({
currentVersion: '1.0.0',
currentVersion: input.currentVersion ?? '1.0.0',
isPackaged: input.isPackaged ?? true,
updateChannel: input.updateChannel ?? 'release',
updater: updater as unknown as AppUpdater,
Expand Down Expand Up @@ -371,28 +372,29 @@ describe('AppUpdateService', () => {
updater.checkCalls += 1;
updater.emit('checking-for-update');
updater.emit('update-available', updateInfo('1.1.0'));
if (updater.checkCalls === 1) {
const downloadPromise = new Promise<string[]>((_resolve, reject) => {
rejectFirstDownload = reject;
});
return {
isUpdateAvailable: true,
updateInfo: updateInfo('1.1.0'),
versionInfo: updateInfo('1.1.0'),
downloadPromise,
cancellationToken: {
cancel: () => {
cancellationCalls += 1;
rejectFirstDownload(new Error('download cancelled for retry'));
},
const downloadPromise = new Promise<string[]>((_resolve, reject) => {
rejectFirstDownload = reject;
});
return {
isUpdateAvailable: true,
updateInfo: updateInfo('1.1.0'),
versionInfo: updateInfo('1.1.0'),
downloadPromise,
cancellationToken: {
cancel: () => {
cancellationCalls += 1;
rejectFirstDownload(new Error('download cancelled for retry'));
},
};
}
},
};
};
updater.downloadUpdate = async () => {
updater.downloadCalls += 1;
updater.emit('update-downloaded', {
...updateInfo('1.1.0'),
downloadedFile: '/tmp/maka-update.zip',
});
return { isUpdateAvailable: true };
return [];
};
const { clock, service } = createHarness({
updater,
Expand All @@ -405,7 +407,8 @@ describe('AppUpdateService', () => {

assert.equal((await service.retryUpdateDownload()).state, 'downloaded');
assert.equal(cancellationCalls, 1);
assert.equal(updater.checkCalls, 2);
assert.equal(updater.checkCalls, 1);
assert.equal(updater.downloadCalls, 1);
assert.equal(statuses.some((status) => status.state === 'error'), false);
});

Expand All @@ -422,19 +425,113 @@ describe('AppUpdateService', () => {
message: 'proxy disconnected',
});

updater.downloadUpdate = async () => {
updater.downloadCalls += 1;
updater.emit('update-downloaded', {
...updateInfo('1.1.0'),
downloadedFile: '/tmp/maka-update.zip',
});
return [];
};
assert.equal((await service.retryUpdateDownload()).state, 'downloaded');
assert.equal(updater.checkCalls, 0);
assert.equal(updater.downloadCalls, 1);
});

test('retries a failed background download without repeating the GitHub feed check', async () => {
const updater = new FakeUpdater();
const statuses: AppUpdateStatus[] = [];
updater.checkForUpdates = async () => {
updater.checkCalls += 1;
updater.emit('checking-for-update');
updater.emit('update-available', updateInfo('1.1.0'));
const downloadPromise = new Promise<string[]>((_resolve, reject) => {
setImmediate(() => {
updater.emit('error', new Error('connection reset'));
reject(new Error('connection reset'));
});
});
return { isUpdateAvailable: true, downloadPromise };
};
updater.downloadUpdate = async () => {
updater.downloadCalls += 1;
updater.emit('update-downloaded', {
...updateInfo('1.1.0'),
downloadedFile: '/tmp/maka-update.zip',
});
return { isUpdateAvailable: true };
return [];
};
assert.equal((await service.retryUpdateDownload()).state, 'downloaded');
const { clock, service } = createHarness({ updater, onStatusChange: (status) => statuses.push(status) });

service.start();
await clock.runNext();
await settleUpdateVerification();
assert.equal(clock.pending().some((timer) => timer.delayMs === 5_000), true);
assert.equal(statuses.some((entry) => entry.state === 'error'), false);
const retry = clock.pending().find((timer) => timer.delayMs === 5_000);
assert.ok(retry);
retry.cleared = true;
retry.callback();
await settleUpdateVerification();
assert.equal(service.getStatus().state, 'downloaded');
assert.equal(updater.checkCalls, 1);
assert.equal(updater.downloadCalls, 1);
});

test('reports a download failure after the background retry also fails', async () => {
const updater = new FakeUpdater();
updater.checkForUpdates = async () => {
updater.checkCalls += 1;
updater.emit('checking-for-update');
updater.emit('update-available', updateInfo('1.1.0'));
return { isUpdateAvailable: true, downloadPromise: Promise.reject(new Error('first failure')) };
};
updater.downloadUpdate = async () => {
updater.downloadCalls += 1;
updater.emit('error', new Error('second failure'));
throw new Error('second failure');
};
const statuses: AppUpdateStatus[] = [];
const { clock, service } = createHarness({ updater, onStatusChange: (status) => statuses.push(status) });

await service.checkForUpdatesNow();
await settleUpdateVerification();
const retry = clock.pending().find((timer) => timer.delayMs === 5_000);
assert.ok(retry);
retry.cleared = true;
retry.callback();
await settleUpdateVerification();
assert.deepEqual(service.getStatus(), {
state: 'error',
currentVersion: '1.0.0',
latestVersion: '1.1.0',
operation: 'download',
message: 'second failure',
});
assert.equal(statuses.filter((entry) => entry.state === 'error').length, 1);
assert.equal(updater.checkCalls, 1);
});

test('a Nightly download retry reuses the known prerelease without a new check', async () => {
const updater = new FakeUpdater();
const version = '1.0.0-dev.2.20260924';
const { service } = createHarness({ updater, currentVersion: '1.0.0-dev.1.20260923' });
updater.emit('update-available', updateInfo(version));
updater.emit('error', new Error('connection reset'));
updater.downloadUpdate = async () => {
updater.downloadCalls += 1;
updater.emit('update-downloaded', {
...updateInfo(version),
downloadedFile: `/tmp/Maka-${version}-mac-arm64.zip`,
});
return [];
};

assert.equal((await service.retryUpdateDownload()).state, 'downloaded');
assert.equal(updater.checkCalls, 0);
assert.equal(updater.downloadCalls, 1);
});

test('recovers from a transient check failure on the built-in retry', async () => {
const updater = new FakeUpdater();
const statuses: AppUpdateStatus[] = [];
Expand Down
Loading