@decaf-ts/core 0.8.16 → 0.8.17
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/README.md +1 -1
- package/dist/core.cjs +1 -1
- package/dist/core.cjs.map +1 -1
- package/dist/core.js +1 -1
- package/dist/core.js.map +1 -1
- package/lib/esm/index.d.ts +1 -1
- package/lib/esm/index.js +1 -1
- package/lib/esm/persistence/ObserverHandler.js +2 -2
- package/lib/esm/persistence/ObserverHandler.js.map +1 -1
- package/lib/esm/tasks/TaskTracker.d.ts +6 -3
- package/lib/esm/tasks/TaskTracker.js +79 -14
- package/lib/esm/tasks/TaskTracker.js.map +1 -1
- package/lib/esm/tasks/builder.d.ts +0 -2
- package/lib/esm/tasks/builder.js +0 -10
- package/lib/esm/tasks/builder.js.map +1 -1
- package/lib/esm/tasks/models/TaskModel.js +2 -0
- package/lib/esm/tasks/models/TaskModel.js.map +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/persistence/ObserverHandler.cjs +2 -2
- package/lib/persistence/ObserverHandler.js.map +1 -1
- package/lib/tasks/TaskTracker.cjs +79 -14
- package/lib/tasks/TaskTracker.d.ts +6 -3
- package/lib/tasks/TaskTracker.js.map +1 -1
- package/lib/tasks/builder.cjs +0 -10
- package/lib/tasks/builder.d.ts +0 -2
- package/lib/tasks/builder.js.map +1 -1
- package/lib/tasks/models/TaskModel.cjs +2 -0
- package/lib/tasks/models/TaskModel.js.map +1 -1
- package/package.json +1 -1
package/lib/esm/index.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export * from "./persistence";
|
|
|
21
21
|
* @const VERSION
|
|
22
22
|
* @memberOf module:core
|
|
23
23
|
*/
|
|
24
|
-
export declare const VERSION = "0.8.
|
|
24
|
+
export declare const VERSION = "0.8.16";
|
|
25
25
|
/**
|
|
26
26
|
* @description Stores the current package version
|
|
27
27
|
* @summary A constant representing the version of the core package
|
package/lib/esm/index.js
CHANGED
|
@@ -31,7 +31,7 @@ export * from "./persistence/index.js";
|
|
|
31
31
|
* @const VERSION
|
|
32
32
|
* @memberOf module:core
|
|
33
33
|
*/
|
|
34
|
-
export const VERSION = "0.8.
|
|
34
|
+
export const VERSION = "0.8.16";
|
|
35
35
|
/**
|
|
36
36
|
* @description Stores the current package version
|
|
37
37
|
* @summary A constant representing the version of the core package
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InternalError, } from "@decaf-ts/db-decorators";
|
|
2
|
-
import {
|
|
2
|
+
import { ContextualLoggedClass, } from "./../utils/ContextualLoggedClass.js";
|
|
3
3
|
/**
|
|
4
4
|
* @description Manages a collection of observers for database events
|
|
5
5
|
* @summary The ObserverHandler class implements the Observable interface and provides a centralized
|
|
@@ -115,7 +115,7 @@ export class ObserverHandler {
|
|
|
115
115
|
* ObserverHandler-->>Client: Return
|
|
116
116
|
*/
|
|
117
117
|
async updateObservers(model, event, id, ...args) {
|
|
118
|
-
const { log, ctxArgs } =
|
|
118
|
+
const { log, ctxArgs } = ContextualLoggedClass.logCtx(this.updateObservers, undefined, false, ...args);
|
|
119
119
|
const results = await Promise.allSettled(this.observers
|
|
120
120
|
.filter((o) => {
|
|
121
121
|
const { filter } = o;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,aAAa,GAEd,MAAM,yBAAyB,CAAC;AAGjC,OAAO,
|
|
1
|
+
{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,23 +11,26 @@ export declare class TaskTracker<O = any> implements Observer<[TaskEventModel, C
|
|
|
11
11
|
protected bus: TaskEventBus;
|
|
12
12
|
private readonly task;
|
|
13
13
|
protected unregistration: () => void;
|
|
14
|
-
private resolveResult;
|
|
15
|
-
private rejectResult;
|
|
16
14
|
protected pipes?: Record<TaskEventType, Set<EventPipe>>;
|
|
17
15
|
private resolved;
|
|
18
|
-
private readonly promise;
|
|
19
16
|
private terminalContext?;
|
|
17
|
+
private lastTerminalPayload?;
|
|
20
18
|
constructor(bus: TaskEventBus, task: TaskModel);
|
|
21
19
|
resolve(): Promise<O>;
|
|
20
|
+
wait(): Promise<O>;
|
|
22
21
|
attach(log: Logger, opts?: LogPipeOptions): void;
|
|
23
22
|
logs(pipe: LogPipe): void;
|
|
24
23
|
protected pipe(pipe: EventPipe, type?: TaskEventType): void;
|
|
25
24
|
protected succeed(result: O): void;
|
|
26
25
|
protected fail(error: TaskErrorModel): void;
|
|
27
26
|
protected cancel(evt: TaskEventModel): void;
|
|
27
|
+
protected retry(evt: TaskEventModel): void;
|
|
28
28
|
onSucceed(handler: EventPipe): () => void;
|
|
29
29
|
onFailure(handler: EventPipe): () => void;
|
|
30
30
|
onCancel(handler: EventPipe): () => void;
|
|
31
|
+
private awaitStatusTerminal;
|
|
32
|
+
private extractOutput;
|
|
33
|
+
private extractError;
|
|
31
34
|
private complete;
|
|
32
35
|
protected isTerminalStatus(status: TaskStatus): boolean;
|
|
33
36
|
protected track(evt: TaskEventModel, ctx: Context): Promise<void>;
|
|
@@ -3,6 +3,7 @@ import { Model } from "@decaf-ts/decorator-validation";
|
|
|
3
3
|
import { TaskEventType, TaskStatus } from "./constants.js";
|
|
4
4
|
import { getLogPipe } from "./logging.js";
|
|
5
5
|
import { Context } from "./../persistence/index.js";
|
|
6
|
+
import { TaskErrorModel } from "./models/TaskErrorModel.js";
|
|
6
7
|
export class TaskTracker {
|
|
7
8
|
constructor(bus, task) {
|
|
8
9
|
this.bus = bus;
|
|
@@ -15,17 +16,23 @@ export class TaskTracker {
|
|
|
15
16
|
(table === TaskEventModel ||
|
|
16
17
|
table === Model.tableName(TaskEventModel)));
|
|
17
18
|
});
|
|
18
|
-
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
19
|
-
const self = this;
|
|
20
|
-
this.promise = new Promise((resolve, reject) => {
|
|
21
|
-
self.resolveResult = resolve;
|
|
22
|
-
self.rejectResult = reject;
|
|
23
|
-
});
|
|
24
19
|
this.pipe(this.track.bind(this));
|
|
25
20
|
this.resolveTerminalState();
|
|
26
21
|
}
|
|
27
22
|
resolve() {
|
|
28
|
-
return this.
|
|
23
|
+
return this.awaitStatusTerminal([
|
|
24
|
+
TaskStatus.SUCCEEDED,
|
|
25
|
+
TaskStatus.FAILED,
|
|
26
|
+
TaskStatus.CANCELED,
|
|
27
|
+
TaskStatus.WAITING_RETRY,
|
|
28
|
+
]);
|
|
29
|
+
}
|
|
30
|
+
wait() {
|
|
31
|
+
return this.awaitStatusTerminal([
|
|
32
|
+
TaskStatus.SUCCEEDED,
|
|
33
|
+
TaskStatus.FAILED,
|
|
34
|
+
TaskStatus.CANCELED,
|
|
35
|
+
]);
|
|
29
36
|
}
|
|
30
37
|
attach(log, opts = { logProgress: true, logStatus: true, style: true }) {
|
|
31
38
|
this.pipe(getLogPipe(log, opts));
|
|
@@ -44,16 +51,22 @@ export class TaskTracker {
|
|
|
44
51
|
this.pipes[type].add(pipe);
|
|
45
52
|
}
|
|
46
53
|
succeed(result) {
|
|
47
|
-
this.complete(result
|
|
54
|
+
this.complete(result);
|
|
48
55
|
}
|
|
49
56
|
fail(error) {
|
|
50
|
-
this.complete(error
|
|
57
|
+
this.complete(error);
|
|
51
58
|
}
|
|
52
59
|
cancel(evt) {
|
|
53
60
|
if (!evt.payload?.error)
|
|
54
61
|
return;
|
|
55
62
|
this.fail(evt.payload.error);
|
|
56
63
|
}
|
|
64
|
+
retry(evt) {
|
|
65
|
+
if (!evt.payload)
|
|
66
|
+
return;
|
|
67
|
+
if (evt.payload.error)
|
|
68
|
+
this.task.error = evt.payload.error;
|
|
69
|
+
}
|
|
57
70
|
onSucceed(handler) {
|
|
58
71
|
return this.registerStatusHandler(TaskStatus.SUCCEEDED, handler);
|
|
59
72
|
}
|
|
@@ -63,16 +76,65 @@ export class TaskTracker {
|
|
|
63
76
|
onCancel(handler) {
|
|
64
77
|
return this.registerStatusHandler(TaskStatus.CANCELED, handler);
|
|
65
78
|
}
|
|
66
|
-
|
|
79
|
+
awaitStatusTerminal(statuses) {
|
|
80
|
+
return new Promise((resolve, reject) => {
|
|
81
|
+
const removers = [];
|
|
82
|
+
let settled = false;
|
|
83
|
+
const cleanup = () => {
|
|
84
|
+
if (settled)
|
|
85
|
+
return;
|
|
86
|
+
settled = true;
|
|
87
|
+
for (const remove of removers) {
|
|
88
|
+
remove();
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
const handler = async (evt) => {
|
|
92
|
+
if (settled)
|
|
93
|
+
return;
|
|
94
|
+
cleanup();
|
|
95
|
+
try {
|
|
96
|
+
if (evt.payload?.status === TaskStatus.SUCCEEDED) {
|
|
97
|
+
resolve(this.extractOutput(evt));
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
reject(this.extractError(evt));
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
catch (err) {
|
|
104
|
+
reject(err);
|
|
105
|
+
}
|
|
106
|
+
};
|
|
107
|
+
statuses.forEach((status) => {
|
|
108
|
+
const remove = this.registerStatusHandler(status, handler);
|
|
109
|
+
removers.push(remove);
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
extractOutput(evt) {
|
|
114
|
+
if (evt.payload?.output !== undefined)
|
|
115
|
+
return evt.payload.output;
|
|
116
|
+
return this.task.output;
|
|
117
|
+
}
|
|
118
|
+
extractError(evt) {
|
|
119
|
+
if (evt.payload?.error)
|
|
120
|
+
return evt.payload.error;
|
|
121
|
+
if (this.task.error)
|
|
122
|
+
return this.task.error;
|
|
123
|
+
if (this.lastTerminalPayload instanceof TaskErrorModel)
|
|
124
|
+
return this.lastTerminalPayload;
|
|
125
|
+
const status = evt.payload?.status ?? this.task.status;
|
|
126
|
+
const message = status === TaskStatus.WAITING_RETRY
|
|
127
|
+
? `Task ${this.task.id} scheduled for retry`
|
|
128
|
+
: `Task ${this.task.id} ${status}`;
|
|
129
|
+
return new TaskErrorModel({ message });
|
|
130
|
+
}
|
|
131
|
+
complete(payload) {
|
|
67
132
|
if (this.resolved)
|
|
68
133
|
return;
|
|
69
134
|
this.resolved = true;
|
|
70
135
|
this.unregistration();
|
|
71
136
|
this.pipes = undefined;
|
|
72
|
-
|
|
73
|
-
this.resolveResult(payload);
|
|
74
|
-
else
|
|
75
|
-
this.rejectResult(payload);
|
|
137
|
+
this.lastTerminalPayload = payload;
|
|
76
138
|
}
|
|
77
139
|
isTerminalStatus(status) {
|
|
78
140
|
return [
|
|
@@ -99,6 +161,9 @@ export class TaskTracker {
|
|
|
99
161
|
if (evt.payload.status === TaskStatus.CANCELED) {
|
|
100
162
|
this.cancel(evt);
|
|
101
163
|
}
|
|
164
|
+
if (evt.payload.status === TaskStatus.WAITING_RETRY) {
|
|
165
|
+
this.retry(evt);
|
|
166
|
+
}
|
|
102
167
|
}
|
|
103
168
|
registerStatusHandler(status, handler) {
|
|
104
169
|
const wrapped = async (evt, ctx) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../../src/tasks/TaskTracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,mCAAgC;AACzD,OAAO,EAAE,KAAK,EAAoB,MAAM,gCAAgC,CAAC;AAEzE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,uBAAoB;AAExD,OAAO,EAAE,UAAU,EAAE,qBAAkB;AAEvC,OAAO,EAAE,OAAO,EAAY,kCAA6B;
|
|
1
|
+
{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../../src/tasks/TaskTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,6 @@ export declare class TaskBuilder extends Model {
|
|
|
21
21
|
protected atomicity: TaskType;
|
|
22
22
|
protected backoff: TaskBackoffModel;
|
|
23
23
|
protected input?: any;
|
|
24
|
-
protected attempt: number;
|
|
25
24
|
protected maxAttempts: number;
|
|
26
25
|
setClassification(value: string): this;
|
|
27
26
|
setStatus(value: TaskStatus): this;
|
|
@@ -29,7 +28,6 @@ export declare class TaskBuilder extends Model {
|
|
|
29
28
|
setBackoff<V extends TaskBackoffModel>(value?: TaskBackoffModel): V extends TaskBackoffModel ? this : TaskBackoffBuilder<true>;
|
|
30
29
|
setInput(value: any): this;
|
|
31
30
|
setMaxAttempts(value: number): this;
|
|
32
|
-
setAttempt(value: number): this;
|
|
33
31
|
constructor(arg?: ModelArg<TaskBuilder>);
|
|
34
32
|
build(): TaskModel<any, any>;
|
|
35
33
|
}
|
package/lib/esm/tasks/builder.js
CHANGED
|
@@ -104,16 +104,11 @@ export class TaskBuilder extends Model {
|
|
|
104
104
|
this.maxAttempts = value;
|
|
105
105
|
return this;
|
|
106
106
|
}
|
|
107
|
-
setAttempt(value) {
|
|
108
|
-
this.attempt = value;
|
|
109
|
-
return this;
|
|
110
|
-
}
|
|
111
107
|
constructor(arg) {
|
|
112
108
|
super(arg);
|
|
113
109
|
this.status = TaskStatus.PENDING;
|
|
114
110
|
this.atomicity = TaskType.ATOMIC;
|
|
115
111
|
this.backoff = new TaskBackoffModel();
|
|
116
|
-
this.attempt = 0;
|
|
117
112
|
this.maxAttempts = 1;
|
|
118
113
|
Model.fromModel(this, arg);
|
|
119
114
|
}
|
|
@@ -144,11 +139,6 @@ __decorate([
|
|
|
144
139
|
prop(),
|
|
145
140
|
__metadata("design:type", Object)
|
|
146
141
|
], TaskBuilder.prototype, "input", void 0);
|
|
147
|
-
__decorate([
|
|
148
|
-
min(0),
|
|
149
|
-
required(),
|
|
150
|
-
__metadata("design:type", Number)
|
|
151
|
-
], TaskBuilder.prototype, "attempt", void 0);
|
|
152
142
|
__decorate([
|
|
153
143
|
min(1),
|
|
154
144
|
required(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/tasks/builder.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAC/C,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,QAAQ,GACT,uBAAoB;AACrB,OAAO,EAAE,gBAAgB,EAAE,0BAAuB;AAClD,OAAO,EAAE,iBAAiB,EAAE,sCAAmC;AAC/D,OAAO,EACL,EAAE,EACF,IAAI,EACJ,GAAG,EACH,KAAK,EAEL,MAAM,EACN,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,OAAO,kBAAmD,SAAQ,KAAK;IAe3E,YAAY,GAAkC;QAC5C,KAAK,CAAC,GAAG,CAAC,CAAC;QAbb,WAAM,GAAW,IAAI,CAAC;QAGtB,WAAM,GAAmB,cAAc,CAAC,IAAI,CAAC;QAI7C,UAAK,GAAW,MAAM,CAAC;QAGvB,aAAQ,GAAoB,eAAe,CAAC,WAAW,CAAC;QAItD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAqB;QAC7B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,KAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAQ,CAAC;IAC3C,CAAC;CACF;AA1CC;IAFC,QAAQ,EAAE;IACV,GAAG,CAAC,IAAI,CAAC;;kDACY;AAGtB;IAFC,QAAQ,EAAE;IACV,MAAM,CAAC,cAAc,CAAC;;kDACsB;AAI7C;IAHC,EAAE,CAAC,QAAQ,CAAC;IACZ,GAAG,CAAC,IAAI,CAAC;IACT,QAAQ,EAAE;;iDACY;AAGvB;IAFC,QAAQ,EAAE;IACV,MAAM,CAAC,eAAe,CAAC;;oDACgC;AAkC1D,MAAM,OAAO,WAAY,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../src/tasks/builder.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,8BAA2B;AAC/C,OAAO,EACL,eAAe,EACf,cAAc,EACd,UAAU,EACV,QAAQ,GACT,uBAAoB;AACrB,OAAO,EAAE,gBAAgB,EAAE,0BAAuB;AAClD,OAAO,EAAE,iBAAiB,EAAE,sCAAmC;AAC/D,OAAO,EACL,EAAE,EACF,IAAI,EACJ,GAAG,EACH,KAAK,EAEL,MAAM,EACN,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,MAAM,OAAO,kBAAmD,SAAQ,KAAK;IAe3E,YAAY,GAAkC;QAC5C,KAAK,CAAC,GAAG,CAAC,CAAC;QAbb,WAAM,GAAW,IAAI,CAAC;QAGtB,WAAM,GAAmB,cAAc,CAAC,IAAI,CAAC;QAI7C,UAAK,GAAW,MAAM,CAAC;QAGvB,aAAQ,GAAoB,eAAe,CAAC,WAAW,CAAC;QAItD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAqB;QAC7B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,WAAW,CAAC,KAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAQ,CAAC;IAC3C,CAAC;CACF;AA1CC;IAFC,QAAQ,EAAE;IACV,GAAG,CAAC,IAAI,CAAC;;kDACY;AAGtB;IAFC,QAAQ,EAAE;IACV,MAAM,CAAC,cAAc,CAAC;;kDACsB;AAI7C;IAHC,EAAE,CAAC,QAAQ,CAAC;IACZ,GAAG,CAAC,IAAI,CAAC;IACT,QAAQ,EAAE;;iDACY;AAGvB;IAFC,QAAQ,EAAE;IACV,MAAM,CAAC,eAAe,CAAC;;oDACgC;AAkC1D,MAAM,OAAO,WAAY,SAAQ,KAAK;IAepC,iBAAiB,CAAC,KAAa;QAC7B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,KAAiB;QACzB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,CAAC,KAAe;QAC1B,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,UAAU,CACR,KAAwB;QAExB,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,OAAO,IAAW,CAAC;QACrB,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACzC,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,OAAO,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE;YACvC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI;gBACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;gBACpD,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;QACH,OAAO,OAAc,CAAC;IACxB,CAAC;IAED,QAAQ,CAAC,KAAU;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,GAA2B;QACrC,KAAK,CAAC,GAAG,CAAC,CAAC;QAxDH,WAAM,GAAe,UAAU,CAAC,OAAO,CAAC;QAExC,cAAS,GAAa,QAAQ,CAAC,MAAM,CAAC;QAEtC,YAAO,GAAqB,IAAI,gBAAgB,EAAE,CAAC;QAKnD,gBAAW,GAAW,CAAC,CAAC;QAgDhC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAC9B,IAAI,IAAI;YAAE,MAAM,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAnEW;IADT,QAAQ,EAAE;;mDACuB;AAExB;IADT,QAAQ,EAAE;;2CACuC;AAExC;IADT,QAAQ,EAAE;;8CACqC;AAEtC;IADT,QAAQ,EAAE;8BACQ,gBAAgB;4CAA0B;AAEnD;IADT,IAAI,EAAE;;0CACe;AAGZ;IAFT,GAAG,CAAC,CAAC,CAAC;IACN,QAAQ,EAAE;;gDACuB;AA0DpC,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IAMnD,YAAY,GAAoC;QAC9C,KAAK,CAAC,GAAG,CAAC,CAAC;QAHH,gBAAW,GAAyB,EAAE,CAAC;QAI/C,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACtC,CAAC;IAED,QAAQ,CAAC,KAA0B;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,cAAsB,EAAE,KAAW;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,IAAI,iBAAiB,CAAC;YACpB,cAAc;YACd,KAAK;YACL,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;SACf,CAAC,CACH,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5BW;IADT,IAAI,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;;mDACQ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,IAAI,EACJ,GAAG,EACH,KAAK,EACL,KAAK,EAEL,MAAM,EACN,QAAQ,EACR,IAAI,GACL,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,EAAE,EAAE,uCAAkC;AAC/C,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,0BAAqB;AACpD,OAAO,EAAE,cAAc,EAAE,4BAAyB;AAClD,OAAO,EAAE,gBAAgB,EAAE,8BAA2B;AAGtD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EACL,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,GACV,oCAA+B;AAEhC,OAAO,EAAE,gBAAgB,EAAE,8BAA2B;AAK/C,IAAM,SAAS,GAAf,MAAM,SAAqC,SAAQ,KAAK;IAsH7D,YAAY,GAAyB;QACnC,KAAK,CAAC,GAAG,CAAC,CAAC;QAlHb,8BAA8B;QAK9B,cAAS,GAAa,QAAQ,CAAC,MAAM,CAAC,CAAC,qCAAqC;QAM5E,YAAY;QAKZ,WAAM,GAAe,UAAU,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskModel.js","sourceRoot":"","sources":["../../../../src/tasks/models/TaskModel.ts"],"names":[],"mappings":"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"}
|
package/lib/index.cjs
CHANGED
|
@@ -48,7 +48,7 @@ __exportStar(require("./persistence/index.cjs"), exports);
|
|
|
48
48
|
* @const VERSION
|
|
49
49
|
* @memberOf module:core
|
|
50
50
|
*/
|
|
51
|
-
exports.VERSION = "0.8.
|
|
51
|
+
exports.VERSION = "0.8.16";
|
|
52
52
|
/**
|
|
53
53
|
* @description Stores the current package version
|
|
54
54
|
* @summary A constant representing the version of the core package
|
package/lib/index.d.ts
CHANGED
|
@@ -21,7 +21,7 @@ export * from "./persistence";
|
|
|
21
21
|
* @const VERSION
|
|
22
22
|
* @memberOf module:core
|
|
23
23
|
*/
|
|
24
|
-
export declare const VERSION = "0.8.
|
|
24
|
+
export declare const VERSION = "0.8.16";
|
|
25
25
|
/**
|
|
26
26
|
* @description Stores the current package version
|
|
27
27
|
* @summary A constant representing the version of the core package
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ObserverHandler = void 0;
|
|
4
4
|
const db_decorators_1 = require("@decaf-ts/db-decorators");
|
|
5
|
-
const
|
|
5
|
+
const ContextualLoggedClass_1 = require("./../utils/ContextualLoggedClass.cjs");
|
|
6
6
|
/**
|
|
7
7
|
* @description Manages a collection of observers for database events
|
|
8
8
|
* @summary The ObserverHandler class implements the Observable interface and provides a centralized
|
|
@@ -118,7 +118,7 @@ class ObserverHandler {
|
|
|
118
118
|
* ObserverHandler-->>Client: Return
|
|
119
119
|
*/
|
|
120
120
|
async updateObservers(model, event, id, ...args) {
|
|
121
|
-
const { log, ctxArgs } =
|
|
121
|
+
const { log, ctxArgs } = ContextualLoggedClass_1.ContextualLoggedClass.logCtx(this.updateObservers, undefined, false, ...args);
|
|
122
122
|
const results = await Promise.allSettled(this.observers
|
|
123
123
|
.filter((o) => {
|
|
124
124
|
const { filter } = o;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":";;;AAEA,2DAIiC;AAGjC,
|
|
1
|
+
{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ const decorator_validation_1 = require("@decaf-ts/decorator-validation");
|
|
|
6
6
|
const constants_1 = require("./constants.cjs");
|
|
7
7
|
const logging_1 = require("./logging.cjs");
|
|
8
8
|
const index_1 = require("./../persistence/index.cjs");
|
|
9
|
+
const TaskErrorModel_1 = require("./models/TaskErrorModel.cjs");
|
|
9
10
|
class TaskTracker {
|
|
10
11
|
constructor(bus, task) {
|
|
11
12
|
this.bus = bus;
|
|
@@ -18,17 +19,23 @@ class TaskTracker {
|
|
|
18
19
|
(table === TaskEventModel_1.TaskEventModel ||
|
|
19
20
|
table === decorator_validation_1.Model.tableName(TaskEventModel_1.TaskEventModel)));
|
|
20
21
|
});
|
|
21
|
-
// eslint-disable-next-line @typescript-eslint/no-this-alias
|
|
22
|
-
const self = this;
|
|
23
|
-
this.promise = new Promise((resolve, reject) => {
|
|
24
|
-
self.resolveResult = resolve;
|
|
25
|
-
self.rejectResult = reject;
|
|
26
|
-
});
|
|
27
22
|
this.pipe(this.track.bind(this));
|
|
28
23
|
this.resolveTerminalState();
|
|
29
24
|
}
|
|
30
25
|
resolve() {
|
|
31
|
-
return this.
|
|
26
|
+
return this.awaitStatusTerminal([
|
|
27
|
+
constants_1.TaskStatus.SUCCEEDED,
|
|
28
|
+
constants_1.TaskStatus.FAILED,
|
|
29
|
+
constants_1.TaskStatus.CANCELED,
|
|
30
|
+
constants_1.TaskStatus.WAITING_RETRY,
|
|
31
|
+
]);
|
|
32
|
+
}
|
|
33
|
+
wait() {
|
|
34
|
+
return this.awaitStatusTerminal([
|
|
35
|
+
constants_1.TaskStatus.SUCCEEDED,
|
|
36
|
+
constants_1.TaskStatus.FAILED,
|
|
37
|
+
constants_1.TaskStatus.CANCELED,
|
|
38
|
+
]);
|
|
32
39
|
}
|
|
33
40
|
attach(log, opts = { logProgress: true, logStatus: true, style: true }) {
|
|
34
41
|
this.pipe((0, logging_1.getLogPipe)(log, opts));
|
|
@@ -47,16 +54,22 @@ class TaskTracker {
|
|
|
47
54
|
this.pipes[type].add(pipe);
|
|
48
55
|
}
|
|
49
56
|
succeed(result) {
|
|
50
|
-
this.complete(result
|
|
57
|
+
this.complete(result);
|
|
51
58
|
}
|
|
52
59
|
fail(error) {
|
|
53
|
-
this.complete(error
|
|
60
|
+
this.complete(error);
|
|
54
61
|
}
|
|
55
62
|
cancel(evt) {
|
|
56
63
|
if (!evt.payload?.error)
|
|
57
64
|
return;
|
|
58
65
|
this.fail(evt.payload.error);
|
|
59
66
|
}
|
|
67
|
+
retry(evt) {
|
|
68
|
+
if (!evt.payload)
|
|
69
|
+
return;
|
|
70
|
+
if (evt.payload.error)
|
|
71
|
+
this.task.error = evt.payload.error;
|
|
72
|
+
}
|
|
60
73
|
onSucceed(handler) {
|
|
61
74
|
return this.registerStatusHandler(constants_1.TaskStatus.SUCCEEDED, handler);
|
|
62
75
|
}
|
|
@@ -66,16 +79,65 @@ class TaskTracker {
|
|
|
66
79
|
onCancel(handler) {
|
|
67
80
|
return this.registerStatusHandler(constants_1.TaskStatus.CANCELED, handler);
|
|
68
81
|
}
|
|
69
|
-
|
|
82
|
+
awaitStatusTerminal(statuses) {
|
|
83
|
+
return new Promise((resolve, reject) => {
|
|
84
|
+
const removers = [];
|
|
85
|
+
let settled = false;
|
|
86
|
+
const cleanup = () => {
|
|
87
|
+
if (settled)
|
|
88
|
+
return;
|
|
89
|
+
settled = true;
|
|
90
|
+
for (const remove of removers) {
|
|
91
|
+
remove();
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
const handler = async (evt) => {
|
|
95
|
+
if (settled)
|
|
96
|
+
return;
|
|
97
|
+
cleanup();
|
|
98
|
+
try {
|
|
99
|
+
if (evt.payload?.status === constants_1.TaskStatus.SUCCEEDED) {
|
|
100
|
+
resolve(this.extractOutput(evt));
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
reject(this.extractError(evt));
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
reject(err);
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
statuses.forEach((status) => {
|
|
111
|
+
const remove = this.registerStatusHandler(status, handler);
|
|
112
|
+
removers.push(remove);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
}
|
|
116
|
+
extractOutput(evt) {
|
|
117
|
+
if (evt.payload?.output !== undefined)
|
|
118
|
+
return evt.payload.output;
|
|
119
|
+
return this.task.output;
|
|
120
|
+
}
|
|
121
|
+
extractError(evt) {
|
|
122
|
+
if (evt.payload?.error)
|
|
123
|
+
return evt.payload.error;
|
|
124
|
+
if (this.task.error)
|
|
125
|
+
return this.task.error;
|
|
126
|
+
if (this.lastTerminalPayload instanceof TaskErrorModel_1.TaskErrorModel)
|
|
127
|
+
return this.lastTerminalPayload;
|
|
128
|
+
const status = evt.payload?.status ?? this.task.status;
|
|
129
|
+
const message = status === constants_1.TaskStatus.WAITING_RETRY
|
|
130
|
+
? `Task ${this.task.id} scheduled for retry`
|
|
131
|
+
: `Task ${this.task.id} ${status}`;
|
|
132
|
+
return new TaskErrorModel_1.TaskErrorModel({ message });
|
|
133
|
+
}
|
|
134
|
+
complete(payload) {
|
|
70
135
|
if (this.resolved)
|
|
71
136
|
return;
|
|
72
137
|
this.resolved = true;
|
|
73
138
|
this.unregistration();
|
|
74
139
|
this.pipes = undefined;
|
|
75
|
-
|
|
76
|
-
this.resolveResult(payload);
|
|
77
|
-
else
|
|
78
|
-
this.rejectResult(payload);
|
|
140
|
+
this.lastTerminalPayload = payload;
|
|
79
141
|
}
|
|
80
142
|
isTerminalStatus(status) {
|
|
81
143
|
return [
|
|
@@ -102,6 +164,9 @@ class TaskTracker {
|
|
|
102
164
|
if (evt.payload.status === constants_1.TaskStatus.CANCELED) {
|
|
103
165
|
this.cancel(evt);
|
|
104
166
|
}
|
|
167
|
+
if (evt.payload.status === constants_1.TaskStatus.WAITING_RETRY) {
|
|
168
|
+
this.retry(evt);
|
|
169
|
+
}
|
|
105
170
|
}
|
|
106
171
|
registerStatusHandler(status, handler) {
|
|
107
172
|
const wrapped = async (evt, ctx) => {
|
|
@@ -11,23 +11,26 @@ export declare class TaskTracker<O = any> implements Observer<[TaskEventModel, C
|
|
|
11
11
|
protected bus: TaskEventBus;
|
|
12
12
|
private readonly task;
|
|
13
13
|
protected unregistration: () => void;
|
|
14
|
-
private resolveResult;
|
|
15
|
-
private rejectResult;
|
|
16
14
|
protected pipes?: Record<TaskEventType, Set<EventPipe>>;
|
|
17
15
|
private resolved;
|
|
18
|
-
private readonly promise;
|
|
19
16
|
private terminalContext?;
|
|
17
|
+
private lastTerminalPayload?;
|
|
20
18
|
constructor(bus: TaskEventBus, task: TaskModel);
|
|
21
19
|
resolve(): Promise<O>;
|
|
20
|
+
wait(): Promise<O>;
|
|
22
21
|
attach(log: Logger, opts?: LogPipeOptions): void;
|
|
23
22
|
logs(pipe: LogPipe): void;
|
|
24
23
|
protected pipe(pipe: EventPipe, type?: TaskEventType): void;
|
|
25
24
|
protected succeed(result: O): void;
|
|
26
25
|
protected fail(error: TaskErrorModel): void;
|
|
27
26
|
protected cancel(evt: TaskEventModel): void;
|
|
27
|
+
protected retry(evt: TaskEventModel): void;
|
|
28
28
|
onSucceed(handler: EventPipe): () => void;
|
|
29
29
|
onFailure(handler: EventPipe): () => void;
|
|
30
30
|
onCancel(handler: EventPipe): () => void;
|
|
31
|
+
private awaitStatusTerminal;
|
|
32
|
+
private extractOutput;
|
|
33
|
+
private extractError;
|
|
31
34
|
private complete;
|
|
32
35
|
protected isTerminalStatus(status: TaskStatus): boolean;
|
|
33
36
|
protected track(evt: TaskEventModel, ctx: Context): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../src/tasks/TaskTracker.ts"],"names":[],"mappings":";;;AACA,gEAAyD;AACzD,yEAAyE;AAEzE,+CAAwD;AAExD,2CAAuC;AAEvC,sDAAyD;
|
|
1
|
+
{"version":3,"file":"TaskTracker.js","sourceRoot":"","sources":["../../src/tasks/TaskTracker.ts"],"names":[],"mappings":"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"}
|
package/lib/tasks/builder.cjs
CHANGED
|
@@ -108,16 +108,11 @@ class TaskBuilder extends decorator_validation_1.Model {
|
|
|
108
108
|
this.maxAttempts = value;
|
|
109
109
|
return this;
|
|
110
110
|
}
|
|
111
|
-
setAttempt(value) {
|
|
112
|
-
this.attempt = value;
|
|
113
|
-
return this;
|
|
114
|
-
}
|
|
115
111
|
constructor(arg) {
|
|
116
112
|
super(arg);
|
|
117
113
|
this.status = constants_1.TaskStatus.PENDING;
|
|
118
114
|
this.atomicity = constants_1.TaskType.ATOMIC;
|
|
119
115
|
this.backoff = new index_1.TaskBackoffModel();
|
|
120
|
-
this.attempt = 0;
|
|
121
116
|
this.maxAttempts = 1;
|
|
122
117
|
decorator_validation_1.Model.fromModel(this, arg);
|
|
123
118
|
}
|
|
@@ -149,11 +144,6 @@ __decorate([
|
|
|
149
144
|
(0, decoration_1.prop)(),
|
|
150
145
|
__metadata("design:type", Object)
|
|
151
146
|
], TaskBuilder.prototype, "input", void 0);
|
|
152
|
-
__decorate([
|
|
153
|
-
(0, decorator_validation_1.min)(0),
|
|
154
|
-
(0, decorator_validation_1.required)(),
|
|
155
|
-
__metadata("design:type", Number)
|
|
156
|
-
], TaskBuilder.prototype, "attempt", void 0);
|
|
157
147
|
__decorate([
|
|
158
148
|
(0, decorator_validation_1.min)(1),
|
|
159
149
|
(0, decorator_validation_1.required)(),
|