cloudron 5.8.2 → 5.10.0

package/bin/cloudron

@@ -109,16 +109,6 @@ program.command('clone')
     .option('--location <domain>', 'Subdomain or full domain')
     .action(actions.clone);
 
-program.command('configure')
-    .description('Change 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')
-    .option('-a, --alias-domains [domain,...]', 'Alias domains')
-    .action(actions.configure);
-
 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')
@@ -275,6 +265,17 @@ program.command('restart')
     .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')
+    .option('-a, --alias-domains [domain,...]', 'Alias domains')
+    .alias('configure') // deprecated
+    .action(actions.setLocation);
+
 program.command('start')
     .description('Start an installed application')
     .option('--app <id/location>', 'App id or location')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.8.2",
+  "version": "5.10.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/actions.js

@@ -31,7 +31,7 @@ exports = module.exports = {
     logout,
     open,
     install,
-    configure,
+    setLocation,
     debug,
     update,
     uninstall,
@@ -677,7 +677,7 @@ async function install(localOptions, cmd) {
     }
 }
 
-async function configure(localOptions, cmd) {
+async function setLocation(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
     try {
@@ -873,18 +873,11 @@ async function repair(localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-        const { manifestFilePath } = await getManifest('' /* appStoreId */);
-
-        let dockerImage = options.image;
-        if (!dockerImage) {
-            const sourceDir = path.dirname(manifestFilePath);
-            dockerImage = config.getAppConfig(sourceDir).dockerImage;
-        }
-
-        if (!dockerImage) return exit('No image found, please run `cloudron build` first or use --image');
+        const data = {};
+        if (options.image) data.dockerImage = options.image;
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/repair`, options);
-        const response = await request.send({ dockerImage });
+        const response = await request.send(data);
         if (response.statusCode !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be repaired ');

package/src/appstore-actions.js

@@ -11,8 +11,7 @@ const assert = require('assert'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
     superagent = require('superagent'),
-    Table = require('easy-table'),
-    util = require('util');
+    Table = require('easy-table');
 
 exports = module.exports = {
     login,
@@ -29,83 +28,79 @@ exports = module.exports = {
 
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
 
+function requestError(response) {
+    if (response.statusCode === 401) return 'Invalid token. Use cloudron appstore login again.';
+
+    return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+}
+
+function createRequest(method, apiPath) {
+    let url = `${config.appStoreOrigin()}${apiPath}`;
+    if (url.includes('?')) url += '&'; else url += '?';
+    url += `accessToken=${config.appStoreToken()}`;
+    const request = superagent(method, url);
+    request.retry(3);
+    request.ok(() => true);
+    return request;
+}
+
 function createUrl(api) {
     return config.appStoreOrigin() + api;
 }
 
 // the app argument allows us in the future to get by name or id
-function getAppstoreId(appstoreId, callback) {
-    if (appstoreId) {
-        var parts = appstoreId.split('@');
-
-        return callback(null, parts[0], parts[1]);
-    }
+async function getAppstoreId(appstoreId) {
+    if (appstoreId) return appstoreId.split('@');
 
-    var manifestFilePath = locateManifest();
-
-    if (!manifestFilePath) return callback('No CloudronManifest.json found');
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) throw new Error('No CloudronManifest.json found');
 
-    var manifest = safe.JSON.parse(safe.fs.readFileSync(manifestFilePath));
-    if (!manifest) callback(util.format('Unable to read manifest %s. Error: %s', manifestFilePath, safe.error));
+    const manifest = safe.JSON.parse(safe.fs.readFileSync(manifestFilePath));
+    if (!manifest) throw new Error(`Unable to read manifest ${manifestFilePath}. Error: ${safe.error.message}`);
 
-    return callback(null, manifest.id, manifest.version);
+    return [manifest.id, manifest.version];
 }
 
-// takes a function returning a superagent request instance and will reauthenticate in case the token is invalid
-function superagentEnd(requestFactory, callback) {
-    requestFactory().end(function (error, result) {
-        if (error && !error.response) return callback(error);
-        if (result.statusCode === 401) return authenticate({ error: true }, superagentEnd.bind(null, requestFactory, callback));
-        if (result.statusCode === 403) return callback(new Error(result.type === 'application/javascript' ? JSON.stringify(result.body) : result.text));
-        callback(error, result);
-    });
-}
-
-function authenticate(options, callback) {
+async function authenticate(options) {
     if (!options.hideBanner) {
         const webDomain = config.appStoreOrigin().replace('https://api.', '');
         console.log(`${webDomain} login` + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
     }
 
-    var email = options.email || readlineSync.question('Email: ', {});
-    var password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
+    const email = options.email || readlineSync.question('Email: ', {});
+    const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
 
     config.setAppStoreToken(null);
 
-    superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).end(function (error, result) {
-        if (error && !error.response) exit(error);
-
-        if (result.statusCode === 401 && result.body.message.indexOf('TOTP') !== -1) {
-            if (result.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
-
-            options.totpToken = readlineSync.question('2FA token: ', {});
-            options.email = email;
-            options.password = password;
-            options.hideBanner = true;
+    const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).ok(() => true);
+    if (response.statusCode === 401 && response.body.message.indexOf('TOTP') !== -1) {
+        if (response.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
 
-            return authenticate(options, callback);
-        }
+        options.totpToken = readlineSync.question('2FA token: ', {});
+        options.email = email;
+        options.password = password;
+        options.hideBanner = true;
 
-        if (result.statusCode !== 200) {
-            console.log('Login failed.');
+        return await authenticate(options); // try again with top set
+    }
 
-            options.hideBanner = true;
-            options.email = '';
-            options.password = '';
+    if (response.statusCode !== 200) {
+        console.log('Login failed.');
 
-            return authenticate(options, callback);
-        }
+        options.hideBanner = true;
+        options.email = '';
+        options.password = '';
 
-        config.setAppStoreToken(result.body.accessToken);
+        return await authenticate(options);
+    }
 
-        console.log('Login successful.');
+    config.setAppStoreToken(response.body.accessToken);
 
-        if (typeof callback === 'function') callback();
-    });
+    console.log('Login successful.');
 }
 
-function login(options) {
-    authenticate(options);
+async function login(options) {
+    await authenticate(options);
 }
 
 function logout() {
@@ -113,93 +108,67 @@ function logout() {
     console.log('Done.');
 }
 
-function info(options) {
-    getAppstoreId(options.appstoreId, function (error, id, version) {
-        if (error) exit(error);
-
-        superagentEnd(function () {
-            return superagent.get(createUrl('/api/v1/developers/apps/' + id + '/versions/' + version)).query({ accessToken: config.appStoreToken() });
-        }, function (error, result) {
-            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message));
-            if (result.statusCode !== 200) exit(util.format('Failed to list apps: %s message: %s', result.statusCode, result.text));
-
-            var manifest = result.body.manifest;
-            console.log('id: %s', manifest.id);
-            console.log('title: %s', manifest.title);
-            console.log('tagline: %s', manifest.tagline);
-            console.log('description: %s', manifest.description);
-            console.log('website: %s', manifest.website);
-            console.log('contactEmail: %s', manifest.contactEmail);
-        });
-    });
-}
+async function info(options) {
+    const [id, version] = await getAppstoreId(options.appstoreId);
 
-function listVersions(options) {
-    getAppstoreId(options.appstoreId, function (error, id) {
-        if (error) exit(error);
+    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions/${version}`);
+    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
 
-        superagentEnd(function () {
-            return superagent.get(createUrl('/api/v1/developers/apps/' + id + '/versions')).query({ accessToken: config.appStoreToken() });
-        }, function (error, result) {
-            if (error && !error.response) exit(util.format('Failed to list versions: %s', error.message));
-            if (result.statusCode === 404) exit('This app is not listed in appstore');
-            if (result.statusCode !== 200) exit(util.format('Failed to list versions: %s message: %s', result.statusCode, result.text));
+    const manifest = response.body.manifest;
+    console.log('id: %s', manifest.id);
+    console.log('title: %s', manifest.title);
+    console.log('tagline: %s', manifest.tagline);
+    console.log('description: %s', manifest.description);
+    console.log('website: %s', manifest.website);
+    console.log('contactEmail: %s', manifest.contactEmail);
+}
 
-            if (result.body.versions.length === 0) return console.log('No versions found.');
+async function listVersions(options) {
+    const [id] = await getAppstoreId(options.appstoreId);
 
-            if (options.raw) return console.log(JSON.stringify(result.body.versions, null, 2));
+    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions`);
+    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
 
-            var versions = result.body.versions.reverse();
+    if (response.body.versions.length === 0) return console.log('No versions found.');
 
-            // var manifest = versions[0].manifest;
-            var t = new Table();
+    if (options.raw) return console.log(JSON.stringify(response.body.versions, null, 2));
 
-            versions.forEach(function (version) {
-                t.cell('Version', version.manifest.version);
-                t.cell('Creation Date', version.creationDate);
-                t.cell('Image', version.manifest.dockerImage);
-                t.cell('Publish state', version.publishState);
-                t.newRow();
-            });
+    const versions = response.body.versions.reverse();
+    const t = new Table();
 
-            console.log();
-            console.log(t.toString());
-        });
+    versions.forEach(function (version) {
+        t.cell('Version', version.manifest.version);
+        t.cell('Creation Date', version.creationDate);
+        t.cell('Image', version.manifest.dockerImage);
+        t.cell('Publish state', version.publishState);
+        t.newRow();
     });
+
+    console.log();
+    console.log(t.toString());
 }
 
-function addApp(manifest, baseDir, callback) {
-    assert(typeof manifest === 'object');
-    assert(typeof baseDir === 'string');
-    assert(typeof callback === 'function');
-
-    superagentEnd(function () {
-        return superagent.post(createUrl('/api/v1/developers/apps'))
-            .query({ accessToken: config.appStoreToken() })
-            .send({ id: manifest.id });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to create app: %s', error.message));
-        if (result.statusCode !== 201 && result.statusCode !== 409) {
-            return exit(util.format('Failed to create app: %s message: %s', result.statusCode, result.text));
-        }
-
-        if (result.statusCode === 201) {
-            console.log('New application added to the appstore with id %s.', manifest.id);
-        }
-
-        callback();
-    });
+async function addApp(manifest, baseDir) {
+    assert.strictEqual(typeof manifest, 'object');
+    assert.strictEqual(typeof baseDir, 'string');
+
+    const request = createRequest('POST', '/api/v1/developers/apps');
+    request.send({ id: manifest.id });
+    const response = await request;
+    if (response.statusCode === 409) return; // already exists
+    if (response.statusCode !== 201) return exit(`Failed to add app: ${requestError(response)}`);
 }
 
 function parseChangelog(file, version) {
-    var changelog = '';
-    var data = safe.fs.readFileSync(file, 'utf8');
+    let changelog = '';
+    const data = safe.fs.readFileSync(file, 'utf8');
     if (!data) return null;
-    var lines = data.split('\n');
+    const lines = data.split('\n');
 
     version = version.replace(/-.*/, ''); // remove any prerelease
 
-    for (var i = 0; i < lines.length; i++) {
+    let i;
+    for (i = 0; i < lines.length; i++) {
         if (lines[i] === '[' + version + ']') break;
     }
 
@@ -213,226 +182,177 @@ function parseChangelog(file, version) {
     return changelog;
 }
 
-function addVersion(manifest, baseDir, callback) {
+async function addVersion(manifest, baseDir) {
     assert.strictEqual(typeof manifest, 'object');
     assert.strictEqual(typeof baseDir, 'string');
 
-    var iconFilePath = null;
+    let iconFilePath = null;
     if (manifest.icon) {
-        var iconFile = manifest.icon; // backward compat
+        let iconFile = manifest.icon; // backward compat
         if (iconFile.slice(0, 7) === 'file://') iconFile = iconFile.slice(7);
 
         iconFilePath = path.isAbsolute(iconFile) ? iconFile : path.join(baseDir, iconFile);
-        if (!fs.existsSync(iconFilePath)) return callback(new Error('icon not found at ' + iconFilePath));
+        if (!fs.existsSync(iconFilePath)) throw new Error('icon not found at ' + iconFilePath);
     }
 
     if (manifest.description.slice(0, 7) === 'file://') {
-        var descriptionFilePath = manifest.description.slice(7);
+        let descriptionFilePath = manifest.description.slice(7);
         descriptionFilePath = path.isAbsolute(descriptionFilePath) ? descriptionFilePath : path.join(baseDir, descriptionFilePath);
         manifest.description = safe.fs.readFileSync(descriptionFilePath, 'utf8');
-        if (!manifest.description && safe.error) return callback(new Error('Could not read/parse description ' + safe.error.message));
-        if (!manifest.description) return callback(new Error('Description cannot be empty'));
+        if (!manifest.description && safe.error) throw(new Error('Could not read/parse description ' + safe.error.message));
+        if (!manifest.description) throw new Error('Description cannot be empty');
     }
 
     if (manifest.postInstallMessage && manifest.postInstallMessage.slice(0, 7) === 'file://') {
-        var postInstallFilePath = manifest.postInstallMessage.slice(7);
+        let postInstallFilePath = manifest.postInstallMessage.slice(7);
         postInstallFilePath = path.isAbsolute(postInstallFilePath) ? postInstallFilePath : path.join(baseDir, postInstallFilePath);
         manifest.postInstallMessage = safe.fs.readFileSync(postInstallFilePath, 'utf8');
-        if (!manifest.postInstallMessage && safe.error) return callback(new Error('Could not read/parse postInstall ' + safe.error.message));
-        if (!manifest.postInstallMessage) return callback(new Error('PostInstall file specified but it is empty'));
+        if (!manifest.postInstallMessage && safe.error) throw(new Error('Could not read/parse postInstall ' + safe.error.message));
+        if (!manifest.postInstallMessage) throw new Error('PostInstall file specified but it is empty');
     }
 
     if (manifest.changelog.slice(0, 7) === 'file://') {
-        var changelogPath = manifest.changelog.slice(7);
+        let changelogPath = manifest.changelog.slice(7);
         changelogPath = path.isAbsolute(changelogPath) ? changelogPath : path.join(baseDir, changelogPath);
         manifest.changelog = parseChangelog(changelogPath, manifest.version);
-        if (!manifest.changelog) return callback(new Error('Bad changelog format or missing changelog for this version'));
+        if (!manifest.changelog) throw new Error('Bad changelog format or missing changelog for this version');
     }
 
-    superagentEnd(function () {
-        var req = superagent.post(createUrl('/api/v1/developers/apps/' + manifest.id + '/versions'));
-        req.query({ accessToken: config.appStoreToken() });
-        if (iconFilePath) req.attach('icon', iconFilePath);
-        req.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
-        return req;
-    }, function (error, result) {
-        if (error && !error.response) return callback(new Error(util.format('Failed to publish version: %s', error.message)));
-        if (result.statusCode === 409) return callback('This version already exists. Use --force to overwrite.');
-        if (result.statusCode !== 204) return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text)));
-
-        callback();
-    });
+    const request = createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions`);
+    if (iconFilePath) request.attach('icon', iconFilePath);
+    request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
+    const response = await request;
+    if (response.statusCode === 409) throw new Error('This version already exists. Use --force to overwrite.');
+    if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
-function updateVersion(manifest, baseDir, callback) {
+async function updateVersion(manifest, baseDir) {
     assert.strictEqual(typeof manifest, 'object');
     assert.strictEqual(typeof baseDir, 'string');
 
-    var iconFilePath = null;
+    let iconFilePath = null;
     if (manifest.icon) {
-        var iconFile = manifest.icon; // backward compat
+        let iconFile = manifest.icon; // backward compat
         if (iconFile.slice(0, 7) === 'file://') iconFile = iconFile.slice(7);
 
         iconFilePath = path.isAbsolute(iconFile) ? iconFile : path.join(baseDir, iconFile);
-        if (!fs.existsSync(iconFilePath)) return callback(new Error('icon not found at ' + iconFilePath));
+        if (!fs.existsSync(iconFilePath)) throw new Error('icon not found at ' + iconFilePath);
     }
 
     if (manifest.description.slice(0, 7) === 'file://') {
-        var descriptionFilePath = manifest.description.slice(7);
+        let descriptionFilePath = manifest.description.slice(7);
         descriptionFilePath = path.isAbsolute(descriptionFilePath) ? descriptionFilePath : path.join(baseDir, descriptionFilePath);
         manifest.description = safe.fs.readFileSync(descriptionFilePath, 'utf8');
-        if (!manifest.description) return callback(new Error('Could not read description ' + safe.error.message));
+        if (!manifest.description) throw new Error('Could not read description ' + safe.error.message);
     }
 
     if (manifest.postInstallMessage && manifest.postInstallMessage.slice(0, 7) === 'file://') {
-        var postInstallFilePath = manifest.postInstallMessage.slice(7);
+        let postInstallFilePath = manifest.postInstallMessage.slice(7);
         postInstallFilePath = path.isAbsolute(postInstallFilePath) ? postInstallFilePath : path.join(baseDir, postInstallFilePath);
         manifest.postInstallMessage = safe.fs.readFileSync(postInstallFilePath, 'utf8');
-        if (!manifest.postInstallMessage) return callback(new Error('Could not read/parse postInstall ' + safe.error.message));
+        if (!manifest.postInstallMessage) throw new Error('Could not read/parse postInstall ' + safe.error.message);
     }
 
     if (manifest.changelog.slice(0, 7) === 'file://') {
-        var changelogPath = manifest.changelog.slice(7);
+        let changelogPath = manifest.changelog.slice(7);
         changelogPath = path.isAbsolute(changelogPath) ? changelogPath : path.join(baseDir, changelogPath);
         manifest.changelog = parseChangelog(changelogPath, manifest.version);
-        if (!manifest.changelog) return callback(new Error('Could not read changelog or missing version changes'));
+        if (!manifest.changelog) throw new Error('Could not read changelog or missing version changes');
     }
 
-    superagentEnd(function () {
-        var req = superagent.put(createUrl('/api/v1/developers/apps/' + manifest.id + '/versions/' + manifest.version));
-        req.query({ accessToken: config.appStoreToken() });
-        if (iconFilePath) req.attach('icon', iconFilePath);
-        req.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
-        return req;
-    }, function (error, result) {
-        if (error && !error.response) return callback(new Error(util.format('Failed to publish version: %s', error.message)));
-        if (result.statusCode !== 204) {
-            return callback(new Error(util.format('Failed to publish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text)));
-        }
-
-        callback();
-    });
+    const request = createRequest('PUT', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}`);
+    if (iconFilePath) request.attach('icon', iconFilePath);
+    request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
+    const response = await request;
+    if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
-function delVersion(manifest, force) {
-    assert(typeof manifest === 'object');
-    assert(typeof force === 'boolean');
+async function delVersion(manifest, force) {
+    assert.strictEqual(typeof manifest, 'object');
+    assert.strictEqual(typeof force, 'boolean');
 
     if (!force) {
-        console.log('This will delete the version %s of app %s from the appstore!', manifest.version, manifest.id);
-        var reallyDelete = readlineSync.question(util.format('Really do this? [y/N]: '), {});
+        console.log(`This will delete the version ${manifest.version} of app ${manifest.id} from the appstore!`);
+        const reallyDelete = readlineSync.question('Really do this? [y/N]: ', {});
         if (reallyDelete.toUpperCase() !== 'Y') exit();
     }
 
-    superagentEnd(function () {
-        return superagent.del(createUrl('/api/v1/developers/apps/' + manifest.id + '/versions/' + manifest.version)).query({ accessToken: config.appStoreToken() });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to unpublish version: %s', error.message));
-        if (result.statusCode !== 204) exit(util.format('Failed to unpublish version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
+    const response = await createRequest('DEL', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}`);
+    if (response.statusCode !== 204) return exit(`Failed to unpublish version: ${requestError(response)}`);
 
-        console.log('version unpublished.');
-    });
+    console.log('version unpublished.');
 }
 
-function revokeVersion(appstoreId, version) {
+async function revokeVersion(appstoreId, version) {
     assert.strictEqual(typeof appstoreId, 'string');
     assert.strictEqual(typeof version, 'string');
 
-    superagentEnd(function () {
-        return superagent.post(createUrl('/api/v1/developers/apps/' + appstoreId + '/versions/' + version + '/revoke'))
-            .query({ accessToken: config.appStoreToken() })
-            .send({ });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to revoke version: %s', error.message));
-        if (result.statusCode !== 200) exit(util.format('Failed to revoke version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
+    const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/revoke`);
+    if (response.statusCode !== 200) return exit(`Failed to revoke version: ${requestError(response)}`);
 
-        console.log('version revoked.');
-    });
+    console.log('version revoked.');
 }
 
-function approveVersion(appstoreId, version) {
+async function approveVersion(appstoreId, version) {
     assert.strictEqual(typeof appstoreId, 'string');
     assert.strictEqual(typeof version, 'string');
 
-    superagentEnd(function () {
-        return superagent.post(createUrl('/api/v1/developers/apps/' + appstoreId + '/versions/' + version + '/approve'))
-            .query({ accessToken: config.appStoreToken() })
-            .send({ });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to approve version: %s', error.message));
-        if (result.statusCode !== 200) exit(util.format('Failed to approve version (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
-
-        console.log('Approved.');
-        console.log('');
-
-        superagentEnd(function () {
-            return superagent.get(createUrl('/api/v1/developers/apps/' + appstoreId + '/versions/' + version)).query({ accessToken: config.appStoreToken() });
-        }, function (error, result) {
-            if (error && !error.response) exit(util.format('Failed to list apps: %s', error.message));
-            if (result.statusCode !== 200) exit(util.format('Failed to list apps: %s message: %s', result.statusCode, result.text));
-
-            console.log('Changelog for forum update: ' + result.body.manifest.forumUrl);
-            console.log('');
-            console.log('[' + version + ']');
-            console.log(result.body.manifest.changelog);
-            console.log('');
-        });
-    });
-}
+    const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`);
+    if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
+
+    console.log('Approved.');
+    console.log('');
 
+    const response2 = await createRequest('GET', `/api/v1/developers/apps/${appstoreId}/versions/${version}`);
+    if (response2.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
-function delApp(appId, force) {
-    assert(typeof appId === 'string');
-    assert(typeof force === 'boolean');
+    console.log('Changelog for forum update: ' + response2.body.manifest.forumUrl);
+    console.log('');
+    console.log('[' + version + ']');
+    console.log(response2.body.manifest.changelog);
+    console.log('');
+}
+
+async function delApp(appId, force) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof force, 'boolean');
 
     if (!force) {
         console.log('This will delete app %s from the appstore!', appId);
-        var reallyDelete = readlineSync.question(util.format('Really do this? [y/N]: '), {});
-        if (reallyDelete.toUpperCase() !== 'Y') exit();
+        const reallyDelete = readlineSync.question('Really do this? [y/N]: ', {});
+        if (reallyDelete.toUpperCase() !== 'Y') return exit();
     }
 
-    superagentEnd(function () {
-        return superagent.del(createUrl('/api/v1/developers/apps/' + appId)).query({ accessToken: config.appStoreToken() });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to unpublish app: %s', error.message));
-        if (result.statusCode !== 204) exit(util.format('Failed to unpublish app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
+    const response = await createRequest('DEL', `/api/v1/developers/apps/${appId}`);
+    if (response.statusCode !== 204) exit(`Failed to unpublish app : ${requestError(response)}`);
 
-        console.log('App unpublished.');
-    });
+    console.log('App unpublished.');
 }
 
-function submitAppForReview(manifest, callback) {
-    assert(typeof manifest === 'object');
-    assert(typeof callback === 'function');
-
-    superagentEnd(function () {
-        return superagent.post(createUrl('/api/v1/developers/apps/' + manifest.id + '/versions/' + manifest.version + '/submit'))
-            .query({ accessToken: config.appStoreToken() })
-            .send({ });
-    }, function (error, result) {
-        if (error && !error.response) exit(util.format('Failed to submit app for review: %s', error.message));
-        if (result.statusCode === 404) {
-            console.log('No version %s found. Please use %s first.', manifest.version, 'cloudron appstore upload');
-            exit('Failed to submit app for review.');
-        }
-        if (result.statusCode !== 200) return exit(util.format('Failed to submit app (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
-
-        console.log('App submitted for review.');
-        console.log('You will receive an email when approved.');
-
-        callback();
-    });
+async function submitAppForReview(manifest) {
+    assert.strictEqual(typeof manifest, 'object');
+
+    const response = await createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}/submit`);
+    if (response.statusCode === 404) {
+        console.log(`No version ${manifest.version} found. Please use 'cloudron apsptore upload' first`);
+        return exit('Failed to submit app for review.');
+    }
+
+    if (response.statusCode !== 200) return exit(`Failed to submit app: ${requestError(response)}`);
+
+    console.log('App submitted for review.');
+    console.log('You will receive an email when approved.');
 }
 
-function upload(options) {
+async function upload(options) {
     // try to find the manifest of this project
-    var manifestFilePath = locateManifest();
+    const manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit(NO_MANIFEST_FOUND_ERROR_STRING);
 
-    var result = manifestFormat.parseFile(manifestFilePath);
+    const result = manifestFormat.parseFile(manifestFilePath);
     if (result.error) return exit(result.error.message);
 
-    let manifest = result.manifest;
+    const manifest = result.manifest;
 
     const sourceDir = path.dirname(manifestFilePath);
     const appConfig = config.getAppConfig(sourceDir);
@@ -446,19 +366,16 @@ function upload(options) {
     // ensure we remove the docker hub handle
     if (manifest.dockerImage.indexOf('docker.io/') === 0) manifest.dockerImage = manifest.dockerImage.slice('docker.io/'.length);
 
-    var error = manifestFormat.checkAppstoreRequirements(manifest);
+    const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
 
     // ensure the app is known on the appstore side
-    addApp(manifest, path.dirname(manifestFilePath), function () {
-        console.log(`Uploading ${manifest.id}@${manifest.version} (dockerImage: ${manifest.dockerImage}) for testing`);
-
-        var func = options.force ? updateVersion : addVersion;
+    const baseDir = path.dirname(manifestFilePath);
+    await addApp(manifest, baseDir);
+    console.log(`Uploading ${manifest.id}@${manifest.version} (dockerImage: ${manifest.dockerImage}) for testing`);
 
-        func(manifest, path.dirname(manifestFilePath), function (error) {
-            if (error) return exit(error);
-        });
-    });
+    const [error2] = await safe(options.force ? updateVersion(manifest, baseDir) : addVersion(manifest, baseDir));
+    if (error2) return exit(error2);
 }
 
 function submit() {
@@ -474,69 +391,55 @@ function submit() {
     submitAppForReview(manifest, exit);
 }
 
-function unpublish(options) {
-    getAppstoreId(options.appstoreId, function (error, id, version) {
-        if (error) exit(error);
+async function unpublish(options) {
+    const [id, version] = await getAppstoreId(options.appstoreId);
 
-        if (!version) {
-            console.log('Unpublishing ' + options.app);
-            delApp(options.app, !!options.force);
-            return;
-        }
+    if (!version) {
+        console.log(`Unpublishing ${options.appstoreId}`);
+        await delApp(options.app, !!options.force);
+        return;
+    }
 
-        console.log('Unpublishing ' + id + '@' + version);
-        delVersion(id, !!options.force);
-    });
+    console.log(`Unpublishing ${id}@${version}`);
+    await delVersion(id, !!options.force);
 }
 
-function revoke(options) {
-    getAppstoreId(options.appstoreId, function (error, id, version) {
-        if (error) return exit(error);
-
-        if (!version) return exit('--appstore-id must be of the format id@version');
+async function revoke(options) {
+    const [id, version] = await getAppstoreId(options.appstoreId);
+    if (!version) return exit('--appstore-id must be of the format id@version');
 
-        console.log('Revoking ' + id + '@' + version);
-        revokeVersion(id, version);
-    });
+    console.log(`Revoking ${id}@${version}`);
+    await revokeVersion(id, version);
 }
 
-function approve(options) {
-    getAppstoreId(options.appstoreId, function (error, id, version) {
-        if (error) return exit(error);
+async function approve(options) {
+    const [id, version] = await getAppstoreId(options.appstoreId);
 
-        if (!version) return exit('--appstore-id must be of the format id@version');
+    if (!version) return exit('--appstore-id must be of the format id@version');
 
-        console.log('Approving ' + id + '@' + version);
+    console.log(`Approving ${id}@${version}`);
 
-        approveVersion(id, version);
-    });
+    await approveVersion(id, version);
 }
 
 // TODO currently no pagination, only needed once we have users with more than 100 apps
-function listPublishedApps(options) {
-    superagentEnd(function () {
-        return superagent.get(createUrl('/api/v1/developers/apps?per_page=100'))
-            .query({ accessToken: config.appStoreToken() })
-            .send({ });
-    }, function (error, result) {
-        if (error && !error.response) return exit(util.format('Failed to get list of published apps: %s', error.message));
-        if (result.statusCode !== 200) return exit(util.format('Failed to get list of published apps (statusCode %s): \n%s', result.statusCode, result.body && result.body.message ? result.body.message : result.text));
-
-        if (result.body.apps.length === 0) return console.log('No apps published.');
-
-        var t = new Table();
-
-        result.body.apps.forEach(function (app) {
-            t.cell('Id', app.id);
-            t.cell('Title', app.manifest.title);
-            t.cell('Latest Version', app.manifest.version);
-            t.cell('Publish State', app.publishState);
-            t.cell('Creation Date', new Date(app.creationDate));
-            if (options.image) t.cell('Image', app.manifest.dockerImage);
-            t.newRow();
-        });
-
-        console.log();
-        console.log(t.toString());
+async function listPublishedApps(options) {
+    const response = await createRequest('GET', '/api/v1/developers/apps?per_page=100');
+    if (response.statusCode !== 200) return exit(`Failed to get list of published apps: ${requestError(response)}`);
+    if (response.body.apps.length === 0) return console.log('No apps published.');
+
+    const t = new Table();
+
+    response.body.apps.forEach(function (app) {
+        t.cell('Id', app.id);
+        t.cell('Title', app.manifest.title);
+        t.cell('Latest Version', app.manifest.version);
+        t.cell('Publish State', app.publishState);
+        t.cell('Creation Date', new Date(app.creationDate));
+        if (options.image) t.cell('Image', app.manifest.dockerImage);
+        t.newRow();
     });
+
+    console.log();
+    console.log(t.toString());
 }

package/src/build-actions.js

@@ -323,7 +323,7 @@ function build(options) {
             url = readlineSync.question('Enter build service URL: ', { });
         }
 
-        if (!url.startsWith('https://')) url = `https://${url}`;
+        if (url.indexOf('://') === -1) url = `https://${url}`;
         buildService.url = url;
     }