cloudron 4.12.10 → 4.14.0

package/bin/cloudron

@@ -3,14 +3,15 @@
 'use strict';
 
 require('supererror');
-require('colors');
 
 const actions = require('../src/actions.js'),
     buildActions = require('../src/build-actions.js'),
     completion = require('../src/completion.js'),
     config = require('../src/config.js'),
     program = require('commander'),
+    safe = require('safetydance'),
     semver = require('semver'),
+    superagent = require('superagent'),
     util = require('util');
 
 const version = require('../package.json').version;
@@ -21,19 +22,6 @@ if (!semver.satisfies(process.version, require('../package.json').engines.node))
     process.exit(1);
 }
 
-// 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
-        var res = require('superagent-sync').get('https://registry.npmjs.org/cloudron').retry(0).end();
-        if (res.statusCode === 200 && res.body['dist-tags'].latest !== version) {
-            var updateCommand = 'npm install -g cloudron@' + res.body['dist-tags'].latest;
-            process.stderr.write(util.format('A new version of Cloudron CLI is available. Please update with: %s\n'.yellow.bold, updateCommand.white));
-        }
-        config.set('lastCliUpdateCheck', Date.now());
-    }
-}
-
 function collectArgs(value, collected) {
     collected.push(value);
     return collected;
@@ -85,15 +73,9 @@ program.command('configure')
     .option('--no-wait', 'Wait for healthcheck to succeed [false]', false)
     .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
     .option('-l, --location <location>', 'Location')
+    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
     .action(actions.configure);
 
-program.command('createOAuthAppCredentials')
-    .option('--redirect-uri [uri]', 'Redirect Uri', 'http://localhost:4000')
-    .option('--scope [scopes]', 'Scopes (comma separated)', 'apps,appstore,clients,cloudron,domains,mail,profile,settings,subscription,users')
-    .option('--shell', 'Print shell friendly output')
-    .description('Create oauth app credentials for local development')
-    .action(actions.createOAuthAppCredentials);
-
 program.command('debug [cmd...]')
     .description('Put app in debug mode and run [cmd] as entrypoint. If cmd is "default" the main app entrypoint is run.')
     .option('--app <id/location>', 'App id or location')
@@ -145,11 +127,11 @@ program.command('init')
 
 program.command('install')
     .description('Install or update app')
-    .option('--app <id/location>', 'App id or location. OBSOLETE: Use "update" instead.')
     .option('--image <docker image>', 'Docker image')
     .option('--no-wait', 'Wait for healthcheck to succeed [false]', false)
-    .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
+    .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
+    .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]', false)
     .option('--debug [cmd]', 'Enable debug mode')
@@ -257,11 +239,26 @@ program.command('update')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 
-// deal first with global flags!
-program.parse(process.argv);
+(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.statusCode === 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);
+
+    const knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
+    if (!knownCommand) {
+        console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron help'.yellow);
+        process.exit(1);
+    }
+})();
 
-var knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
-if (!knownCommand) {
-    console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron help'.yellow);
-    process.exit(1);
-}

package/bin/cloudron-appstore

@@ -3,7 +3,6 @@
 'use strict';
 
 require('supererror');
-require('colors');
 
 var program = require('commander'),
     appstoreActions = require('../src/appstore-actions.js');

package/bin/cloudron-backup

@@ -3,7 +3,6 @@
 'use strict';
 
 require('supererror');
-require('colors');
 
 var program = require('commander'),
     actions = require('../src/actions.js'),

package/bin/cloudron-env

@@ -3,7 +3,6 @@
 'use strict';
 
 require('supererror');
-require('colors');
 
 var program = require('commander'),
     actions = require('../src/actions.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.12.10",
+  "version": "4.14.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,26 +17,23 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.2",
-    "cloudron-manifestformat": "^5.14.0",
-    "colors": "1.4.0",
+    "async": "^3.2.3",
+    "cloudron-manifestformat": "^5.15.0",
     "commander": "^6.1.0",
     "debug": "^4.3.3",
+    "delay": "^5.0.0",
     "easy-table": "^1.2.0",
     "ejs": "^3.1.6",
     "eventsource": "^1.1.0",
     "micromatch": "^4.0.4",
-    "mkdirp": "^1.0.4",
     "once": "^1.4.0",
     "open": "^8.4.0",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
-    "request": "^2.88.2",
     "safetydance": "^2.2.0",
     "split": "^1.0.1",
-    "superagent": "^6.1.0",
-    "superagent-sync": "^0.2.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"