cloudron 5.16.0 → 6.0.0

package/CHANGELOG.md

@@ -42,3 +42,6 @@
 [5.16.0]
 * build: output the selected Dockerfile name
 
+[5.16.1]
+* Remove the update checker
+

package/bin/cloudron

@@ -39,6 +39,7 @@ const backupCommand = program.command('backup')
 
 backupCommand.command('create')
     .description('Create new app backup')
+    .option('--site <siteid>', 'App id')
     .option('--app <id>', 'App id')
     .action(actions.backupCreate);
 
@@ -290,19 +291,5 @@ program.command('update')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 
-(async function main() {
-    // completion is useful in shell configs, so don't block here
-    if (process.argv[2] !== 'completion') {
-        if (Date.now() - (config.get('lastCliUpdateCheck') || 0) > 24*60*60*1000) {
-            // check if cli tool is up-to-date
-            const [error, response] = await safe(superagent.get('https://registry.npmjs.org/cloudron').retry(0).ok(() => true));
-            if (!error && response.status === 200 && response.body['dist-tags'].latest !== version) {
-                const updateCommand = 'npm install -g cloudron@' + response.body['dist-tags'].latest;
-                process.stderr.write(util.format('A new version of Cloudron CLI is available. Please update with: %s\n', updateCommand));
-            }
-            config.set('lastCliUpdateCheck', Date.now());
-        }
-    }
-
-    program.parse(process.argv);
-})();
+program.parse(process.argv);
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.16.0",
+  "version": "6.0.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -19,23 +19,23 @@
   "dependencies": {
     "@cloudron/manifest-format": "^5.28.0",
     "@cloudron/superagent": "^1.0.0",
-    "commander": "^13.1.0",
-    "debug": "^4.4.1",
+    "commander": "^14.0.1",
+    "debug": "^4.4.3",
     "easy-table": "^1.2.0",
     "ejs": "^3.1.10",
-    "eventsource": "^3.0.7",
+    "eventsource": "^4.0.0",
     "micromatch": "^4.0.8",
     "open": "^10.2.0",
     "safetydance": "^2.5.1",
-    "tar-fs": "^3.1.0"
+    "tar-fs": "^3.1.1"
   },
   "engines": {
     "node": ">= 18.x.x"
   },
   "devDependencies": {
-    "@eslint/js": "^9.32.0",
-    "eslint": "^9.32.0",
+    "@eslint/js": "^9.37.0",
+    "eslint": "^9.37.0",
     "expect.js": "^0.3.1",
-    "mocha": "^11.7.1"
+    "mocha": "^11.7.4"
   }
 }

package/src/actions.js

@@ -384,7 +384,7 @@ async function login(adminFqdn, localOptions, cmd) {
             console.log('Existing token still valid.');
         } else {
             token = null;
-            console.log(`Existing token possibly expired: ${requestError(response)}`);
+            console.log(requestError(response));
         }
     }
 
@@ -1107,8 +1107,17 @@ async function backupCreate(localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
+        let backupSiteId = options.site || null;
+        if (!backupSiteId) {
+            const response = await createRequest('GET', `/api/v1/backup_sites`, options);
+            if (response.status !== 200) throw new Error(`Failed to list backup sites: ${requestError(response)}`);
+            if (response.body.backupSites.length === 0) throw new Error(`No backup sites`);
+            backupSiteId = response.body.backupSites[0].id;
+            if (response.body.backupSites.length > 1) console.warn(`More than one backup site. Picking ${response.body.backupSites[0].name}`);
+        }
+
         const request = createRequest('POST', `/api/v1/apps/${app.id}/backup`, options);
-        const response = await request.send({});
+        const response = await request.send({ backupSiteId });
         if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState