cloudron 8.2.3 → 8.2.5

package/CHANGELOG.md

@@ -132,3 +132,5 @@
 [8.2.1]
 * cancel task: wait for cancellation
 
+[8.2.4]
+* logs: `--ndjson` prints newline-delimited JSON (plain dump or `--tail` follow stream)

package/bin/cloudron

@@ -306,6 +306,7 @@ program.command('logs')
     .description('Application or System logs')
     .option('-f, --tail', 'Follow')
     .option('-l, --lines <lines>', 'Number of lines to show (default: 500)')
+    .option('--ndjson', 'Print newline-delimited JSON objects instead of HH:MM:SS log lines')
     .option('--app <id/location>', 'App id or location')
     .option('--system [service-name]', 'Show System logs or optionally service logs')
     .action(actions.logs);
@@ -416,6 +417,7 @@ const versionsCommand = program.command('versions').description('Commands for pu
 
 versionsCommand.command('add')
     .description('Add the current build to version file')
+    .option('-i, --image <image>', 'Docker image')
     .option('--state <state>', 'Publish state (published or testing)')
     .action(versionsActions.addOrUpdate);
 
@@ -434,6 +436,7 @@ versionsCommand.command('revoke')
 
 versionsCommand.command('update')
     .description('Update existing version')
+    .option('-i, --image <image>', 'Docker image')
     .option('--version <version>', 'Version to update')
     .option('--state <state>', 'Publish state (published or testing)')
     .action(versionsActions.addOrUpdate);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "8.2.3",
+  "version": "8.2.5",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",
@@ -17,7 +17,7 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "@cloudron/manifest-format": "^6.2.0",
+    "@cloudron/manifest-format": "^6.2.1",
     "@cloudron/safetydance": "^3.0.1",
     "@cloudron/superagent": "^2.1.1",
     "commander": "^14.0.3",
@@ -27,7 +27,7 @@
     "eventsource": "^4.1.0",
     "micromatch": "^4.0.8",
     "open": "^11.0.0",
-    "semver": "^7.7.4",
+    "semver": "^7.8.0",
     "tar-fs": "^3.1.2"
   },
   "engines": {
@@ -35,8 +35,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.2.1",
-    "globals": "^17.5.0",
+    "eslint": "^10.3.0",
+    "globals": "^17.6.0",
     "mocha": "^11.7.5"
   }
 }

package/src/actions.js

@@ -1074,6 +1074,8 @@ async function logs(localOptions, cmd) {
     const { adminFqdn, token, rejectUnauthorized } = requestOptions(options);
     const lines = options.lines || 500;
     const tail = !!options.tail;
+    const ndjson = !!options.ndjson;
+
     let apiPath;
 
     if (typeof options.system === 'boolean' && options.system) {
@@ -1096,7 +1098,11 @@ async function logs(localOptions, cmd) {
         const es = new EventSource(url, { rejectUnauthorized }); // not sure why this is needed
 
         es.addEventListener('message', function (e) { // e { type, data, lastEventId }. lastEventId is the timestamp
-            logPrinter(JSON.parse(e.data));
+            if (ndjson) {
+                console.log(e.data);
+            } else {
+                logPrinter(JSON.parse(e.data));
+            }
         });
 
         es.addEventListener('error', function (error) {
@@ -1110,8 +1116,13 @@ async function logs(localOptions, cmd) {
         const response = await superagent.get(url, { rejectUnauthorized }).ok(() => true);
         if (response.status !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
 
-        for (const line of response.body.toString('utf8').trim().split('\n')) {
-            logPrinter(JSON.parse(line));
+        const raw = response.body.toString('utf8').trimEnd();
+        if (ndjson) {
+            console.log(raw);
+        } else {
+            for (const line of raw.split('\n')) {
+                logPrinter(JSON.parse(line));
+            }
         }
     }
 }

package/test/test.js

@@ -247,6 +247,14 @@ describe('app logs', () => {
         const out = cli('logs --app ' + app.id);
         assert.ok(out.stdout.includes('listening on'));
     });
+
+    it('supports --ndjson on a log dump', () => {
+        const out = cli('logs --ndjson --lines 20 --app ' + app.id);
+        const first = out.stdout.trim().split('\n').find((l) => l.length > 0);
+        assert.ok(first, 'expected at least one NDJSON line');
+        const obj = JSON.parse(first);
+        assert.ok('realtimeTimestamp' in obj && 'message' in obj);
+    });
 });
 
 describe('Uninstall', function () {