refactor

Author: potapovDim

lib/execProc.js

@@ -14,7 +14,8 @@ function buildExecRunner(failedByAssert, runOpts) {
   } = runOpts
 
   const executeCommandAsync = (cmd, index) => new Promise((resolve) => {
-    let watcher = null
+    let execProc = null
+
     let additionalOpts = null
     let originalCmd = cmd
     let specificCallBack = null
@@ -23,8 +24,7 @@ function buildExecRunner(failedByAssert, runOpts) {
     /**
      * @now this variable will be used for process kill if time more than @longestProcessTime
      */
-    const now = +Date.now()
-
+    const startTime = +Date.now()
 
     /**
      * @param {undefined|function} addSpecificOptions if function cmd will go to this function as argument
@@ -44,30 +44,49 @@ function buildExecRunner(failedByAssert, runOpts) {
       }
     }
 
-    if(debugProcess) {console.log(cmd)}
+    execProc = exec(cmd, execOpts, (error, stdout, stderr) => {
+      if(debugProcess) {
+        console.log('___________________________________________________________________________')
+        console.log(`command for process:  ${cmd}`)
+        console.log(`stdout: ${stdout}`);
+        console.error(`stderr: ${stderr}`);
+        console.error(`error ${error}`)
+        console.log('___________________________________________________________________________')
+      }
+
+      executionStack += `${stdout}${stderr}`
+    })
 
-    const proc = exec(cmd, execOpts)
 
-    const killTooLongExecution = (proc) => {
-      if(now - Date.now() < longestProcessTime) {
-        proc.kill()
+    const killTooLongExecution = (procWhatShouldBekilled) => {
+      if(+Date.now() - startTime > longestProcessTime) {
+        procWhatShouldBekilled.kill()
       }
     }
 
-    watcher = setInterval(() => killTooLongExecution(proc), 5000)
+    const watcher = setInterval(() => killTooLongExecution(execProc), 5000)
 
-    proc.on('exit', () => {clearInterval(watcher)})
+    execProc.on('exit', () => {
+      if(debugProcess) {
+        console.log('EXIT PROCESS')
+      }
+    })
 
-    proc.stdout.on('data', (data) => {
-      executionStack += data.toString()
+    execProc.on('close', () => {
+      if(debugProcess) {
+        console.log('CLOSE PROCESS')
+      }
+      clearInterval(watcher)
     })
-    proc.stderr.on('data', (data) => console.log(data.toString('utf8')))
-    proc.on('error', (e) => {console.error(e)})
 
-    proc.on('close', async (code) => {
+    execProc.on('error', (e) => {console.error(e)})
+
+    execProc.on('close', async (code) => {
+      // clear watcher interval
+      clearInterval(watcher)
+
       let commandToRerun = null
 
-      if(debugProcess) {console.log(executionStack, code)}
 
       // if process code 0 - exit as a success result
       if(code === 0) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "process-rerun",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "bin": {
     "protractor-rerun": "./bin/rerun"
   },