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

merge updatechecker into updater

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-06-26 13:41:09 +02:00
parent a085e9ed54
commit abd640d36b
8 changed files with 292 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/apps.js
View File

@@ -180,7 +180,7 @@ const appTaskManager = require('./apptaskmanager.js'),
tasks = require('./tasks.js'),
tgz = require('./backupformat/tgz.js'),
TransformStream = require('stream').Transform,
updateChecker = require('./updatechecker.js'),
updater = require('./updater.js'),
users = require('./users.js'),
util = require('util'),
uuid = require('uuid'),
@@ -759,7 +759,7 @@ function postProcess(result) {
}
// note: this value cannot be cached as it depends on enableAutomaticUpdate and runState
function canAutoupdateApp(app, updateInfo) {
function canAutoupdateAppSync(app, updateInfo) {
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof updateInfo, 'object');
@@ -801,9 +801,9 @@ function attachProperties(app, domainObjectMap) {
app.redirectDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
app.aliasDomains.forEach(function (ad) { ad.fqdn = dns.fqdn(ad.subdomain, ad.domain); });
const updateInfo = updateChecker.getAppUpdateInfoSync(app.id);
const updateInfo = updater.getAppUpdateInfoSync(app.id);
if (updateInfo) {
const { code, reason } = canAutoupdateApp(app, updateInfo); // isAutoUpdatable is not cached since it depends on enableAutomaticUpdate and runState
const { code, reason } = canAutoupdateAppSync(app, updateInfo); // isAutoUpdatable is not cached since it depends on enableAutomaticUpdate and runState
updateInfo.isAutoUpdatable = code;
updateInfo.manualUpdateReason = reason;
}