cloudron 4.14.4 → 4.15.2

package/README.md

@@ -1,10 +1,10 @@
 # The Cloudron CLI tool
 
-The [Cloudron](https://cloudron.io) CLI tool allows you to install, configure and test apps on your Cloudron.
+The [Cloudron](https://cloudron.io) [CLI tool](https://docs.cloudron.io/packaging/cli/) allows you to install, configure and test apps on your Cloudron.
 It is also used to submit your app to the Cloudron Store. The `machine` subcommand can be used for
 various maintenance tasks on a selfhosted Cloudron.
 
-Read the Cloudron.io [documentation](https://cloudron.io/documentation.html) for in-depth information.
+Read the Cloudron.io [documentation](https://docs.cloudron.io/) for in-depth information.
 
 ## Installation
 

package/bin/cloudron

@@ -2,8 +2,6 @@
 
 'use strict';
 
-require('supererror');
-
 const actions = require('../src/actions.js'),
     buildActions = require('../src/build-actions.js'),
     completion = require('../src/completion.js'),
@@ -142,6 +140,7 @@ program.command('install')
 program.command('list')
     .description('List installed applications')
     .option('-q, --quiet', 'Only display app IDs')
+    .option('-t, --tag <tag>', 'Only display apps with this tag')
     .action(actions.list);
 
 program.command('login [cloudron]')

package/bin/cloudron-appstore

@@ -2,9 +2,7 @@
 
 'use strict';
 
-require('supererror');
-
-var program = require('commander'),
+const program = require('commander'),
     appstoreActions = require('../src/appstore-actions.js');
 
 program.version(require('../package.json').version);

package/bin/cloudron-backup

@@ -2,9 +2,7 @@
 
 'use strict';
 
-require('supererror');
-
-var program = require('commander'),
+const program = require('commander'),
     actions = require('../src/actions.js'),
     backupTools = require('../src/backup-tools.js');
 
@@ -22,12 +20,12 @@ program.command('list')
     .action(actions.backupList);
 
 program.command('decrypt <file>')
-    .description('Decrypt a directory')
+    .description('Decrypt an encrypted file')
     .option('--password <password>', 'password')
     .action(backupTools.decrypt);
 
 program.command('decrypt-dir <indir> <outdir>')
-    .description('Decrypt a directory')
+    .description('Decrypt an encrypted directory')
     .option('--password <password>', 'password')
     .action(backupTools.decryptDir);
 

package/bin/cloudron-env

@@ -2,9 +2,7 @@
 
 'use strict';
 
-require('supererror');
-
-var program = require('commander'),
+const program = require('commander'),
     actions = require('../src/actions.js');
 
 program.version(require('../package.json').version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.14.4",
+  "version": "4.15.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -34,7 +34,6 @@
     "safetydance": "^2.2.0",
     "split": "^1.0.1",
     "superagent": "^7.0.2",
-    "supererror": "^0.7.2",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
     "underscore": "^1.13.2"
   },

package/src/actions.js

@@ -325,6 +325,16 @@ async function startApp(app, options) {
     await waitForTask(response.body.taskId, options);
 }
 
+async function restartApp(app, options) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof options, 'object');
+
+    const response = await createRequest('POST', `/api/v1/apps/${app.id}/restart`, options);
+    if (response.statusCode !== 202) throw `Failed to restart app: ${requestError(response)}`;
+
+    await waitForTask(response.body.taskId, options);
+}
+
 async function authenticate(adminFqdn, username, password, options) {
     assert.strictEqual(typeof adminFqdn, 'string');
     assert.strictEqual(typeof username, 'string');
@@ -427,30 +437,41 @@ async function list(options) {
     if (error) return exit(error);
     if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
-    if (response.body.apps.length === 0) return console.log('No apps installed.');
+    let apps = response.body.apps;
+
+    if (options.tag) apps = apps.filter(function (a) { return a.tags.indexOf(options.tag) !== -1; });
 
     if (options.quiet) {
-        console.log(response.body.apps.map(a => a.id).join('\n'));
+        console.log(apps.map(a => a.id).join('\n'));
         return;
     }
 
-    var t = new Table();
+    // after quiet
+    if (apps.length === 0) return console.log('No apps installed.');
 
-    response.body.apps.forEach(function (app) {
-        t.cell('Id', app.id);
-        t.cell('Location', app.fqdn);
-        t.cell('Manifest Id', (app.manifest.id || 'customapp') + '@' + app.manifest.version);
+    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 detailedApp = response2.body;
+
+        t.cell('Id', detailedApp.id);
+        t.cell('Location', detailedApp.fqdn);
+        t.cell('Manifest Id', (detailedApp.manifest.id || 'customapp') + '@' + detailedApp.manifest.version);
         var prettyState;
-        if (app.installationState === 'installed') {
-            prettyState = (app.debugMode ? 'debug' : app.runState);
-        } else if (app.installationState === 'error') {
-            prettyState = `error (${app.error.installationState})`;
+        if (detailedApp.installationState === 'installed') {
+            prettyState = (detailedApp.debugMode ? 'debug' : detailedApp.runState);
+        } else if (detailedApp.installationState === 'error') {
+            prettyState = `error (${detailedApp.error.installationState})`;
         } else {
-            prettyState = app.installationState;
+            prettyState = detailedApp.installationState;
         }
         t.cell('State', prettyState);
         t.newRow();
-    });
+    }
 
     console.log();
     console.log(t.toString());
@@ -999,8 +1020,7 @@ async function restart(options) {
     try {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await stopApp(app, options);
-        await startApp(app, options);
+        await restartApp(app, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp restarted');
     } catch (error) {

package/src/backup-tools.js

@@ -23,7 +23,7 @@ function encryptFilePath(filePath, encryption) {
     assert.strictEqual(typeof filePath, 'string');
     assert.strictEqual(typeof encryption, 'object');
 
-    var encryptedParts = filePath.split('/').map(function (part) {
+    const encryptedParts = filePath.split('/').map(function (part) {
         let hmac = crypto.createHmac('sha256', Buffer.from(encryption.filenameHmacKey, 'hex'));
         const iv = hmac.update(part).digest().slice(0, 16); // iv has to be deterministic, for our sync (copy) logic to work
         const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(encryption.filenameKey, 'hex'), iv);
@@ -42,7 +42,7 @@ function decryptFilePath(filePath, encryption) {
     assert.strictEqual(typeof filePath, 'string');
     assert.strictEqual(typeof encryption, 'object');
 
-    let decryptedParts = [];
+    const decryptedParts = [];
     for (let part of filePath.split('/')) {
         part = part + Array(part.length % 4).join('='); // add back = padding
         part = part.replace(/-/g, '/');                 // replace with '/'
@@ -197,9 +197,9 @@ function encrypt(input, options) {
 
     const encryption = aesKeysFromPassword(options.password);
 
-    let inStream = fs.createReadStream(input);
-    let outStream = process.stdout;
-    let encryptStream = new EncryptStream(encryption);
+    const inStream = fs.createReadStream(input);
+    const outStream = process.stdout;
+    const encryptStream = new EncryptStream(encryption);
 
     inStream.on('error', exit);
     encryptStream.on('error', exit);
@@ -227,9 +227,9 @@ function decrypt(input, options) {
 
     const encryption = aesKeysFromPassword(options.password);
 
-    let inStream = fs.createReadStream(input);
-    let outStream = process.stdout;
-    let decryptStream = new DecryptStream(encryption);
+    const inStream = fs.createReadStream(input);
+    const outStream = process.stdout;
+    const decryptStream = new DecryptStream(encryption);
 
     inStream.on('error', exit);
     decryptStream.on('error', exit);

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,3 @@
-FROM cloudron/base:3.1.0@sha256:eb2ab9c7d361acda2f3ef2d8388154bc48f1651b5013fe6de4beea003018e427
+FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
 EXPOSE <%- httpPort %>