@nsshunt/stsappframework 3.0.145 → 3.0.147
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/authutilsnode.js +29 -41
- package/dist/authutilsnode.js.map +1 -1
- package/dist/influxdb/influxDBManagerAgent.js +4 -0
- package/dist/influxdb/influxDBManagerAgent.js.map +1 -1
- package/dist/influxdb/influxDBManagerService.js +20 -16
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/package.json +16 -16
- package/src/authutilsnode.ts +42 -23
- package/src/influxdb/influxDBManagerAgent.ts +4 -0
- package/src/influxdb/influxDBManagerService.ts +20 -16
- package/types/authutilsnode.d.ts +9 -9
- package/types/authutilsnode.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerAgent.d.ts.map +1 -1
- package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
package/dist/authutilsnode.js
CHANGED
|
@@ -17,25 +17,7 @@ const stsutils_1 = require("@nsshunt/stsutils");
|
|
|
17
17
|
const errors_1 = require("./validation/errors");
|
|
18
18
|
const http_status_codes_1 = require("http-status-codes");
|
|
19
19
|
const chalk_1 = __importDefault(require("chalk"));
|
|
20
|
-
|
|
21
|
-
export enum STSClientID {
|
|
22
|
-
STSRest01Service = 'KgSyRECcvnJwwOZqf7GPqUw508sx7VBFEbDC0iP4oeY=',
|
|
23
|
-
STSAuthService = 'q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=',
|
|
24
|
-
STSUITerminal = 'U0E4c4cuRKlBsGo7OhOl3qTkoNGFBXjORUS/T4R4xyA=',
|
|
25
|
-
STSCLI = 'EcCpnQOIQFizAnWphlFJ4tSylosgVnwKTSNtgwuL2tw=',
|
|
26
|
-
STSUIWebApp = 'lww8Je8n2P0OI/KEfJ+4p/bqsk8uE/noeq13tl4zlQ0=',
|
|
27
|
-
XXSTSUserAgentRunnerX = 'y1h2nNr1BzTVPIzNmP/f041uxbnyZYTJeF/5GcwRCtw=',
|
|
28
|
-
STSInstrumentManagerService = 'l8u2E912eR44ZYRHUkSBCCnDOXxQqYOPahDVQzYowrw=',
|
|
29
|
-
STSTestOrchestratorService = 'CU1sVlS6vsEe3O3VvNzKFdBnQd9pQ83w9RyVx/7tJfc=',
|
|
30
|
-
STSTestRunnerNode = 'aX9dJbsT06V1G4j06xEIQ/rZ2CDlpzggU58aLtZ8fzE=',
|
|
31
|
-
STSBrokerService = 'TRppBuvxcjL7jrY9lCASJ5st8JpU8WlhAUAWoX/KKQ4=',
|
|
32
|
-
STSTestingService = '4Mtb3ABdSzZvSz4T51HPJhT14znVnqVDRFiZsvDNAOg=',
|
|
33
|
-
XXSTSAuthenticateSPAXX = 'v4qBrds3Autl/i86xT+5z0K53kJ/2hHTfxNo0QO/0Jk=',
|
|
34
|
-
STSTestRunnerAgentSPA = 'yDbklCH3awzDNuHICuco9mjDqhdzCa8m7w/UE9Opexc=',
|
|
35
|
-
STSClientApp01SPA = 'FDX/CPyDb3m6d9G2k+wDX8Uvey+yCkllaT4EuEt4QyU=',
|
|
36
|
-
PowerPlatformCustomConnectorSPA = 'fcdcebb5-d154-4699-b99d-87d29e5e148f'
|
|
37
|
-
}
|
|
38
|
-
*/
|
|
20
|
+
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
39
21
|
class AuthUtilsNode {
|
|
40
22
|
#cookiejar;
|
|
41
23
|
#httpsAgent = null;
|
|
@@ -172,15 +154,17 @@ class AuthUtilsNode {
|
|
|
172
154
|
const match = uri.match(this.#originRegex);
|
|
173
155
|
return match ? match[1] : null;
|
|
174
156
|
};
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
157
|
+
GetAPITokenFromAuthServerUsingScope = async (options, errorCb) => {
|
|
158
|
+
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
159
|
+
const invokeErrorCb = (error) => {
|
|
160
|
+
this.#debug(error);
|
|
161
|
+
if (instrumentController) {
|
|
162
|
+
instrumentController.UpdateInstrument(stsinstrumentation_1.Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, {
|
|
163
|
+
Inc: 1
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
errorCb(error);
|
|
167
|
+
};
|
|
184
168
|
try {
|
|
185
169
|
const scopes = scope.split(' ');
|
|
186
170
|
let origin = null;
|
|
@@ -209,7 +193,7 @@ class AuthUtilsNode {
|
|
|
209
193
|
}
|
|
210
194
|
}
|
|
211
195
|
if (error) {
|
|
212
|
-
|
|
196
|
+
invokeErrorCb(error);
|
|
213
197
|
return "";
|
|
214
198
|
}
|
|
215
199
|
const headers = { 'Content-Type': 'application/json' };
|
|
@@ -239,36 +223,40 @@ class AuthUtilsNode {
|
|
|
239
223
|
}
|
|
240
224
|
}
|
|
241
225
|
else {
|
|
242
|
-
|
|
243
|
-
this.#debug(msg);
|
|
244
|
-
errorCb(new Error(msg));
|
|
226
|
+
invokeErrorCb(new Error(chalk_1.default.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
245
227
|
return "";
|
|
246
228
|
}
|
|
247
229
|
if (retVal.data) {
|
|
248
230
|
if (retVal.data.access_token) {
|
|
231
|
+
if (instrumentController) {
|
|
232
|
+
instrumentController.UpdateInstrument(stsinstrumentation_1.Gauge.AUTHENTICATION_COUNT_GAUGE, {
|
|
233
|
+
Inc: 1
|
|
234
|
+
});
|
|
235
|
+
}
|
|
249
236
|
return retVal.data.access_token;
|
|
250
237
|
}
|
|
251
238
|
else {
|
|
252
|
-
|
|
253
|
-
this.#debug(msg);
|
|
254
|
-
errorCb(new Error(msg));
|
|
239
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`));
|
|
255
240
|
return "";
|
|
256
241
|
}
|
|
257
242
|
}
|
|
258
243
|
else {
|
|
259
|
-
|
|
260
|
-
this.#debug(msg);
|
|
261
|
-
errorCb(new Error(msg));
|
|
244
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`));
|
|
262
245
|
return "";
|
|
263
246
|
}
|
|
264
247
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
265
248
|
}
|
|
266
249
|
catch (error) {
|
|
267
|
-
|
|
250
|
+
let details = 'None available.';
|
|
268
251
|
if (error.response && error.response.data) {
|
|
269
|
-
|
|
252
|
+
try {
|
|
253
|
+
details = JSON.stringify(error.response.data);
|
|
254
|
+
}
|
|
255
|
+
catch (error) {
|
|
256
|
+
details = `Could not JSON.stringify(error.response.data)`;
|
|
257
|
+
}
|
|
270
258
|
}
|
|
271
|
-
|
|
259
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Details: [${details}]`));
|
|
272
260
|
return "";
|
|
273
261
|
}
|
|
274
262
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAiC;AACjC,kDAAyB;AACzB,gEAA+B;AAC/B,2CAAuC;AACvC,wDAAkC;AAElC,kDAA0B;AAE1B,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAA+B;AAE/B,gDAA+D;AAE/D,gDAA2D;AAE3D,yDAAgD;AAEhD,kDAA0B;
|
|
1
|
+
{"version":3,"file":"authutilsnode.js","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,8 @@ r1 =
|
|
|
22
22
|
or r["_field"] == "errorCount"
|
|
23
23
|
or r["_field"] == "retryCount"
|
|
24
24
|
or r["_field"] == "authenticationCount"
|
|
25
|
+
or r["_field"] == "authenticationErrorCount"
|
|
26
|
+
or r["_field"] == "authenticationRetryCount"
|
|
25
27
|
or r["_field"] == "activeRequestCount"
|
|
26
28
|
or r["_field"] == "coreCount"
|
|
27
29
|
or r["_field"] == "velocity"
|
|
@@ -279,6 +281,8 @@ class InfluxDBManagerAgent extends influxDBManagerBase_1.InfluxDBManagerBase {
|
|
|
279
281
|
.intField('errorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ERROR_COUNT_GAUGE].val) // j
|
|
280
282
|
.intField('retryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.RETRY_COUNT_GAUGE].val) // r
|
|
281
283
|
.intField('authenticationCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_COUNT_GAUGE].val) // b
|
|
284
|
+
.intField('authenticationErrorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val) // aa
|
|
285
|
+
.intField('authenticationRetryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val) // ab
|
|
282
286
|
.floatField('velocity', instrumentPayload.instruments[stsinstrumentation_1.Gauge.VELOCITY_GAUGE].va) // t - Note: Using va not val here
|
|
283
287
|
.intField('coreCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CORE_COUNT_GAUGE].val) // x
|
|
284
288
|
.floatField('rx', instrumentPayload.instruments[stsinstrumentation_1.Gauge.NETWORK_RX_GAUGE].va) // Note: Using va not val here
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;AACpG,4FAA4F;AAC5F,+GAA+G;;;;;;AAE/G
|
|
1
|
+
{"version":3,"file":"influxDBManagerAgent.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,22 +21,24 @@ data =
|
|
|
21
21
|
|
|
22
22
|
r1 =
|
|
23
23
|
data
|
|
24
|
-
|> filter(
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
24
|
+
|> filter(fn: (r) => r["_field"] == "requestCount"
|
|
25
|
+
or r["_field"] == "errorCount"
|
|
26
|
+
or r["_field"] == "retryCount"
|
|
27
|
+
or r["_field"] == "authenticationCount"
|
|
28
|
+
or r["_field"] == "authenticationErrorCount"
|
|
29
|
+
or r["_field"] == "authenticationRetryCount"
|
|
30
|
+
or r["_field"] == "activeRequestCount"
|
|
31
|
+
or r["_field"] == "connectionCount"
|
|
32
|
+
or r["_field"] == "connectionPoolCount"
|
|
33
|
+
or r["_field"] == "connectionIdleCount"
|
|
34
|
+
or r["_field"] == "connectionWaitingCount"
|
|
35
|
+
or r["_field"] == "coreCount"
|
|
36
|
+
or r["_field"] == "cpu"
|
|
37
|
+
or r["_field"] == "systemcpu"
|
|
38
|
+
or r["_field"] == "velocity"
|
|
39
|
+
or r["_field"] == "timer"
|
|
40
|
+
or r["_field"] == "rx"
|
|
41
|
+
or r["_field"] == "tx")
|
|
40
42
|
|
|
41
43
|
r2 =
|
|
42
44
|
data
|
|
@@ -325,6 +327,8 @@ data
|
|
|
325
327
|
.intField('errorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ERROR_COUNT_GAUGE].val)
|
|
326
328
|
.intField('retryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.RETRY_COUNT_GAUGE].val)
|
|
327
329
|
.intField('authenticationCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_COUNT_GAUGE].val)
|
|
330
|
+
.intField('authenticationErrorCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val)
|
|
331
|
+
.intField('authenticationRetryCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val)
|
|
328
332
|
.floatField('velocity', instrumentPayload.instruments[stsinstrumentation_1.Gauge.VELOCITY_GAUGE].va) // Note: Using va not val here
|
|
329
333
|
.floatField('cpu', instrumentPayload.instruments[stsinstrumentation_1.Gauge.CPU_LOAD_GAUGE].val)
|
|
330
334
|
.intField('activeRequestCount', instrumentPayload.instruments[stsinstrumentation_1.Gauge.ACTIVE_REQUEST_GAUGE].val)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":";AAAA,wFAAwF,CAAE,UAAU;AACpG,4FAA4F;AAC5F,+GAA+G;;;;;;AAE/G
|
|
1
|
+
{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.147",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
},
|
|
26
26
|
"homepage": "https://github.com/nsshunt/stsappframework#readme",
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@babel/preset-env": "^7.23.
|
|
28
|
+
"@babel/preset-env": "^7.23.6",
|
|
29
29
|
"@babel/preset-typescript": "^7.23.3",
|
|
30
30
|
"@tsconfig/node20": "^20.1.2",
|
|
31
31
|
"@types/cookie-parser": "^1.4.6",
|
|
@@ -36,23 +36,23 @@
|
|
|
36
36
|
"@types/lodash": "^4.14.202",
|
|
37
37
|
"@types/pg": "^8.10.9",
|
|
38
38
|
"@types/uuid": "^9.0.7",
|
|
39
|
-
"@typescript-eslint/eslint-plugin": "^6.
|
|
40
|
-
"@typescript-eslint/parser": "^6.
|
|
41
|
-
"eslint": "^8.
|
|
39
|
+
"@typescript-eslint/eslint-plugin": "^6.15.0",
|
|
40
|
+
"@typescript-eslint/parser": "^6.15.0",
|
|
41
|
+
"eslint": "^8.56.0",
|
|
42
42
|
"jest": "^29.7.0",
|
|
43
43
|
"supertest": "^6.3.3",
|
|
44
|
-
"testcontainers": "^10.
|
|
44
|
+
"testcontainers": "^10.4.0",
|
|
45
45
|
"typescript": "^5.3.3"
|
|
46
46
|
},
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"@influxdata/influxdb-client": "^1.33.2",
|
|
49
49
|
"@influxdata/influxdb-client-apis": "^1.33.2",
|
|
50
|
-
"@nsshunt/stsconfig": "^1.25.
|
|
51
|
-
"@nsshunt/stsdatamanagement": "^1.17.
|
|
52
|
-
"@nsshunt/stsinstrumentation": "^7.0.
|
|
53
|
-
"@nsshunt/stspublisherserver": "^2.0.
|
|
54
|
-
"@nsshunt/stssocketio-client": "^1.0.
|
|
55
|
-
"@nsshunt/stsutils": "^1.16.
|
|
50
|
+
"@nsshunt/stsconfig": "^1.25.75",
|
|
51
|
+
"@nsshunt/stsdatamanagement": "^1.17.151",
|
|
52
|
+
"@nsshunt/stsinstrumentation": "^7.0.16",
|
|
53
|
+
"@nsshunt/stspublisherserver": "^2.0.49",
|
|
54
|
+
"@nsshunt/stssocketio-client": "^1.0.2",
|
|
55
|
+
"@nsshunt/stsutils": "^1.16.28",
|
|
56
56
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
57
57
|
"@socket.io/redis-streams-adapter": "^0.1.0",
|
|
58
58
|
"@types/on-headers": "^1.0.3",
|
|
@@ -73,13 +73,13 @@
|
|
|
73
73
|
"kafkajs": "^2.2.4",
|
|
74
74
|
"on-headers": "^1.0.2",
|
|
75
75
|
"pidusage": "^3.0.2",
|
|
76
|
-
"prom-client": "^15.
|
|
77
|
-
"redis": "^4.6.
|
|
76
|
+
"prom-client": "^15.1.0",
|
|
77
|
+
"redis": "^4.6.12",
|
|
78
78
|
"socket.io": "^4.7.2",
|
|
79
79
|
"socket.io-client": "^4.7.2",
|
|
80
|
-
"systeminformation": "^5.21.
|
|
80
|
+
"systeminformation": "^5.21.22",
|
|
81
81
|
"tough-cookie": "^4.1.3",
|
|
82
82
|
"uuid": "^9.0.1",
|
|
83
|
-
"vitest": "^1.0
|
|
83
|
+
"vitest": "^1.1.0"
|
|
84
84
|
}
|
|
85
85
|
}
|
package/src/authutilsnode.ts
CHANGED
|
@@ -19,6 +19,9 @@ import { StatusCodes } from 'http-status-codes';
|
|
|
19
19
|
|
|
20
20
|
import chalk from 'chalk';
|
|
21
21
|
|
|
22
|
+
import { PublishInstrumentControllerV2 } from '@nsshunt/stspublisherserver'
|
|
23
|
+
import { Gauge } from '@nsshunt/stsinstrumentation'
|
|
24
|
+
|
|
22
25
|
export interface IAuthUtilsNodeOptions {
|
|
23
26
|
permissions: string[]
|
|
24
27
|
}
|
|
@@ -43,6 +46,14 @@ export enum STSClientID {
|
|
|
43
46
|
}
|
|
44
47
|
*/
|
|
45
48
|
|
|
49
|
+
export interface IGetAPITokenFromAuthServerUsingScopeOptions {
|
|
50
|
+
clientId: string
|
|
51
|
+
authClientSecret: string
|
|
52
|
+
scope: string
|
|
53
|
+
endPoint: string
|
|
54
|
+
instrumentController?: PublishInstrumentControllerV2
|
|
55
|
+
}
|
|
56
|
+
|
|
46
57
|
export class AuthUtilsNode
|
|
47
58
|
{
|
|
48
59
|
#cookiejar: tough.CookieJar;
|
|
@@ -198,16 +209,20 @@ export class AuthUtilsNode
|
|
|
198
209
|
return match ? match[1] : null;
|
|
199
210
|
}
|
|
200
211
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
212
|
+
GetAPITokenFromAuthServerUsingScope = async (options: IGetAPITokenFromAuthServerUsingScopeOptions, errorCb: (error: Error) => void): Promise<string> => {
|
|
213
|
+
const { scope, clientId, authClientSecret, endPoint, instrumentController } = options;
|
|
214
|
+
|
|
215
|
+
const invokeErrorCb = (error: Error) => {
|
|
216
|
+
this.#debug(error);
|
|
217
|
+
if (instrumentController) {
|
|
218
|
+
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE, { // auth error
|
|
219
|
+
Inc: 1
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
errorCb(error);
|
|
223
|
+
};
|
|
224
|
+
|
|
225
|
+
try {
|
|
211
226
|
const scopes = scope.split(' ');
|
|
212
227
|
let origin: string | null = null;
|
|
213
228
|
let error: Error | null = null;
|
|
@@ -233,7 +248,7 @@ export class AuthUtilsNode
|
|
|
233
248
|
}
|
|
234
249
|
}
|
|
235
250
|
if (error) {
|
|
236
|
-
|
|
251
|
+
invokeErrorCb(error);
|
|
237
252
|
return "";
|
|
238
253
|
}
|
|
239
254
|
|
|
@@ -264,33 +279,37 @@ export class AuthUtilsNode
|
|
|
264
279
|
this.#debug(chalk.magenta(`Error (AuthUtilsNode:GetAPITokenFromServer): Invalid response from server: [${retVal.status}]`));
|
|
265
280
|
}
|
|
266
281
|
} else {
|
|
267
|
-
|
|
268
|
-
this.#debug(msg);
|
|
269
|
-
errorCb(new Error(msg));
|
|
282
|
+
invokeErrorCb(new Error(chalk.red(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.status)`)));
|
|
270
283
|
return "";
|
|
271
284
|
}
|
|
272
285
|
if (retVal.data) {
|
|
273
286
|
if (retVal.data.access_token) {
|
|
287
|
+
if (instrumentController) {
|
|
288
|
+
instrumentController.UpdateInstrument(Gauge.AUTHENTICATION_COUNT_GAUGE, {
|
|
289
|
+
Inc: 1
|
|
290
|
+
});
|
|
291
|
+
}
|
|
292
|
+
|
|
274
293
|
return retVal.data.access_token as string;
|
|
275
294
|
} else {
|
|
276
|
-
|
|
277
|
-
this.#debug(msg);
|
|
278
|
-
errorCb(new Error(msg));
|
|
295
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data.access_token)`));
|
|
279
296
|
return "";
|
|
280
297
|
}
|
|
281
298
|
} else {
|
|
282
|
-
|
|
283
|
-
this.#debug(msg);
|
|
284
|
-
errorCb(new Error(msg));
|
|
299
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:No retVal.data)`));
|
|
285
300
|
return "";
|
|
286
301
|
}
|
|
287
302
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
288
303
|
} catch (error: any) {
|
|
289
|
-
|
|
304
|
+
let details = 'None available.';
|
|
290
305
|
if (error.response && error.response.data) {
|
|
291
|
-
|
|
306
|
+
try {
|
|
307
|
+
details = JSON.stringify(error.response.data);
|
|
308
|
+
} catch (error) {
|
|
309
|
+
details = `Could not JSON.stringify(error.response.data)`;
|
|
310
|
+
}
|
|
292
311
|
}
|
|
293
|
-
|
|
312
|
+
invokeErrorCb(new Error(`Error (AuthUtilsNode:GetAPITokenFromServer:catch): [${error}], Details: [${details}]`));
|
|
294
313
|
return "";
|
|
295
314
|
}
|
|
296
315
|
}
|
|
@@ -17,6 +17,8 @@ r1 =
|
|
|
17
17
|
or r["_field"] == "errorCount"
|
|
18
18
|
or r["_field"] == "retryCount"
|
|
19
19
|
or r["_field"] == "authenticationCount"
|
|
20
|
+
or r["_field"] == "authenticationErrorCount"
|
|
21
|
+
or r["_field"] == "authenticationRetryCount"
|
|
20
22
|
or r["_field"] == "activeRequestCount"
|
|
21
23
|
or r["_field"] == "coreCount"
|
|
22
24
|
or r["_field"] == "velocity"
|
|
@@ -294,6 +296,8 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
|
|
|
294
296
|
.intField('errorCount', instrumentPayload.instruments[Gauge.ERROR_COUNT_GAUGE].val) // j
|
|
295
297
|
.intField('retryCount', instrumentPayload.instruments[Gauge.RETRY_COUNT_GAUGE].val) // r
|
|
296
298
|
.intField('authenticationCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_COUNT_GAUGE].val) // b
|
|
299
|
+
.intField('authenticationErrorCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val) // aa
|
|
300
|
+
.intField('authenticationRetryCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val) // ab
|
|
297
301
|
.floatField('velocity', (instrumentPayload.instruments[Gauge.VELOCITY_GAUGE] as InstrumentVelocity).va) // t - Note: Using va not val here
|
|
298
302
|
.intField('coreCount', instrumentPayload.instruments[Gauge.CORE_COUNT_GAUGE].val) // x
|
|
299
303
|
.floatField('rx', (instrumentPayload.instruments[Gauge.NETWORK_RX_GAUGE] as InstrumentVelocity).va) // Note: Using va not val here
|
|
@@ -16,22 +16,24 @@ data =
|
|
|
16
16
|
|
|
17
17
|
r1 =
|
|
18
18
|
data
|
|
19
|
-
|> filter(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
19
|
+
|> filter(fn: (r) => r["_field"] == "requestCount"
|
|
20
|
+
or r["_field"] == "errorCount"
|
|
21
|
+
or r["_field"] == "retryCount"
|
|
22
|
+
or r["_field"] == "authenticationCount"
|
|
23
|
+
or r["_field"] == "authenticationErrorCount"
|
|
24
|
+
or r["_field"] == "authenticationRetryCount"
|
|
25
|
+
or r["_field"] == "activeRequestCount"
|
|
26
|
+
or r["_field"] == "connectionCount"
|
|
27
|
+
or r["_field"] == "connectionPoolCount"
|
|
28
|
+
or r["_field"] == "connectionIdleCount"
|
|
29
|
+
or r["_field"] == "connectionWaitingCount"
|
|
30
|
+
or r["_field"] == "coreCount"
|
|
31
|
+
or r["_field"] == "cpu"
|
|
32
|
+
or r["_field"] == "systemcpu"
|
|
33
|
+
or r["_field"] == "velocity"
|
|
34
|
+
or r["_field"] == "timer"
|
|
35
|
+
or r["_field"] == "rx"
|
|
36
|
+
or r["_field"] == "tx")
|
|
35
37
|
|
|
36
38
|
r2 =
|
|
37
39
|
data
|
|
@@ -344,6 +346,8 @@ data
|
|
|
344
346
|
.intField('errorCount', instrumentPayload.instruments[Gauge.ERROR_COUNT_GAUGE].val)
|
|
345
347
|
.intField('retryCount', instrumentPayload.instruments[Gauge.RETRY_COUNT_GAUGE].val)
|
|
346
348
|
.intField('authenticationCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_COUNT_GAUGE].val)
|
|
349
|
+
.intField('authenticationErrorCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_ERROR_COUNT_GAUGE].val)
|
|
350
|
+
.intField('authenticationRetryCount', instrumentPayload.instruments[Gauge.AUTHENTICATION_RETRY_COUNT_GAUGE].val)
|
|
347
351
|
.floatField('velocity', (instrumentPayload.instruments[Gauge.VELOCITY_GAUGE] as InstrumentVelocity).va) // Note: Using va not val here
|
|
348
352
|
.floatField('cpu', instrumentPayload.instruments[Gauge.CPU_LOAD_GAUGE].val)
|
|
349
353
|
.intField('activeRequestCount', instrumentPayload.instruments[Gauge.ACTIVE_REQUEST_GAUGE].val)
|
package/types/authutilsnode.d.ts
CHANGED
|
@@ -1,7 +1,15 @@
|
|
|
1
1
|
import tough from 'tough-cookie';
|
|
2
|
+
import { PublishInstrumentControllerV2 } from '@nsshunt/stspublisherserver';
|
|
2
3
|
export interface IAuthUtilsNodeOptions {
|
|
3
4
|
permissions: string[];
|
|
4
5
|
}
|
|
6
|
+
export interface IGetAPITokenFromAuthServerUsingScopeOptions {
|
|
7
|
+
clientId: string;
|
|
8
|
+
authClientSecret: string;
|
|
9
|
+
scope: string;
|
|
10
|
+
endPoint: string;
|
|
11
|
+
instrumentController?: PublishInstrumentControllerV2;
|
|
12
|
+
}
|
|
5
13
|
export declare class AuthUtilsNode {
|
|
6
14
|
#private;
|
|
7
15
|
constructor();
|
|
@@ -11,14 +19,6 @@ export declare class AuthUtilsNode {
|
|
|
11
19
|
GetCookiesFromJar: (endpoint: string) => Promise<tough.Cookie[]>;
|
|
12
20
|
ValidateJWT: (token: string, audience: string, endpoint?: string) => Promise<string>;
|
|
13
21
|
ExtractOrigin: (uri: string) => string | null;
|
|
14
|
-
|
|
15
|
-
*
|
|
16
|
-
* @param clientId
|
|
17
|
-
* @param authClientSecret
|
|
18
|
-
* @param scope space seperate list of fully qualifed required scopes (i.e. api://<<api id>>/<<resource>>.<<permission>>). Note the scopes must all be for the same client api.
|
|
19
|
-
* @param endPoint
|
|
20
|
-
* @returns
|
|
21
|
-
*/
|
|
22
|
-
GetAPITokenFromAuthServerUsingScope: (clientId: string, authClientSecret: string, scope: string, endPoint: string, errorCb: (error: Error) => void) => Promise<string>;
|
|
22
|
+
GetAPITokenFromAuthServerUsingScope: (options: IGetAPITokenFromAuthServerUsingScopeOptions, errorCb: (error: Error) => void) => Promise<string>;
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=authutilsnode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAqBjC,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAsBD,qBAAa,aAAa;;;IA4BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAE9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAqCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED
|
|
1
|
+
{"version":3,"file":"authutilsnode.d.ts","sourceRoot":"","sources":["../src/authutilsnode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,cAAc,CAAC;AAqBjC,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAA;AAG3E,MAAM,WAAW,qBAAqB;IAClC,WAAW,EAAE,MAAM,EAAE,CAAA;CACxB;AAsBD,MAAM,WAAW,2CAA2C;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,CAAC,EAAE,6BAA6B,CAAA;CACvD;AAED,qBAAa,aAAa;;;IA4BtB,8BAA8B,CAAC,OAAO,EAAE,qBAAqB,SAE9B,GAAG,OAAO,GAAG,QAAQ,GAAG;IAqCjD,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;IAyB3D,eAAe,YAAmB,OAAO,MAAM,EAAE,GAAG,CAAC,YAAY,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAgB/F;IAEF,iBAAiB,aAAoB,MAAM,KAAG,QAAQ,MAAM,MAAM,EAAE,CAAC,CAGnE;IAEF,WAAW,UAAiB,MAAM,YAAY,MAAM,aAAa,MAAM,KAAG,QAAQ,MAAM,CAAC,CAgCxF;IAGD,aAAa,QAAS,MAAM,mBAG3B;IAED,mCAAmC,YAAmB,2CAA2C,mBAAmB,KAAK,KAAK,IAAI,KAAG,QAAQ,MAAM,CAAC,CAuGnJ;CA4FJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":";AAuGA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAWpF,qBAAa,oBAAqB,SAAQ,mBAAmB;;gBAE7C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ;IAIhE,IAAa,SAAS,IAAI,MAAM,CAE/B;IAqEK,2BAA2B,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkB7F,uBAAuB,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkBzF,8BAA8B,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmBhG,6BAA6B,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAsB/F,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CA+CnG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":";AAgHA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAmBpF,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ;IAIhE,IAAa,SAAS,IAAI,MAAM,CAE/B;IA6FK,6BAA6B,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkB/F,yBAAyB,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmB3F,kCAAkC,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAmBpG,iCAAiC,CAAC,eAAe,EAAE,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAsBnG,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CA+DnG"}
|