@5minds/processcube_engine_client 6.0.0-develop-d26b13-m4limdtf → 6.0.0-develop-9a10f4-m4shjfuy
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/Client.d.ts +1 -0
- package/dist/ClientCredentialsIdentityAccessor.d.ts +2 -1
- package/dist/Clients/ExternalTaskHttpClient.d.ts +1 -0
- package/dist/Clients/Lib/SocketIoManager.d.ts +2 -0
- package/dist/IdentityAccessor.d.ts +19 -10
- package/dist/commonjs/Client.js +10 -7
- package/dist/commonjs/Client.js.map +1 -1
- package/dist/commonjs/ClientCredentialsIdentityAccessor.js +18 -6
- package/dist/commonjs/ClientCredentialsIdentityAccessor.js.map +1 -1
- package/dist/commonjs/Clients/ExternalTaskHttpClient.js +3 -0
- package/dist/commonjs/Clients/ExternalTaskHttpClient.js.map +1 -1
- package/dist/commonjs/Clients/Lib/SocketIoManager.js +47 -55
- package/dist/commonjs/Clients/Lib/SocketIoManager.js.map +1 -1
- package/dist/commonjs/ExternalTaskExecution.js +1 -0
- package/dist/commonjs/ExternalTaskExecution.js.map +1 -1
- package/dist/commonjs/ExternalTaskWorker.js +6 -2
- package/dist/commonjs/ExternalTaskWorker.js.map +1 -1
- package/dist/commonjs/IdentityAccessor.js +52 -17
- package/dist/commonjs/IdentityAccessor.js.map +1 -1
- package/package.json +3 -2
package/dist/Client.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export declare class EngineClient {
|
|
|
17
17
|
private readonly processInstanceClient;
|
|
18
18
|
private readonly processModelClient;
|
|
19
19
|
private readonly userTaskClient;
|
|
20
|
+
private readonly socketIoManager;
|
|
20
21
|
constructor(engineUrl: string, identity?: IdentityLike);
|
|
21
22
|
dispose(): void;
|
|
22
23
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Identity } from '@5minds/processcube_engine_sdk';
|
|
2
|
-
import { ClientCredentialsConfig, IdentityAccessor } from './';
|
|
2
|
+
import { ClientCredentialsConfig, IdentityAccessor } from './index';
|
|
3
3
|
export declare class ClientCredentialsIdentityAccessor extends IdentityAccessor {
|
|
4
4
|
private config;
|
|
5
5
|
constructor(clientCredentialsConfig: ClientCredentialsConfig);
|
|
@@ -9,4 +9,5 @@ export declare class ClientCredentialsIdentityAccessor extends IdentityAccessor
|
|
|
9
9
|
private getOpenIdClient;
|
|
10
10
|
private getAuthorityUrl;
|
|
11
11
|
private getAuthorityUrlFromEngineUrl;
|
|
12
|
+
private hash;
|
|
12
13
|
}
|
|
@@ -9,5 +9,6 @@ export declare class ExternalTaskClient {
|
|
|
9
9
|
* Gets the url of the engine that this client is communicating with.
|
|
10
10
|
*/
|
|
11
11
|
getEngineUrl(): string;
|
|
12
|
+
dispose(): void;
|
|
12
13
|
subscribeToExternalTaskTopic<TExternalTaskPayload, TResultPayload extends object>(topic: string, processingFunction: HandleExternalTaskAction<TExternalTaskPayload, TResultPayload>, config?: IExternalTaskWorkerConfig): Promise<ExternalTaskWorker<TExternalTaskPayload, TResultPayload>>;
|
|
13
14
|
}
|
|
@@ -12,7 +12,9 @@ export declare class SocketIoManager {
|
|
|
12
12
|
createSocketIoSubscription(accessor: IdentityAccessor, eventName: string, callback: (...args: any[]) => void, subscribeOnce: boolean): Promise<Subscription>;
|
|
13
13
|
removeSocketIoSubscription(accessor: IdentityAccessor, subscription: Subscription): void;
|
|
14
14
|
getSocketForIdentity(accessor: IdentityAccessor): Socket;
|
|
15
|
+
private createSocketForIdentitySync;
|
|
15
16
|
private createSocketForIdentity;
|
|
17
|
+
private buildSocketWithContext;
|
|
16
18
|
private getSocketContext;
|
|
17
19
|
private ensureSocketContextIsinitialized;
|
|
18
20
|
private addNewSubscriptionToSocketContext;
|
|
@@ -1,19 +1,32 @@
|
|
|
1
1
|
import { Identity, Logger } from '@5minds/processcube_engine_sdk';
|
|
2
|
+
export type IdentityLike = Identity | (() => Promise<Identity>) | (() => Identity) | IdentityAccessor | ClientCredentialsConfig;
|
|
3
|
+
export type ClientCredentialsConfig = {
|
|
4
|
+
authorityUrl?: string;
|
|
5
|
+
engineUrl?: string;
|
|
6
|
+
baseMinRefreshTimeInMs?: number;
|
|
7
|
+
clientId: string;
|
|
8
|
+
clientSecret: string;
|
|
9
|
+
scope: string;
|
|
10
|
+
};
|
|
2
11
|
export declare class IdentityAccessor {
|
|
3
12
|
static wrap(identity?: IdentityLike, engineUrl?: string): IdentityAccessor;
|
|
4
13
|
private identityGetter;
|
|
5
14
|
private latestIdentity;
|
|
6
15
|
private expirationTimeInMs;
|
|
7
|
-
|
|
16
|
+
protected id: string;
|
|
8
17
|
private identityAvailablePromise;
|
|
9
18
|
private identityAvailableResolve;
|
|
10
19
|
private identityAvailableReject;
|
|
11
20
|
private refreshTimeout;
|
|
21
|
+
private disposed;
|
|
22
|
+
private isDynamicRefreshObject;
|
|
12
23
|
protected logger: Logger;
|
|
13
24
|
private newIdentityCallbacks;
|
|
14
25
|
private asyncLock;
|
|
15
26
|
constructor(staticOrDynamicIdentity?: Identity | (() => Promise<Identity>) | (() => Identity));
|
|
27
|
+
initialize(): void;
|
|
16
28
|
getId(): string;
|
|
29
|
+
getIdentitySync(): Identity;
|
|
17
30
|
getIdentity(): Promise<Identity>;
|
|
18
31
|
/**
|
|
19
32
|
* This method only waits the first time the identity is retrieved from any remote source to ensure no missing references occur.
|
|
@@ -25,17 +38,13 @@ export declare class IdentityAccessor {
|
|
|
25
38
|
getIdentityStatic(): Identity;
|
|
26
39
|
onNewIdentity(callback: (identity: Identity) => Promise<void>): void;
|
|
27
40
|
removeOnNewIdentityListener(callback: (identity: Identity) => Promise<void>): void;
|
|
41
|
+
/**
|
|
42
|
+
* The IdentityAccesor creates a refresh timer, which needs to be disposed.
|
|
43
|
+
* This method should be called when the IdentityAccessor is not needed anymore.
|
|
44
|
+
* If any Client using this will be disposed, the IdentityAccessor will be disposed as well.
|
|
45
|
+
*/
|
|
28
46
|
dispose(): void;
|
|
29
47
|
protected getBaseMinRefreshTimeInMs(): number;
|
|
30
48
|
private refreshIdentityIfNeeded;
|
|
31
49
|
private getDecodedToken;
|
|
32
50
|
}
|
|
33
|
-
export type IdentityLike = Identity | (() => Promise<Identity>) | (() => Identity) | IdentityAccessor | ClientCredentialsConfig;
|
|
34
|
-
export type ClientCredentialsConfig = {
|
|
35
|
-
authorityUrl?: string;
|
|
36
|
-
engineUrl?: string;
|
|
37
|
-
baseMinRefreshTimeInMs?: number;
|
|
38
|
-
clientId: string;
|
|
39
|
-
clientSecret: string;
|
|
40
|
-
scope: string;
|
|
41
|
-
};
|
package/dist/commonjs/Client.js
CHANGED
|
@@ -21,24 +21,25 @@ class EngineClient {
|
|
|
21
21
|
processInstanceClient;
|
|
22
22
|
processModelClient;
|
|
23
23
|
userTaskClient;
|
|
24
|
+
socketIoManager;
|
|
24
25
|
constructor(engineUrl, identity) {
|
|
25
26
|
this.engineUrl = engineUrl;
|
|
26
27
|
this.identityAccessor = IdentityAccessor_1.IdentityAccessor.wrap(identity, engineUrl);
|
|
27
|
-
|
|
28
|
-
this.applicationInfoClient = ClientFactory_1.ClientFactory.createApplicationInfoClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
28
|
+
this.socketIoManager = new SocketIoManager_1.SocketIoManager(this.engineUrl);
|
|
29
|
+
this.applicationInfoClient = ClientFactory_1.ClientFactory.createApplicationInfoClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
29
30
|
this.correlationClient = ClientFactory_1.ClientFactory.createCorrelationClient(this.engineUrl, this.identityAccessor);
|
|
30
31
|
this.cronjobClient = ClientFactory_1.ClientFactory.createCronJobClient(this.engineUrl, this.identityAccessor);
|
|
31
32
|
this.dataObjectInstanceClient = ClientFactory_1.ClientFactory.createDataObjectInstanceClient(this.engineUrl, this.identityAccessor);
|
|
32
|
-
this.eventClient = ClientFactory_1.ClientFactory.createEventClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
33
|
+
this.eventClient = ClientFactory_1.ClientFactory.createEventClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
33
34
|
this.externalTaskClient = ClientFactory_1.ClientFactory.createExternalTaskClient(this.engineUrl, this.identityAccessor);
|
|
34
35
|
this.flowNodeInstanceClient = ClientFactory_1.ClientFactory.createFlowNodeInstanceClient(this.engineUrl, this.identityAccessor);
|
|
35
|
-
this.manualTaskClient = ClientFactory_1.ClientFactory.createManualTaskClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
36
|
-
this.notificationClient = ClientFactory_1.ClientFactory.createNotificationClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
36
|
+
this.manualTaskClient = ClientFactory_1.ClientFactory.createManualTaskClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
37
|
+
this.notificationClient = ClientFactory_1.ClientFactory.createNotificationClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
37
38
|
this.processDefinitionClient = ClientFactory_1.ClientFactory.createProcessDefinitionClient(this.engineUrl, this.identityAccessor);
|
|
38
39
|
this.processInstanceClient = ClientFactory_1.ClientFactory.createProcessInstanceClient(this.engineUrl, this.identityAccessor);
|
|
39
40
|
this.processModelClient = ClientFactory_1.ClientFactory.createProcessModelClient(this.engineUrl, this.identityAccessor);
|
|
40
|
-
this.untypedTaskClient = ClientFactory_1.ClientFactory.createUntypedTaskClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
41
|
-
this.userTaskClient = ClientFactory_1.ClientFactory.createUserTaskClient(this.engineUrl, this.identityAccessor, socketIoManager);
|
|
41
|
+
this.untypedTaskClient = ClientFactory_1.ClientFactory.createUntypedTaskClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
42
|
+
this.userTaskClient = ClientFactory_1.ClientFactory.createUserTaskClient(this.engineUrl, this.identityAccessor, this.socketIoManager);
|
|
42
43
|
}
|
|
43
44
|
dispose() {
|
|
44
45
|
this.applicationInfoClient.dispose();
|
|
@@ -46,6 +47,7 @@ class EngineClient {
|
|
|
46
47
|
this.cronjobClient.dispose();
|
|
47
48
|
this.dataObjectInstanceClient.dispose();
|
|
48
49
|
this.eventClient.dispose();
|
|
50
|
+
this.externalTaskClient.dispose();
|
|
49
51
|
this.flowNodeInstanceClient.dispose();
|
|
50
52
|
this.manualTaskClient.dispose();
|
|
51
53
|
this.notificationClient.dispose();
|
|
@@ -54,6 +56,7 @@ class EngineClient {
|
|
|
54
56
|
this.untypedTaskClient.dispose();
|
|
55
57
|
this.userTaskClient.dispose();
|
|
56
58
|
this.identityAccessor.dispose();
|
|
59
|
+
this.socketIoManager.dispose();
|
|
57
60
|
}
|
|
58
61
|
/**
|
|
59
62
|
* Gets the url of the engine that this client is communicating with.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,mEAAgE;AAEhE,yDAAoE;AAEpE,MAAa,YAAY;IACN,SAAS,CAAS;IAClB,gBAAgB,CAAmB;IAEnC,qBAAqB,CAAoC;IACzD,iBAAiB,CAAgC;IACjD,aAAa,CAA4B;IACzC,wBAAwB,CAAuC;IAC/D,iBAAiB,CAAgC;IACjD,WAAW,CAA0B;IACrC,kBAAkB,CAA6B;IAC/C,sBAAsB,CAAqC;IAC3D,gBAAgB,CAA+B;IAC/C,kBAAkB,CAAiC;IACnD,uBAAuB,CAAsC;IAC7D,qBAAqB,CAAoC;IACzD,kBAAkB,CAAiC;IACnD,cAAc,CAA6B;
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ClientCredentialsIdentityAccessor = void 0;
|
|
4
|
-
const _1 = require("./");
|
|
5
4
|
const ClientFactory_1 = require("./ClientFactory");
|
|
6
5
|
const Retry_1 = require("./Retry");
|
|
7
|
-
|
|
6
|
+
const index_1 = require("./index");
|
|
7
|
+
class ClientCredentialsIdentityAccessor extends index_1.IdentityAccessor {
|
|
8
8
|
config;
|
|
9
9
|
constructor(clientCredentialsConfig) {
|
|
10
10
|
super(async () => {
|
|
@@ -12,6 +12,7 @@ class ClientCredentialsIdentityAccessor extends _1.IdentityAccessor {
|
|
|
12
12
|
return identity;
|
|
13
13
|
});
|
|
14
14
|
this.config = clientCredentialsConfig;
|
|
15
|
+
this.id = this.hash(JSON.stringify(clientCredentialsConfig ?? {}));
|
|
15
16
|
}
|
|
16
17
|
async getFreshIdentity(clientCredentialsConfig) {
|
|
17
18
|
const token = await this.getNewToken(clientCredentialsConfig);
|
|
@@ -33,13 +34,13 @@ class ClientCredentialsIdentityAccessor extends _1.IdentityAccessor {
|
|
|
33
34
|
const wellKnownUrl = new URL(`${authorityUrl}/.well-known/openid-configuration`);
|
|
34
35
|
let tokenSet;
|
|
35
36
|
try {
|
|
36
|
-
const config = await (0, Retry_1.executeWithRetry)(openIdClient.discovery
|
|
37
|
+
const config = await (0, Retry_1.executeWithRetry)(async () => openIdClient.discovery(wellKnownUrl, clientCredentialsConfig.clientId ?? '', clientCredentialsConfig.clientSecret, undefined, {
|
|
37
38
|
execute: [openIdClient.allowInsecureRequests],
|
|
38
39
|
}), `${wellKnownUrl} not available, retrying...`);
|
|
39
|
-
tokenSet = await (0, Retry_1.executeWithRetry)(openIdClient.clientCredentialsGrant
|
|
40
|
+
tokenSet = await (0, Retry_1.executeWithRetry)(async () => openIdClient.clientCredentialsGrant(config, { scope: clientCredentialsConfig.scope ?? '' }), `${wellKnownUrl} not available, retrying...`);
|
|
40
41
|
}
|
|
41
42
|
catch (err) {
|
|
42
|
-
this.logger.error('Error while getting new token from authority', { err, authorityUrl });
|
|
43
|
+
this.logger.error('Error while getting new token from authority', { err, authorityUrl, wellKnownUrl });
|
|
43
44
|
throw err;
|
|
44
45
|
}
|
|
45
46
|
if (tokenSet.access_token) {
|
|
@@ -66,7 +67,7 @@ class ClientCredentialsIdentityAccessor extends _1.IdentityAccessor {
|
|
|
66
67
|
async getAuthorityUrlFromEngineUrl(engineUrl) {
|
|
67
68
|
try {
|
|
68
69
|
const applicationInfoClient = ClientFactory_1.ClientFactory.createApplicationInfoClient(engineUrl);
|
|
69
|
-
const authorityAddress = await (0, Retry_1.executeWithRetry)(applicationInfoClient.getAuthorityAddress
|
|
70
|
+
const authorityAddress = await (0, Retry_1.executeWithRetry)(async () => applicationInfoClient.getAuthorityAddress(), `${engineUrl} not available, retrying...`);
|
|
70
71
|
return authorityAddress;
|
|
71
72
|
}
|
|
72
73
|
catch (err) {
|
|
@@ -74,6 +75,17 @@ class ClientCredentialsIdentityAccessor extends _1.IdentityAccessor {
|
|
|
74
75
|
throw err;
|
|
75
76
|
}
|
|
76
77
|
}
|
|
78
|
+
hash(str) {
|
|
79
|
+
// djb2 constants
|
|
80
|
+
let hash = 5381;
|
|
81
|
+
const product = 33;
|
|
82
|
+
let i = str.length;
|
|
83
|
+
while (i) {
|
|
84
|
+
hash = (hash * product) ^ str.charCodeAt(--i);
|
|
85
|
+
}
|
|
86
|
+
const numericalHash = hash >>> 0;
|
|
87
|
+
return numericalHash + '';
|
|
88
|
+
}
|
|
77
89
|
}
|
|
78
90
|
exports.ClientCredentialsIdentityAccessor = ClientCredentialsIdentityAccessor;
|
|
79
91
|
//# sourceMappingURL=ClientCredentialsIdentityAccessor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientCredentialsIdentityAccessor.js","sourceRoot":"","sources":["../../src/ClientCredentialsIdentityAccessor.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"ClientCredentialsIdentityAccessor.js","sourceRoot":"","sources":["../../src/ClientCredentialsIdentityAccessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,9 @@ class ExternalTaskClient {
|
|
|
16
16
|
getEngineUrl() {
|
|
17
17
|
return this.engineUrl;
|
|
18
18
|
}
|
|
19
|
+
dispose() {
|
|
20
|
+
this.identityAccessor?.dispose();
|
|
21
|
+
}
|
|
19
22
|
async subscribeToExternalTaskTopic(topic, processingFunction, config) {
|
|
20
23
|
const extendedConfig = { ...config };
|
|
21
24
|
extendedConfig.identity = IdentityAccessor_1.IdentityAccessor.wrap(extendedConfig.identity ?? this.identityAccessor, this.engineUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskHttpClient.js","sourceRoot":"","sources":["../../../src/Clients/ExternalTaskHttpClient.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAC3D,0DAAuD;AAGvD,MAAa,kBAAkB;IACrB,SAAS,CAAS;IAElB,gBAAgB,CAAmB;IAE3C,YAAY,SAAiB,EAAE,QAA2B;QACxD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,mCAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,KAAa,EACb,kBAAkF,EAClF,MAAkC;QAElC,MAAM,cAAc,GAA8B,EAAE,GAAG,MAAM,EAAE,CAAC;QAChE,cAAc,CAAC,QAAQ,GAAG,mCAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAElH,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAE7G,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"ExternalTaskHttpClient.js","sourceRoot":"","sources":["../../../src/Clients/ExternalTaskHttpClient.ts"],"names":[],"mappings":";;;AAAA,8DAA2D;AAC3D,0DAAuD;AAGvD,MAAa,kBAAkB;IACrB,SAAS,CAAS;IAElB,gBAAgB,CAAmB;IAE3C,YAAY,SAAiB,EAAE,QAA2B;QACxD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,GAAG,mCAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACI,YAAY;QACjB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,4BAA4B,CACvC,KAAa,EACb,kBAAkF,EAClF,MAAkC;QAElC,MAAM,cAAc,GAA8B,EAAE,GAAG,MAAM,EAAE,CAAC;QAChE,cAAc,CAAC,QAAQ,GAAG,mCAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAElH,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,kBAAkB,EAAE,cAAc,CAAC,CAAC;QAE7G,OAAO,kBAAkB,CAAC;IAC5B,CAAC;CACF;AAjCD,gDAiCC"}
|
|
@@ -51,60 +51,38 @@ class SocketIoManager {
|
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
53
|
socketForIdentity.disconnect();
|
|
54
|
-
socketForIdentity.
|
|
54
|
+
socketForIdentity.removeAllListeners();
|
|
55
55
|
if (this.socketCollection[accessor.getId()].identityRefreshSubscription) {
|
|
56
56
|
accessor.removeOnNewIdentityListener(this.socketCollection[accessor.getId()].identityRefreshSubscription);
|
|
57
57
|
}
|
|
58
58
|
delete this.socketCollection[accessor.getId()];
|
|
59
59
|
}
|
|
60
60
|
dispose() {
|
|
61
|
-
const
|
|
62
|
-
for (const socketId of sockets) {
|
|
61
|
+
for (const socketId of Object.keys(this.socketCollection)) {
|
|
63
62
|
this.socketCollection[socketId]?.socket?.disconnect();
|
|
64
|
-
this.socketCollection[socketId]?.socket?.
|
|
63
|
+
this.socketCollection[socketId]?.socket?.removeAllListeners();
|
|
65
64
|
if (this.socketCollection[socketId]?.identityRefreshSubscription) {
|
|
66
65
|
this.socketCollection[socketId].identityAccessor.removeOnNewIdentityListener(this.socketCollection[socketId].identityRefreshSubscription);
|
|
67
66
|
}
|
|
67
|
+
if (this.socketCollection[socketId]?.identityAccessor) {
|
|
68
|
+
this.socketCollection[socketId]?.identityAccessor?.dispose();
|
|
69
|
+
}
|
|
68
70
|
delete this.socketCollection[socketId];
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
73
|
createSocketIoSubscriptionSync(accessor, eventName, callback, subscribeOnce) {
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
try {
|
|
75
|
-
const socketForIdentity = await this.createSocketForIdentity(accessor);
|
|
76
|
-
if (subscribeOnce) {
|
|
77
|
-
socketForIdentity.once(eventName, callback);
|
|
78
|
-
}
|
|
79
|
-
else {
|
|
80
|
-
socketForIdentity.on(eventName, callback);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
catch (error) {
|
|
84
|
-
this.logger.error('Error while creating socket.io subscription, aborting subscription', { err: error, eventName: eventName });
|
|
85
|
-
this.removeSocketIoSubscription(accessor, subscription);
|
|
86
|
-
}
|
|
87
|
-
};
|
|
88
|
-
createSocketInBackground();
|
|
89
|
-
return subscription;
|
|
74
|
+
this.createSocketForIdentitySync(accessor);
|
|
75
|
+
return this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
90
76
|
}
|
|
91
77
|
async createSocketIoSubscription(accessor, eventName, callback, subscribeOnce) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
socketForIdentity.once(eventName, callback);
|
|
95
|
-
}
|
|
96
|
-
else {
|
|
97
|
-
socketForIdentity.on(eventName, callback);
|
|
98
|
-
}
|
|
99
|
-
const subscription = this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
100
|
-
return subscription;
|
|
78
|
+
await this.createSocketForIdentity(accessor);
|
|
79
|
+
return this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
101
80
|
}
|
|
102
81
|
removeSocketIoSubscription(accessor, subscription) {
|
|
103
|
-
const
|
|
104
|
-
if (!
|
|
82
|
+
const socketContext = this.getSocketContext(accessor);
|
|
83
|
+
if (!socketContext.socket) {
|
|
105
84
|
return;
|
|
106
85
|
}
|
|
107
|
-
const socketContext = this.getSocketContext(accessor);
|
|
108
86
|
const eventSubscriptions = socketContext.subscriptions[subscription.eventName];
|
|
109
87
|
if (!eventSubscriptions) {
|
|
110
88
|
return;
|
|
@@ -113,22 +91,26 @@ class SocketIoManager {
|
|
|
113
91
|
if (!subscriptionContext) {
|
|
114
92
|
return;
|
|
115
93
|
}
|
|
116
|
-
|
|
94
|
+
socketContext.socket.off(subscription.eventName, subscriptionContext.callback);
|
|
95
|
+
delete socketContext.subscriptions[subscription.eventName];
|
|
117
96
|
delete eventSubscriptions[subscription.id];
|
|
118
|
-
if (Object.keys(eventSubscriptions).length === 0) {
|
|
119
|
-
socketForIdentity.off(subscription.eventName, callbackToRemove);
|
|
120
|
-
delete socketContext.subscriptions[subscription.eventName];
|
|
121
|
-
}
|
|
122
97
|
}
|
|
123
98
|
getSocketForIdentity(accessor) {
|
|
124
99
|
return this.socketCollection[accessor.getId()]?.socket;
|
|
125
100
|
}
|
|
101
|
+
createSocketForIdentitySync(accessor) {
|
|
102
|
+
const identity = accessor.getIdentitySync();
|
|
103
|
+
return this.buildSocketWithContext(accessor, identity);
|
|
104
|
+
}
|
|
126
105
|
async createSocketForIdentity(accessor) {
|
|
106
|
+
const identity = await accessor.getIdentity();
|
|
107
|
+
return this.buildSocketWithContext(accessor, identity);
|
|
108
|
+
}
|
|
109
|
+
buildSocketWithContext(accessor, identity) {
|
|
127
110
|
const existingSocket = this.getSocketForIdentity(accessor);
|
|
128
111
|
if (existingSocket) {
|
|
129
112
|
return existingSocket;
|
|
130
113
|
}
|
|
131
|
-
const identity = await accessor.getIdentity();
|
|
132
114
|
const noAuthTokenProvided = !(typeof identity?.token === 'string');
|
|
133
115
|
if (noAuthTokenProvided) {
|
|
134
116
|
throw new processcube_engine_sdk_1.UnauthorizedError('No auth token provided!');
|
|
@@ -152,7 +134,7 @@ class SocketIoManager {
|
|
|
152
134
|
const socketContext = this.getSocketContext(accessor);
|
|
153
135
|
socketContext.socket = socket;
|
|
154
136
|
socketContext.identityAccessor = accessor;
|
|
155
|
-
this.applySubscriptionsToSocket(socketContext);
|
|
137
|
+
// this.applySubscriptionsToSocket(socketContext);
|
|
156
138
|
return socket;
|
|
157
139
|
}
|
|
158
140
|
getSocketContext(accessor) {
|
|
@@ -160,12 +142,14 @@ class SocketIoManager {
|
|
|
160
142
|
return this.socketCollection[accessor.getId()];
|
|
161
143
|
}
|
|
162
144
|
ensureSocketContextIsinitialized(accessor) {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
145
|
+
if (!Object.hasOwn(this.socketCollection, accessor.getId())) {
|
|
146
|
+
this.socketCollection[accessor.getId()] = {
|
|
147
|
+
subscriptions: {},
|
|
148
|
+
identityAccessor: accessor,
|
|
149
|
+
socket: null,
|
|
150
|
+
identityRefreshSubscription: null,
|
|
151
|
+
};
|
|
152
|
+
}
|
|
169
153
|
if (!this.socketCollection[accessor.getId()].identityRefreshSubscription) {
|
|
170
154
|
this.socketCollection[accessor.getId()].identityRefreshSubscription = this.getRecreateWhenIdentityIsRefreshedFunction(this.socketCollection[accessor.getId()]);
|
|
171
155
|
accessor.onNewIdentity(this.socketCollection[accessor.getId()].identityRefreshSubscription);
|
|
@@ -179,25 +163,33 @@ class SocketIoManager {
|
|
|
179
163
|
onlyReceiveOnce: subscribeOnce,
|
|
180
164
|
};
|
|
181
165
|
const socketContext = this.getSocketContext(accessor);
|
|
182
|
-
|
|
166
|
+
if (subscribeOnce) {
|
|
167
|
+
socketContext.socket.once(eventName, callback);
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
socketContext.socket.on(eventName, callback);
|
|
171
|
+
}
|
|
172
|
+
if (!socketContext.subscriptions[eventName]) {
|
|
173
|
+
socketContext.subscriptions[eventName] = {};
|
|
174
|
+
}
|
|
183
175
|
socketContext.subscriptions[eventName][subscriptionId] = {
|
|
184
176
|
subscription: subscription,
|
|
185
177
|
callback: callback,
|
|
186
178
|
};
|
|
187
179
|
return subscription;
|
|
188
180
|
}
|
|
189
|
-
getRecreateWhenIdentityIsRefreshedFunction(
|
|
181
|
+
getRecreateWhenIdentityIsRefreshedFunction(socketContext) {
|
|
190
182
|
return async (identity) => {
|
|
191
|
-
this.logger.info(`Recreating socket.io connection for identity ${identity?.userId ??
|
|
192
|
-
const oldSocket =
|
|
193
|
-
this.socketCollection[SocketContext.identityAccessor.getId()].socket = undefined;
|
|
194
|
-
const newSocket = await this.createSocketForIdentity(SocketContext.identityAccessor);
|
|
183
|
+
this.logger.info(`Recreating socket.io connection for identity ${identity?.userId ?? socketContext.identityAccessor.getId()}`);
|
|
184
|
+
const oldSocket = socketContext.socket;
|
|
195
185
|
if (oldSocket) {
|
|
196
186
|
oldSocket.removeAllListeners();
|
|
197
187
|
oldSocket.disconnect();
|
|
198
|
-
oldSocket.close();
|
|
199
188
|
}
|
|
200
|
-
|
|
189
|
+
this.socketCollection[socketContext.identityAccessor.getId()].socket = undefined;
|
|
190
|
+
const newSocket = await this.createSocketForIdentity(socketContext.identityAccessor);
|
|
191
|
+
this.applySubscriptionsToSocket(socketContext);
|
|
192
|
+
socketContext.socket = newSocket;
|
|
201
193
|
};
|
|
202
194
|
}
|
|
203
195
|
applySubscriptionsToSocket(socketContext) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SocketIoManager.js","sourceRoot":"","sources":["../../../../src/Clients/Lib/SocketIoManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA8C;AAC9C,2CAA6B;AAE7B,2EAAmG;AAGnG,6CAAmD;AAkBnD,MAAa,eAAe;IACT,SAAS,CAAS;IAC3B,MAAM,GAAG,IAAI,+BAAM,CAAC,iCAAiC,CAAC,CAAC;IAEvD,gBAAgB,GAA6B,EAAE,CAAC;IAExD,YAAY,SAAiB;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAEM,gBAAgB,CAAC,QAA0B;QAChD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAE9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,iBAAiB,CAAC,UAAU,EAAE,CAAC;QAC/B,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"SocketIoManager.js","sourceRoot":"","sources":["../../../../src/Clients/Lib/SocketIoManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,7 @@ class ExternalTaskExecution {
|
|
|
74
74
|
async dispose() {
|
|
75
75
|
this.removeAbortSignalSubscription();
|
|
76
76
|
this.stopLockingInterval();
|
|
77
|
+
// we explicitly do not dispose the identityAccessor here, since it is shared with the ExternalTaskWorker
|
|
77
78
|
}
|
|
78
79
|
stopLockingInterval() {
|
|
79
80
|
if (this.interval) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalTaskExecution.js","sourceRoot":"","sources":["../../src/ExternalTaskExecution.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ExternalTaskExecution.js","sourceRoot":"","sources":["../../src/ExternalTaskExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ class ExternalTaskWorker {
|
|
|
63
63
|
this.longpollingTimeout = config?.longpollingTimeout ?? 10000;
|
|
64
64
|
this.lockDuration = config?.lockDuration ?? 30000;
|
|
65
65
|
this.payloadFilter = config?.payloadFilter;
|
|
66
|
-
this.externalTaskClient = new ExternalTaskApiHttpClient_1.ExternalTaskApiClient(engineUrl, this.
|
|
66
|
+
this.externalTaskClient = new ExternalTaskApiHttpClient_1.ExternalTaskApiClient(engineUrl, this.identityAccessor);
|
|
67
67
|
}
|
|
68
68
|
/**
|
|
69
69
|
* @deprecated Use getIdentity instead.
|
|
@@ -103,6 +103,7 @@ class ExternalTaskWorker {
|
|
|
103
103
|
}
|
|
104
104
|
dispose() {
|
|
105
105
|
this.externalTaskClient.dispose();
|
|
106
|
+
this.identityAccessor?.dispose();
|
|
106
107
|
}
|
|
107
108
|
async processExternalTasks() {
|
|
108
109
|
let errorCount = 0;
|
|
@@ -114,6 +115,9 @@ class ExternalTaskWorker {
|
|
|
114
115
|
errorCount = 0;
|
|
115
116
|
}
|
|
116
117
|
catch (error) {
|
|
118
|
+
if (this.abortSignal?.aborted) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
117
121
|
logger.error('Failed to fetch and lock External Tasks.', { err: error });
|
|
118
122
|
errorCount++;
|
|
119
123
|
const timeoutOffset = (Math.floor(Math.random() * 10) + 1) * 30;
|
|
@@ -135,7 +139,7 @@ class ExternalTaskWorker {
|
|
|
135
139
|
}
|
|
136
140
|
}
|
|
137
141
|
async fetchAndLockExternalTasks() {
|
|
138
|
-
return this.externalTaskClient.fetchAndLockExternalTasks(this.workerId, this.topic, this.maxTasks, this.longpollingTimeout, this.lockDuration, this.payloadFilter,
|
|
142
|
+
return this.externalTaskClient.fetchAndLockExternalTasks(this.workerId, this.topic, this.maxTasks, this.longpollingTimeout, this.lockDuration, this.payloadFilter, this.identityAccessor, this.abortSignal);
|
|
139
143
|
}
|
|
140
144
|
async startExecutingExternalTask(externalTask) {
|
|
141
145
|
try {
|
|
@@ -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;AAGtD,MAAM,MAAM,GAAG,IAAI,+BAAM,CAAC,sBAAsB,CAAC,CAAC;AAElD,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,gBAAgB,CAAmB;IACnC,cAAc,GAAG,KAAK,CAAC;IACvB,kBAAkB,CAAwB;IAC1C,kBAAkB,GAAuB,IAAI,CAAC;IAC9C,eAAe,CAAkB;IACjC,WAAW,CAAc;IAEjC,YAAY,SAAiB,EAAE,KAAa,EAAE,kBAAkF,EAAE,MAAkC;QAClK,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,QAAQ,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QAC/C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,IAAI,CAAC,gBAAgB,GAAG,mCAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAC3E,IAAI,CAAC,QAAQ,GAAG,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,kBAAkB,GAAG,MAAM,EAAE,kBAAkB,IAAI,KAAK,CAAC;QAC9D,IAAI,CAAC,YAAY,GAAG,MAAM,EAAE,YAAY,IAAI,KAAK,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,MAAM,EAAE,aAAa,CAAC;QAE3C,IAAI,CAAC,kBAAkB,GAAG,IAAI,iDAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ExternalTaskWorker.js","sourceRoot":"","sources":["../../src/ExternalTaskWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,28 +40,41 @@ exports.IdentityAccessor = void 0;
|
|
|
40
40
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
41
41
|
const uuid = __importStar(require("uuid"));
|
|
42
42
|
const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
43
|
-
const
|
|
43
|
+
const index_1 = require("./index");
|
|
44
44
|
const dummyIdentity = {
|
|
45
45
|
token: 'ZHVtbXlfdG9rZW4=',
|
|
46
46
|
userId: 'dummy_token',
|
|
47
47
|
};
|
|
48
48
|
class IdentityAccessor {
|
|
49
49
|
static wrap(identity, engineUrl) {
|
|
50
|
+
if (identity instanceof IdentityAccessor) {
|
|
51
|
+
return identity;
|
|
52
|
+
}
|
|
53
|
+
let accessor;
|
|
50
54
|
if (!identity) {
|
|
51
|
-
|
|
55
|
+
accessor = new IdentityAccessor();
|
|
52
56
|
}
|
|
53
|
-
else if (identity
|
|
54
|
-
|
|
57
|
+
else if (typeof identity === 'function') {
|
|
58
|
+
accessor = new IdentityAccessor(identity);
|
|
55
59
|
}
|
|
56
60
|
else if (isClientCredentialsConfig(identity)) {
|
|
57
61
|
if (!identity.engineUrl && engineUrl) {
|
|
58
62
|
identity.engineUrl = engineUrl;
|
|
59
63
|
}
|
|
60
|
-
|
|
64
|
+
accessor = new index_1.ClientCredentialsIdentityAccessor(identity);
|
|
65
|
+
}
|
|
66
|
+
else if (!identity.token) {
|
|
67
|
+
const invalidIdentity = new processcube_engine_sdk_1.BadRequestError(`The given identity is invalid. Required property 'token' is missing.`);
|
|
68
|
+
invalidIdentity.additionalInformation = {
|
|
69
|
+
configuredIdentity: identity,
|
|
70
|
+
};
|
|
71
|
+
throw invalidIdentity;
|
|
61
72
|
}
|
|
62
73
|
else {
|
|
63
|
-
|
|
74
|
+
accessor = new IdentityAccessor(identity);
|
|
64
75
|
}
|
|
76
|
+
accessor.initialize();
|
|
77
|
+
return accessor;
|
|
65
78
|
}
|
|
66
79
|
identityGetter;
|
|
67
80
|
latestIdentity;
|
|
@@ -71,30 +84,41 @@ class IdentityAccessor {
|
|
|
71
84
|
identityAvailableResolve;
|
|
72
85
|
identityAvailableReject;
|
|
73
86
|
refreshTimeout;
|
|
87
|
+
disposed = false;
|
|
88
|
+
isDynamicRefreshObject = false;
|
|
74
89
|
logger = new processcube_engine_sdk_1.Logger('engine-client:identity-accessor');
|
|
75
90
|
newIdentityCallbacks = [];
|
|
76
91
|
asyncLock = new async_lock_1.default({ maxPending: 100000 });
|
|
77
92
|
constructor(staticOrDynamicIdentity) {
|
|
78
93
|
if (typeof staticOrDynamicIdentity === 'function') {
|
|
94
|
+
this.id = uuid.v4();
|
|
79
95
|
this.identityGetter = staticOrDynamicIdentity;
|
|
96
|
+
this.isDynamicRefreshObject = true;
|
|
80
97
|
}
|
|
81
98
|
else if (staticOrDynamicIdentity) {
|
|
99
|
+
this.id = staticOrDynamicIdentity?.userId ?? uuid.v4();
|
|
100
|
+
this.latestIdentity = staticOrDynamicIdentity;
|
|
82
101
|
this.identityGetter = async () => staticOrDynamicIdentity;
|
|
83
102
|
}
|
|
84
103
|
else {
|
|
104
|
+
this.id = dummyIdentity.userId;
|
|
105
|
+
this.latestIdentity = dummyIdentity;
|
|
85
106
|
this.identityGetter = async () => dummyIdentity;
|
|
86
107
|
}
|
|
87
108
|
this.identityAvailablePromise = new Promise((resolve, reject) => {
|
|
88
109
|
this.identityAvailableResolve = resolve;
|
|
89
110
|
this.identityAvailableReject = reject;
|
|
90
111
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
this.
|
|
112
|
+
}
|
|
113
|
+
initialize() {
|
|
114
|
+
this.refreshIdentityIfNeeded();
|
|
94
115
|
}
|
|
95
116
|
getId() {
|
|
96
117
|
return this.id;
|
|
97
118
|
}
|
|
119
|
+
getIdentitySync() {
|
|
120
|
+
return this.latestIdentity;
|
|
121
|
+
}
|
|
98
122
|
async getIdentity() {
|
|
99
123
|
await this.waitUntilIdentityIsAvailable();
|
|
100
124
|
return this.latestIdentity;
|
|
@@ -112,7 +136,6 @@ class IdentityAccessor {
|
|
|
112
136
|
if (!this.latestIdentity) {
|
|
113
137
|
throw new Error('Identity not yet initialized');
|
|
114
138
|
}
|
|
115
|
-
// this.refreshIdentityIfNeeded();
|
|
116
139
|
return this.latestIdentity;
|
|
117
140
|
}
|
|
118
141
|
onNewIdentity(callback) {
|
|
@@ -121,10 +144,16 @@ class IdentityAccessor {
|
|
|
121
144
|
removeOnNewIdentityListener(callback) {
|
|
122
145
|
this.newIdentityCallbacks = this.newIdentityCallbacks.filter((cb) => cb !== callback);
|
|
123
146
|
}
|
|
147
|
+
/**
|
|
148
|
+
* The IdentityAccesor creates a refresh timer, which needs to be disposed.
|
|
149
|
+
* This method should be called when the IdentityAccessor is not needed anymore.
|
|
150
|
+
* If any Client using this will be disposed, the IdentityAccessor will be disposed as well.
|
|
151
|
+
*/
|
|
124
152
|
dispose() {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
153
|
+
clearTimeout(this.refreshTimeout);
|
|
154
|
+
this.refreshTimeout = undefined;
|
|
155
|
+
this.identityAvailableResolve();
|
|
156
|
+
this.disposed = true;
|
|
128
157
|
}
|
|
129
158
|
getBaseMinRefreshTimeInMs() {
|
|
130
159
|
const fiveMinutes = 5 * 60 * 1000;
|
|
@@ -132,16 +161,17 @@ class IdentityAccessor {
|
|
|
132
161
|
}
|
|
133
162
|
async refreshIdentityIfNeeded() {
|
|
134
163
|
await this.asyncLock.acquire('refreshIdentity', async () => {
|
|
164
|
+
clearTimeout(this.refreshTimeout);
|
|
135
165
|
let failedCritically = false;
|
|
136
166
|
try {
|
|
137
167
|
this.latestIdentity = await this.identityGetter();
|
|
138
168
|
if (this.latestIdentity == dummyIdentity || this.latestIdentity?.token == dummyIdentity.token) {
|
|
139
|
-
this.expirationTimeInMs =
|
|
169
|
+
this.expirationTimeInMs = 0;
|
|
140
170
|
this.identityAvailableResolve();
|
|
141
171
|
}
|
|
142
172
|
else if (this.latestIdentity?.token) {
|
|
143
173
|
const decodedToken = this.getDecodedToken(this.latestIdentity.token);
|
|
144
|
-
this.expirationTimeInMs = decodedToken?.exp ? decodedToken.exp * 1000 :
|
|
174
|
+
this.expirationTimeInMs = decodedToken?.exp ? decodedToken.exp * 1000 : 0;
|
|
145
175
|
this.identityAvailableResolve();
|
|
146
176
|
const announceNewIdentity = async () => {
|
|
147
177
|
try {
|
|
@@ -153,6 +183,9 @@ class IdentityAccessor {
|
|
|
153
183
|
};
|
|
154
184
|
announceNewIdentity();
|
|
155
185
|
}
|
|
186
|
+
else {
|
|
187
|
+
this.identityAvailableResolve();
|
|
188
|
+
}
|
|
156
189
|
}
|
|
157
190
|
catch (err) {
|
|
158
191
|
this.logger.error('Error while refreshing identity', { err });
|
|
@@ -160,11 +193,13 @@ class IdentityAccessor {
|
|
|
160
193
|
!err.message ||
|
|
161
194
|
!['ETIMEDOUT', 'ECONNRESET', 'ECONNREFUSED', 'other side closed', 'SocketError', 'EAI_AGAIN', 'EHOSTUNREACH', 'EPIPE', 'ECONNABORTED', 'EHOSTDOWN'].some((errorString) => err.message.includes(errorString));
|
|
162
195
|
}
|
|
163
|
-
const canBeRefreshed = this.expirationTimeInMs
|
|
196
|
+
const canBeRefreshed = this.expirationTimeInMs > 0 && !failedCritically && !this.disposed && this.isDynamicRefreshObject;
|
|
164
197
|
if (canBeRefreshed) {
|
|
165
198
|
const timeUntilNextRefresh = Math.max((this.expirationTimeInMs ?? 0) - Date.now() - this.getBaseMinRefreshTimeInMs(), this.getBaseMinRefreshTimeInMs());
|
|
166
199
|
const timeUntilNextRefresh32Bit = Math.min(timeUntilNextRefresh, 2147483647);
|
|
167
|
-
this.refreshTimeout = setTimeout(
|
|
200
|
+
this.refreshTimeout = setTimeout(() => {
|
|
201
|
+
this.refreshIdentityIfNeeded();
|
|
202
|
+
}, timeUntilNextRefresh32Bit);
|
|
168
203
|
}
|
|
169
204
|
else if (failedCritically) {
|
|
170
205
|
this.logger.error('Identity refresh failed critically and wont be refreshed anymore.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IdentityAccessor.js","sourceRoot":"","sources":["../../src/IdentityAccessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAmC;AACnC,2CAA6B;AAE7B,
|
|
1
|
+
{"version":3,"file":"IdentityAccessor.js","sourceRoot":"","sources":["../../src/IdentityAccessor.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-9a10f4-m4shjfuy",
|
|
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",
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
"@trivago/prettier-plugin-sort-imports": "^5.2.0",
|
|
53
53
|
"@types/node": "^22.10.2",
|
|
54
54
|
"prettier": "^3.3.2",
|
|
55
|
-
"typescript": "^5.5.3"
|
|
55
|
+
"typescript": "^5.5.3",
|
|
56
|
+
"why-is-node-running": "^3.2.1"
|
|
56
57
|
}
|
|
57
58
|
}
|