fix: improve stdout handling in callTsProxy and enhance resource column synchronization error handling

Author: NoOne7135

adminforth/commands/callTsProxy.js

@@ -47,10 +47,10 @@ export function callTsProxy(tsCode, silent=false) {
       env: getEnvWithLocalBin(currentDirectory),
     });
     let stderr = "";
-    let stdoutLogs = [];
+    let stdout = "";
 
     child.stdout.on("data", (data) => {
-      stdoutLogs.push(data.toString());
+      stdout += data.toString();
     });
 
     child.stderr.on("data", (data) => {
@@ -62,17 +62,18 @@ export function callTsProxy(tsCode, silent=false) {
     });
 
     child.on("close", (code) => {
-      const tsProxyResult = stdoutLogs.find(log => log.includes('>>>>>>>'));
-      if (!tsProxyResult) {
-        reject(new Error(`Invalid JSON from tsproxy. stdout: ${stdoutLogs.join("")}, stderr: ${stderr}`));
+      const resultStart = stdout.indexOf('>>>>>>>');
+      const resultEnd = stdout.lastIndexOf('<<<<<<<');
+      if (resultStart === -1 || resultEnd === -1 || resultEnd < resultStart) {
+        reject(new Error(`Invalid JSON from tsproxy. stdout: ${stdout}, stderr: ${stderr}`));
         return;
       }
-      const preparedStdout = tsProxyResult.slice(tsProxyResult.indexOf('>>>>>>>') + 7, tsProxyResult.lastIndexOf('<<<<<<<'));
-      const preparedStdoutLogs = stdoutLogs.filter(log => !log.includes('>>>>>>>'));
+      const preparedStdout = stdout.slice(resultStart + 7, resultEnd);
+      const preparedStdoutLogs = stdout.slice(0, resultStart);
       if (code === 0) {
         try {
-          for (const log of preparedStdoutLogs) {
-            console.log(log);
+          if (preparedStdoutLogs) {
+            process.stdout.write(preparedStdoutLogs);
           }
           const parsed = JSON.parse(preparedStdout);
           if (!silent) {

adminforth/commands/createResource/generateResourceFile.js

@@ -130,9 +130,16 @@ async function syncResourceColumns(filePath, content, discoveredColumns) {
     throw new Error(`Could not find resource columns array in ${filePath}`);
   }
 
+  const dynamicColumnElements = columnsArray.elements.filter((element) => !n.ObjectExpression.check(element));
+  if (dynamicColumnElements.length) {
+    throw new Error(
+      `Resource columns array in ${filePath} contains dynamic entries. ` +
+      `Please sync this resource manually because automatic column import only supports literal column objects.`
+    );
+  }
+
   const existingColumnNames = new Set(
     columnsArray.elements
-      .filter((element) => n.ObjectExpression.check(element))
       .map((element) => getObjectPropertyValue(element, "name"))
       .filter(Boolean)
   );

adminforth/index.ts

@@ -522,7 +522,7 @@ class AdminForth implements IAdminForth {
 
   async getAllColumnsInTable(
     tableName: string,
-    dataSourceId?: string
+    requestedDataSourceId?: string
   ): Promise<{ [dataSourceId: string]: Array<{ name: string; type?: string; isPrimaryKey?: boolean; isUUID?: boolean; }> }> {
     const results: { [dataSourceId: string]: Array<{ name: string; type?: string; isPrimaryKey?: boolean;  isUUID?: boolean; }> } = {};
 
@@ -532,7 +532,7 @@ class AdminForth implements IAdminForth {
 
     await Promise.all(
       Object.entries(this.connectors)
-        .filter(([connectorDataSourceId]) => !dataSourceId || connectorDataSourceId === dataSourceId)
+        .filter(([dataSourceId]) => !requestedDataSourceId || dataSourceId === requestedDataSourceId)
         .map(async ([dataSourceId, connector]) => {
         if (typeof connector.getAllColumnsInTable === 'function') {
           try {
@@ -838,4 +838,4 @@ class AdminForth implements IAdminForth {
 
 }
 
-export default AdminForth;
+export default AdminForth;