Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
5fe60c6e50 | |||
6f811b4ab5 | |||
2cf32ac723 | |||
09936fda56 | |||
ddc9a77fe2 | |||
575912eab7 | |||
eee146ae8b | |||
ea8ef61c40 | |||
70bb5b3f5d | |||
5fa7312171 | |||
cb85deeb3d | |||
fdfb780c33 | |||
f21b53b81d | |||
0bf3b2ea8b | |||
0e81b8bd94 | |||
138aefc499 | |||
af5fa857cc | |||
f275f7e2f6 |
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
|
102
.gitlab-ci.yml
102
.gitlab-ci.yml
@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
|||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- .npmci_cache/
|
- .npmci_cache/
|
||||||
key: "$CI_BUILD_STAGE"
|
key: '$CI_BUILD_STAGE'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- security
|
- security
|
||||||
- test
|
- test
|
||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
@ -18,21 +18,36 @@ stages:
|
|||||||
mirror:
|
mirror:
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci git mirror
|
- npmci git mirror
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
snyk:
|
auditProductionDependencies:
|
||||||
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci command npm install -g snyk
|
- npmci command npm install --production --ignore-scripts
|
||||||
- npmci command npm install --ignore-scripts
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command snyk test
|
- npmci command npm audit --audit-level=high --only=prod --production
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
|
||||||
|
auditDevDependencies:
|
||||||
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
|
stage: security
|
||||||
|
script:
|
||||||
|
- npmci npm prepare
|
||||||
|
- npmci command npm install --ignore-scripts
|
||||||
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
|
- npmci command npm audit --audit-level=high --only=dev
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# test stage
|
# test stage
|
||||||
@ -41,37 +56,36 @@ snyk:
|
|||||||
testStable:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install stable
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- priv
|
|
||||||
|
|
||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command npm run build
|
- npmci command npm run build
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
stage: release
|
stage: release
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm publish
|
- npmci npm publish
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# metadata stage
|
# metadata stage
|
||||||
@ -79,35 +93,39 @@ release:
|
|||||||
codequality:
|
codequality:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g tslint typescript
|
||||||
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- priv
|
- docker
|
||||||
|
- priv
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci trigger
|
- npmci trigger
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
image: hosttoday/ht-docker-dbase:npmci
|
|
||||||
services:
|
|
||||||
- docker:stable-dind
|
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
|
- npmci node install lts
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
- npmci command npm install -g @gitzone/tsdoc
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command tsdoc
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
- notpriv
|
||||||
only:
|
only:
|
||||||
@ -115,5 +133,5 @@ pages:
|
|||||||
artifacts:
|
artifacts:
|
||||||
expire_in: 1 week
|
expire_in: 1 week
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
29
.vscode/launch.json
vendored
Normal file
29
.vscode/launch.json
vendored
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
{
|
||||||
|
"version": "0.2.0",
|
||||||
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "current file",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"args": [
|
||||||
|
"${relativeFile}"
|
||||||
|
],
|
||||||
|
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"protocol": "inspector",
|
||||||
|
"internalConsoleOptions": "openOnSessionStart"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "test.ts",
|
||||||
|
"type": "node",
|
||||||
|
"request": "launch",
|
||||||
|
"args": [
|
||||||
|
"test/test.ts"
|
||||||
|
],
|
||||||
|
"runtimeArgs": ["-r", "@gitzone/tsrun"],
|
||||||
|
"cwd": "${workspaceRoot}",
|
||||||
|
"protocol": "inspector",
|
||||||
|
"internalConsoleOptions": "openOnSessionStart"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
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,6 +5,7 @@
|
|||||||
"npmRegistryUrl": "registry.npmjs.org"
|
"npmRegistryUrl": "registry.npmjs.org"
|
||||||
},
|
},
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
|
10658
package-lock.json
generated
10658
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
51
package.json
51
package.json
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/taskbuffer",
|
"name": "@pushrocks/taskbuffer",
|
||||||
"version": "2.0.15",
|
"version": "2.1.7",
|
||||||
"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",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/)",
|
"test": "(tstest test/ --web)",
|
||||||
"build": "(tsbuild)"
|
"build": "(tsbuild --web && tsbundle npm)"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -27,31 +27,36 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
|
"homepage": "https://gitlab.com/pushrocks/taskbuffer#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/lik": "^3.0.11",
|
"@pushrocks/lik": "^4.0.17",
|
||||||
"@pushrocks/smartdelay": "^2.0.3",
|
"@pushrocks/smartdelay": "^2.0.10",
|
||||||
"@pushrocks/smartlog": "^2.0.19",
|
"@pushrocks/smartlog": "^2.0.36",
|
||||||
"@pushrocks/smartpromise": "^3.0.5",
|
"@pushrocks/smartpromise": "^3.0.6",
|
||||||
"@types/cron": "^1.7.1",
|
"@pushrocks/smartrx": "^2.0.18",
|
||||||
"cron": "^1.7.2",
|
"@pushrocks/smarttime": "^3.0.24",
|
||||||
"rxjs": "^6.5.3"
|
"@types/cron": "^1.7.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.17",
|
"@gitzone/tsbuild": "^2.1.25",
|
||||||
"@gitzone/tstest": "^1.0.24",
|
"@gitzone/tsbundle": "^1.0.78",
|
||||||
"@pushrocks/tapbundle": "^3.0.13",
|
"@gitzone/tstest": "^1.0.44",
|
||||||
"@types/node": "^12.7.5",
|
"@pushrocks/tapbundle": "^3.2.9",
|
||||||
"tslint": "^5.20.0",
|
"@types/node": "^14.6.2",
|
||||||
|
"tslint": "^6.1.3",
|
||||||
"tslint-config-prettier": "^1.18.0"
|
"tslint-config-prettier": "^1.18.0"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/*",
|
"ts/**/*",
|
||||||
"ts_web/*",
|
"ts_web/**/*",
|
||||||
"dist/*",
|
"dist/**/*",
|
||||||
"dist_web/*",
|
"dist_*/**/*",
|
||||||
"dist_ts_web/*",
|
"dist_ts/**/*",
|
||||||
"assets/*",
|
"dist_ts_web/**/*",
|
||||||
|
"assets/**/*",
|
||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
|
],
|
||||||
|
"browserslist": [
|
||||||
|
"last 1 chrome versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
25
readme.md
25
readme.md
@ -8,13 +8,20 @@ flexible task management. TypeScript ready!
|
|||||||
* [docs (typedoc)](https://pushrocks.gitlab.io/taskbuffer/)
|
* [docs (typedoc)](https://pushrocks.gitlab.io/taskbuffer/)
|
||||||
|
|
||||||
## Status for master
|
## Status for master
|
||||||
[](https://gitlab.com/pushrocks/taskbuffer/commits/master)
|
|
||||||
[](https://gitlab.com/pushrocks/taskbuffer/commits/master)
|
Status Category | Status Badge
|
||||||
[](https://www.npmjs.com/package/@pushrocks/taskbuffer)
|
-- | --
|
||||||
[](https://snyk.io/test/npm/@pushrocks/taskbuffer)
|
GitLab Pipelines | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
npm | [](https://lossless.cloud)
|
||||||
[](https://prettier.io/)
|
Snyk | [](https://lossless.cloud)
|
||||||
|
TypeScript Support | [](https://lossless.cloud)
|
||||||
|
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
|
Code Style | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
|
Platform support | [](https://lossless.cloud) [](https://lossless.cloud)
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
@ -44,6 +51,10 @@ For further information read the linked docs at the top of this README.
|
|||||||
|
|
||||||
[](https://push.rocks)
|
[](https://push.rocks)
|
||||||
|
|
||||||
|
## Contribution
|
||||||
|
|
||||||
|
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
|
||||||
|
|
||||||
For further information read the linked docs at the top of this readme.
|
For further information read the linked docs at the top of this readme.
|
||||||
|
|
||||||
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||||
|
@ -11,7 +11,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 +27,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 +40,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 +53,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,7 +61,7 @@ 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,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -93,7 +93,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 +104,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();
|
||||||
|
@ -9,7 +9,7 @@ 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 +17,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,13 +25,13 @@ 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);
|
||||||
|
@ -7,7 +7,7 @@ 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 +15,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 +23,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();
|
||||||
});
|
});
|
||||||
|
47
test/test.4.taskmanager.browser.ts
Normal file
47
test/test.4.taskmanager.browser.ts
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
import { expect, tap } from '@pushrocks/tapbundle';
|
||||||
|
import taskbuffer = require('../ts/index');
|
||||||
|
|
||||||
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
|
import * as smartdelay from '@pushrocks/smartdelay';
|
||||||
|
|
||||||
|
let myTaskManager: taskbuffer.TaskManager;
|
||||||
|
let taskRunCounter = 0;
|
||||||
|
const taskDone = smartpromise.defer();
|
||||||
|
|
||||||
|
tap.test('should create an instance of TaskManager', async () => {
|
||||||
|
myTaskManager = new taskbuffer.TaskManager();
|
||||||
|
expect(myTaskManager).to.be.instanceof(taskbuffer.TaskManager);
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should run the task as expected', async () => {
|
||||||
|
let referenceBoolean = false;
|
||||||
|
myTaskManager.addTask(
|
||||||
|
new taskbuffer.Task({
|
||||||
|
name: 'myTask',
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('Task executed!');
|
||||||
|
referenceBoolean = true;
|
||||||
|
taskRunCounter++;
|
||||||
|
if (taskRunCounter === 10) {
|
||||||
|
taskDone.resolve();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
myTaskManager.start();
|
||||||
|
await myTaskManager.triggerTaskByName('myTask');
|
||||||
|
// tslint:disable-next-line:no-unused-expression
|
||||||
|
expect(referenceBoolean).to.be.true;
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should schedule task', async () => {
|
||||||
|
myTaskManager.scheduleTaskByName('myTask', '* * * * * *');
|
||||||
|
await taskDone.promise;
|
||||||
|
myTaskManager.descheduleTaskByName('myTask');
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should stop the taskmanager', async () => {
|
||||||
|
myTaskManager.stop();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.start();
|
@ -25,9 +25,10 @@ tap.test('should run the task as expected', async () => {
|
|||||||
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).to.be.true;
|
||||||
@ -39,4 +40,8 @@ tap.test('should schedule task', async () => {
|
|||||||
myTaskManager.descheduleTaskByName('myTask');
|
myTaskManager.descheduleTaskByName('myTask');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
tap.test('should stop the taskmanager', async () => {
|
||||||
|
myTaskManager.stop();
|
||||||
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
@ -11,7 +11,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 +23,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,11 +34,11 @@ 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 () => {
|
||||||
|
@ -9,7 +9,7 @@ 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).to.be.instanceof(taskbuffer.TaskOnce);
|
||||||
});
|
});
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { tap, expect } from '@pushrocks/tapbundle';
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
|
||||||
import * as taskbuffer from '../ts';
|
import * as taskbuffer from '../ts';
|
||||||
|
|
||||||
let preTask: taskbuffer.Task;
|
let preTask: taskbuffer.Task;
|
||||||
let afterTask: taskbuffer.Task;
|
let afterTask: taskbuffer.Task;
|
||||||
@ -13,7 +13,7 @@ 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',
|
||||||
@ -25,7 +25,7 @@ tap.test('should create tasks', async () => {
|
|||||||
return x;
|
return x;
|
||||||
},
|
},
|
||||||
preTask,
|
preTask,
|
||||||
afterTask
|
afterTask,
|
||||||
});
|
});
|
||||||
|
|
||||||
mainTask = new taskbuffer.Task({
|
mainTask = new taskbuffer.Task({
|
||||||
@ -40,7 +40,7 @@ tap.test('should create tasks', async () => {
|
|||||||
preTask: () => {
|
preTask: () => {
|
||||||
return preTask;
|
return preTask;
|
||||||
},
|
},
|
||||||
afterTask
|
afterTask,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -48,4 +48,4 @@ tap.test('should execute the mainTask', async () => {
|
|||||||
await mainTask.trigger();
|
await mainTask.trigger();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
||||||
|
33
test/test.taskrunner.ts
Normal file
33
test/test.taskrunner.ts
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
import * as taskbuffer from '../ts/index';
|
||||||
|
|
||||||
|
let testTaskRunner: taskbuffer.TaskRunner;
|
||||||
|
|
||||||
|
tap.test('should create a valid taskrunner', async () => {
|
||||||
|
testTaskRunner = new taskbuffer.TaskRunner();
|
||||||
|
await testTaskRunner.start();
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.test('should execute task when its scheduled', async (tools) => {
|
||||||
|
const done = tools.defer();
|
||||||
|
testTaskRunner.addTask(
|
||||||
|
new taskbuffer.Task({
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('hi');
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
testTaskRunner.addTask(
|
||||||
|
new taskbuffer.Task({
|
||||||
|
taskFunction: async () => {
|
||||||
|
console.log('there');
|
||||||
|
done.resolve();
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
await done.promise;
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.start();
|
@ -3,6 +3,5 @@ export { Taskchain } from './taskbuffer.classes.taskchain';
|
|||||||
export { Taskparallel } from './taskbuffer.classes.taskparallel';
|
export { Taskparallel } from './taskbuffer.classes.taskparallel';
|
||||||
export { TaskManager } from './taskbuffer.classes.taskmanager';
|
export { TaskManager } from './taskbuffer.classes.taskmanager';
|
||||||
export { TaskOnce } from './taskbuffer.classes.taskonce';
|
export { TaskOnce } from './taskbuffer.classes.taskonce';
|
||||||
|
export { TaskRunner } from './taskbuffer.classes.taskrunner';
|
||||||
// import for naming only
|
export { TaskDebounced } from './taskbuffer.classes.taskdebounced';
|
||||||
import './taskbuffer.classes.helpers';
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { Task } from "./taskbuffer.classes.task";
|
import { Task } from './taskbuffer.classes.task';
|
||||||
|
|
||||||
export class BufferRunner {
|
export class BufferRunner {
|
||||||
public task: Task;
|
public task: Task;
|
||||||
@ -23,11 +23,11 @@ export class BufferRunner {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _run(x) {
|
private _run(x) {
|
||||||
const recursiveBufferRunner = x => {
|
const recursiveBufferRunner = (x) => {
|
||||||
if (this.bufferCounter >= 0) {
|
if (this.bufferCounter >= 0) {
|
||||||
this.running = true;
|
this.running = true;
|
||||||
this.task.running = true;
|
this.task.running = true;
|
||||||
Task.runTask(this.task, { x: x }).then(x => {
|
Task.runTask(this.task, { x: x }).then((x) => {
|
||||||
this.bufferCounter--;
|
this.bufferCounter--;
|
||||||
this.task.cycleCounter.informOfCycle(x);
|
this.task.cycleCounter.informOfCycle(x);
|
||||||
recursiveBufferRunner(x);
|
recursiveBufferRunner(x);
|
||||||
@ -39,4 +39,4 @@ export class BufferRunner {
|
|||||||
};
|
};
|
||||||
recursiveBufferRunner(x);
|
recursiveBufferRunner(x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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) {
|
||||||
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);
|
||||||
|
@ -1,5 +0,0 @@
|
|||||||
import plugins = require('./taskbuffer.plugins');
|
|
||||||
import { Task, ITaskFunction } from './taskbuffer.classes.task';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
|||||||
import * as plugins from './taskbuffer.plugins';
|
import * as plugins from './taskbuffer.plugins';
|
||||||
import * as helpers from './taskbuffer.classes.helpers';
|
|
||||||
import { BufferRunner } from './taskbuffer.classes.bufferrunner';
|
import { BufferRunner } from './taskbuffer.classes.bufferrunner';
|
||||||
import { CycleCounter } from './taskbuffer.classes.cyclecounter';
|
import { CycleCounter } from './taskbuffer.classes.cyclecounter';
|
||||||
|
|
||||||
|
import { logger } from './taskbuffer.logging';
|
||||||
|
|
||||||
export interface ITaskFunction {
|
export interface ITaskFunction {
|
||||||
(x?: any): PromiseLike<any>;
|
(x?: any): PromiseLike<any>;
|
||||||
}
|
}
|
||||||
@ -12,12 +13,12 @@ export type TPreOrAfterTaskFunction = () => Task;
|
|||||||
export class Task {
|
export class Task {
|
||||||
// STATIC
|
// STATIC
|
||||||
public static extractTask(preOrAfterTaskArg: Task | TPreOrAfterTaskFunction): Task {
|
public static extractTask(preOrAfterTaskArg: Task | TPreOrAfterTaskFunction): Task {
|
||||||
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;
|
||||||
case typeof preOrAfterTaskArg === "function":
|
case typeof preOrAfterTaskArg === 'function':
|
||||||
const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
|
const taskFunction = preOrAfterTaskArg as TPreOrAfterTaskFunction;
|
||||||
return taskFunction();
|
return taskFunction();
|
||||||
default:
|
default:
|
||||||
@ -25,13 +26,12 @@ 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): boolean => {
|
||||||
if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
|
if (taskArg instanceof Task && typeof taskArg.taskFunction === 'function') {
|
||||||
return true;
|
return true;
|
||||||
@ -39,8 +39,11 @@ export class Task {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public static isTaskTouched = (taskArg: Task | TPreOrAfterTaskFunction, touchedTasksArray: Task[]): boolean => {
|
public static isTaskTouched = (
|
||||||
|
taskArg: Task | TPreOrAfterTaskFunction,
|
||||||
|
touchedTasksArray: Task[]
|
||||||
|
): 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) {
|
||||||
@ -50,39 +53,42 @@ export class Task {
|
|||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
public static runTask = async (taskArg: Task | TPreOrAfterTaskFunction, optionsArg: { x?; touchedTasksArray?: Task[] }) => {
|
public static runTask = async (
|
||||||
|
taskArg: Task | TPreOrAfterTaskFunction,
|
||||||
|
optionsArg: { x?; touchedTasksArray?: Task[] }
|
||||||
|
) => {
|
||||||
const taskToRun = Task.extractTask(taskArg);
|
const taskToRun = Task.extractTask(taskArg);
|
||||||
const done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
|
|
||||||
// pay respect to execDelay
|
// pay respect to execDelay
|
||||||
if (taskToRun.execDelay) {
|
if (taskToRun.execDelay) {
|
||||||
await plugins.smartdelay.delayFor(taskToRun.execDelay);
|
await plugins.smartdelay.delayFor(taskToRun.execDelay);
|
||||||
}
|
}
|
||||||
|
|
||||||
// set running params
|
// set running params
|
||||||
taskToRun.running = true;
|
taskToRun.running = true;
|
||||||
|
|
||||||
done.promise.then(async () => {
|
done.promise.then(async () => {
|
||||||
taskToRun.running = false;
|
taskToRun.running = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
// 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;
|
||||||
|
|
||||||
touchedTasksArray.push(taskToRun);
|
touchedTasksArray.push(taskToRun);
|
||||||
|
|
||||||
// run the task cascade
|
// run the task cascade
|
||||||
const localDeferred = plugins.smartpromise.defer();
|
const localDeferred = plugins.smartpromise.defer();
|
||||||
localDeferred.promise
|
localDeferred.promise
|
||||||
.then(() => {
|
.then(() => {
|
||||||
// lets run any preTask
|
// 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 {
|
||||||
@ -91,7 +97,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);
|
||||||
@ -99,7 +105,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 {
|
||||||
@ -108,21 +114,22 @@ 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
|
// INSTANCE
|
||||||
// man datory properties
|
// man datory properties
|
||||||
public name: string;
|
public name: 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;
|
||||||
@ -193,6 +200,7 @@ 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?): Promise<any> {
|
||||||
return Task.runTask(this, { x: x });
|
return Task.runTask(this, { x: x });
|
||||||
@ -200,6 +208,7 @@ export class Task {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* trigger task buffered.
|
* trigger task buffered.
|
||||||
|
* will simply call task.trigger(), which respects buffering by default
|
||||||
*/
|
*/
|
||||||
public triggerBuffered(x?): Promise<any> {
|
public triggerBuffered(x?): Promise<any> {
|
||||||
return this.bufferRunner.trigger(x);
|
return this.bufferRunner.trigger(x);
|
||||||
@ -213,7 +222,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`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
import * as plugins from './taskbuffer.plugins';
|
import * as plugins from './taskbuffer.plugins';
|
||||||
import { Task } from './taskbuffer.classes.task';
|
import { Task } from './taskbuffer.classes.task';
|
||||||
import helpers = require('./taskbuffer.classes.helpers');
|
import { logger } from './taskbuffer.logging';
|
||||||
|
|
||||||
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) => {
|
||||||
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';
|
||||||
|
|
||||||
|
import { Task, ITaskFunction } from './taskbuffer.classes.task';
|
||||||
|
|
||||||
|
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,5 +1,6 @@
|
|||||||
import * as plugins from './taskbuffer.plugins';
|
import * as plugins from './taskbuffer.plugins';
|
||||||
import { Task } from './taskbuffer.classes.task';
|
import { Task } from './taskbuffer.classes.task';
|
||||||
|
import { threadId } from 'worker_threads';
|
||||||
|
|
||||||
export interface ICronJob {
|
export interface ICronJob {
|
||||||
cronString: string;
|
cronString: string;
|
||||||
@ -8,9 +9,9 @@ export interface ICronJob {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class TaskManager {
|
export class TaskManager {
|
||||||
public taskMap = new plugins.lik.Objectmap<Task>();
|
public taskMap = new plugins.lik.ObjectMap<Task>();
|
||||||
private cronJobMap = new plugins.lik.Objectmap<ICronJob>();
|
private cronJobManager = new plugins.smarttime.CronManager();
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
// nothing here
|
// nothing here
|
||||||
}
|
}
|
||||||
@ -20,7 +21,7 @@ export class TaskManager {
|
|||||||
* @param taskNameArg
|
* @param taskNameArg
|
||||||
*/
|
*/
|
||||||
public getTaskByName(taskNameArg): Task {
|
public getTaskByName(taskNameArg): Task {
|
||||||
return this.taskMap.find(itemArg => {
|
return this.taskMap.find((itemArg) => {
|
||||||
return itemArg.name === taskNameArg;
|
return itemArg.name === taskNameArg;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -43,8 +44,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,29 +69,25 @@ 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(cronStringArg, async () => {
|
||||||
cronTime: cronStringArg,
|
await taskToSchedule.triggerBuffered();
|
||||||
onTick: () => {
|
|
||||||
this.triggerTaskByName(taskNameArg);
|
|
||||||
},
|
|
||||||
start: true
|
|
||||||
});
|
|
||||||
this.cronJobMap.add({
|
|
||||||
taskNameArg: taskToSchedule.name,
|
|
||||||
cronString: cronStringArg,
|
|
||||||
job
|
|
||||||
});
|
});
|
||||||
|
taskToSchedule.cronJob = cronJob;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* deschedules a task by name
|
* deschedules a task by name
|
||||||
* @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 +102,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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,7 @@ export class TaskOnce extends Task {
|
|||||||
this.hasTriggered = true;
|
this.hasTriggered = true;
|
||||||
await optionsArg.taskFunction();
|
await optionsArg.taskFunction();
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,23 +1,22 @@
|
|||||||
import * as plugins from './taskbuffer.plugins';
|
import * as plugins from './taskbuffer.plugins';
|
||||||
import * as helpers from './taskbuffer.classes.helpers';
|
|
||||||
import { Task } from './taskbuffer.classes.task';
|
import { Task } from './taskbuffer.classes.task';
|
||||||
|
|
||||||
export class Taskparallel extends Task {
|
export class Taskparallel extends Task {
|
||||||
taskArray: Task[];
|
public taskArray: Task[];
|
||||||
constructor(optionsArg: { taskArray: Task[] }) {
|
constructor(optionsArg: { taskArray: Task[] }) {
|
||||||
const options = {
|
const options = {
|
||||||
...optionsArg,
|
...optionsArg,
|
||||||
...{
|
...{
|
||||||
taskFunction: () => {
|
taskFunction: () => {
|
||||||
let done = plugins.smartpromise.defer();
|
const done = plugins.smartpromise.defer();
|
||||||
let 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;
|
||||||
|
63
ts/taskbuffer.classes.taskrunner.ts
Normal file
63
ts/taskbuffer.classes.taskrunner.ts
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
import * as plugins from './taskbuffer.plugins';
|
||||||
|
|
||||||
|
import { Task } from './taskbuffer.classes.task';
|
||||||
|
|
||||||
|
export class TaskRunner {
|
||||||
|
public maxParrallelJobs: number = 1;
|
||||||
|
public status: 'stopped' | 'running' = 'stopped';
|
||||||
|
public runningTasks: plugins.lik.ObjectMap<Task> = new plugins.lik.ObjectMap<Task>();
|
||||||
|
public qeuedTasks: Task[] = [];
|
||||||
|
|
||||||
|
constructor() {
|
||||||
|
this.runningTasks.eventSubject.subscribe(async (eventArg) => {
|
||||||
|
this.checkExecution();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* adds a task to the qeue
|
||||||
|
*/
|
||||||
|
public addTask(taskArg: Task) {
|
||||||
|
this.qeuedTasks.push(taskArg);
|
||||||
|
this.checkExecution();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* set amount of parallel tasks
|
||||||
|
* be careful, you might loose dependability of tasks
|
||||||
|
*/
|
||||||
|
public setMaxParallelJobs(maxParrallelJobsArg: number) {
|
||||||
|
this.maxParrallelJobs = maxParrallelJobsArg;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* starts the task queue
|
||||||
|
*/
|
||||||
|
public async start() {
|
||||||
|
this.status = 'running';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* checks wether execution is on point
|
||||||
|
*/
|
||||||
|
public async checkExecution() {
|
||||||
|
if (
|
||||||
|
this.runningTasks.getArray().length < this.maxParrallelJobs &&
|
||||||
|
this.status === 'running' &&
|
||||||
|
this.qeuedTasks.length > 0
|
||||||
|
) {
|
||||||
|
const nextJob = this.qeuedTasks.shift();
|
||||||
|
this.runningTasks.add(nextJob);
|
||||||
|
await nextJob.trigger();
|
||||||
|
this.runningTasks.remove(nextJob);
|
||||||
|
this.checkExecution();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* stops the task queue
|
||||||
|
*/
|
||||||
|
public async stop() {
|
||||||
|
this.status = 'stopped';
|
||||||
|
}
|
||||||
|
}
|
3
ts/taskbuffer.logging.ts
Normal file
3
ts/taskbuffer.logging.ts
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
import * as plugins from './taskbuffer.plugins';
|
||||||
|
|
||||||
|
export const logger = new plugins.smartlog.ConsoleLog();
|
@ -1,8 +1,8 @@
|
|||||||
import * as smartlog from '@pushrocks/smartlog';
|
import * as smartlog from '@pushrocks/smartlog';
|
||||||
import cron from 'cron';
|
|
||||||
import * as lik from '@pushrocks/lik';
|
import * as lik from '@pushrocks/lik';
|
||||||
import * as rxjs from 'rxjs';
|
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
import * as smartdelay from '@pushrocks/smartdelay';
|
import * as smartdelay from '@pushrocks/smartdelay';
|
||||||
|
import * as smartrx from '@pushrocks/smartrx';
|
||||||
|
import * as smarttime from '@pushrocks/smarttime';
|
||||||
|
|
||||||
export { smartlog, cron, lik, rxjs, smartpromise, smartdelay };
|
export { smartlog, lik, smartpromise, smartdelay, smartrx, smarttime };
|
||||||
|
Reference in New Issue
Block a user