@5minds/processcube_engine_client 6.0.0-develop-0fbaf5-m7spd9jo → 6.0.0-develop-7e43a3-m7t7o30c
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 +2 -2
- package/dist/ExternalTaskWorker.d.ts +2 -0
- package/dist/Types/IExternalTaskWorker.d.ts +8 -0
- package/dist/commonjs/ExternalTaskExecution.js +8 -6
- package/dist/commonjs/ExternalTaskExecution.js.map +1 -1
- package/dist/commonjs/ExternalTaskWorker.js +9 -6
- package/dist/commonjs/ExternalTaskWorker.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ExternalTask } from '@5minds/processcube_engine_sdk';
|
|
2
2
|
import { ExternalTaskApiClient } from './Clients';
|
|
3
3
|
import { ExternalTaskWorkerHeartbeat } from './ExternalTaskWorker';
|
|
4
|
-
import { HandleExternalTaskAction, IExternalTaskWorkerConfig, WorkerErrorHandler } from './Types';
|
|
4
|
+
import { HandleExternalTaskAction, IExternalTaskWorkerConfig, ILogger, WorkerErrorHandler } from './Types';
|
|
5
5
|
export declare class ExternalTaskExecution<TExternalTaskPayload, TResultPayload extends object> {
|
|
6
6
|
private externalTask;
|
|
7
7
|
private processingFunction;
|
|
@@ -15,7 +15,7 @@ export declare class ExternalTaskExecution<TExternalTaskPayload, TResultPayload
|
|
|
15
15
|
private identityAccessor;
|
|
16
16
|
private logger;
|
|
17
17
|
private isDisposed;
|
|
18
|
-
constructor(externalTask: ExternalTask<TExternalTaskPayload>, processingFunction: HandleExternalTaskAction<TExternalTaskPayload, TResultPayload>, externalTaskClient: ExternalTaskApiClient, config: IExternalTaskWorkerConfig, topic: string, onHeartbeatCallback?: ExternalTaskWorkerHeartbeat, customErrorHandler?: WorkerErrorHandler);
|
|
18
|
+
constructor(externalTask: ExternalTask<TExternalTaskPayload>, processingFunction: HandleExternalTaskAction<TExternalTaskPayload, TResultPayload>, externalTaskClient: ExternalTaskApiClient, config: IExternalTaskWorkerConfig, topic: string, onHeartbeatCallback?: ExternalTaskWorkerHeartbeat, customErrorHandler?: WorkerErrorHandler, customLogger?: ILogger);
|
|
19
19
|
get disposed(): boolean;
|
|
20
20
|
execute(): Promise<void>;
|
|
21
21
|
abort(): void;
|
|
@@ -9,6 +9,8 @@ export declare class ExternalTaskWorker<TExternalTaskPayload, TResultPayload ext
|
|
|
9
9
|
private readonly longpollingTimeout;
|
|
10
10
|
private readonly processingFunction;
|
|
11
11
|
private readonly payloadFilter;
|
|
12
|
+
private readonly useCustomLogger;
|
|
13
|
+
private readonly logger;
|
|
12
14
|
private identityAccessor;
|
|
13
15
|
private _pollingActive;
|
|
14
16
|
private externalTaskClient;
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { ExternalTask } from '@5minds/processcube_engine_sdk';
|
|
2
2
|
import { IdentityLike } from '../IdentityAccessor';
|
|
3
|
+
export interface ILogger {
|
|
4
|
+
error(message: string, logObject?: Record<string, any>): void;
|
|
5
|
+
warn(message: string, logObject?: Record<string, any>): void;
|
|
6
|
+
info(message: string, logObject?: Record<string, any>): void;
|
|
7
|
+
debug(message: string, logObject?: Record<string, any>): void;
|
|
8
|
+
trace(message: string, logObject?: Record<string, any>): void;
|
|
9
|
+
}
|
|
3
10
|
/**
|
|
4
11
|
* Definition of the HandleExternalTask Callback.
|
|
5
12
|
*/
|
|
@@ -12,6 +19,7 @@ export type IExternalTaskWorkerConfig = {
|
|
|
12
19
|
longpollingTimeout?: number;
|
|
13
20
|
identity?: IdentityLike;
|
|
14
21
|
payloadFilter?: RegExp;
|
|
22
|
+
logger?: ILogger;
|
|
15
23
|
};
|
|
16
24
|
/**
|
|
17
25
|
* Periodically fetches, locks and processes ExternalTasks for a given topic.
|
|
@@ -16,7 +16,7 @@ class ExternalTaskExecution {
|
|
|
16
16
|
identityAccessor;
|
|
17
17
|
logger;
|
|
18
18
|
isDisposed = false;
|
|
19
|
-
constructor(externalTask, processingFunction, externalTaskClient, config, topic, onHeartbeatCallback, customErrorHandler) {
|
|
19
|
+
constructor(externalTask, processingFunction, externalTaskClient, config, topic, onHeartbeatCallback, customErrorHandler, customLogger) {
|
|
20
20
|
this.externalTask = externalTask;
|
|
21
21
|
this.processingFunction = processingFunction;
|
|
22
22
|
this.externalTaskClient = externalTaskClient;
|
|
@@ -25,11 +25,13 @@ class ExternalTaskExecution {
|
|
|
25
25
|
this.topic = topic;
|
|
26
26
|
this.onHeartbeatCallback = onHeartbeatCallback;
|
|
27
27
|
this.customErrorHandler = customErrorHandler;
|
|
28
|
-
this.logger =
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
28
|
+
this.logger =
|
|
29
|
+
customLogger ??
|
|
30
|
+
new processcube_engine_sdk_1.Logger('external_task_execution', {
|
|
31
|
+
workerId: config.workerId,
|
|
32
|
+
externalTaskId: externalTask.id,
|
|
33
|
+
topic: topic,
|
|
34
|
+
});
|
|
33
35
|
}
|
|
34
36
|
get disposed() {
|
|
35
37
|
return this.isDisposed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskExecution.js","sourceRoot":"","sources":["../../src/ExternalTaskExecution.ts"],"names":[],"mappings":";;;AAAA,2EAAyF;AAIzF,yDAAsD;AAGtD,MAAa,qBAAqB;IACxB,YAAY,CAAqC;IACjD,kBAAkB,CAAiE;IACnF,kBAAkB,CAAwB;IAC1C,MAAM,CAA4B;IAClC,KAAK,CAAS;IACd,wBAAwB,GAAG,IAAI,eAAe,EAAE,CAAC;IAEjD,kBAAkB,CAAsB;IACxC,mBAAmB,GAAgC,IAAI,CAAC;IAExD,QAAQ,CAAiB;IACzB,gBAAgB,CAAmB;IAEnC,MAAM,
|
|
1
|
+
{"version":3,"file":"ExternalTaskExecution.js","sourceRoot":"","sources":["../../src/ExternalTaskExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,6 @@ const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
|
39
39
|
const ExternalTaskApiHttpClient_1 = require("./Clients/ExternalTaskApiHttpClient");
|
|
40
40
|
const ExternalTaskExecution_1 = require("./ExternalTaskExecution");
|
|
41
41
|
const IdentityAccessor_1 = require("./IdentityAccessor");
|
|
42
|
-
const logger = new processcube_engine_sdk_1.Logger('external_task_worker');
|
|
43
42
|
class ExternalTaskWorker {
|
|
44
43
|
_workerId;
|
|
45
44
|
lockDuration;
|
|
@@ -48,6 +47,8 @@ class ExternalTaskWorker {
|
|
|
48
47
|
longpollingTimeout;
|
|
49
48
|
processingFunction;
|
|
50
49
|
payloadFilter;
|
|
50
|
+
useCustomLogger = false;
|
|
51
|
+
logger;
|
|
51
52
|
identityAccessor;
|
|
52
53
|
_pollingActive = false;
|
|
53
54
|
externalTaskClient;
|
|
@@ -65,6 +66,8 @@ class ExternalTaskWorker {
|
|
|
65
66
|
this.longpollingTimeout = config?.longpollingTimeout ?? 10000;
|
|
66
67
|
this.lockDuration = config?.lockDuration ?? 30000;
|
|
67
68
|
this.payloadFilter = config?.payloadFilter;
|
|
69
|
+
this.useCustomLogger = config?.logger != null;
|
|
70
|
+
this.logger = config?.logger ?? new processcube_engine_sdk_1.Logger('external_task_worker');
|
|
68
71
|
this.externalTaskClient = new ExternalTaskApiHttpClient_1.ExternalTaskApiClient(engineUrl, this.identityAccessor);
|
|
69
72
|
}
|
|
70
73
|
/**
|
|
@@ -143,11 +146,11 @@ class ExternalTaskWorker {
|
|
|
143
146
|
if (this.abortSignal?.aborted) {
|
|
144
147
|
return;
|
|
145
148
|
}
|
|
146
|
-
logger.error('Failed to fetch and lock External Tasks.', { err: error });
|
|
149
|
+
this.logger.error('Failed to fetch and lock External Tasks.', { err: error });
|
|
147
150
|
if (error.message?.match(/expired/i) && this.identityAccessor.canIdentityBeRefreshed()) {
|
|
148
|
-
logger.info('Identity has expired. Refreshing identity to get a new auth token...');
|
|
151
|
+
this.logger.info('Identity has expired. Refreshing identity to get a new auth token...');
|
|
149
152
|
await this.identityAccessor.forceImmediateIdentityRefresh();
|
|
150
|
-
logger.info('Identity refresh completed. Fetch and Lock will continue.');
|
|
153
|
+
this.logger.info('Identity refresh completed. Fetch and Lock will continue.');
|
|
151
154
|
}
|
|
152
155
|
errorCount++;
|
|
153
156
|
const timeoutOffset = (Math.floor(Math.random() * 10) + 1) * 30;
|
|
@@ -180,7 +183,7 @@ class ExternalTaskWorker {
|
|
|
180
183
|
maxTasks: this.maxTasks,
|
|
181
184
|
payloadFilter: this.payloadFilter,
|
|
182
185
|
workerId: this.workerId,
|
|
183
|
-
}, this.topic, this.onHeartbeatCallback, this.customErrorHandler);
|
|
186
|
+
}, this.topic, this.onHeartbeatCallback, this.customErrorHandler, this.useCustomLogger ? this.logger : undefined);
|
|
184
187
|
this.activelyProcessedExternalTasks[externalTask.id] = externalTaskExecution;
|
|
185
188
|
await externalTaskExecution.execute();
|
|
186
189
|
}
|
|
@@ -188,7 +191,7 @@ class ExternalTaskWorker {
|
|
|
188
191
|
if (typeof this.customErrorHandler === 'function') {
|
|
189
192
|
this.customErrorHandler('unprocessableExternalTask', error, externalTask);
|
|
190
193
|
}
|
|
191
|
-
logger.warn(`External Task ${externalTask.id} could not be processed.`, { err: error });
|
|
194
|
+
this.logger.warn(`External Task ${externalTask.id} could not be processed.`, { err: error });
|
|
192
195
|
}
|
|
193
196
|
finally {
|
|
194
197
|
delete this.activelyProcessedExternalTasks[externalTask.id];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,2EAAgF;AAEhF,mFAA4E;AAC5E,mEAAgE;AAChE,yDAAsD;
|
|
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": "6.0.0-develop-
|
|
7
|
+
"version": "6.0.0-develop-7e43a3-m7t7o30c",
|
|
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",
|