cloudron 5.11.4 → 5.11.6

package/bin/cloudron

@@ -32,7 +32,6 @@ program.option('--server <server>', 'Cloudron domain')
 
 // these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
-program.command('repo', 'Cloudron repo commands');
 program.command('build', 'Cloudron build commands');
 
 const backupCommand = program.command('backup')

package/bin/cloudron-appstore

@@ -22,16 +22,15 @@ program.command('info')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
     .action(appstoreActions.info);
 
-program.command('published')
-    .description('List published apps from this account')
-    .option('-i --image', 'Display docker image')
-    .action(appstoreActions.listPublishedApps);
-
 program.command('approve')
     .description('Approve a submitted app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
     .action(appstoreActions.approve);
 
+program.command('publish <version>')
+    .description('Tag the repo and publish')
+    .action(appstoreActions.publish);
+
 program.command('revoke')
     .description('Revoke a published app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
@@ -41,12 +40,6 @@ program.command('submit')
     .description('Submit app to the store for review')
     .action(appstoreActions.submit);
 
-program.command('unpublish')
-    .description('Delete app or app version from the store')
-    .option('--appstore-id <id@[version]>', 'Unpublish app')
-    .option('-f, --force', 'Do not ask anything')
-    .action(appstoreActions.unpublish);
-
 program.command('upload')
     .description('Upload app to the store for testing')
     .option('-i, --image <image>', 'Docker image')

package/bin/cloudron-build

@@ -14,8 +14,8 @@ function collectArgs(value, collected) {
 
 // global options
 program.option('--server <server>', 'Cloudron domain')
-    .option('--build-service-token <token>', 'Build service token')
-    .option('--build-service, --set-build-service [buildservice url]', 'Set build service app URL. This build service is automatically used for future calls from this project');
+    .option('--token, --build-service-token <token>', 'Build service token')
+    .option('--url, --set-build-service [buildservice url]', 'Set build service URL. This build service is automatically used for future calls from this project');
 
 program.command('build', { isDefault: true })
     .description('Build an app. This is the default subcommand')
@@ -31,8 +31,7 @@ program.command('build', { isDefault: true })
 
 program.command('login')
     .description('Login to the build service')
-    .option('-u, --username <username>', 'Username')
-    .option('-p, --password <password>', 'Password (unsafe)')
+    .option('-t, --token <token>', 'Build service token')
     .action(buildActions.login);
 
 program.command('logs')

package/package.json

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

package/src/appstore-actions.js

@@ -4,12 +4,14 @@
 
 const assert = require('assert'),
     config = require('./config.js'),
+    execSync = require('child_process').execSync,
     fs = require('fs'),
     { exit, locateManifest } = require('./helper.js'),
     manifestFormat = require('cloudron-manifestformat'),
     path = require('path'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
+    semver = require('semver'),
     superagent = require('superagent'),
     Table = require('easy-table');
 
@@ -22,8 +24,8 @@ exports = module.exports = {
     upload,
     revoke,
     approve,
-    unpublish,
-    listPublishedApps
+
+    publish
 };
 
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
@@ -267,22 +269,6 @@ async function updateVersion(manifest, baseDir) {
     if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
-async function delVersion(manifest, force) {
-    assert.strictEqual(typeof manifest, 'object');
-    assert.strictEqual(typeof force, 'boolean');
-
-    if (!force) {
-        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();
-    }
-
-    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.');
-}
-
 async function revokeVersion(appstoreId, version) {
     assert.strictEqual(typeof appstoreId, 'string');
     assert.strictEqual(typeof version, 'string');
@@ -313,22 +299,6 @@ async function approveVersion(appstoreId, version) {
     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);
-        const reallyDelete = readlineSync.question('Really do this? [y/N]: ', {});
-        if (reallyDelete.toUpperCase() !== 'Y') return exit();
-    }
-
-    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.');
-}
-
 async function submitAppForReview(manifest) {
     assert.strictEqual(typeof manifest, 'object');
 
@@ -380,30 +350,17 @@ async function upload(options) {
 
 function submit() {
     // 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);
 
-    var manifest = result.manifest;
+    const manifest = result.manifest;
 
     submitAppForReview(manifest, exit);
 }
 
-async function unpublish(options) {
-    const [id, version] = await getAppstoreId(options.appstoreId);
-
-    if (!version) {
-        console.log(`Unpublishing ${options.appstoreId}`);
-        await delApp(options.app, !!options.force);
-        return;
-    }
-
-    console.log(`Unpublishing ${id}@${version}`);
-    await delVersion(id, !!options.force);
-}
-
 async function revoke(options) {
     const [id, version] = await getAppstoreId(options.appstoreId);
     if (!version) return exit('--appstore-id must be of the format id@version');
@@ -422,24 +379,84 @@ async function approve(options) {
     await approveVersion(id, version);
 }
 
-// TODO currently no pagination, only needed once we have users with more than 100 apps
-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.');
+async function tagRepository(version) {
+    const basename = `${path.basename(process.cwd())}`;
+    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
 
-    const t = new Table();
+    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
 
-    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();
-    });
+    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
+    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
 
-    console.log();
-    console.log(t.toString());
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
+
+    const result = manifestFormat.parseFile(manifestFilePath);
+    if (result.error) throw new Error(`Invalid CloudronManifest.json: ${result.error.message}`);
+    const { manifest } = result;
+
+    const latestVersion = latestTag.match(/v(.*)/)[1];
+
+    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
+    if (semver.inc(latestVersion, 'major') !== version
+        && semver.inc(latestVersion, 'minor') !== version
+        && semver.inc(latestVersion, 'patch') !== version) {
+            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
+    }
+
+    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
+    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
+
+    const [ , , commitMessage ] = latestRenovateCommit.split(',');
+    const repoDir = path.dirname(manifestFilePath);
+    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
+
+    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
+    const rawChangelog = fs.readFileSync(0, 'utf-8');
+    const mdChangelog = rawChangelog.split('\n').map(line => {
+        line = line.trim();
+        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
+        line = line.replace(/^\* /, ''); // replace any "* " in the front
+        return line ? `* ${line}` : '';
+    }).join('\n');
+    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
+    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
+    fs.appendFileSync(changelogFile, newChangelog);
+
+    manifest.version = version;
+    manifest.upstreamVersion = upstreamVersion;
+    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
+
+    // git branch --show-current does not work in CI :/
+    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
+    if (safe.error) return exit('Could not determine branch name');
+    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
+
+    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
+    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
+    console.log(`git push --atomic origin ${branch} v${version}`);
+    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
+    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
+
+    console.log(`Created tag v${version} and pushed branch ${branch}`);
+}
+
+async function publish(version, options) {
+    await tagRepository(version);
+
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
+
+    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
+    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
+
+    const [ abbrevHash, commitDate ] = latestRenovateCommit.split(',');
+    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
+    const repoDir = path.dirname(manifestFilePath);
+    const repoName = path.basename(repoDir).replace('-app', '');
+    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
+
+    await upload({ image: dockerImage, force: false });
+    await submit();
+    await approve();
 }

package/src/build-actions.js

@@ -33,25 +33,50 @@ function requestError(response) {
     return `${response.statusCode} message: ${response.body?.message || null}`;
 }
 
+// analyzes options and merges with any existing build service config
+function getBuildServiceConfig(options) {
+    const buildService = config.getBuildServiceConfig();
+    if (!buildService.type) buildService.type = 'local'; // default
+
+    if (options.local) {
+        buildService.type = 'local';
+    } else if (options.setBuildService) { // stash for future use
+        buildService.token = null;
+        buildService.url = null;
+        buildService.type = 'remote';
+
+        let url;
+        if (typeof options.setBuildService === 'string') {
+            url = options.setBuildService;
+        } else {
+            url = readlineSync.question('Enter build service URL: ', { });
+        }
+
+        if (url.indexOf('://') === -1) url = `https://${url}`;
+        buildService.url = url;
+    }
+
+    if (options.buildServiceToken) buildService.token = options.buildServiceToken;
+
+    config.setBuildServiceConfig(buildService);
+
+    return buildService;
+}
+
 async function login(options) {
     assert.strictEqual(typeof options, 'object');
 
-    const buildServiceConfig = config.getBuildServiceConfig();
-
-    if (!options.hideBanner) console.log('Build Service login' + ` (${buildServiceConfig.url}):`);
+    const buildServiceConfig = getBuildServiceConfig(options);
 
-    const username = options.username || readlineSync.question('Username: ', {});
-    const password = options.password || readlineSync.question('Password: ', { noEchoBack: true });
+    console.log('Build Service login' + ` (${buildServiceConfig.url}):`);
 
-    // reset token
-    buildServiceConfig.token = null;
-    config.setBuildServiceConfig(buildServiceConfig);
+    const token = options.buildServiceToken || readlineSync.question('Token: ', {});
 
-    const response = await superagent.post(`${buildServiceConfig.url}/api/v1/login`).send({ username: username, password: password }).ok(() => true);
-    if (response.statusCode === 401 || response.statusCode === 403) return exit(`Authentication error: ${requestError(response)}}`);
-    if (response.statusCode !== 200 && response.statusCode !== 201) return exit(`Unexpected response: ${requestError(response)}`);
+    const response = await superagent.get(`${buildServiceConfig.url}/api/v1/profile`).query({ accessToken: token }).ok(() => true);
+    if (response.statusCode === 401 || response.statusCode === 403) return exit(`Authentication error: ${requestError(response)}`);
+    if (response.statusCode !== 200) return exit(`Unexpected response: ${requestError(response)}`);
 
-    buildServiceConfig.token = response.body.accessToken;
+    buildServiceConfig.token = token;
     config.setBuildServiceConfig(buildServiceConfig);
 
     console.log('Login successful.');
@@ -276,7 +301,9 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
     exit();
 }
 
-async function build(options) {
+async function build(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     // try to find the manifest of this project
     const manifestFilePath = helper.locateManifest();
     if (!manifestFilePath) return exit('No CloudronManifest.json found');
@@ -288,31 +315,7 @@ async function build(options) {
     const sourceDir = path.dirname(manifestFilePath);
 
     const appConfig = config.getAppConfig(sourceDir);
-
-    const buildService = config.getBuildServiceConfig();
-    if (!buildService.type) buildService.type = 'local'; // default
-
-    if (options.local) {
-        buildService.type = 'local';
-    } else if (options.setBuildService) {
-        buildService.token = null;
-        buildService.url = null;
-        buildService.type = 'remote';
-
-        let url;
-        if (typeof options.setBuildService === 'string') {
-            url = options.setBuildService;
-        } else {
-            url = readlineSync.question('Enter build service URL: ', { });
-        }
-
-        if (url.indexOf('://') === -1) url = `https://${url}`;
-        buildService.url = url;
-    }
-
-    if (options.buildServiceToken) buildService.token = options.buildServiceToken;
-
-    config.setBuildServiceConfig(buildService);
+    const buildServiceConfig = getBuildServiceConfig(options);
 
     let repository = appConfig.repository;
     if (!repository || options.setRepository) {
@@ -328,23 +331,27 @@ async function build(options) {
         config.setAppConfig(sourceDir, appConfig);
     }
 
-    if (buildService.type === 'local') {
+    if (buildServiceConfig.type === 'local') {
         await buildLocal(manifest, sourceDir, appConfig, options);
-    } else if (buildService.type === 'remote' && buildService.url) {
+    } else if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
         await buildRemote(manifest, sourceDir, appConfig, options);
     } else {
         exit('Unknown build service type or missing build service url. Rerun with --reset-build-service');
     }
 }
 
-async function logs(options) {
+async function logs(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
 
     const [logsError] = await safe(followBuildLog(options.id, !!options.raw));
     if (logsError) console.log(`Failed to get logs: ${logsError.message}`);
 }
 
-async function status(options) {
+async function status(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
 
     const [statusError, status] = await safe(getStatus(options.id));
@@ -352,12 +359,14 @@ async function status(options) {
     console.log(status);
 }
 
-async function push(options) {
+async function push(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     if (!options.id) return exit('buildId is required');
     if (!options.repository) return exit('repository is required');
     if (!options.tag) return exit('tag is required');
 
-    const buildServiceConfig = config.getBuildServiceConfig();
+    const buildServiceConfig = getBuildServiceConfig(options);
 
     const response = await superagent.post(`${buildServiceConfig.url}/api/v1/builds/${options.id}/push`)
         .query({ accessToken: buildServiceConfig.token })

package/bin/cloudron-repo

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const { program } = require('commander'),
-    repoActions = require('../src/repo-actions.js');
-
-program.version(require('../package.json').version);
-
-program.command('tag <version>')
-    .description('Creates a new release with given tag')
-    .action(repoActions.tag);
-
-program.command('publish')
-    .description('Publish to appstore')
-    .action(repoActions.publish);
-
-program.parse(process.argv);

package/src/repo-actions.js

@@ -1,102 +0,0 @@
-/* jshint node:true */
-
-'use strict';
-
-const { exit, locateManifest } = require('./helper.js'),
-    execSync = require('child_process').execSync,
-    fs = require('fs'),
-    manifestFormat = require('cloudron-manifestformat'),
-    path = require('path'),
-    safe = require('safetydance'),
-    semver = require('semver');
-
-exports = module.exports = {
-    tag,
-    publish
-};
-
-async function tag(version, options) {
-    const basename = `${path.basename(process.cwd())}`;
-    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
-
-    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
-
-    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
-    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
-
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
-
-    const latestVersion = latestTag.match(/v(.*)/)[1];
-
-    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
-    if (semver.inc(latestVersion, 'major') !== version
-        && semver.inc(latestVersion, 'minor') !== version
-        && semver.inc(latestVersion, 'patch') !== version) {
-            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
-    }
-
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ abbrevHash, commitDate, commitMessage ] = latestRenovateCommit.split(',');
-    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
-    const repoDir = path.dirname(manifestFilePath);
-    const repoName = path.basename(repoDir).replace('-app', '');
-    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
-    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
-
-    const result = manifestFormat.parseFile(manifestFilePath);
-    if (result.error) throw new Error(`Invalid CloudronManifest.json: ${result.error.message}`);
-    const { manifest } = result;
-
-    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
-    const rawChangelog = fs.readFileSync(0, 'utf-8');
-    const mdChangelog = rawChangelog.split('\n').map(line => {
-        line = line.trim();
-        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
-        line = line.replace(/^\* /, ''); // replace any "* " in the front
-        return line ? `* ${line}` : '';
-    }).join('\n');
-    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
-    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
-    fs.appendFileSync(changelogFile, newChangelog);
-
-    manifest.version = version;
-    manifest.upstreamVersion = upstreamVersion;
-    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
-
-    // git branch --show-current does not work in CI :/
-    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
-    if (safe.error) return exit('Could not determine branch name');
-    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
-
-    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    console.log(`git push --atomic origin ${branch} v${version}`);
-    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
-    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
-
-    console.log(`Created tag v${version} and pushed branch ${branch}`);
-}
-
-async function publish(options) {
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
-
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ abbrevHash, commitDate ] = latestRenovateCommit.split(',');
-    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
-    const repoDir = path.dirname(manifestFilePath);
-    const repoName = path.basename(repoDir).replace('-app', '');
-    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
-
-    safe.child_process.execSync(`cloudron appstore upload --image ${dockerImage}`);
-    if (safe.error) return exit(`Failed to publish image to appstore: ${safe.error.message}`);
-    execSync(`cloudron appstore submit`);
-    execSync(`cloudron appstore approve`);
-
-    console.log('Published to appstore');
-}