2.0.13

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/taskbuffer",
-  "version": "2.0.9",
+  "version": "2.0.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -229,9 +229,9 @@
       "dev": true
     },
     "@pushrocks/smartpromise": {
-      "version": "3.0.2",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.0.2.tgz",
-      "integrity": "sha512-jmrJMUEmBCWChWK8CIcx4Vw3wv/8OgVNmkaxJrbs+WMaoRUfJtpWWJfrAwwHWt9ZXJbarJ+CwfwfYiiZXymndQ=="
+      "version": "3.0.5",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-3.0.5.tgz",
+      "integrity": "sha512-9kHBWyDFjQ6cV1rseOfge02EH6huh/mrtqxlFoJoxnMaGWf5F8H3UEsskBBUGI6QKE1Bl8evr74AIKWwJ0r/bA=="
     },
     "@pushrocks/smartrequest": {
       "version": "1.1.23",
@@ -387,9 +387,9 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
     },
     "@types/node": {
-      "version": "12.7.4",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.7.4.tgz",
-      "integrity": "sha512-W0+n1Y+gK/8G2P/piTkBBN38Qc5Q1ZSO6B5H3QmPCUewaiXOo2GCAWZ4ElZCcNhjJuBSUSLGFUJnmlCn5+nxOQ=="
+      "version": "12.7.5",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-12.7.5.tgz",
+      "integrity": "sha512-9fq4jZVhPNW8r+UYKnxF1e2HkDWOWKM5bC2/7c9wPV835I0aOrVbS/Hw/pWPk2uKrNXQqg9Z959Kz+IYDd5p3w=="
     },
     "@types/vinyl": {
       "version": "2.0.3",
@@ -641,9 +641,9 @@
       "dev": true
     },
     "cron": {
-      "version": "1.7.1",
-      "resolved": "https://verdaccio.lossless.one/cron/-/cron-1.7.1.tgz",
-      "integrity": "sha512-gmMB/pJcqUVs/NklR1sCGlNYM7TizEw+1gebz20BMc/8bTm/r7QUp3ZPSPlG8Z5XRlvb7qhjEjq/+bdIfUCL2A==",
+      "version": "1.7.2",
+      "resolved": "https://verdaccio.lossless.one/cron/-/cron-1.7.2.tgz",
+      "integrity": "sha512-+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ==",
       "requires": {
         "moment-timezone": "^0.5.x"
       }
@@ -1467,16 +1467,16 @@
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
     "tslint": {
-      "version": "5.19.0",
-      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.19.0.tgz",
-      "integrity": "sha512-1LwwtBxfRJZnUvoS9c0uj8XQtAnyhWr9KlNvDIdB+oXyT+VpsOAaEhEgKi1HrZ8rq0ki/AAnbGSv4KM6/AfVZw==",
+      "version": "5.20.0",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.20.0.tgz",
+      "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
         "chalk": "^2.3.0",
         "commander": "^2.12.1",
-        "diff": "^3.2.0",
+        "diff": "^4.0.1",
         "glob": "^7.1.1",
         "js-yaml": "^3.13.1",
         "minimatch": "^3.0.4",
@@ -1485,14 +1485,6 @@
         "semver": "^5.3.0",
         "tslib": "^1.8.0",
         "tsutils": "^2.29.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "3.5.0",
-          "resolved": "https://verdaccio.lossless.one/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-          "dev": true
-        }
       }
     },
     "tslint-config-prettier": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/taskbuffer",
-  "version": "2.0.9",
+  "version": "2.0.13",
   "private": false,
   "description": "flexible task management. TypeScript ready!",
   "main": "dist/index.js",
@@ -30,17 +30,17 @@
     "@pushrocks/lik": "^3.0.11",
     "@pushrocks/smartdelay": "^2.0.3",
     "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.5",
     "@types/cron": "^1.7.1",
-    "cron": "^1.7.1",
+    "cron": "^1.7.2",
     "rxjs": "^6.5.3"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
     "@gitzone/tstest": "^1.0.24",
     "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.4",
-    "tslint": "^5.19.0",
+    "@types/node": "^12.7.5",
+    "tslint": "^5.20.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [

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.7.taskloop.ts

@@ -0,0 +1,40 @@
+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 :)');
+    }
+  });
+  afterTask = new taskbuffer.Task({
+    name: 'myAfterTask',
+    taskFunction: async () => {
+      console.log('afterTask executed :)');
+    },
+    preTask,
+    afterTask
+  });
+
+  mainTask = new taskbuffer.Task({
+    name: 'mainTask',
+    taskFunction: async () => {
+      console.log('main task executed');
+    },
+    preTask,
+    afterTask
+  });
+});
+
+tap.test('should execute the mainTasj', async () => {
+  await mainTask.trigger();
+});
+
+tap.start();

ts/taskbuffer.classes.helpers.ts

@@ -1,13 +1,13 @@
 import plugins = require('./taskbuffer.plugins');
 import { Task, ITaskFunction } from './taskbuffer.classes.task';
 
-export let emptyTaskFunction: ITaskFunction = function(x) {
-  let done = plugins.smartpromise.defer();
+export const emptyTaskFunction: ITaskFunction = function(x) {
+  const done = plugins.smartpromise.defer();
   done.resolve();
   return done.promise;
 };
 
-export let isTask = function(taskArg: Task): boolean {
+export const isTask = (taskArg: Task): boolean => {
   if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
     return true;
   } else {
@@ -15,9 +15,9 @@ export let isTask = function(taskArg: Task): boolean {
   }
 };
 
-export let isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean => {
+export const isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean => {
   let result = false;
-  for (let keyArg in touchedTasksArray) {
+  for (const keyArg in touchedTasksArray) {
     if (taskArg === touchedTasksArray[keyArg]) {
       result = true;
     }
@@ -25,8 +25,8 @@ export let isTaskTouched = (taskArg: Task, touchedTasksArray: Task[]): boolean =
   return result;
 };
 
-export let runTask = async (taskArg: Task, optionsArg: { x?; touchedTasksArray?: Task[] }) => {
-  let done = plugins.smartpromise.defer();
+export const runTask = async (taskArg: Task, optionsArg: { x?; touchedTasksArray?: Task[] }) => {
+  const done = plugins.smartpromise.defer();
 
   // pay respect to execDelay
   if (taskArg.execDelay) {
@@ -41,35 +41,41 @@ export let runTask = async (taskArg: Task, optionsArg: { x?; touchedTasksArray?:
   });
 
   // handle options
-  let options = {
+  const options = {
     ...{ x: undefined, touchedTasksArray: [] },
     ...optionsArg
   };
-  let x = options.x;
-  let touchedTasksArray: Task[] = options.touchedTasksArray;
+  const x = options.x;
+  const touchedTasksArray: Task[] = options.touchedTasksArray;
 
   touchedTasksArray.push(taskArg);
 
   // run the task cascade
-  let localDeferred = plugins.smartpromise.defer();
+  const localDeferred = plugins.smartpromise.defer();
   localDeferred.promise
     .then(() => {
+      // lets run any preTask
       if (taskArg.preTask && !isTaskTouched(taskArg.preTask, touchedTasksArray)) {
-        return runTask(taskArg.preTask, { x: x, touchedTasksArray: touchedTasksArray });
+        return runTask(taskArg.preTask, { x, touchedTasksArray });
       } else {
-        let done2 = plugins.smartpromise.defer();
+        const done2 = plugins.smartpromise.defer();
         done2.resolve(x);
         return done2.promise;
       }
     })
-    .then(x => {
-      return taskArg.taskFunction(x);
+    .then(async x => {
+      // lets run the main task
+      try {
+        return await taskArg.taskFunction(x);
+      } catch (e) {
+        console.log(e);
+      }
     })
     .then(x => {
       if (taskArg.afterTask && !isTaskTouched(taskArg.afterTask, touchedTasksArray)) {
         return runTask(taskArg.afterTask, { x: x, touchedTasksArray: touchedTasksArray });
       } else {
-        let done2 = plugins.smartpromise.defer();
+        const done2 = plugins.smartpromise.defer();
         done2.resolve(x);
         return done2.promise;
       }
@@ -96,8 +102,8 @@ export class CycleCounter {
     this.task = taskArg;
   }
   getPromiseForCycle(cycleCountArg: number) {
-    let done = plugins.smartpromise.defer();
-    let cycleObject: cycleObject = {
+    const done = plugins.smartpromise.defer();
+    const cycleObject: cycleObject = {
       cycleCounter: cycleCountArg,
       deferred: done
     };
@@ -105,7 +111,7 @@ export class CycleCounter {
     return done.promise;
   }
   informOfCycle(x) {
-    let newCycleObjectArray: cycleObject[] = [];
+    const newCycleObjectArray: cycleObject[] = [];
     this.cycleObjectArray.forEach(cycleObjectArg => {
       cycleObjectArg.cycleCounter--;
       if (cycleObjectArg.cycleCounter <= 0) {
@@ -131,7 +137,7 @@ export class BufferRunner {
     if (!(this.bufferCounter >= this.task.bufferMax)) {
       this.bufferCounter++;
     }
-    let returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
+    const returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
       this.bufferCounter + 1
     );
     if (!this.running) {
@@ -141,7 +147,7 @@ export class BufferRunner {
   }
 
   private _run(x) {
-    let recursiveBufferRunner = x => {
+    const recursiveBufferRunner = x => {
       if (this.bufferCounter >= 0) {
         this.running = true;
         this.task.running = true;

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 {
   public taskMap = new plugins.lik.Objectmap<Task>();
   private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
+  
   constructor() {
     // nothing here
   }
@@ -55,6 +59,10 @@ export class TaskManager {
     return taskToTrigger.trigger();
   }
 
+  public async triggerTask(task: Task) {
+    return task.trigger();
+  }
+
   /**
    * schedules the task by name
    * @param taskNameArg
@@ -71,25 +79,31 @@ export class TaskManager {
     this.cronJobMap.add({
       taskNameArg: taskToSchedule.name,
       cronString: cronStringArg,
-      job: job
+      job
     });
   }
 
+  /**
+   * 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
    */
   public getSchedulesForTaskName(taskNameArg: string) {}
 }
-
-export interface ICronJob {
-  cronString: string;
-  taskNameArg: string;
-  job: any;
-}

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';