hola-server 0.8.6 → 0.8.7

package/core/bash.js

@@ -1,8 +1,17 @@
+const fs = require('fs');
 const { exec } = require("child_process");
+const { random_code } = require('./random');
 const { is_log_debug, is_log_error, log_debug, log_error } = require('../db/db');
 
 const LOG_BASH = "bash";
 
+const get_log_file = async () => {
+    const home = await run_local_cmd("echo ~");
+    const log_dir = `${home}/.hola/ssh`;
+    await run_local_cmd(`mkdir -p ${log_dir}`);
+    return `${log_dir}/l_${random_code()}.log`;
+}
+
 /**
  * Run script and get stdout
  * @param {host info,contains user,ip and password} host
@@ -10,36 +19,44 @@ const LOG_BASH = "bash";
  * @returns 
  */
 const run_script = async (host, script, log_extra) => {
+    const log_file = await get_log_file();
+
     return new Promise((resolve) => {
-        exec(`ssh ${host.auth} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash <<'EOT' \n ${script} \nEOT\n`, { maxBuffer: 1024 * 150000 }, (error, stdout) => {
+        exec(`ssh ${host.auth} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash <<'EOT' > ${log_file} \n ${script} \nEOT\n`, { maxBuffer: 1024 * 150000 }, (error, stdout) => {
             if (error) {
                 if (is_log_error()) {
                     log_error(LOG_BASH, "error running on host:" + host.name + " the script:" + script + ",error:" + error, log_extra);
                 }
                 resolve({ stdout: stdout, err: "error running the script:" + script + ",error:" + error });
             } else {
+                const output = fs.readFileSync(log_file, { encoding: 'utf8', flag: 'r' });
                 if (is_log_debug()) {
-                    log_debug(LOG_BASH, "executing on host:" + host.name + ", script:" + script + ",stdout:" + stdout, log_extra);
+                    log_debug(LOG_BASH, "executing on host:" + host.name + ", script:" + script + ",stdout:" + output, log_extra);
                 }
-                resolve({ stdout: stdout });
+                resolve({ stdout: output });
+                fs.unlinkSync(log_file);
             }
         });
     });
 };
 
 const run_script_file = async (host, script_file, log_extra) => {
+    const log_file = await get_log_file();
+
     return new Promise((resolve) => {
-        exec(`ssh ${host.auth} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash < ${script_file}`, (error, stdout) => {
+        exec(`ssh ${host.auth} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p ${host.port} ${host.user}@${host.ip} /bin/bash < ${script_file} > ${log_file}`, (error, stdout) => {
             if (error) {
                 if (is_log_error()) {
                     log_error(LOG_BASH, "error running on host:" + host.name + " the script_file:" + script_file + ",error:" + error, log_extra);
                 }
                 resolve({ stdout: stdout, err: "error running the script:" + script_file + ",error:" + error });
             } else {
+                const output = fs.readFileSync(log_file, { encoding: 'utf8', flag: 'r' });
                 if (is_log_debug()) {
-                    log_debug(LOG_BASH, "executing on host:" + host.name + ", script_file:" + script_file + ",stdout:" + stdout, log_extra);
+                    log_debug(LOG_BASH, "executing on host:" + host.name + ", script_file:" + script_file + ",stdout:" + output, log_extra);
                 }
-                resolve({ stdout: stdout });
+                resolve({ stdout: output });
+                fs.unlinkSync(log_file);
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hola-server",
-  "version": "0.8.6",
+  "version": "0.8.7",
   "description": "a meta programming framework used to build nodejs restful api",
   "main": "index.js",
   "scripts": {