3.0.3

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -12,6 +12,9 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
@@ -19,22 +22,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
+auditProductionDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +66,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +77,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +97,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -5,6 +5,7 @@
     "npmRegistryUrl": "registry.npmjs.org"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@pushrocks/taskbuffer",
-  "version": "2.1.1",
+  "version": "3.0.3",
   "private": false,
   "description": "flexible task management. TypeScript ready!",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "(tstest test/ --web)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "repository": {
     "type": "git",
@@ -27,31 +28,34 @@
   },
   "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.13",
+    "@pushrocks/lik": "^6.0.0",
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartlog": "^3.0.1",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.7",
-    "@types/cron": "^1.7.1",
+    "@pushrocks/smartrx": "^3.0.0",
-    "cron": "^1.7.2",
+    "@pushrocks/smarttime": "^3.0.45"
-    "rxjs": "^6.5.3"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tsbundle": "^2.0.6",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@gitzone/tsrun": "^1.2.39",
-    "@types/node": "^12.12.14",
+    "@gitzone/tstest": "^1.0.72",
-    "tslint": "^5.20.1",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "tslint-config-prettier": "^1.18.0"
+    "@types/node": "^18.6.3"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ flexible task management. TypeScript ready!
 * [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)
+Status Category | Status Badge
-[![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)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/taskbuffer/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/taskbuffer/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/taskbuffer)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/taskbuffer)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/taskbuffer)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/taskbuffer)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/taskbuffer)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
@@ -44,7 +51,6 @@ 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). :)

test/test.1.task.ts

@@ -1,5 +1,6 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import taskbuffer = require('../ts/index');
+
+import * as taskbuffer from '../ts/index.js';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
@@ -11,7 +12,7 @@ let testPreTask = new taskbuffer.Task({
   taskFunction: async () => {
     console.log('preTask executed');
   },
-  preTask: testTask
+  preTask: testTask,
 });
 
 // some more tasks to test with
@@ -27,7 +28,7 @@ let task1 = new taskbuffer.Task({
       done.resolve();
     }, 5000);
     return done.promise;
-  }
+  },
 });
 
 let task2 = new taskbuffer.Task({
@@ -40,7 +41,7 @@ let task2 = new taskbuffer.Task({
       done.resolve();
     }, 5000);
     await done.promise;
-  }
+  },
 });
 
 let task3 = new taskbuffer.Task({
@@ -53,7 +54,7 @@ let task3 = new taskbuffer.Task({
       done.resolve();
     }, 5000);
     return done.promise;
-  }
+  },
 });
 
 tap.test('new Task() should return a new task', async () => {
@@ -61,12 +62,12 @@ tap.test('new Task() should return a new task', async () => {
     taskFunction: async () => {
       console.log('executed twice');
     },
-    preTask: testPreTask
+    preTask: testPreTask,
   });
 });
 
 tap.test('expect testTask to be an instance of Task', async () => {
-  expect(testTask).to.be.instanceof(taskbuffer.Task);
+  expect(testTask).toBeInstanceOf(taskbuffer.Task);
 });
 
 tap.test('expect testTask.idle is true', async () => {
@@ -76,13 +77,13 @@ tap.test('expect testTask.idle is true', async () => {
 });
 
 tap.test('testTask.running should be of type boolean and initially false', async () => {
-  expect(testTask.running).to.be.a('boolean');
+  expect(testTask.running).toBeTypeofBoolean();
   // tslint:disable-next-line:no-unused-expression
-  expect(testTask.running).to.be.false;
+  expect(testTask.running).toBeFalse();
 });
 
 tap.test('testTask.trigger() should return Promise', async () => {
-  expect(testTask.trigger()).to.be.instanceof(Promise);
+  expect(testTask.trigger()).toBeInstanceOf(Promise);
 });
 
 tap.test('testTask.trigger() returned Promise should be fullfilled', async () => {
@@ -93,7 +94,7 @@ tap.test('expect to run a task without pre and afterTask errorless', async () =>
   let localTestTask = new taskbuffer.Task({
     taskFunction: async () => {
       console.log('only once');
-    }
+    },
   });
   await localTestTask.trigger();
 });
@@ -104,7 +105,7 @@ tap.test('expect task to run in buffered mode', async () => {
       await smartdelay.delayFor(3000);
     },
     buffered: true,
-    bufferMax: 2
+    bufferMax: 2,
   });
   localTestTask.trigger();
   localTestTask.trigger();

test/test.2.taskchain.ts

@@ -1,5 +1,6 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import taskbuffer = require('../ts/index');
+
+import * as taskbuffer from '../ts/index.js';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
@@ -9,7 +10,7 @@ const task1 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task1Executed = true;
-  }
+  },
 });
 
 let task2Executed = false;
@@ -17,7 +18,7 @@ const task2 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task2Executed = true;
-  }
+  },
 });
 
 let task3Executed = false;
@@ -25,23 +26,23 @@ const task3 = new taskbuffer.Task({
   taskFunction: async () => {
     await smartdelay.delayFor(2000);
     task3Executed = true;
-  }
+  },
 });
 
 tap.test('expect run tasks in sequence', async () => {
   const testTaskchain = new taskbuffer.Taskchain({
     name: 'Taskchain1',
-    taskArray: [task1, task2, task3]
+    taskArray: [task1, task2, task3],
   });
   const testPromise = testTaskchain.trigger();
   await smartdelay.delayFor(2100);
   // tslint:disable-next-line:no-unused-expression
-  expect(task1Executed).to.be.true;
+  expect(task1Executed).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(task2Executed).to.be.false;
+  expect(task2Executed).toBeFalse();
   await smartdelay.delayFor(2100);
   // tslint:disable-next-line:no-unused-expression
-  expect(task2Executed).to.be.true;
+  expect(task2Executed).toBeTrue();
   await testPromise;
 });
 

test/test.3.taskparallel.ts

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

test/test.4.taskmanager.both.ts

@@ -1,5 +1,6 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import taskbuffer = require('../ts/index');
+
+import * as taskbuffer from '../ts/index.js';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
@@ -10,7 +11,7 @@ const taskDone = smartpromise.defer();
 
 tap.test('should create an instance of TaskManager', async () => {
   myTaskManager = new taskbuffer.TaskManager();
-  expect(myTaskManager).to.be.instanceof(taskbuffer.TaskManager);
+  expect(myTaskManager).toBeInstanceOf(taskbuffer.TaskManager);
 });
 
 tap.test('should run the task as expected', async () => {
@@ -18,25 +19,32 @@ tap.test('should run the task as expected', async () => {
   myTaskManager.addTask(
     new taskbuffer.Task({
       name: 'myTask',
+      bufferMax: 1,
+      buffered: true,
       taskFunction: async () => {
-        console.log('Task executed!');
+        console.log('Task "myTask" executed!');
         referenceBoolean = true;
         taskRunCounter++;
         if (taskRunCounter === 10) {
           taskDone.resolve();
         }
-      }
+      },
     })
   );
+  myTaskManager.start();
   await myTaskManager.triggerTaskByName('myTask');
   // tslint:disable-next-line:no-unused-expression
-  expect(referenceBoolean).to.be.true;
+  expect(referenceBoolean).toBeTrue();
 });
 
 tap.test('should schedule task', async () => {
-  myTaskManager.scheduleTaskByName('myTask', '* * * * * *');
+  myTaskManager.scheduleTaskByName('myTask', '*/10 * * * * *');
   await taskDone.promise;
   myTaskManager.descheduleTaskByName('myTask');
 });
 
+tap.test('should stop the taskmanager', async () => {
+  myTaskManager.stop();
+});
+
 tap.start();

test/test.5.task.paramflow.ts

@@ -1,5 +1,6 @@
 import { expect, tap } from '@pushrocks/tapbundle';
-import taskbuffer = require('../ts/index');
+
+import * as taskbuffer from '../ts/index.js';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
@@ -11,7 +12,7 @@ const flowTask1 = new taskbuffer.Task({
     console.log(x);
     done.resolve(x);
     return done.promise;
-  }
+  },
 });
 
 const flowTaskBuffered = new taskbuffer.Task({
@@ -23,7 +24,7 @@ const flowTaskBuffered = new taskbuffer.Task({
     return done.promise;
   },
   buffered: true,
-  bufferMax: 1
+  bufferMax: 1,
 });
 
 const flowTask2 = new taskbuffer.Task({
@@ -34,31 +35,31 @@ const flowTask2 = new taskbuffer.Task({
     done.resolve(x);
     return done.promise;
   },
-  preTask: flowTask1
+  preTask: flowTask1,
 });
 
 const flowTask3 = new taskbuffer.Taskchain({
-  taskArray: [flowTask1, flowTask2]
+  taskArray: [flowTask1, flowTask2],
 });
 
 tap.test('should let a value flow through a task', async () => {
   const result = await flowTask1.trigger(12);
-  expect(result).to.equal(12);
+  expect(result).toEqual(12);
 });
 
 tap.test('expect values to flow between tasks', async () => {
   const result = await flowTask2.trigger(12);
-  expect(result).to.equal(12);
+  expect(result).toEqual(12);
 });
 
 tap.test('expect values to flow between tasks when buffered', async () => {
   const result = await flowTaskBuffered.trigger(12);
-  expect(result).to.equal(12);
+  expect(result).toEqual(12);
 });
 
 tap.test('expect values to flow between tasks in Taskchain', async () => {
   const result = await flowTask3.trigger(12);
-  expect(result).to.equal(12);
+  expect(result).toEqual(12);
 });
 
 tap.start();

test/test.6.taskonce.ts

@@ -1,6 +1,6 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 
-import * as taskbuffer from '../ts/index';
+import * as taskbuffer from '../ts/index.js';
 
 let myNumber = 0;
 let myTaskOnce: taskbuffer.TaskOnce;
@@ -9,20 +9,20 @@ tap.test('should create a valid instance of TaskOnce', async () => {
   myTaskOnce = new taskbuffer.TaskOnce({
     taskFunction: async () => {
       myNumber++;
-    }
+    },
   });
-  expect(myTaskOnce).to.be.instanceof(taskbuffer.TaskOnce);
+  expect(myTaskOnce).toBeInstanceOf(taskbuffer.TaskOnce);
 });
 
 tap.test('myNumber should still be 0', async () => {
-  expect(myNumber).to.equal(0);
+  expect(myNumber).toEqual(0);
 });
 
 tap.test('myTaskOnce should trigger once', async () => {
   await myTaskOnce.trigger();
   await myTaskOnce.trigger();
   await myTaskOnce.trigger();
-  expect(myNumber).to.equal(1);
+  expect(myNumber).toEqual(1);
 });
 
 tap.start();

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/index.js';
 
 let preTask: taskbuffer.Task;
 let afterTask: taskbuffer.Task;
@@ -13,11 +13,11 @@ tap.test('should create tasks', async () => {
     taskFunction: async () => {
       console.log('pretask executed :)');
       return 'hi';
-    }
+    },
   });
   afterTask = new taskbuffer.Task({
     name: 'myAfterTask',
-    taskFunction: async x => {
+    taskFunction: async (x) => {
       if (x === 'hi') {
         console.log('afterTask: values get passed along alright');
       }
@@ -25,12 +25,12 @@ tap.test('should create tasks', async () => {
       return x;
     },
     preTask,
-    afterTask
+    afterTask,
   });
 
   mainTask = new taskbuffer.Task({
     name: 'mainTask',
-    taskFunction: async x => {
+    taskFunction: async (x) => {
       if (x === 'hi') {
         console.log('mainTask: values get passed along alright');
       }
@@ -40,7 +40,7 @@ tap.test('should create tasks', async () => {
     preTask: () => {
       return preTask;
     },
-    afterTask
+    afterTask,
   });
 });
 

test/test.8.bufferedrun.ts

@@ -0,0 +1,52 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+let counter1 = 0;
+let counter2 = 0;
+let counter3 = 0;
+
+tap.test('should run buffered', async (tools) => {
+  const task = new taskbuffer.Task({
+    name: 'a buffered task',
+    taskFunction: async () => {
+      counter1++;
+      await tools.delayFor(2000);
+      console.log(`task 1 ran ${counter1} times`);
+    },
+    buffered: true,
+    bufferMax: 1,
+    afterTask: () => {
+      return task2;
+    },
+  });
+  const task2 = new taskbuffer.Task({
+    name: 'a buffered task',
+    taskFunction: async () => {
+      counter2++;
+      await tools.delayFor(2000);
+      console.log(`task2 ran ${counter2} times`);
+    },
+    buffered: true,
+    bufferMax: 1,
+    afterTask: () => {
+      return task3;
+    },
+  });
+  const task3 = new taskbuffer.Task({
+    name: 'a buffered task',
+    taskFunction: async () => {
+      counter3++;
+      await tools.delayFor(2000);
+      console.log(`task3 ran ${counter3} times`);
+    },
+    buffered: true,
+    bufferMax: 1,
+  });
+  while (counter1 < 10) {
+    await tools.delayFor(5000);
+    task.trigger();
+  }
+});
+
+tap.start();

test/test.taskrunner.ts

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

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/taskbuffer',
+  version: '3.0.3',
+  description: 'flexible task management. TypeScript ready!'
+}

ts/index.ts

@@ -1,6 +1,8 @@
-export { Task, ITaskFunction } from './taskbuffer.classes.task';
+export { Task } from './taskbuffer.classes.task.js';
-export { Taskchain } from './taskbuffer.classes.taskchain';
+export type { ITaskFunction } from './taskbuffer.classes.task.js'
-export { Taskparallel } from './taskbuffer.classes.taskparallel';
+export { Taskchain } from './taskbuffer.classes.taskchain.js';
-export { TaskManager } from './taskbuffer.classes.taskmanager';
+export { Taskparallel } from './taskbuffer.classes.taskparallel.js';
-export { TaskOnce } from './taskbuffer.classes.taskonce';
+export { TaskManager } from './taskbuffer.classes.taskmanager.js';
-export { TaskRunner } from './taskbuffer.classes.taskrunner';
+export { TaskOnce } from './taskbuffer.classes.taskonce.js';
+export { TaskRunner } from './taskbuffer.classes.taskrunner.js';
+export { TaskDebounced } from './taskbuffer.classes.taskdebounced.js';

ts/taskbuffer.classes.bufferrunner.ts

@@ -1,39 +1,36 @@
-import { Task } from './taskbuffer.classes.task';
+import { Task } from './taskbuffer.classes.task.js';
 
 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> {
+  public trigger(x: any): Promise<any> {
     if (!(this.bufferCounter >= this.task.bufferMax)) {
       this.bufferCounter++;
     }
     const returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
       this.bufferCounter + 1
     );
-    if (!this.running) {
+    if (!this.task.running) {
       this._run(x);
     }
     return returnPromise;
   }
 
-  private _run(x) {
+  private _run(x: any) {
-    const recursiveBufferRunner = x => {
+    const recursiveBufferRunner = (x: any) => {
       if (this.bufferCounter >= 0) {
-        this.running = true;
         this.task.running = true;
-        Task.runTask(this.task, { x: x }).then(x => {
+        Task.runTask(this.task, { x: x }).then((x) => {
-          this.bufferCounter--;
+          this.bufferCounter--; // this.bufferCounter drops below 0, the recursion stops.
           this.task.cycleCounter.informOfCycle(x);
           recursiveBufferRunner(x);
         });
       } else {
-        this.running = false;
         this.task.running = false;
       }
     };

ts/taskbuffer.classes.cyclecounter.ts

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

ts/taskbuffer.classes.distributedcoordinator.ts

@@ -0,0 +1,5 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+export class DistributedCoordinator {
+  
+}

ts/taskbuffer.classes.helpers.ts

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

ts/taskbuffer.classes.task.ts

@@ -1,7 +1,8 @@
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
-import * as helpers from './taskbuffer.classes.helpers';
+import { BufferRunner } from './taskbuffer.classes.bufferrunner.js';
-import { BufferRunner } from './taskbuffer.classes.bufferrunner';
+import { CycleCounter } from './taskbuffer.classes.cyclecounter.js';
-import { CycleCounter } from './taskbuffer.classes.cyclecounter';
+
+import { logger } from './taskbuffer.logging.js';
 
 export interface ITaskFunction {
   (x?: any): PromiseLike<any>;
@@ -25,7 +26,7 @@ export class Task {
     }
   }
 
-  public static emptyTaskFunction: ITaskFunction = function(x) {
+  public static emptyTaskFunction: ITaskFunction = function (x) {
     const done = plugins.smartpromise.defer();
     done.resolve();
     return done.promise;
@@ -55,8 +56,9 @@ export class Task {
 
   public static runTask = async (
     taskArg: Task | TPreOrAfterTaskFunction,
-    optionsArg: { x?; touchedTasksArray?: Task[] }
+    optionsArg: { x?: any; touchedTasksArray?: Task[] }
   ) => {
+    // extracts the task in case it is specified as a return value of a function
     const taskToRun = Task.extractTask(taskArg);
     const done = plugins.smartpromise.defer();
 
@@ -75,7 +77,7 @@ export class Task {
     // handle options
     const options = {
       ...{ x: undefined, touchedTasksArray: [] },
-      ...optionsArg
+      ...optionsArg,
     };
     const x = options.x;
     const touchedTasksArray: Task[] = options.touchedTasksArray;
@@ -96,7 +98,7 @@ export class Task {
           return done2.promise;
         }
       })
-      .then(async x => {
+      .then(async (x) => {
         // lets run the main task
         try {
           return await taskToRun.taskFunction(x);
@@ -104,7 +106,7 @@ export class Task {
           console.log(e);
         }
       })
-      .then(x => {
+      .then((x) => {
         if (taskToRun.afterTask && !Task.isTaskTouched(taskToRun.afterTask, touchedTasksArray)) {
           return Task.runTask(taskToRun.afterTask, { x: x, touchedTasksArray: touchedTasksArray });
         } else {
@@ -113,10 +115,10 @@ export class Task {
           return done2.promise;
         }
       })
-      .then(x => {
+      .then((x) => {
         done.resolve(x);
       })
-      .catch(err => {
+      .catch((err) => {
         console.log(err);
       });
     localDeferred.resolve();
@@ -124,10 +126,11 @@ export class Task {
   };
 
   // INSTANCE
-  // man datory properties
+  // mandatory properties
   public name: string;
   public taskFunction: ITaskFunction;
   public buffered: boolean;
+  public cronJob: plugins.smarttime.CronJob;
 
   public bufferMax: number;
   public execDelay: number;
@@ -188,7 +191,7 @@ export class Task {
   /**
    * trigger the task. Will trigger buffered if this.buffered is true
    */
-  public trigger(x?): Promise<any> {
+  public trigger(x?: any): Promise<any> {
     if (this.buffered) {
       return this.triggerBuffered(x);
     } else {
@@ -198,15 +201,17 @@ export class Task {
 
   /**
    * trigger task unbuffered.
+   * will actually run the task, not considering any buffered limits.
    */
-  public triggerUnBuffered(x?): Promise<any> {
+  public triggerUnBuffered(x?: any): Promise<any> {
     return Task.runTask(this, { x: x });
   }
 
   /**
    * trigger task buffered.
+   * note: .trigger() also calls this function
    */
-  public triggerBuffered(x?): Promise<any> {
+  public triggerBuffered(x?: any): Promise<any> {
     return this.bufferRunner.trigger(x);
   }
 
@@ -218,7 +223,7 @@ export class Task {
     if (stateArg === 'locked') {
       this._state = 'locked';
     } else {
-      plugins.smartlog.defaultLogger.log('error', 'state type ' + stateArg + ' could not be set');
+      logger.log('error', `state type ${stateArg} could not be set`);
     }
   }
 }

ts/taskbuffer.classes.taskchain.ts

@@ -1,9 +1,9 @@
 // TaskChain chains tasks
 // and extends Task
 
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
-import { Task } from './taskbuffer.classes.task';
+import { Task } from './taskbuffer.classes.task.js';
-import helpers = require('./taskbuffer.classes.helpers');
+import { logger } from './taskbuffer.logging.js';
 
 export class Taskchain extends Task {
   taskArray: Task[];
@@ -14,22 +14,22 @@ export class Taskchain extends Task {
     buffered?: boolean;
     bufferMax?: number;
   }) {
-    let options = {
+    const options = {
       ...{
         name: 'unnamed Taskchain',
-        log: false
+        log: false,
       },
       ...optionsArg,
       ...{
         taskFunction: (x: any) => {
           // this is the function that gets executed when TaskChain is triggered
-          let done = plugins.smartpromise.defer(); // this is the starting Deferred object
+          const done = plugins.smartpromise.defer(); // this is the starting Deferred object
           let taskCounter = 0; // counter for iterating async over the taskArray
-          let iterateTasks = x => {
+          const iterateTasks = (x: any) => {
             if (typeof this.taskArray[taskCounter] !== 'undefined') {
               console.log(this.name + ' running: Task' + this.taskArray[taskCounter].name);
-              this.taskArray[taskCounter].trigger(x).then(x => {
+              this.taskArray[taskCounter].trigger(x).then((x) => {
-                plugins.smartlog.defaultLogger.log('info', this.taskArray[taskCounter].name);
+                logger.log('info', this.taskArray[taskCounter].name);
                 taskCounter++;
                 iterateTasks(x);
               });
@@ -40,8 +40,8 @@ export class Taskchain extends Task {
           };
           iterateTasks(x);
           return done.promise;
-        }
+        },
-      }
+      },
     };
     super(options);
     this.taskArray = optionsArg.taskArray;

ts/taskbuffer.classes.taskdebounced.ts

@@ -0,0 +1,27 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+import { Task, ITaskFunction } from './taskbuffer.classes.task.js';
+
+export class TaskDebounced<T = unknown> extends Task {
+  private _debouncedTaskFunction: ITaskFunction;
+  private _observableIntake = new plugins.smartrx.ObservableIntake<T>();
+
+  constructor(optionsArg: {
+    name: string;
+    taskFunction: ITaskFunction;
+    debounceTimeInMillis: number;
+  }) {
+    super({
+      name: optionsArg.name,
+      taskFunction: async (x: T) => {
+        this._observableIntake.push(x);
+      },
+    });
+    this.taskFunction = optionsArg.taskFunction;
+    this._observableIntake.observable
+      .pipe(plugins.smartrx.rxjs.ops.debounceTime(optionsArg.debounceTimeInMillis))
+      .subscribe((x) => {
+        this.taskFunction(x);
+      });
+  }
+}

ts/taskbuffer.classes.taskmanager.ts

@@ -1,5 +1,5 @@
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
-import { Task } from './taskbuffer.classes.task';
+import { Task } from './taskbuffer.classes.task.js';
 
 export interface ICronJob {
   cronString: string;
@@ -8,8 +8,8 @@ export interface ICronJob {
 }
 
 export class TaskManager {
-  public taskMap = new plugins.lik.Objectmap<Task>();
+  public taskMap = new plugins.lik.ObjectMap<Task>();
-  private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
+  private cronJobManager = new plugins.smarttime.CronManager();
 
   constructor() {
     // nothing here
@@ -19,8 +19,8 @@ export class TaskManager {
    * checks if a task is already present
    * @param taskNameArg
    */
-  public getTaskByName(taskNameArg): Task {
+  public getTaskByName(taskNameArg: string): Task {
-    return this.taskMap.find(itemArg => {
+    return this.taskMap.findSync((itemArg) => {
       return itemArg.name === taskNameArg;
     });
   }
@@ -43,8 +43,7 @@ export class TaskManager {
    */
   public addAndScheduleTask(taskArg: Task, cronStringArg: string) {
     this.addTask(taskArg);
-    const taskName = taskArg.name;
+    this.scheduleTaskByName(taskArg.name, cronStringArg);
-    this.scheduleTaskByName(taskName, cronStringArg);
   }
 
   /**
@@ -69,18 +68,18 @@ export class TaskManager {
    */
   public scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
     const taskToSchedule = this.getTaskByName(taskNameArg);
-    const job = new plugins.cron.CronJob({
+    const cronJob = this.cronJobManager.addCronjob(cronStringArg, async () => {
-      cronTime: cronStringArg,
+      console.log(`taskbuffer schedule triggered task >>${taskToSchedule.name}<<`);
-      onTick: () => {
+      console.log(
-        this.triggerTaskByName(taskNameArg);
+        `task >>${taskToSchedule.name}<< is ${
-      },
+          taskToSchedule.buffered
-      start: true
+            ? `buffered with max ${taskToSchedule.bufferMax} buffered calls`
-    });
+            : `unbuffered`
-    this.cronJobMap.add({
+        }`
-      taskNameArg: taskToSchedule.name,
+      );
-      cronString: cronStringArg,
+      await taskToSchedule.trigger();
-      job
     });
+    taskToSchedule.cronJob = cronJob;
   }
 
   /**
@@ -88,10 +87,14 @@ export class TaskManager {
    * @param taskNameArg
    */
   public descheduleTaskByName(taskNameArg: string) {
-    const descheduledCron = this.cronJobMap.findOneAndRemove(itemArg => {
+    const taskToDeSchedule = this.getTaskByName(taskNameArg);
-      return itemArg.taskNameArg === taskNameArg;
+    if (taskToDeSchedule.cronJob) {
-    });
+      this.cronJobManager.removeCronjob(taskToDeSchedule.cronJob);
-    descheduledCron.job.stop();
+      taskToDeSchedule.cronJob = null;
+    }
+    if (this.cronJobManager.cronjobs.isEmpty) {
+      this.cronJobManager.stop();
+    }
   }
 
   /**
@@ -106,4 +109,18 @@ export class TaskManager {
    * @param taskNameArg
    */
   public getSchedulesForTaskName(taskNameArg: string) {}
+
+  /**
+   * starts the taskmanager
+   */
+  public start() {
+    this.cronJobManager.start();
+  }
+
+  /**
+   * stops the taskmanager
+   */
+  public stop() {
+    this.cronJobManager.stop();
+  }
 }

ts/taskbuffer.classes.taskonce.ts

@@ -1,6 +1,6 @@
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
 
-import { Task, ITaskFunction } from './taskbuffer.classes.task';
+import { Task, ITaskFunction } from './taskbuffer.classes.task.js';
 
 /**
  * TaskOnce is run exactly once, no matter how often it is triggered
@@ -15,7 +15,7 @@ export class TaskOnce extends Task {
           this.hasTriggered = true;
           await optionsArg.taskFunction();
         }
-      }
+      },
     });
   }
 }

ts/taskbuffer.classes.taskparallel.ts

@@ -1,6 +1,5 @@
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
-import * as helpers from './taskbuffer.classes.helpers';
+import { Task } from './taskbuffer.classes.task.js';
-import { Task } from './taskbuffer.classes.task';
 
 export class Taskparallel extends Task {
   public taskArray: Task[];
@@ -11,13 +10,13 @@ export class Taskparallel extends Task {
         taskFunction: () => {
           const done = plugins.smartpromise.defer();
           const promiseArray: Promise<any>[] = []; // stores promises of all tasks, since they run in parallel
-          this.taskArray.forEach(function(taskArg) {
+          this.taskArray.forEach(function (taskArg) {
             promiseArray.push(taskArg.trigger());
           });
           Promise.all(promiseArray).then(done.resolve);
           return done.promise;
-        }
+        },
-      }
+      },
     };
     super(options);
     this.taskArray = optionsArg.taskArray;

ts/taskbuffer.classes.taskrunner.ts

@@ -1,15 +1,15 @@
-import * as plugins from './taskbuffer.plugins';
+import * as plugins from './taskbuffer.plugins.js';
 
-import { Task } from './taskbuffer.classes.task';
+import { Task } from './taskbuffer.classes.task.js';
 
 export class TaskRunner {
   public maxParrallelJobs: number = 1;
   public status: 'stopped' | 'running' = 'stopped';
-  public runningTasks: plugins.lik.Objectmap<Task> = new plugins.lik.Objectmap<Task>();
+  public runningTasks: plugins.lik.ObjectMap<Task> = new plugins.lik.ObjectMap<Task>();
   public qeuedTasks: Task[] = [];
 
   constructor() {
-    this.runningTasks.eventSubject.subscribe(async eventArg => {
+    this.runningTasks.eventSubject.subscribe(async (eventArg) => {
       this.checkExecution();
     });
   }

ts/taskbuffer.logging.ts

@@ -0,0 +1,3 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+export const logger = new plugins.smartlog.ConsoleLog();

ts/taskbuffer.plugins.ts

@@ -1,8 +1,8 @@
 import * as smartlog from '@pushrocks/smartlog';
-import cron from 'cron';
 import * as lik from '@pushrocks/lik';
-import * as rxjs from 'rxjs';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartrx from '@pushrocks/smartrx';
+import * as smarttime from '@pushrocks/smarttime';
 
-export { smartlog, cron, lik, rxjs, smartpromise, smartdelay };
+export { smartlog, lik, smartpromise, smartdelay, smartrx, smarttime };

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}