From 5cb1f2b879a8524b78a178ae9006e7bb9373ecc7 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 29 Apr 2020 11:02:13 +0300
Subject: [PATCH] Some refactoring

---
 src/Action/ActionController.ts |  2 +-
 src/Executor.ts                | 64 ++++++++++++++++++++--------------
 src/Task/TaskController.ts     |  2 +-
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/Action/ActionController.ts b/src/Action/ActionController.ts
index 09c88e4..ca82f4d 100644
--- a/src/Action/ActionController.ts
+++ b/src/Action/ActionController.ts
@@ -11,7 +11,7 @@ export function registerAction(constructor: Function) {
     actionMap[constructor.name] = constructor;
 }
 
-export function createAction(name: string, scheduler: Scheduler): ActionController | undefined {
+export function createActionHandler(name: string, scheduler: Scheduler): ActionController | undefined {
     const storedFunction = actionMap[name];
     if (storedFunction === undefined) {
         return undefined;
diff --git a/src/Executor.ts b/src/Executor.ts
index 8d7de4f..228032a 100644
--- a/src/Executor.ts
+++ b/src/Executor.ts
@@ -3,8 +3,8 @@ import { AbortTaskError, ActionError, TryLaterError } from './Errors';
 import { Task } from './Queue/TaskQueue';
 import { Command } from './Command';
 import { TaskQueueRenderer } from './TaskQueueRenderer';
-import { createAction } from './Action/ActionController';
-import { createTask } from './Task/TaskController';
+import { createActionHandler } from './Action/ActionController';
+import { createTaskHandler } from './Task/TaskController';
 import { ConsoleLogger, Logger } from './Logger';
 import { GrabberManager } from './Grabber/GrabberManager';
 import { Scheduler } from './Scheduler';
@@ -36,29 +36,30 @@ export class Executor {
         await waitForLoad();
         await sleepMicro();
 
+        this.renderInfo();
+
+        const sleep = createExecutionLoopSleeper();
+
+        while (true) {
+            await sleep();
+            if (!this.isPaused()) {
+                await this.doTaskProcessingStep();
+            }
+        }
+    }
+
+    private renderInfo() {
         try {
             markPage('Executor', this.version);
             this.renderTaskQueue();
         } catch (e) {
             this.logger.warn(e);
         }
+    }
 
-        let skipFirstSleep = true;
-
-        while (true) {
-            if (skipFirstSleep) {
-                skipFirstSleep = false;
-            } else {
-                await sleepMicro();
-            }
-
-            const { pauseTs } = this.executionState.getExecutionSettings();
-            if (pauseTs > timestamp()) {
-                continue;
-            }
-
-            await this.doTaskProcessingStep();
-        }
+    private isPaused(): boolean {
+        const { pauseTs } = this.executionState.getExecutionSettings();
+        return pauseTs > timestamp();
     }
 
     private renderTaskQueue() {
@@ -96,24 +97,24 @@ export class Executor {
     }
 
     private async processActionCommand(cmd: Command, task: Task) {
-        const actionController = createAction(cmd.name, this.scheduler);
-        this.logger.log('PROCESS ACTION', cmd.name, actionController);
+        const actionHandler = createActionHandler(cmd.name, this.scheduler);
+        this.logger.log('PROCESS ACTION', cmd.name, actionHandler);
         if (cmd.args.taskId !== task.id) {
             throw new ActionError(`Action task id ${cmd.args.taskId} not equal current task id ${task.id}`);
         }
-        if (actionController) {
+        if (actionHandler) {
             this.statistics.incrementAction();
-            await actionController.run(cmd.args, task);
+            await actionHandler.run(cmd.args, task);
         } else {
             this.logger.warn('ACTION NOT FOUND', cmd.name);
         }
     }
 
     private async processTaskCommand(task: Task) {
-        const taskController = createTask(task.name, this.scheduler);
-        this.logger.log('PROCESS TASK', task.name, task, taskController);
-        if (taskController) {
-            await taskController.run(task);
+        const taskHandler = createTaskHandler(task.name, this.scheduler);
+        this.logger.log('PROCESS TASK', task.name, task, taskHandler);
+        if (taskHandler) {
+            await taskHandler.run(task);
         } else {
             this.logger.warn('TASK NOT FOUND', task.name);
             this.scheduler.removeTask(task.id);
@@ -153,3 +154,14 @@ export class Executor {
         }
     }
 }
+
+function createExecutionLoopSleeper() {
+    let skipFirstSleep = true;
+    return async () => {
+        if (skipFirstSleep) {
+            skipFirstSleep = false;
+        } else {
+            await sleepMicro();
+        }
+    };
+}
diff --git a/src/Task/TaskController.ts b/src/Task/TaskController.ts
index edc9274..a583c72 100644
--- a/src/Task/TaskController.ts
+++ b/src/Task/TaskController.ts
@@ -9,7 +9,7 @@ export function registerTask(constructor: Function) {
     taskMap[constructor.name] = constructor;
 }
 
-export function createTask(name: string, scheduler: Scheduler): TaskController | undefined {
+export function createTaskHandler(name: string, scheduler: Scheduler): TaskController | undefined {
     const storedFunction = taskMap[name];
     if (storedFunction === undefined) {
         return undefined;