cloudron 4.15.3 → 5.1.0

package/bin/cloudron

@@ -3,10 +3,11 @@
 'use strict';
 
 const actions = require('../src/actions.js'),
+    backupTools = require('../src/backup-tools.js'),
     buildActions = require('../src/build-actions.js'),
     completion = require('../src/completion.js'),
     config = require('../src/config.js'),
-    program = require('commander'),
+    Command = require('commander').Command,
     safe = require('safetydance'),
     semver = require('semver'),
     superagent = require('superagent'),
@@ -16,30 +17,72 @@ const version = require('../package.json').version;
 
 // ensure node version
 if (!semver.satisfies(process.version, require('../package.json').engines.node)) {
-    console.error('Your nodejs version is not compatible. Please installe nodejs', require('../package.json').engines.node);
+    console.error('Your nodejs version is not compatible. Please install nodejs', require('../package.json').engines.node);
     process.exit(1);
 }
 
+const program = new Command();
+
 function collectArgs(value, collected) {
     collected.push(value);
     return collected;
 }
 
-// TODO when updating to commander v8 we require https://github.com/tj/commander.js/pull/1670
-program.version(version)
-    .option('--server <server>', 'Cloudron domain')
+program.version(version);
+
+// global options
+program.option('--server <server>', 'Cloudron domain')
     .option('--token <token>', 'Cloudron token')
     .option('--allow-selfsigned', 'Accept self signed SSL certificate')
     .option('--accept-selfsigned', 'Accept self signed SSL certificate');
 
+// this is a separate binary since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
 
-program.command('backup', 'App backup commands');
+const backupCommand = program.command('backup')
+    .description('App backup commands');
+
+backupCommand.command('create')
+    .description('Create new app backup')
+    .option('--app <id>', 'App id')
+    .action(actions.backupCreate);
+
+backupCommand.command('list')
+    .description('List all backups for specified app')
+    .option('--raw', 'Print raw json output')
+    .option('--app <id>', 'App id')
+    .action(actions.backupList);
+
+backupCommand.command('decrypt <file>')
+    .description('Decrypt an encrypted file')
+    .option('--password <password>', 'password')
+    .action(backupTools.decrypt);
+
+backupCommand.command('decrypt-dir <indir> <outdir>')
+    .description('Decrypt an encrypted directory')
+    .option('--password <password>', 'password')
+    .action(backupTools.decryptDir);
+
+backupCommand.command('decrypt-filename <path>')
+    .description('Encrypt a file name')
+    .option('--password <password>', 'password')
+    .action(backupTools.decryptFilename);
+
+backupCommand.command('encrypt <input>')
+    .description('Encrypt a file')
+    .option('--password <password>', 'password')
+    .action(backupTools.encrypt);
+
+backupCommand.command('encrypt-filename <path>')
+    .description('Encrypt a file name')
+    .option('--password <password>', 'password')
+    .action(backupTools.encryptFilename);
 
 program.command('completion')
     .description('Shows completion for your shell')
     .action(completion);
 
+// should probably move to separate binary since globals don't apply
 program.command('build')
     .description('Build an app')
     .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectArgs, [])
@@ -83,7 +126,28 @@ program.command('debug [cmd...]')
     .option('--limit-memory', 'Enforces app memory limit. Default is to not limit memory in debug mode.')
     .action(actions.debug);
 
-program.command('env', 'App environment commands');
+const envCommand = program.command('env')
+    .description('App environment commands');
+
+envCommand.command('get <name>')
+    .description('Get environment variables')
+    .option('--app <id>', 'App id')
+    .action(actions.envGet);
+
+envCommand.command('list')
+    .description('List environment variables')
+    .option('--app <id>', 'App id')
+    .action(actions.envList);
+
+envCommand.command('set <KEY=value...>')
+    .description('Set environment variables')
+    .option('--app <id>', 'App id')
+    .action(actions.envSet);
+
+envCommand.command('unset <KEY...>')
+    .description('Unset environment variables')
+    .option('--app <id>', 'App id')
+    .action(actions.envUnset);
 
 program.command('exec [cmd...]')
     .description('Exec a command in an application')
@@ -122,6 +186,7 @@ program.command('inspect')
 
 program.command('init')
     .description('Creates a new CloudronManifest.json and Dockerfile')
+    .option('--appstore', 'Appstore template')
     .action(actions.init);
 
 program.command('install')
@@ -254,11 +319,4 @@ program.command('update')
     }
 
     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] + '.\nTry ' + 'cloudron help');
-        process.exit(1);
-    }
 })();
-

package/bin/cloudron-appstore

@@ -59,22 +59,4 @@ program.command('versions')
     .option('--raw', 'Dump versions as json')
     .action(appstoreActions.listVersions);
 
-if (!process.argv.slice(2).length) {
-    program.outputHelp();
-} else { // https://github.com/tj/commander.js/issues/338
-    // deal first with global flags!
-    program.parse(process.argv);
-
-    if (process.argv[2] === 'help') {
-        return program.outputHelp();
-    }
-
-    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] + '.\nTry ' + 'cloudron appstore help');
-        process.exit(1);
-    }
-    return;
-}
-
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.15.3",
+  "version": "5.1.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,15 +17,15 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.3",
-    "cloudron-manifestformat": "^5.15.2",
-    "commander": "^6.1.0",
-    "debug": "^4.3.3",
+    "async": "^3.2.4",
+    "cloudron-manifestformat": "^5.17.0",
+    "commander": "^9.4.0",
+    "debug": "^4.3.4",
     "delay": "^5.0.0",
     "easy-table": "^1.2.0",
-    "ejs": "^3.1.6",
-    "eventsource": "^1.1.0",
-    "micromatch": "^4.0.4",
+    "ejs": "^3.1.8",
+    "eventsource": "^2.0.2",
+    "micromatch": "^4.0.5",
     "once": "^1.4.0",
     "open": "^8.4.0",
     "progress": "^2.0.3",
@@ -33,9 +33,9 @@
     "readline-sync": "^1.4.10",
     "safetydance": "^2.2.0",
     "split": "^1.0.1",
-    "superagent": "^7.0.2",
+    "superagent": "^8.0.0",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
-    "underscore": "^1.13.2"
+    "underscore": "^1.13.4"
   },
   "engines": {
     "node": ">= 14.x.x"
@@ -43,7 +43,7 @@
   "devDependencies": {
     "expect.js": "^0.3.1",
     "memorystream": "^0.3.1",
-    "mocha": "^9.1.3",
+    "mocha": "^10.0.0",
     "rimraf": "^3.0.2"
   }
 }

package/src/actions.js

@@ -4,9 +4,9 @@ const assert = require('assert'),
     config = require('./config.js'),
     delay = require('delay'),
     ejs = require('ejs'),
+    { exit, locateManifest } = require('./helper.js'),
     EventSource = require('eventsource'),
     fs = require('fs'),
-    helper = require('./helper.js'),
     https = require('https'),
     manifestFormat = require('cloudron-manifestformat'),
     opn = require('open'),
@@ -14,7 +14,6 @@ const assert = require('assert'),
     path = require('path'),
     ProgressBar = require('progress'),
     ProgressStream = require('progress-stream'),
-    querystring = require('querystring'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
@@ -25,8 +24,6 @@ const assert = require('assert'),
     zlib = require('zlib'),
     _ = require('underscore');
 
-const exit = helper.exit;
-
 exports = module.exports = {
     list,
     login,
@@ -66,13 +63,13 @@ const NO_APP_FOUND_ERROR_STRING = 'Could not determine app. Use --app to specify
 
 // options for the request module
 function requestOptions(options) {
-    const adminFqdn = options.parent.server || config.apiEndpoint();
+    const adminFqdn = options.server || config.apiEndpoint();
 
     // ensure config can return the correct section
     config.setActive(adminFqdn);
 
-    const token = options.parent.token || config.token();
-    const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned || config.allowSelfsigned());
+    const token = options.token || config.token();
+    const rejectUnauthorized = !(options.allowSelfsigned || options.acceptSelfsigned || config.allowSelfsigned());
 
     if (!adminFqdn && !token) return exit('Login with "cloudron login" first'); // a bit rough to put this here!
 
@@ -180,7 +177,7 @@ async function getApp(options) {
     const app = options.app || null;
 
     if (!app) { // determine based on repository name given during 'build'
-        const manifestFilePath = helper.locateManifest();
+        const manifestFilePath = locateManifest();
 
         if (!manifestFilePath) throw new Error(NO_APP_FOUND_ERROR_STRING);
 
@@ -369,7 +366,7 @@ async function authenticate(adminFqdn, username, password, options) {
     return response.body.accessToken;
 }
 
-async function login(adminFqdn, options) {
+async function login(adminFqdn, localOptions, cmd) {
     if (!adminFqdn) adminFqdn = readlineSync.question('Cloudron Domain (e.g. my.example.com): ', {});
     if (!adminFqdn) return exit('');
 
@@ -378,7 +375,9 @@ async function login(adminFqdn, options) {
 
     config.setActive(adminFqdn);
 
-    const rejectUnauthorized = !(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
+    const options = cmd.optsWithGlobals();
+
+    const rejectUnauthorized = !(options.allowSelfsigned || options.acceptSelfsigned);
     let token = config.token();
     if (token) { // check if the token is not expired
         const request = superagent.get(`https://${adminFqdn}/api/v1/profile?access_token=${token}`)
@@ -408,7 +407,7 @@ async function login(adminFqdn, options) {
     config.setActive(adminFqdn);
     config.setApiEndpoint(adminFqdn);
     config.setToken(token);
-    config.setAllowSelfsigned(options.parent.allowSelfsigned || options.parent.acceptSelfsigned);
+    config.setAllowSelfsigned(cmd.optsWithGlobals().allowSelfsigned || cmd.optsWithGlobals().acceptSelfsigned);
     config.set('cloudrons.default', adminFqdn);
 
     console.log('Login successful.');
@@ -421,7 +420,8 @@ function logout() {
     console.log('Logged out.');
 }
 
-async function open(options) {
+async function open(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [error, app] = await safe(getApp(options));
     if (error) return exit(error);
 
@@ -430,9 +430,8 @@ async function open(options) {
     opn(`https://${app.fqdn}`);
 }
 
-async function list(options) {
-    helper.verifyArguments(arguments);
-
+async function list(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [error, response] = await safe(createRequest('GET', '/api/v1/apps', options));
     if (error) return exit(error);
     if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
@@ -533,7 +532,7 @@ async function getManifest(appstoreId) {
 
     if (appstoreId) return await downloadManifest(appstoreId);
 
-    const manifestFilePath = helper.locateManifest();
+    const manifestFilePath = locateManifest();
     if (!manifestFilePath) throw new Error('No CloudronManifest.json found');
 
     const result = manifestFormat.parseFile(manifestFilePath);
@@ -551,8 +550,8 @@ async function getManifest(appstoreId) {
     return { manifest: result.manifest, manifestFilePath };
 }
 
-async function install(options) {
-    helper.verifyArguments(arguments);
+async function install(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
     try {
         const result = await getManifest(options.appstoreId || '');
@@ -661,8 +660,8 @@ async function install(options) {
     }
 }
 
-async function configure(options) {
-    helper.verifyArguments(arguments);
+async function configure(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
     try {
         const app = await getApp(options);
@@ -741,8 +740,8 @@ async function configure(options) {
     }
 }
 
-async function update(options) {
-    helper.verifyArguments(arguments);
+async function update(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
     try {
         const app = await getApp(options);
@@ -798,15 +797,16 @@ async function update(options) {
     }
 }
 
-async function debug(cmd, options) {
+async function debug(args, localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const data = {
             debugMode: options.disable ? null : {
                 readonlyRootfs: options.readonly ? true : false,
-                cmd: parseDebugCommand(cmd.join(' ').trim())
+                cmd: parseDebugCommand(args.join(' ').trim())
             }
         };
 
@@ -835,8 +835,9 @@ async function debug(cmd, options) {
     }
 }
 
-async function repair(options) {
+async function repair(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -863,10 +864,9 @@ async function repair(options) {
     }
 }
 
-async function cancel(options) {
-    helper.verifyArguments(arguments);
-
+async function cancel(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
         if (!app.taskId) return exit('No active task.');
@@ -877,10 +877,9 @@ async function cancel(options) {
     }
 }
 
-async function uninstall(options) {
-    helper.verifyArguments(arguments);
-
+async function uninstall(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -919,9 +918,8 @@ function logPrinter(obj) {
     console.log('%s - %s', ts, message);
 }
 
-async function logs(options) {
-    helper.verifyArguments(arguments);
-
+async function logs(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const { adminFqdn, token, rejectUnauthorized } = requestOptions(options);
     const lines = options.lines || 500;
     const tail = !!options.tail;
@@ -969,9 +967,8 @@ async function logs(options) {
     }
 }
 
-async function status(options) {
-    helper.verifyArguments(arguments);
-
+async function status(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [error, app] = await safe(getApp(options));
     if (error) return exit(error);
     if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
@@ -987,10 +984,9 @@ async function status(options) {
     console.log();
 }
 
-async function inspect(options) {
-    helper.verifyArguments(arguments);
-
+async function inspect(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const response = await createRequest('GET', '/api/v1/apps', options);
         if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
@@ -1003,7 +999,7 @@ async function inspect(options) {
             apps.push(response2.body);
         }
 
-        const { adminFqdn } = requestOptions(options);
+        const { adminFqdn } = requestOptions(cmd.optsWithGlobals());
         console.log(JSON.stringify({
             apiEndpoint: adminFqdn,
             appStoreOrigin: config.appStoreOrigin(),
@@ -1014,10 +1010,9 @@ async function inspect(options) {
     }
 }
 
-async function restart(options) {
-    helper.verifyArguments(arguments);
-
+async function restart(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
         await restartApp(app, options);
@@ -1028,10 +1023,9 @@ async function restart(options) {
     }
 }
 
-async function start(options) {
-    helper.verifyArguments(arguments);
-
+async function start(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
         await startApp(app, options);
@@ -1042,10 +1036,9 @@ async function start(options) {
     }
 }
 
-async function stop(options) {
-    helper.verifyArguments(arguments);
-
+async function stop(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
         await stopApp(app, options);
@@ -1055,10 +1048,9 @@ async function stop(options) {
     }
 }
 
-async function backupCreate(options) {
-    helper.verifyArguments(arguments);
-
+async function backupCreate(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1073,10 +1065,9 @@ async function backupCreate(options) {
     }
 }
 
-async function backupList(options) {
-    helper.verifyArguments(arguments);
-
+async function backupList(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1122,10 +1113,9 @@ async function getLastBackup(app, options) {
     return response.body.backups[0].id;
 }
 
-async function restore(options) {
-    helper.verifyArguments(arguments);
-
+async function restore(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1150,10 +1140,9 @@ async function restore(options) {
     }
 }
 
-async function importApp(options) {
-    helper.verifyArguments(arguments);
-
+async function importApp(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1206,10 +1195,9 @@ async function importApp(options) {
     }
 }
 
-async function exportApp(options) {
-    helper.verifyArguments(arguments);
-
+async function exportApp(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1228,10 +1216,9 @@ async function exportApp(options) {
     }
 }
 
-async function clone(options) {
-    helper.verifyArguments(arguments);
-
+async function clone(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1290,11 +1277,12 @@ function demuxStream(stream, stdout, stderr) {
 // echo "sauce" | cloudron exec -- bash -c "cat - > /app/data/sauce" - test with binary files. should disable tty
 // cat ~/tmp/fantome.tar.gz | cloudron exec -- bash -c "tar xvf - -C /tmp" - must show an error
 // cat ~/tmp/fantome.tar.gz | cloudron exec -- bash -c "tar zxf - -C /tmp" - must extrack ok
-async function exec(cmd, options) {
-    let stdin = options._stdin || process.stdin; // hack for 'push', 'pull' to reuse this function
-    let stdout = options._stdout || process.stdout;
+async function exec(args, localOptions, cmd) {
+    let stdin = localOptions._stdin || process.stdin; // hack for 'push', 'pull' to reuse this function
+    let stdout = localOptions._stdout || process.stdout; // hack for 'push', 'pull' to reuse this function
 
-    let tty = !!options.const;
+    const options = cmd.optsWithGlobals();
+    let tty = !!options.tty;
 
     const [error, app] = await safe(getApp(options));
     if (error) return exit(error);
@@ -1302,26 +1290,37 @@ async function exec(cmd, options) {
 
     if (app.installationState !== 'installed') exit('App is not yet running. Try again later.');
 
-    if (cmd.length === 0) {
-        cmd = [ '/bin/bash' ];
+    if (args.length === 0) {
+        args = [ '/bin/bash' ];
         tty = true; // override
     }
 
     if (tty && !stdin.isTTY) exit('stdin is not tty');
 
-    const { adminFqdn, token, rejectUnauthorized } = requestOptions(options);
+    const request = createRequest('POST', `/api/v1/apps/${app.id}/exec`, options);
+    const response = await request.send({ cmd: args, tty });
+    if (response.statusCode !== 200) return exit(`Failed to create exec: ${requestError(response)}`);
+    const execId = response.body.id;
+
+    async function exitWithCode() {
+        const response2 = await createRequest('GET', `/api/v1/apps/${app.id}/exec/${execId}`, options);
+        if (response2.statusCode !== 200) return exit(`Failed to get exec code: ${requestError(response2)}`);
+
+        process.exit(response2.body.exitCode);
+    }
+
+    const { adminFqdn, token, rejectUnauthorized } = requestOptions(cmd.optsWithGlobals());
 
-    const query = {
-        rows: stdout.rows,
-        columns: stdout.columns,
+    const searchParams = new URLSearchParams({
+        rows: stdout.rows || 24,
+        columns: stdout.columns || 80,
         access_token: token,
-        cmd: JSON.stringify(cmd),
-        tty: tty
-    };
+        tty
+    });
 
     const req = https.request({
         hostname: adminFqdn,
-        path: `/api/v1/apps/${app.id}/exec?` + querystring.stringify(query),
+        path: `/api/v1/apps/${app.id}/exec/${execId}/start?${searchParams.toString()}`,
         method: 'GET',
         headers: {
             'Connection': 'Upgrade',
@@ -1345,8 +1344,8 @@ async function exec(cmd, options) {
             stdin.setRawMode(true);
             stdin.pipe(socket, { end: false }); // the remote will close the connection
             socket.pipe(stdout); // in tty mode, stdout/stderr is merged
-            socket.on('end', exit); // server closed the socket
-        } else {// create stdin process on demand
+            socket.on('end', exitWithCode); // server closed the socket
+        } else { // create stdin process on demand
             if (typeof stdin === 'function') stdin = stdin();
 
             stdin.on('data', function (d) {
@@ -1361,7 +1360,7 @@ async function exec(cmd, options) {
                 socket.write(buf);
             });
 
-            stdout.on('close', () => process.exit()); // this is only emitted when stdout is a file and not the terminal
+            stdout.on('close', exitWithCode); // this is only emitted when stdout is a file and not the terminal
 
             demuxStream(socket, stdout, process.stderr); // can get separate streams in non-tty mode
             socket.on('end', function () {  // server closed the socket
@@ -1371,7 +1370,7 @@ async function exec(cmd, options) {
                 socket.end();
 
                 // process._getActiveHandles(); process._getActiveRequests();
-                if (stdout === process.stdout) setImmediate(() => process.exit()); // otherwise, we rely on the 'close' event above
+                if (stdout === process.stdout) setImmediate(exitWithCode); // otherwise, we rely on the 'close' event above
             });
         }
     });
@@ -1380,30 +1379,30 @@ async function exec(cmd, options) {
     req.end(); // this makes the request
 }
 
-function push(localDir, remote, options) {
+function push(localDir, remote, localOptions, cmd) {
     // deal with paths prefixed with ~
-    var local = localDir.replace(/^~(?=$|\/|\\)/, os.homedir());
-    var stat = fs.existsSync(path.resolve(local)) ? fs.lstatSync(local) : null;
+    const local = localDir.replace(/^~(?=$|\/|\\)/, os.homedir());
+    const stat = fs.existsSync(path.resolve(local)) ? fs.lstatSync(local) : null;
 
     if (stat && stat.isDirectory())  {
         // Create a functor for stdin. If no data event handlers are attached, and there are no stream.pipe() destinations, and the stream is
         // switched into flowing mode, then data will be lost. So, we have to start the tarzip only when exec is ready to attach event handlers.
-        options._stdin = function () {
+        localOptions._stdin = function () {
             var tarzip = spawn('tar', ['zcf', '-', '-C', path.dirname(local), path.basename(local)], { stdio: 'pipe' });
             return tarzip.stdout;
         };
 
-        exec(['tar', 'zxvf', '-', '-C', remote], options);
+        exec(['tar', 'zxvf', '-', '-C', remote], localOptions, cmd);
     } else {
         if (local === '-') {
-            options._stdin = process.stdin;
+            localOptions._stdin = process.stdin;
         } else if (stat) {
-            var progress = new ProgressStream({ length: stat.size, time: 1000 });
+            const progress = new ProgressStream({ length: stat.size, time: 1000 });
 
-            options._stdin = progress;
+            localOptions._stdin = progress;
             fs.createReadStream(local).pipe(progress);
 
-            var bar = new ProgressBar('Uploading [:bar] :percent: :etas', {
+            const bar = new ProgressBar('Uploading [:bar] :percent: :etas', {
                 complete: '=',
                 incomplete: ' ',
                 width: 100,
@@ -1415,48 +1414,52 @@ function push(localDir, remote, options) {
             exit('local file ' + local + ' does not exist');
         }
 
-        options._stdin.on('error', function (error) { exit('Error pushing', error); });
+        localOptions._stdin.on('error', function (error) { exit('Error pushing', error); });
 
         if (remote.endsWith('/')) { // dir
             remote = remote + '/' + path.basename(local); // do not use path.join as we want this to be a UNIX path
         }
 
-        exec(['bash', '-c', `cat - > "${remote}"`], options);
+        exec(['bash', '-c', `cat - > "${remote}"`], localOptions, cmd);
     }
 }
 
-function pull(remote, local, options) {
+function pull(remote, local, localOptions, cmd) {
     if (remote.endsWith('/')) { // dir
         var untar = tar.extract(local); // local directory is created if it doesn't exist!
         var unzip = zlib.createGunzip();
 
         unzip.pipe(untar);
-        options._stdout = unzip;
+        localOptions._stdout = unzip;
 
-        exec(['tar', 'zcf', '-', '-C', remote, '.'], options);
+        exec(['tar', 'zcf', '-', '-C', remote, '.'], localOptions, cmd);
     } else {
         if (fs.existsSync(local) && fs.lstatSync(local).isDirectory()) {
             local = path.join(local, path.basename(remote));
-            options._stdout = fs.createWriteStream(local);
+            localOptions._stdout = fs.createWriteStream(local);
         } else if (local === '-') {
-            options._stdout = process.stdout;
+            localOptions._stdout = process.stdout;
         } else {
-            options._stdout = fs.createWriteStream(local);
+            localOptions._stdout = fs.createWriteStream(local);
         }
 
-        options._stdout.on('error', function (error) { exit('Error pulling', error); });
+        localOptions._stdout.on('error', function (error) { exit('Error pulling', error); });
 
-        exec(['cat', remote], options);
+        exec(['cat', remote], localOptions, cmd);
     }
 }
 
-function init() {
-    const manifestFilePath = helper.locateManifest();
+function init(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+    const manifestFilePath = locateManifest();
     if (manifestFilePath && path.dirname(manifestFilePath) === process.cwd()) return exit('CloudronManifest.json already exists in current directory');
 
-    const manifestTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'CloudronManifest.json.ejs'), 'utf8');
+    const manifestTemplateFilename = options.appstore ? 'CloudronManifest.appstore.json.ejs' : 'CloudronManifest.json.ejs';
+
+    const manifestTemplate = fs.readFileSync(path.join(__dirname, 'templates/', manifestTemplateFilename), 'utf8');
     const dockerfileTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'Dockerfile.ejs'), 'utf8');
     const dockerignoreTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'dockerignore.ejs'), 'utf8');
+    const startShTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'start.sh.ejs'), 'utf8');
 
     const data = {
         version: '0.1.0',
@@ -1481,6 +1484,21 @@ function init() {
         fs.writeFileSync('.dockerignore', dockerignore, 'utf8');
     }
 
+    if (fs.existsSync('start.sh')) {
+        console.log('start.sh already exists, skipping');
+    } else {
+        const dockerignore = ejs.render(startShTemplate, {});
+        fs.writeFileSync('start.sh', dockerignore, 'utf8');
+        fs.chmodSync('start.sh', 0o0775);
+    }
+
+    if (options.appstore) {
+        if (!fs.existsSync('.gitignore')) fs.writeFileSync('.gitignore', 'node_modules/\n', 'utf8');
+        if (!fs.existsSync('DESCRIPTION.md')) fs.writeFileSync('DESCRIPTION.md', '## About\n\nThis app changes everything\n\n', 'utf8');
+        if (!fs.existsSync('POSTINSTALL.md')) fs.writeFileSync('POSTINSTALL.md', 'Post installation information\n\n', 'utf8');
+        if (!fs.existsSync('CHANGELOG')) fs.writeFileSync('CHANGELOG', '[0.1.0]\n* Initial version\n\n', 'utf8');
+    }
+
     console.log();
     console.log('Now edit the CloudronManifest.json');
     console.log();
@@ -1499,8 +1517,9 @@ async function setEnv(app, env, options) {
     console.log('\n');
 }
 
-async function envSet(envVars, options) {
+async function envSet(envVars, localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1520,8 +1539,9 @@ async function envSet(envVars, options) {
     }
 }
 
-async function envUnset(envNames, options) {
+async function envUnset(envNames, localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1537,10 +1557,9 @@ async function envUnset(envNames, options) {
     }
 }
 
-async function envList(options) {
-    helper.verifyArguments(arguments);
-
+async function envList(localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
@@ -1566,8 +1585,9 @@ async function envList(options) {
     }
 }
 
-async function envGet(envName, options) {
+async function envGet(envName, localOptions, cmd) {
     try {
+        const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 

package/src/appstore-actions.js

@@ -2,30 +2,29 @@
 
 'use strict';
 
-var superagent = require('superagent'),
-    util = require('util'),
-    path = require('path'),
-    assert = require('assert'),
+const assert = require('assert'),
+    config = require('./config.js'),
     fs = require('fs'),
+    { exit, locateManifest } = require('./helper.js'),
+    manifestFormat = require('cloudron-manifestformat'),
+    path = require('path'),
+    readlineSync = require('readline-sync'),
     safe = require('safetydance'),
+    superagent = require('superagent'),
     Table = require('easy-table'),
-    readlineSync = require('readline-sync'),
-    config = require('./config.js'),
-    helper = require('./helper.js'),
-    exit = helper.exit,
-    manifestFormat = require('cloudron-manifestformat');
+    util = require('util');
 
 exports = module.exports = {
-    login: login,
-    logout: logout,
-    info: info,
-    listVersions: listVersions,
-    submit: submit,
-    upload: upload,
-    revoke: revoke,
-    approve: approve,
-    unpublish: unpublish,
-    listPublishedApps: listPublishedApps
+    login,
+    logout,
+    info,
+    listVersions,
+    submit,
+    upload,
+    revoke,
+    approve,
+    unpublish,
+    listPublishedApps
 };
 
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
@@ -42,7 +41,7 @@ function getAppstoreId(appstoreId, callback) {
         return callback(null, parts[0], parts[1]);
     }
 
-    var manifestFilePath = helper.locateManifest();
+    var manifestFilePath = locateManifest();
 
     if (!manifestFilePath) return callback('No CloudronManifest.json found');
 
@@ -136,8 +135,6 @@ function info(options) {
 }
 
 function listVersions(options) {
-    helper.verifyArguments(arguments);
-
     getAppstoreId(options.appstoreId, function (error, id) {
         if (error) exit(error);
 
@@ -428,10 +425,8 @@ function submitAppForReview(manifest, callback) {
 }
 
 function upload(options) {
-    helper.verifyArguments(arguments);
-
     // try to find the manifest of this project
-    var manifestFilePath = helper.locateManifest();
+    var manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit(NO_MANIFEST_FOUND_ERROR_STRING);
 
     var result = manifestFormat.parseFile(manifestFilePath);
@@ -467,10 +462,8 @@ function upload(options) {
 }
 
 function submit() {
-    helper.verifyArguments(arguments);
-
     // try to find the manifest of this project
-    var manifestFilePath = helper.locateManifest();
+    var manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit(NO_MANIFEST_FOUND_ERROR_STRING);
 
     var result = manifestFormat.parseFile(manifestFilePath);
@@ -482,8 +475,6 @@ function submit() {
 }
 
 function unpublish(options) {
-    helper.verifyArguments(arguments);
-
     getAppstoreId(options.appstoreId, function (error, id, version) {
         if (error) exit(error);
 
@@ -499,8 +490,6 @@ function unpublish(options) {
 }
 
 function revoke(options) {
-    helper.verifyArguments(arguments);
-
     getAppstoreId(options.appstoreId, function (error, id, version) {
         if (error) return exit(error);
 
@@ -525,8 +514,6 @@ function approve(options) {
 
 // TODO currently no pagination, only needed once we have users with more than 100 apps
 function listPublishedApps(options) {
-    helper.verifyArguments(arguments);
-
     superagentEnd(function () {
         return superagent.get(createUrl('/api/v1/developers/apps?per_page=100'))
             .query({ accessToken: config.appStoreToken() })

package/src/build-actions.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports = module.exports = {
-    build: build
+    build
 };
 
 const assert = require('assert'),
@@ -292,8 +292,6 @@ function buildRemote(manifest, sourceDir, appConfig, options) {
 }
 
 function build(options) {
-    helper.verifyArguments(arguments);
-
     // try to find the manifest of this project
     const manifestFilePath = helper.locateManifest();
     if (!manifestFilePath) return exit('No CloudronManifest.json found');

package/src/completion.js

@@ -2,17 +2,17 @@
 
 'use strict';
 
-var helper = require('./helper.js'),
+const helper = require('./helper.js'),
     util = require('util');
 
-exports = module.exports = function (options) {
+exports = module.exports = function (options, cmd) {
     var completion = '';
 
-    var commands = [];
-    for (var command in options.parent.commands) {
-        if (options.parent.commands[command]._name === '*' || options.parent.commands[command]._name === 'completion') continue;
-        if (options.parent.commands[command]._name) commands.push(options.parent.commands[command]._name);
-        if (options.parent.commands[command]._alias) commands.push(options.parent.commands[command]._alias);
+    const commands = [];
+    for (const command of cmd.parent.commands) {
+        if (command._name === '*' || command._name === 'completion') continue;
+        if (command._name) commands.push(command._name);
+        if (command._alias) commands.push(command._alias);
     }
     commands.sort();
 

package/src/helper.js

@@ -10,7 +10,6 @@ exports = module.exports = {
     exit,
 
     locateManifest,
-    verifyArguments
 };
 
 function exit(error) {
@@ -35,11 +34,3 @@ function locateManifest() {
 
     return null;
 }
-
-function verifyArguments(args) {
-    if (args.length > 1) {
-        console.log('Too many arguments');
-        args[0].parent.help(); // extra args won't have parent() field
-        process.exit(1);
-    }
-}

package/src/templates/CloudronManifest.appstore.json.ejs

@@ -0,0 +1,25 @@
+{
+  "id": "",
+  "version": "<%- version %>",
+  "upstreamVersion": "",
+  "minBoxVersion": "7.1.0",
+  "title": "",
+  "author": "",
+  "description": "file://DESCRIPTION.md",
+  "tagline": "",
+  "website": "",
+  "contactEmail": "",
+  "icon": "file://logo.png",
+  "healthCheckPath": "/",
+  "mediaLinks": [],
+  "httpPort": <%- httpPort %>,
+  "tags": [],
+  "changelog": "file://CHANGELOG",
+  "postInstallMessage": "file://POSTINSTALL.md",
+  "documentationUrl": "",
+  "forumUrl": "",
+  "addons": {
+    "localstorage": {}
+  },
+  "manifestVersion": 2
+}

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,9 @@
 FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
 
-EXPOSE <%- httpPort %>
+RUN mkdir -p /app/code
+WORKDIR /app/code
+
+COPY start.sh /app/pkg/
+
+CMD [ "/app/pkg/start.sh" ]
+

package/src/templates/start.sh.ejs

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

package/bin/cloudron-backup

@@ -1,65 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const program = require('commander'),
-    actions = require('../src/actions.js'),
-    backupTools = require('../src/backup-tools.js');
-
-program.version(require('../package.json').version);
-
-program.command('create')
-    .description('Create new app backup')
-    .option('--app <id>', 'App id')
-    .action(actions.backupCreate);
-
-program.command('list')
-    .description('List all backups for specified app')
-    .option('--raw', 'Print raw json output')
-    .option('--app <id>', 'App id')
-    .action(actions.backupList);
-
-program.command('decrypt <file>')
-    .description('Decrypt an encrypted file')
-    .option('--password <password>', 'password')
-    .action(backupTools.decrypt);
-
-program.command('decrypt-dir <indir> <outdir>')
-    .description('Decrypt an encrypted directory')
-    .option('--password <password>', 'password')
-    .action(backupTools.decryptDir);
-
-program.command('decrypt-filename <path>')
-    .description('Encrypt a file name')
-    .option('--password <password>', 'password')
-    .action(backupTools.decryptFilename);
-
-program.command('encrypt <input>')
-    .description('Encrypt a file')
-    .option('--password <password>', 'password')
-    .action(backupTools.encrypt);
-
-program.command('encrypt-filename <path>')
-    .description('Encrypt a file name')
-    .option('--password <password>', 'password')
-    .action(backupTools.encryptFilename);
-
-if (!process.argv.slice(2).length) {
-    program.outputHelp();
-} else { // https://github.com/tj/commander.js/issues/338
-    // deal first with global flags!
-    program.parse(process.argv);
-
-    if (process.argv[2] === 'help') {
-        return program.outputHelp();
-    }
-
-    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] + '.\nTry ' + 'cloudron backup help');
-        process.exit(1);
-    }
-    return;
-}
-
-program.parse(process.argv);

package/bin/cloudron-env

@@ -1,48 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const program = require('commander'),
-    actions = require('../src/actions.js');
-
-program.version(require('../package.json').version);
-
-program.command('get <name>')
-    .description('Get environment variables')
-    .option('--app <id>', 'App id')
-    .action(actions.envGet);
-
-program.command('list')
-    .description('List environment variables')
-    .option('--app <id>', 'App id')
-    .action(actions.envList);
-
-program.command('set <KEY=value...>')
-    .description('Set environment variables')
-    .option('--app <id>', 'App id')
-    .action(actions.envSet);
-
-program.command('unset <KEY...>')
-    .description('Unset environment variables')
-    .option('--app <id>', 'App id')
-    .action(actions.envUnset);
-
-if (!process.argv.slice(2).length) {
-    program.outputHelp();
-} else { // https://github.com/tj/commander.js/issues/338
-    // deal first with global flags!
-    program.parse(process.argv);
-
-    if (process.argv[2] === 'help') {
-        return program.outputHelp();
-    }
-
-    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] + '.\nTry ' + 'cloudron env help');
-        process.exit(1);
-    }
-    return;
-}
-
-program.parse(process.argv);