cloudron 5.12.0 → 5.14.0

package/src/actions.js

@@ -4,25 +4,22 @@ const assert = require('assert'),
     config = require('./config.js'),
     ejs = require('ejs'),
     { exit, locateManifest } = require('./helper.js'),
-    EventSource = require('eventsource'),
+    { EventSource } = require('eventsource'),
     fs = require('fs'),
     https = require('https'),
+    LineStream = require('./line-stream.js'),
     manifestFormat = require('cloudron-manifestformat'),
     os = require('os'),
     path = require('path'),
-    ProgressBar = require('progress'),
-    ProgressStream = require('progress-stream'),
-    readlineSync = require('readline-sync'),
+    readline = require('./readline.js'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
     semver = require('semver'),
-    split = require('split2'),
-    superagent = require('superagent'),
+    superagent = require('./superagent.js'),
     Table = require('easy-table'),
     tar = require('tar-fs'),
     timers = require('timers/promises'),
-    zlib = require('zlib'),
-    _ = require('underscore');
+    zlib = require('zlib');
 
 exports = module.exports = {
     list,
@@ -82,7 +79,7 @@ function createRequest(method, apiPath, options) {
     let url = `https://${adminFqdn}${apiPath}`;
     if (url.includes('?')) url += '&'; else url += '?';
     url += `access_token=${token}`;
-    const request = superagent(method, url);
+    const request = superagent.request(method, url);
     if (!rejectUnauthorized) request.disableTLSCerts();
     request.retry(3);
     request.ok(() => true);
@@ -91,9 +88,9 @@ function createRequest(method, apiPath, options) {
 
 // error for the request module
 function requestError(response) {
-    if (response.statusCode === 401) return 'Invalid token. Use cloudron login again.';
+    if (response.status === 401) return 'Invalid token. Use cloudron login again.';
 
-    return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+    return `${response.status} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
 
 async function selectDomain(location, options) {
@@ -103,7 +100,7 @@ async function selectDomain(location, options) {
     const { adminFqdn } = requestOptions(options);
 
     const response = await createRequest('GET', '/api/v1/domains', options);
-    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
 
     const domains = response.body.domains;
 
@@ -137,7 +134,7 @@ async function stopActiveTask(app, options) {
     console.log(`Stopping app's current active task ${app.taskId}`);
 
     const response = await createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
-    if (response.statusCode !== 204) throw `Failed to stop active task: ${requestError(response)}`;
+    if (response.status !== 204) throw `Failed to stop active task: ${requestError(response)}`;
 }
 
 async function selectAppWithRepository(repository, options) {
@@ -145,7 +142,7 @@ async function selectAppWithRepository(repository, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('GET', '/api/v1/apps', options);
-    if (response.statusCode !== 200) throw new Error(`Failed to install app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to install app: ${requestError(response)}`);
 
     const matchingApps = response.body.apps.filter(function (app) {
         return !app.appStoreId && app.manifest.dockerImage.startsWith(repository); // never select apps from the store
@@ -163,7 +160,7 @@ async function selectAppWithRepository(repository, options) {
 
     let index = -1;
     while (true) {
-        index = parseInt(readlineSync.question('Choose app [0-' + (matchingApps.length-1) + ']: ', {}), 10);
+        index = parseInt(await readline.question('Choose app [0-' + (matchingApps.length-1) + ']: ', {}), 10);
         if (isNaN(index) || index < 0 || index > matchingApps.length-1) console.log('Invalid selection');
         else break;
     }
@@ -193,12 +190,12 @@ async function getApp(options) {
         return result;
     } else if (app.match(/.{8}-.{4}-.{4}-.{4}-.{8}/)) {  // it is an id
         const response = await createRequest('GET', `/api/v1/apps/${app}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
         return response.body;
     } else { // it is a location
         const response = await createRequest('GET', '/api/v1/apps', options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get apps: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get apps: ${requestError(response)}`);
 
         const match = response.body.apps.filter(function (m) { return m.subdomain === app || m.location === app || m.fqdn === app; });
         if (match.length == 0) throw new Error(`App at location ${app} not found`);
@@ -218,7 +215,7 @@ async function waitForHealthy(appId, options) {
     while (true) {
         await timers.setTimeout(1000);
         const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
         // do not check installation state here. it can be pending_backup etc (this is a bug in box code)
         if (response.body.health === 'healthy') return;
@@ -241,7 +238,7 @@ async function waitForTask(taskId, options) {
 
     while (true) {
         const response = await createRequest('GET', `/api/v1/tasks/${taskId}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
 
         if (!response.body.active) return response.body;
 
@@ -275,7 +272,7 @@ async function waitForFinishInstallation(appId, taskId, options) {
     await waitForTask(taskId, options);
 
     const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
     if (response.body.installationState !== 'installed') throw new Error(`Installation failed: ${response.body.error ? response.body.error.message : ''}`);
 
@@ -292,7 +289,7 @@ async function waitForFinishBackup(appId, taskId, options) {
     if (result.error) throw new Error(`Backup failed: ${result.error.message}`);
 
     const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 }
 
 async function stopApp(app, options) {
@@ -300,7 +297,7 @@ async function stopApp(app, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('POST', `/api/v1/apps/${app.id}/stop`, options);
-    if (response.statusCode !== 202) throw `Failed to stop app: ${requestError(response)}`;
+    if (response.status !== 202) throw `Failed to stop app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -310,7 +307,7 @@ async function startApp(app, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('POST', `/api/v1/apps/${app.id}/start`, options);
-    if (response.statusCode !== 202) throw `Failed to start app: ${requestError(response)}`;
+    if (response.status !== 202) throw `Failed to start app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -320,7 +317,7 @@ async function restartApp(app, options) {
     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)}`;
+    if (response.status !== 202) throw `Failed to restart app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -334,7 +331,7 @@ async function authenticate(adminFqdn, username, password, options) {
     let totpToken;
 
     const { rejectUnauthorized, askForTotpToken } = options;
-    if (askForTotpToken) totpToken = readlineSync.question('2FA Token: ', {});
+    if (askForTotpToken) totpToken = await readline.question('2FA Token: ', {});
 
     const request = superagent.post(`https://${adminFqdn}/api/v1/auth/login`)
         .timeout(60000)
@@ -354,13 +351,13 @@ async function authenticate(adminFqdn, username, password, options) {
         }
     }
 
-    if (response.statusCode !== 200) throw new Error(`Login failed: Status code: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Login failed: Status code: ${requestError(response)}`);
 
     return response.body.accessToken;
 }
 
 async function login(adminFqdn, localOptions, cmd) {
-    if (!adminFqdn) adminFqdn = readlineSync.question('Cloudron Domain (e.g. my.example.com): ', {});
+    if (!adminFqdn) adminFqdn = await readline.question('Cloudron Domain (e.g. my.example.com): ', {});
     if (!adminFqdn) return exit('');
 
     if (adminFqdn.indexOf('https://') === 0) adminFqdn = adminFqdn.slice('https://'.length);
@@ -389,8 +386,8 @@ async function login(adminFqdn, localOptions, cmd) {
     }
 
     if (!token) {
-        const username = options.username || readlineSync.question('Username: ', {});
-        const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
+        const username = options.username || await readline.question('Username: ', {});
+        const password = options.password || await readline.question('Password: ', { noEchoBack: true });
 
         const [error, result] = await safe(authenticate(adminFqdn, username, password, { rejectUnauthorized, askForTotpToken: false }));
         if (error) return exit(`Failed to login: ${error.message}`);
@@ -428,7 +425,7 @@ 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)}`);
+    if (response.status !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
     let apps = response.body.apps;
 
@@ -450,7 +447,7 @@ async function list(localOptions, cmd) {
 
         const response = result.value;
 
-        if (response.statusCode !== 200) return exit(`Failed to list app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to list app: ${requestError(response)}`);
         response.body.location = response.body.location || response.body.subdomain; // LEGACY support
 
         const detailedApp = response.body;
@@ -458,7 +455,7 @@ async function list(localOptions, cmd) {
         t.cell('Id', detailedApp.id);
         t.cell('Location', detailedApp.fqdn);
         t.cell('Manifest Id', (detailedApp.manifest.id || 'customapp') + '@' + detailedApp.manifest.version);
-        var prettyState;
+        let prettyState;
         if (detailedApp.installationState === 'installed') {
             prettyState = (detailedApp.debugMode ? 'debug' : detailedApp.runState);
         } else if (detailedApp.installationState === 'error') {
@@ -481,18 +478,19 @@ async function querySecondaryDomains(app, manifest, options) {
 
     for (const env in manifest.httpPorts) {
         const defaultDomain = (app && app.secondaryDomains && app.secondaryDomains[env]) ? app.secondaryDomains[env] : (manifest.httpPorts[env].defaultValue || '');
-        const input = readlineSync.question(`${manifest.httpPorts[env].description} (default: "${defaultDomain}"): `, {});
+        const input = await readline.question(`${manifest.httpPorts[env].description} (default: "${defaultDomain}"): `, {});
         secondaryDomains[env] = await selectDomain(input, options);
     }
     return secondaryDomains;
 }
 
-function queryPortBindings(app, manifest) {
+async function queryPortBindings(app, manifest) {
     const portBindings = {};
-    const allPorts = _.extend({}, manifest.tcpPorts, manifest.udpPorts);
+    const allPorts = Object.assign({}, manifest.tcpPorts, manifest.udpPorts);
+
     for (const env in allPorts) {
         const defaultPort = (app && app.portBindings && app.portBindings[env]) ? app.portBindings[env] : (allPorts[env].defaultValue || '');
-        const port = readlineSync.question(allPorts[env].description + ' (default ' + env + '=' + defaultPort + '. "x" to disable): ', {});
+        const port = await readline.question(allPorts[env].description + ' (default ' + env + '=' + defaultPort + '. "x" to disable): ', {});
         if (port === '') {
             portBindings[env] = defaultPort;
         } else if (isNaN(parseInt(port, 10))) {
@@ -515,7 +513,7 @@ async function downloadManifest(appstoreId) {
 
     const [error, response] = await safe(superagent.get(url).ok(() => true));
     if (error) throw new Error(`Failed to list apps from appstore: ${error.message}`);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app info from store: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app info from store: ${requestError(response)}`);
 
     return { manifest: response.body.manifest, manifestFilePath: null /* manifest file path */ };
 }
@@ -559,7 +557,7 @@ async function install(localOptions, cmd) {
             manifest.dockerImage = image;
         }
 
-        const location = options.location || readlineSync.question('Location: ', {});
+        const location = options.location || await readline.question('Location: ', {});
         if (!location) return exit('');
 
         const domainObject = await selectDomain(location, options);
@@ -604,10 +602,10 @@ async function install(localOptions, cmd) {
                     ports[tmp[0]] = parseInt(tmp[1], 10);
                 });
             } else {
-                ports = queryPortBindings(null /* existing app */, manifest);
+                ports = await queryPortBindings(null /* existing app */, manifest);
             }
         } else { // just put in defaults
-            const allPorts = _.extend({}, manifest.tcpPorts, manifest.udpPorts);
+            const allPorts = Object.assign({}, manifest.tcpPorts, manifest.udpPorts);
             for (const portName in allPorts) {
                 ports[portName] = allPorts[portName].defaultValue;
             }
@@ -649,7 +647,7 @@ async function install(localOptions, cmd) {
 
         const request = createRequest('POST', '/api/v1/apps/install', options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to install app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to install app: ${requestError(response)}`);
 
         const appId = response.body.id;
 
@@ -669,7 +667,7 @@ async function setLocation(localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-        if (!options.location) options.location = readlineSync.question(`Enter new location (default: ${app.fqdn}): `, { });
+        if (!options.location) options.location = await readline.question(`Enter new location (default: ${app.fqdn}): `, { });
         const location = options.location || app.subdomain;
 
         const domainObject = await selectDomain(location, options);
@@ -734,7 +732,7 @@ async function setLocation(localOptions, cmd) {
                     ports[tmp[0]] = parseInt(tmp[1], 10);
                 });
             } else {
-                ports = queryPortBindings(app, app.manifest);
+                ports = await queryPortBindings(app, app.manifest);
             }
 
             for (const port in ports) {
@@ -746,7 +744,7 @@ async function setLocation(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/location`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
 
         await waitForTask(response.body.taskId, options);
         await waitForHealthy(app.id, options);
@@ -788,10 +786,10 @@ async function update(localOptions, cmd) {
 
         if (app.error && (app.error.installationState === 'pending_install')) { // install had failed. call repair to re-install
             apiPath = `/api/v1/apps/${app.id}/repair`;
-            data = _.extend(data, { manifest });
+            data = Object.assign(data, { manifest });
         } else {
             apiPath = `/api/v1/apps/${app.id}/update`;
-            data = _.extend(data, {
+            data = Object.assign(data, {
                 appStoreId: options.appstoreId || '', // note case change
                 manifest: manifest,
                 skipBackup: !options.backup,
@@ -802,7 +800,7 @@ async function update(localOptions, cmd) {
 
         const request = createRequest('POST', apiPath, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to update app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to update app: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be updated ');
 
@@ -831,7 +829,7 @@ async function debug(args, localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/debug_mode`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
 
         await waitForTask(response.body.taskId, options);
 
@@ -845,7 +843,7 @@ async function debug(args, localOptions, cmd) {
 
         const request2 = createRequest('POST', `/api/v1/apps/${app.id}/configure/memory_limit`, options);
         const response2 = await request2.send({ memoryLimit });
-        if (response2.statusCode !== 202) return exit(`Failed to set memory limit: ${requestError(response2)}`);
+        if (response2.status !== 202) return exit(`Failed to set memory limit: ${requestError(response2)}`);
 
         await waitForTask(response2.body.taskId, options);
         console.log('\n\nDone');
@@ -865,7 +863,7 @@ async function repair(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/repair`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be repaired ');
 
@@ -898,13 +896,13 @@ async function uninstall(localOptions, cmd) {
         await stopActiveTask(app, options);
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/uninstall`, options);
-        if (response.statusCode !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be uninstalled ');
 
         await waitForTask(response.body.taskId, options);
         const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response2.statusCode === 404) {
+        if (response2.status === 404) {
             console.log('\n\nApp %s successfully uninstalled.', app.fqdn);
         } else if (response2.body.installationState === 'error') {
             console.log('\n\nApp uninstallation failed.\n');
@@ -954,13 +952,13 @@ async function logs(localOptions, cmd) {
 
     if (tail) {
         const url = `${apiPath}?access_token=${token}&lines=10&format=json`;
-        var es = new EventSource(url, { rejectUnauthorized }); // not sure why this is needed
+        const es = new EventSource(url, { rejectUnauthorized }); // not sure why this is needed
 
-        es.on('message', function (e) { // e { type, data, lastEventId }. lastEventId is the timestamp
+        es.addEventListener('message', function (e) { // e { type, data, lastEventId }. lastEventId is the timestamp
             logPrinter(JSON.parse(e.data));
         });
 
-        es.on('error', function (error) {
+        es.addEventListener('error', function (error) {
             if (error.status === 401) return exit('Please login first');
             if (error.status === 412) exit('Logs currently not available.');
             exit(error);
@@ -970,17 +968,17 @@ async function logs(localOptions, cmd) {
 
         const req = superagent.get(url, { rejectUnauthorized });
         req.on('response', function (response) {
-            if (response.statusCode !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
+            if (response.status !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
         });
         req.on('error', (error) => exit(`Pipe error: ${error.message}`));
 
-        const jsonStream = split((line) => JSON.parse(line));
-        jsonStream
-            .on('data', logPrinter)
+        const lineStream = new LineStream();
+        lineStream
+            .on('line', (line) => { logPrinter(JSON.parse(line)); } )
             .on('error', (error) => exit(`JSON parse error: ${error.message}`))
             .on('end', process.exit);
 
-        req.pipe(jsonStream);
+        req.pipe(lineStream);
     }
 }
 
@@ -1005,13 +1003,13 @@ 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)}`);
+        if (response.status !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
         const apps = [];
 
         for (const app of response.body.apps) {
             const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-            if (response2.statusCode !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
+            if (response2.status !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
             response2.body.location = response2.body.location || response2.body.subdomain; // LEGACY support
             apps.push(response2.body);
         }
@@ -1072,7 +1070,7 @@ async function backupCreate(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/backup`, options);
-        if (response.statusCode !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishBackup(app.id, response.body.taskId, options);
@@ -1089,7 +1087,7 @@ async function backupList(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}/backups`, options);
-        if (response.statusCode !== 200) return exit(`Failed to list backups: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to list backups: ${requestError(response)}`);
 
         if (options.raw) return console.log(JSON.stringify(response.body.backups, null, 4));
 
@@ -1100,7 +1098,7 @@ async function backupList(localOptions, cmd) {
             return backup;
         }).sort(function (a, b) { return b.creationTime - a.creationTime; });
 
-        var t = new Table();
+        const t = new Table();
 
         response.body.backups.forEach(function (backup) {
             t.cell('Id', backup.id);
@@ -1119,7 +1117,7 @@ async function backupList(localOptions, cmd) {
 
 async function getLastBackup(app, options) {
     const response = await createRequest('GET', `/api/v1/apps/${app.id}/backups`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to list backups: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to list backups: ${requestError(response)}`);
     if (response.body.backups.length === 0) throw new Error('No backups');
 
     response.body.backups = response.body.backups.map(function (backup) {
@@ -1145,7 +1143,7 @@ async function restore(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/restore`, options);
         const response = await request.send({ backupId });
-        if (response.statusCode !== 202) return exit(`Failed to restore app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to restore app: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishInstallation(app.id, response.body.taskId, options);
@@ -1204,7 +1202,7 @@ async function importApp(localOptions, cmd) {
         }
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/import`, options);
-        if (response.statusCode !== 202) return exit(`Failed to import app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to import app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
         console.log('\n\nApp is restored');
@@ -1225,7 +1223,7 @@ async function exportApp(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/export`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to export app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to export app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
         console.log('\n\nApp is exported');
@@ -1242,9 +1240,9 @@ async function clone(localOptions, cmd) {
 
         if (!options.backup) return exit('Use --backup to specify the backup id');
 
-        const location = options.location || readlineSync.question('Cloned app location: ', {});
+        const location = options.location || await readline.question('Cloned app location: ', {});
         const secondaryDomains = await querySecondaryDomains(app, app.manifest, options);
-        const ports = queryPortBindings(app, app.manifest);
+        const ports = await queryPortBindings(app, app.manifest);
         const backupId = options.backup;
 
         const domainObject = await selectDomain(location, options);
@@ -1258,7 +1256,7 @@ async function clone(localOptions, cmd) {
         };
         const request = createRequest('POST', `/api/v1/apps/${app.id}/clone`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 201) return exit(`Failed to list apps: ${requestError(response)}`);
+        if (response.status !== 201) return exit(`Failed to list apps: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         console.log('App cloned as id ' + response.body.id);
@@ -1319,12 +1317,12 @@ async function exec(args, localOptions, cmd) {
 
     const request = createRequest('POST', `/api/v1/apps/${app.id}/exec`, options);
     const response = await request.send({ cmd: args, tty, lang });
-    if (response.statusCode !== 200) return exit(`Failed to create exec: ${requestError(response)}`);
+    if (response.status !== 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)}`);
+        if (response2.status !== 200) return exit(`Failed to get exec code: ${requestError(response2)}`);
 
         process.exit(response2.body.exitCode);
     }
@@ -1417,19 +1415,7 @@ function push(localDir, remote, localOptions, cmd) {
         if (local === '-') {
             localOptions._stdin = process.stdin;
         } else if (stat) {
-            const progress = new ProgressStream({ length: stat.size, time: 1000 });
-
-            localOptions._stdin = progress;
-            fs.createReadStream(local).pipe(progress);
-
-            const bar = new ProgressBar('Uploading [:bar] :percent: :etas', {
-                complete: '=',
-                incomplete: ' ',
-                width: 100,
-                total: stat.size
-            });
-
-            progress.on('progress', function (p) { bar.update(p.percentage / 100); /* bar.tick(p.transferred - bar.curr); */ });
+            localOptions._stdin = fs.createReadStream(local);
         } else {
             exit('local file ' + local + ' does not exist');
         }
@@ -1533,7 +1519,7 @@ async function setEnv(app, env, options) {
 
     const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/env`, options);
     const response = await request.send({ env });
-    if (response.statusCode !== 202) return exit(`Failed to set env: ${requestError(response)}`);
+    if (response.status !== 202) return exit(`Failed to set env: ${requestError(response)}`);
 
     await waitForTask(response.body.taskId, options);
     console.log('\n');
@@ -1546,7 +1532,7 @@ async function envSet(envVars, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const env = response.body.env;
         envVars.forEach(envVar => {
@@ -1568,7 +1554,7 @@ async function envUnset(envNames, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const env = response.body.env;
         envNames.forEach(name => delete env[name]);
@@ -1586,7 +1572,7 @@ async function envList(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const t = new Table();
 
@@ -1614,7 +1600,7 @@ async function envGet(envName, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         console.log(response.body.env[envName]);
     } catch (error) {