@5minds/processcube_engine_client 5.1.0-alpha.1 → 5.1.0-alpha.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/Clients/ExternalTaskApiHttpClient.d.ts +4 -4
- package/dist/ExternalTaskWorker.d.ts +3 -0
- package/dist/HttpClient.d.ts +2 -2
- package/dist/Types/IExternalTaskWorker.d.ts +1 -1
- package/dist/commonjs/Clients/ExternalTaskApiHttpClient.js +8 -8
- package/dist/commonjs/Clients/ExternalTaskApiHttpClient.js.map +1 -1
- package/dist/commonjs/Clients/Lib/Mappers.js +9 -10
- package/dist/commonjs/Clients/Lib/Mappers.js.map +1 -1
- package/dist/commonjs/ExternalTaskWorker.js +31 -8
- package/dist/commonjs/ExternalTaskWorker.js.map +1 -1
- package/dist/commonjs/HttpClient.js +4 -2
- package/dist/commonjs/HttpClient.js.map +1 -1
- package/package.json +3 -3
|
@@ -3,9 +3,9 @@ import { BaseClient } from './BaseClient';
|
|
|
3
3
|
type ExternalTask<TPayload> = DataModels.ExternalTasks.ExternalTask<TPayload>;
|
|
4
4
|
export declare class ExternalTaskApiClient extends BaseClient implements IExternalTaskExtensionAdapter {
|
|
5
5
|
getAllDeployedTopics(identity?: Identity): Promise<Array<string>>;
|
|
6
|
-
fetchAndLockExternalTasks<TPayload>(workerId: string, topicNames: string | Array<string>, maxTasks: number, longPollingTimeout: number, lockDuration: number, payloadFilter?: RegExp, identity?: Identity): Promise<Array<ExternalTask<TPayload>>>;
|
|
7
|
-
extendLock(workerId: string, externalTaskId: string, additionalDuration: number, identity?: Identity): Promise<void>;
|
|
8
|
-
handleError(workerId: string, externalTaskId: string, error: DataModels.ExternalTasks.ExternalTaskError, identity?: Identity): Promise<void>;
|
|
9
|
-
finishExternalTask<TResultType>(workerId: string, externalTaskId: string, result: TResultType, identity?: Identity): Promise<void>;
|
|
6
|
+
fetchAndLockExternalTasks<TPayload>(workerId: string, topicNames: string | Array<string>, maxTasks: number, longPollingTimeout: number, lockDuration: number, payloadFilter?: RegExp, identity?: Identity, abortSignal?: AbortSignal): Promise<Array<ExternalTask<TPayload>>>;
|
|
7
|
+
extendLock(workerId: string, externalTaskId: string, additionalDuration: number, identity?: Identity, abortSignal?: AbortSignal): Promise<void>;
|
|
8
|
+
handleError(workerId: string, externalTaskId: string, error: DataModels.ExternalTasks.ExternalTaskError, identity?: Identity, abortSignal?: AbortSignal): Promise<void>;
|
|
9
|
+
finishExternalTask<TResultType>(workerId: string, externalTaskId: string, result: TResultType, identity?: Identity, abortSignal?: AbortSignal): Promise<void>;
|
|
10
10
|
}
|
|
11
11
|
export {};
|
|
@@ -12,6 +12,8 @@ export declare class ExternalTaskWorker<TExternalTaskPayload, TResultPayload ext
|
|
|
12
12
|
private _pollingActive;
|
|
13
13
|
private externalTaskClient;
|
|
14
14
|
private customErrorHandler;
|
|
15
|
+
private abortController;
|
|
16
|
+
private abortSignal;
|
|
15
17
|
constructor(engineUrl: string, topic: string, processingFunction: HandleExternalTaskAction<TExternalTaskPayload, TResultPayload>, config?: IExternalTaskWorkerConfig);
|
|
16
18
|
get identity(): Identity;
|
|
17
19
|
set identity(value: Identity);
|
|
@@ -23,6 +25,7 @@ export declare class ExternalTaskWorker<TExternalTaskPayload, TResultPayload ext
|
|
|
23
25
|
dispose(): void;
|
|
24
26
|
private processExternalTasks;
|
|
25
27
|
private fetchAndLockExternalTasks;
|
|
28
|
+
private startExecutingExternalTask;
|
|
26
29
|
private executeExternalTask;
|
|
27
30
|
private extendLocks;
|
|
28
31
|
private processResult;
|
package/dist/HttpClient.d.ts
CHANGED
|
@@ -14,8 +14,8 @@ export declare class HttpClient {
|
|
|
14
14
|
private httpRedirectResponseCode;
|
|
15
15
|
constructor(url: string);
|
|
16
16
|
get<TResponse>(url: string, options?: IRequestOptions): Promise<IResponse<TResponse>>;
|
|
17
|
-
post<TPayload, TResult>(url: string, data: TPayload, options?: IRequestOptions): Promise<IResponse<TResult>>;
|
|
18
|
-
put<TResult>(url: string, data: TResult, options?: IRequestOptions): Promise<IResponse<TResult>>;
|
|
17
|
+
post<TPayload, TResult>(url: string, data: TPayload, options?: IRequestOptions, abortSignal?: AbortSignal): Promise<IResponse<TResult>>;
|
|
18
|
+
put<TResult>(url: string, data: TResult, options?: IRequestOptions, abortSignal?: AbortSignal): Promise<IResponse<TResult>>;
|
|
19
19
|
delete<TResult>(url: string, options?: IRequestOptions): Promise<IResponse<TResult>>;
|
|
20
20
|
private addPrefixToUrl;
|
|
21
21
|
private buildHeaders;
|
|
@@ -3,7 +3,7 @@ import { ExternalTask, Identity } from '@5minds/processcube_engine_sdk';
|
|
|
3
3
|
* Definition of the HandleExternalTask Callback.
|
|
4
4
|
*/
|
|
5
5
|
export type HandleExternalTaskAction<TPayload, TResult extends object> = (payload: TPayload, externalTask?: ExternalTask<TPayload>) => TResult | Promise<TResult>;
|
|
6
|
-
export type WorkerErrorHandler = (errorType: 'fetchAndLock' | 'extendLock' | 'processExternalTask' | 'finishExternalTask', error: Error, externalTask?: ExternalTask<any>) => void;
|
|
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;
|
|
9
9
|
lockDuration?: number;
|
|
@@ -11,7 +11,7 @@ class ExternalTaskApiClient extends BaseClient_1.BaseClient {
|
|
|
11
11
|
const response = await this.httpClient.get(url, requestAuthHeaders);
|
|
12
12
|
return response.result;
|
|
13
13
|
}
|
|
14
|
-
async fetchAndLockExternalTasks(workerId, topicNames, maxTasks, longPollingTimeout, lockDuration, payloadFilter, identity) {
|
|
14
|
+
async fetchAndLockExternalTasks(workerId, topicNames, maxTasks, longPollingTimeout, lockDuration, payloadFilter, identity, abortSignal) {
|
|
15
15
|
const httpPayload = {
|
|
16
16
|
workerId: workerId,
|
|
17
17
|
topicName: topicNames,
|
|
@@ -22,11 +22,11 @@ class ExternalTaskApiClient extends BaseClient_1.BaseClient {
|
|
|
22
22
|
};
|
|
23
23
|
const url = this.buildUrl(index_1.restSettings.paths.fetchAndLockExternalTasks);
|
|
24
24
|
const requestAuthHeaders = this.createRequestAuthHeaders(identity);
|
|
25
|
-
const response = await this.httpClient.post(url, httpPayload, requestAuthHeaders);
|
|
25
|
+
const response = await this.httpClient.post(url, httpPayload, requestAuthHeaders, abortSignal);
|
|
26
26
|
const mappedResult = response.result.map((result) => (0, Mappers_1.mapExternalTask)(result));
|
|
27
27
|
return mappedResult;
|
|
28
28
|
}
|
|
29
|
-
async extendLock(workerId, externalTaskId, additionalDuration, identity) {
|
|
29
|
+
async extendLock(workerId, externalTaskId, additionalDuration, identity, abortSignal) {
|
|
30
30
|
const httpPayload = {
|
|
31
31
|
workerId: workerId,
|
|
32
32
|
additionalDuration: additionalDuration,
|
|
@@ -34,9 +34,9 @@ class ExternalTaskApiClient extends BaseClient_1.BaseClient {
|
|
|
34
34
|
const endpoint = index_1.restSettings.paths.extendExternalTaskLock.replace(index_1.restSettings.params.externalTaskId, externalTaskId);
|
|
35
35
|
const url = this.buildUrl(endpoint);
|
|
36
36
|
const requestAuthHeaders = this.createRequestAuthHeaders(identity);
|
|
37
|
-
await this.httpClient.put(url, httpPayload, requestAuthHeaders);
|
|
37
|
+
await this.httpClient.put(url, httpPayload, requestAuthHeaders, abortSignal);
|
|
38
38
|
}
|
|
39
|
-
async handleError(workerId, externalTaskId, error, identity) {
|
|
39
|
+
async handleError(workerId, externalTaskId, error, identity, abortSignal) {
|
|
40
40
|
const httpPayload = {
|
|
41
41
|
workerId: workerId,
|
|
42
42
|
error: error,
|
|
@@ -44,9 +44,9 @@ class ExternalTaskApiClient extends BaseClient_1.BaseClient {
|
|
|
44
44
|
const endpoint = index_1.restSettings.paths.finishExternalTaskWithError.replace(index_1.restSettings.params.externalTaskId, externalTaskId);
|
|
45
45
|
const url = this.buildUrl(endpoint);
|
|
46
46
|
const requestAuthHeaders = this.createRequestAuthHeaders(identity);
|
|
47
|
-
await this.httpClient.put(url, httpPayload, requestAuthHeaders);
|
|
47
|
+
await this.httpClient.put(url, httpPayload, requestAuthHeaders, abortSignal);
|
|
48
48
|
}
|
|
49
|
-
async finishExternalTask(workerId, externalTaskId, result, identity) {
|
|
49
|
+
async finishExternalTask(workerId, externalTaskId, result, identity, abortSignal) {
|
|
50
50
|
const httpPayload = {
|
|
51
51
|
workerId: workerId,
|
|
52
52
|
result: result,
|
|
@@ -54,7 +54,7 @@ class ExternalTaskApiClient extends BaseClient_1.BaseClient {
|
|
|
54
54
|
const endpoint = index_1.restSettings.paths.finishExternalTask.replace(index_1.restSettings.params.externalTaskId, externalTaskId);
|
|
55
55
|
const url = this.buildUrl(endpoint);
|
|
56
56
|
const requestAuthHeaders = this.createRequestAuthHeaders(identity);
|
|
57
|
-
await this.httpClient.put(url, httpPayload, requestAuthHeaders);
|
|
57
|
+
await this.httpClient.put(url, httpPayload, requestAuthHeaders, abortSignal);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
exports.ExternalTaskApiClient = ExternalTaskApiClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskApiHttpClient.js","sourceRoot":"","sources":["../../../src/Clients/ExternalTaskApiHttpClient.ts"],"names":[],"mappings":";;;AAEA,0CAA8C;AAC9C,6CAA0C;AAC1C,2CAAgD;AAIhD,MAAa,qBAAsB,SAAQ,uBAAU;IAC5C,KAAK,CAAC,oBAAoB,CAAC,QAAmB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,oBAAY,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACnE,MAAM,kBAAkB,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QAEnE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAgB,GAAG,EAAE,kBAAkB,CAAC,CAAC;QAEnF,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,yBAAyB,CACpC,QAAgB,EAChB,UAAkC,EAClC,QAAgB,EAChB,kBAA0B,EAC1B,YAAoB,EACpB,aAAsB,EACtB,QAAmB;
|
|
1
|
+
{"version":3,"file":"ExternalTaskApiHttpClient.js","sourceRoot":"","sources":["../../../src/Clients/ExternalTaskApiHttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.mapProcessDefinition = mapProcessDefinition;
|
|
4
|
+
exports.mapProcessModel = mapProcessModel;
|
|
5
|
+
exports.mapFlowNodeInstance = mapFlowNodeInstance;
|
|
6
|
+
exports.mapBusinessRuleTask = mapBusinessRuleTask;
|
|
7
|
+
exports.mapServiceTask = mapServiceTask;
|
|
8
|
+
exports.mapCronjobConfiguration = mapCronjobConfiguration;
|
|
9
|
+
exports.mapDataObjectInstance = mapDataObjectInstance;
|
|
10
|
+
exports.mapExternalTask = mapExternalTask;
|
|
11
|
+
exports.mapProcessInstance = mapProcessInstance;
|
|
4
12
|
const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
5
13
|
function mapProcessDefinition(rawDefinition) {
|
|
6
14
|
const processDefinition = {
|
|
@@ -10,13 +18,11 @@ function mapProcessDefinition(rawDefinition) {
|
|
|
10
18
|
};
|
|
11
19
|
return processDefinition;
|
|
12
20
|
}
|
|
13
|
-
exports.mapProcessDefinition = mapProcessDefinition;
|
|
14
21
|
function mapProcessModel(rawModel) {
|
|
15
22
|
return {
|
|
16
23
|
...rawModel,
|
|
17
24
|
};
|
|
18
25
|
}
|
|
19
|
-
exports.mapProcessModel = mapProcessModel;
|
|
20
26
|
function mapFlowNodeInstance(data) {
|
|
21
27
|
if (data.flowNodeType === processcube_engine_sdk_1.BpmnType.businessRuleTask) {
|
|
22
28
|
return mapBusinessRuleTask(data);
|
|
@@ -26,7 +32,6 @@ function mapFlowNodeInstance(data) {
|
|
|
26
32
|
}
|
|
27
33
|
return createFlowNodeInstance(data);
|
|
28
34
|
}
|
|
29
|
-
exports.mapFlowNodeInstance = mapFlowNodeInstance;
|
|
30
35
|
function mapBusinessRuleTask(data) {
|
|
31
36
|
const businessRuleTaskInstance = createFlowNodeInstance(data);
|
|
32
37
|
if (data.businessRuleTaskData) {
|
|
@@ -39,7 +44,6 @@ function mapBusinessRuleTask(data) {
|
|
|
39
44
|
}
|
|
40
45
|
return businessRuleTaskInstance;
|
|
41
46
|
}
|
|
42
|
-
exports.mapBusinessRuleTask = mapBusinessRuleTask;
|
|
43
47
|
function mapServiceTask(data) {
|
|
44
48
|
const serviceTaskInstance = createFlowNodeInstance(data);
|
|
45
49
|
if (data.externalTaskData) {
|
|
@@ -57,7 +61,6 @@ function mapServiceTask(data) {
|
|
|
57
61
|
}
|
|
58
62
|
return serviceTaskInstance;
|
|
59
63
|
}
|
|
60
|
-
exports.mapServiceTask = mapServiceTask;
|
|
61
64
|
function createFlowNodeInstance(data) {
|
|
62
65
|
return {
|
|
63
66
|
...data,
|
|
@@ -73,7 +76,6 @@ function mapCronjobConfiguration(data) {
|
|
|
73
76
|
nextTriggerDate: data.nextTriggerDate ? new Date(data.nextTriggerDate) : undefined,
|
|
74
77
|
};
|
|
75
78
|
}
|
|
76
|
-
exports.mapCronjobConfiguration = mapCronjobConfiguration;
|
|
77
79
|
function mapDataObjectInstance(data) {
|
|
78
80
|
return {
|
|
79
81
|
...data,
|
|
@@ -81,7 +83,6 @@ function mapDataObjectInstance(data) {
|
|
|
81
83
|
updatedAt: new Date(data.updatedAt),
|
|
82
84
|
};
|
|
83
85
|
}
|
|
84
|
-
exports.mapDataObjectInstance = mapDataObjectInstance;
|
|
85
86
|
function mapExternalTask(data) {
|
|
86
87
|
return {
|
|
87
88
|
...data,
|
|
@@ -91,7 +92,6 @@ function mapExternalTask(data) {
|
|
|
91
92
|
createdAt: data.createdAt ? new Date(data.createdAt) : undefined,
|
|
92
93
|
};
|
|
93
94
|
}
|
|
94
|
-
exports.mapExternalTask = mapExternalTask;
|
|
95
95
|
function mapProcessInstance(data) {
|
|
96
96
|
return {
|
|
97
97
|
...data,
|
|
@@ -101,5 +101,4 @@ function mapProcessInstance(data) {
|
|
|
101
101
|
restartedAt: data.restartedAt ? new Date(data.restartedAt) : undefined,
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
|
-
exports.mapProcessInstance = mapProcessInstance;
|
|
105
104
|
//# sourceMappingURL=Mappers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mappers.js","sourceRoot":"","sources":["../../../../src/Clients/Lib/Mappers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Mappers.js","sourceRoot":"","sources":["../../../../src/Clients/Lib/Mappers.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,6 +44,8 @@ class ExternalTaskWorker {
|
|
|
44
44
|
_pollingActive = false;
|
|
45
45
|
externalTaskClient;
|
|
46
46
|
customErrorHandler = null;
|
|
47
|
+
abortController;
|
|
48
|
+
abortSignal;
|
|
47
49
|
constructor(engineUrl, topic, processingFunction, config) {
|
|
48
50
|
this._workerId = config?.workerId ?? uuid.v4();
|
|
49
51
|
this.topic = topic;
|
|
@@ -72,10 +74,13 @@ class ExternalTaskWorker {
|
|
|
72
74
|
}
|
|
73
75
|
start() {
|
|
74
76
|
this._pollingActive = true;
|
|
77
|
+
this.abortController = new AbortController();
|
|
78
|
+
this.abortSignal = this.abortController.signal;
|
|
75
79
|
this.processExternalTasks();
|
|
76
80
|
}
|
|
77
81
|
stop() {
|
|
78
82
|
this._pollingActive = false;
|
|
83
|
+
this.abortController?.abort();
|
|
79
84
|
}
|
|
80
85
|
dispose() {
|
|
81
86
|
this.externalTaskClient.dispose();
|
|
@@ -83,7 +88,7 @@ class ExternalTaskWorker {
|
|
|
83
88
|
async processExternalTasks() {
|
|
84
89
|
let errorCount = 0;
|
|
85
90
|
const maximumErrorTimeout = 30 * 1000;
|
|
86
|
-
while (this.
|
|
91
|
+
while (this.abortSignal?.aborted === false) {
|
|
87
92
|
let externalTasks;
|
|
88
93
|
try {
|
|
89
94
|
externalTasks = await this.fetchAndLockExternalTasks();
|
|
@@ -98,18 +103,31 @@ class ExternalTaskWorker {
|
|
|
98
103
|
if (typeof this.customErrorHandler === 'function') {
|
|
99
104
|
this.customErrorHandler('fetchAndLock', error);
|
|
100
105
|
}
|
|
101
|
-
|
|
106
|
+
if (this.abortSignal?.aborted === false) {
|
|
107
|
+
await this.sleep(timeoutToUse);
|
|
108
|
+
}
|
|
102
109
|
externalTasks = [];
|
|
103
110
|
}
|
|
104
111
|
const executeTaskPromises = [];
|
|
105
112
|
for (const externalTask of externalTasks) {
|
|
106
|
-
executeTaskPromises.push(this.
|
|
113
|
+
executeTaskPromises.push(this.startExecutingExternalTask(externalTask));
|
|
107
114
|
}
|
|
108
115
|
await Promise.all(executeTaskPromises);
|
|
109
116
|
}
|
|
110
117
|
}
|
|
111
118
|
async fetchAndLockExternalTasks() {
|
|
112
|
-
return this.externalTaskClient.fetchAndLockExternalTasks(this.workerId, this.topic, this.maxTasks, this.longpollingTimeout, this.lockDuration, this.payloadFilter, this.identity);
|
|
119
|
+
return this.externalTaskClient.fetchAndLockExternalTasks(this.workerId, this.topic, this.maxTasks, this.longpollingTimeout, this.lockDuration, this.payloadFilter, this.identity, this.abortSignal);
|
|
120
|
+
}
|
|
121
|
+
async startExecutingExternalTask(externalTask) {
|
|
122
|
+
try {
|
|
123
|
+
await this.executeExternalTask(externalTask);
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
if (typeof this.customErrorHandler === 'function') {
|
|
127
|
+
this.customErrorHandler('unprocessableExternalTask', error, externalTask);
|
|
128
|
+
}
|
|
129
|
+
logger.warn(`External Task ${externalTask.id} could not be processed.`, { err: error });
|
|
130
|
+
}
|
|
113
131
|
}
|
|
114
132
|
async executeExternalTask(externalTask) {
|
|
115
133
|
let interval;
|
|
@@ -125,6 +143,8 @@ class ExternalTaskWorker {
|
|
|
125
143
|
this.customErrorHandler('processExternalTask', error, externalTask);
|
|
126
144
|
}
|
|
127
145
|
await this.handleExternalTaskExecutionError(error, externalTask?.id);
|
|
146
|
+
}
|
|
147
|
+
finally {
|
|
128
148
|
if (interval) {
|
|
129
149
|
clearInterval(interval);
|
|
130
150
|
}
|
|
@@ -132,7 +152,7 @@ class ExternalTaskWorker {
|
|
|
132
152
|
}
|
|
133
153
|
async extendLocks(externalTask) {
|
|
134
154
|
try {
|
|
135
|
-
await this.externalTaskClient.extendLock(this.workerId, externalTask.id, this.lockDuration, this.identity);
|
|
155
|
+
await this.externalTaskClient.extendLock(this.workerId, externalTask.id, this.lockDuration, this.identity, this.abortSignal);
|
|
136
156
|
}
|
|
137
157
|
catch (error) {
|
|
138
158
|
if (typeof this.customErrorHandler === 'function') {
|
|
@@ -145,10 +165,10 @@ class ExternalTaskWorker {
|
|
|
145
165
|
}
|
|
146
166
|
async processResult(result, externalTask) {
|
|
147
167
|
try {
|
|
148
|
-
if (result instanceof processcube_engine_sdk_1.ExternalTaskError || result instanceof
|
|
168
|
+
if (result instanceof processcube_engine_sdk_1.ExternalTaskError || result instanceof Error) {
|
|
149
169
|
return this.handleExternalTaskExecutionError(result, externalTask.id);
|
|
150
170
|
}
|
|
151
|
-
return this.externalTaskClient.finishExternalTask(this.workerId, externalTask.id, result, this.identity);
|
|
171
|
+
return this.externalTaskClient.finishExternalTask(this.workerId, externalTask.id, result, this.identity, this.abortSignal);
|
|
152
172
|
}
|
|
153
173
|
catch (error) {
|
|
154
174
|
if (typeof this.customErrorHandler === 'function') {
|
|
@@ -158,7 +178,7 @@ class ExternalTaskWorker {
|
|
|
158
178
|
}
|
|
159
179
|
async handleExternalTaskExecutionError(error, externalTaskId) {
|
|
160
180
|
logger.error(`Error raised for external task '${externalTaskId}' with topic '${this.topic}': `, error);
|
|
161
|
-
const workerError = new processcube_engine_sdk_1.ExternalTaskError('
|
|
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.');
|
|
162
182
|
return this.externalTaskClient.handleError(this.workerId, externalTaskId, workerError, this.identity);
|
|
163
183
|
}
|
|
164
184
|
async sleep(milliseconds) {
|
|
@@ -170,4 +190,7 @@ class ExternalTaskWorker {
|
|
|
170
190
|
}
|
|
171
191
|
}
|
|
172
192
|
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
|
+
}
|
|
173
196
|
//# sourceMappingURL=ExternalTaskWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,2EAAmG;AAEnG,mFAA4E;AAG5E,MAAM,MAAM,GAAG,IAAI,+BAAM,CAAC,sBAAsB,CAAC,CAAC;AAElD,MAAM,aAAa,GAAa;IAC9B,KAAK,EAAE,kBAAkB;IACzB,MAAM,EAAE,aAAa;CACtB,CAAC;AAEF,MAAa,kBAAkB;IACZ,SAAS,CAAS;IAClB,YAAY,CAAS;IACrB,KAAK,CAAS;IACd,QAAQ,CAAS;IACjB,kBAAkB,CAAS;IAC3B,kBAAkB,CAAiE;IACnF,aAAa,CAAS;IAE/B,SAAS,CAAW;IACpB,cAAc,GAAG,KAAK,CAAC;IACvB,kBAAkB,CAAwB;IAC1C,kBAAkB,GAAuB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ class HttpClient {
|
|
|
26
26
|
const parsedResponse = await this.evaluateResponse(response);
|
|
27
27
|
return parsedResponse;
|
|
28
28
|
}
|
|
29
|
-
async post(url, data, options) {
|
|
29
|
+
async post(url, data, options, abortSignal) {
|
|
30
30
|
const prefixedUrl = this.addPrefixToUrl(url);
|
|
31
31
|
const headers = this.buildHeaders(options);
|
|
32
32
|
const request = {
|
|
@@ -35,12 +35,13 @@ class HttpClient {
|
|
|
35
35
|
referrer: 'no-referrer',
|
|
36
36
|
headers: headers,
|
|
37
37
|
body: JSON.stringify(data),
|
|
38
|
+
signal: abortSignal,
|
|
38
39
|
};
|
|
39
40
|
const response = await (0, cross_fetch_1.default)(prefixedUrl, request);
|
|
40
41
|
const parsedResponse = await this.evaluateResponse(response);
|
|
41
42
|
return parsedResponse;
|
|
42
43
|
}
|
|
43
|
-
async put(url, data, options) {
|
|
44
|
+
async put(url, data, options, abortSignal) {
|
|
44
45
|
const prefixedUrl = this.addPrefixToUrl(url);
|
|
45
46
|
const headers = this.buildHeaders(options);
|
|
46
47
|
const request = {
|
|
@@ -49,6 +50,7 @@ class HttpClient {
|
|
|
49
50
|
referrer: 'no-referrer',
|
|
50
51
|
headers: headers,
|
|
51
52
|
body: JSON.stringify(data),
|
|
53
|
+
signal: abortSignal,
|
|
52
54
|
};
|
|
53
55
|
const response = await (0, cross_fetch_1.default)(prefixedUrl, request);
|
|
54
56
|
const parsedResponse = await this.evaluateResponse(response);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/HttpClient.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAgC;AAEhC,2EAA2H;AAc3H,MAAa,UAAU;IACb,GAAG,CAAS;IAEZ,uBAAuB,GAAG,GAAG,CAAC;IAC9B,wBAAwB,GAAG,GAAG,CAAC;IAEvC,YAAY,GAAW;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAY,GAAW,EAAE,OAAyB;QAChE,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAgB;YAC3B,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,aAAa;YACvB,OAAO,EAAE,OAAO;SACjB,CAAC;QAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAK,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEnD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAY,QAAQ,CAAC,CAAC;QAExE,OAAO,cAAc,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,IAAI,CAAoB,GAAW,EAAE,IAAc,EAAE,OAAyB;
|
|
1
|
+
{"version":3,"file":"HttpClient.js","sourceRoot":"","sources":["../../src/HttpClient.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-alpha.
|
|
7
|
+
"version": "5.1.0-alpha.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": "5.1.0-alpha.
|
|
39
|
+
"@5minds/processcube_engine_sdk": "5.1.0-alpha.2",
|
|
40
40
|
"bufferutil": "4.0.8",
|
|
41
41
|
"cross-fetch": "4.0.0",
|
|
42
42
|
"socket.io-client": "4.7.5",
|
|
@@ -47,6 +47,6 @@
|
|
|
47
47
|
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
|
|
48
48
|
"@types/node": "^20.11.27",
|
|
49
49
|
"prettier": "^3.3.2",
|
|
50
|
-
"typescript": "^5.
|
|
50
|
+
"typescript": "^5.5.3"
|
|
51
51
|
}
|
|
52
52
|
}
|