2.0.15

.gitignore

@@ -1,4 +1,22 @@
-coverage/
-node_modules
-pages/
 .nogit/
+
+# artifacts
+coverage/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -34,48 +34,11 @@ snyk:
   - docker
   - notpriv
 
-sast:
-  stage: security
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  variables:
-    DOCKER_DRIVER: overlay2
-  allow_failure: true
-  services:
-    - docker:stable-dind
-  script:
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command npm run build
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume "$PWD:/code"
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
-  artifacts:
-    reports:
-      sast: gl-sast-report.json
-  tags:
-  - docker
-  - priv
-
 # ====================
 # test stage
 # ====================
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
   - npmci npm prepare
@@ -85,12 +48,24 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -103,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -131,13 +98,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

npmextra.json

@@ -1,12 +1,17 @@
 {
-  "npmts":{
-    "mode":"default",
-    "testConfig": {
-      "parallel": false
-    }
-  },
   "npmci": {
     "npmGlobalTools": [],
-    "npmAccessLevel": "public"
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "taskbuffer",
+      "shortDescription": "flexible task management. TypeScript ready!",
+      "npmPackagename": "@pushrocks/taskbuffer",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/taskbuffer",
-  "version": "2.0.6",
+  "version": "2.0.15",
   "private": false,
   "description": "flexible task management. TypeScript ready!",
   "main": "dist/index.js",
@@ -27,20 +27,31 @@
   },
   "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.4",
-    "@pushrocks/smartdelay": "^2.0.2",
-    "@pushrocks/smartlog": "^2.0.9",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@types/cron": "^1.3.0",
-    "cron": "^1.6.0",
-    "rxjs": "^6.3.3"
+    "@pushrocks/lik": "^3.0.11",
+    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartpromise": "^3.0.5",
+    "@types/cron": "^1.7.1",
+    "cron": "^1.7.2",
+    "rxjs": "^6.5.3"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.4",
-    "@gitzone/tstest": "^1.0.18",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.12.18",
-    "tslint": "^5.12.1",
-    "tslint-config-prettier": "^1.17.0"
-  }
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.7.5",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -1,64 +1,22 @@
-# taskbuffer
-
+# @pushrocks/taskbuffer
 flexible task management. TypeScript ready!
 
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/taskbuffer)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/taskbuffer)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/taskbuffer)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/taskbuffer/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/taskbuffer)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/taskbuffer)
+* [github.com (source mirror)](https://github.com/pushrocks/taskbuffer)
+* [docs (typedoc)](https://pushrocks.gitlab.io/taskbuffer/)
 
 ## Status for master
+[![build status](https://gitlab.com/pushrocks/taskbuffer/badges/master/build.svg)](https://gitlab.com/pushrocks/taskbuffer/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/taskbuffer/badges/master/coverage.svg)](https://gitlab.com/pushrocks/taskbuffer/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/taskbuffer.svg)](https://www.npmjs.com/package/@pushrocks/taskbuffer)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/taskbuffer/badge.svg)](https://snyk.io/test/npm/@pushrocks/taskbuffer)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
 
-[![build status](https://GitLab.com/pushrocks/taskbuffer/badges/master/build.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/taskbuffer/badges/master/coverage.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/taskbuffer.svg)](https://www.npmjs.com/package/taskbuffer)
-[![Dependency Status](https://david-dm.org/pushrocks/taskbuffer.svg)](https://david-dm.org/pushrocks/taskbuffer)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/taskbuffer/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/taskbuffer/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/taskbuffer/badges/code.svg)](https://www.bithound.io/github/pushrocks/taskbuffer)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Install
-
-```sh
-npm install taskbuffer --save
-```
-
-## Concepts
-
-### class `Task`
-
-- A Task in its most simple form is a function that is executed when the task runs.
-- A Task can have a **preTask** and an **afterTask**
-  (those are run before or after the main function whenever the task is called)
-- A Task can be buffered.
-  That means it can be called multiple times in a very short time.
-  However execution happens in line:
-  meaning execution of the task's main function is on halt until the previous task call has finished.
-  You can set bufferMax number, which is the max number of buffered task calls.
-  Any additional calls will then be truncated
-- Task.trigger() and Task.triggerBuffered() always return a Promise
-  which is fullfilled once the related task call has completed.
-- Task.triggered() is an Observable stream that emits events every time a task call is called and every time a call is completed.
-- Task is compatible to gulp streams.
-
-### class `TaskChain`
-
-- TaskChain extends Task.
-- Multiple Tasks can be combined in a bigger task using a TaskChain.
-- While the tasks are async in themselve, TaskChain **runs Tasks serialized** (one after the other)
-- that means that tasks can rely on each other and
-
-### class `TaskParallel`
-
-- TaskParallel extends Task.
-- like TaskChain, however **tasks run in parallel**
-- Tasks cannot rely on each other.
-
-### Usage
+## Usage
 
 We highly recommend TypeScript as this module supports **TypeScript intellisense**.
 
@@ -85,3 +43,10 @@ For further information read the linked docs at the top of this README.
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
 
 [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.2.taskchain.ts

@@ -5,7 +5,7 @@ import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
 
 let task1Executed = false;
-let task1 = new taskbuffer.Task({
+const task1 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task1Executed = true;
@@ -13,7 +13,7 @@ let task1 = new taskbuffer.Task({
 });
 
 let task2Executed = false;
-let task2 = new taskbuffer.Task({
+const task2 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task2Executed = true;
@@ -21,7 +21,7 @@ let task2 = new taskbuffer.Task({
 });
 
 let task3Executed = false;
-let task3 = new taskbuffer.Task({
+const task3 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task3Executed = true;
@@ -29,11 +29,11 @@ let task3 = new taskbuffer.Task({
 });
 
 tap.test('expect run tasks in sequence', async () => {
-  let testTaskchain = new taskbuffer.Taskchain({
+  const testTaskchain = new taskbuffer.Taskchain({
     name: 'Taskchain1',
     taskArray: [task1, task2, task3]
   });
-  let testPromise = testTaskchain.trigger();
+  const testPromise = testTaskchain.trigger();
   await smartdelay.delayFor(2100);
   // tslint:disable-next-line:no-unused-expression
   expect(task1Executed).to.be.true;

test/test.3.taskparallel.ts

@@ -1,11 +1,9 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import taskbuffer = require('../ts/index');
-
-import * as smartq from 'smartq';
 import * as smartdelay from '@pushrocks/smartdelay';
 
 let task1Executed = false;
-let task1 = new taskbuffer.Task({
+const task1 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task1Executed = true;
@@ -13,7 +11,7 @@ let task1 = new taskbuffer.Task({
 });
 
 let task2Executed = false;
-let task2 = new taskbuffer.Task({
+const task2 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task2Executed = true;
@@ -21,7 +19,7 @@ let task2 = new taskbuffer.Task({
 });
 
 let task3Executed = false;
-let task3 = new taskbuffer.Task({
+const task3 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task3Executed = true;
@@ -29,7 +27,7 @@ let task3 = new taskbuffer.Task({
 });
 
 tap.test('expect run in Parallel', async () => {
-  let testTaskparallel = new taskbuffer.Taskparallel({
+  const testTaskparallel = new taskbuffer.Taskparallel({
     taskArray: [task1, task2, task3]
   });
   await testTaskparallel.trigger();

test/test.4.taskmanager.ts

@@ -6,7 +6,7 @@ import * as smartdelay from '@pushrocks/smartdelay';
 
 let myTaskManager: taskbuffer.TaskManager;
 let taskRunCounter = 0;
-let taskDone = smartpromise.defer();
+const taskDone = smartpromise.defer();
 
 tap.test('should create an instance of TaskManager', async () => {
   myTaskManager = new taskbuffer.TaskManager();

test/test.5.task.paramflow.ts

@@ -4,9 +4,9 @@ import taskbuffer = require('../ts/index');
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
 
-let flowTask1 = new taskbuffer.Task({
+const flowTask1 = new taskbuffer.Task({
   taskFunction: (x: number) => {
-    let done = smartpromise.defer();
+    const done = smartpromise.defer();
     console.log('flowTask1');
     console.log(x);
     done.resolve(x);
@@ -14,9 +14,9 @@ let flowTask1 = new taskbuffer.Task({
   }
 });
 
-let flowTaskBuffered = new taskbuffer.Task({
+const flowTaskBuffered = new taskbuffer.Task({
   taskFunction: (x: number) => {
-    let done = smartpromise.defer();
+    const done = smartpromise.defer();
     console.log('flowTask1');
     console.log(x);
     done.resolve(x);
@@ -26,9 +26,9 @@ let flowTaskBuffered = new taskbuffer.Task({
   bufferMax: 1
 });
 
-let flowTask2 = new taskbuffer.Task({
+const flowTask2 = new taskbuffer.Task({
   taskFunction: (x: number) => {
-    let done = smartpromise.defer();
+    const done = smartpromise.defer();
     console.log('flowTask2');
     console.log(x);
     done.resolve(x);
@@ -37,27 +37,27 @@ let flowTask2 = new taskbuffer.Task({
   preTask: flowTask1
 });
 
-let flowTask3 = new taskbuffer.Taskchain({
+const flowTask3 = new taskbuffer.Taskchain({
   taskArray: [flowTask1, flowTask2]
 });
 
 tap.test('should let a value flow through a task', async () => {
-  let result = await flowTask1.trigger(12);
+  const result = await flowTask1.trigger(12);
   expect(result).to.equal(12);
 });
 
 tap.test('expect values to flow between tasks', async () => {
-  let result = await flowTask2.trigger(12);
+  const result = await flowTask2.trigger(12);
   expect(result).to.equal(12);
 });
 
 tap.test('expect values to flow between tasks when buffered', async () => {
-  let result = await flowTaskBuffered.trigger(12);
+  const result = await flowTaskBuffered.trigger(12);
   expect(result).to.equal(12);
 });
 
 tap.test('expect values to flow between tasks in Taskchain', async () => {
-  let result = await flowTask3.trigger(12);
+  const result = await flowTask3.trigger(12);
   expect(result).to.equal(12);
 });
 

test/test.7.taskloop.ts

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

ts/taskbuffer.classes.bufferrunner.ts

@@ -0,0 +1,42 @@
+import { Task } from "./taskbuffer.classes.task";
+
+export class BufferRunner {
+  public task: Task;
+  // initialze by default
+  public bufferCounter: number = 0;
+  public running: boolean = false;
+  constructor(taskArg: Task) {
+    this.task = taskArg;
+  }
+
+  public trigger(x): Promise<any> {
+    if (!(this.bufferCounter >= this.task.bufferMax)) {
+      this.bufferCounter++;
+    }
+    const returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
+      this.bufferCounter + 1
+    );
+    if (!this.running) {
+      this._run(x);
+    }
+    return returnPromise;
+  }
+
+  private _run(x) {
+    const recursiveBufferRunner = x => {
+      if (this.bufferCounter >= 0) {
+        this.running = true;
+        this.task.running = true;
+        Task.runTask(this.task, { x: x }).then(x => {
+          this.bufferCounter--;
+          this.task.cycleCounter.informOfCycle(x);
+          recursiveBufferRunner(x);
+        });
+      } else {
+        this.running = false;
+        this.task.running = false;
+      }
+    };
+    recursiveBufferRunner(x);
+  }
+}

ts/taskbuffer.classes.cyclecounter.ts

@@ -0,0 +1,36 @@
+import * as plugins from './taskbuffer.plugins';
+import { Task } from './taskbuffer.classes.task';
+
+export interface ICycleObject {
+  cycleCounter: number;
+  deferred: plugins.smartpromise.Deferred<any>;
+}
+
+export class CycleCounter {
+  public task: Task;
+  public cycleObjectArray: ICycleObject[] = [];
+  constructor(taskArg: Task) {
+    this.task = taskArg;
+  }
+  public getPromiseForCycle(cycleCountArg: number) {
+    const done = plugins.smartpromise.defer();
+    const cycleObject: ICycleObject = {
+      cycleCounter: cycleCountArg,
+      deferred: done
+    };
+    this.cycleObjectArray.push(cycleObject);
+    return done.promise;
+  }
+  public informOfCycle(x) {
+    const newCycleObjectArray: ICycleObject[] = [];
+    this.cycleObjectArray.forEach(cycleObjectArg => {
+      cycleObjectArg.cycleCounter--;
+      if (cycleObjectArg.cycleCounter <= 0) {
+        cycleObjectArg.deferred.resolve(x);
+      } else {
+        newCycleObjectArray.push(cycleObjectArg);
+      }
+    });
+    this.cycleObjectArray = newCycleObjectArray;
+  }
+}

ts/taskbuffer.classes.helpers.ts

@@ -1,160 +1,5 @@
 import plugins = require('./taskbuffer.plugins');
 import { Task, ITaskFunction } from './taskbuffer.classes.task';
 
-export let emptyTaskFunction: ITaskFunction = function(x) {
-  let done = plugins.smartpromise.defer();
-  done.resolve();
-  return done.promise;
-};
 
-export let isTask = function(taskArg: Task): boolean {
-  if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
-    return true;
-  } else {
-    return false;
-  }
-};
 
-export let isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean => {
-  let result = false;
-  for (let keyArg in touchedTasksArray) {
-    if (taskArg === touchedTasksArray[keyArg]) {
-      result = true;
-    }
-  }
-  return result;
-};
-
-export let runTask = async (taskArg: Task, optionsArg: { x?; touchedTasksArray?: Task[] }) => {
-  let done = plugins.smartpromise.defer();
-
-  // pay respect to execDelay
-  if (taskArg.execDelay) {
-    await plugins.smartdelay.delayFor(taskArg.execDelay);
-  }
-
-  //  set running params
-  taskArg.running = true;
-
-  done.promise.then(async () => {
-    taskArg.running = false;
-  });
-
-  // handle options
-  let options = {
-    ...{ x: undefined, touchedTasksArray: [] },
-    ...optionsArg
-  };
-  let x = options.x;
-  let touchedTasksArray: Task[] = options.touchedTasksArray;
-
-  touchedTasksArray.push(taskArg);
-
-  // run the task cascade
-  let localDeferred = plugins.smartpromise.defer();
-  localDeferred.promise
-    .then(() => {
-      if (taskArg.preTask && !isTaskTouched(taskArg.preTask, touchedTasksArray)) {
-        return runTask(taskArg.preTask, { x: x, touchedTasksArray: touchedTasksArray });
-      } else {
-        let done2 = plugins.smartpromise.defer();
-        done2.resolve(x);
-        return done2.promise;
-      }
-    })
-    .then(x => {
-      return taskArg.taskFunction(x);
-    })
-    .then(x => {
-      if (taskArg.afterTask && !isTaskTouched(taskArg.afterTask, touchedTasksArray)) {
-        return runTask(taskArg.afterTask, { x: x, touchedTasksArray: touchedTasksArray });
-      } else {
-        let done2 = plugins.smartpromise.defer();
-        done2.resolve(x);
-        return done2.promise;
-      }
-    })
-    .then(x => {
-      done.resolve(x);
-    })
-    .catch(err => {
-      console.log(err);
-    });
-  localDeferred.resolve();
-  return await done.promise;
-};
-
-export interface cycleObject {
-  cycleCounter: number;
-  deferred: plugins.smartpromise.Deferred<any>;
-}
-
-export class CycleCounter {
-  task: Task;
-  cycleObjectArray: cycleObject[] = [];
-  constructor(taskArg: Task) {
-    this.task = taskArg;
-  }
-  getPromiseForCycle(cycleCountArg: number) {
-    let done = plugins.smartpromise.defer();
-    let cycleObject: cycleObject = {
-      cycleCounter: cycleCountArg,
-      deferred: done
-    };
-    this.cycleObjectArray.push(cycleObject);
-    return done.promise;
-  }
-  informOfCycle(x) {
-    let newCycleObjectArray: cycleObject[] = [];
-    this.cycleObjectArray.forEach(cycleObjectArg => {
-      cycleObjectArg.cycleCounter--;
-      if (cycleObjectArg.cycleCounter <= 0) {
-        cycleObjectArg.deferred.resolve(x);
-      } else {
-        newCycleObjectArray.push(cycleObjectArg);
-      }
-    });
-    this.cycleObjectArray = newCycleObjectArray;
-  }
-}
-
-export class BufferRunner {
-  task: Task;
-  // initialze by default
-  bufferCounter: number = 0;
-  running: boolean = false;
-  constructor(taskArg: Task) {
-    this.task = taskArg;
-  }
-
-  trigger(x): Promise<any> {
-    if (!(this.bufferCounter >= this.task.bufferMax)) {
-      this.bufferCounter++;
-    }
-    let returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
-      this.bufferCounter + 1
-    );
-    if (!this.running) {
-      this._run(x);
-    }
-    return returnPromise;
-  }
-
-  private _run(x) {
-    let recursiveBufferRunner = x => {
-      if (this.bufferCounter >= 0) {
-        this.running = true;
-        this.task.running = true;
-        runTask(this.task, { x: x }).then(x => {
-          this.bufferCounter--;
-          this.task.cycleCounter.informOfCycle(x);
-          recursiveBufferRunner(x);
-        });
-      } else {
-        this.running = false;
-        this.task.running = false;
-      }
-    };
-    recursiveBufferRunner(x);
-  }
-}

ts/taskbuffer.classes.task.ts

@@ -1,29 +1,142 @@
 import * as plugins from './taskbuffer.plugins';
 import * as helpers from './taskbuffer.classes.helpers';
+import { BufferRunner } from './taskbuffer.classes.bufferrunner';
+import { CycleCounter } from './taskbuffer.classes.cyclecounter';
 
 export interface ITaskFunction {
   (x?: any): PromiseLike<any>;
 }
 
-export class Task {
-  // man datory properties
-  name: string;
-  taskFunction: ITaskFunction;
-  buffered: boolean;
+export type TPreOrAfterTaskFunction = () => Task;
 
-  bufferMax: number;
-  execDelay: number;
+export class Task {
+  // STATIC
+  public static extractTask(preOrAfterTaskArg: Task | TPreOrAfterTaskFunction): Task {
+    switch(true) {
+      case (!preOrAfterTaskArg):
+        return null;
+      case (preOrAfterTaskArg instanceof Task):
+        return preOrAfterTaskArg as Task;
+      case typeof preOrAfterTaskArg === "function":
+        const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
+        return taskFunction();
+      default:
+        return null;
+    }
+  }
+
+
+  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;
+    } else {
+      return false;
+    }
+  };
+  
+  public static isTaskTouched = (taskArg: Task | TPreOrAfterTaskFunction, touchedTasksArray: Task[]): boolean => {
+    const taskToCheck = Task.extractTask(taskArg);
+    let result = false;
+    for (const keyArg in touchedTasksArray) {
+      if (taskToCheck === touchedTasksArray[keyArg]) {
+        result = true;
+      }
+    }
+    return result;
+  };
+  
+  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: [] },
+      ...optionsArg
+    };
+    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 {
+          const done2 = plugins.smartpromise.defer();
+          done2.resolve(x);
+          return done2.promise;
+        }
+      })
+      .then(async x => {
+        // lets run the main task
+        try {
+          return await taskToRun.taskFunction(x);
+        } catch (e) {
+          console.log(e);
+        }
+      })
+      .then(x => {
+        if (taskToRun.afterTask && !Task.isTaskTouched(taskToRun.afterTask, touchedTasksArray)) {
+          return Task.runTask(taskToRun.afterTask, { x: x, touchedTasksArray: touchedTasksArray });
+        } else {
+          const done2 = plugins.smartpromise.defer();
+          done2.resolve(x);
+          return done2.promise;
+        }
+      })
+      .then(x => {
+        done.resolve(x);
+      })
+      .catch(err => {
+        console.log(err);
+      });
+    localDeferred.resolve();
+    return await done.promise;
+  }
+
+  // INSTANCE
+  // man datory properties
+  public name: string;
+  public taskFunction: ITaskFunction;
+  public buffered: boolean;
+
+  public bufferMax: number;
+  public execDelay: number;
 
   // tasks to run before and after
-  preTask: Task;
-  afterTask: Task;
+  public preTask: Task | TPreOrAfterTaskFunction;
+  public afterTask: Task | TPreOrAfterTaskFunction;
 
   // initialize by default
-  running: boolean = false;
-  bufferRunner = new helpers.BufferRunner(this);
-  cycleCounter = new helpers.CycleCounter(this);
+  public running: boolean = false;
+  public bufferRunner = new BufferRunner(this);
+  public cycleCounter = new CycleCounter(this);
 
-  idle: boolean = true;
+  public idle: boolean = true;
   private _state: string = 'ready';
 
   constructor(optionsArg: {
@@ -34,11 +147,11 @@ export class Task {
     /**
      * any other task to run before
      */
-    preTask?: Task;
+    preTask?: Task | TPreOrAfterTaskFunction;
     /**
      * any other task to run after
      */
-    afterTask?: Task;
+    afterTask?: Task | TPreOrAfterTaskFunction;
     /**
      * wether this task should run buffered
      */
@@ -70,7 +183,7 @@ export class Task {
   /**
    * trigger the task. Will trigger buffered if this.buffered is true
    */
-  trigger(x?): Promise<any> {
+  public trigger(x?): Promise<any> {
     if (this.buffered) {
       return this.triggerBuffered(x);
     } else {
@@ -81,14 +194,14 @@ export class Task {
   /**
    * trigger task unbuffered.
    */
-  triggerUnBuffered(x?): Promise<any> {
-    return helpers.runTask(this, { x: x });
+  public triggerUnBuffered(x?): Promise<any> {
+    return Task.runTask(this, { x: x });
   }
 
   /**
    * trigger task buffered.
    */
-  triggerBuffered(x?): Promise<any> {
+  public triggerBuffered(x?): Promise<any> {
     return this.bufferRunner.trigger(x);
   }
 

ts/taskbuffer.classes.taskmanager.ts

@@ -1,12 +1,16 @@
 import * as plugins from './taskbuffer.plugins';
 import { Task } from './taskbuffer.classes.task';
 
-// interfaces
-import { Objectmap } from '@pushrocks/lik';
+export interface ICronJob {
+  cronString: string;
+  taskNameArg: string;
+  job: any;
+}
 
 export class TaskManager {
-  taskMap = new plugins.lik.Objectmap<Task>();
+  public taskMap = new plugins.lik.Objectmap<Task>();
   private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
+  
   constructor() {
     // nothing here
   }
@@ -15,7 +19,7 @@ export class TaskManager {
    * checks if a task is already present
    * @param taskNameArg
    */
-  getTaskByName(taskNameArg): Task {
+  public getTaskByName(taskNameArg): Task {
     return this.taskMap.find(itemArg => {
       return itemArg.name === taskNameArg;
     });
@@ -25,7 +29,7 @@ export class TaskManager {
    * adds a Task to the TaskManager
    * @param taskArg
    */
-  addTask(taskArg: Task): void {
+  public addTask(taskArg: Task): void {
     if (!taskArg.name) {
       throw new Error('taskArg needs a name to be added to taskManager');
     }
@@ -37,9 +41,9 @@ export class TaskManager {
    * @param taskArg
    * @param cronStringArg
    */
-  addAndScheduleTask(taskArg: Task, cronStringArg: string) {
+  public addAndScheduleTask(taskArg: Task, cronStringArg: string) {
     this.addTask(taskArg);
-    let taskName = taskArg.name;
+    const taskName = taskArg.name;
     this.scheduleTaskByName(taskName, cronStringArg);
   }
 
@@ -47,21 +51,25 @@ export class TaskManager {
    * triggers a task in the TaskManagerByName
    * @param taskNameArg
    */
-  triggerTaskByName(taskNameArg: string): Promise<any> {
-    let taskToTrigger = this.getTaskByName(taskNameArg);
+  public triggerTaskByName(taskNameArg: string): Promise<any> {
+    const taskToTrigger = this.getTaskByName(taskNameArg);
     if (!taskToTrigger) {
       throw new Error(`There is no task with the name of ${taskNameArg}`);
     }
     return taskToTrigger.trigger();
   }
 
+  public async triggerTask(task: Task) {
+    return task.trigger();
+  }
+
   /**
    * schedules the task by name
    * @param taskNameArg
    */
-  scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
-    let taskToSchedule = this.getTaskByName(taskNameArg);
-    let job = new plugins.cron.CronJob({
+  public scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
+    const taskToSchedule = this.getTaskByName(taskNameArg);
+    const job = new plugins.cron.CronJob({
       cronTime: cronStringArg,
       onTick: () => {
         this.triggerTaskByName(taskNameArg);
@@ -71,25 +79,31 @@ export class TaskManager {
     this.cronJobMap.add({
       taskNameArg: taskToSchedule.name,
       cronString: cronStringArg,
-      job: job
+      job
     });
   }
 
-  descheduleTaskByName(taskNameArg: string) {
-    let descheduledCron = this.cronJobMap.findOneAndRemove(itemArg => {
+  /**
+   * deschedules a task by name
+   * @param taskNameArg 
+   */
+  public descheduleTaskByName(taskNameArg: string) {
+    const descheduledCron = this.cronJobMap.findOneAndRemove(itemArg => {
       return itemArg.taskNameArg === taskNameArg;
     });
     descheduledCron.job.stop();
   }
+
+  /**
+   * deschedules a task
+   * @param task
+   */
+  public async descheduleTask(task: Task) {
+    await this.descheduleTaskByName(task.name);
+  }
   /**
    * returns all schedules of a specific task
    * @param taskNameArg
    */
-  getSchedulesForTaskName(taskNameArg: string) {}
-}
-
-export interface ICronJob {
-  cronString: string;
-  taskNameArg: string;
-  job: any;
+  public getSchedulesForTaskName(taskNameArg: string) {}
 }

ts/taskbuffer.plugins.ts

@@ -1,5 +1,5 @@
 import * as smartlog from '@pushrocks/smartlog';
-let cron = require('cron');
+import cron from 'cron';
 import * as lik from '@pushrocks/lik';
 import * as rxjs from 'rxjs';
 import * as smartpromise from '@pushrocks/smartpromise';