Compare commits

..

60 Commits

Author SHA1 Message Date
fa8be6b6d3 3.0.12 2023-08-02 00:07:22 +02:00
b5981d67cf fix(core): update 2023-08-02 00:07:21 +02:00
493cd83dda 3.0.11 2023-07-26 14:16:34 +02:00
86b2842ed2 fix(core): update 2023-07-26 14:16:33 +02:00
801e2ad266 3.0.10 2023-01-19 14:21:36 +01:00
7f837c70fc fix(core): update 2023-01-19 14:21:36 +01:00
f5ca4a696c 3.0.9 2023-01-19 14:20:45 +01:00
b48d42dfb9 fix(core): update 2023-01-19 14:20:44 +01:00
5bf568d0cd 3.0.8 2023-01-19 14:09:57 +01:00
173e1ca35d fix(core): update 2023-01-19 14:09:56 +01:00
ce258c76d2 3.0.7 2023-01-09 18:40:39 +01:00
4d2756b743 fix(core): update 2023-01-09 18:40:38 +01:00
973678d635 3.0.6 2023-01-07 20:35:28 +01:00
28e7bad605 fix(core): update 2023-01-07 20:35:27 +01:00
fb44dd47fc 3.0.5 2023-01-07 19:05:30 +01:00
a2f6bccac2 fix(core): update 2023-01-07 19:05:29 +01:00
e4f8be5603 3.0.4 2022-11-14 14:54:26 +01:00
84f186924e fix(core): update 2022-11-14 14:54:26 +01:00
ff57dccee1 3.0.3 2022-11-09 10:36:18 +01:00
a9d84d5147 fix(core): update 2022-11-09 10:36:18 +01:00
ae6a6ce67e 3.0.2 2022-08-02 15:07:20 +02:00
05b14136f9 fix(core): update 2022-08-02 15:07:20 +02:00
bf9ca39c36 3.0.1 2022-04-15 16:41:42 +02:00
e61791ec41 fix(core): update 2022-04-15 16:41:42 +02:00
9001a96df0 3.0.0 2022-03-25 12:14:49 +01:00
835fa3663d BREAKING CHANGE(core): switch to esm 2022-03-25 12:14:49 +01:00
f50384947d 2.1.17 2021-11-11 20:48:32 +01:00
65c1dd8fdc fix(core): update 2021-11-11 20:48:31 +01:00
613d46bb38 2.1.16 2021-11-11 20:37:27 +01:00
439da1f342 fix(core): update 2021-11-11 20:37:27 +01:00
e9e4a60fe6 2.1.15 2021-11-11 19:59:56 +01:00
1630f6971f fix(core): update 2021-11-11 19:59:56 +01:00
7bfb145513 2.1.14 2021-09-26 14:45:02 +02:00
c367f0f949 fix(core): update 2021-09-26 14:45:02 +02:00
8f9b3151d8 2.1.13 2020-09-07 23:52:23 +00:00
81e97b513a fix(core): update 2020-09-07 23:52:22 +00:00
7da0035805 2.1.12 2020-09-07 17:35:51 +00:00
16a77e4c41 fix(core): update 2020-09-07 17:35:50 +00:00
495f63ec71 2.1.11 2020-09-04 16:09:44 +00:00
17f840d24c fix(core): update 2020-09-04 16:09:44 +00:00
b93407e83a 2.1.10 2020-09-04 06:47:31 +00:00
003c1f2796 fix(core): update 2020-09-04 06:47:30 +00:00
7f72a88846 2.1.9 2020-09-03 20:43:38 +00:00
823d4f7d55 fix(core): update 2020-09-03 20:43:37 +00:00
7d57fcf07e 2.1.8 2020-09-02 15:26:46 +00:00
eb9ae2fa71 fix(core): update 2020-09-02 15:26:45 +00:00
5fe60c6e50 2.1.7 2020-09-02 13:46:27 +00:00
6f811b4ab5 fix(core): update 2020-09-02 13:46:26 +00:00
2cf32ac723 2.1.6 2020-09-02 13:04:53 +00:00
09936fda56 fix(core): update 2020-09-02 13:04:52 +00:00
ddc9a77fe2 2.1.5 2020-09-02 13:04:12 +00:00
575912eab7 fix(core): update 2020-09-02 13:04:12 +00:00
eee146ae8b 2.1.4 2020-07-12 10:57:15 +00:00
ea8ef61c40 fix(core): update 2020-07-12 10:57:15 +00:00
70bb5b3f5d 2.1.3 2020-07-12 02:40:45 +00:00
5fa7312171 fix(core): update 2020-07-12 02:40:45 +00:00
cb85deeb3d 2.1.2 2020-07-12 00:48:51 +00:00
fdfb780c33 fix(core): update 2020-07-12 00:48:51 +00:00
f21b53b81d 2.1.1 2019-11-28 14:42:29 +00:00
0bf3b2ea8b fix(core): update 2019-11-28 14:42:28 +00:00
37 changed files with 5591 additions and 2231 deletions

View File

@ -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

View File

@ -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

4
.gitignore vendored
View File

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

View File

@ -1,126 +0,0 @@
# gitzone ci_default
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache:
paths:
- .npmci_cache/
key: '$CI_BUILD_STAGE'
stages:
- security
- test
- release
- metadata
# ====================
# security stage
# ====================
mirror:
stage: security
script:
- npmci git mirror
tags:
- lossless
- docker
- notpriv
snyk:
image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
stage: security
script:
- npmci npm prepare
- npmci command npm install --ignore-scripts
- npmci command snyk test
tags:
- lossless
- docker
- notpriv
# ====================
# test stage
# ====================
testStable:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- lossless
- docker
- priv
testBuild:
stage: test
script:
- npmci npm prepare
- npmci node install stable
- npmci npm install
- npmci command npm run build
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- lossless
- docker
- notpriv
release:
stage: release
script:
- npmci node install stable
- npmci npm publish
only:
- tags
tags:
- lossless
- docker
- notpriv
# ====================
# metadata stage
# ====================
codequality:
stage: metadata
allow_failure: true
script:
- npmci command npm install -g tslint typescript
- npmci npm prepare
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- lossless
- docker
- priv
trigger:
stage: metadata
script:
- npmci trigger
only:
- tags
tags:
- lossless
- docker
- notpriv
pages:
stage: metadata
script:
- npmci node install lts
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare
- npmci npm install
- npmci command tsdoc
tags:
- lossless
- docker
- notpriv
only:
- tags
artifacts:
expire_in: 1 week
paths:
- public
allow_failure: true

11
.vscode/launch.json vendored Normal file
View File

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

26
.vscode/settings.json vendored Normal file
View File

@ -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"]
}
}
}
}
}
}
]
}

View File

@ -5,12 +5,13 @@
"npmRegistryUrl": "registry.npmjs.org" "npmRegistryUrl": "registry.npmjs.org"
}, },
"gitzone": { "gitzone": {
"projectType": "npm",
"module": { "module": {
"githost": "gitlab.com", "githost": "gitlab.com",
"gitscope": "pushrocks", "gitscope": "push.rocks",
"gitrepo": "taskbuffer", "gitrepo": "taskbuffer",
"shortDescription": "flexible task management. TypeScript ready!", "description": "flexible task management. TypeScript ready!",
"npmPackagename": "@pushrocks/taskbuffer", "npmPackagename": "@push.rocks/taskbuffer",
"license": "MIT" "license": "MIT"
} }
} }

1853
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +1,15 @@
{ {
"name": "@pushrocks/taskbuffer", "name": "@push.rocks/taskbuffer",
"version": "2.1.0", "version": "3.0.12",
"private": false, "private": false,
"description": "flexible task management. TypeScript ready!", "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": { "scripts": {
"test": "(tstest test/)", "test": "(tstest test/ --web)",
"build": "(tsbuild)" "build": "(tsbuild --web && tsbundle npm)",
"buildDocs": "tsdoc"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -27,31 +29,35 @@
}, },
"homepage": "https://gitlab.com/pushrocks/taskbuffer#readme", "homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
"dependencies": { "dependencies": {
"@pushrocks/lik": "^3.0.13", "@push.rocks/isounique": "^1.0.5",
"@pushrocks/smartdelay": "^2.0.6", "@push.rocks/lik": "^6.0.3",
"@pushrocks/smartlog": "^2.0.21", "@push.rocks/smartdelay": "^3.0.5",
"@pushrocks/smartpromise": "^3.0.6", "@push.rocks/smartlog": "^3.0.3",
"@types/cron": "^1.7.1", "@push.rocks/smartpromise": "^4.0.3",
"cron": "^1.7.2", "@push.rocks/smartrx": "^3.0.6",
"rxjs": "^6.5.3" "@push.rocks/smarttime": "^4.0.4"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.66",
"@gitzone/tstest": "^1.0.28", "@gitzone/tsbundle": "^2.0.8",
"@pushrocks/tapbundle": "^3.2.0", "@gitzone/tsrun": "^1.2.44",
"@types/node": "^12.12.14", "@gitzone/tstest": "^1.0.77",
"tslint": "^5.20.1", "@push.rocks/tapbundle": "^5.0.12",
"tslint-config-prettier": "^1.18.0" "@types/node": "^20.4.5"
}, },
"files": [ "files": [
"ts/**/*", "ts/**/*",
"ts_web/**/*", "ts_web/**/*",
"dist/**/*", "dist/**/*",
"dist_web/**/*", "dist_*/**/*",
"dist_ts/**/*",
"dist_ts_web/**/*", "dist_ts_web/**/*",
"assets/**/*", "assets/**/*",
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
],
"browserslist": [
"last 1 chrome versions"
] ]
} }

4905
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +1,26 @@
# @pushrocks/taskbuffer # @push.rocks/taskbuffer
flexible task management. TypeScript ready! flexible task management. TypeScript ready!
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/taskbuffer) * [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/taskbuffer)
* [gitlab.com (source)](https://gitlab.com/pushrocks/taskbuffer) * [gitlab.com (source)](https://gitlab.com/push.rocks/taskbuffer)
* [github.com (source mirror)](https://github.com/pushrocks/taskbuffer) * [github.com (source mirror)](https://github.com/push.rocks/taskbuffer)
* [docs (typedoc)](https://pushrocks.gitlab.io/taskbuffer/) * [docs (typedoc)](https://push.rocks.gitlab.io/taskbuffer/)
## Status for master ## 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/push.rocks/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/push.rocks/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/@push.rocks/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/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 ## Usage
@ -44,14 +50,12 @@ 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) [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
## Contribution ## 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). :) 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. For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) ## 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) | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

View File

@ -1,8 +1,9 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@push.rocks/tapbundle';
import taskbuffer = require('../ts/index');
import * as smartpromise from '@pushrocks/smartpromise'; import * as taskbuffer from '../ts/index.js';
import * as smartdelay from '@pushrocks/smartdelay';
import * as smartpromise from '@push.rocks/smartpromise';
import * as smartdelay from '@push.rocks/smartdelay';
// setup some testData to work with // setup some testData to work with
let testTask: taskbuffer.Task; let testTask: taskbuffer.Task;
@ -11,7 +12,7 @@ let testPreTask = new taskbuffer.Task({
taskFunction: async () => { taskFunction: async () => {
console.log('preTask executed'); console.log('preTask executed');
}, },
preTask: testTask preTask: testTask,
}); });
// some more tasks to test with // some more tasks to test with
@ -27,7 +28,7 @@ let task1 = new taskbuffer.Task({
done.resolve(); done.resolve();
}, 5000); }, 5000);
return done.promise; return done.promise;
} },
}); });
let task2 = new taskbuffer.Task({ let task2 = new taskbuffer.Task({
@ -40,7 +41,7 @@ let task2 = new taskbuffer.Task({
done.resolve(); done.resolve();
}, 5000); }, 5000);
await done.promise; await done.promise;
} },
}); });
let task3 = new taskbuffer.Task({ let task3 = new taskbuffer.Task({
@ -53,7 +54,7 @@ let task3 = new taskbuffer.Task({
done.resolve(); done.resolve();
}, 5000); }, 5000);
return done.promise; return done.promise;
} },
}); });
tap.test('new Task() should return a new task', async () => { 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 () => { taskFunction: async () => {
console.log('executed twice'); console.log('executed twice');
}, },
preTask: testPreTask preTask: testPreTask,
}); });
}); });
tap.test('expect testTask to be an instance of Task', async () => { 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 () => { 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 () => { 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 // 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 () => { 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 () => { 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({ let localTestTask = new taskbuffer.Task({
taskFunction: async () => { taskFunction: async () => {
console.log('only once'); console.log('only once');
} },
}); });
await localTestTask.trigger(); await localTestTask.trigger();
}); });
@ -104,7 +105,7 @@ tap.test('expect task to run in buffered mode', async () => {
await smartdelay.delayFor(3000); await smartdelay.delayFor(3000);
}, },
buffered: true, buffered: true,
bufferMax: 2 bufferMax: 2,
}); });
localTestTask.trigger(); localTestTask.trigger();
localTestTask.trigger(); localTestTask.trigger();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
import { tap, expect } from '@pushrocks/tapbundle'; import { tap, expect } from '@push.rocks/tapbundle';
import * as taskbuffer from '../ts'; import * as taskbuffer from '../ts/index.js';
let preTask: taskbuffer.Task; let preTask: taskbuffer.Task;
let afterTask: taskbuffer.Task; let afterTask: taskbuffer.Task;
@ -13,11 +13,11 @@ tap.test('should create tasks', async () => {
taskFunction: async () => { taskFunction: async () => {
console.log('pretask executed :)'); console.log('pretask executed :)');
return 'hi'; return 'hi';
} },
}); });
afterTask = new taskbuffer.Task({ afterTask = new taskbuffer.Task({
name: 'myAfterTask', name: 'myAfterTask',
taskFunction: async x => { taskFunction: async (x) => {
if (x === 'hi') { if (x === 'hi') {
console.log('afterTask: values get passed along alright'); console.log('afterTask: values get passed along alright');
} }
@ -25,12 +25,12 @@ tap.test('should create tasks', async () => {
return x; return x;
}, },
preTask, preTask,
afterTask afterTask,
}); });
mainTask = new taskbuffer.Task({ mainTask = new taskbuffer.Task({
name: 'mainTask', name: 'mainTask',
taskFunction: async x => { taskFunction: async (x) => {
if (x === 'hi') { if (x === 'hi') {
console.log('mainTask: values get passed along alright'); console.log('mainTask: values get passed along alright');
} }
@ -40,7 +40,7 @@ tap.test('should create tasks', async () => {
preTask: () => { preTask: () => {
return preTask; return preTask;
}, },
afterTask afterTask,
}); });
}); });

View File

@ -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();

View File

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

8
ts/00_commitinfo_data.ts Normal file
View File

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

View File

@ -1,6 +1,10 @@
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';
import * as distributedCoordination from './taskbuffer.classes.distributedcoordinator.js';
export { distributedCoordination };

View File

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

View File

@ -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 { export interface ICycleObject {
cycleCounter: number; cycleCounter: number;
@ -16,14 +16,14 @@ export class CycleCounter {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const cycleObject: ICycleObject = { const cycleObject: ICycleObject = {
cycleCounter: cycleCountArg, cycleCounter: cycleCountArg,
deferred: done deferred: done,
}; };
this.cycleObjectArray.push(cycleObject); this.cycleObjectArray.push(cycleObject);
return done.promise; return done.promise;
} }
public informOfCycle(x) { public informOfCycle(x: any) {
const newCycleObjectArray: ICycleObject[] = []; const newCycleObjectArray: ICycleObject[] = [];
this.cycleObjectArray.forEach(cycleObjectArg => { this.cycleObjectArray.forEach((cycleObjectArg) => {
cycleObjectArg.cycleCounter--; cycleObjectArg.cycleCounter--;
if (cycleObjectArg.cycleCounter <= 0) { if (cycleObjectArg.cycleCounter <= 0) {
cycleObjectArg.deferred.resolve(x); cycleObjectArg.deferred.resolve(x);

View File

@ -0,0 +1,41 @@
import { Task } from './taskbuffer.classes.task.js';
import * as plugins from './taskbuffer.plugins.js';
/**
* constains all data for the final coordinator to actually make an informed decision
*/
export interface IDistributedTaskRequest {
/**
* this needs to correlate to the consultationResult
*/
submitterRandomId: string;
taskName: string;
taskVersion: string;
taskExecutionTime: number;
taskExecutionTimeout: number;
taskExecutionParallel: number;
status: 'requesting' | 'gotRejected' | 'failed' | 'succeeded';
}
export interface IDistributedTaskRequestResult {
/**
* this needs to correlate to the decisionInfoBasis
*/
submitterRandomId: string;
/**
* can be used while debugging
*/
considered: boolean;
rank: string;
reason: string;
shouldTrigger: boolean;
}
export abstract class AbstractDistributedCoordinator {
public abstract fireDistributedTaskRequest(
infoBasisArg: IDistributedTaskRequest
): Promise<IDistributedTaskRequestResult>;
public abstract updateDistributedTaskRequest(
infoBasisArg: IDistributedTaskRequest
): Promise<void>;
}

View File

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

View File

@ -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 { export interface ITaskFunction {
(x?: any): PromiseLike<any>; (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(); const done = plugins.smartpromise.defer();
done.resolve(); done.resolve();
return done.promise; return done.promise;
@ -55,8 +56,9 @@ export class Task {
public static runTask = async ( public static runTask = async (
taskArg: Task | TPreOrAfterTaskFunction, 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 taskToRun = Task.extractTask(taskArg);
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
@ -75,7 +77,7 @@ export class Task {
// handle options // handle options
const options = { const options = {
...{ x: undefined, touchedTasksArray: [] }, ...{ x: undefined, touchedTasksArray: [] },
...optionsArg ...optionsArg,
}; };
const x = options.x; const x = options.x;
const touchedTasksArray: Task[] = options.touchedTasksArray; const touchedTasksArray: Task[] = options.touchedTasksArray;
@ -96,7 +98,7 @@ export class Task {
return done2.promise; return done2.promise;
} }
}) })
.then(async x => { .then(async (x) => {
// lets run the main task // lets run the main task
try { try {
return await taskToRun.taskFunction(x); return await taskToRun.taskFunction(x);
@ -104,7 +106,7 @@ export class Task {
console.log(e); console.log(e);
} }
}) })
.then(x => { .then((x) => {
if (taskToRun.afterTask && !Task.isTaskTouched(taskToRun.afterTask, touchedTasksArray)) { if (taskToRun.afterTask && !Task.isTaskTouched(taskToRun.afterTask, touchedTasksArray)) {
return Task.runTask(taskToRun.afterTask, { x: x, touchedTasksArray: touchedTasksArray }); return Task.runTask(taskToRun.afterTask, { x: x, touchedTasksArray: touchedTasksArray });
} else { } else {
@ -113,10 +115,10 @@ export class Task {
return done2.promise; return done2.promise;
} }
}) })
.then(x => { .then((x) => {
done.resolve(x); done.resolve(x);
}) })
.catch(err => { .catch((err) => {
console.log(err); console.log(err);
}); });
localDeferred.resolve(); localDeferred.resolve();
@ -124,13 +126,21 @@ export class Task {
}; };
// INSTANCE // INSTANCE
// man datory properties // mandatory properties
public name: string; public name: string;
/**
* the version of the task
* should follow semver
* might be important for DistributedCoordinator
*/
public version: string;
public taskFunction: ITaskFunction; public taskFunction: ITaskFunction;
public buffered: boolean; public buffered: boolean;
public cronJob: plugins.smarttime.CronJob;
public bufferMax: number; public bufferMax: number;
public execDelay: number; public execDelay: number;
public timeout: number;
// tasks to run before and after // tasks to run before and after
public preTask: Task | TPreOrAfterTaskFunction; public preTask: Task | TPreOrAfterTaskFunction;
@ -188,7 +198,7 @@ export class Task {
/** /**
* trigger the task. Will trigger buffered if this.buffered is true * 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) { if (this.buffered) {
return this.triggerBuffered(x); return this.triggerBuffered(x);
} else { } else {
@ -198,15 +208,17 @@ export class Task {
/** /**
* trigger task unbuffered. * 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 }); return Task.runTask(this, { x: x });
} }
/** /**
* trigger task buffered. * 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); return this.bufferRunner.trigger(x);
} }
@ -218,7 +230,7 @@ export class Task {
if (stateArg === 'locked') { if (stateArg === 'locked') {
this._state = 'locked'; this._state = 'locked';
} else { } else {
plugins.smartlog.defaultLogger.log('error', 'state type ' + stateArg + ' could not be set'); logger.log('error', `state type ${stateArg} could not be set`);
} }
} }
} }

View File

@ -1,9 +1,9 @@
// TaskChain chains tasks // TaskChain chains tasks
// and extends Task // 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 { export class Taskchain extends Task {
taskArray: Task[]; taskArray: Task[];
@ -14,22 +14,22 @@ export class Taskchain extends Task {
buffered?: boolean; buffered?: boolean;
bufferMax?: number; bufferMax?: number;
}) { }) {
let options = { const options = {
...{ ...{
name: 'unnamed Taskchain', name: 'unnamed Taskchain',
log: false log: false,
}, },
...optionsArg, ...optionsArg,
...{ ...{
taskFunction: (x: any) => { taskFunction: (x: any) => {
// this is the function that gets executed when TaskChain is triggered // 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 taskCounter = 0; // counter for iterating async over the taskArray
let iterateTasks = x => { const iterateTasks = (x: any) => {
if (typeof this.taskArray[taskCounter] !== 'undefined') { if (typeof this.taskArray[taskCounter] !== 'undefined') {
console.log(this.name + ' running: Task' + this.taskArray[taskCounter].name); 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++; taskCounter++;
iterateTasks(x); iterateTasks(x);
}); });
@ -40,8 +40,8 @@ export class Taskchain extends Task {
}; };
iterateTasks(x); iterateTasks(x);
return done.promise; return done.promise;
} },
} },
}; };
super(options); super(options);
this.taskArray = optionsArg.taskArray; this.taskArray = optionsArg.taskArray;

View File

@ -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);
});
}
}

View File

@ -1,5 +1,6 @@
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 { AbstractDistributedCoordinator } from './taskbuffer.classes.distributedcoordinator.js';
export interface ICronJob { export interface ICronJob {
cronString: string; cronString: string;
@ -7,20 +8,29 @@ export interface ICronJob {
job: any; job: any;
} }
export class TaskManager { export interface ITaskManagerConstructorOptions {
public taskMap = new plugins.lik.Objectmap<Task>(); distributedCoordinator?: AbstractDistributedCoordinator;
private cronJobMap = new plugins.lik.Objectmap<ICronJob>(); }
constructor() { export class TaskManager {
// nothing here public randomId = plugins.isounique.uni();
public taskMap = new plugins.lik.ObjectMap<Task>();
private cronJobManager = new plugins.smarttime.CronManager();
public options: ITaskManagerConstructorOptions = {
distributedCoordinator: null,
};
constructor(optionosArg: ITaskManagerConstructorOptions = {}) {
this.options = Object.assign(this.options, optionosArg);
} }
/** /**
* checks if a task is already present * checks if a task is already present
* @param taskNameArg * @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; return itemArg.name === taskNameArg;
}); });
} }
@ -43,8 +53,7 @@ export class TaskManager {
*/ */
public addAndScheduleTask(taskArg: Task, cronStringArg: string) { public addAndScheduleTask(taskArg: Task, cronStringArg: string) {
this.addTask(taskArg); this.addTask(taskArg);
const taskName = taskArg.name; this.scheduleTaskByName(taskArg.name, cronStringArg);
this.scheduleTaskByName(taskName, cronStringArg);
} }
/** /**
@ -69,18 +78,41 @@ export class TaskManager {
*/ */
public scheduleTaskByName(taskNameArg: string, cronStringArg: string) { public scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
const taskToSchedule = this.getTaskByName(taskNameArg); const taskToSchedule = this.getTaskByName(taskNameArg);
const job = new plugins.cron.CronJob({ const cronJob = this.cronJobManager.addCronjob(
cronTime: cronStringArg, cronStringArg,
onTick: () => { async (triggerTimeArg: number) => {
this.triggerTaskByName(taskNameArg); console.log(`taskbuffer schedule triggered task >>${taskToSchedule.name}<<`);
}, console.log(
start: true `task >>${taskToSchedule.name}<< is ${
}); taskToSchedule.buffered
this.cronJobMap.add({ ? `buffered with max ${taskToSchedule.bufferMax} buffered calls`
taskNameArg: taskToSchedule.name, : `unbuffered`
cronString: cronStringArg, }`
job );
}); if (this.options.distributedCoordinator) {
console.log(`Found a distrubuted coordinator, performing distributed consultation.`);
const announcementResult =
await this.options.distributedCoordinator.fireDistributedTaskRequest({
submitterRandomId: this.randomId,
status: 'requesting',
taskExecutionParallel: 1,
taskExecutionTime: triggerTimeArg,
taskExecutionTimeout: taskToSchedule.timeout,
taskName: taskToSchedule.name,
taskVersion: taskToSchedule.version,
});
if (!announcementResult.shouldTrigger) {
console.log('distributed coordinator result: NOT EXECUTING');
return;
} else {
console.log('distributed coordinator result: CHOSEN AND EXECUTING');
}
}
await taskToSchedule.trigger();
}
);
taskToSchedule.cronJob = cronJob;
} }
/** /**
@ -88,10 +120,14 @@ export class TaskManager {
* @param taskNameArg * @param taskNameArg
*/ */
public descheduleTaskByName(taskNameArg: string) { 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 +142,18 @@ export class TaskManager {
* @param taskNameArg * @param taskNameArg
*/ */
public getSchedulesForTaskName(taskNameArg: string) {} public getSchedulesForTaskName(taskNameArg: string) {}
/**
* starts the taskmanager
*/
public start() {
this.cronJobManager.start();
}
/**
* stops the taskmanager
*/
public stop() {
this.cronJobManager.stop();
}
} }

View File

@ -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, type ITaskFunction } from './taskbuffer.classes.task.js';
/** /**
* TaskOnce is run exactly once, no matter how often it is triggered * TaskOnce is run exactly once, no matter how often it is triggered
@ -15,7 +15,7 @@ export class TaskOnce extends Task {
this.hasTriggered = true; this.hasTriggered = true;
await optionsArg.taskFunction(); await optionsArg.taskFunction();
} }
} },
}); });
} }
} }

View File

@ -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 { export class Taskparallel extends Task {
public taskArray: Task[]; public taskArray: Task[];
@ -11,13 +10,13 @@ export class Taskparallel extends Task {
taskFunction: () => { taskFunction: () => {
const done = plugins.smartpromise.defer(); const done = plugins.smartpromise.defer();
const promiseArray: Promise<any>[] = []; // stores promises of all tasks, since they run in parallel 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()); promiseArray.push(taskArg.trigger());
}); });
Promise.all(promiseArray).then(done.resolve); Promise.all(promiseArray).then(done.resolve);
return done.promise; return done.promise;
} },
} },
}; };
super(options); super(options);
this.taskArray = optionsArg.taskArray; this.taskArray = optionsArg.taskArray;

View File

@ -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 { export class TaskRunner {
public maxParrallelJobs: number = 1; public maxParrallelJobs: number = 1;
public status: 'stopped' | 'running' = 'stopped'; 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[] = []; public qeuedTasks: Task[] = [];
constructor() { constructor() {
this.runningTasks.eventSubject.subscribe(async eventArg => { this.runningTasks.eventSubject.subscribe(async (eventArg) => {
this.checkExecution(); this.checkExecution();
}); });
} }
@ -33,7 +33,7 @@ export class TaskRunner {
/** /**
* starts the task queue * starts the task queue
*/ */
public start() { public async start() {
this.status = 'running'; this.status = 'running';
} }
@ -57,7 +57,7 @@ export class TaskRunner {
/** /**
* stops the task queue * stops the task queue
*/ */
public stop() { public async stop() {
this.status = 'stopped'; this.status = 'stopped';
} }
} }

3
ts/taskbuffer.logging.ts Normal file
View File

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

View File

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

11
tsconfig.json Normal file
View File

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

View File

@ -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"
}