3.1.5

update from q to smartq

See merge request !1

.gitea/workflows/default_nottags.yaml

@@ -0,0 +1,66 @@
+name: Default (not tags)
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install pnpm and npmci
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+
+      - name: Run npm prepare
+        run: npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build

.gitea/workflows/default_tags.yaml

@@ -0,0 +1,124 @@
+name: Default (tags)
+
+on:
+  push:
+    tags:
+      - '*'
+
+env:
+  IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
+  NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
+  NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
+  NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
+  NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
+
+jobs:
+  security:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Audit production dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --prod
+        continue-on-error: true
+
+      - name: Audit development dependencies
+        run: |
+          npmci command npm config set registry https://registry.npmjs.org
+          npmci command pnpm audit --audit-level=high --dev
+        continue-on-error: true
+
+  test:
+    if: ${{ always() }}
+    needs: security
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Test stable
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm test
+
+      - name: Test build
+        run: |
+          npmci node install stable
+          npmci npm install
+          npmci npm build
+
+  release:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Release
+        run: |
+          npmci node install stable
+          npmci npm publish
+
+  metadata:
+    needs: test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ env.IMAGE }}
+    continue-on-error: true
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Prepare
+        run: |
+          pnpm install -g pnpm
+          pnpm install -g @shipzone/npmci
+          npmci npm prepare
+
+      - name: Code quality
+        run: |
+          npmci command npm install -g typescript
+          npmci npm install
+
+      - name: Trigger
+        run: npmci trigger
+
+      - name: Build docs and upload artifacts
+        run: |
+          npmci node install stable
+          npmci npm install
+          pnpm install -g @gitzone/tsdoc
+          npmci command tsdoc
+        continue-on-error: true

.gitignore

@@ -1,7 +1,20 @@
-.idea/
+.nogit/
+
+# artifacts
 coverage/
-docs/
-ts/*.js
-ts/*.js.map
-ts/typings/
-node_modules
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.npmignore

@@ -1,5 +1,5 @@
-.idea/
 docs/
 coverage/
 ts/
 node_modules/
+pages/

.travis.yml

@@ -1,11 +0,0 @@
-language: node_js
-node_js:
-- stable
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: NejErc2+ohEEH8DecYcx6/2oSdEQQBRzlOwTMxQBftHdIkvziwOcCerqCJtrXuzalqAofVCcVisunWIXZmxfIBGV6mJVauCIp5KzH4JUhYzLym33p9MSphjlPNfsI6nKkW0LAgOMjkJGuHLqU3oskvBqYyh8m3NuCna5mNwm8lo5WGckzHSwdsmhnb839WhlZbmQc6M6WW6Ir7bbxX9ZOmNUYUWH6VdXfPBxoXN3nO21pXKt7Zg8/nU7IkF+VEUVfYNlR3xUiocWemuBFxjtsfoliQ/y/oGL7ccQ7OeE4PxSu+xNUpYYVipkQcRtyWDKCwJp4R2DNTj/ikOHH+BEFOBDG8qYxwf37Ju0jFybzslAEJLy5gl4bFjiZNA8ldUXY5ubJb56iZTNSbMU0lmXw+qKvIoyVY/1JAE5lzFGVA6nDdiUGAEOg/ajzAC3gjFU2QS2Wvncz3dky0k/2INBVUwmmAvAMazl5XkvHtQ3Wzb+Fc8TXWflqBDF0okySoJzlY13pm/OtOHipiqEyUCnqaUUwJtLIb6tHOPzxZKlWLCem7y84cDlxQSbLVItbArOJFHdr66sp/U/FqYAtWeLdbkhjCENFwzR9kYtEyEl+QWLTckO1/lVF4xJLh6drfhQ66CwF5bfqr5xIS08mnKuYBfJOA4/wV4bQFPhtYm7Oi8=
-  on:
-    tags: true
-    repo: pushrocks/taskbuffer

.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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,51 +0,0 @@
-# taskbuffer
-Flexible task organization for gulp. TypeScript ready!
-
-## Status
-[![Coverage Status](https://coveralls.io/repos/github/pushrocks/taskbuffer/badge.svg?branch=master)](https://coveralls.io/github/pushrocks/taskbuffer?branch=master)
-
-## 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`
-* Multiple Tasks can be combined in a bigger task using a Taskchain.
-* Taskchain extends Task.
-* 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`
-* like TaskChain, however **tasks run in parallel**
-* Tasks cannot rely on each other
-
-### Usage
-We highly recommend TypeScript as this module supports **TypeScript intellisense**.
-```
-import * as taskbuffer from "taskbuffer";
-
-myTask = new taskbuffer.Task({
-  name:"myTask1",
-  taskFunction:() => {
-    //do some stuff and return promise
-  }
-})
-```

dist/index.d.ts

@@ -1,5 +0,0 @@
-export { Task } from "./taskbuffer.classes.task";
-export { Taskchain } from "./taskbuffer.classes.taskchain";
-export { Taskparallel } from "./taskbuffer.classes.taskparallel";
-export { Taskspace } from "./taskbuffer.classes.taskspace";
-import "./taskbuffer.classes.helpers";

dist/index.js

@@ -1,14 +0,0 @@
-"use strict";
-/// <reference path="./typings/main.d.ts" />
-var taskbuffer_classes_task_1 = require("./taskbuffer.classes.task");
-exports.Task = taskbuffer_classes_task_1.Task;
-var taskbuffer_classes_taskchain_1 = require("./taskbuffer.classes.taskchain");
-exports.Taskchain = taskbuffer_classes_taskchain_1.Taskchain;
-var taskbuffer_classes_taskparallel_1 = require("./taskbuffer.classes.taskparallel");
-exports.Taskparallel = taskbuffer_classes_taskparallel_1.Taskparallel;
-var taskbuffer_classes_taskspace_1 = require("./taskbuffer.classes.taskspace");
-exports.Taskspace = taskbuffer_classes_taskspace_1.Taskspace;
-// import for naming only
-require("./taskbuffer.classes.helpers");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSw0Q0FBNEM7QUFDNUMsd0NBQW1CLDJCQUEyQixDQUFDO0FBQXZDLDhDQUF1QztBQUMvQyw2Q0FBd0IsZ0NBQWdDLENBQUM7QUFBakQsNkRBQWlEO0FBQ3pELGdEQUEyQixtQ0FBbUMsQ0FBQztBQUF2RCxzRUFBdUQ7QUFDL0QsNkNBQXdCLGdDQUFnQyxDQUFDO0FBQWpELDZEQUFpRDtBQUV6RCx5QkFBeUI7QUFDekIsUUFBTyw4QkFBOEIsQ0FBQyxDQUFEIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5leHBvcnQge1Rhc2t9IGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrXCI7XHJcbmV4cG9ydCB7VGFza2NoYWlufSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza2NoYWluXCI7XHJcbmV4cG9ydCB7VGFza3BhcmFsbGVsfSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza3BhcmFsbGVsXCI7XHJcbmV4cG9ydCB7VGFza3NwYWNlfSBmcm9tIFwiLi90YXNrYnVmZmVyLmNsYXNzZXMudGFza3NwYWNlXCI7XHJcblxyXG4vLyBpbXBvcnQgZm9yIG5hbWluZyBvbmx5XHJcbmltcG9ydCBcIi4vdGFza2J1ZmZlci5jbGFzc2VzLmhlbHBlcnNcIiJdfQ==

dist/taskbuffer.classes.helpers.d.ts

@@ -1,9 +0,0 @@
-import { Task } from "./taskbuffer.classes.task";
-export declare let emptyTaskFunction: () => any;
-export declare let isTask: (taskArg: any) => boolean;
-export declare let isTaskTouched: (taskArg: Task, touchedTasksArray: Task[]) => boolean;
-export declare let runTask: (taskArg: Task, optionsArg?: {
-    touchedTasksArray: Task[];
-}) => any;
-export declare let runBufferedTask: (taskArg: Task) => void;
-export declare let updateTaskStatus: (taskArg: any, statusArg: string) => void;

dist/taskbuffer.classes.task.d.ts

@@ -1,25 +0,0 @@
-export declare class Task {
-    name: string;
-    task: any;
-    running: boolean;
-    idle: boolean;
-    buffered: boolean;
-    bufferCounter: number;
-    bufferMax: number;
-    private _counterTriggerAbsolute;
-    private _state;
-    preTask: Task;
-    afterTask: Task;
-    constructor(optionsArg: {
-        taskFunction: any;
-        preTask?: Task;
-        afterTask?: Task;
-        buffered?: boolean;
-        bufferMax?: number;
-        name?: string;
-    });
-    trigger(): any;
-    triggerUnBuffered(): any;
-    triggerBuffered(): any;
-    state: string;
-}

dist/taskbuffer.classes.taskchain.d.ts

@@ -1,14 +0,0 @@
-import { Task } from "./taskbuffer.classes.task";
-export declare class Taskchain extends Task {
-    taskArray: Task[];
-    private _oraObject;
-    constructor(optionsArg: {
-        name?: string;
-        log?: boolean;
-        taskArray: Task[];
-    });
-    addTask(taskArg: Task): void;
-    removeTask(taskArg: Task): void;
-    shiftTask(): void;
-    trigger(): any;
-}

dist/taskbuffer.classes.taskparallel.d.ts

@@ -1,7 +0,0 @@
-import { Task } from "./taskbuffer.classes.task";
-export declare class Taskparallel extends Task {
-    taskArray: Task[];
-    constructor(optionsArg: {
-        taskArray: Task[];
-    });
-}

dist/taskbuffer.classes.taskparallel.js

@@ -1,32 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-/// <reference path="./typings/main.d.ts" />
-var plugins = require("./taskbuffer.plugins");
-var taskbuffer_classes_task_1 = require("./taskbuffer.classes.task");
-var Taskparallel = (function (_super) {
-    __extends(Taskparallel, _super);
-    function Taskparallel(optionsArg) {
-        var _this = this;
-        var options = plugins.lodash.assign(optionsArg, {
-            taskFunction: function () {
-                var done = plugins.Q.defer();
-                var promiseArray; // stores promises of all tasks, since they run in parallel
-                _this.taskArray.forEach(function (taskArg) {
-                    promiseArray.push(taskArg.trigger());
-                });
-                plugins.Q.all(promiseArray)
-                    .then(done.resolve);
-                return done.promise;
-            }
-        });
-        _super.call(this, options);
-    }
-    return Taskparallel;
-}(taskbuffer_classes_task_1.Task));
-exports.Taskparallel = Taskparallel;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50YXNrcGFyYWxsZWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQUEsNENBQTRDO0FBQzVDLElBQVksT0FBTyxXQUFNLHNCQUN6QixDQUFDLENBRDhDO0FBRS9DLHdDQUFtQiwyQkFFbkIsQ0FBQyxDQUY2QztBQUU5QztJQUFrQyxnQ0FBSTtJQUVsQyxzQkFBWSxVQUVYO1FBSkwsaUJBc0JDO1FBakJPLElBQUksT0FBTyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUMvQixVQUFVLEVBQ1Y7WUFDSSxZQUFZLEVBQUM7Z0JBQ1QsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDN0IsSUFBSSxZQUFZLENBQUMsQ0FBQywyREFBMkQ7Z0JBQzdFLEtBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLFVBQVMsT0FBWTtvQkFDeEMsWUFBWSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztnQkFDekMsQ0FBQyxDQUFDLENBQUE7Z0JBQ0YsT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO3FCQUN0QixJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUN4QixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUN4QixDQUFDO1NBQ0osQ0FDSixDQUFBO1FBQ0Qsa0JBQU0sT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztJQUNMLG1CQUFDO0FBQUQsQ0F0QkEsQUFzQkMsQ0F0QmlDLDhCQUFJLEdBc0JyQztBQXRCWSxvQkFBWSxlQXNCeEIsQ0FBQSIsImZpbGUiOiJ0YXNrYnVmZmVyLmNsYXNzZXMudGFza3BhcmFsbGVsLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3Rhc2tidWZmZXIucGx1Z2luc1wiXHJcbmltcG9ydCAqIGFzIGhlbHBlcnMgZnJvbSBcIi4vdGFza2J1ZmZlci5jbGFzc2VzLmhlbHBlcnNcIlxyXG5pbXBvcnQge1Rhc2t9IGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy50YXNrXCJcclxuXHJcbmV4cG9ydCBjbGFzcyBUYXNrcGFyYWxsZWwgZXh0ZW5kcyBUYXNrIHtcclxuICAgIHRhc2tBcnJheTpUYXNrW107XHJcbiAgICBjb25zdHJ1Y3RvcihvcHRpb25zQXJnOntcclxuICAgICAgICB0YXNrQXJyYXk6VGFza1tdXHJcbiAgICB9KXtcclxuICAgICAgICBsZXQgb3B0aW9ucyA9IHBsdWdpbnMubG9kYXNoLmFzc2lnbihcclxuICAgICAgICAgICAgb3B0aW9uc0FyZyxcclxuICAgICAgICAgICAge1xyXG4gICAgICAgICAgICAgICAgdGFza0Z1bmN0aW9uOigpID0+IHtcclxuICAgICAgICAgICAgICAgICAgICBsZXQgZG9uZSA9IHBsdWdpbnMuUS5kZWZlcigpO1xyXG4gICAgICAgICAgICAgICAgICAgIGxldCBwcm9taXNlQXJyYXk7IC8vIHN0b3JlcyBwcm9taXNlcyBvZiBhbGwgdGFza3MsIHNpbmNlIHRoZXkgcnVuIGluIHBhcmFsbGVsXHJcbiAgICAgICAgICAgICAgICAgICAgdGhpcy50YXNrQXJyYXkuZm9yRWFjaChmdW5jdGlvbih0YXNrQXJnOlRhc2spe1xyXG4gICAgICAgICAgICAgICAgICAgICAgICBwcm9taXNlQXJyYXkucHVzaCh0YXNrQXJnLnRyaWdnZXIoKSk7XHJcbiAgICAgICAgICAgICAgICAgICAgfSlcclxuICAgICAgICAgICAgICAgICAgICBwbHVnaW5zLlEuYWxsKHByb21pc2VBcnJheSlcclxuICAgICAgICAgICAgICAgICAgICAgICAgLnRoZW4oZG9uZS5yZXNvbHZlKTtcclxuICAgICAgICAgICAgICAgICAgICByZXR1cm4gZG9uZS5wcm9taXNlO1xyXG4gICAgICAgICAgICAgICAgfVxyXG4gICAgICAgICAgICB9XHJcbiAgICAgICAgKVxyXG4gICAgICAgIHN1cGVyKG9wdGlvbnMpO1xyXG4gICAgfVxyXG59XHJcblxyXG4iXX0=

dist/taskbuffer.classes.taskspace.d.ts

@@ -1,2 +0,0 @@
-export declare class Taskspace {
-}

dist/taskbuffer.classes.taskspace.js

@@ -1,9 +0,0 @@
-"use strict";
-var Taskspace = (function () {
-    function Taskspace() {
-    }
-    return Taskspace;
-}());
-exports.Taskspace = Taskspace;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIuY2xhc3Nlcy50YXNrc3BhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUlBO0lBQUE7SUFFQSxDQUFDO0lBQUQsZ0JBQUM7QUFBRCxDQUZBLEFBRUMsSUFBQTtBQUZZLGlCQUFTLFlBRXJCLENBQUEiLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2tzcGFjZS5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi90YXNrYnVmZmVyLnBsdWdpbnNcIlxyXG5pbXBvcnQgKiBhcyBoZWxwZXJzIGZyb20gXCIuL3Rhc2tidWZmZXIuY2xhc3Nlcy5oZWxwZXJzXCJcclxuXHJcbmV4cG9ydCBjbGFzcyBUYXNrc3BhY2Uge1xyXG4gICAgXHJcbn0iXX0=

dist/taskbuffer.plugins.d.ts

@@ -1,3 +0,0 @@
-export import beautylog = require("beautylog");
-export declare let Q: any;
-export declare let lodash: any;

dist/taskbuffer.plugins.js

@@ -1,7 +0,0 @@
-"use strict";
-/// <reference path="./typings/main.d.ts" />
-exports.beautylog = require("beautylog");
-exports.Q = require("q");
-exports.lodash = require("lodash");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRhc2tidWZmZXIucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsNENBQTRDO0FBQzlCLGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixjQUFNLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDIiwiZmlsZSI6InRhc2tidWZmZXIucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cclxuZXhwb3J0IGltcG9ydCBiZWF1dHlsb2cgPSByZXF1aXJlKFwiYmVhdXR5bG9nXCIpO1xyXG5leHBvcnQgbGV0IFEgPSByZXF1aXJlKFwicVwiKTtcclxuZXhwb3J0IGxldCBsb2Rhc2g9IHJlcXVpcmUoXCJsb2Rhc2hcIik7XHJcbiJdfQ==

npmextra.json

@@ -0,0 +1,18 @@
+{
+  "npmci": {
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "push.rocks",
+      "gitrepo": "taskbuffer",
+      "description": "flexible task management. TypeScript ready!",
+      "npmPackagename": "@push.rocks/taskbuffer",
+      "license": "MIT"
+    }
+  }
+}

npmts.json

@@ -1,4 +0,0 @@
-{
-  "mode":"default",
-  "coveralls":true
-}

package.json

@@ -1,36 +1,63 @@
 {
-  "name": "taskbuffer",
-  "version": "0.1.1",
-  "description": "Flexible task organization for gulp. TypeScript ready!",
-  "main": "dist/index.js",
+  "name": "@push.rocks/taskbuffer",
+  "version": "3.1.5",
+  "private": false,
+  "description": "flexible task management. TypeScript ready!",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/ --web)",
+    "build": "(tsbuild --web && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/taskbuffer.git"
+    "url": "git+https://gitlab.com/pushrocks/taskbuffer.git"
   },
   "keywords": [
     "gulp",
-    "tasks",
-    "watch",
-    "buffer"
+    "task",
+    "buffer",
+    "TypeScript",
+    "push.rocks"
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/taskbuffer/issues"
+    "url": "https://gitlab.com/pushrocks/taskbuffer/issues"
   },
-  "homepage": "https://github.com/pushrocks/taskbuffer#readme",
+  "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "beautylog": "^5.0.0",
-    "lodash": "^4.12.0",
-    "projectinfo": "1.0.1",
-    "q": "^1.4.1",
-    "rx": "^4.1.0"
+    "@push.rocks/lik": "^6.0.5",
+    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartlog": "^3.0.3",
+    "@push.rocks/smartpromise": "^4.0.3",
+    "@push.rocks/smartrx": "^3.0.6",
+    "@push.rocks/smarttime": "^4.0.5",
+    "@push.rocks/smartunique": "^3.0.6"
   },
   "devDependencies": {
-    "should": "^8.3.1",
-    "npmts": "^5.1.5"
-  }
+    "@gitzone/tsbuild": "^2.1.66",
+    "@gitzone/tsbundle": "^2.0.8",
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.15",
+    "@types/node": "^20.5.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -0,0 +1,61 @@
+# @push.rocks/taskbuffer
+flexible task management. TypeScript ready!
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/taskbuffer)
+* [gitlab.com (source)](https://gitlab.com/push.rocks/taskbuffer)
+* [github.com (source mirror)](https://github.com/push.rocks/taskbuffer)
+* [docs (typedoc)](https://push.rocks.gitlab.io/taskbuffer/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/taskbuffer/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/taskbuffer/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/taskbuffer)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/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/@push.rocks/taskbuffer)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/taskbuffer)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/taskbuffer)](https://lossless.cloud)
+
+## Usage
+
+We highly recommend TypeScript as this module supports **TypeScript intellisense**.
+
+```javascript
+import * as taskbuffer from "taskbuffer";
+
+myTask = new taskbuffer.Task({
+  preTask: someOtherTask // optional, don't worry loops are prevented
+  afterTask: someOtherTask // optional, don't worry loops are prevented
+  name:"myTask1",
+  buffered: true, // optional
+  bufferMax: 3, // optional, call qeues greater than this are truncated
+  execDelay: 1000, // optional, time in ms to wait before executing task call
+  taskFunction:() => {
+    // do some stuff and return promise
+    // pass on any data through promise resolution
+    // Use TypeScript for better understanding and code completion
+  }
+})
+```
+
+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)
+
+## 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.
+
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

test/test.1.task.ts

@@ -0,0 +1,89 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+import * as taskbuffer from '../ts/index.js';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+
+tap.test('new Task() should return a new task', async () => {
+  const testTask = new taskbuffer.Task({
+    taskFunction: async () => {
+      console.log('executed twice');
+    },
+  });
+  expect(testTask).toBeInstanceOf(taskbuffer.Task);
+});
+
+tap.test('should have bufferMax set to the provided value', async () => {
+  const task2 = new taskbuffer.Task({
+    taskFunction: async () => {},
+  });
+  expect(task2.bufferMax).toBeUndefined();  // test for a task without bufferMax set
+  const bufferedTask = new taskbuffer.Task({
+    taskFunction: async () => {},
+    buffered: true,
+    bufferMax: 3,
+  });
+  expect(bufferedTask.bufferMax).toEqual(3);
+});
+
+tap.test('should be able to trigger tasks multiple times', async () => {
+  let task1Counter = 0; 
+  const task1 = new taskbuffer.Task({
+    name: 'Task 1',
+    taskFunction: () => {
+      let done = smartpromise.defer();
+      console.log('Task1 started');
+      setTimeout(() => {
+        task1Counter++;
+        console.log('Task1 executed');
+        done.resolve();
+      }, 5000);
+      return done.promise;
+    },
+  });
+  await task1.trigger();
+  await task1.trigger();
+  expect(task1Counter).toEqual(2);
+});
+
+tap.test('should execute setup function before the task function', async () => {
+  const task2 = new taskbuffer.Task({
+    name: 'Task 2',
+    taskSetup: async () => {
+      console.log('this is the setup function for task 2. It should only run once.')
+      return {
+        nice: 'yes',
+      }
+    },
+    taskFunction: async (before, setupArg) => {
+      expect(setupArg).toEqual({ nice: 'yes' });
+      const done = smartpromise.defer();
+      console.log('Task2 started');
+      setTimeout(() => {
+        console.log('Task2 executed');
+        done.resolve();
+      }, 5000);
+      await done.promise;
+    },
+  });
+  await task2.trigger();
+});
+
+tap.test('should not exceed bufferMax when task is buffered', async () => {
+  let counter = 0;
+  const bufferedTask = new taskbuffer.Task({
+    taskFunction: async () => {
+      counter++;
+      await smartdelay.delayFor(2000);
+      counter--;
+    },
+    buffered: true,
+    bufferMax: 2,
+  });
+  bufferedTask.trigger();
+  bufferedTask.trigger();
+  bufferedTask.trigger();
+  await smartdelay.delayFor(100);
+  expect(counter <= bufferedTask.bufferMax).toBeTrue();
+});
+
+tap.start();

test/test.2.taskchain.ts

@@ -0,0 +1,49 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+
+let task1Executed = false;
+const task1 = new taskbuffer.Task({
+  taskFunction: async () => {
+    await smartdelay.delayFor(2000);
+    task1Executed = true;
+  },
+});
+
+let task2Executed = false;
+const task2 = new taskbuffer.Task({
+  taskFunction: async () => {
+    await smartdelay.delayFor(2000);
+    task2Executed = true;
+  },
+});
+
+let task3Executed = false;
+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],
+  });
+  const testPromise = testTaskchain.trigger();
+  await smartdelay.delayFor(2100);
+  // tslint:disable-next-line:no-unused-expression
+  expect(task1Executed).toBeTrue();
+  // tslint:disable-next-line:no-unused-expression
+  expect(task2Executed).toBeFalse();
+  await smartdelay.delayFor(2100);
+  // tslint:disable-next-line:no-unused-expression
+  expect(task2Executed).toBeTrue();
+  await testPromise;
+});
+
+tap.start();

test/test.3.taskparallel.ts

@@ -0,0 +1,37 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+import * as smartdelay from '@push.rocks/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;
+const task2 = new taskbuffer.Task({
+  taskFunction: async () => {
+    await smartdelay.delayFor(2000);
+    task2Executed = true;
+  },
+});
+
+let task3Executed = false;
+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],
+  });
+  await testTaskparallel.trigger();
+});
+
+tap.start();

test/test.4.taskmanager.both.ts

@@ -0,0 +1,50 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+
+let myTaskManager: taskbuffer.TaskManager;
+let taskRunCounter = 0;
+const taskDone = smartpromise.defer();
+
+tap.test('should create an instance of TaskManager', async () => {
+  myTaskManager = new taskbuffer.TaskManager();
+  expect(myTaskManager).toBeInstanceOf(taskbuffer.TaskManager);
+});
+
+tap.test('should run the task as expected', async () => {
+  let referenceBoolean = false;
+  myTaskManager.addTask(
+    new taskbuffer.Task({
+      name: 'myTask',
+      bufferMax: 1,
+      buffered: true,
+      taskFunction: async () => {
+        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).toBeTrue();
+});
+
+tap.test('should schedule task', async () => {
+  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

@@ -0,0 +1,65 @@
+import { expect, tap } from '@push.rocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+
+const flowTask1 = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    const done = smartpromise.defer();
+    console.log('flowTask1');
+    console.log(x);
+    done.resolve(x);
+    return done.promise;
+  },
+});
+
+const flowTaskBuffered = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    const done = smartpromise.defer();
+    console.log('flowTask1');
+    console.log(x);
+    done.resolve(x);
+    return done.promise;
+  },
+  buffered: true,
+  bufferMax: 1,
+});
+
+const flowTask2 = new taskbuffer.Task({
+  taskFunction: (x: number) => {
+    const done = smartpromise.defer();
+    console.log('flowTask2');
+    console.log(x);
+    done.resolve(x);
+    return done.promise;
+  },
+  preTask: flowTask1,
+});
+
+const flowTask3 = new taskbuffer.Taskchain({
+  taskArray: [flowTask1, flowTask2],
+});
+
+tap.test('should let a value flow through a task', async () => {
+  const result = await flowTask1.trigger(12);
+  expect(result).toEqual(12);
+});
+
+tap.test('expect values to flow between tasks', async () => {
+  const result = await flowTask2.trigger(12);
+  expect(result).toEqual(12);
+});
+
+tap.test('expect values to flow between tasks when buffered', async () => {
+  const result = await flowTaskBuffered.trigger(12);
+  expect(result).toEqual(12);
+});
+
+tap.test('expect values to flow between tasks in Taskchain', async () => {
+  const result = await flowTask3.trigger(12);
+  expect(result).toEqual(12);
+});
+
+tap.start();

test/test.6.taskonce.ts

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

test/test.7.taskloop.ts

@@ -0,0 +1,51 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+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();

test/test.8.bufferedrun.ts

@@ -0,0 +1,52 @@
+import { tap, expect } from '@push.rocks/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.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC1C,IAAI,OAAO,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACpD,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,QAAQ,CAAC,YAAY,EAAC;IAClB,QAAQ,CAAC,SAAS,EAAC;QACf,IAAI,QAAQ,CAAC;QACb,EAAE,CAAC,0CAA0C,EAAC;YAC1C,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAC;YACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uBAAuB,EAAC;YACvB,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACjD,CAAC;QACL,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,sDAAsD,EAAC;YACtD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/test.taskrunner.ts

@@ -0,0 +1,34 @@
+import { tap, expect } from '@push.rocks/tapbundle';
+
+import * as taskbuffer from '../ts/index.js';
+
+let testTaskRunner: taskbuffer.TaskRunner;
+
+tap.test('should create a valid taskrunner', async () => {
+  testTaskRunner = new taskbuffer.TaskRunner();
+  await 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();

test/test.ts

@@ -1,83 +0,0 @@
-/// <reference path="../ts/typings/main.d.ts" />
-import taskbuffer = require("../dist/index");
-let should = require("should");
-let plugins = {
-    q: require("q")
-}
-
-// setup some testData to work with
-let testTask:taskbuffer.Task;
-let testTaskFunction = function(){
-    let done = plugins.q.defer();
-    console.log("main function executed!")
-    done.resolve();
-    return done.promise;
-}
-let testPreTask = new taskbuffer.Task({
-    taskFunction:function(){
-        console.log("preTask executed");
-    },
-    preTask:testTask
-});
-
-describe("taskbuffer",function(){
-    describe(".Task",function(){
-        it("new Task() should return a new task",function(){
-            testTask = new taskbuffer.Task({taskFunction:testTaskFunction,preTask:testPreTask});
-        });
-        it("testTask should be and instance of Task",function(){
-            testTask.should.be.instanceof(taskbuffer.Task);
-        });
-        it("testTask.idle is true",function(){
-            if (!testTask.idle){
-                throw new Error("testTask.idle is not true");
-            }
-            
-        });
-        it("testTask.running is type boolean and initially false",function(){
-            testTask.running.should.be.type("boolean");
-            testTask.running.should.be.false();
-        });
-        it("testTask.trigger() should return Promise",function(){
-            testTask.trigger().should.be.Promise();
-        });
-        it("testTask.trigger() returned Promise should be fullfilled",function(done){
-            testTask.trigger()
-                .then(done);
-        });
-        it("should run a task without pre and afterTask",function(done){
-            let localTestTask = new taskbuffer.Task({taskFunction:testTaskFunction});
-            localTestTask.trigger().then(done);
-        });
-    });
-    describe("Taskchain",function(){
-        let testTaskchain;
-        let testTaskArray = [
-            new taskbuffer.Task({
-                name:"task1",
-                taskFunction:function(){
-                    let done = plugins.q.defer();
-                    setTimeout(done.resolve,2000);
-                    return done.promise;
-                }
-            }),
-            new taskbuffer.Task({
-                name:"task2",
-                taskFunction: function(){
-                    let done = plugins.q.defer();
-                    setTimeout(done.resolve,2000);
-                    return done.promise;
-                }
-            }),
-        ];
-        it("should run tasks in sequence",function(done){
-            this.timeout(5000);
-            testTaskchain = new taskbuffer.Taskchain({
-                name:"Taskchain1",
-                taskArray:testTaskArray
-            });
-            testTaskchain.trigger().then(done);
-            
-        });
-    });
-});

ts/00_commitinfo_data.ts

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

ts/index.ts

@@ -1,8 +1,10 @@
-/// <reference path="./typings/main.d.ts" />
-export {Task} from "./taskbuffer.classes.task";
-export {Taskchain} from "./taskbuffer.classes.taskchain";
-export {Taskparallel} from "./taskbuffer.classes.taskparallel";
-export {Taskspace} from "./taskbuffer.classes.taskspace";
-
-// import for naming only
-import "./taskbuffer.classes.helpers"
+export { Task } from './taskbuffer.classes.task.js';
+export type { ITaskFunction } from './taskbuffer.classes.task.js';
+export { Taskchain } from './taskbuffer.classes.taskchain.js';
+export { Taskparallel } from './taskbuffer.classes.taskparallel.js';
+export { TaskManager } from './taskbuffer.classes.taskmanager.js';
+export { TaskOnce } from './taskbuffer.classes.taskonce.js';
+export { TaskRunner } from './taskbuffer.classes.taskrunner.js';
+export { TaskDebounced } from './taskbuffer.classes.taskdebounced.js';
+import * as distributedCoordination from './taskbuffer.classes.distributedcoordinator.js';
+export { distributedCoordination };

ts/taskbuffer.classes.bufferrunner.ts

@@ -0,0 +1,34 @@
+import { Task } from './taskbuffer.classes.task.js';
+
+export class BufferRunner {
+  public task: Task;
+  // initialize by default
+  public bufferCounter: number = 0;
+
+  constructor(taskArg: Task<any>) {
+    this.task = taskArg;
+  }
+
+  public trigger(x: any): Promise<any> {
+    if (!(this.bufferCounter >= this.task.bufferMax)) {
+      this.bufferCounter++;
+    }
+    const returnPromise: Promise<any> = this.task.cycleCounter.getPromiseForCycle(
+      this.bufferCounter
+    );
+    if (!this.task.running) {
+      this._run(x);
+    }
+    return returnPromise;
+  }
+
+  private async _run(x: any) {
+    this.task.running = true;
+    while (this.bufferCounter > 0) {
+      const result = await Task.runTask(this.task, { x: x });
+      this.bufferCounter--;
+      this.task.cycleCounter.informOfCycle(result);
+    }
+    this.task.running = false;
+  }
+}

ts/taskbuffer.classes.cyclecounter.ts

@@ -0,0 +1,36 @@
+import * as plugins from './taskbuffer.plugins.js';
+import { Task } from './taskbuffer.classes.task.js';
+
+export interface ICycleObject {
+  cycleCounter: number;
+  deferred: plugins.smartpromise.Deferred<any>;
+}
+
+export class CycleCounter {
+  public task: Task;
+  public cycleObjectArray: ICycleObject[] = [];
+  constructor(taskArg: Task<any>) {
+    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: any) {
+    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.distributedcoordinator.ts

@@ -0,0 +1,38 @@
+import { Task } from './taskbuffer.classes.task.js';
+import * as plugins from './taskbuffer.plugins.js';
+
+/**
+ * Contains all data for the final coordinator to make an informed decision.
+ */
+export interface IDistributedTaskRequest {
+  submitterId: string;
+  requestResponseId: string;
+  taskName: string;
+  taskVersion: string;
+  taskExecutionTime: number;
+  taskExecutionTimeout: number;
+  taskExecutionParallel: number;
+  status: 'requesting' | 'gotRejected' | 'failed' | 'succeeded';
+}
+
+export interface IDistributedTaskRequestResult {
+  submitterId: string;
+  requestResponseId: string;
+  considered: boolean;
+  rank: number;
+  reason: string;
+  shouldTrigger: boolean;
+}
+
+export abstract class AbstractDistributedCoordinator {
+  public abstract fireDistributedTaskRequest(
+    infoBasis: IDistributedTaskRequest
+  ): Promise<IDistributedTaskRequestResult>;
+
+  public abstract updateDistributedTaskRequest(
+    infoBasis: IDistributedTaskRequest
+  ): Promise<void>;
+
+  public abstract start(): Promise<void>;
+  public abstract stop(): Promise<void>;
+}

ts/taskbuffer.classes.helpers.ts

@@ -1,97 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./taskbuffer.plugins");
-import {Task} from "./taskbuffer.classes.task";
-
-export let emptyTaskFunction = function(){
-    let done = plugins.Q.defer();
-    done.resolve();
-    return done.promise;
-};
-
-export let isTask = function(taskArg):boolean{
-    if(
-        taskArg instanceof Task
-        && typeof taskArg.task === "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 = function(taskArg:Task,optionsArg:{touchedTasksArray:Task[]} = {touchedTasksArray:[]}){
-    let done = plugins.Q.defer();
-    updateTaskStatus(taskArg,"running");
-    done.promise.then(function(){updateTaskStatus(taskArg,"idle")})
-    let localDeferred = plugins.Q.defer();
-    let touchedTasksArray:Task[];
-    if(optionsArg.touchedTasksArray){
-        touchedTasksArray = optionsArg.touchedTasksArray;
-    } else {
-        touchedTasksArray = [];
-    }
-    touchedTasksArray.push(taskArg);
-    localDeferred.promise
-        .then(() =>{
-            if(taskArg.preTask && !isTaskTouched(taskArg.preTask,touchedTasksArray)){
-                return runTask(taskArg.preTask,{touchedTasksArray:touchedTasksArray})
-            } else {
-                let done2 = plugins.Q.defer();
-                done2.resolve();
-                return done2.promise;
-            }
-        })
-        .then(() => {
-            return taskArg.task();
-        })
-        .then(() => {
-            if(taskArg.afterTask && !isTaskTouched(taskArg.afterTask,touchedTasksArray)){
-                return runTask(taskArg.afterTask,{touchedTasksArray:touchedTasksArray})
-            } else {
-                let done2 = plugins.Q.defer();
-                done2.resolve();
-                return done2.promise;
-            }
-        })
-        .then(() => {
-            done.resolve();
-        });
-    localDeferred.resolve();
-    return done.promise;
-};
-
-export let runBufferedTask = (taskArg:Task) => {
-    let recursiveBufferRunner = () => {
-        if(taskArg.bufferCounter > 0){
-            taskArg.bufferCounter--;
-            runTask(taskArg)
-                .then(recursiveBufferRunner);
-        }
-    }
-}
-
-export let updateTaskStatus = (taskArg,statusArg:string) => {
-    switch (statusArg) {
-        case "running":
-            taskArg.running = true;
-            taskArg.idle = false;
-            break;
-        case "idle":
-            taskArg.running = false;
-            taskArg.idle = true;
-            break;
-        default:
-            throw new Error("status not recognised");
-    }
-}

ts/taskbuffer.classes.task.ts

@@ -1,72 +1,213 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins"
-import * as helpers from "./taskbuffer.classes.helpers"
+import * as plugins from './taskbuffer.plugins.js';
+import { BufferRunner } from './taskbuffer.classes.bufferrunner.js';
+import { CycleCounter } from './taskbuffer.classes.cyclecounter.js';
 
-export class Task {
-    name:string;
-    task:any;
-    running:boolean;
-    idle:boolean;
-    buffered:boolean;
-    bufferCounter:number;
-    bufferMax:number;
-    private _counterTriggerAbsolute:number;
-    private _state:string;
-    preTask:Task;
-    afterTask:Task;
+import { logger } from './taskbuffer.logging.js';
 
-    constructor(optionsArg:{
-        taskFunction:any,
-        preTask?:Task,
-        afterTask?:Task,
-        buffered?:boolean,
-        bufferMax?:number,
-        name?:string
-    }){
-        if (!optionsArg){optionsArg = {taskFunction:function(){}}}
-        var options = optionsArg;
-        this.task = optionsArg.taskFunction;
-        this.preTask = options.preTask;
-        this.afterTask = options.afterTask;
-        this.running = false;
-        this.idle = true;
-        this.buffered = options.buffered;
-        this.bufferMax = options.bufferMax;
-        this.name = options.name;
+export interface ITaskFunction<T = undefined> {
+  (x?: any, setupValue?: T): PromiseLike<any>;
+}
+
+export interface ITaskSetupFunction<T = undefined> {
+  (): Promise<T>;
+}
+
+export type TPreOrAfterTaskFunction = () => Task<any>;
+
+export class Task<T = undefined> {
+  public static extractTask<T = undefined>(
+    preOrAfterTaskArg: Task<T> | TPreOrAfterTaskFunction
+  ): Task<T> {
+    switch (true) {
+      case !preOrAfterTaskArg:
+        return null;
+      case preOrAfterTaskArg instanceof Task:
+        return preOrAfterTaskArg as Task<T>;
+      case typeof preOrAfterTaskArg === 'function':
+        const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
+        return taskFunction();
+      default:
+        return null;
     }
-    
-    trigger(){
-        let done = plugins.Q.defer();
-        if(this.buffered) {
-            this.triggerBuffered()
-                .then(done.resolve);
-        }
-        else {
-            this.triggerUnBuffered()
-                .then(done.resolve);
-        };
-        return done.promise;
+  }
+
+  public static emptyTaskFunction: ITaskFunction = function (x) {
+    const done = plugins.smartpromise.defer();
+    done.resolve();
+    return done.promise;
+  };
+
+  public static isTask = (taskArg: Task<any>): boolean => {
+    if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
+      return true;
+    } else {
+      return false;
+    }
+  };
+
+  public static isTaskTouched<T = undefined>(
+    taskArg: Task<T> | TPreOrAfterTaskFunction,
+    touchedTasksArray: Task<T>[]
+  ): 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 <T>(
+    taskArg: Task<T> | TPreOrAfterTaskFunction,
+    optionsArg: { x?: any; touchedTasksArray?: Task<T>[] }
+  ) => {
+    const taskToRun = Task.extractTask(taskArg);
+    const done = plugins.smartpromise.defer();
+
+    // Wait for all blocking tasks to finish
+    for (const task of taskToRun.blockingTasks) {
+      await task.finished;
+    }
+
+    if (!taskToRun.setupValue && taskToRun.taskSetup) {
+      taskToRun.setupValue = await taskToRun.taskSetup();
+    }
+
+    if (taskToRun.execDelay) {
+      await plugins.smartdelay.delayFor(taskToRun.execDelay);
+    }
+
+    taskToRun.running = true;
+
+    done.promise.then(async () => {
+      taskToRun.running = false;
+
+      // When the task has finished running, resolve the finished promise
+      taskToRun.resolveFinished();
+
+      // Create a new finished promise for the next run
+      taskToRun.finished = new Promise((resolve) => {
+        taskToRun.resolveFinished = resolve;
+      });
+    });
+
+    const options = {
+      ...{ x: undefined, touchedTasksArray: [] },
+      ...optionsArg,
     };
-    triggerUnBuffered(){
-        return helpers.runTask(this);
-    }
-    triggerBuffered(){
-        var done = plugins.Q.defer();
-        if(!(this.bufferCounter >= this.bufferMax)){
-            this.bufferCounter++
-        }
-        helpers.runBufferedTask(this);
-        return done.promise;
-    }
+    const x = options.x;
+    const touchedTasksArray: Task<T>[] = options.touchedTasksArray;
 
-    get state():string {
-        return this._state;
-    }
-    set state(stateArg:string){
-        if (stateArg == "locked"){
-            this._state = "locked";
+    touchedTasksArray.push(taskToRun);
+
+    const localDeferred = plugins.smartpromise.defer();
+    localDeferred.promise
+      .then(() => {
+        if (taskToRun.preTask && !Task.isTaskTouched(taskToRun.preTask, touchedTasksArray)) {
+          return Task.runTask(taskToRun.preTask, { x, touchedTasksArray });
         } else {
-            plugins.beautylog.error("state type " + stateArg.blue + " could not be set");
+          const done2 = plugins.smartpromise.defer();
+          done2.resolve(x);
+          return done2.promise;
         }
+      })
+      .then(async (x) => {
+        try {
+          return await taskToRun.taskFunction(x, taskToRun.setupValue);
+        } 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;
+  };
+
+  public name: string;
+  public version: string;
+  public taskFunction: ITaskFunction<T>;
+  public buffered: boolean;
+  public cronJob: plugins.smarttime.CronJob;
+
+  public bufferMax: number;
+  public execDelay: number;
+  public timeout: number;
+
+  public preTask: Task<T> | TPreOrAfterTaskFunction;
+  public afterTask: Task<T> | TPreOrAfterTaskFunction;
+
+  // Add a list to store the blocking tasks
+  public blockingTasks: Task[] = [];
+
+  // Add a promise that will resolve when the task has finished
+  private finished: Promise<void>;
+  private resolveFinished: () => void;
+
+  public running: boolean = false;
+  public bufferRunner = new BufferRunner(this);
+  public cycleCounter = new CycleCounter(this);
+
+  public get idle() {
+    return !this.running;
+  }
+
+  public taskSetup: ITaskSetupFunction<T>;
+  public setupValue: T;
+
+  constructor(optionsArg: {
+    taskFunction: ITaskFunction<T>;
+    preTask?: Task<T> | TPreOrAfterTaskFunction;
+    afterTask?: Task<T> | TPreOrAfterTaskFunction;
+    buffered?: boolean;
+    bufferMax?: number;
+    execDelay?: number;
+    name?: string;
+    taskSetup?: ITaskSetupFunction<T>;
+  }) {
+    this.taskFunction = optionsArg.taskFunction;
+    this.preTask = optionsArg.preTask;
+    this.afterTask = optionsArg.afterTask;
+    this.buffered = optionsArg.buffered;
+    this.bufferMax = optionsArg.bufferMax;
+    this.execDelay = optionsArg.execDelay;
+    this.name = optionsArg.name;
+    this.taskSetup = optionsArg.taskSetup;
+
+    // Create the finished promise
+    this.finished = new Promise((resolve) => {
+      this.resolveFinished = resolve;
+    });
+  }
+
+  public trigger(x?: any): Promise<any> {
+    if (this.buffered) {
+      return this.triggerBuffered(x);
+    } else {
+      return this.triggerUnBuffered(x);
     }
-}
+  }
+
+  public triggerUnBuffered(x?: any): Promise<any> {
+    return Task.runTask<T>(this, { x: x });
+  }
+
+  public triggerBuffered(x?: any): Promise<any> {
+    return this.bufferRunner.trigger(x);
+  }
+}

ts/taskbuffer.classes.taskchain.ts

@@ -1,60 +1,58 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins";
-import {Task} from "./taskbuffer.classes.task";
-import helpers = require("./taskbuffer.classes.helpers");
+// TaskChain chains tasks
+// and extends Task
+
+import * as plugins from './taskbuffer.plugins.js';
+import { Task } from './taskbuffer.classes.task.js';
+import { logger } from './taskbuffer.logging.js';
 
 export class Taskchain extends Task {
-    taskArray:Task[];
-    private _oraObject:plugins.beautylog.Ora;
-    constructor(optionsArg:{
-        name?:string,
-        log?:boolean,
-        taskArray:Task[]
-    }){
-        let options = plugins.lodash.assign(
-            {
-                name:"unnamed Taskchain",
-                log:false
-            },
-            optionsArg,
-            {
-                taskFunction: () => { // this is the function that gets executed when TaskChain is triggered
-                    let done = plugins.Q.defer(); // this is the starting Deferred object 
-                    let taskCounter = 0;
-                    let iterateTasks = () => {
-                        if(typeof this.taskArray[taskCounter] != "undefined"){
-                            this._oraObject.text(this.name + " running: Task" + this.taskArray[taskCounter].name);
-                            this.taskArray[taskCounter].trigger()
-                                .then(()=>{
-                                    this._oraObject.log(this.taskArray[taskCounter].name,"ok");
-                                    taskCounter++;
-                                    iterateTasks();
-                                });     
-                        } else {
-                            this._oraObject.endOk("Taskchain \"" + this.name +  "\" completed successfully");
-                            done.resolve();
-                        }
-                    };
-                    iterateTasks();
-                    return done.promise;
-                }
+  taskArray: Task[];
+  constructor(optionsArg: {
+    taskArray: Task[];
+    name?: string;
+    log?: boolean;
+    buffered?: boolean;
+    bufferMax?: number;
+  }) {
+    const options = {
+      ...{
+        name: 'unnamed Taskchain',
+        log: false,
+      },
+      ...optionsArg,
+      ...{
+        taskFunction: (x: any) => {
+          // this is the function that gets executed when TaskChain is triggered
+          const done = plugins.smartpromise.defer(); // this is the starting Deferred object
+          let taskCounter = 0; // counter for iterating async over the taskArray
+          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) => {
+                logger.log('info', this.taskArray[taskCounter].name);
+                taskCounter++;
+                iterateTasks(x);
+              });
+            } else {
+              console.log('Taskchain "' + this.name + '" completed successfully');
+              done.resolve(x);
             }
-        );
-        super(options);
-        this.taskArray = optionsArg.taskArray;
-        this._oraObject = new plugins.beautylog.Ora("Taskchain idle","blue");
-    }
-    addTask(taskArg:Task){
-        this.taskArray.push(taskArg);
+          };
+          iterateTasks(x);
+          return done.promise;
+        },
+      },
     };
-    removeTask(taskArg:Task){
-        //TODO
-    };
-    shiftTask(){
-        
-    };
-    trigger(){
-        this._oraObject.start(this.name + " running...");
-        return helpers.runTask(this);
-    }
-};
+    super(options);
+    this.taskArray = optionsArg.taskArray;
+  }
+  addTask(taskArg: Task) {
+    this.taskArray.push(taskArg);
+  }
+  removeTask(taskArg: Task) {
+    // TODO:
+  }
+  shiftTask() {
+    // TODO:
+  }
+}

ts/taskbuffer.classes.taskdebounced.ts

@@ -0,0 +1,27 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+import { Task, type 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

@@ -0,0 +1,139 @@
+import * as plugins from './taskbuffer.plugins.js';
+import { Task } from './taskbuffer.classes.task.js';
+import { AbstractDistributedCoordinator, type IDistributedTaskRequestResult } from './taskbuffer.classes.distributedcoordinator.js';
+
+export interface ICronJob {
+  cronString: string;
+  taskName: string;
+  job: any;
+}
+
+export interface ITaskManagerConstructorOptions {
+  distributedCoordinator?: AbstractDistributedCoordinator;
+}
+
+export class TaskManager {
+  public randomId = plugins.smartunique.shortId();
+  public taskMap = new plugins.lik.ObjectMap<Task>();
+  private cronJobManager = new plugins.smarttime.CronManager();
+  public options: ITaskManagerConstructorOptions = {
+    distributedCoordinator: null,
+  };
+
+  constructor(options: ITaskManagerConstructorOptions = {}) {
+    this.options = Object.assign(this.options, options);
+  }
+
+  public getTaskByName(taskName: string): Task {
+    return this.taskMap.findSync((task) => task.name === taskName);
+  }
+
+  public addTask(task: Task): void {
+    if (!task.name) {
+      throw new Error('Task must have a name to be added to taskManager');
+    }
+    this.taskMap.add(task);
+  }
+
+  public addAndScheduleTask(task: Task, cronString: string) {
+    this.addTask(task);
+    this.scheduleTaskByName(task.name, cronString);
+  }
+
+  public async triggerTaskByName(taskName: string): Promise<any> {
+    const taskToTrigger = this.getTaskByName(taskName);
+    if (!taskToTrigger) {
+      throw new Error(`No task with the name ${taskName} found.`);
+    }
+    return taskToTrigger.trigger();
+  }
+
+  public async triggerTask(task: Task) {
+    return task.trigger();
+  }
+
+  public scheduleTaskByName(taskName: string, cronString: string) {
+    const taskToSchedule = this.getTaskByName(taskName);
+    if (!taskToSchedule) {
+      throw new Error(`No task with the name ${taskName} found.`);
+    }
+    this.handleTaskScheduling(taskToSchedule, cronString);
+  }
+
+  private handleTaskScheduling(task: Task, cronString: string) {
+    const cronJob = this.cronJobManager.addCronjob(
+      cronString,
+      async (triggerTime: number) => {
+        this.logTaskState(task);
+        if (this.options.distributedCoordinator) {
+          const announcementResult = await this.performDistributedConsultation(task, triggerTime);
+          if (!announcementResult.shouldTrigger) {
+            console.log('Distributed coordinator result: NOT EXECUTING');
+            return;
+          } else {
+            console.log('Distributed coordinator result: CHOSEN AND EXECUTING');
+          }
+        }
+        await task.trigger();
+      }
+    );
+    task.cronJob = cronJob;
+  }
+
+  private logTaskState(task: Task) {
+    console.log(`Taskbuffer schedule triggered task >>${task.name}<<`);
+    const bufferState = task.buffered
+      ? `buffered with max ${task.bufferMax} buffered calls`
+      : `unbuffered`;
+    console.log(`Task >>${task.name}<< is ${bufferState}`);
+  }
+
+  private async performDistributedConsultation(task: Task, triggerTime: number): Promise<IDistributedTaskRequestResult> {
+    console.log('Found a distributed coordinator, performing consultation.');
+
+    return this.options.distributedCoordinator.fireDistributedTaskRequest({
+      submitterId: this.randomId,
+      requestResponseId: plugins.smartunique.shortId(),
+      status: 'requesting',
+      taskExecutionParallel: 1,
+      taskExecutionTime: triggerTime,
+      taskExecutionTimeout: task.timeout,
+      taskName: task.name,
+      taskVersion: task.version,
+    });
+  }
+
+  public descheduleTaskByName(taskName: string) {
+    const task = this.getTaskByName(taskName);
+    if (task && task.cronJob) {
+      this.cronJobManager.removeCronjob(task.cronJob);
+      task.cronJob = null;
+    }
+    if (this.cronJobManager.cronjobs.isEmpty) {
+      this.cronJobManager.stop();
+    }
+  }
+
+  public async descheduleTask(task: Task) {
+    await this.descheduleTaskByName(task.name);
+  }
+
+  public getScheduleForTaskName(taskName: string): string | null {
+    const task = this.getTaskByName(taskName);
+    return task && task.cronJob ? task.cronJob.cronExpression : null;
+  }
+
+  public async start() {
+    if (this.options.distributedCoordinator) {
+      await this.options.distributedCoordinator.start();
+    }
+    this.cronJobManager.start();
+  }
+
+  public async stop() {
+    this.cronJobManager.stop();
+    if (this.options.distributedCoordinator) {
+      await this.options.distributedCoordinator.stop();
+    }
+  }
+}

ts/taskbuffer.classes.taskonce.ts

@@ -0,0 +1,21 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+import { Task, type ITaskFunction } from './taskbuffer.classes.task.js';
+
+/**
+ * TaskOnce is run exactly once, no matter how often it is triggered
+ */
+export class TaskOnce extends Task {
+  hasTriggered: boolean = false;
+  constructor(optionsArg: { name?: string; taskFunction: ITaskFunction }) {
+    super({
+      name: optionsArg.name,
+      taskFunction: async () => {
+        if (!this.hasTriggered) {
+          this.hasTriggered = true;
+          await optionsArg.taskFunction();
+        }
+      },
+    });
+  }
+}

ts/taskbuffer.classes.taskparallel.ts

@@ -1,29 +1,24 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins"
-import * as helpers from "./taskbuffer.classes.helpers"
-import {Task} from "./taskbuffer.classes.task"
+import * as plugins from './taskbuffer.plugins.js';
+import { Task } from './taskbuffer.classes.task.js';
 
 export class Taskparallel extends Task {
-    taskArray:Task[];
-    constructor(optionsArg:{
-        taskArray:Task[]
-    }){
-        let options = plugins.lodash.assign(
-            optionsArg,
-            {
-                taskFunction:() => {
-                    let done = plugins.Q.defer();
-                    let promiseArray; // stores promises of all tasks, since they run in parallel
-                    this.taskArray.forEach(function(taskArg:Task){
-                        promiseArray.push(taskArg.trigger());
-                    })
-                    plugins.Q.all(promiseArray)
-                        .then(done.resolve);
-                    return done.promise;
-                }
-            }
-        )
-        super(options);
-    }
+  public taskArray: Task[];
+  constructor(optionsArg: { taskArray: Task[] }) {
+    const options = {
+      ...optionsArg,
+      ...{
+        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) {
+            promiseArray.push(taskArg.trigger());
+          });
+          Promise.all(promiseArray).then(done.resolve);
+          return done.promise;
+        },
+      },
+    };
+    super(options);
+    this.taskArray = optionsArg.taskArray;
+  }
 }
-

ts/taskbuffer.classes.taskrunner.ts

@@ -0,0 +1,63 @@
+import * as plugins from './taskbuffer.plugins.js';
+
+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 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();
+  }
+
+  /**
+   * set amount of parallel tasks
+   * be careful, you might loose dependability of tasks
+   */
+  public setMaxParallelJobs(maxParrallelJobsArg: number) {
+    this.maxParrallelJobs = maxParrallelJobsArg;
+  }
+
+  /**
+   * starts the task queue
+   */
+  public async start() {
+    this.status = 'running';
+  }
+
+  /**
+   * checks wether execution is on point
+   */
+  public async checkExecution() {
+    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();
+    }
+  }
+
+  /**
+   * stops the task queue
+   */
+  public async stop() {
+    this.status = 'stopped';
+  }
+}

ts/taskbuffer.classes.taskspace.ts

@@ -1,7 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-import * as plugins from "./taskbuffer.plugins"
-import * as helpers from "./taskbuffer.classes.helpers"
-
-export class Taskspace {
-    
-}

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,4 +1,9 @@
-/// <reference path="./typings/main.d.ts" />
-export import beautylog = require("beautylog");
-export let Q = require("q");
-export let lodash= require("lodash");
+import * as lik from '@push.rocks/lik';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartrx from '@push.rocks/smartrx';
+import * as smarttime from '@push.rocks/smarttime';
+import * as smartunique from '@push.rocks/smartunique';
+
+export { lik, smartlog, smartpromise, smartdelay, smartrx, smarttime, smartunique };

ts/typings.json

@@ -1,8 +0,0 @@
-{
-  "ambientDependencies": {
-    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts",
-    "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
-    "should": "registry:dt/should#8.1.1+20160316155526"
-  }
-}

tsconfig.json

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