add in progress commands to logger

Author: potapovDim

lib/executor.circle.ts

@@ -43,6 +43,7 @@ async function circleExecutor(runOptions, commandsArray): Promise<{ retriable: s
    * commandsArray = toArray(commandsArray);
    */
   commandsArray = toArray(commandsArray);
+  const inProgressCommands = [];
 
   logStartCycle(maxThreads, attemptsCount, commandsArray);
 
@@ -68,9 +69,13 @@ async function circleExecutor(runOptions, commandsArray): Promise<{ retriable: s
 
       const commandToExecute = commands.splice(0, 1)[0];
       if (isString(commandToExecute)) {
+        const index = inProgressCommands.push(commandToExecute) - 1;
         result = await executeCommandAsync(commandToExecute, runIndex).catch(error => logger.error(error));
+        inProgressCommands.splice(index, 1);
       } else if (isFunction(commandToExecute) || isAsyncFunction(commandToExecute)) {
+        const index = inProgressCommands.push(commandToExecute.toString()) - 1;
         result = await commandToExecute(runIndex).catch(error => logger.error(error));
+        inProgressCommands.splice(index, 1);
       }
 
       if (result) {
@@ -87,7 +92,8 @@ async function circleExecutor(runOptions, commandsArray): Promise<{ retriable: s
     const asserter = setInterval(() => runCommand(commands, retriable, executionCount), pollTime);
 
     const logProcessesProgressLogger =
-      logProcessesProgress && setInterval(() => logMiddleResultsCycle(initialCommandsCount, commands), 5000);
+      logProcessesProgress &&
+      setInterval(() => logMiddleResultsCycle(initialCommandsCount, commands, inProgressCommands), 5000);
 
     const watcherRunner = watcher && setInterval(watcher, 5000);
 

lib/executor.intime.ts

@@ -47,6 +47,7 @@ async function intimeExecutor(runOptions, commandsArray): Promise<{ retriable: s
     cmd,
   }));
 
+  const inProgressCommands = [];
   logStartCycle(maxThreads, attemptsCount, inTimeCommands);
 
   async function runCommand(commands) {
@@ -60,11 +61,15 @@ async function intimeExecutor(runOptions, commandsArray): Promise<{ retriable: s
 
       const executionIndex = commadData.attemptsCount--;
       if (isString(commadData.cmd)) {
+        const index = inProgressCommands.push(commadData.cmd) - 1;
         result = await executeCommandAsync(commadData.cmd, attemptsCount - executionIndex).catch(error =>
           logger.error(error),
         );
+        inProgressCommands.splice(index, 1);
       } else if (isFunction(commadData.cmd) || isAsyncFunction(commadData.cmd)) {
+        const index = inProgressCommands.push(commadData.cmd.toString()) - 1;
         result = await commadData.cmd(attemptsCount - executionIndex).catch(error => logger.error(error));
+        inProgressCommands.splice(index, 1);
       }
 
       if (result) {
@@ -80,12 +85,15 @@ async function intimeExecutor(runOptions, commandsArray): Promise<{ retriable: s
       currentSessionCount -= 1;
     }
   }
+
   async function runCommandsArray(commands: any[]) {
     const initialCommandsCount = commands.length;
     const asserter = setInterval(() => runCommand(commands), pollTime);
 
     const logProcessesProgressLoggerRunner =
-      logProcessesProgress && setInterval(() => logMiddleResultsCycle(initialCommandsCount, commands), 5000);
+      logProcessesProgress &&
+      setInterval(() => logMiddleResultsCycle(initialCommandsCount, commands, inProgressCommands), 5000);
+
     const watcherRunner = watcher && setInterval(watcher, 5000);
 
     do {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "process-rerun",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/potapovDim/protractor-rerun.git"
@@ -10,7 +10,7 @@
     "tscw": "tsc -w",
     "validate": "npm ls",
     "test": "mocha $(find specs -name '*.spec.*') --timeout 500000 --require ts-node/register",
-    "build": "rm -rf ./built && tsc",
+    "tsc": "rm -rf ./built && tsc",
     "lint": "eslint --ext .ts ./ --fix"
   },
   "author": {