@5minds/processcube_engine_client 5.1.2-hotfix-d85690-m4r6pszp → 5.1.2-hotfix-e43b02-m4rh1h65
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/ClientCredentialsIdentityAccessor.d.ts +1 -1
- package/dist/Clients/Lib/SocketIoManager.d.ts +2 -0
- package/dist/IdentityAccessor.d.ts +10 -11
- package/dist/commonjs/ClientCredentialsIdentityAccessor.js +2 -2
- package/dist/commonjs/ClientCredentialsIdentityAccessor.js.map +1 -1
- package/dist/commonjs/Clients/Lib/SocketIoManager.js +40 -45
- package/dist/commonjs/Clients/Lib/SocketIoManager.js.map +1 -1
- package/dist/commonjs/IdentityAccessor.js +26 -21
- package/dist/commonjs/IdentityAccessor.js.map +1 -1
- package/package.json +1 -1
|
@@ -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);
|
|
@@ -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,7 +1,15 @@
|
|
|
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
|
-
private static cleanupRegistry;
|
|
5
13
|
private identityGetter;
|
|
6
14
|
private latestIdentity;
|
|
7
15
|
private expirationTimeInMs;
|
|
@@ -10,7 +18,6 @@ export declare class IdentityAccessor {
|
|
|
10
18
|
private identityAvailableResolve;
|
|
11
19
|
private identityAvailableReject;
|
|
12
20
|
private refreshTimeout;
|
|
13
|
-
private initialTimeout;
|
|
14
21
|
private disposed;
|
|
15
22
|
private isDynamicRefreshObject;
|
|
16
23
|
protected logger: Logger;
|
|
@@ -18,6 +25,7 @@ export declare class IdentityAccessor {
|
|
|
18
25
|
private asyncLock;
|
|
19
26
|
constructor(staticOrDynamicIdentity?: Identity | (() => Promise<Identity>) | (() => Identity));
|
|
20
27
|
getId(): string;
|
|
28
|
+
getIdentitySync(): Identity;
|
|
21
29
|
getIdentity(): Promise<Identity>;
|
|
22
30
|
/**
|
|
23
31
|
* This method only waits the first time the identity is retrieved from any remote source to ensure no missing references occur.
|
|
@@ -39,12 +47,3 @@ export declare class IdentityAccessor {
|
|
|
39
47
|
private refreshIdentityIfNeeded;
|
|
40
48
|
private getDecodedToken;
|
|
41
49
|
}
|
|
42
|
-
export type IdentityLike = Identity | (() => Promise<Identity>) | (() => Identity) | IdentityAccessor | ClientCredentialsConfig;
|
|
43
|
-
export type ClientCredentialsConfig = {
|
|
44
|
-
authorityUrl?: string;
|
|
45
|
-
engineUrl?: string;
|
|
46
|
-
baseMinRefreshTimeInMs?: number;
|
|
47
|
-
clientId: string;
|
|
48
|
-
clientSecret: string;
|
|
49
|
-
scope: string;
|
|
50
|
-
};
|
|
@@ -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 () => {
|
|
@@ -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":";;;AAEA,mDAAgD;AAChD,mCAA2C;AAC3C,mCAAoE;AAEpE,MAAa,iCAAkC,SAAQ,wBAAgB;IAC7D,MAAM,CAA0B;IAExC,YAAY,uBAAgD;QAC1D,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;YACtE,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,uBAAuB,CAAC;QACtC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,uBAAuB,IAAI,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,uBAAgD;QAC5E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;QAE9D,OAAO;YACL,KAAK;YACL,MAAM,EAAE,uBAAuB,CAAC,QAAQ,IAAI,EAAE;SAC/C,CAAC;IACJ,CAAC;IAES,yBAAyB;QACjC,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QAElC,IAAI,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,MAAM,CAAC,sBAAsB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC;QACnG,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,uBAAgD;QACxE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;QACzE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAElD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,GAAG,YAAY,mCAAmC,CAAC,CAAC;QAEjF,IAAI,QAAa,CAAC;QAElB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,EACnC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,YAAY,EAAE,uBAAuB,CAAC,QAAQ,IAAI,EAAE,EAAE,uBAAuB,CAAC,YAAY,EAAE,SAAS,EAAE;gBACzJ,OAAO,EAAE,CAAC,YAAY,CAAC,qBAAqB,CAAC;aAC9C,CAAC,EACF,GAAG,YAAY,6BAA6B,CAC7C,CAAC;YAEF,QAAQ,GAAG,MAAM,IAAA,wBAAgB,EAC/B,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,uBAAuB,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC,EACrI,GAAG,YAAY,6BAA6B,CAC7C,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;YACzF,MAAM,GAAG,CAAC;QACZ,CAAC;QAED,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC1B,OAAO,QAAQ,CAAC,YAAY,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;QACnD,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAA+B;QAC3D,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,OAAO,MAAM,CAAC,YAAY,CAAC;QAC7B,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,SAAiB;QAC1D,IAAI,CAAC;YACH,MAAM,qBAAqB,GAAG,6BAAa,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC;YAEnF,MAAM,gBAAgB,GAAG,MAAM,IAAA,wBAAgB,EAAS,qBAAqB,CAAC,mBAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,GAAG,SAAS,6BAA6B,CAAC,CAAC;YAE1K,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;YAC3F,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,IAAI,CAAC,GAAW;QACtB,iBAAiB;QACjB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,MAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QAEnB,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,CAAC;QAEjC,OAAO,aAAa,GAAG,EAAE,CAAC;IAC5B,CAAC;CACF;AA9GD,8EA8GC"}
|
|
@@ -41,14 +41,14 @@ class SocketIoManager {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
socketForIdentity.disconnect();
|
|
44
|
+
socketForIdentity.removeAllListeners();
|
|
44
45
|
if (this.socketCollection[accessor.getId()].identityRefreshSubscription) {
|
|
45
46
|
accessor.removeOnNewIdentityListener(this.socketCollection[accessor.getId()].identityRefreshSubscription);
|
|
46
47
|
}
|
|
47
48
|
delete this.socketCollection[accessor.getId()];
|
|
48
49
|
}
|
|
49
50
|
dispose() {
|
|
50
|
-
const
|
|
51
|
-
for (const socketId of sockets) {
|
|
51
|
+
for (const socketId of Object.keys(this.socketCollection)) {
|
|
52
52
|
this.socketCollection[socketId]?.socket?.disconnect();
|
|
53
53
|
this.socketCollection[socketId]?.socket?.removeAllListeners();
|
|
54
54
|
if (this.socketCollection[socketId]?.identityRefreshSubscription) {
|
|
@@ -61,35 +61,12 @@ class SocketIoManager {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
createSocketIoSubscriptionSync(accessor, eventName, callback, subscribeOnce) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
try {
|
|
67
|
-
const socketForIdentity = await this.createSocketForIdentity(accessor);
|
|
68
|
-
if (subscribeOnce) {
|
|
69
|
-
socketForIdentity.once(eventName, callback);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
socketForIdentity.on(eventName, callback);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
catch (error) {
|
|
76
|
-
this.logger.error('Error while creating socket.io subscription, aborting subscription', { err: error, eventName: eventName });
|
|
77
|
-
this.removeSocketIoSubscription(accessor, subscription);
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
|
-
createSocketInBackground();
|
|
81
|
-
return subscription;
|
|
64
|
+
this.createSocketForIdentitySync(accessor);
|
|
65
|
+
return this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
82
66
|
}
|
|
83
67
|
async createSocketIoSubscription(accessor, eventName, callback, subscribeOnce) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
socketForIdentity.once(eventName, callback);
|
|
87
|
-
}
|
|
88
|
-
else {
|
|
89
|
-
socketForIdentity.on(eventName, callback);
|
|
90
|
-
}
|
|
91
|
-
const subscription = this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
92
|
-
return subscription;
|
|
68
|
+
await this.createSocketForIdentity(accessor);
|
|
69
|
+
return this.addNewSubscriptionToSocketContext(accessor, eventName, callback, subscribeOnce);
|
|
93
70
|
}
|
|
94
71
|
removeSocketIoSubscription(accessor, subscription) {
|
|
95
72
|
const socketForIdentity = this.getSocketForIdentity(accessor);
|
|
@@ -106,21 +83,28 @@ class SocketIoManager {
|
|
|
106
83
|
return;
|
|
107
84
|
}
|
|
108
85
|
const callbackToRemove = subscriptionContext.callback;
|
|
109
|
-
delete eventSubscriptions[subscription.id];
|
|
110
86
|
if (Object.keys(eventSubscriptions).length === 0) {
|
|
111
87
|
socketForIdentity.off(subscription.eventName, callbackToRemove);
|
|
112
88
|
delete socketContext.subscriptions[subscription.eventName];
|
|
113
89
|
}
|
|
90
|
+
delete eventSubscriptions[subscription.id];
|
|
114
91
|
}
|
|
115
92
|
getSocketForIdentity(accessor) {
|
|
116
93
|
return this.socketCollection[accessor.getId()]?.socket;
|
|
117
94
|
}
|
|
95
|
+
createSocketForIdentitySync(accessor) {
|
|
96
|
+
const identity = accessor.getIdentitySync();
|
|
97
|
+
return this.buildSocketWithContext(accessor, identity);
|
|
98
|
+
}
|
|
118
99
|
async createSocketForIdentity(accessor) {
|
|
100
|
+
const identity = await accessor.getIdentity();
|
|
101
|
+
return this.buildSocketWithContext(accessor, identity);
|
|
102
|
+
}
|
|
103
|
+
buildSocketWithContext(accessor, identity) {
|
|
119
104
|
const existingSocket = this.getSocketForIdentity(accessor);
|
|
120
105
|
if (existingSocket) {
|
|
121
106
|
return existingSocket;
|
|
122
107
|
}
|
|
123
|
-
const identity = await accessor.getIdentity();
|
|
124
108
|
const noAuthTokenProvided = !(typeof identity?.token === 'string');
|
|
125
109
|
if (noAuthTokenProvided) {
|
|
126
110
|
throw new processcube_engine_sdk_1.UnauthorizedError('No auth token provided!');
|
|
@@ -144,7 +128,7 @@ class SocketIoManager {
|
|
|
144
128
|
const socketContext = this.getSocketContext(accessor);
|
|
145
129
|
socketContext.socket = socket;
|
|
146
130
|
socketContext.identityAccessor = accessor;
|
|
147
|
-
this.applySubscriptionsToSocket(socketContext);
|
|
131
|
+
// this.applySubscriptionsToSocket(socketContext);
|
|
148
132
|
return socket;
|
|
149
133
|
}
|
|
150
134
|
getSocketContext(accessor) {
|
|
@@ -152,12 +136,14 @@ class SocketIoManager {
|
|
|
152
136
|
return this.socketCollection[accessor.getId()];
|
|
153
137
|
}
|
|
154
138
|
ensureSocketContextIsinitialized(accessor) {
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
139
|
+
if (!Object.hasOwn(this.socketCollection, accessor.getId())) {
|
|
140
|
+
this.socketCollection[accessor.getId()] = {
|
|
141
|
+
subscriptions: {},
|
|
142
|
+
identityAccessor: accessor,
|
|
143
|
+
socket: null,
|
|
144
|
+
identityRefreshSubscription: null,
|
|
145
|
+
};
|
|
146
|
+
}
|
|
161
147
|
if (!this.socketCollection[accessor.getId()].identityRefreshSubscription) {
|
|
162
148
|
this.socketCollection[accessor.getId()].identityRefreshSubscription = this.getRecreateWhenIdentityIsRefreshedFunction(this.socketCollection[accessor.getId()]);
|
|
163
149
|
accessor.onNewIdentity(this.socketCollection[accessor.getId()].identityRefreshSubscription);
|
|
@@ -171,24 +157,33 @@ class SocketIoManager {
|
|
|
171
157
|
onlyReceiveOnce: subscribeOnce,
|
|
172
158
|
};
|
|
173
159
|
const socketContext = this.getSocketContext(accessor);
|
|
174
|
-
|
|
160
|
+
if (subscribeOnce) {
|
|
161
|
+
socketContext.socket.once(eventName, callback);
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
socketContext.socket.on(eventName, callback);
|
|
165
|
+
}
|
|
166
|
+
if (!socketContext.subscriptions[eventName]) {
|
|
167
|
+
socketContext.subscriptions[eventName] = {};
|
|
168
|
+
}
|
|
175
169
|
socketContext.subscriptions[eventName][subscriptionId] = {
|
|
176
170
|
subscription: subscription,
|
|
177
171
|
callback: callback,
|
|
178
172
|
};
|
|
179
173
|
return subscription;
|
|
180
174
|
}
|
|
181
|
-
getRecreateWhenIdentityIsRefreshedFunction(
|
|
175
|
+
getRecreateWhenIdentityIsRefreshedFunction(socketContext) {
|
|
182
176
|
return async (identity) => {
|
|
183
|
-
this.logger.info(`Recreating socket.io connection for identity ${identity?.userId ??
|
|
184
|
-
const oldSocket =
|
|
185
|
-
this.socketCollection[SocketContext.identityAccessor.getId()].socket = undefined;
|
|
186
|
-
const newSocket = await this.createSocketForIdentity(SocketContext.identityAccessor);
|
|
177
|
+
this.logger.info(`Recreating socket.io connection for identity ${identity?.userId ?? socketContext.identityAccessor.getId()}`);
|
|
178
|
+
const oldSocket = socketContext.socket;
|
|
187
179
|
if (oldSocket) {
|
|
188
180
|
oldSocket.removeAllListeners();
|
|
189
181
|
oldSocket.disconnect();
|
|
190
182
|
}
|
|
191
|
-
|
|
183
|
+
this.socketCollection[socketContext.identityAccessor.getId()].socket = undefined;
|
|
184
|
+
const newSocket = await this.createSocketForIdentity(socketContext.identityAccessor);
|
|
185
|
+
this.applySubscriptionsToSocket(socketContext);
|
|
186
|
+
socketContext.socket = newSocket;
|
|
192
187
|
};
|
|
193
188
|
}
|
|
194
189
|
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;
|
|
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,kBAAkB,EAAE,CAAC;QAEvC,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,EAAE,CAAC;YACxE,QAAQ,CAAC,2BAA2B,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IACjD,CAAC;IAEM,OAAO;QACZ,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC1D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;YACtD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YAC9D,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,2BAA2B,EAAE,CAAC;gBACjE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,2BAA2B,CAAC,CAAC;YAC5I,CAAC;YAED,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;gBACtD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;YAC/D,CAAC;YAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAEM,8BAA8B,CAAC,QAA0B,EAAE,SAAiB,EAAE,QAAkC,EAAE,aAAsB;QAC7I,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QAE3C,OAAO,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC9F,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,QAA0B,EAAE,SAAiB,EAAE,QAAkC,EAAE,aAAsB;QAC/I,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC9F,CAAC;IAEM,0BAA0B,CAAC,QAA0B,EAAE,YAA0B;QACtF,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,kBAAkB,GAAG,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC/E,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,QAAQ,CAAC;QAEtD,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YAChE,OAAO,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,kBAAkB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAEM,oBAAoB,CAAC,QAA0B;QACpD,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,MAAM,CAAC;IACzD,CAAC;IAEO,2BAA2B,CAAC,QAA0B;QAC5D,MAAM,QAAQ,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC;QAE5C,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,QAA0B;QAC9D,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;QAE9C,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACzD,CAAC;IAEO,sBAAsB,CAAC,QAA0B,EAAE,QAAkB;QAC3E,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,MAAM,mBAAmB,GAAG,CAAC,CAAC,OAAO,QAAQ,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC;QACnE,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,IAAI,0CAAiB,CAAC,yBAAyB,CAAC,CAAC;QACzD,CAAC;QAED,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC;QAC5E,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAEvJ,MAAM,SAAS,GAAG,GAAG,QAAQ,IAAI,sBAAc,CAAC,SAAS,EAAE,CAAC;QAE5D,MAAM,OAAO,GAAG,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAErG,MAAM,MAAM,GAAG,IAAA,qBAAE,EAAC,SAAS,EAAE;YAC3B,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,YAAY,CAAC,CAAC,CAAC,YAAY;YACrD,gBAAgB,EAAE;gBAChB,OAAO,EAAE;oBACP,YAAY,EAAE;wBACZ,aAAa,EAAE,QAAQ,CAAC,KAAK;wBAC7B,MAAM,EAAE,QAAQ,CAAC,MAAM;qBACxB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtD,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC;QAC9B,aAAa,CAAC,gBAAgB,GAAG,QAAQ,CAAC;QAE1C,kDAAkD;QAElD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,QAA0B;QACjD,IAAI,CAAC,gCAAgC,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IACjD,CAAC;IAEO,gCAAgC,CAAC,QAA0B;QACjE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG;gBACxC,aAAa,EAAE,EAAE;gBACjB,gBAAgB,EAAE,QAAQ;gBAC1B,MAAM,EAAE,IAAI;gBACZ,2BAA2B,EAAE,IAAI;aAClC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,EAAE,CAAC;YACzE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,GAAG,IAAI,CAAC,0CAA0C,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC/J,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,2BAA2B,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;IAEO,iCAAiC,CAAC,QAA0B,EAAE,SAAiB,EAAE,QAAkC,EAAE,aAAsB;QACjJ,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAY,CAAC;QAC3C,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,cAAc;YAClB,SAAS,EAAE,SAAS;YACpB,eAAe,EAAE,aAAa;SACf,CAAC;QAElB,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAEtD,IAAI,aAAa,EAAE,CAAC;YAClB,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;QACD,aAAa,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,cAAc,CAAC,GAAG;YACvD,YAAY,EAAE,YAAY;YAC1B,QAAQ,EAAE,QAAQ;SACnB,CAAC;QAEF,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,0CAA0C,CAAC,aAA4B;QAC7E,OAAO,KAAK,EAAE,QAAkB,EAAE,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,QAAQ,EAAE,MAAM,IAAI,aAAa,CAAC,gBAAgB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAE/H,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC;YAEvC,IAAI,SAAS,EAAE,CAAC;gBACd,SAAS,CAAC,kBAAkB,EAAE,CAAC;gBAC/B,SAAS,CAAC,UAAU,EAAE,CAAC;YACzB,CAAC;YAED,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;YACjF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YAErF,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,CAAC;YAC/C,aAAa,CAAC,MAAM,GAAG,SAAS,CAAC;QACnC,CAAC,CAAC;IACJ,CAAC;IAEO,0BAA0B,CAAC,aAA4B;QAC7D,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa,CAAC;QAClD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;QAEpC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACnD,MAAM,oBAAoB,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;gBACxC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC;oBAC7D,IAAI,CAAC;wBACH,IAAI,UAAU,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC;4BAC5C,IAAI,CAAC,0BAA0B,CAAC,aAAa,CAAC,gBAAgB,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;wBAC3F,CAAC;wBAED,MAAM,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;oBACrC,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;oBACtG,CAAC;gBACH,CAAC;YACH,CAAC,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC;gBACpC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAxOD,0CAwOC"}
|
|
@@ -30,7 +30,7 @@ exports.IdentityAccessor = void 0;
|
|
|
30
30
|
const async_lock_1 = __importDefault(require("async-lock"));
|
|
31
31
|
const uuid = __importStar(require("uuid"));
|
|
32
32
|
const processcube_engine_sdk_1 = require("@5minds/processcube_engine_sdk");
|
|
33
|
-
const
|
|
33
|
+
const index_1 = require("./index");
|
|
34
34
|
const dummyIdentity = {
|
|
35
35
|
token: 'ZHVtbXlfdG9rZW4=',
|
|
36
36
|
userId: 'dummy_token',
|
|
@@ -40,22 +40,23 @@ class IdentityAccessor {
|
|
|
40
40
|
if (!identity) {
|
|
41
41
|
return new IdentityAccessor();
|
|
42
42
|
}
|
|
43
|
-
|
|
43
|
+
if (identity instanceof IdentityAccessor) {
|
|
44
44
|
return identity;
|
|
45
45
|
}
|
|
46
|
-
|
|
46
|
+
if (isClientCredentialsConfig(identity)) {
|
|
47
47
|
if (!identity.engineUrl && engineUrl) {
|
|
48
48
|
identity.engineUrl = engineUrl;
|
|
49
49
|
}
|
|
50
|
-
return new
|
|
50
|
+
return new index_1.ClientCredentialsIdentityAccessor(identity);
|
|
51
51
|
}
|
|
52
|
-
|
|
53
|
-
|
|
52
|
+
if (!identity.token) {
|
|
53
|
+
const invalidIdentity = new processcube_engine_sdk_1.BadRequestError(`The given identity is invalid. Required property 'token' is missing.`);
|
|
54
|
+
invalidIdentity.additionalInformation = {
|
|
55
|
+
configuredIdentity: identity,
|
|
56
|
+
};
|
|
54
57
|
}
|
|
58
|
+
return new IdentityAccessor(identity);
|
|
55
59
|
}
|
|
56
|
-
static cleanupRegistry = new FinalizationRegistry((timeout) => {
|
|
57
|
-
clearTimeout(timeout);
|
|
58
|
-
});
|
|
59
60
|
identityGetter;
|
|
60
61
|
latestIdentity;
|
|
61
62
|
expirationTimeInMs;
|
|
@@ -64,7 +65,6 @@ class IdentityAccessor {
|
|
|
64
65
|
identityAvailableResolve;
|
|
65
66
|
identityAvailableReject;
|
|
66
67
|
refreshTimeout;
|
|
67
|
-
initialTimeout;
|
|
68
68
|
disposed = false;
|
|
69
69
|
isDynamicRefreshObject = false;
|
|
70
70
|
logger = new processcube_engine_sdk_1.Logger('engine-client:identity-accessor');
|
|
@@ -78,23 +78,26 @@ class IdentityAccessor {
|
|
|
78
78
|
}
|
|
79
79
|
else if (staticOrDynamicIdentity) {
|
|
80
80
|
this.id = staticOrDynamicIdentity?.userId ?? uuid.v4();
|
|
81
|
+
this.latestIdentity = staticOrDynamicIdentity;
|
|
81
82
|
this.identityGetter = async () => staticOrDynamicIdentity;
|
|
82
83
|
}
|
|
83
84
|
else {
|
|
84
|
-
this.id =
|
|
85
|
+
this.id = dummyIdentity.userId;
|
|
86
|
+
this.latestIdentity = dummyIdentity;
|
|
85
87
|
this.identityGetter = async () => dummyIdentity;
|
|
86
88
|
}
|
|
87
89
|
this.identityAvailablePromise = new Promise((resolve, reject) => {
|
|
88
90
|
this.identityAvailableResolve = resolve;
|
|
89
91
|
this.identityAvailableReject = reject;
|
|
90
92
|
});
|
|
91
|
-
this.
|
|
92
|
-
IdentityAccessor.cleanupRegistry.register(this, this.initialTimeout, this);
|
|
93
|
-
IdentityAccessor.cleanupRegistry.register(this, this.refreshTimeout, this);
|
|
93
|
+
this.refreshIdentityIfNeeded();
|
|
94
94
|
}
|
|
95
95
|
getId() {
|
|
96
96
|
return this.id;
|
|
97
97
|
}
|
|
98
|
+
getIdentitySync() {
|
|
99
|
+
return this.latestIdentity;
|
|
100
|
+
}
|
|
98
101
|
async getIdentity() {
|
|
99
102
|
await this.waitUntilIdentityIsAvailable();
|
|
100
103
|
return this.latestIdentity;
|
|
@@ -127,9 +130,7 @@ class IdentityAccessor {
|
|
|
127
130
|
*/
|
|
128
131
|
dispose() {
|
|
129
132
|
clearTimeout(this.refreshTimeout);
|
|
130
|
-
clearTimeout(this.initialTimeout);
|
|
131
133
|
this.refreshTimeout = undefined;
|
|
132
|
-
this.initialTimeout = undefined;
|
|
133
134
|
this.identityAvailableResolve();
|
|
134
135
|
this.disposed = true;
|
|
135
136
|
}
|
|
@@ -139,18 +140,17 @@ class IdentityAccessor {
|
|
|
139
140
|
}
|
|
140
141
|
async refreshIdentityIfNeeded() {
|
|
141
142
|
await this.asyncLock.acquire('refreshIdentity', async () => {
|
|
142
|
-
clearTimeout(this.initialTimeout);
|
|
143
143
|
clearTimeout(this.refreshTimeout);
|
|
144
144
|
let failedCritically = false;
|
|
145
145
|
try {
|
|
146
146
|
this.latestIdentity = await this.identityGetter();
|
|
147
147
|
if (this.latestIdentity == dummyIdentity || this.latestIdentity?.token == dummyIdentity.token) {
|
|
148
|
-
this.expirationTimeInMs =
|
|
148
|
+
this.expirationTimeInMs = 0;
|
|
149
149
|
this.identityAvailableResolve();
|
|
150
150
|
}
|
|
151
151
|
else if (this.latestIdentity?.token) {
|
|
152
152
|
const decodedToken = this.getDecodedToken(this.latestIdentity.token);
|
|
153
|
-
this.expirationTimeInMs = decodedToken?.exp ? decodedToken.exp * 1000 :
|
|
153
|
+
this.expirationTimeInMs = decodedToken?.exp ? decodedToken.exp * 1000 : 0;
|
|
154
154
|
this.identityAvailableResolve();
|
|
155
155
|
const announceNewIdentity = async () => {
|
|
156
156
|
try {
|
|
@@ -162,6 +162,9 @@ class IdentityAccessor {
|
|
|
162
162
|
};
|
|
163
163
|
announceNewIdentity();
|
|
164
164
|
}
|
|
165
|
+
else {
|
|
166
|
+
this.identityAvailableResolve();
|
|
167
|
+
}
|
|
165
168
|
}
|
|
166
169
|
catch (err) {
|
|
167
170
|
this.logger.error('Error while refreshing identity', { err });
|
|
@@ -169,11 +172,13 @@ class IdentityAccessor {
|
|
|
169
172
|
!err.message ||
|
|
170
173
|
!['ETIMEDOUT', 'ECONNRESET', 'ECONNREFUSED', 'other side closed', 'SocketError', 'EAI_AGAIN', 'EHOSTUNREACH', 'EPIPE', 'ECONNABORTED', 'EHOSTDOWN'].some((errorString) => err.message.includes(errorString));
|
|
171
174
|
}
|
|
172
|
-
const canBeRefreshed = this.expirationTimeInMs
|
|
175
|
+
const canBeRefreshed = this.expirationTimeInMs > 0 && !failedCritically && !this.disposed && this.isDynamicRefreshObject;
|
|
173
176
|
if (canBeRefreshed) {
|
|
174
177
|
const timeUntilNextRefresh = Math.max((this.expirationTimeInMs ?? 0) - Date.now() - this.getBaseMinRefreshTimeInMs(), this.getBaseMinRefreshTimeInMs());
|
|
175
178
|
const timeUntilNextRefresh32Bit = Math.min(timeUntilNextRefresh, 2147483647);
|
|
176
|
-
this.refreshTimeout = setTimeout(
|
|
179
|
+
this.refreshTimeout = setTimeout(() => {
|
|
180
|
+
this.refreshIdentityIfNeeded();
|
|
181
|
+
}, timeUntilNextRefresh32Bit);
|
|
177
182
|
}
|
|
178
183
|
else if (failedCritically) {
|
|
179
184
|
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": "5.1.2-hotfix-
|
|
7
|
+
"version": "5.1.2-hotfix-e43b02-m4rh1h65",
|
|
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",
|