@5minds/processcube_engine_client 5.1.0-beta.1 → 5.1.0-beta.3
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/ExternalTaskExecution.d.ts +28 -0
- package/dist/ExternalTaskWorker.d.ts +0 -4
- package/dist/Types/IExternalTaskWorker.d.ts +1 -1
- package/dist/commonjs/ExternalTaskExecution.js +121 -0
- package/dist/commonjs/ExternalTaskExecution.js.map +1 -0
- package/dist/commonjs/ExternalTaskWorker.js +13 -57
- package/dist/commonjs/ExternalTaskWorker.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { ExternalTask } from '@5minds/processcube_engine_sdk';
|
|
2
|
+
import { ExternalTaskApiClient } from './Clients';
|
|
3
|
+
import { HandleExternalTaskAction, IExternalTaskWorkerConfig, WorkerErrorHandler } from './Types';
|
|
4
|
+
export declare class ExternalTaskExecution<TExternalTaskPayload, TResultPayload extends object> {
|
|
5
|
+
private externalTask;
|
|
6
|
+
private processingFunction;
|
|
7
|
+
private externalTaskClient;
|
|
8
|
+
private config;
|
|
9
|
+
private topic;
|
|
10
|
+
private abortSignal;
|
|
11
|
+
private customErrorHandler?;
|
|
12
|
+
private interval;
|
|
13
|
+
private abortSignalSubscription;
|
|
14
|
+
private awaitAbortSignal;
|
|
15
|
+
private abortSignalResolver;
|
|
16
|
+
private logger;
|
|
17
|
+
constructor(externalTask: ExternalTask<TExternalTaskPayload>, processingFunction: HandleExternalTaskAction<TExternalTaskPayload, TResultPayload>, externalTaskClient: ExternalTaskApiClient, config: IExternalTaskWorkerConfig, topic: string, abortSignal: AbortSignal, customErrorHandler?: WorkerErrorHandler);
|
|
18
|
+
execute(): Promise<void>;
|
|
19
|
+
private processResult;
|
|
20
|
+
private handleExternalTaskExecutionError;
|
|
21
|
+
private dispose;
|
|
22
|
+
private stopLockingInterval;
|
|
23
|
+
private startAbortSignalSubscription;
|
|
24
|
+
private removeAbortSignalSubscription;
|
|
25
|
+
private startExtendLockInterval;
|
|
26
|
+
private extendLocks;
|
|
27
|
+
private handleError;
|
|
28
|
+
}
|
|
@@ -26,9 +26,5 @@ export declare class ExternalTaskWorker<TExternalTaskPayload, TResultPayload ext
|
|
|
26
26
|
private processExternalTasks;
|
|
27
27
|
private fetchAndLockExternalTasks;
|
|
28
28
|
private startExecutingExternalTask;
|
|
29
|
-
private executeExternalTask;
|
|
30
|
-
private extendLocks;
|
|
31
|
-
private processResult;
|
|
32
|
-
private handleExternalTaskExecutionError;
|
|
33
29
|
private sleep;
|
|
34
30
|
}
|
|
@@ -2,7 +2,7 @@ import { ExternalTask, Identity } from '@5minds/processcube_engine_sdk';
|
|
|
2
2
|
/**
|
|
3
3
|
* Definition of the HandleExternalTask Callback.
|
|
4
4
|
*/
|
|
5
|
-
export type HandleExternalTaskAction<TPayload, TResult extends object> = (payload: TPayload, externalTask?: ExternalTask<TPayload
|
|
5
|
+
export type HandleExternalTaskAction<TPayload, TResult extends object> = (payload: TPayload, externalTask?: ExternalTask<TPayload>, signal?: AbortSignal) => TResult | Promise<TResult>;
|
|
6
6
|
export type WorkerErrorHandler = (errorType: 'fetchAndLock' | 'extendLock' | 'processExternalTask' | 'finishExternalTask' | 'unprocessableExternalTask', error: Error, externalTask?: ExternalTask<any>) => void;
|
|
7
7
|
export type IExternalTaskWorkerConfig = {
|
|
8
8
|
workerId?: string;
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ExternalTaskExecution = void 0;
|
|
4
|
+
const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
5
|
+
class ExternalTaskExecution {
|
|
6
|
+
externalTask;
|
|
7
|
+
processingFunction;
|
|
8
|
+
externalTaskClient;
|
|
9
|
+
config;
|
|
10
|
+
topic;
|
|
11
|
+
abortSignal;
|
|
12
|
+
customErrorHandler;
|
|
13
|
+
interval;
|
|
14
|
+
abortSignalSubscription;
|
|
15
|
+
awaitAbortSignal;
|
|
16
|
+
abortSignalResolver;
|
|
17
|
+
logger;
|
|
18
|
+
constructor(externalTask, processingFunction, externalTaskClient, config, topic, abortSignal, customErrorHandler) {
|
|
19
|
+
this.externalTask = externalTask;
|
|
20
|
+
this.processingFunction = processingFunction;
|
|
21
|
+
this.externalTaskClient = externalTaskClient;
|
|
22
|
+
this.config = config;
|
|
23
|
+
this.topic = topic;
|
|
24
|
+
this.abortSignal = abortSignal;
|
|
25
|
+
this.customErrorHandler = customErrorHandler;
|
|
26
|
+
this.logger = new processcube_engine_sdk_1.Logger('external_task_execution', {
|
|
27
|
+
workerId: config.workerId,
|
|
28
|
+
externalTaskId: externalTask.id,
|
|
29
|
+
topic: topic,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
async execute() {
|
|
33
|
+
try {
|
|
34
|
+
this.abortSignal.throwIfAborted();
|
|
35
|
+
this.startAbortSignalSubscription();
|
|
36
|
+
this.startExtendLockInterval();
|
|
37
|
+
const result = await Promise.race([this.processingFunction(this.externalTask.payload, this.externalTask, this.abortSignal), this.awaitAbortSignal]);
|
|
38
|
+
this.abortSignal.throwIfAborted();
|
|
39
|
+
this.stopLockingInterval();
|
|
40
|
+
if (result) {
|
|
41
|
+
await this.processResult(result);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
this.handleError('processExternalTask', error);
|
|
46
|
+
await this.handleExternalTaskExecutionError(error);
|
|
47
|
+
}
|
|
48
|
+
finally {
|
|
49
|
+
this.dispose();
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
async processResult(result) {
|
|
53
|
+
try {
|
|
54
|
+
if (result instanceof processcube_engine_sdk_1.ExternalTaskError || result instanceof Error) {
|
|
55
|
+
return await this.handleExternalTaskExecutionError(result);
|
|
56
|
+
}
|
|
57
|
+
return await this.externalTaskClient.finishExternalTask(this.config.workerId, this.externalTask.id, result, this.config.identity, this.abortSignal);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
this.handleError('finishExternalTask', error);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
async handleExternalTaskExecutionError(error) {
|
|
64
|
+
if (this.abortSignal.aborted) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
this.logger.error(`Error raised for external task '${this.externalTask.id}' with topic '${this.topic}': `, { err: error });
|
|
68
|
+
const workerError = new processcube_engine_sdk_1.ExternalTaskError(error?.errorCode || error?.name || 'ExternalTaskExecutionError', error?.errorMessage || error?.message || 'An error occurred while processing the external task.', error?.errorDetails || error?.stack || 'No error details available.');
|
|
69
|
+
return await this.externalTaskClient.handleError(this.config.workerId, this.externalTask.id, workerError, this.config.identity);
|
|
70
|
+
}
|
|
71
|
+
async dispose() {
|
|
72
|
+
this.removeAbortSignalSubscription();
|
|
73
|
+
this.stopLockingInterval();
|
|
74
|
+
}
|
|
75
|
+
stopLockingInterval() {
|
|
76
|
+
if (this.interval) {
|
|
77
|
+
clearInterval(this.interval);
|
|
78
|
+
this.interval = undefined;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
startAbortSignalSubscription() {
|
|
82
|
+
this.awaitAbortSignal = new Promise((resolve) => (this.abortSignalResolver = resolve));
|
|
83
|
+
this.abortSignalSubscription = () => {
|
|
84
|
+
if (this.abortSignalResolver) {
|
|
85
|
+
this.abortSignalResolver();
|
|
86
|
+
}
|
|
87
|
+
this.dispose();
|
|
88
|
+
};
|
|
89
|
+
this.abortSignal.addEventListener('abort', this.abortSignalSubscription);
|
|
90
|
+
}
|
|
91
|
+
removeAbortSignalSubscription() {
|
|
92
|
+
if (this.abortSignalSubscription) {
|
|
93
|
+
this.abortSignal.removeEventListener('abort', this.abortSignalSubscription);
|
|
94
|
+
}
|
|
95
|
+
if (this.abortSignalResolver) {
|
|
96
|
+
this.abortSignalResolver();
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
startExtendLockInterval() {
|
|
100
|
+
const lockExtensionBuffer = 5000;
|
|
101
|
+
this.interval = setInterval(async () => this.extendLocks(this.externalTask), this.config.lockDuration - lockExtensionBuffer);
|
|
102
|
+
}
|
|
103
|
+
async extendLocks(externalTask) {
|
|
104
|
+
try {
|
|
105
|
+
await this.externalTaskClient.extendLock(this.config.workerId, externalTask.id, this.config.lockDuration, this.config.identity, this.abortSignal);
|
|
106
|
+
}
|
|
107
|
+
catch (error) {
|
|
108
|
+
this.handleError('extendLock', error);
|
|
109
|
+
// This can happen, if the lock-extension was performed after the task was already finished.
|
|
110
|
+
// Since this isn't really an error, a warning suffices here.
|
|
111
|
+
this.logger.warn(`An error occured while trying to extend the lock for ExternalTask ${externalTask.id}`, { err: error });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
handleError(errorType, error) {
|
|
115
|
+
if (typeof this.customErrorHandler === 'function') {
|
|
116
|
+
this.customErrorHandler(errorType, error, this.externalTask);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
exports.ExternalTaskExecution = ExternalTaskExecution;
|
|
121
|
+
//# sourceMappingURL=ExternalTaskExecution.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ExternalTaskExecution.js","sourceRoot":"","sources":["../../src/ExternalTaskExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ exports.ExternalTaskWorker = void 0;
|
|
|
27
27
|
const uuid = __importStar(require("uuid"));
|
|
28
28
|
const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
29
29
|
const ExternalTaskApiHttpClient_1 = require("./Clients/ExternalTaskApiHttpClient");
|
|
30
|
+
const ExternalTaskExecution_1 = require("./ExternalTaskExecution");
|
|
30
31
|
const logger = new processcube_engine_sdk_1.Logger('external_task_worker');
|
|
31
32
|
const dummyIdentity = {
|
|
32
33
|
token: 'ZHVtbXlfdG9rZW4=',
|
|
@@ -80,7 +81,9 @@ class ExternalTaskWorker {
|
|
|
80
81
|
}
|
|
81
82
|
stop() {
|
|
82
83
|
this._pollingActive = false;
|
|
83
|
-
this.abortController
|
|
84
|
+
if (this.abortController && this.abortSignal.aborted === false) {
|
|
85
|
+
this.abortController?.abort();
|
|
86
|
+
}
|
|
84
87
|
}
|
|
85
88
|
dispose() {
|
|
86
89
|
this.externalTaskClient.dispose();
|
|
@@ -120,7 +123,15 @@ class ExternalTaskWorker {
|
|
|
120
123
|
}
|
|
121
124
|
async startExecutingExternalTask(externalTask) {
|
|
122
125
|
try {
|
|
123
|
-
|
|
126
|
+
const externalTaskExecution = new ExternalTaskExecution_1.ExternalTaskExecution(externalTask, this.processingFunction, this.externalTaskClient, {
|
|
127
|
+
identity: this.identity,
|
|
128
|
+
lockDuration: this.lockDuration,
|
|
129
|
+
longpollingTimeout: this.longpollingTimeout,
|
|
130
|
+
maxTasks: this.maxTasks,
|
|
131
|
+
payloadFilter: this.payloadFilter,
|
|
132
|
+
workerId: this.workerId,
|
|
133
|
+
}, this.topic, this.abortSignal, this.customErrorHandler);
|
|
134
|
+
await externalTaskExecution.execute();
|
|
124
135
|
}
|
|
125
136
|
catch (error) {
|
|
126
137
|
if (typeof this.customErrorHandler === 'function') {
|
|
@@ -129,58 +140,6 @@ class ExternalTaskWorker {
|
|
|
129
140
|
logger.warn(`External Task ${externalTask.id} could not be processed.`, { err: error });
|
|
130
141
|
}
|
|
131
142
|
}
|
|
132
|
-
async executeExternalTask(externalTask) {
|
|
133
|
-
let interval;
|
|
134
|
-
try {
|
|
135
|
-
const lockExtensionBuffer = 5000;
|
|
136
|
-
interval = setInterval(async () => this.extendLocks(externalTask), this.lockDuration - lockExtensionBuffer);
|
|
137
|
-
const result = await this.processingFunction(externalTask.payload, externalTask);
|
|
138
|
-
clearInterval(interval);
|
|
139
|
-
await this.processResult(result, externalTask);
|
|
140
|
-
}
|
|
141
|
-
catch (error) {
|
|
142
|
-
if (typeof this.customErrorHandler === 'function') {
|
|
143
|
-
this.customErrorHandler('processExternalTask', error, externalTask);
|
|
144
|
-
}
|
|
145
|
-
await this.handleExternalTaskExecutionError(error, externalTask?.id);
|
|
146
|
-
}
|
|
147
|
-
finally {
|
|
148
|
-
if (interval) {
|
|
149
|
-
clearInterval(interval);
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
async extendLocks(externalTask) {
|
|
154
|
-
try {
|
|
155
|
-
await this.externalTaskClient.extendLock(this.workerId, externalTask.id, this.lockDuration, this.identity, this.abortSignal);
|
|
156
|
-
}
|
|
157
|
-
catch (error) {
|
|
158
|
-
if (typeof this.customErrorHandler === 'function') {
|
|
159
|
-
this.customErrorHandler('extendLock', error, externalTask);
|
|
160
|
-
}
|
|
161
|
-
// This can happen, if the lock-extension was performed after the task was already finished.
|
|
162
|
-
// Since this isn't really an error, a warning suffices here.
|
|
163
|
-
logger.warn(`An error occured while trying to extend the lock for ExternalTask ${externalTask.id}`, { err: error });
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
async processResult(result, externalTask) {
|
|
167
|
-
try {
|
|
168
|
-
if (result instanceof processcube_engine_sdk_1.ExternalTaskError || result instanceof Error) {
|
|
169
|
-
return this.handleExternalTaskExecutionError(result, externalTask.id);
|
|
170
|
-
}
|
|
171
|
-
return this.externalTaskClient.finishExternalTask(this.workerId, externalTask.id, result, this.identity, this.abortSignal);
|
|
172
|
-
}
|
|
173
|
-
catch (error) {
|
|
174
|
-
if (typeof this.customErrorHandler === 'function') {
|
|
175
|
-
this.customErrorHandler('finishExternalTask', error, externalTask);
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
async handleExternalTaskExecutionError(error, externalTaskId) {
|
|
180
|
-
logger.error(`Error raised for external task '${externalTaskId}' with topic '${this.topic}': `, error);
|
|
181
|
-
const workerError = new processcube_engine_sdk_1.ExternalTaskError(error?.errorCode || error?.name || 'ExternalTaskExecutionError', error?.errorMessage || error?.message || 'An error occurred while processing the external task.', error?.errorDetails || error?.stack || 'No error details available.');
|
|
182
|
-
return this.externalTaskClient.handleError(this.workerId, externalTaskId, workerError, this.identity);
|
|
183
|
-
}
|
|
184
143
|
async sleep(milliseconds) {
|
|
185
144
|
return new Promise((resolve) => {
|
|
186
145
|
setTimeout(() => {
|
|
@@ -190,7 +149,4 @@ class ExternalTaskWorker {
|
|
|
190
149
|
}
|
|
191
150
|
}
|
|
192
151
|
exports.ExternalTaskWorker = ExternalTaskWorker;
|
|
193
|
-
function isExternalTaskError(error) {
|
|
194
|
-
return error.errorCode !== undefined || error.errorMessage !== undefined || error.errorDetails !== undefined || error instanceof processcube_engine_sdk_1.ExternalTaskError;
|
|
195
|
-
}
|
|
196
152
|
//# sourceMappingURL=ExternalTaskWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"utf-8-validate": "Not used by the client directly, but a requirement of the 'ws' sub-dependency. Since it is not available in the browser, the client would be unusable for the APP SDK, if we did not install it explicitly here"
|
|
5
5
|
},
|
|
6
6
|
"name": "@5minds/processcube_engine_client",
|
|
7
|
-
"version": "5.1.0-beta.
|
|
7
|
+
"version": "5.1.0-beta.3",
|
|
8
8
|
"description": "Contains a typescript based client for accessing the Engine.",
|
|
9
9
|
"main": "dist/commonjs/index.js",
|
|
10
10
|
"types": "dist/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"test": ":"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@5minds/processcube_engine_sdk": "6.0.0-beta.
|
|
39
|
+
"@5minds/processcube_engine_sdk": "6.0.0-beta.2",
|
|
40
40
|
"bufferutil": "4.0.8",
|
|
41
41
|
"cross-fetch": "4.0.0",
|
|
42
42
|
"socket.io-client": "4.7.5",
|