Compare commits
87 Commits
Author | SHA1 | Date | |
---|---|---|---|
65886287c6 | |||
fdaf772cfc | |||
757b992440 | |||
b4a701d128 | |||
ca3ef8ced6 | |||
6115bae66b | |||
1be83af475 | |||
bd14c41edc | |||
d61b79282d | |||
1cba9245fe | |||
4b0db4da21 | |||
a6cd0cb579 | |||
bd6109d5ea | |||
aa632a5294 | |||
6499dd45cf | |||
d04ed21607 | |||
bae776d4e9 | |||
fcd7ea467e | |||
e061b96056 | |||
c2ce669f0c | |||
05f91c3e35 | |||
94e327c722 | |||
57a27604a7 | |||
b077bd7a1b | |||
f2c2dab782 | |||
53a67c0ebe | |||
5240a80cb3 | |||
fa8be6b6d3 | |||
b5981d67cf | |||
493cd83dda | |||
86b2842ed2 | |||
801e2ad266 | |||
7f837c70fc | |||
f5ca4a696c | |||
b48d42dfb9 | |||
5bf568d0cd | |||
173e1ca35d | |||
ce258c76d2 | |||
4d2756b743 | |||
973678d635 | |||
28e7bad605 | |||
fb44dd47fc | |||
a2f6bccac2 | |||
e4f8be5603 | |||
84f186924e | |||
ff57dccee1 | |||
a9d84d5147 | |||
ae6a6ce67e | |||
05b14136f9 | |||
bf9ca39c36 | |||
e61791ec41 | |||
9001a96df0 | |||
835fa3663d | |||
f50384947d | |||
65c1dd8fdc | |||
613d46bb38 | |||
439da1f342 | |||
e9e4a60fe6 | |||
1630f6971f | |||
7bfb145513 | |||
c367f0f949 | |||
8f9b3151d8 | |||
81e97b513a | |||
7da0035805 | |||
16a77e4c41 | |||
495f63ec71 | |||
17f840d24c | |||
b93407e83a | |||
003c1f2796 | |||
7f72a88846 | |||
823d4f7d55 | |||
7d57fcf07e | |||
eb9ae2fa71 | |||
5fe60c6e50 | |||
6f811b4ab5 | |||
2cf32ac723 | |||
09936fda56 | |||
ddc9a77fe2 | |||
575912eab7 | |||
eee146ae8b | |||
ea8ef61c40 | |||
70bb5b3f5d | |||
5fa7312171 | |||
cb85deeb3d | |||
fdfb780c33 | |||
f21b53b81d | |||
0bf3b2ea8b |
66
.gitea/workflows/default_nottags.yaml
Normal file
66
.gitea/workflows/default_nottags.yaml
Normal 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
|
124
.gitea/workflows/default_tags.yaml
Normal file
124
.gitea/workflows/default_tags.yaml
Normal 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 @git.zone/tsdoc
|
||||||
|
npmci command tsdoc
|
||||||
|
continue-on-error: true
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -15,8 +15,6 @@ node_modules/
|
|||||||
|
|
||||||
# builds
|
# builds
|
||||||
dist/
|
dist/
|
||||||
dist_web/
|
dist_*/
|
||||||
dist_serve/
|
|
||||||
dist_ts_web/
|
|
||||||
|
|
||||||
# custom
|
# custom
|
126
.gitlab-ci.yml
126
.gitlab-ci.yml
@ -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
11
.vscode/launch.json
vendored
Normal 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
26
.vscode/settings.json
vendored
Normal 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"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -5,13 +5,29 @@
|
|||||||
"npmRegistryUrl": "registry.npmjs.org"
|
"npmRegistryUrl": "registry.npmjs.org"
|
||||||
},
|
},
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "code.foss.global",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "push.rocks",
|
||||||
"gitrepo": "taskbuffer",
|
"gitrepo": "taskbuffer",
|
||||||
"shortDescription": "flexible task management. TypeScript ready!",
|
"description": "A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.",
|
||||||
"npmPackagename": "@pushrocks/taskbuffer",
|
"npmPackagename": "@push.rocks/taskbuffer",
|
||||||
"license": "MIT"
|
"license": "MIT",
|
||||||
|
"keywords": [
|
||||||
|
"task management",
|
||||||
|
"TypeScript",
|
||||||
|
"task buffering",
|
||||||
|
"task scheduling",
|
||||||
|
"task execution",
|
||||||
|
"task dependencies",
|
||||||
|
"parallel tasks",
|
||||||
|
"task chains",
|
||||||
|
"debounced tasks",
|
||||||
|
"distributed coordination"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"tsdoc": {
|
||||||
|
"legal": "\n## License and Legal Information\n\nThis repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. \n\n**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.\n\n### Trademarks\n\nThis project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.\n\n### Company Information\n\nTask Venture Capital GmbH \nRegistered at District court Bremen HRB 35230 HB, Germany\n\nFor any legal inquiries or if you require further information, please contact us via email at hello@task.vc.\n\nBy using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.\n"
|
||||||
}
|
}
|
||||||
}
|
}
|
1853
package-lock.json
generated
1853
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
67
package.json
67
package.json
@ -1,57 +1,68 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/taskbuffer",
|
"name": "@push.rocks/taskbuffer",
|
||||||
"version": "2.1.0",
|
"version": "3.1.7",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "flexible task management. TypeScript ready!",
|
"description": "A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.",
|
||||||
"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",
|
||||||
"url": "git+https://gitlab.com/pushrocks/taskbuffer.git"
|
"url": "https://code.foss.global/push.rocks/taskbuffer.git"
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"gulp",
|
"task management",
|
||||||
"task",
|
|
||||||
"buffer",
|
|
||||||
"TypeScript",
|
"TypeScript",
|
||||||
"push.rocks"
|
"task buffering",
|
||||||
|
"task scheduling",
|
||||||
|
"task execution",
|
||||||
|
"task dependencies",
|
||||||
|
"parallel tasks",
|
||||||
|
"task chains",
|
||||||
|
"debounced tasks",
|
||||||
|
"distributed coordination"
|
||||||
],
|
],
|
||||||
"author": "Lossless GmbH",
|
"author": "Lossless GmbH",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://gitlab.com/pushrocks/taskbuffer/issues"
|
"url": "https://gitlab.com/pushrocks/taskbuffer/issues"
|
||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
|
"homepage": "https://code.foss.global/push.rocks/taskbuffer",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/lik": "^3.0.13",
|
"@push.rocks/lik": "^6.0.5",
|
||||||
"@pushrocks/smartdelay": "^2.0.6",
|
"@push.rocks/smartdelay": "^3.0.5",
|
||||||
"@pushrocks/smartlog": "^2.0.21",
|
"@push.rocks/smartlog": "^3.0.3",
|
||||||
"@pushrocks/smartpromise": "^3.0.6",
|
"@push.rocks/smartpromise": "^4.0.3",
|
||||||
"@types/cron": "^1.7.1",
|
"@push.rocks/smartrx": "^3.0.6",
|
||||||
"cron": "^1.7.2",
|
"@push.rocks/smarttime": "^4.0.6",
|
||||||
"rxjs": "^6.5.3"
|
"@push.rocks/smartunique": "^3.0.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.17",
|
"@git.zone/tsbuild": "^2.1.66",
|
||||||
"@gitzone/tstest": "^1.0.28",
|
"@git.zone/tsbundle": "^2.0.8",
|
||||||
"@pushrocks/tapbundle": "^3.2.0",
|
"@git.zone/tsrun": "^1.2.44",
|
||||||
"@types/node": "^12.12.14",
|
"@git.zone/tstest": "^1.0.77",
|
||||||
"tslint": "^5.20.1",
|
"@push.rocks/tapbundle": "^5.0.15",
|
||||||
"tslint-config-prettier": "^1.18.0"
|
"@types/node": "^20.8.7"
|
||||||
},
|
},
|
||||||
"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"
|
||||||
]
|
]
|
||||||
}
|
}
|
5793
pnpm-lock.yaml
generated
Normal file
5793
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
1
readme.hints.md
Normal file
1
readme.hints.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
|
198
readme.md
198
readme.md
@ -1,57 +1,167 @@
|
|||||||
# @pushrocks/taskbuffer
|
# @push.rocks/taskbuffer
|
||||||
flexible task management. TypeScript ready!
|
flexible task management. TypeScript ready!
|
||||||
|
|
||||||
## Availabililty and Links
|
## Install
|
||||||
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/taskbuffer)
|
To install `@push.rocks/taskbuffer`, use the following npm command:
|
||||||
* [gitlab.com (source)](https://gitlab.com/pushrocks/taskbuffer)
|
|
||||||
* [github.com (source mirror)](https://github.com/pushrocks/taskbuffer)
|
|
||||||
* [docs (typedoc)](https://pushrocks.gitlab.io/taskbuffer/)
|
|
||||||
|
|
||||||
## Status for master
|
```bash
|
||||||
[](https://gitlab.com/pushrocks/taskbuffer/commits/master)
|
npm install @push.rocks/taskbuffer --save
|
||||||
[](https://gitlab.com/pushrocks/taskbuffer/commits/master)
|
|
||||||
[](https://www.npmjs.com/package/@pushrocks/taskbuffer)
|
|
||||||
[](https://snyk.io/test/npm/@pushrocks/taskbuffer)
|
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
||||||
[](https://prettier.io/)
|
|
||||||
|
|
||||||
## 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.
|
This will add `@push.rocks/taskbuffer` to your project's dependencies, allowing you to use it within your TypeScript project.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
## Usage
|
||||||
|
`@push.rocks/taskbuffer` offers a versatile way to manage tasks in your application. Whether you need simple asynchronous task execution, buffered tasks to limit concurrent executions, or more complex scenarios involving task chaining and parallel execution, `@push.rocks/taskbuffer` has got you covered. Below, you'll find detailed examples showcasing the module's capabilities and how to use them in TypeScript.
|
||||||
|
|
||||||
[](https://push.rocks)
|
### Basic Task Execution
|
||||||
|
To create and run a simple task:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { Task } from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
## Contribution
|
const simpleTask = new Task({
|
||||||
|
name: 'SimpleTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('Executing a simple task');
|
||||||
|
// Perform your task here (e.g., fetch data from an API)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
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). :)
|
// Trigger the task
|
||||||
|
simpleTask.trigger();
|
||||||
|
```
|
||||||
|
|
||||||
For further information read the linked docs at the top of this readme.
|
This basic example creates a task that prints a message to the console when executed.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
### Buffered Task Execution
|
||||||
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
Buffered tasks allow you to throttle task executions, for example, to avoid overwhelming a server with simultaneous requests:
|
||||||
|
|
||||||
[](https://maintainedby.lossless.com)
|
```typescript
|
||||||
|
import { Task } from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
|
const bufferedTask = new Task({
|
||||||
|
name: 'BufferedTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
// Task implementation
|
||||||
|
console.log('Buffered task execution');
|
||||||
|
},
|
||||||
|
buffered: true,
|
||||||
|
bufferMax: 3 // Maximum number of concurrent executions
|
||||||
|
});
|
||||||
|
|
||||||
|
// Trigger the task multiple times
|
||||||
|
bufferedTask.trigger();
|
||||||
|
bufferedTask.trigger();
|
||||||
|
bufferedTask.trigger();
|
||||||
|
bufferedTask.trigger();
|
||||||
|
```
|
||||||
|
|
||||||
|
In this scenario, only three instances of `bufferedTask` will run concurrently, thanks to the buffer settings.
|
||||||
|
|
||||||
|
### Task Chains
|
||||||
|
Task chains are a powerful feature that allows you to execute tasks in a specified order:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { Task, Taskchain } from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
|
const firstTask = new Task({
|
||||||
|
name: 'FirstTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('First task execution');
|
||||||
|
// First task logic
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const secondTask = new Task({
|
||||||
|
name: 'SecondTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('Second task execution');
|
||||||
|
// Second task logic
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const taskChain = new Taskchain({
|
||||||
|
name: 'MyTaskChain',
|
||||||
|
taskArray: [firstTask, secondTask] // Tasks will be executed in the order they are provided
|
||||||
|
});
|
||||||
|
|
||||||
|
// Trigger the task chain
|
||||||
|
taskChain.trigger();
|
||||||
|
```
|
||||||
|
|
||||||
|
### Parallel Task Execution
|
||||||
|
To run tasks in parallel, use `Taskparallel`:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { Task, Taskparallel } from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
|
const taskOne = new Task({
|
||||||
|
name: 'TaskOne',
|
||||||
|
taskFunction: async () => {
|
||||||
|
// Task one logic
|
||||||
|
console.log('Task one execution');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const taskTwo = new Task({
|
||||||
|
name: 'TaskTwo',
|
||||||
|
taskFunction: async () => {
|
||||||
|
// Task two logic
|
||||||
|
console.log('Task two execution');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const parallelTask = new Taskparallel({
|
||||||
|
taskArray: [taskOne, taskTwo] // These tasks will be executed in parallel
|
||||||
|
});
|
||||||
|
|
||||||
|
// Trigger the parallel tasks
|
||||||
|
parallelTask.trigger();
|
||||||
|
```
|
||||||
|
|
||||||
|
### Task Scheduling with Task Manager
|
||||||
|
`@push.rocks/taskbuffer` also provides a `TaskManager` to schedule tasks using cron expressions:
|
||||||
|
|
||||||
|
```typescript
|
||||||
|
import { Task, TaskManager } from '@push.rocks/taskbuffer';
|
||||||
|
|
||||||
|
const scheduledTask = new Task({
|
||||||
|
name: 'ScheduledTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('Scheduled task execution');
|
||||||
|
// Task logic here
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const taskManager = new TaskManager();
|
||||||
|
taskManager.addAndScheduleTask(scheduledTask, '0 * * * * *'); // Execute task at the start of every minute
|
||||||
|
|
||||||
|
// Start the task manager to enable the scheduled execution
|
||||||
|
taskManager.start();
|
||||||
|
```
|
||||||
|
|
||||||
|
### Advanced Use Cases
|
||||||
|
The flexibility of `@push.rocks/taskbuffer` allows for more sophisticated task management scenarios. You can combine the features mentioned above to fit your specific needs, such as chaining parallel tasks, dynamically adding tasks to a manager or chain based on conditions, and much more.
|
||||||
|
|
||||||
|
`@push.rocks/taskbuffer` leverages TypeScript's advanced typing features to provide you with clear and predictable APIs, making it easier to build and maintain complex task management logic within your application.
|
||||||
|
|
||||||
|
For further information and advanced configurations, please refer to the [official documentation](https://gitlab.com/pushrocks/taskbuffer).
|
||||||
|
|
||||||
|
## License and Legal Information
|
||||||
|
|
||||||
|
This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository.
|
||||||
|
|
||||||
|
**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
### Trademarks
|
||||||
|
|
||||||
|
This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
|
||||||
|
|
||||||
|
### Company Information
|
||||||
|
|
||||||
|
Task Venture Capital GmbH
|
||||||
|
Registered at District court Bremen HRB 35230 HB, Germany
|
||||||
|
|
||||||
|
For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
|
||||||
|
|
||||||
|
By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.
|
||||||
|
@ -1,115 +1,89 @@
|
|||||||
import { expect, tap } from '@pushrocks/tapbundle';
|
import { expect, tap } from '@push.rocks/tapbundle';
|
||||||
import taskbuffer = require('../ts/index');
|
import * as taskbuffer from '../ts/index.js';
|
||||||
|
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';
|
|
||||||
|
|
||||||
// setup some testData to work with
|
|
||||||
let testTask: taskbuffer.Task;
|
|
||||||
|
|
||||||
let testPreTask = new taskbuffer.Task({
|
|
||||||
taskFunction: async () => {
|
|
||||||
console.log('preTask executed');
|
|
||||||
},
|
|
||||||
preTask: testTask
|
|
||||||
});
|
|
||||||
|
|
||||||
// some more tasks to test with
|
|
||||||
let task1Counter = 0; // how often task 1 is being executed
|
|
||||||
let 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;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let task2 = new taskbuffer.Task({
|
|
||||||
name: 'Task 1',
|
|
||||||
taskFunction: async () => {
|
|
||||||
const done = smartpromise.defer();
|
|
||||||
console.log('Task2 started');
|
|
||||||
setTimeout(() => {
|
|
||||||
console.log('Task2 executed');
|
|
||||||
done.resolve();
|
|
||||||
}, 5000);
|
|
||||||
await done.promise;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let task3 = new taskbuffer.Task({
|
|
||||||
name: 'Task 3',
|
|
||||||
taskFunction: () => {
|
|
||||||
let done = smartpromise.defer();
|
|
||||||
console.log('Task3 started');
|
|
||||||
setTimeout(() => {
|
|
||||||
console.log('Task3 executed');
|
|
||||||
done.resolve();
|
|
||||||
}, 5000);
|
|
||||||
return done.promise;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
tap.test('new Task() should return a new task', async () => {
|
tap.test('new Task() should return a new task', async () => {
|
||||||
testTask = new taskbuffer.Task({
|
const testTask = new taskbuffer.Task({
|
||||||
taskFunction: async () => {
|
taskFunction: async () => {
|
||||||
console.log('executed twice');
|
console.log('executed twice');
|
||||||
},
|
},
|
||||||
preTask: testPreTask
|
|
||||||
});
|
});
|
||||||
|
expect(testTask).toBeInstanceOf(taskbuffer.Task);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('expect testTask to be an instance of Task', async () => {
|
tap.test('should have bufferMax set to the provided value', async () => {
|
||||||
expect(testTask).to.be.instanceof(taskbuffer.Task);
|
const task2 = new taskbuffer.Task({
|
||||||
});
|
taskFunction: async () => {},
|
||||||
|
|
||||||
tap.test('expect testTask.idle is true', async () => {
|
|
||||||
if (!testTask.idle) {
|
|
||||||
throw new Error('testTask.idle is not true');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
tap.test('testTask.running should be of type boolean and initially false', async () => {
|
|
||||||
expect(testTask.running).to.be.a('boolean');
|
|
||||||
// tslint:disable-next-line:no-unused-expression
|
|
||||||
expect(testTask.running).to.be.false;
|
|
||||||
});
|
|
||||||
|
|
||||||
tap.test('testTask.trigger() should return Promise', async () => {
|
|
||||||
expect(testTask.trigger()).to.be.instanceof(Promise);
|
|
||||||
});
|
|
||||||
|
|
||||||
tap.test('testTask.trigger() returned Promise should be fullfilled', async () => {
|
|
||||||
await testTask.trigger();
|
|
||||||
});
|
|
||||||
|
|
||||||
tap.test('expect to run a task without pre and afterTask errorless', async () => {
|
|
||||||
let localTestTask = new taskbuffer.Task({
|
|
||||||
taskFunction: async () => {
|
|
||||||
console.log('only once');
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
await localTestTask.trigger();
|
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('expect task to run in buffered mode', async () => {
|
tap.test('should be able to trigger tasks multiple times', async () => {
|
||||||
let localTestTask = new taskbuffer.Task({
|
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 () => {
|
taskFunction: async () => {
|
||||||
await smartdelay.delayFor(3000);
|
counter++;
|
||||||
|
await smartdelay.delayFor(2000);
|
||||||
|
counter--;
|
||||||
},
|
},
|
||||||
buffered: true,
|
buffered: true,
|
||||||
bufferMax: 2
|
bufferMax: 2,
|
||||||
});
|
});
|
||||||
localTestTask.trigger();
|
bufferedTask.trigger();
|
||||||
localTestTask.trigger();
|
bufferedTask.trigger();
|
||||||
localTestTask.trigger();
|
bufferedTask.trigger();
|
||||||
await localTestTask.trigger();
|
await smartdelay.delayFor(100);
|
||||||
|
expect(counter <= bufferedTask.bufferMax).toBeTrue();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
@ -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;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -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();
|
||||||
});
|
});
|
||||||
|
@ -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();
|
@ -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();
|
||||||
|
@ -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();
|
||||||
|
@ -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,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
52
test/test.8.bufferedrun.ts
Normal file
52
test/test.8.bufferedrun.ts
Normal 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();
|
@ -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
8
ts/00_commitinfo_data.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
/**
|
||||||
|
* autocreated commitinfo by @pushrocks/commitinfo
|
||||||
|
*/
|
||||||
|
export const commitinfo = {
|
||||||
|
name: '@push.rocks/taskbuffer',
|
||||||
|
version: '3.1.7',
|
||||||
|
description: 'flexible task management. TypeScript ready!'
|
||||||
|
}
|
16
ts/index.ts
16
ts/index.ts
@ -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 };
|
||||||
|
@ -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<any>) {
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
@ -9,21 +9,21 @@ export interface ICycleObject {
|
|||||||
export class CycleCounter {
|
export class CycleCounter {
|
||||||
public task: Task;
|
public task: Task;
|
||||||
public cycleObjectArray: ICycleObject[] = [];
|
public cycleObjectArray: ICycleObject[] = [];
|
||||||
constructor(taskArg: Task) {
|
constructor(taskArg: Task<any>) {
|
||||||
this.task = taskArg;
|
this.task = taskArg;
|
||||||
}
|
}
|
||||||
public getPromiseForCycle(cycleCountArg: number) {
|
public getPromiseForCycle(cycleCountArg: number) {
|
||||||
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);
|
||||||
|
38
ts/taskbuffer.classes.distributedcoordinator.ts
Normal file
38
ts/taskbuffer.classes.distributedcoordinator.ts
Normal file
@ -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>;
|
||||||
|
}
|
@ -1,2 +0,0 @@
|
|||||||
import plugins = require('./taskbuffer.plugins');
|
|
||||||
import { Task, ITaskFunction } from './taskbuffer.classes.task';
|
|
@ -1,22 +1,28 @@
|
|||||||
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';
|
|
||||||
|
|
||||||
export interface ITaskFunction {
|
import { logger } from './taskbuffer.logging.js';
|
||||||
(x?: any): PromiseLike<any>;
|
|
||||||
|
export interface ITaskFunction<T = undefined> {
|
||||||
|
(x?: any, setupValue?: T): PromiseLike<any>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type TPreOrAfterTaskFunction = () => Task;
|
export interface ITaskSetupFunction<T = undefined> {
|
||||||
|
(): Promise<T>;
|
||||||
|
}
|
||||||
|
|
||||||
export class Task {
|
export type TPreOrAfterTaskFunction = () => Task<any>;
|
||||||
// STATIC
|
|
||||||
public static extractTask(preOrAfterTaskArg: Task | TPreOrAfterTaskFunction): Task {
|
export class Task<T = undefined> {
|
||||||
|
public static extractTask<T = undefined>(
|
||||||
|
preOrAfterTaskArg: Task<T> | TPreOrAfterTaskFunction
|
||||||
|
): Task<T> {
|
||||||
switch (true) {
|
switch (true) {
|
||||||
case !preOrAfterTaskArg:
|
case !preOrAfterTaskArg:
|
||||||
return null;
|
return null;
|
||||||
case preOrAfterTaskArg instanceof Task:
|
case preOrAfterTaskArg instanceof Task:
|
||||||
return preOrAfterTaskArg as Task;
|
return preOrAfterTaskArg as Task<T>;
|
||||||
case typeof preOrAfterTaskArg === 'function':
|
case typeof preOrAfterTaskArg === 'function':
|
||||||
const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
|
const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
|
||||||
return taskFunction();
|
return taskFunction();
|
||||||
@ -25,13 +31,13 @@ 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;
|
||||||
};
|
};
|
||||||
|
|
||||||
public static isTask = (taskArg: Task): boolean => {
|
public static isTask = (taskArg: Task<any>): boolean => {
|
||||||
if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
|
if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
@ -39,10 +45,10 @@ export class Task {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static isTaskTouched = (
|
public static isTaskTouched<T = undefined>(
|
||||||
taskArg: Task | TPreOrAfterTaskFunction,
|
taskArg: Task<T> | TPreOrAfterTaskFunction,
|
||||||
touchedTasksArray: Task[]
|
touchedTasksArray: Task<T>[]
|
||||||
): boolean => {
|
): boolean {
|
||||||
const taskToCheck = Task.extractTask(taskArg);
|
const taskToCheck = Task.extractTask(taskArg);
|
||||||
let result = false;
|
let result = false;
|
||||||
for (const keyArg in touchedTasksArray) {
|
for (const keyArg in touchedTasksArray) {
|
||||||
@ -51,43 +57,54 @@ export class Task {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
};
|
}
|
||||||
|
|
||||||
public static runTask = async (
|
public static runTask = async <T>(
|
||||||
taskArg: Task | TPreOrAfterTaskFunction,
|
taskArg: Task<T> | TPreOrAfterTaskFunction,
|
||||||
optionsArg: { x?; touchedTasksArray?: Task[] }
|
optionsArg: { x?: any; touchedTasksArray?: Task<T>[] }
|
||||||
) => {
|
) => {
|
||||||
const taskToRun = Task.extractTask(taskArg);
|
const taskToRun = Task.extractTask(taskArg);
|
||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
|
|
||||||
// pay respect to execDelay
|
// 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) {
|
if (taskToRun.execDelay) {
|
||||||
await plugins.smartdelay.delayFor(taskToRun.execDelay);
|
await plugins.smartdelay.delayFor(taskToRun.execDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set running params
|
|
||||||
taskToRun.running = true;
|
taskToRun.running = true;
|
||||||
|
|
||||||
done.promise.then(async () => {
|
done.promise.then(async () => {
|
||||||
taskToRun.running = false;
|
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;
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// 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<T>[] = options.touchedTasksArray;
|
||||||
|
|
||||||
touchedTasksArray.push(taskToRun);
|
touchedTasksArray.push(taskToRun);
|
||||||
|
|
||||||
// run the task cascade
|
|
||||||
const localDeferred = plugins.smartpromise.defer();
|
const localDeferred = plugins.smartpromise.defer();
|
||||||
localDeferred.promise
|
localDeferred.promise
|
||||||
.then(() => {
|
.then(() => {
|
||||||
// lets run any preTask
|
|
||||||
|
|
||||||
if (taskToRun.preTask && !Task.isTaskTouched(taskToRun.preTask, touchedTasksArray)) {
|
if (taskToRun.preTask && !Task.isTaskTouched(taskToRun.preTask, touchedTasksArray)) {
|
||||||
return Task.runTask(taskToRun.preTask, { x, touchedTasksArray });
|
return Task.runTask(taskToRun.preTask, { x, touchedTasksArray });
|
||||||
} else {
|
} else {
|
||||||
@ -96,15 +113,14 @@ export class Task {
|
|||||||
return done2.promise;
|
return done2.promise;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(async x => {
|
.then(async (x) => {
|
||||||
// lets run the main task
|
|
||||||
try {
|
try {
|
||||||
return await taskToRun.taskFunction(x);
|
return await taskToRun.taskFunction(x, taskToRun.setupValue);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
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,82 +129,73 @@ 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();
|
||||||
return await done.promise;
|
return await done.promise;
|
||||||
};
|
};
|
||||||
|
|
||||||
// INSTANCE
|
|
||||||
// man datory properties
|
|
||||||
public name: string;
|
public name: string;
|
||||||
public taskFunction: ITaskFunction;
|
public version: string;
|
||||||
|
public taskFunction: ITaskFunction<T>;
|
||||||
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
|
public preTask: Task<T> | TPreOrAfterTaskFunction;
|
||||||
public preTask: Task | TPreOrAfterTaskFunction;
|
public afterTask: Task<T> | TPreOrAfterTaskFunction;
|
||||||
public afterTask: Task | 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;
|
||||||
|
|
||||||
// initialize by default
|
|
||||||
public running: boolean = false;
|
public running: boolean = false;
|
||||||
public bufferRunner = new BufferRunner(this);
|
public bufferRunner = new BufferRunner(this);
|
||||||
public cycleCounter = new CycleCounter(this);
|
public cycleCounter = new CycleCounter(this);
|
||||||
|
|
||||||
public idle: boolean = true;
|
public get idle() {
|
||||||
private _state: string = 'ready';
|
return !this.running;
|
||||||
|
}
|
||||||
|
|
||||||
|
public taskSetup: ITaskSetupFunction<T>;
|
||||||
|
public setupValue: T;
|
||||||
|
|
||||||
constructor(optionsArg: {
|
constructor(optionsArg: {
|
||||||
/**
|
taskFunction: ITaskFunction<T>;
|
||||||
* the task function to run, must return promise
|
preTask?: Task<T> | TPreOrAfterTaskFunction;
|
||||||
*/
|
afterTask?: Task<T> | TPreOrAfterTaskFunction;
|
||||||
taskFunction: ITaskFunction;
|
|
||||||
/**
|
|
||||||
* any other task to run before
|
|
||||||
*/
|
|
||||||
preTask?: Task | TPreOrAfterTaskFunction;
|
|
||||||
/**
|
|
||||||
* any other task to run after
|
|
||||||
*/
|
|
||||||
afterTask?: Task | TPreOrAfterTaskFunction;
|
|
||||||
/**
|
|
||||||
* wether this task should run buffered
|
|
||||||
*/
|
|
||||||
buffered?: boolean;
|
buffered?: boolean;
|
||||||
/**
|
|
||||||
* the maximum buffer
|
|
||||||
*/
|
|
||||||
bufferMax?: number;
|
bufferMax?: number;
|
||||||
/**
|
|
||||||
* the execution delay, before the task is executed
|
|
||||||
* only makes sense when running in buffered mode
|
|
||||||
*/
|
|
||||||
execDelay?: number;
|
execDelay?: number;
|
||||||
/**
|
|
||||||
* the name of the task
|
|
||||||
*/
|
|
||||||
name?: string;
|
name?: string;
|
||||||
|
taskSetup?: ITaskSetupFunction<T>;
|
||||||
}) {
|
}) {
|
||||||
this.taskFunction = optionsArg.taskFunction;
|
this.taskFunction = optionsArg.taskFunction;
|
||||||
this.preTask = optionsArg.preTask;
|
this.preTask = optionsArg.preTask;
|
||||||
this.afterTask = optionsArg.afterTask;
|
this.afterTask = optionsArg.afterTask;
|
||||||
this.idle = !this.running;
|
|
||||||
this.buffered = optionsArg.buffered;
|
this.buffered = optionsArg.buffered;
|
||||||
this.bufferMax = optionsArg.bufferMax;
|
this.bufferMax = optionsArg.bufferMax;
|
||||||
this.execDelay = optionsArg.execDelay;
|
this.execDelay = optionsArg.execDelay;
|
||||||
this.name = optionsArg.name;
|
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> {
|
||||||
* trigger the task. Will trigger buffered if this.buffered is true
|
|
||||||
*/
|
|
||||||
public trigger(x?): Promise<any> {
|
|
||||||
if (this.buffered) {
|
if (this.buffered) {
|
||||||
return this.triggerBuffered(x);
|
return this.triggerBuffered(x);
|
||||||
} else {
|
} else {
|
||||||
@ -196,29 +203,11 @@ export class Task {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public triggerUnBuffered(x?: any): Promise<any> {
|
||||||
* trigger task unbuffered.
|
return Task.runTask<T>(this, { x: x });
|
||||||
*/
|
|
||||||
public triggerUnBuffered(x?): Promise<any> {
|
|
||||||
return Task.runTask(this, { x: x });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public triggerBuffered(x?: any): Promise<any> {
|
||||||
* trigger task buffered.
|
|
||||||
*/
|
|
||||||
public triggerBuffered(x?): Promise<any> {
|
|
||||||
return this.bufferRunner.trigger(x);
|
return this.bufferRunner.trigger(x);
|
||||||
}
|
}
|
||||||
|
|
||||||
get state(): string {
|
|
||||||
return this._state;
|
|
||||||
}
|
|
||||||
|
|
||||||
set state(stateArg: string) {
|
|
||||||
if (stateArg === 'locked') {
|
|
||||||
this._state = 'locked';
|
|
||||||
} else {
|
|
||||||
plugins.smartlog.defaultLogger.log('error', 'state type ' + stateArg + ' could not be set');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
27
ts/taskbuffer.classes.taskdebounced.ts
Normal file
27
ts/taskbuffer.classes.taskdebounced.ts
Normal 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);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
@ -1,60 +1,49 @@
|
|||||||
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, type IDistributedTaskRequestResult } from './taskbuffer.classes.distributedcoordinator.js';
|
||||||
|
|
||||||
export interface ICronJob {
|
export interface ICronJob {
|
||||||
cronString: string;
|
cronString: string;
|
||||||
taskNameArg: string;
|
taskName: string;
|
||||||
job: any;
|
job: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ITaskManagerConstructorOptions {
|
||||||
|
distributedCoordinator?: AbstractDistributedCoordinator;
|
||||||
|
}
|
||||||
|
|
||||||
export class TaskManager {
|
export class TaskManager {
|
||||||
public taskMap = new plugins.lik.Objectmap<Task>();
|
public randomId = plugins.smartunique.shortId();
|
||||||
private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
|
public taskMap = new plugins.lik.ObjectMap<Task>();
|
||||||
|
private cronJobManager = new plugins.smarttime.CronManager();
|
||||||
|
public options: ITaskManagerConstructorOptions = {
|
||||||
|
distributedCoordinator: null,
|
||||||
|
};
|
||||||
|
|
||||||
constructor() {
|
constructor(options: ITaskManagerConstructorOptions = {}) {
|
||||||
// nothing here
|
this.options = Object.assign(this.options, options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public getTaskByName(taskName: string): Task {
|
||||||
* checks if a task is already present
|
return this.taskMap.findSync((task) => task.name === taskName);
|
||||||
* @param taskNameArg
|
|
||||||
*/
|
|
||||||
public getTaskByName(taskNameArg): Task {
|
|
||||||
return this.taskMap.find(itemArg => {
|
|
||||||
return itemArg.name === taskNameArg;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public addTask(task: Task): void {
|
||||||
* adds a Task to the TaskManager
|
if (!task.name) {
|
||||||
* @param taskArg
|
throw new Error('Task must have a name to be added to taskManager');
|
||||||
*/
|
|
||||||
public addTask(taskArg: Task): void {
|
|
||||||
if (!taskArg.name) {
|
|
||||||
throw new Error('taskArg needs a name to be added to taskManager');
|
|
||||||
}
|
}
|
||||||
this.taskMap.add(taskArg);
|
this.taskMap.add(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public addAndScheduleTask(task: Task, cronString: string) {
|
||||||
* adds and schedules a task at once
|
this.addTask(task);
|
||||||
* @param taskArg
|
this.scheduleTaskByName(task.name, cronString);
|
||||||
* @param cronStringArg
|
|
||||||
*/
|
|
||||||
public addAndScheduleTask(taskArg: Task, cronStringArg: string) {
|
|
||||||
this.addTask(taskArg);
|
|
||||||
const taskName = taskArg.name;
|
|
||||||
this.scheduleTaskByName(taskName, cronStringArg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public async triggerTaskByName(taskName: string): Promise<any> {
|
||||||
* triggers a task in the TaskManagerByName
|
const taskToTrigger = this.getTaskByName(taskName);
|
||||||
* @param taskNameArg
|
|
||||||
*/
|
|
||||||
public triggerTaskByName(taskNameArg: string): Promise<any> {
|
|
||||||
const taskToTrigger = this.getTaskByName(taskNameArg);
|
|
||||||
if (!taskToTrigger) {
|
if (!taskToTrigger) {
|
||||||
throw new Error(`There is no task with the name of ${taskNameArg}`);
|
throw new Error(`No task with the name ${taskName} found.`);
|
||||||
}
|
}
|
||||||
return taskToTrigger.trigger();
|
return taskToTrigger.trigger();
|
||||||
}
|
}
|
||||||
@ -63,47 +52,88 @@ export class TaskManager {
|
|||||||
return task.trigger();
|
return task.trigger();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public scheduleTaskByName(taskName: string, cronString: string) {
|
||||||
* schedules the task by name
|
const taskToSchedule = this.getTaskByName(taskName);
|
||||||
* @param taskNameArg
|
if (!taskToSchedule) {
|
||||||
*/
|
throw new Error(`No task with the name ${taskName} found.`);
|
||||||
public scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
|
}
|
||||||
const taskToSchedule = this.getTaskByName(taskNameArg);
|
this.handleTaskScheduling(taskToSchedule, cronString);
|
||||||
const job = new plugins.cron.CronJob({
|
}
|
||||||
cronTime: cronStringArg,
|
|
||||||
onTick: () => {
|
private handleTaskScheduling(task: Task, cronString: string) {
|
||||||
this.triggerTaskByName(taskNameArg);
|
const cronJob = this.cronJobManager.addCronjob(
|
||||||
},
|
cronString,
|
||||||
start: true
|
async (triggerTime: number) => {
|
||||||
});
|
this.logTaskState(task);
|
||||||
this.cronJobMap.add({
|
if (this.options.distributedCoordinator) {
|
||||||
taskNameArg: taskToSchedule.name,
|
const announcementResult = await this.performDistributedConsultation(task, triggerTime);
|
||||||
cronString: cronStringArg,
|
if (!announcementResult.shouldTrigger) {
|
||||||
job
|
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) {
|
||||||
* deschedules a task by name
|
const task = this.getTaskByName(taskName);
|
||||||
* @param taskNameArg
|
if (task && task.cronJob) {
|
||||||
*/
|
this.cronJobManager.removeCronjob(task.cronJob);
|
||||||
public descheduleTaskByName(taskNameArg: string) {
|
task.cronJob = null;
|
||||||
const descheduledCron = this.cronJobMap.findOneAndRemove(itemArg => {
|
}
|
||||||
return itemArg.taskNameArg === taskNameArg;
|
if (this.cronJobManager.cronjobs.isEmpty) {
|
||||||
});
|
this.cronJobManager.stop();
|
||||||
descheduledCron.job.stop();
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* deschedules a task
|
|
||||||
* @param task
|
|
||||||
*/
|
|
||||||
public async descheduleTask(task: Task) {
|
public async descheduleTask(task: Task) {
|
||||||
await this.descheduleTaskByName(task.name);
|
await this.descheduleTaskByName(task.name);
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* returns all schedules of a specific task
|
public getScheduleForTaskName(taskName: string): string | null {
|
||||||
* @param taskNameArg
|
const task = this.getTaskByName(taskName);
|
||||||
*/
|
return task && task.cronJob ? task.cronJob.cronExpression : null;
|
||||||
public getSchedulesForTaskName(taskNameArg: string) {}
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
|
@ -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
3
ts/taskbuffer.logging.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
import * as plugins from './taskbuffer.plugins.js';
|
||||||
|
|
||||||
|
export const logger = new plugins.smartlog.ConsoleLog();
|
@ -1,8 +1,9 @@
|
|||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as lik from '@push.rocks/lik';
|
||||||
import cron from 'cron';
|
import * as smartlog from '@push.rocks/smartlog';
|
||||||
import * as lik from '@pushrocks/lik';
|
import * as smartpromise from '@push.rocks/smartpromise';
|
||||||
import * as rxjs from 'rxjs';
|
import * as smartdelay from '@push.rocks/smartdelay';
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartrx from '@push.rocks/smartrx';
|
||||||
import * as smartdelay from '@pushrocks/smartdelay';
|
import * as smarttime from '@push.rocks/smarttime';
|
||||||
|
import * as smartunique from '@push.rocks/smartunique';
|
||||||
|
|
||||||
export { smartlog, cron, lik, rxjs, smartpromise, smartdelay };
|
export { lik, smartlog, smartpromise, smartdelay, smartrx, smarttime, smartunique };
|
||||||
|
14
tsconfig.json
Normal file
14
tsconfig.json
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"experimentalDecorators": true,
|
||||||
|
"useDefineForClassFields": false,
|
||||||
|
"target": "ES2022",
|
||||||
|
"module": "NodeNext",
|
||||||
|
"moduleResolution": "NodeNext",
|
||||||
|
"esModuleInterop": true,
|
||||||
|
"verbatimModuleSyntax": true
|
||||||
|
},
|
||||||
|
"exclude": [
|
||||||
|
"dist_*/**/*.d.ts"
|
||||||
|
]
|
||||||
|
}
|
17
tslint.json
17
tslint.json
@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": ["tslint:latest", "tslint-config-prettier"],
|
|
||||||
"rules": {
|
|
||||||
"semicolon": [true, "always"],
|
|
||||||
"no-console": false,
|
|
||||||
"ordered-imports": false,
|
|
||||||
"object-literal-sort-keys": false,
|
|
||||||
"member-ordering": {
|
|
||||||
"options":{
|
|
||||||
"order": [
|
|
||||||
"static-method"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaultSeverity": "warning"
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user