@push.rocks/taskbuffer 5.0.0 → 6.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.d.ts +1 -1
- package/dist_ts/taskbuffer.classes.taskconstraintgroup.d.ts +4 -2
- package/dist_ts/taskbuffer.classes.taskconstraintgroup.js +11 -4
- package/dist_ts/taskbuffer.classes.taskmanager.d.ts +1 -0
- package/dist_ts/taskbuffer.classes.taskmanager.js +43 -9
- package/dist_ts/taskbuffer.interfaces.d.ts +7 -1
- package/dist_ts_web/00_commitinfo_data.js +1 -1
- package/package.json +1 -1
- package/readme.hints.md +5 -3
- package/readme.md +108 -12
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +1 -1
- package/ts/taskbuffer.classes.taskconstraintgroup.ts +13 -4
- package/ts/taskbuffer.classes.taskmanager.ts +47 -11
- package/ts/taskbuffer.interfaces.ts +8 -1
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/taskbuffer',
|
|
6
|
-
version: '
|
|
6
|
+
version: '6.0.0',
|
|
7
7
|
description: 'A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLDhJQUE4STtDQUM1SixDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -8,6 +8,6 @@ export { TaskDebounced } from './taskbuffer.classes.taskdebounced.js';
|
|
|
8
8
|
export { TaskConstraintGroup } from './taskbuffer.classes.taskconstraintgroup.js';
|
|
9
9
|
export { TaskStep } from './taskbuffer.classes.taskstep.js';
|
|
10
10
|
export type { ITaskStep } from './taskbuffer.classes.taskstep.js';
|
|
11
|
-
export type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo, ITaskEvent, TTaskEventType, ITaskConstraintGroupOptions } from './taskbuffer.interfaces.js';
|
|
11
|
+
export type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo, ITaskEvent, TTaskEventType, ITaskConstraintGroupOptions, ITaskExecution } from './taskbuffer.interfaces.js';
|
|
12
12
|
import * as distributedCoordination from './taskbuffer.classes.distributedcoordinator.js';
|
|
13
13
|
export { distributedCoordination };
|
|
@@ -4,11 +4,13 @@ export declare class TaskConstraintGroup<TData extends Record<string, unknown> =
|
|
|
4
4
|
name: string;
|
|
5
5
|
maxConcurrent: number;
|
|
6
6
|
cooldownMs: number;
|
|
7
|
-
private
|
|
7
|
+
private constraintKeyForExecution;
|
|
8
|
+
private shouldExecuteFn?;
|
|
8
9
|
private runningCounts;
|
|
9
10
|
private lastCompletionTimes;
|
|
10
11
|
constructor(options: ITaskConstraintGroupOptions<TData>);
|
|
11
|
-
getConstraintKey(task: Task<any, any, TData
|
|
12
|
+
getConstraintKey(task: Task<any, any, TData>, input?: any): string | null;
|
|
13
|
+
checkShouldExecute(task: Task<any, any, TData>, input?: any): Promise<boolean>;
|
|
12
14
|
canRun(subGroupKey: string): boolean;
|
|
13
15
|
acquireSlot(subGroupKey: string): void;
|
|
14
16
|
releaseSlot(subGroupKey: string): void;
|
|
@@ -3,14 +3,21 @@ export class TaskConstraintGroup {
|
|
|
3
3
|
this.runningCounts = new Map();
|
|
4
4
|
this.lastCompletionTimes = new Map();
|
|
5
5
|
this.name = options.name;
|
|
6
|
-
this.
|
|
6
|
+
this.constraintKeyForExecution = options.constraintKeyForExecution;
|
|
7
7
|
this.maxConcurrent = options.maxConcurrent ?? Infinity;
|
|
8
8
|
this.cooldownMs = options.cooldownMs ?? 0;
|
|
9
|
+
this.shouldExecuteFn = options.shouldExecute;
|
|
9
10
|
}
|
|
10
|
-
getConstraintKey(task) {
|
|
11
|
-
const key = this.
|
|
11
|
+
getConstraintKey(task, input) {
|
|
12
|
+
const key = this.constraintKeyForExecution(task, input);
|
|
12
13
|
return key ?? null;
|
|
13
14
|
}
|
|
15
|
+
async checkShouldExecute(task, input) {
|
|
16
|
+
if (!this.shouldExecuteFn) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
return this.shouldExecuteFn(task, input);
|
|
20
|
+
}
|
|
14
21
|
canRun(subGroupKey) {
|
|
15
22
|
const running = this.runningCounts.get(subGroupKey) ?? 0;
|
|
16
23
|
if (running >= this.maxConcurrent) {
|
|
@@ -61,4 +68,4 @@ export class TaskConstraintGroup {
|
|
|
61
68
|
this.lastCompletionTimes.clear();
|
|
62
69
|
}
|
|
63
70
|
}
|
|
64
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGFza2J1ZmZlci5jbGFzc2VzLnRhc2tjb25zdHJhaW50Z3JvdXAuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy90YXNrYnVmZmVyLmNsYXNzZXMudGFza2NvbnN0cmFpbnRncm91cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLE9BQU8sbUJBQW1CO0lBVTlCLFlBQVksT0FBMkM7UUFIL0Msa0JBQWEsR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztRQUMxQyx3QkFBbUIsR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztRQUd0RCxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDekIsSUFBSSxDQUFDLHlCQUF5QixHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQztRQUNuRSxJQUFJLENBQUMsYUFBYSxHQUFHLE9BQU8sQ0FBQyxhQUFhLElBQUksUUFBUSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsSUFBSSxDQUFDLENBQUM7UUFDMUMsSUFBSSxDQUFDLGVBQWUsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDO0lBQy9DLENBQUM7SUFFTSxnQkFBZ0IsQ0FBQyxJQUEyQixFQUFFLEtBQVc7UUFDOUQsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLHlCQUF5QixDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztRQUN4RCxPQUFPLEdBQUcsSUFBSSxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVNLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxJQUEyQixFQUFFLEtBQVc7UUFDdEUsSUFBSSxDQUFDLElBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQztZQUMxQixPQUFPLElBQUksQ0FBQztRQUNkLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFTSxNQUFNLENBQUMsV0FBbUI7UUFDL0IsTUFB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
|
|
@@ -29,6 +29,7 @@ export declare class TaskManager {
|
|
|
29
29
|
addConstraintGroup(group: TaskConstraintGroup<any>): void;
|
|
30
30
|
removeConstraintGroup(name: string): void;
|
|
31
31
|
triggerTaskConstrained(task: Task<any, any, any>, input?: any): Promise<any>;
|
|
32
|
+
private checkAllShouldExecute;
|
|
32
33
|
private executeWithConstraintTracking;
|
|
33
34
|
private drainConstraintQueue;
|
|
34
35
|
triggerTaskByName(taskName: string): Promise<any>;
|
|
@@ -56,13 +56,17 @@ export class TaskManager {
|
|
|
56
56
|
// Gather applicable constraints
|
|
57
57
|
const applicableGroups = [];
|
|
58
58
|
for (const group of this.constraintGroups) {
|
|
59
|
-
const key = group.getConstraintKey(task);
|
|
59
|
+
const key = group.getConstraintKey(task, input);
|
|
60
60
|
if (key !== null) {
|
|
61
61
|
applicableGroups.push({ group, key });
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
// No constraints apply → trigger directly
|
|
64
|
+
// No constraints apply → check shouldExecute then trigger directly
|
|
65
65
|
if (applicableGroups.length === 0) {
|
|
66
|
+
const shouldRun = await this.checkAllShouldExecute(task, input);
|
|
67
|
+
if (!shouldRun) {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
66
70
|
return task.trigger(input);
|
|
67
71
|
}
|
|
68
72
|
// Check if all constraints allow running
|
|
@@ -70,16 +74,39 @@ export class TaskManager {
|
|
|
70
74
|
if (allCanRun) {
|
|
71
75
|
return this.executeWithConstraintTracking(task, input, applicableGroups);
|
|
72
76
|
}
|
|
73
|
-
// Blocked → enqueue with deferred promise
|
|
77
|
+
// Blocked → enqueue with deferred promise and cached constraint keys
|
|
74
78
|
const deferred = plugins.smartpromise.defer();
|
|
75
|
-
|
|
79
|
+
const constraintKeys = new Map();
|
|
80
|
+
for (const { group, key } of applicableGroups) {
|
|
81
|
+
constraintKeys.set(group.name, key);
|
|
82
|
+
}
|
|
83
|
+
this.constraintQueue.push({ task, input, deferred, constraintKeys });
|
|
76
84
|
return deferred.promise;
|
|
77
85
|
}
|
|
86
|
+
async checkAllShouldExecute(task, input) {
|
|
87
|
+
for (const group of this.constraintGroups) {
|
|
88
|
+
const shouldRun = await group.checkShouldExecute(task, input);
|
|
89
|
+
if (!shouldRun) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return true;
|
|
94
|
+
}
|
|
78
95
|
async executeWithConstraintTracking(task, input, groups) {
|
|
79
|
-
// Acquire slots
|
|
96
|
+
// Acquire slots synchronously to prevent race conditions
|
|
80
97
|
for (const { group, key } of groups) {
|
|
81
98
|
group.acquireSlot(key);
|
|
82
99
|
}
|
|
100
|
+
// Check shouldExecute after acquiring slots
|
|
101
|
+
const shouldRun = await this.checkAllShouldExecute(task, input);
|
|
102
|
+
if (!shouldRun) {
|
|
103
|
+
// Release slots and drain queue
|
|
104
|
+
for (const { group, key } of groups) {
|
|
105
|
+
group.releaseSlot(key);
|
|
106
|
+
}
|
|
107
|
+
this.drainConstraintQueue();
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
83
110
|
try {
|
|
84
111
|
return await task.trigger(input);
|
|
85
112
|
}
|
|
@@ -97,18 +124,25 @@ export class TaskManager {
|
|
|
97
124
|
for (const entry of this.constraintQueue) {
|
|
98
125
|
const applicableGroups = [];
|
|
99
126
|
for (const group of this.constraintGroups) {
|
|
100
|
-
const key = group.getConstraintKey(entry.task);
|
|
127
|
+
const key = group.getConstraintKey(entry.task, entry.input);
|
|
101
128
|
if (key !== null) {
|
|
102
129
|
applicableGroups.push({ group, key });
|
|
103
130
|
}
|
|
104
131
|
}
|
|
105
|
-
// No constraints apply anymore (group removed?) → run
|
|
132
|
+
// No constraints apply anymore (group removed?) → check shouldExecute then run
|
|
106
133
|
if (applicableGroups.length === 0) {
|
|
107
|
-
entry.task
|
|
134
|
+
this.checkAllShouldExecute(entry.task, entry.input).then((shouldRun) => {
|
|
135
|
+
if (!shouldRun) {
|
|
136
|
+
entry.deferred.resolve(undefined);
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
entry.task.trigger(entry.input).then((result) => entry.deferred.resolve(result), (err) => entry.deferred.reject(err));
|
|
140
|
+
});
|
|
108
141
|
continue;
|
|
109
142
|
}
|
|
110
143
|
const allCanRun = applicableGroups.every(({ group, key }) => group.canRun(key));
|
|
111
144
|
if (allCanRun) {
|
|
145
|
+
// executeWithConstraintTracking handles shouldExecute check internally
|
|
112
146
|
this.executeWithConstraintTracking(entry.task, entry.input, applicableGroups).then((result) => entry.deferred.resolve(result), (err) => entry.deferred.reject(err));
|
|
113
147
|
}
|
|
114
148
|
else {
|
|
@@ -334,4 +368,4 @@ export class TaskManager {
|
|
|
334
368
|
}
|
|
335
369
|
}
|
|
336
370
|
}
|
|
337
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"taskbuffer.classes.taskmanager.js","sourceRoot":"","sources":["../ts/taskbuffer.classes.taskmanager.ts"],"names":[],"mappings":"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"}
|
|
371
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"taskbuffer.classes.taskmanager.js","sourceRoot":"","sources":["../ts/taskbuffer.classes.taskmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,20 @@ import type { ITaskStep } from './taskbuffer.classes.taskstep.js';
|
|
|
2
2
|
import type { Task } from './taskbuffer.classes.task.js';
|
|
3
3
|
export interface ITaskConstraintGroupOptions<TData extends Record<string, unknown> = Record<string, unknown>> {
|
|
4
4
|
name: string;
|
|
5
|
-
|
|
5
|
+
constraintKeyForExecution: (task: Task<any, any, TData>, input?: any) => string | null | undefined;
|
|
6
6
|
maxConcurrent?: number;
|
|
7
7
|
cooldownMs?: number;
|
|
8
|
+
shouldExecute?: (task: Task<any, any, TData>, input?: any) => boolean | Promise<boolean>;
|
|
9
|
+
}
|
|
10
|
+
export interface ITaskExecution<TData extends Record<string, unknown> = Record<string, unknown>> {
|
|
11
|
+
task: Task<any, any, TData>;
|
|
12
|
+
input: any;
|
|
8
13
|
}
|
|
9
14
|
export interface IConstrainedTaskEntry {
|
|
10
15
|
task: Task<any, any, any>;
|
|
11
16
|
input: any;
|
|
12
17
|
deferred: import('@push.rocks/smartpromise').Deferred<any>;
|
|
18
|
+
constraintKeys: Map<string, string>;
|
|
13
19
|
}
|
|
14
20
|
export interface ITaskMetadata {
|
|
15
21
|
name: string;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/taskbuffer',
|
|
6
|
-
version: '
|
|
6
|
+
version: '6.0.0',
|
|
7
7
|
description: 'A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsd0JBQXdCO0lBQzlCLE9BQU8sRUFBRSxPQUFPO0lBQ2hCLFdBQVcsRUFBRSw4SUFBOEk7Q0FDNUosQ0FBQSJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@push.rocks/taskbuffer",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
package/readme.hints.md
CHANGED
|
@@ -12,11 +12,13 @@
|
|
|
12
12
|
- Typed data bag accessible as `task.data`
|
|
13
13
|
|
|
14
14
|
### TaskConstraintGroup
|
|
15
|
-
- `new TaskConstraintGroup<TData>({ name,
|
|
16
|
-
- `
|
|
15
|
+
- `new TaskConstraintGroup<TData>({ name, constraintKeyForExecution, maxConcurrent?, cooldownMs?, shouldExecute? })`
|
|
16
|
+
- `constraintKeyForExecution(task, input?)` returns a string key (constraint applies) or `null` (skip). Receives both task and runtime input.
|
|
17
|
+
- `shouldExecute(task, input?)` — optional pre-execution check. Returns `false` to skip (deferred resolves `undefined`). Can be async.
|
|
17
18
|
- `maxConcurrent` (default: `Infinity`) — max concurrent tasks per key
|
|
18
19
|
- `cooldownMs` (default: `0`) — minimum ms gap between completions per key
|
|
19
|
-
- Methods: `canRun(key)`, `acquireSlot(key)`, `releaseSlot(key)`, `getCooldownRemaining(key)`, `getRunningCount(key)`, `reset()`
|
|
20
|
+
- Methods: `getConstraintKey(task, input?)`, `checkShouldExecute(task, input?)`, `canRun(key)`, `acquireSlot(key)`, `releaseSlot(key)`, `getCooldownRemaining(key)`, `getRunningCount(key)`, `reset()`
|
|
21
|
+
- `ITaskExecution<TData>` type exported from index — `{ task, input }` tuple
|
|
20
22
|
|
|
21
23
|
### TaskManager Constraint Integration
|
|
22
24
|
- `manager.addConstraintGroup(group)` / `manager.removeConstraintGroup(name)`
|
package/readme.md
CHANGED
|
@@ -120,7 +120,7 @@ const manager = new TaskManager();
|
|
|
120
120
|
const domainMutex = new TaskConstraintGroup<{ domain: string }>({
|
|
121
121
|
name: 'domain-mutex',
|
|
122
122
|
maxConcurrent: 1,
|
|
123
|
-
|
|
123
|
+
constraintKeyForExecution: (task, input?) => task.data.domain,
|
|
124
124
|
});
|
|
125
125
|
|
|
126
126
|
manager.addConstraintGroup(domainMutex);
|
|
@@ -156,7 +156,7 @@ Cap how many tasks can run concurrently across a group:
|
|
|
156
156
|
const dnsLimit = new TaskConstraintGroup<{ group: string }>({
|
|
157
157
|
name: 'dns-concurrency',
|
|
158
158
|
maxConcurrent: 3,
|
|
159
|
-
|
|
159
|
+
constraintKeyForExecution: (task) =>
|
|
160
160
|
task.data.group === 'dns' ? 'dns' : null, // null = skip constraint
|
|
161
161
|
});
|
|
162
162
|
|
|
@@ -173,7 +173,7 @@ const rateLimiter = new TaskConstraintGroup<{ domain: string }>({
|
|
|
173
173
|
name: 'api-rate-limit',
|
|
174
174
|
maxConcurrent: 1,
|
|
175
175
|
cooldownMs: 11000,
|
|
176
|
-
|
|
176
|
+
constraintKeyForExecution: (task) => task.data.domain,
|
|
177
177
|
});
|
|
178
178
|
|
|
179
179
|
manager.addConstraintGroup(rateLimiter);
|
|
@@ -187,7 +187,7 @@ Limit total concurrent tasks system-wide:
|
|
|
187
187
|
const globalCap = new TaskConstraintGroup({
|
|
188
188
|
name: 'global-cap',
|
|
189
189
|
maxConcurrent: 10,
|
|
190
|
-
|
|
190
|
+
constraintKeyForExecution: () => 'all', // same key = shared limit
|
|
191
191
|
});
|
|
192
192
|
|
|
193
193
|
manager.addConstraintGroup(globalCap);
|
|
@@ -208,26 +208,119 @@ await manager.triggerTask(dnsTask);
|
|
|
208
208
|
|
|
209
209
|
### Selective Constraints
|
|
210
210
|
|
|
211
|
-
Return `null` from `
|
|
211
|
+
Return `null` from `constraintKeyForExecution` to exempt a task from a constraint group:
|
|
212
212
|
|
|
213
213
|
```typescript
|
|
214
214
|
const constraint = new TaskConstraintGroup<{ priority: string }>({
|
|
215
215
|
name: 'low-priority-limit',
|
|
216
216
|
maxConcurrent: 2,
|
|
217
|
-
|
|
217
|
+
constraintKeyForExecution: (task) =>
|
|
218
218
|
task.data.priority === 'low' ? 'low-priority' : null, // high priority tasks skip this constraint
|
|
219
219
|
});
|
|
220
220
|
```
|
|
221
221
|
|
|
222
|
+
### Input-Aware Constraints 🎯
|
|
223
|
+
|
|
224
|
+
The `constraintKeyForExecution` function receives both the **task** and the **runtime input** passed to `trigger(input)`. This means the same task triggered with different inputs can be constrained independently:
|
|
225
|
+
|
|
226
|
+
```typescript
|
|
227
|
+
const extractTLD = (domain: string) => {
|
|
228
|
+
const parts = domain.split('.');
|
|
229
|
+
return parts.slice(-2).join('.');
|
|
230
|
+
};
|
|
231
|
+
|
|
232
|
+
// Same TLD → serialized. Different TLDs → parallel.
|
|
233
|
+
const tldMutex = new TaskConstraintGroup({
|
|
234
|
+
name: 'tld-mutex',
|
|
235
|
+
maxConcurrent: 1,
|
|
236
|
+
constraintKeyForExecution: (task, input?: string) => {
|
|
237
|
+
if (!input) return null;
|
|
238
|
+
return extractTLD(input); // "example.com", "other.org", etc.
|
|
239
|
+
},
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
manager.addConstraintGroup(tldMutex);
|
|
243
|
+
|
|
244
|
+
// These two serialize (same TLD "example.com")
|
|
245
|
+
const p1 = manager.triggerTaskConstrained(getCert, 'app.example.com');
|
|
246
|
+
const p2 = manager.triggerTaskConstrained(getCert, 'api.example.com');
|
|
247
|
+
|
|
248
|
+
// This runs in parallel (different TLD "other.org")
|
|
249
|
+
const p3 = manager.triggerTaskConstrained(getCert, 'my.other.org');
|
|
250
|
+
```
|
|
251
|
+
|
|
252
|
+
You can also combine `task.data` and `input` for composite keys:
|
|
253
|
+
|
|
254
|
+
```typescript
|
|
255
|
+
const providerDomain = new TaskConstraintGroup<{ provider: string }>({
|
|
256
|
+
name: 'provider-domain',
|
|
257
|
+
maxConcurrent: 1,
|
|
258
|
+
constraintKeyForExecution: (task, input?: string) => {
|
|
259
|
+
return `${task.data.provider}:${input || 'default'}`;
|
|
260
|
+
},
|
|
261
|
+
});
|
|
262
|
+
```
|
|
263
|
+
|
|
264
|
+
### Pre-Execution Check with `shouldExecute` ✅
|
|
265
|
+
|
|
266
|
+
The `shouldExecute` callback runs right before a queued task executes. If it returns `false`, the task is skipped and its promise resolves with `undefined`. This is perfect for scenarios where a prior execution's outcome makes subsequent queued tasks unnecessary:
|
|
267
|
+
|
|
268
|
+
```typescript
|
|
269
|
+
const certCache = new Map<string, string>();
|
|
270
|
+
|
|
271
|
+
const certConstraint = new TaskConstraintGroup({
|
|
272
|
+
name: 'cert-mutex',
|
|
273
|
+
maxConcurrent: 1,
|
|
274
|
+
constraintKeyForExecution: (task, input?: string) => {
|
|
275
|
+
if (!input) return null;
|
|
276
|
+
return extractTLD(input);
|
|
277
|
+
},
|
|
278
|
+
shouldExecute: (task, input?: string) => {
|
|
279
|
+
if (!input) return true;
|
|
280
|
+
// Skip if a wildcard cert already covers this TLD
|
|
281
|
+
return certCache.get(extractTLD(input)) !== 'wildcard';
|
|
282
|
+
},
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
const getCert = new Task({
|
|
286
|
+
name: 'get-certificate',
|
|
287
|
+
taskFunction: async (domain: string) => {
|
|
288
|
+
const cert = await acme.getCert(domain);
|
|
289
|
+
if (cert.isWildcard) certCache.set(extractTLD(domain), 'wildcard');
|
|
290
|
+
return cert;
|
|
291
|
+
},
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
manager.addConstraintGroup(certConstraint);
|
|
295
|
+
manager.addTask(getCert);
|
|
296
|
+
|
|
297
|
+
const r1 = manager.triggerTaskConstrained(getCert, 'app.example.com'); // runs, gets wildcard
|
|
298
|
+
const r2 = manager.triggerTaskConstrained(getCert, 'api.example.com'); // queued → skipped!
|
|
299
|
+
const r3 = manager.triggerTaskConstrained(getCert, 'my.other.org'); // parallel (different TLD)
|
|
300
|
+
|
|
301
|
+
const [cert1, cert2, cert3] = await Promise.all([r1, r2, r3]);
|
|
302
|
+
// cert2 === undefined (skipped because wildcard already covers example.com)
|
|
303
|
+
```
|
|
304
|
+
|
|
305
|
+
**`shouldExecute` semantics:**
|
|
306
|
+
|
|
307
|
+
- Runs right before execution (after slot acquisition, before `trigger()`)
|
|
308
|
+
- Also checked on immediate (non-queued) triggers
|
|
309
|
+
- Returns `false` → skip execution, deferred resolves with `undefined`
|
|
310
|
+
- Can be async (return `Promise<boolean>`)
|
|
311
|
+
- Has closure access to external state modified by prior executions
|
|
312
|
+
- If multiple constraint groups have `shouldExecute`, **all** must return `true`
|
|
313
|
+
|
|
222
314
|
### How It Works
|
|
223
315
|
|
|
224
316
|
When you trigger a task through `TaskManager` (via `triggerTask`, `triggerTaskByName`, `addExecuteRemoveTask`, or cron), the manager:
|
|
225
317
|
|
|
226
|
-
1. Evaluates all registered constraint groups against the task
|
|
227
|
-
2. If no constraints apply (all matchers return `null`) → runs
|
|
228
|
-
3. If all applicable constraints have capacity → acquires slots
|
|
318
|
+
1. Evaluates all registered constraint groups against the task and input
|
|
319
|
+
2. If no constraints apply (all matchers return `null`) → checks `shouldExecute` → runs or skips
|
|
320
|
+
3. If all applicable constraints have capacity → acquires slots → checks `shouldExecute` → runs or skips
|
|
229
321
|
4. If any constraint blocks → enqueues the task; when a running task completes, the queue is drained
|
|
230
322
|
5. Cooldown-blocked tasks auto-retry after the shortest remaining cooldown expires
|
|
323
|
+
6. Queued tasks re-check `shouldExecute` when their turn comes — stale work is automatically pruned
|
|
231
324
|
|
|
232
325
|
## 🎯 Core Concepts
|
|
233
326
|
|
|
@@ -732,7 +825,7 @@ const manager = new TaskManager();
|
|
|
732
825
|
const tenantLimit = new TaskConstraintGroup<{ tenantId: string }>({
|
|
733
826
|
name: 'tenant-concurrency',
|
|
734
827
|
maxConcurrent: 2,
|
|
735
|
-
|
|
828
|
+
constraintKeyForExecution: (task, input?) => task.data.tenantId,
|
|
736
829
|
});
|
|
737
830
|
manager.addConstraintGroup(tenantLimit);
|
|
738
831
|
|
|
@@ -829,15 +922,17 @@ const acmeTasks = manager.getTasksMetadataByLabel('tenantId', 'acme');
|
|
|
829
922
|
| Option | Type | Default | Description |
|
|
830
923
|
| --- | --- | --- | --- |
|
|
831
924
|
| `name` | `string` | *required* | Constraint group identifier |
|
|
832
|
-
| `
|
|
925
|
+
| `constraintKeyForExecution` | `(task, input?) => string \| null` | *required* | Returns key for grouping, or `null` to skip. Receives both the task and runtime input. |
|
|
833
926
|
| `maxConcurrent` | `number` | `Infinity` | Max concurrent tasks per key |
|
|
834
927
|
| `cooldownMs` | `number` | `0` | Minimum ms between completions per key |
|
|
928
|
+
| `shouldExecute` | `(task, input?) => boolean \| Promise<boolean>` | — | Pre-execution check. Return `false` to skip; deferred resolves `undefined`. |
|
|
835
929
|
|
|
836
930
|
### TaskConstraintGroup Methods
|
|
837
931
|
|
|
838
932
|
| Method | Returns | Description |
|
|
839
933
|
| --- | --- | --- |
|
|
840
|
-
| `getConstraintKey(task)` | `string \| null` | Get the constraint key for a task |
|
|
934
|
+
| `getConstraintKey(task, input?)` | `string \| null` | Get the constraint key for a task + input |
|
|
935
|
+
| `checkShouldExecute(task, input?)` | `Promise<boolean>` | Run the `shouldExecute` callback (defaults to `true`) |
|
|
841
936
|
| `canRun(key)` | `boolean` | Check if a slot is available |
|
|
842
937
|
| `acquireSlot(key)` | `void` | Claim a running slot |
|
|
843
938
|
| `releaseSlot(key)` | `void` | Release a slot and record completion time |
|
|
@@ -884,6 +979,7 @@ const acmeTasks = manager.getTasksMetadataByLabel('tenantId', 'acme');
|
|
|
884
979
|
import type {
|
|
885
980
|
ITaskMetadata,
|
|
886
981
|
ITaskExecutionReport,
|
|
982
|
+
ITaskExecution,
|
|
887
983
|
IScheduledTaskInfo,
|
|
888
984
|
ITaskEvent,
|
|
889
985
|
TTaskEventType,
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/taskbuffer',
|
|
6
|
-
version: '
|
|
6
|
+
version: '6.0.0',
|
|
7
7
|
description: 'A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.'
|
|
8
8
|
}
|
package/ts/index.ts
CHANGED
|
@@ -12,7 +12,7 @@ export { TaskStep } from './taskbuffer.classes.taskstep.js';
|
|
|
12
12
|
export type { ITaskStep } from './taskbuffer.classes.taskstep.js';
|
|
13
13
|
|
|
14
14
|
// Metadata interfaces
|
|
15
|
-
export type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo, ITaskEvent, TTaskEventType, ITaskConstraintGroupOptions } from './taskbuffer.interfaces.js';
|
|
15
|
+
export type { ITaskMetadata, ITaskExecutionReport, IScheduledTaskInfo, ITaskEvent, TTaskEventType, ITaskConstraintGroupOptions, ITaskExecution } from './taskbuffer.interfaces.js';
|
|
16
16
|
|
|
17
17
|
import * as distributedCoordination from './taskbuffer.classes.distributedcoordinator.js';
|
|
18
18
|
export { distributedCoordination };
|
|
@@ -5,23 +5,32 @@ export class TaskConstraintGroup<TData extends Record<string, unknown> = Record<
|
|
|
5
5
|
public name: string;
|
|
6
6
|
public maxConcurrent: number;
|
|
7
7
|
public cooldownMs: number;
|
|
8
|
-
private
|
|
8
|
+
private constraintKeyForExecution: (task: Task<any, any, TData>, input?: any) => string | null | undefined;
|
|
9
|
+
private shouldExecuteFn?: (task: Task<any, any, TData>, input?: any) => boolean | Promise<boolean>;
|
|
9
10
|
|
|
10
11
|
private runningCounts = new Map<string, number>();
|
|
11
12
|
private lastCompletionTimes = new Map<string, number>();
|
|
12
13
|
|
|
13
14
|
constructor(options: ITaskConstraintGroupOptions<TData>) {
|
|
14
15
|
this.name = options.name;
|
|
15
|
-
this.
|
|
16
|
+
this.constraintKeyForExecution = options.constraintKeyForExecution;
|
|
16
17
|
this.maxConcurrent = options.maxConcurrent ?? Infinity;
|
|
17
18
|
this.cooldownMs = options.cooldownMs ?? 0;
|
|
19
|
+
this.shouldExecuteFn = options.shouldExecute;
|
|
18
20
|
}
|
|
19
21
|
|
|
20
|
-
public getConstraintKey(task: Task<any, any, TData
|
|
21
|
-
const key = this.
|
|
22
|
+
public getConstraintKey(task: Task<any, any, TData>, input?: any): string | null {
|
|
23
|
+
const key = this.constraintKeyForExecution(task, input);
|
|
22
24
|
return key ?? null;
|
|
23
25
|
}
|
|
24
26
|
|
|
27
|
+
public async checkShouldExecute(task: Task<any, any, TData>, input?: any): Promise<boolean> {
|
|
28
|
+
if (!this.shouldExecuteFn) {
|
|
29
|
+
return true;
|
|
30
|
+
}
|
|
31
|
+
return this.shouldExecuteFn(task, input);
|
|
32
|
+
}
|
|
33
|
+
|
|
25
34
|
public canRun(subGroupKey: string): boolean {
|
|
26
35
|
const running = this.runningCounts.get(subGroupKey) ?? 0;
|
|
27
36
|
if (running >= this.maxConcurrent) {
|
|
@@ -80,14 +80,18 @@ export class TaskManager {
|
|
|
80
80
|
// Gather applicable constraints
|
|
81
81
|
const applicableGroups: Array<{ group: TaskConstraintGroup<any>; key: string }> = [];
|
|
82
82
|
for (const group of this.constraintGroups) {
|
|
83
|
-
const key = group.getConstraintKey(task);
|
|
83
|
+
const key = group.getConstraintKey(task, input);
|
|
84
84
|
if (key !== null) {
|
|
85
85
|
applicableGroups.push({ group, key });
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
-
// No constraints apply → trigger directly
|
|
89
|
+
// No constraints apply → check shouldExecute then trigger directly
|
|
90
90
|
if (applicableGroups.length === 0) {
|
|
91
|
+
const shouldRun = await this.checkAllShouldExecute(task, input);
|
|
92
|
+
if (!shouldRun) {
|
|
93
|
+
return undefined;
|
|
94
|
+
}
|
|
91
95
|
return task.trigger(input);
|
|
92
96
|
}
|
|
93
97
|
|
|
@@ -97,22 +101,47 @@ export class TaskManager {
|
|
|
97
101
|
return this.executeWithConstraintTracking(task, input, applicableGroups);
|
|
98
102
|
}
|
|
99
103
|
|
|
100
|
-
// Blocked → enqueue with deferred promise
|
|
104
|
+
// Blocked → enqueue with deferred promise and cached constraint keys
|
|
101
105
|
const deferred = plugins.smartpromise.defer<any>();
|
|
102
|
-
|
|
106
|
+
const constraintKeys = new Map<string, string>();
|
|
107
|
+
for (const { group, key } of applicableGroups) {
|
|
108
|
+
constraintKeys.set(group.name, key);
|
|
109
|
+
}
|
|
110
|
+
this.constraintQueue.push({ task, input, deferred, constraintKeys });
|
|
103
111
|
return deferred.promise;
|
|
104
112
|
}
|
|
105
113
|
|
|
114
|
+
private async checkAllShouldExecute(task: Task<any, any, any>, input?: any): Promise<boolean> {
|
|
115
|
+
for (const group of this.constraintGroups) {
|
|
116
|
+
const shouldRun = await group.checkShouldExecute(task, input);
|
|
117
|
+
if (!shouldRun) {
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return true;
|
|
122
|
+
}
|
|
123
|
+
|
|
106
124
|
private async executeWithConstraintTracking(
|
|
107
125
|
task: Task<any, any, any>,
|
|
108
126
|
input: any,
|
|
109
127
|
groups: Array<{ group: TaskConstraintGroup<any>; key: string }>,
|
|
110
128
|
): Promise<any> {
|
|
111
|
-
// Acquire slots
|
|
129
|
+
// Acquire slots synchronously to prevent race conditions
|
|
112
130
|
for (const { group, key } of groups) {
|
|
113
131
|
group.acquireSlot(key);
|
|
114
132
|
}
|
|
115
133
|
|
|
134
|
+
// Check shouldExecute after acquiring slots
|
|
135
|
+
const shouldRun = await this.checkAllShouldExecute(task, input);
|
|
136
|
+
if (!shouldRun) {
|
|
137
|
+
// Release slots and drain queue
|
|
138
|
+
for (const { group, key } of groups) {
|
|
139
|
+
group.releaseSlot(key);
|
|
140
|
+
}
|
|
141
|
+
this.drainConstraintQueue();
|
|
142
|
+
return undefined;
|
|
143
|
+
}
|
|
144
|
+
|
|
116
145
|
try {
|
|
117
146
|
return await task.trigger(input);
|
|
118
147
|
} finally {
|
|
@@ -131,23 +160,30 @@ export class TaskManager {
|
|
|
131
160
|
for (const entry of this.constraintQueue) {
|
|
132
161
|
const applicableGroups: Array<{ group: TaskConstraintGroup<any>; key: string }> = [];
|
|
133
162
|
for (const group of this.constraintGroups) {
|
|
134
|
-
const key = group.getConstraintKey(entry.task);
|
|
163
|
+
const key = group.getConstraintKey(entry.task, entry.input);
|
|
135
164
|
if (key !== null) {
|
|
136
165
|
applicableGroups.push({ group, key });
|
|
137
166
|
}
|
|
138
167
|
}
|
|
139
168
|
|
|
140
|
-
// No constraints apply anymore (group removed?) → run
|
|
169
|
+
// No constraints apply anymore (group removed?) → check shouldExecute then run
|
|
141
170
|
if (applicableGroups.length === 0) {
|
|
142
|
-
entry.task
|
|
143
|
-
(
|
|
144
|
-
|
|
145
|
-
|
|
171
|
+
this.checkAllShouldExecute(entry.task, entry.input).then((shouldRun) => {
|
|
172
|
+
if (!shouldRun) {
|
|
173
|
+
entry.deferred.resolve(undefined);
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
entry.task.trigger(entry.input).then(
|
|
177
|
+
(result) => entry.deferred.resolve(result),
|
|
178
|
+
(err) => entry.deferred.reject(err),
|
|
179
|
+
);
|
|
180
|
+
});
|
|
146
181
|
continue;
|
|
147
182
|
}
|
|
148
183
|
|
|
149
184
|
const allCanRun = applicableGroups.every(({ group, key }) => group.canRun(key));
|
|
150
185
|
if (allCanRun) {
|
|
186
|
+
// executeWithConstraintTracking handles shouldExecute check internally
|
|
151
187
|
this.executeWithConstraintTracking(entry.task, entry.input, applicableGroups).then(
|
|
152
188
|
(result) => entry.deferred.resolve(result),
|
|
153
189
|
(err) => entry.deferred.reject(err),
|
|
@@ -3,15 +3,22 @@ import type { Task } from './taskbuffer.classes.task.js';
|
|
|
3
3
|
|
|
4
4
|
export interface ITaskConstraintGroupOptions<TData extends Record<string, unknown> = Record<string, unknown>> {
|
|
5
5
|
name: string;
|
|
6
|
-
|
|
6
|
+
constraintKeyForExecution: (task: Task<any, any, TData>, input?: any) => string | null | undefined;
|
|
7
7
|
maxConcurrent?: number; // default: Infinity
|
|
8
8
|
cooldownMs?: number; // default: 0
|
|
9
|
+
shouldExecute?: (task: Task<any, any, TData>, input?: any) => boolean | Promise<boolean>;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export interface ITaskExecution<TData extends Record<string, unknown> = Record<string, unknown>> {
|
|
13
|
+
task: Task<any, any, TData>;
|
|
14
|
+
input: any;
|
|
9
15
|
}
|
|
10
16
|
|
|
11
17
|
export interface IConstrainedTaskEntry {
|
|
12
18
|
task: Task<any, any, any>;
|
|
13
19
|
input: any;
|
|
14
20
|
deferred: import('@push.rocks/smartpromise').Deferred<any>;
|
|
21
|
+
constraintKeys: Map<string, string>; // groupName -> key
|
|
15
22
|
}
|
|
16
23
|
|
|
17
24
|
export interface ITaskMetadata {
|
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/taskbuffer',
|
|
6
|
-
version: '
|
|
6
|
+
version: '6.0.0',
|
|
7
7
|
description: 'A flexible task management library supporting TypeScript, allowing for task buffering, scheduling, and execution with dependency management.'
|
|
8
8
|
}
|