cloudron 5.14.1 → 5.14.2

package/package.json

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

package/src/actions.js

@@ -7,7 +7,6 @@ const assert = require('assert'),
     { EventSource } = require('eventsource'),
     fs = require('fs'),
     https = require('https'),
-    LineStream = require('./line-stream.js'),
     manifestFormat = require('cloudron-manifestformat'),
     os = require('os'),
     path = require('path'),
@@ -966,19 +965,12 @@ async function logs(localOptions, cmd) {
     } else {
         const url = `${apiPath}?access_token=${token}&lines=${lines}&format=json`;
 
-        const req = superagent.get(url, { rejectUnauthorized });
-        req.on('response', function (response) {
-            if (response.status !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
-        });
-        req.on('error', (error) => exit(`Pipe error: ${error.message}`));
-
-        const lineStream = new LineStream();
-        lineStream
-            .on('line', (line) => { logPrinter(JSON.parse(line)); } )
-            .on('error', (error) => exit(`JSON parse error: ${error.message}`))
-            .on('end', process.exit);
+        const response = await superagent.get(url, { rejectUnauthorized }).ok(() => true);
+        if (response.status !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
 
-        req.pipe(lineStream);
+        for (const line of response.body.toString('utf8').trim().split('\n')) {
+            logPrinter(JSON.parse(line));
+        }
     }
 }
 

package/src/line-stream.js

@@ -1,30 +0,0 @@
-'use strict';
-
-const { Transform } = require('stream');
-
-class LineStream extends Transform {
-    constructor(options) {
-      super();
-      this._buffer = '';
-    }
-
-    _transform(chunk, encoding, callback) {
-        this._buffer += chunk.toString('utf8');
-
-        const lines = this._buffer.split('\n');
-        this._buffer = lines.pop(); // maybe incomplete line
-
-        for (const line of lines) {
-            this.emit('line', line);
-        }
-
-        callback();
-    }
-
-    _flush(callback) {
-      if (this._buffer) this.emit('line', this.buff_bufferer);
-      callback();
-    }
-}
-
-exports = module.exports = LineStream;