Compare commits

..

4 Commits

Author SHA1 Message Date
f50384947d 2.1.17 2021-11-11 20:48:32 +01:00
65c1dd8fdc fix(core): update 2021-11-11 20:48:31 +01:00
613d46bb38 2.1.16 2021-11-11 20:37:27 +01:00
439da1f342 fix(core): update 2021-11-11 20:37:27 +01:00
8 changed files with 31 additions and 34 deletions

View File

@ -12,6 +12,9 @@ stages:
- release
- metadata
before_script:
- npm install -g @shipzone/npmci
# ====================
# security stage
# ====================
@ -36,6 +39,7 @@ auditProductionDependencies:
- npmci command npm audit --audit-level=high --only=prod --production
tags:
- docker
allow_failure: true
auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci

24
.vscode/launch.json vendored
View File

@ -2,28 +2,10 @@
"version": "0.2.0",
"configurations": [
{
"name": "current file",
"type": "node",
"command": "npm test",
"name": "Run npm test",
"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"
"type": "node-terminal"
}
]
}

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@pushrocks/taskbuffer",
"version": "2.1.15",
"version": "2.1.17",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@pushrocks/taskbuffer",
"version": "2.1.15",
"version": "2.1.17",
"license": "MIT",
"dependencies": {
"@pushrocks/lik": "^5.0.0",

View File

@ -1,6 +1,6 @@
{
"name": "@pushrocks/taskbuffer",
"version": "2.1.15",
"version": "2.1.17",
"private": false,
"description": "flexible task management. TypeScript ready!",
"main": "dist_ts/index.js",

View File

@ -18,8 +18,10 @@ tap.test('should run the task as expected', async () => {
myTaskManager.addTask(
new taskbuffer.Task({
name: 'myTask',
bufferMax: 1,
buffered: true,
taskFunction: async () => {
console.log('Task executed!');
console.log('Task "myTask" executed!');
referenceBoolean = true;
taskRunCounter++;
if (taskRunCounter === 10) {
@ -35,7 +37,7 @@ tap.test('should run the task as expected', async () => {
});
tap.test('should schedule task', async () => {
myTaskManager.scheduleTaskByName('myTask', '* * * * * *');
myTaskManager.scheduleTaskByName('myTask', '*/10 * * * * *');
await taskDone.promise;
myTaskManager.descheduleTaskByName('myTask');
});

View File

@ -18,7 +18,7 @@ tap.test('should run buffered', async (tools) => {
bufferMax: 1,
afterTask: () => {
return task2;
}
},
});
const task2 = new taskbuffer.Task({
name: 'a buffered task',
@ -31,7 +31,7 @@ tap.test('should run buffered', async (tools) => {
bufferMax: 1,
afterTask: () => {
return task3;
}
},
});
const task3 = new taskbuffer.Task({
name: 'a buffered task',
@ -41,12 +41,12 @@ tap.test('should run buffered', async (tools) => {
console.log(`task3 ran ${counter3} times`);
},
buffered: true,
bufferMax: 1
bufferMax: 1,
});
while(counter1 < 10) {
while (counter1 < 10) {
await tools.delayFor(5000);
task.trigger();
}
})
});
tap.start();
tap.start();

View File

@ -58,6 +58,7 @@ export class Task {
taskArg: Task | TPreOrAfterTaskFunction,
optionsArg: { x?: any; touchedTasksArray?: Task[] }
) => {
// extracts the task in case it is specified as a return value of a function
const taskToRun = Task.extractTask(taskArg);
const done = plugins.smartpromise.defer();
@ -125,7 +126,7 @@ export class Task {
};
// INSTANCE
// man datory properties
// mandatory properties
public name: string;
public taskFunction: ITaskFunction;
public buffered: boolean;

View File

@ -70,7 +70,15 @@ export class TaskManager {
public scheduleTaskByName(taskNameArg: string, cronStringArg: string) {
const taskToSchedule = this.getTaskByName(taskNameArg);
const cronJob = this.cronJobManager.addCronjob(cronStringArg, async () => {
await taskToSchedule.triggerBuffered();
console.log(`taskbuffer schedule triggered task >>${taskToSchedule.name}<<`);
console.log(
`task >>${taskToSchedule.name}<< is ${
taskToSchedule.buffered
? `buffered with max ${taskToSchedule.bufferMax} buffered calls`
: `unbuffered`
}`
);
await taskToSchedule.trigger();
});
taskToSchedule.cronJob = cronJob;
}