cloudron 4.14.3 → 4.15.1

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');
 

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.3",
+  "version": "4.15.1",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.3",
-    "cloudron-manifestformat": "^5.15.1",
+    "cloudron-manifestformat": "^5.15.2",
     "commander": "^6.1.0",
     "debug": "^4.3.3",
     "delay": "^5.0.0",
@@ -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) {