cloudron 7.0.0 → 7.0.1

package/bin/cloudron

@@ -20,7 +20,8 @@ program.version(pkg.version);
 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');
+    .option('--accept-selfsigned', 'Accept self signed SSL certificate')
+    .option('--no-wait', 'Do not wait for the operation to finish');
 
 // these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
@@ -158,7 +159,6 @@ program.command('init')
 program.command('install')
     .description('Install or update app')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Set secondary domains')
@@ -226,26 +226,22 @@ program.command('repair')
     .description('Repair an installed application (re-configure)')
     .option('--app <id/location>', 'App id or location')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.repair);
 
 program.command('restore')
     .description('Restore app from known backup')
     .option('--app <id/location>', 'App id or location')
     .option('--backup <backup>', 'Backup id')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restore);
 
 program.command('restart')
     .description('Restart an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restart);
 
 program.command('set-location')
     .description('Set the location of an app')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [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')
@@ -256,7 +252,6 @@ program.command('set-location')
 program.command('start')
     .description('Start an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.start);
 
 program.command('stop')
@@ -280,7 +275,6 @@ program.command('update')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--image <docker image>', 'Docker image')
     .option('--no-backup', 'Skip backup [false]')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

package/src/actions.js

@@ -266,7 +266,7 @@ async function stopApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to stop app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function startApp(app, options) {
@@ -277,7 +277,7 @@ async function startApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to start app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function restartApp(app, options) {
@@ -288,7 +288,7 @@ async function restartApp(app, options) {
     const response = await request.send({});
     if (response.status !== 202) throw `Failed to restart app: ${requestError(response)}`;
 
-    await waitForTask(response.body.taskId, options);
+    return response.body.taskId;
 }
 
 async function authenticate(adminFqdn, username, password, options) {
@@ -722,6 +722,8 @@ async function install(localOptions, cmd) {
 
         console.log('App is being installed.');
 
+        if (!options.wait) return;
+
         await waitForFinishInstallation(appId, response.body.taskId, options);
         console.log('\n\nApp is installed.');
     } catch (error) {
@@ -815,6 +817,8 @@ async function setLocation(localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         await waitForTask(response.body.taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp configured');
@@ -924,6 +928,8 @@ async function debugApp(args, localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         await waitForTask(response.body.taskId, options);
 
         const memoryLimit = options.limitMemory ? 0 : -1;
@@ -958,6 +964,8 @@ async function repair(localOptions, cmd) {
         const response = await request.send(data);
         if (response.status !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         process.stdout.write('\n => ' + 'Waiting for app to be repaired ');
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
@@ -992,6 +1000,8 @@ async function uninstall(localOptions, cmd) {
         const response = await request.send({});
         if (response.status !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         process.stdout.write('\n => ' + 'Waiting for app to be uninstalled ');
 
         await waitForTask(response.body.taskId, options);
@@ -1117,7 +1127,9 @@ async function restart(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await restartApp(app, options);
+        const taskId = await restartApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp restarted');
     } catch (error) {
@@ -1130,7 +1142,9 @@ async function start(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await startApp(app, options);
+        const taskId = await startApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         await waitForHealthy(app.id, options);
         console.log('\n\nApp started');
     } catch (error) {
@@ -1143,7 +1157,9 @@ async function stop(localOptions, cmd) {
         const options = cmd.optsWithGlobals();
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
-        await stopApp(app, options);
+        const taskId = await stopApp(app, options);
+        if (!options.wait) return;
+        await waitForTask(taskId, options);
         console.log('\n\nApp stopped');
     } catch (error) {
         exit(error);
@@ -1169,6 +1185,8 @@ async function backupCreate(localOptions, cmd) {
         const response = await request.send({ backupSiteId });
         if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
+        if (!options.wait) return;
+
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishBackup(app.id, response.body.taskId, options);
         console.log('\n\nApp is backed up');