replace split with our own LogStream

split module is archived

src/apps.js

@@ -160,6 +160,7 @@ const appstore = require('./appstore.js'),
     domains = require('./domains.js'),
     eventlog = require('./eventlog.js'),
     fs = require('fs'),
+    LogStream = require('./log-stream.js'),
     mail = require('./mail.js'),
     manifestFormat = require('cloudron-manifestformat'),
     mounts = require('./mounts.js'),
@@ -175,7 +176,6 @@ const appstore = require('./appstore.js'),
     settings = require('./settings.js'),
     shell = require('./shell.js'),
     spawn = require('child_process').spawn,
-    split = require('split'),
     storage = require('./storage.js'),
     superagent = require('superagent'),
     system = require('./system.js'),
@@ -2026,29 +2026,12 @@ async function getLogs(app, options) {
     const logPaths = await getLogPaths(app);
     const cp = spawn('/usr/bin/tail', args.concat(logPaths));
 
-    const transformStream = split(function mapper(line) {
-        if (format !== 'json') return line + '\n';
+    const logStream = new LogStream({ format, source: appId });
+    logStream.close = cp.kill.bind(cp, 'SIGKILL'); // hook for caller. closing stream kills the child process
 
-        const data = line.split(' '); // logs are <ISOtimestamp> <msg>
-        let timestamp = (new Date(data[0])).getTime();
-        if (isNaN(timestamp)) timestamp = 0;
-        const message = line.slice(data[0].length+1);
+    cp.stdout.pipe(logStream);
 
-        // ignore faulty empty logs
-        if (!timestamp && !message) return;
-
-        return JSON.stringify({
-            realtimeTimestamp: timestamp * 1000,
-            message: message,
-            source: appId
-        }) + '\n';
-    });
-
-    transformStream.close = cp.kill.bind(cp, 'SIGKILL'); // closing stream kills the child process
-
-    cp.stdout.pipe(transformStream);
-
-    return transformStream;
+    return logStream;
 }
 
 // never fails just prints error