profxadke/OpenAsar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Updater > Module] Rewrite checking as async with host + modules in parallel

Browse source
This commit is contained in:
Ducko 2022-04-28 22:40:14 +01:00
parent 72a9b09eae
commit 95fb31ffd6
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/updater/moduleUpdater.js
View file

@ -80,8 +80,6 @@ exports.init = (endpoint, { releaseChannel, version }) => {
hostUpdater.on('update-progress', progress => events.emit('downloading-module', { name: 'host', progress })); hostUpdater.on('update-progress', progress => events.emit('downloading-module', { name: 'host', progress }));
hostUpdater.on('update-not-available', hostPassed);
hostUpdater.on('update-manually', e => events.emit('manual', e)); hostUpdater.on('update-manually', e => events.emit('manual', e));
hostUpdater.on('update-downloaded', hostUpdater.quitAndInstall); hostUpdater.on('update-downloaded', hostUpdater.quitAndInstall);
@ -102,16 +100,6 @@ exports.init = (endpoint, { releaseChannel, version }) => {
}; };
}; };
const hostPassed = (skip = skipModule) => {
if (skip) return events.emit('checked', {
count: 0
});
log('Modules', 'Host good');
checkModules();
};
const checkModules = async () => { const checkModules = async () => {
remote = await new Promise((res) => request({ remote = await new Promise((res) => request({
url: baseUrl + '/versions.json', url: baseUrl + '/versions.json',
@ -129,9 +117,7 @@ const checkModules = async () => {
} }
} }
events.emit('checked', { return downloading.total;
count: downloading.total
});
}; };
const downloadModule = async (name, ver) => { const downloadModule = async (name, ver) => {
@ -255,14 +241,24 @@ const finishInstall = (name, ver, success) => {
}; };
exports.checkForUpdates = () => { exports.checkForUpdates = async () => {
log('Modules', 'Checking'); log('Modules', 'Checking');
events.emit('checking-for-updates'); const done = (e = {}) => events.emit('checked', e);
if (skipHost) hostPassed(); if (last > Date.now() - 10000) return done();
else if (last > Date.now() - 10000) hostPassed(true);
else hostUpdater.checkForUpdates(); let p = [];
if (!skipHost) {
p.push(new Promise((res) => hostUpdater.once('update-not-available', res)));
hostUpdater.checkForUpdates();
}
if (!skipModule) p.push(checkModules());
done({
count: (await Promise.all(p)).pop()
});
}; };
exports.quitAndInstallUpdates = () => hostUpdater.quitAndInstall(); exports.quitAndInstallUpdates = () => hostUpdater.quitAndInstall();