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

[Splash > Backend] Minor source cleanup/rewrite for ModuleUpdater

Browse source
This commit is contained in:
Ducko 2022-04-20 11:45:03 +01:00
parent 73ac41967c
commit d0562f856e
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/splash/index.js
View file

@ -3,11 +3,9 @@ const { app } = require('electron');
const moduleUpdater = require("../updater/moduleUpdater"); const moduleUpdater = require("../updater/moduleUpdater");
const updater = require("../updater/updater"); const updater = require("../updater/updater");
let splashState = {}; let splashState = {},
let modulesListeners = {}; launched = false,
let launchedMainWindow = false; win, newUpdater;
let updateAttempt = 0;
let win, newUpdater;
exports.initSplash = (startMin = false) => { exports.initSplash = (startMin = false) => {
@ -46,12 +44,12 @@ const destroySplash = () => {
}; };
const launchMain = () => { const launchMain = () => {
for (const e in modulesListeners) moduleUpdater.events.removeListener(e, modulesListeners[e]); // Remove updater v1 listeners moduleUpdater.events.removeAllListeners(); // Remove updater v1 listeners
if (!launchedMainWindow && win != null) { if (!launched && win != null) {
sendState('starting'); sendState('starting');
launchedMainWindow = true; launched = true;
events.emit('APP_SHOULD_LAUNCH'); events.emit('APP_SHOULD_LAUNCH');
} }
}; };
@ -69,7 +67,7 @@ const launchSplash = (startMin) => {
height: process.platform === 'darwin' ? 300 : 350 height: process.platform === 'darwin' ? 300 : 350
}, 'splash'); }, 'splash');
if (process.platform !== 'darwin') win.on('closed', () => !launchedMainWindow && app.quit()); if (process.platform !== 'darwin') win.on('closed', () => !launched && app.quit());
if (!startMin) win.once('ready-to-show', win.show); if (!startMin) win.once('ready-to-show', win.show);
}; };
@ -174,21 +172,19 @@ const updateUntilCurrent = async () => {
}; };
const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only) const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
const add = (event, listener) => { const on = (k, v) => moduleUpdater.events.on(k, v);
modulesListeners[event] = listener;
moduleUpdater.events.on(event, listener);
};
const callbackCheck = () => moduleUpdater.checkForUpdates(); const check = () => moduleUpdater.checkForUpdates();
const downloads = new UIProgress(0), installs = new UIProgress(1); const downloads = new UIProgress(0), installs = new UIProgress(1);
const handleFail = () => { const handleFail = () => {
setTimeout(check)
scheduleNextUpdate(); scheduleNextUpdate();
sendState('fail'); sendState('fail');
}; };
add('update-check-finished', ({ succeeded, updateCount }) => { on('update-check-finished', ({ succeeded, updateCount }) => {
installs.reset(); installs.reset();
downloads.reset(); downloads.reset();
@ -199,18 +195,18 @@ const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
} }
}); });
add('downloading-module', ({ name }) => { on('downloading-module', ({ name }) => {
downloads.record(name, 'Waiting'); downloads.record(name, 'Waiting');
installs.record(name, 'Waiting'); installs.record(name, 'Waiting');
}); });
add('downloading-modules-finished', ({ failed }) => { on('downloading-modules-finished', ({ failed }) => {
toSend = 1; toSend = 1;
if (failed > 0) handleFail(); if (failed > 0) handleFail();
}); });
add('installing-module', ({ name }) => { on('installing-module', ({ name }) => {
installs.record(name, 'Waiting'); installs.record(name, 'Waiting');
}); });
@ -219,25 +215,25 @@ const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
if (name === 'host') moduleUpdater.quitAndInstallUpdates(); if (name === 'host') moduleUpdater.quitAndInstallUpdates();
}); });
add('downloaded-module', segmentCallback(downloads)); on('downloaded-module', segmentCallback(downloads));
add('installed-module', segmentCallback(installs)); on('installed-module', segmentCallback(installs));
add('installing-modules-finished', callbackCheck); on('installing-modules-finished', check);
const progressCallback = (tracker) => ({ name, cur, total }) => tracker.record(name, '', cur, total); const progressCallback = (tracker) => ({ name, cur, total }) => tracker.record(name, '', cur, total);
add('downloading-module-progress', progressCallback(downloads)); on('downloading-module-progress', progressCallback(downloads));
add('installing-module-progress', progressCallback(installs)); on('installing-module-progress', progressCallback(installs));
add('update-manually', e => { on('update-manually', e => {
splashState.newVersion = e.newVersion; splashState.newVersion = e.newVersion;
sendState('update-manually'); sendState('update-manually');
}); });
sendState(CHECKING_FOR_UPDATES); sendState(CHECKING_FOR_UPDATES);
callbackCheck(); check();
}; };
const scheduleNextUpdate = (callback = moduleUpdater.checkForUpdates) => { // Used by v1 and v2, default to v1 as used more widely in it const scheduleNextUpdate = (callback = moduleUpdater.checkForUpdates) => { // Used by v1 and v2, default to v1 as used more widely in it