cloudron 5.1.2 → 5.2.0

package/bin/cloudron

@@ -64,7 +64,7 @@ backupCommand.command('decrypt-dir <indir> <outdir>')
     .action(backupTools.decryptDir);
 
 backupCommand.command('decrypt-filename <path>')
-    .description('Encrypt a file name')
+    .description('Decrypt a file name')
     .option('--password <password>', 'password')
     .action(backupTools.decryptFilename);
 
@@ -172,12 +172,12 @@ program.command('export')
 program.command('import')
     .description('Import app from an external backup')
     .option('--app <id/location>', 'App id or location')
-    .option('--backup-id <backup>', 'Backup id')
     .option('--backup-format <tgz|rsync>', 'Backup format (default: tgz)')
     .option('--backup-config <json>', 'Backup config in JSON format')
     .option('--backup-path <file|dir>', 'Absolute path to a backup on the filesystem')
     .option('--backup-key <key>', 'Encryption key')
     .option('--in-place', 'Re-import from current app directory without downloading any backup', false)
+    .option('--remote-path <remote-path>', 'Remote Path')
     .action(actions.importApp);
 
 program.command('inspect')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.4",
-    "cloudron-manifestformat": "^5.17.0",
+    "cloudron-manifestformat": "^5.19.0",
     "commander": "^9.4.0",
     "debug": "^4.3.4",
     "delay": "^5.0.0",

package/src/actions.js

@@ -450,12 +450,16 @@ async function list(localOptions, cmd) {
 
     const t = new Table();
 
-    for (const app of apps) {
-        const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response2.statusCode !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
-        response2.body.location = response2.body.location || response2.body.subdomain; // LEGACY support
+    const responses = await Promise.allSettled(apps.map(function (app) { return createRequest('GET', `/api/v1/apps/${app.id}`, options); }));
+    responses.forEach(function (result) {
+        if (result.status !== 'fulfilled') return exit(`Failed to list app: ${requestError(result.value)}`);
+
+        const response = result.value;
+
+        if (response.statusCode !== 200) return exit(`Failed to list app: ${requestError(response)}`);
+        response.body.location = response.body.location || response.body.subdomain; // LEGACY support
 
-        const detailedApp = response2.body;
+        const detailedApp = response.body;
 
         t.cell('Id', detailedApp.id);
         t.cell('Location', detailedApp.fqdn);
@@ -470,7 +474,7 @@ async function list(localOptions, cmd) {
         }
         t.cell('State', prettyState);
         t.newRow();
-    }
+    });
 
     console.log();
     console.log(t.toString());
@@ -822,7 +826,7 @@ async function debug(args, localOptions, cmd) {
         if (app.memoryLimit === memoryLimit) return console.log('\n\nDone');
 
         console.log('\n');
-        console.log(options.limitMemory ? 'Limiting memory' : 'Setting unlimited memory');
+        console.log(options.limitMemory || options.disable ? 'Limiting memory' : 'Setting unlimited memory');
 
         const request2 = createRequest('POST', `/api/v1/apps/${app.id}/configure/memory_limit`, options);
         const response2 = await request2.send({ memoryLimit });
@@ -1149,27 +1153,27 @@ async function importApp(localOptions, cmd) {
         let data = {};
 
         if (!options.inPlace) {
-            let { backupId, backupFormat, backupConfig, backupPath, backupKey } = options;
+            let { remotePath, backupFormat, backupConfig, backupPath, backupKey } = options;
             let backupFolder;
 
             if (backupPath) {
                 if (backupPath.endsWith('.tar.gz')) {
                     backupFolder = path.dirname(backupPath);
-                    backupId = path.basename(backupPath).replace(/.tar.gz$/, '');
+                    remotePath = path.basename(backupPath).replace(/.tar.gz$/, '');
                     backupFormat = 'tgz';
                 } else {
                     backupFolder = path.dirname(backupPath);
-                    backupId = path.basename(backupPath);
+                    remotePath = path.basename(backupPath);
                     backupFormat = 'rsync';
                 }
                 backupConfig = { provider: 'filesystem', backupFolder };
-                data = { backupId, backupFormat, backupConfig };
+                data = { remotePath, backupFormat, backupConfig };
             } else {
-                if (!backupId) return exit('--backup-id, --backup-file or --in-place is required');
+                if (!remotePath) return exit('--remote-path, --backup-file or --in-place is required');
                 if (!backupFormat) return exit('--backup-format is required');
 
-                if (backupId.endsWith('.tar.gz')) { // common mistake...
-                    return exit('backupId should not end with .tar.gz. Try again removing the extension from backup id');
+                if (remotePath.endsWith('.tar.gz')) { // common mistake...
+                    return exit('remotePath should not end with .tar.gz. Try again removing the extension from remote path');
                 }
 
                 if (backupConfig) {
@@ -1179,7 +1183,7 @@ async function importApp(localOptions, cmd) {
                     backupConfig = null; // ensure null-ness
                 }
 
-                data = { backupId, backupFormat, backupConfig };
+                data = { remotePath, backupFormat, backupConfig };
             }
 
             if (backupKey) data.backupConfig.key = backupKey;
@@ -1283,6 +1287,7 @@ async function exec(args, localOptions, cmd) {
 
     const options = cmd.optsWithGlobals();
     let tty = !!options.tty;
+    let lang; // used as body param later
 
     const [error, app] = await safe(getApp(options));
     if (error) return exit(error);
@@ -1293,12 +1298,13 @@ async function exec(args, localOptions, cmd) {
     if (args.length === 0) {
         args = [ '/bin/bash' ];
         tty = true; // override
+        lang = 'C.UTF-8';
     }
 
     if (tty && !stdin.isTTY) exit('stdin is not tty');
 
     const request = createRequest('POST', `/api/v1/apps/${app.id}/exec`, options);
-    const response = await request.send({ cmd: args, tty });
+    const response = await request.send({ cmd: args, tty, lang });
     if (response.statusCode !== 200) return exit(`Failed to create exec: ${requestError(response)}`);
     const execId = response.body.id;