change error and exit/close infor handling

Author: potapovDim

lib/exec.proc.ts

@@ -14,6 +14,8 @@ function buildExecRunner(notRetriable, runOpts) {
     pollTime,
     successExitCode = 0,
     logProcessResult = internalLogProcessResult,
+    onExitCloseProcess,
+    onErrorProcess,
   } = runOpts;
 
   if (!isNumber(successExitCode)) {
@@ -52,17 +54,18 @@ function buildExecRunner(notRetriable, runOpts) {
 
       const watcher = setInterval(() => killTooLongExecution(execProc), pollTime);
 
-      execProc.on('exit', (code, signal) => {
-        logger.info(`EXIT PROCESS: PID="${execProc.pid}", code="${code}" and signal="${signal}"`);
-      });
+      if (onExitCloseProcess) {
+        execProc.on('exit', (code, signal) => onExitCloseProcess(execProc, code, signal));
+      }
 
-      execProc.on('error', e => {
-        logger.info(`ERROR PROCESS: PID="${execProc.pid}"`);
-        logger.error(e);
-      });
+      if (onErrorProcess) {
+        execProc.on('error', error => onErrorProcess(execProc, error));
+      }
 
       execProc.on('close', async (code, signal) => {
-        logger.info(`CLOSE PROCESS: PID="${execProc.pid}", code="${code}" and signal="${signal}"`);
+        if (onExitCloseProcess) {
+          onExitCloseProcess(execProc, code, signal);
+        }
 
         // clear watcher interval
         clearInterval(watcher);

lib/executor.circle.ts

@@ -32,6 +32,8 @@ async function circleExecutor(runOptions, commandsArray): Promise<{ retriable: s
     logEndCycle = internalLogEndCycle,
     logIteractionCycle = internalLogIteractionCycle,
     logMiddleResultsCycle = internalLogMiddleResultsCycle,
+    onExitCloseProcess,
+    onErrorProcess,
   } = runOptions;
 
   /**
@@ -50,6 +52,8 @@ async function circleExecutor(runOptions, commandsArray): Promise<{ retriable: s
     pollTime,
     successExitCode,
     logProcessResult,
+    onExitCloseProcess,
+    onErrorProcess,
   });
 
   async function runCommand(commands, retriable, runIndex) {

lib/helpers.ts

@@ -1,15 +1,20 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import {ProcessRerunError} from './error';
-
-const getFilesList = function(dir: string, fileList: string[] = [], directoryToSkip: string[] = [], ignoreSubDirs?: boolean): string[] {
+import { ProcessRerunError } from './error';
+
+const getFilesList = function (
+  dir: string,
+  fileList: string[] = [],
+  directoryToSkip: string[] = [],
+  ignoreSubDirs?: boolean,
+): string[] {
   if (!fs.existsSync(dir)) {
     throw new ProcessRerunError('FileSystem', `${dir} does not exists`);
   }
 
   const files = fs.readdirSync(dir);
 
-  files.forEach(function(file) {
+  files.forEach(function (file) {
     const isDirr = fs.statSync(path.join(dir, file)).isDirectory();
 
     const shouldBeExcluded =
@@ -32,15 +37,11 @@ const getFilesList = function(dir: string, fileList: string[] = [], directoryToS
 };
 
 function getPollTime(timeVal: any): number {
-  return typeof timeVal === 'number' && !isNaN(timeVal) && isFinite(timeVal) ? timeVal : 1000;
+  return typeof timeVal === 'number' && !Number.isNaN(timeVal) && Number.isFinite(timeVal) ? timeVal : 1000;
 }
 
 function sleep(time: number): Promise<void> {
-  return new Promise((res) => setTimeout(res, time));
+  return new Promise(res => setTimeout(res, time));
 }
 
-export {
-  getPollTime,
-  sleep,
-  getFilesList,
-};
+export { getPollTime, sleep, getFilesList };

lib/index.ts

@@ -28,6 +28,8 @@ type IBuildOpts = {
   logIteractionCycle?: (cycleNumber: number, commands: string[]) => void;
   logMiddleResultsCycle?: (initialCount: number, commands: string[]) => void;
   logProcessResult?: (cmd: string, startTime: number, execProc, error, stdout, stderr) => void;
+  onExitCloseProcess?: (execProc, code: null, signal: string | number) => void;
+  onErrorProcess?: (execProc, error) => void;
 };
 
 type IRunner = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "process-rerun",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/potapovDim/protractor-rerun.git"