cloudron 6.0.0 → 7.0.1

package/CHANGELOG.md

@@ -45,3 +45,7 @@
 [5.16.1]
 * Remove the update checker
 
+[6.0.0]
+* Various changes to accomodate Cloudron 9 release API changes
+* add --siteId to cloudron backup to specify site id explicitly
+

package/bin/cloudron

@@ -1,38 +1,32 @@
 #!/usr/bin/env node
 
-'use strict';
-
-const actions = require('../src/actions.js'),
-    backupTools = require('../src/backup-tools.js'),
-    buildActions = require('../src/build-actions.js'),
-    completion = require('../src/completion.js'),
-    config = require('../src/config.js'),
-    Command = require('commander').Command,
-    safe = require('safetydance'),
-    semver = require('semver'),
-    superagent = require('@cloudron/superagent'),
-    util = require('util');
-
-const version = require('../package.json').version;
+import actions from '../src/actions.js';
+import backupTools from '../src/backup-tools.js';
+import completion from '../src/completion.js';
+import { Command } from 'commander';
+import semver from 'semver';
+import pkg from '../package.json' with { type: 'json' };
 
 // ensure node version
-if (!semver.satisfies(process.version, require('../package.json').engines.node)) {
-    console.error('Your nodejs version is not compatible. Please install nodejs', require('../package.json').engines.node);
+if (!semver.satisfies(process.version, pkg.engines.node)) {
+    console.error('Your nodejs version is not compatible. Please install nodejs', pkg.engines.node);
     process.exit(1);
 }
 
 const program = new Command();
-program.version(version);
+program.version(pkg.version);
 
 // global options
 program.option('--server <server>', 'Cloudron domain')
     .option('--token <token>', 'Cloudron token')
     .option('--allow-selfsigned', 'Accept self signed SSL certificate')
-    .option('--accept-selfsigned', 'Accept self signed SSL certificate');
+    .option('--accept-selfsigned', 'Accept self signed SSL certificate')
+    .option('--no-wait', 'Do not wait for the operation to finish');
 
 // these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
 program.command('build', 'Cloudron build commands');
+program.command('versions', 'Cloudron versions commands');
 
 const backupCommand = program.command('backup')
     .description('App backup commands');
@@ -57,7 +51,7 @@ backupCommand.command('decrypt <infile> <outfile>')
 backupCommand.command('decrypt-dir <indir> <outdir>')
     .description('Decrypt an encrypted directory')
     .option('--password <password>', 'password')
-    .option('--no-decrypt-filenames', 'Decrypt filenames [false]')
+    .option('--no-decrypt-filenames', 'Do not decrypt filenames')
     .action(backupTools.decryptDir);
 
 backupCommand.command('decrypt-filename <path>')
@@ -165,7 +159,6 @@ program.command('init')
 program.command('install')
     .description('Install or update app')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query/Set port bindings')
     .option('-l, --location <domain>', 'Subdomain or full domain')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Set secondary domains')
@@ -186,8 +179,8 @@ program.command('list')
 
 program.command('login [cloudron]')
     .description('Login to cloudron')
-    .option('-u, --username <username>', 'Username')
-    .option('-p, --password <password>', 'Password')
+    .option('-u, --username <username>', 'Username [will be removed after Cloudron 9.1]')
+    .option('-p, --password <password>', 'Password [will be removed after Cloudron 9.1]')
     .action(actions.login);
 
 program.command('logout')
@@ -233,26 +226,22 @@ program.command('repair')
     .description('Repair an installed application (re-configure)')
     .option('--app <id/location>', 'App id or location')
     .option('--image <docker image>', 'Docker image')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.repair);
 
 program.command('restore')
     .description('Restore app from known backup')
     .option('--app <id/location>', 'App id or location')
     .option('--backup <backup>', 'Backup id')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restore);
 
 program.command('restart')
     .description('Restart an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.restart);
 
 program.command('set-location')
     .description('Set the location of an app')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('-p, --port-bindings [PORT=port,...]', 'Query port bindings')
     .option('-l, --location <location>', 'Location')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Query/Set secondary domains')
@@ -263,7 +252,6 @@ program.command('set-location')
 program.command('start')
     .description('Start an installed application')
     .option('--app <id/location>', 'App id or location')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .action(actions.start);
 
 program.command('stop')
@@ -287,9 +275,7 @@ program.command('update')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--image <docker image>', 'Docker image')
     .option('--no-backup', 'Skip backup [false]')
-    .option('--no-wait', 'Wait for healthcheck to succeed [false]')
     .option('--no-force', 'Match appstore id and manifest id before updating', true)
     .action(actions.update);
 
 program.parse(process.argv);
-

package/bin/cloudron-appstore

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 
-'use strict';
-
-const appstoreActions = require('../src/appstore-actions.js'),
-    Command = require('commander').Command;
-
-const version = require('../package.json').version;
+import appstoreActions from '../src/appstore-actions.js';
+import { Command } from 'commander';
+import pkg from '../package.json' with { type: 'json' };
 
 const program = new Command();
-program.version(version);
+program.version(pkg.packageVersion);
 
 // global options. IMPORTANT: These cannot conflict with global options!
 program

package/bin/cloudron-build

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 
-'use strict';
+import { program } from 'commander';
+import buildActions from '../src/build-actions.js';
+import pkg from '../package.json' with { type: 'json' };
 
-const { program } = require('commander'),
-    buildActions = require('../src/build-actions.js');
-
-program.version(require('../package.json').version);
+program.version(pkg.version);
 
 program.addHelpText('after', `
 
@@ -20,25 +19,36 @@ function collectArgs(value, collected) {
 
 // global options. IMPORTANT: These cannot conflict with global options!
 program.option('--server <server>', 'Cloudron domain')
-    .option('--build-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');
+    .option('--build-service-url <url>', 'Build service URL')
+    .option('--build-service-token <token>', 'Build service token');
 
 program.command('build', { isDefault: true })
     .description('Build an app. This is the default subcommand')
     .option('--build-arg <namevalue>', 'Build arg passed to docker. Can be used multiple times', collectArgs, [])
     .option('-f, --file <dockerfile>', 'Name of the Dockerfile')
     .option('--set-repository [repository url]', 'Change the repository. This url is stored for future builds for this project. e.g registry/username/projectname')
-    .option('--local', 'Build docker images locally')
     .option('--no-cache', 'Do not use cache')
     .option('--no-push', 'Do not push built image to registry')
     .option('--raw', 'Raw output build log')
     .option('--tag <docker image tag>', 'Docker image tag. Note that this does not include the repository name')
     .action(buildActions.build);
 
+program.command('clear')
+    .description('Clears build information')
+    .action(buildActions.clear);
+
+program.command('info')
+    .description('Print build information')
+    .action(buildActions.info);
+
 program.command('login')
     .description('Login to the build service')
     .action(buildActions.login);
 
+program.command('logout')
+    .description('Logout from the build service')
+    .action(buildActions.logout);
+
 program.command('logs')
     .description('Build logs. This works only when using the Build Service')
     .option('--id <buildid>', 'Build ID')

package/bin/cloudron-versions

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import versionsActions from '../src/versions-actions.js';
+import { Command } from 'commander';
+import pkg from '../package.json' with { type: 'json' };
+
+const program = new Command();
+program.version(pkg.version);
+
+program.command('add')
+    .description('Add the current build to version file')
+    .option('--state <state>', 'Publish state (published or testing)')
+    .action(versionsActions.addOrUpdate);
+
+program.command('init')
+    .description('Create versions file')
+    .action(versionsActions.init);
+
+program.command('list')
+    .description('List existing versions')
+    .action(versionsActions.list);
+
+program.command('revoke')
+    .description('Revoke the latest version')
+    .action(versionsActions.revoke);
+
+program.command('update')
+    .description('Update existing version')
+    .option('--version <version>', 'Version to update')
+    .option('--state <state>', 'Publish state (published or testing)')
+    .action(versionsActions.addOrUpdate);
+
+program.parse(process.argv);

package/eslint.config.js

@@ -1,7 +1,7 @@
-const js = require('@eslint/js');
-const globals = require('globals');
+import js from '@eslint/js';
+import globals from 'globals';
 
-module.exports = [
+export default [
     js.configs.recommended,
     {
         files: ["**/*.js"],
@@ -10,12 +10,13 @@ module.exports = [
                 ...globals.node,
             },
             ecmaVersion: 13,
-            sourceType: "commonjs"
+            sourceType: "module"
         },
         rules: {
             semi: "error",
-            "prefer-const": "error"
+            "prefer-const": "error",
+            "no-use-before-define": "error",
+            "no-shadow": "error"
         }
     }
 ];
-

package/package.json

@@ -1,41 +1,42 @@
 {
   "name": "cloudron",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
-  "main": "main.js",
+  "type": "module",
   "homepage": "https://git.cloudron.io/platform/cloudron-cli",
   "repository": {
     "type": "git",
     "url": "https://git.cloudron.io/platform/cloudron-cli.git"
   },
   "scripts": {
-    "test": "mocha test/test.js"
+    "test": "mocha --bail --no-timeouts test/test.js"
   },
   "bin": {
     "cloudron": "bin/cloudron"
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "@cloudron/manifest-format": "^5.28.0",
-    "@cloudron/superagent": "^1.0.0",
-    "commander": "^14.0.1",
+    "@cloudron/manifest-format": "^6.0.2",
+    "@cloudron/safetydance": "^3.0.1",
+    "@cloudron/superagent": "^2.1.1",
+    "commander": "^14.0.3",
     "debug": "^4.4.3",
     "easy-table": "^1.2.0",
-    "ejs": "^3.1.10",
-    "eventsource": "^4.0.0",
+    "ejs": "^4.0.1",
+    "eventsource": "^4.1.0",
     "micromatch": "^4.0.8",
-    "open": "^10.2.0",
-    "safetydance": "^2.5.1",
+    "open": "^11.0.0",
+    "semver": "^7.7.4",
     "tar-fs": "^3.1.1"
   },
   "engines": {
-    "node": ">= 18.x.x"
+    "node": ">= 20.11.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.37.0",
-    "eslint": "^9.37.0",
-    "expect.js": "^0.3.1",
-    "mocha": "^11.7.4"
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.0.0",
+    "globals": "^17.3.0",
+    "mocha": "^11.7.5"
   }
 }