jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Ensure the updatechecker does not prematurely callback

Browse Source 
Also add tests and make sure we send update notifications if automatic
updates cannot be applied
This commit is contained in:
Johannes Zellner
2017-06-19 14:34:34 +02:00
parent cd42a6c2ea
commit 2d72f49261
2 changed files with 171 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/updatechecker.js
View File

@@ -95,30 +95,34 @@ function checkAppUpdates(callback) {
if (oldState[app.id] === newState[app.id]) {
debug('Skipping notification of app update %s since user was already notified', app.id);
iteratorDone();
} else {
settings.getSubscription(function (error, result) {
if (error) return debug(error);
if (error) {
debug(error);
return iteratorDone();
}
// always send notifications if user is on the free plan
if (result.plan.id === 'free' || result.plan.id === 'undecided') {
debug('Notifying user of app update for %s from %s to %s', app.id, app.manifest.version, updateInfo.manifest.version);
mailer.appUpdateAvailable(app, updateInfo);
return;
return iteratorDone();
}
// only send notifications if update pattern is 'never'
settings.getAutoupdatePattern(function (error, result) {
if (error) return debug(error);
if (result !== constants.AUTOUPDATE_PATTERN_NEVER) return;
if (error) {
debug(error);
} else if (result === constants.AUTOUPDATE_PATTERN_NEVER) {
debug('Notifying user of app update for %s from %s to %s', app.id, app.manifest.version, updateInfo.manifest.version);
mailer.appUpdateAvailable(app, updateInfo);
}
debug('Notifying user of app update for %s from %s to %s', app.id, app.manifest.version, updateInfo.manifest.version);
mailer.appUpdateAvailable(app, updateInfo);
iteratorDone();
});
});
}
iteratorDone();
});
}, function () {
newState.box = loadState().box; // preserve the latest box state information
@@ -158,16 +162,31 @@ function checkBoxUpdates(callback) {
return callback();
}
state.box = updateInfo.version;
settings.getSubscription(function (error, result) {
if (error) {
debug(error);
return callback();
}
saveState(state);
function done() {
state.box = updateInfo.version;
saveState(state);
callback();
}
// only send notifications if update pattern is 'never'
settings.getAutoupdatePattern(function (error, result) {
if (error) debug(error);
else if (result === constants.AUTOUPDATE_PATTERN_NEVER) mailer.boxUpdateAvailable(updateInfo.version, updateInfo.changelog);
// always send notifications if user is on the free plan
if (result.plan.id === 'free' || result.plan.id === 'undecided') {
mailer.boxUpdateAvailable(updateInfo.version, updateInfo.changelog);
return done();
}
callback();
// only send notifications if update pattern is 'never'
settings.getAutoupdatePattern(function (error, result) {
if (error) debug(error);
else if (result === constants.AUTOUPDATE_PATTERN_NEVER) mailer.boxUpdateAvailable(updateInfo.version, updateInfo.changelog);
done();
});
});
});
});