feat(taskrunner): now has working taskrunner

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,23 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -41,37 +43,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci npm test
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm install
+    - npmci npm install
-  - npmci command npm run build
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,33 +86,35 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -115,5 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

package.json

@@ -44,14 +44,14 @@
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_web/**/*",
-    "dist_ts_web/*",
+    "dist_ts_web/**/*",
-    "assets/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
   ]
-}
+}

readme.md

@@ -44,6 +44,11 @@ For further information read the linked docs at the top of this README.
 
 [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
 
+
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.7.taskloop.ts

@@ -1,6 +1,6 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 
-import * as taskbuffer from  '../ts';
+import * as taskbuffer from '../ts';
 
 let preTask: taskbuffer.Task;
 let afterTask: taskbuffer.Task;
@@ -17,7 +17,7 @@ tap.test('should create tasks', async () => {
   });
   afterTask = new taskbuffer.Task({
     name: 'myAfterTask',
-    taskFunction: async (x) => {
+    taskFunction: async x => {
       if (x === 'hi') {
         console.log('afterTask: values get passed along alright');
       }
@@ -30,7 +30,7 @@ tap.test('should create tasks', async () => {
 
   mainTask = new taskbuffer.Task({
     name: 'mainTask',
-    taskFunction: async (x) => {
+    taskFunction: async x => {
       if (x === 'hi') {
         console.log('mainTask: values get passed along alright');
       }
@@ -48,4 +48,4 @@ tap.test('should execute the mainTask', async () => {
   await mainTask.trigger();
 });
 
-tap.start();
+tap.start();

test/test.taskrunner.ts

@@ -0,0 +1,29 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+import * as taskbuffer from '../ts/index';
+
+let testTaskRunner: taskbuffer.TaskRunner;
+
+tap.test('should create a valid taskrunner', async () => {
+  testTaskRunner = new taskbuffer.TaskRunner();
+  testTaskRunner.start();
+});
+
+tap.test('should execute task when its scheduled', async (tools) => {
+  const done = tools.defer();
+  testTaskRunner.addTask(new taskbuffer.Task({
+    taskFunction: async () => {
+      console.log('hi');
+    }
+  }));
+
+  testTaskRunner.addTask(new taskbuffer.Task({
+    taskFunction: async () => {
+      console.log('there');
+      done.resolve();
+    }
+  }));
+
+  await done.promise;
+});
+
+tap.start();

ts/index.ts

@@ -3,6 +3,4 @@ export { Taskchain } from './taskbuffer.classes.taskchain';
 export { Taskparallel } from './taskbuffer.classes.taskparallel';
 export { TaskManager } from './taskbuffer.classes.taskmanager';
 export { TaskOnce } from './taskbuffer.classes.taskonce';
-
+export { TaskRunner } from './taskbuffer.classes.taskrunner';
-// import for naming only
-import './taskbuffer.classes.helpers';

ts/taskbuffer.classes.bufferrunner.ts

@@ -1,4 +1,4 @@
-import { Task } from "./taskbuffer.classes.task";
+import { Task } from './taskbuffer.classes.task';
 
 export class BufferRunner {
   public task: Task;
@@ -39,4 +39,4 @@ export class BufferRunner {
     };
     recursiveBufferRunner(x);
   }
-}
+}

ts/taskbuffer.classes.helpers.ts

@@ -1,5 +1,2 @@
 import plugins = require('./taskbuffer.plugins');
 import { Task, ITaskFunction } from './taskbuffer.classes.task';
-
-
-

ts/taskbuffer.classes.task.ts

@@ -12,12 +12,12 @@ export type TPreOrAfterTaskFunction = () => Task;
 export class Task {
   // STATIC
   public static extractTask(preOrAfterTaskArg: Task | TPreOrAfterTaskFunction): Task {
-    switch(true) {
+    switch (true) {
-      case (!preOrAfterTaskArg):
+      case !preOrAfterTaskArg:
         return null;
-      case (preOrAfterTaskArg instanceof Task):
+      case preOrAfterTaskArg instanceof Task:
         return preOrAfterTaskArg as Task;
-      case typeof preOrAfterTaskArg === "function":
+      case typeof preOrAfterTaskArg === 'function':
         const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
         return taskFunction();
       default:
@@ -25,13 +25,12 @@ export class Task {
     }
   }
 
-
   public static emptyTaskFunction: ITaskFunction = function(x) {
     const done = plugins.smartpromise.defer();
     done.resolve();
     return done.promise;
   };
-  
+
   public static isTask = (taskArg: Task): boolean => {
     if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
       return true;
@@ -39,8 +38,11 @@ export class Task {
       return false;
     }
   };
-  
+
-  public static isTaskTouched = (taskArg: Task | TPreOrAfterTaskFunction, touchedTasksArray: Task[]): boolean => {
+  public static isTaskTouched = (
+    taskArg: Task | TPreOrAfterTaskFunction,
+    touchedTasksArray: Task[]
+  ): boolean => {
     const taskToCheck = Task.extractTask(taskArg);
     let result = false;
     for (const keyArg in touchedTasksArray) {
@@ -50,23 +52,26 @@ export class Task {
     }
     return result;
   };
-  
+
-  public static runTask = async (taskArg: Task | TPreOrAfterTaskFunction, optionsArg: { x?; touchedTasksArray?: Task[] }) => {
+  public static runTask = async (
+    taskArg: Task | TPreOrAfterTaskFunction,
+    optionsArg: { x?; touchedTasksArray?: Task[] }
+  ) => {
     const taskToRun = Task.extractTask(taskArg);
     const done = plugins.smartpromise.defer();
-  
+
     // pay respect to execDelay
     if (taskToRun.execDelay) {
       await plugins.smartdelay.delayFor(taskToRun.execDelay);
     }
-  
+
     //  set running params
     taskToRun.running = true;
-  
+
     done.promise.then(async () => {
       taskToRun.running = false;
     });
-  
+
     // handle options
     const options = {
       ...{ x: undefined, touchedTasksArray: [] },
@@ -74,15 +79,15 @@ export class Task {
     };
     const x = options.x;
     const touchedTasksArray: Task[] = options.touchedTasksArray;
-  
+
     touchedTasksArray.push(taskToRun);
-  
+
     // run the task cascade
     const localDeferred = plugins.smartpromise.defer();
     localDeferred.promise
       .then(() => {
         // lets run any preTask
-        
+
         if (taskToRun.preTask && !Task.isTaskTouched(taskToRun.preTask, touchedTasksArray)) {
           return Task.runTask(taskToRun.preTask, { x, touchedTasksArray });
         } else {
@@ -116,7 +121,7 @@ export class Task {
       });
     localDeferred.resolve();
     return await done.promise;
-  }
+  };
 
   // INSTANCE
   // man datory properties

ts/taskbuffer.classes.taskmanager.ts

@@ -10,7 +10,7 @@ export interface ICronJob {
 export class TaskManager {
   public taskMap = new plugins.lik.Objectmap<Task>();
   private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
-  
+
   constructor() {
     // nothing here
   }
@@ -85,7 +85,7 @@ export class TaskManager {
 
   /**
    * deschedules a task by name
-   * @param taskNameArg 
+   * @param taskNameArg
    */
   public descheduleTaskByName(taskNameArg: string) {
     const descheduledCron = this.cronJobMap.findOneAndRemove(itemArg => {

ts/taskbuffer.classes.taskrunner.ts

@@ -8,11 +8,18 @@ export class TaskRunner {
   public runningTasks: plugins.lik.Objectmap<Task> = new plugins.lik.Objectmap<Task>();
   public qeuedTasks: Task[] = [];
 
+  constructor() {
+    this.runningTasks.eventSubject.subscribe(async eventArg => {
+      this.checkExecution();
+    });
+  }
+
   /**
    * adds a task to the qeue
    */
   public addTask(taskArg: Task) {
     this.qeuedTasks.push(taskArg);
+    this.checkExecution();
   }
 
   /**
@@ -30,12 +37,20 @@ export class TaskRunner {
     this.status = 'running';
   }
 
+  /**
+   * checks wether execution is on point
+   */
   public async checkExecution() {
-    if (this.runningTasks.getArray().length < this.maxParrallelJobs) {
+    if (
+      this.runningTasks.getArray().length < this.maxParrallelJobs &&
+      this.status === 'running' &&
+      this.qeuedTasks.length > 0
+    ) {
       const nextJob = this.qeuedTasks.shift();
       this.runningTasks.add(nextJob);
       await nextJob.trigger();
-
+      this.runningTasks.remove(nextJob);
+      this.checkExecution();
     }
   }
 
@@ -44,5 +59,5 @@ export class TaskRunner {
    */
   public stop() {
     this.status = 'stopped';
-  };
+  }
 }