Merge pull request #524 from devforth/feature/AdminForth/1194/i-added-logger-to-root-level-a

fix: allow to log JSON's using standart adminforth logger

Author: ivictbor

adminforth/commands/callTsProxy.js

@@ -25,11 +25,11 @@ export function callTsProxy(tsCode, silent=false) {
     const child = spawn("tsx", [path.join(currentFileFolder, "proxy.ts")], {
       env: process.env,
     });
-    let stdout = "";
     let stderr = "";
+    let stdoutLogs = [];
 
     child.stdout.on("data", (data) => {
-      stdout += data;
+      stdoutLogs.push(data.toString());
     });
 
     child.stderr.on("data", (data) => {
@@ -39,7 +39,12 @@ export function callTsProxy(tsCode, silent=false) {
     child.on("close", (code) => {
       if (code === 0) {
         try {
-          const preparedStdout = stdout.slice(stdout.indexOf("{"), stdout.lastIndexOf("}") + 1);
+          const tsProxyResult = stdoutLogs.find(log => log.includes('>>>>>>>'));
+          const preparedStdout = tsProxyResult.slice(tsProxyResult.indexOf('>>>>>>>') + 46, tsProxyResult.lastIndexOf('<<<<<<<'));
+          const preparedStdoutLogs = stdoutLogs.filter(log => !log.includes('>>>>>>>'));
+          for (const log of preparedStdoutLogs) {
+            console.log(log);
+          }
           const parsed = JSON.parse(preparedStdout);
           if (!silent) {
             parsed.capturedLogs.forEach((log) => {
@@ -52,10 +57,10 @@ export function callTsProxy(tsCode, silent=false) {
           }
           resolve(parsed.result);
         } catch (e) {
-          reject(new Error("Invalid JSON from tsproxy: " + stdout));
+          reject(new Error("Invalid JSON from tsproxy: " + preparedStdout));
         }
       } else {
-        console.error(`tsproxy exited with non-0, this should never happen, stdout: ${stdout}, stderr: ${stderr}`);
+        console.error(`tsproxy exited with non-0, this should never happen, stdout: ${preparedStdout}, stderr: ${stderr}`);
         reject(new Error(stderr));
       }
     });

adminforth/commands/proxy.ts

@@ -41,19 +41,27 @@ import path from 'path';
 
     // Restore original console.log
     console.log = origLog;
-    console.log(JSON.stringify({ 
-      result, 
-      capturedLogs,
-      error: null 
-    }));
+    console.log(
+      ">>>>>>>"+
+      JSON.stringify({ 
+        result, 
+        capturedLogs,
+        error: null 
+      })
+      +"<<<<<<<"
+    );
   } catch (error: any) {
     // Restore original console.log
     console.log = origLog;
-    console.log(JSON.stringify({ 
-      error: error.message, 
-      stack: error.stack,
-      capturedLogs 
-    }));
+    console.log(
+      ">>>>>>>"+
+      JSON.stringify({ 
+        error: error.message, 
+        stack: error.stack,
+        capturedLogs 
+      })
+      +"<<<<<<<"
+    );
   } finally {
     await unlink(tmpFile).catch(() => {});
   }