cloudron 5.11.10 → 5.12.0

package/bin/cloudron

@@ -170,7 +170,7 @@ program.command('install')
     .option('-a, --alias-domains [domain,...]', 'Alias domains')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]')
-    .option('--debug [cmd]', 'Enable debug mode')
+    .option('--debug [cmd...]', 'Enable debug mode', false)
     .option('--readonly', 'Mount filesystem readonly. Default is read/write in debug mode.')
     .action(actions.install);
 

package/bin/cloudron-build

@@ -31,7 +31,6 @@ program.command('build', { isDefault: true })
 
 program.command('login')
     .description('Login to the build service')
-    .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.10",
+  "version": "5.12.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,31 +17,29 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "async": "^3.2.5",
+    "async": "^3.2.6",
     "cloudron-manifestformat": "^5.26.2",
     "commander": "^12.1.0",
-    "debug": "^4.3.5",
+    "debug": "^4.3.7",
     "easy-table": "^1.2.0",
     "ejs": "^3.1.10",
     "eventsource": "^2.0.2",
-    "micromatch": "^4.0.7",
-    "open": "^8.4.0",
+    "micromatch": "^4.0.8",
+    "open": "^10.1.0",
     "progress": "^2.0.3",
     "progress-stream": "^2.0.0",
     "readline-sync": "^1.4.10",
     "safetydance": "^2.4.0",
     "split2": "^4.2.0",
-    "superagent": "^9.0.2",
+    "superagent": "^10.1.1",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
-    "underscore": "^1.13.6"
+    "underscore": "^1.13.7"
   },
   "engines": {
     "node": ">= 18.x.x"
   },
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "memorystream": "^0.3.1",
-    "mocha": "^10.4.0",
-    "rimraf": "^5.0.7"
+    "mocha": "^10.8.2"
   }
 }

package/src/actions.js

@@ -8,7 +8,6 @@ const assert = require('assert'),
     fs = require('fs'),
     https = require('https'),
     manifestFormat = require('cloudron-manifestformat'),
-    opn = require('open'),
     os = require('os'),
     path = require('path'),
     ProgressBar = require('progress'),
@@ -244,13 +243,7 @@ async function waitForTask(taskId, options) {
         const response = await createRequest('GET', `/api/v1/tasks/${taskId}`, options);
         if (response.statusCode !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
 
-        // TODO remove later, for now keep old behavior on if `pending` is missing
-        if (typeof response.body.pending === 'undefined') {
-            // note: for queued tasks, 'active' returns false
-            if (response.body.error || response.body.percent === 100) return response.body; // task errored or done
-        } else {
-            if (!response.body.pending && !response.body.active) return response.body;
-        }
+        if (!response.body.active) return response.body;
 
         let message = response.body.message || '';
 
@@ -427,7 +420,8 @@ async function open(localOptions, cmd) {
 
     if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
-    opn(`https://${app.fqdn}`);
+    // pure esm module
+    (await import('open')).default(`https://${app.fqdn}`);
 }
 
 async function list(localOptions, cmd) {
@@ -510,16 +504,6 @@ function queryPortBindings(app, manifest) {
     return portBindings;
 }
 
-// this function can fail on many levels
-function parseDebugCommand(cmd) {
-    // hack for commander
-    if (typeof cmd !== 'string' || cmd === '') return [ '/bin/bash', '-c', 'echo "Debug mode. Use cloudron exec to debug. Sleeping" && sleep 100000' ];
-
-    if (cmd == 'default') return null; // another hack
-
-    return cmd.split(' '); // yet another hack
-}
-
 async function downloadManifest(appstoreId) {
     const [ id, version ] = appstoreId.split('@');
 
@@ -646,10 +630,11 @@ async function install(localOptions, cmd) {
         // the sso only applies for apps which allow optional sso
         if (manifest.optionalSso) data.sso = options.sso;
 
-        if (options.debug) {
+        if (options.debug) { // 'true' when no args.  otherwise, array
+            const debugCmd = options.debug === true ? [ '/bin/bash', '-c', 'echo "Repair mode. Use the webterminal or cloudron exec to repair. Sleeping" && sleep infinity' ] : options.debug;
             data.debugMode = {
                 readonlyRootfs: options.readonly ? true : false,
-                cmd: parseDebugCommand(options.debug)
+                cmd: debugCmd
             };
             data.memoryLimit = -1;
             options.wait = false; // in debug mode, health check never succeeds
@@ -835,10 +820,12 @@ async function debug(args, localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
+        const debugCmd = args.length === 0 ? [ '/bin/bash', '-c', 'echo "Repair mode. Use the webterminal or cloudron exec to repair. Sleeping" && sleep infinity' ] : args;
+
         const data = {
             debugMode: options.disable ? null : {
                 readonlyRootfs: options.readonly ? true : false,
-                cmd: parseDebugCommand(args.join(' ').trim())
+                cmd: debugCmd
             }
         };
 

package/src/build-actions.js

@@ -63,8 +63,8 @@ function getBuildServiceConfig(options) {
     return buildService;
 }
 
-async function login(options) {
-    assert.strictEqual(typeof options, 'object');
+async function login(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
 
     const buildServiceConfig = getBuildServiceConfig(options);
 

package/test/test.js

@@ -12,7 +12,6 @@ var child_process = require('child_process'),
     expect = require('expect.js'),
     fs = require('fs'),
     path = require('path'),
-    rimraf = require('rimraf'),
     safe = require('safetydance'),
     util = require('util');
 
@@ -203,7 +202,7 @@ describe('Pull', function () {
     });
 
     it('can pull a directory', function () {
-        rimraf.sync('/tmp/pulldir');
+        fs.rmSync('/tmp/pulldir', { recursive: true, force: true });
         safe.fs.mkdirSync('/tmp/pulldir');
         cli(util.format('pull --app %s /app/code/ /tmp/pulldir', app.id));
         expect(fs.existsSync('/tmp/pulldir/README.md')).to.be.ok();
@@ -213,7 +212,7 @@ describe('Pull', function () {
         var result = cli(util.format('exec --app %s md5sum /app/code/node_modules/uglify-js/bin/uglifyjs', app.id));
         expect(result.output[1]).to.contain(md5('/tmp/pulldir/node_modules/uglify-js/bin/uglifyjs'));
 
-        rimraf.sync('/tmp/pulldir');
+        fs.rmSync('/tmp/pulldir', { recursive: true, force: true });
     });
 
     it('can pull to directory', function () {