itrm-tools 1.3.16-beta.14 → 1.3.16-beta.15
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/api/request/crud/common/ComponentManager.js.map +1 -1
- package/dist/api/request/crud/common/ServiceSessionManager.d.ts +5 -0
- package/dist/api/request/crud/common/ServiceSessionManager.js +117 -25
- package/dist/api/request/crud/common/ServiceSessionManager.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ComponentManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ComponentManager.ts"],"names":[],"mappings":";;;AACA,8DAAwF;
|
|
1
|
+
{"version":3,"file":"ComponentManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ComponentManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,9 +13,14 @@ export declare class ServiceSessionManager {
|
|
|
13
13
|
private authToken?;
|
|
14
14
|
constructor(service: string, role: string, application: string, platform: string, referer: string, secretKey: string, sessionServiceUrl: string);
|
|
15
15
|
requestHeaders(): Promise<AxiosRequestConfig>;
|
|
16
|
+
private tryUseExistingToken;
|
|
17
|
+
private requestNewToken;
|
|
16
18
|
private checkKeys;
|
|
17
19
|
private requestKeys;
|
|
18
20
|
private isCurrentKeysValid;
|
|
21
|
+
private handleTokenExpiration;
|
|
22
|
+
private exponentialBackoff;
|
|
23
|
+
private isUnauthorizedError;
|
|
19
24
|
buildHeaders(additionalHeaders?: Record<string, string>): {
|
|
20
25
|
headers: Record<string, string>;
|
|
21
26
|
};
|
|
@@ -5,6 +5,8 @@ const AesCipheringAlgorithm_1 = require("../../../../cryptography/algorithm/AesC
|
|
|
5
5
|
const ApiKeySigner_1 = require("../../../../cryptography/sign/ApiKeySigner");
|
|
6
6
|
const RequestAxiosCall_1 = require("../../RequestAxiosCall");
|
|
7
7
|
const APIRequest_1 = require("../../../APIRequest");
|
|
8
|
+
const MAX_RETRIES = 3;
|
|
9
|
+
const RETRY_DELAY_MS = 100; // Base delay for exponential backoff
|
|
8
10
|
class ServiceSessionManager {
|
|
9
11
|
cipheringAlgorithm;
|
|
10
12
|
apiKeySigner;
|
|
@@ -29,36 +31,84 @@ class ServiceSessionManager {
|
|
|
29
31
|
this.platform = platform;
|
|
30
32
|
}
|
|
31
33
|
async requestHeaders() {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
};
|
|
34
|
+
let attempts = 0;
|
|
35
|
+
while (attempts < MAX_RETRIES) {
|
|
36
|
+
try {
|
|
37
|
+
if (!(await this.checkKeys())) {
|
|
38
|
+
console.warn(`[${this.application}/${this.service}] Failed to obtain or validate keys (attempt ${attempts + 1}/${MAX_RETRIES})`);
|
|
39
|
+
attempts++;
|
|
40
|
+
await this.exponentialBackoff(attempts);
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
// Try to validate and use existing token
|
|
44
|
+
const existingTokenHeaders = await this.tryUseExistingToken(attempts);
|
|
45
|
+
if (existingTokenHeaders) {
|
|
46
|
+
return existingTokenHeaders;
|
|
47
|
+
}
|
|
48
|
+
// Request new token
|
|
49
|
+
const newTokenHeaders = await this.requestNewToken(attempts);
|
|
50
|
+
if (newTokenHeaders) {
|
|
51
|
+
return newTokenHeaders;
|
|
52
52
|
}
|
|
53
|
+
// Both attempts failed, retry
|
|
54
|
+
attempts++;
|
|
55
|
+
await this.exponentialBackoff(attempts);
|
|
53
56
|
}
|
|
54
|
-
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.error(`[${this.application}/${this.service}] Unexpected error in requestHeaders (attempt ${attempts + 1}/${MAX_RETRIES}):`, error);
|
|
59
|
+
attempts++;
|
|
60
|
+
await this.exponentialBackoff(attempts);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
console.error(`[${this.application}/${this.service}] Failed to obtain auth headers after ${MAX_RETRIES} attempts`);
|
|
64
|
+
return {};
|
|
65
|
+
}
|
|
66
|
+
async tryUseExistingToken(attemptNumber) {
|
|
67
|
+
if (!this.authToken)
|
|
68
|
+
return null;
|
|
69
|
+
try {
|
|
70
|
+
const response = await RequestAxiosCall_1.RequestAxiosCall.post(`${this.sessionServiceUrl}/service/validate/token`, {
|
|
71
|
+
payload: this.encryptPayload(`${this.application}:${this.service}:${this.authToken}`),
|
|
72
|
+
}, this.buildHeaders({
|
|
73
|
+
authorization: `${this.application} ${this.apiKeySigner.sign({
|
|
74
|
+
method: APIRequest_1.RequestMethod.POST,
|
|
75
|
+
path: `/service/validate/token`,
|
|
76
|
+
}, this.keys)}`
|
|
77
|
+
}));
|
|
78
|
+
if (response.success && response.payload) {
|
|
79
|
+
console.debug(`[${this.application}/${this.service}] Existing token is still valid`);
|
|
80
|
+
return {
|
|
81
|
+
headers: {
|
|
82
|
+
Referer: this.encryptPayload(this.serviceReferer),
|
|
83
|
+
Authorization: `Bearer ${this.authToken}`,
|
|
84
|
+
Platform: this.platform,
|
|
85
|
+
Application: this.application,
|
|
86
|
+
Service: this.service,
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
return null;
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
if (this.isUnauthorizedError(error)) {
|
|
94
|
+
console.warn(`[${this.application}/${this.service}] Token validation returned 401, triggering re-authentication`);
|
|
95
|
+
await this.handleTokenExpiration();
|
|
96
|
+
}
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
async requestNewToken(attemptNumber) {
|
|
101
|
+
try {
|
|
102
|
+
const tokenUrl = `${this.sessionServiceUrl}/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&service=${encodeURIComponent(this.service)}`;
|
|
103
|
+
const response = await RequestAxiosCall_1.RequestAxiosCall.get(tokenUrl, this.buildHeaders({
|
|
55
104
|
authorization: `${this.application} ${this.apiKeySigner.sign({
|
|
56
105
|
method: APIRequest_1.RequestMethod.GET,
|
|
57
106
|
path: `/service/token?role=${encodeURIComponent(this.role)}&application=${encodeURIComponent(this.application)}&platform=${encodeURIComponent(this.platform)}&service=${encodeURIComponent(this.service)}`,
|
|
58
107
|
}, this.keys)}`
|
|
59
108
|
}));
|
|
60
|
-
if (response.success) {
|
|
109
|
+
if (response.success && response.payload) {
|
|
61
110
|
this.authToken = response.payload;
|
|
111
|
+
console.debug(`[${this.application}/${this.service}] Successfully obtained new auth token`);
|
|
62
112
|
return {
|
|
63
113
|
headers: {
|
|
64
114
|
Referer: this.encryptPayload(this.serviceReferer),
|
|
@@ -69,8 +119,19 @@ class ServiceSessionManager {
|
|
|
69
119
|
},
|
|
70
120
|
};
|
|
71
121
|
}
|
|
122
|
+
console.warn(`[${this.application}/${this.service}] Token request returned unsuccessful response (attempt ${attemptNumber + 1}/${MAX_RETRIES})`);
|
|
123
|
+
return null;
|
|
124
|
+
}
|
|
125
|
+
catch (error) {
|
|
126
|
+
if (this.isUnauthorizedError(error)) {
|
|
127
|
+
console.warn(`[${this.application}/${this.service}] Token request returned 401, refreshing credentials (attempt ${attemptNumber + 1}/${MAX_RETRIES})`);
|
|
128
|
+
await this.handleTokenExpiration();
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
console.error(`[${this.application}/${this.service}] Error during token request (attempt ${attemptNumber + 1}/${MAX_RETRIES}):`, error);
|
|
132
|
+
}
|
|
133
|
+
return null;
|
|
72
134
|
}
|
|
73
|
-
return {};
|
|
74
135
|
}
|
|
75
136
|
async checkKeys() {
|
|
76
137
|
this.keys = this.keys ?? await this.requestKeys();
|
|
@@ -83,12 +144,19 @@ class ServiceSessionManager {
|
|
|
83
144
|
const response = await RequestAxiosCall_1.RequestAxiosCall.get(`${this.sessionServiceUrl}/service/credentials?service=${encodeURIComponent(this.service)}&application=${encodeURIComponent(this.application)}`, this.buildHeaders());
|
|
84
145
|
if (response.success) {
|
|
85
146
|
this.keys = JSON.parse(this.decryptPayload(response.payload));
|
|
147
|
+
console.debug(`[${this.application}/${this.service}] Successfully obtained new credentials`);
|
|
86
148
|
return this.keys;
|
|
87
149
|
}
|
|
150
|
+
console.warn(`[${this.application}/${this.service}] Credentials request returned unsuccessful response`);
|
|
88
151
|
return undefined;
|
|
89
152
|
}
|
|
90
153
|
catch (error) {
|
|
91
|
-
|
|
154
|
+
if (this.isUnauthorizedError(error)) {
|
|
155
|
+
console.error(`[${this.application}/${this.service}] Credentials request returned 401 - authentication system may be unavailable`);
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
console.error(`[${this.application}/${this.service}] Failed to request new keys:`, error);
|
|
159
|
+
}
|
|
92
160
|
return undefined;
|
|
93
161
|
}
|
|
94
162
|
}
|
|
@@ -101,12 +169,36 @@ class ServiceSessionManager {
|
|
|
101
169
|
return response.success && response.payload;
|
|
102
170
|
}
|
|
103
171
|
catch (error) {
|
|
104
|
-
|
|
172
|
+
if (this.isUnauthorizedError(error)) {
|
|
173
|
+
console.warn(`[${this.application}/${this.service}] Key validation returned 401, keys are expired or invalid`);
|
|
174
|
+
}
|
|
175
|
+
else {
|
|
176
|
+
console.error(`[${this.application}/${this.service}] Key validation failed, will attempt to refetch:`, error);
|
|
177
|
+
}
|
|
105
178
|
return false;
|
|
106
179
|
}
|
|
107
180
|
}
|
|
108
181
|
return false;
|
|
109
182
|
}
|
|
183
|
+
async handleTokenExpiration() {
|
|
184
|
+
console.info(`[${this.application}/${this.service}] Clearing expired credentials and keys`);
|
|
185
|
+
this.authToken = undefined;
|
|
186
|
+
this.keys = undefined;
|
|
187
|
+
}
|
|
188
|
+
async exponentialBackoff(attemptNumber) {
|
|
189
|
+
if (attemptNumber >= MAX_RETRIES)
|
|
190
|
+
return;
|
|
191
|
+
const delayMs = RETRY_DELAY_MS * Math.pow(2, attemptNumber - 1);
|
|
192
|
+
console.debug(`[${this.application}/${this.service}] Waiting ${delayMs}ms before retry`);
|
|
193
|
+
await new Promise(resolve => setTimeout(resolve, delayMs));
|
|
194
|
+
}
|
|
195
|
+
isUnauthorizedError(error) {
|
|
196
|
+
if (error && typeof error === 'object' && 'response' in error) {
|
|
197
|
+
const response = error.response;
|
|
198
|
+
return response?.status === 401;
|
|
199
|
+
}
|
|
200
|
+
return false;
|
|
201
|
+
}
|
|
110
202
|
buildHeaders(additionalHeaders) {
|
|
111
203
|
const headers = {
|
|
112
204
|
Referer: this.encryptPayload(this.serviceReferer),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceSessionManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ServiceSessionManager.ts"],"names":[],"mappings":";;;AACA,oGAAiG;AACjG,6EAA0E;AAE1E,6DAA0D;AAE1D,oDAAoD;AAEpD,MAAa,qBAAqB;IACf,kBAAkB,CAAwB;IAC1C,YAAY,CAAe;IAC3B,cAAc,CAAS;IACvB,gBAAgB,CAAS;IACzB,iBAAiB,CAAS;IAC1B,OAAO,CAAS;IAChB,IAAI,CAAS;IACb,WAAW,CAAS;IACpB,QAAQ,CAAS;IAC1B,IAAI,CAAoB;IACxB,SAAS,CAAU;IAE3B,YACE,OAAe,EACf,IAAY,EACZ,WAAmB,EACnB,QAAgB,EAChB,OAAe,EACf,SAAiB,EACjB,iBAAyB;QAEzB,IAAI,CAAC,kBAAkB,GAAG,IAAI,6CAAqB,EAAE,CAAC;QACtD,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC;QAC9B,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,cAAc;QACzB,IAAI,MAAM,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ServiceSessionManager.js","sourceRoot":"","sources":["../../../../../src/api/request/crud/common/ServiceSessionManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "itrm-tools",
|
|
3
|
-
"version": "1.3.16-beta.
|
|
3
|
+
"version": "1.3.16-beta.15",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/ITRMachines/itrm-tools#readme",
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@sequelize/sqlite3": "^7.0.0-alpha.
|
|
34
|
+
"@sequelize/sqlite3": "^7.0.0-alpha.47",
|
|
35
35
|
"@types/cors": "^2.8.19",
|
|
36
36
|
"@types/crypto-js": "^4.2.2",
|
|
37
|
-
"@types/express": "^5.0.
|
|
37
|
+
"@types/express": "^5.0.5",
|
|
38
38
|
"@types/jest": "^30.0.0",
|
|
39
39
|
"@types/morgan": "^1.9.10",
|
|
40
40
|
"@types/multer": "^2.0.0",
|
|
@@ -55,8 +55,8 @@
|
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@scalar/express-api-reference": "^0.8.22",
|
|
58
|
-
"@sequelize/core": "^7.0.0-alpha.
|
|
59
|
-
"axios": "^1.
|
|
58
|
+
"@sequelize/core": "^7.0.0-alpha.47",
|
|
59
|
+
"axios": "^1.13.0",
|
|
60
60
|
"axios-retry": "^4.5.0",
|
|
61
61
|
"cors": "^2.8.5",
|
|
62
62
|
"crypto-js": "^4.2.0",
|