2.0.6

.gitlab-ci.yml

@@ -26,6 +26,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -33,24 +34,39 @@ snyk:
   - docker
   - notpriv
 
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
 testLTS:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
@@ -62,6 +78,7 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
@@ -118,6 +135,7 @@ pages:
   stage: metadata
   script:
     - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
@@ -130,13 +148,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

docs/index.md

@@ -1,87 +0,0 @@
-# taskbuffer
-
-flexible task management. TypeScript ready!
-
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/taskbuffer)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/taskbuffer)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/taskbuffer)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/taskbuffer/)
-
-## Status for master
-
-[![build status](https://GitLab.com/pushrocks/taskbuffer/badges/master/build.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/taskbuffer/badges/master/coverage.svg)](https://GitLab.com/pushrocks/taskbuffer/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/taskbuffer.svg)](https://www.npmjs.com/package/taskbuffer)
-[![Dependency Status](https://david-dm.org/pushrocks/taskbuffer.svg)](https://david-dm.org/pushrocks/taskbuffer)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/taskbuffer/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/taskbuffer/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/taskbuffer/badges/code.svg)](https://www.bithound.io/github/pushrocks/taskbuffer)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Install
-
-```sh
-npm install taskbuffer --save
-```
-
-## Concepts
-
-### class `Task`
-
-- A Task in its most simple form is a function that is executed when the task runs.
-- A Task can have a **preTask** and an **afterTask**
-  (those are run before or after the main function whenever the task is called)
-- A Task can be buffered.
-  That means it can be called multiple times in a very short time.
-  However execution happens in line:
-  meaning execution of the task's main function is on halt until the previous task call has finished.
-  You can set bufferMax number, which is the max number of buffered task calls.
-  Any additional calls will then be truncated
-- Task.trigger() and Task.triggerBuffered() always return a Promise
-  which is fullfilled once the related task call has completed.
-- Task.triggered() is an Observable stream that emits events every time a task call is called and every time a call is completed.
-- Task is compatible to gulp streams.
-
-### class `TaskChain`
-
-- TaskChain extends Task.
-- Multiple Tasks can be combined in a bigger task using a TaskChain.
-- While the tasks are async in themselve, TaskChain **runs Tasks serialized** (one after the other)
-- that means that tasks can rely on each other and
-
-### class `TaskParallel`
-
-- TaskParallel extends Task.
-- like TaskChain, however **tasks run in parallel**
-- Tasks cannot rely on each other.
-
-### Usage
-
-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)

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@pushrocks/taskbuffer",
-  "version": "2.0.0",
+  "version": "2.0.6",
+  "private": false,
   "description": "flexible task management. TypeScript ready!",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "tstest test/",
-    "build": "echo \"Not needed for now\""
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -26,18 +27,20 @@
   },
   "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.1",
-    "@pushrocks/smartdelay": "^2.0.1",
-    "@pushrocks/smartlog": "^2.0.1",
+    "@pushrocks/lik": "^3.0.4",
+    "@pushrocks/smartdelay": "^2.0.2",
+    "@pushrocks/smartlog": "^2.0.9",
     "@pushrocks/smartpromise": "^2.0.5",
     "@types/cron": "^1.3.0",
-    "cron": "^1.3.0",
-    "rxjs": "^6.2.2"
+    "cron": "^1.6.0",
+    "rxjs": "^6.3.3"
   },
   "devDependencies": {
-    "@gitzone/tstest": "^1.0.7",
-    "@pushrocks/tapbundle": "^3.0.1",
-    "@types/node": "^10.5.4"
-  },
-  "private": true
+    "@gitzone/tsbuild": "^2.1.4",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.18",
+    "tslint": "^5.12.1",
+    "tslint-config-prettier": "^1.17.0"
+  }
 }

readme.md

@@ -1,4 +1,4 @@
-# @pushrocks/taskbuffer
+# taskbuffer
 
 flexible task management. TypeScript ready!
 
@@ -21,13 +21,67 @@ flexible task management. TypeScript ready!
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
-## Usage
+## Install
 
-Use TypeScript for best in class instellisense.
+```sh
+npm install taskbuffer --save
+```
+
+## Concepts
+
+### class `Task`
+
+- A Task in its most simple form is a function that is executed when the task runs.
+- A Task can have a **preTask** and an **afterTask**
+  (those are run before or after the main function whenever the task is called)
+- A Task can be buffered.
+  That means it can be called multiple times in a very short time.
+  However execution happens in line:
+  meaning execution of the task's main function is on halt until the previous task call has finished.
+  You can set bufferMax number, which is the max number of buffered task calls.
+  Any additional calls will then be truncated
+- Task.trigger() and Task.triggerBuffered() always return a Promise
+  which is fullfilled once the related task call has completed.
+- Task.triggered() is an Observable stream that emits events every time a task call is called and every time a call is completed.
+- Task is compatible to gulp streams.
+
+### class `TaskChain`
+
+- TaskChain extends Task.
+- Multiple Tasks can be combined in a bigger task using a TaskChain.
+- While the tasks are async in themselve, TaskChain **runs Tasks serialized** (one after the other)
+- that means that tasks can rely on each other and
+
+### class `TaskParallel`
+
+- TaskParallel extends Task.
+- like TaskChain, however **tasks run in parallel**
+- Tasks cannot rely on each other.
+
+### Usage
+
+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)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
 [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

test/test.1.task.ts

@@ -8,11 +8,8 @@ import * as smartdelay from '@pushrocks/smartdelay';
 let testTask: taskbuffer.Task;
 
 let testPreTask = new taskbuffer.Task({
-  taskFunction: function() {
-    let done = smartpromise.defer();
+  taskFunction: async () => {
     console.log('preTask executed');
-    done.resolve();
-    return done.promise;
   },
   preTask: testTask
 });
@@ -35,14 +32,14 @@ let task1 = new taskbuffer.Task({
 
 let task2 = new taskbuffer.Task({
   name: 'Task 1',
-  taskFunction: () => {
-    let done = smartpromise.defer();
+  taskFunction: async () => {
+    const done = smartpromise.defer();
     console.log('Task2 started');
     setTimeout(() => {
       console.log('Task2 executed');
       done.resolve();
     }, 5000);
-    return done.promise;
+    await done.promise;
   }
 });
 

test/test.2.taskchain.ts

@@ -1,7 +1,7 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import taskbuffer = require('../ts/index');
 
-import * as smartq from 'smartq';
+import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartdelay from '@pushrocks/smartdelay';
 
 let task1Executed = false;

ts/taskbuffer.classes.task.ts

@@ -100,7 +100,7 @@ export class Task {
     if (stateArg === 'locked') {
       this._state = 'locked';
     } else {
-      plugins.smartlog.defaultLogger.error('state type ' + stateArg + ' could not be set');
+      plugins.smartlog.defaultLogger.log('error', 'state type ' + stateArg + ' could not be set');
     }
   }
 }

ts/taskbuffer.classes.taskchain.ts

@@ -29,7 +29,7 @@ export class Taskchain extends Task {
             if (typeof this.taskArray[taskCounter] !== 'undefined') {
               console.log(this.name + ' running: Task' + this.taskArray[taskCounter].name);
               this.taskArray[taskCounter].trigger(x).then(x => {
-                plugins.smartlog.defaultLogger.info(this.taskArray[taskCounter].name);
+                plugins.smartlog.defaultLogger.log('info', this.taskArray[taskCounter].name);
                 taskCounter++;
                 iterateTasks(x);
               });

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "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"
 }