@nsshunt/stsappframework 3.0.45 → 3.0.47
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/influxdb/influxDBManagerService.js +57 -1
- package/dist/influxdb/influxDBManagerService.js.map +1 -1
- package/dist/testing/appWorkerWSS.js +2 -2
- package/dist/testing/appWorkerWSS.js.map +1 -1
- package/package.json +1 -1
- package/src/influxdb/influxDBManagerService.ts +60 -1
- package/src/testing/appWorkerWSS.ts +3 -3
- package/types/influxdb/influxDBManagerService.d.ts.map +1 -1
- package/types/testing/appWorkerWSS.d.ts.map +1 -1
|
@@ -14,8 +14,64 @@ class InfluxDBManagerService extends influxDBManagerBase_1.InfluxDBManagerBase {
|
|
|
14
14
|
return 'service';
|
|
15
15
|
}
|
|
16
16
|
// Queries --------------------------------------------------------------------------------------------------------
|
|
17
|
-
|
|
17
|
+
/*
|
|
18
|
+
data = from(bucket: "my-bucket")
|
|
19
|
+
|> range(start: -task.every)
|
|
20
|
+
|> filter(fn: (r) => r._measurement == "my_measurement")
|
|
21
|
+
|
|
22
|
+
data
|
|
23
|
+
|> mean()
|
|
24
|
+
|> set(key: "agg_type",value: "mean_temp")
|
|
25
|
+
|> to(bucket: "downsampled", org: "my-org", tagColumns: ["agg_type"])
|
|
26
|
+
|
|
27
|
+
data
|
|
28
|
+
|> count()
|
|
29
|
+
|> set(key: "agg_type",value: "count_temp")
|
|
30
|
+
|> to(bucket: "downsampled", org: "my-org", tagColumns: ["agg_type"])
|
|
31
|
+
*/
|
|
18
32
|
#GetSTSCountGenericService = async (filterClause, groupClause, showOutput = false) => {
|
|
33
|
+
try {
|
|
34
|
+
const query = `data = from(bucket: "${this.options.bucket}")
|
|
35
|
+
|> range(start: -5s)
|
|
36
|
+
|> filter(fn: (r) => r["_measurement"] == "all" and r["modelType"] == "service" ${filterClause})
|
|
37
|
+
|
|
38
|
+
r1 = data
|
|
39
|
+
|> filter(fn: (r) => r["_field"] == "requestCount"
|
|
40
|
+
or r["_field"] == "errorCount"
|
|
41
|
+
or r["_field"] == "retryCount"
|
|
42
|
+
or r["_field"] == "authenticationCount"
|
|
43
|
+
or r["_field"] == "activeRequestCount"
|
|
44
|
+
or r["_field"] == "connectionCount"
|
|
45
|
+
or r["_field"] == "connectionPoolCount"
|
|
46
|
+
or r["_field"] == "connectionIdleCount"
|
|
47
|
+
or r["_field"] == "connectionWaitingCount"
|
|
48
|
+
or r["_field"] == "coreCount"
|
|
49
|
+
or r["_field"] == "cpu"
|
|
50
|
+
or r["_field"] == "systemcpu"
|
|
51
|
+
or r["_field"] == "velocity"
|
|
52
|
+
or r["_field"] == "timer"
|
|
53
|
+
or r["_field"] == "duration"
|
|
54
|
+
or r["_field"] == "latency")
|
|
55
|
+
|> last()
|
|
56
|
+
|> ${groupClause}
|
|
57
|
+
|> sum()
|
|
58
|
+
|
|
59
|
+
r2 = data
|
|
60
|
+
|> filter(fn: (r) => r["_field"] == "memory")
|
|
61
|
+
|> last()
|
|
62
|
+
|
|
63
|
+
union(tables: [r1, r2])`;
|
|
64
|
+
if (showOutput) {
|
|
65
|
+
console.log(query);
|
|
66
|
+
}
|
|
67
|
+
return this.queryApi.collectRows(query);
|
|
68
|
+
}
|
|
69
|
+
catch (error) {
|
|
70
|
+
console.error(`${_logPrefix}#GetSTSCountGeneric: Error: [${error}]`.red);
|
|
71
|
+
}
|
|
72
|
+
};
|
|
73
|
+
// Counter metrics
|
|
74
|
+
#GetSTSCountGenericServiceOld = async (filterClause, groupClause, showOutput = false) => {
|
|
19
75
|
try {
|
|
20
76
|
const query = `dostscountex = (q, d) =>
|
|
21
77
|
from(bucket: "${this.options.bucket}")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":";;;AAAA,wFAAwF,CAAE,UAAU;AACpG,iEAAuE;AAEvE,oEAAuE;AAEvE,+DAA2D;AAK3D,MAAM,UAAU,GAAG,yBAAyB,CAAA;AAE5C,MAAa,sBAAuB,SAAQ,yCAAmB;IAE3D,YAAY,OAAgC,EAAE,QAAkB,EAAE,WAAqB;QACnF,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC1C,CAAC;IAED,IAAa,SAAS;QAClB,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,mHAAmH;IAEnH,kBAAkB;IAClB,
|
|
1
|
+
{"version":3,"file":"influxDBManagerService.js","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,7 +40,7 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
40
40
|
if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
|
|
41
41
|
//console.log(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`.grey);
|
|
42
42
|
console.log(`WorkerProcess.ReceivedMessageFromMaster`.grey);
|
|
43
|
-
const { socketId, workerId
|
|
43
|
+
const { socketId, workerId } = messageData; //@@ type
|
|
44
44
|
if (node_cluster_1.default.worker && node_cluster_1.default.worker.id !== workerId) {
|
|
45
45
|
// Invalid data - this workerId must match
|
|
46
46
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerId: [${workerId}]. Should have been: [${node_cluster_1.default.worker.id}].`.red);
|
|
@@ -54,7 +54,7 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
54
54
|
if (socket.id.localeCompare(socketId) === 0) {
|
|
55
55
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`.green);
|
|
56
56
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
57
|
-
socket.emit(
|
|
57
|
+
//socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gEAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -22,8 +22,67 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
|
|
|
22
22
|
|
|
23
23
|
// Queries --------------------------------------------------------------------------------------------------------
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
/*
|
|
26
|
+
data = from(bucket: "my-bucket")
|
|
27
|
+
|> range(start: -task.every)
|
|
28
|
+
|> filter(fn: (r) => r._measurement == "my_measurement")
|
|
29
|
+
|
|
30
|
+
data
|
|
31
|
+
|> mean()
|
|
32
|
+
|> set(key: "agg_type",value: "mean_temp")
|
|
33
|
+
|> to(bucket: "downsampled", org: "my-org", tagColumns: ["agg_type"])
|
|
34
|
+
|
|
35
|
+
data
|
|
36
|
+
|> count()
|
|
37
|
+
|> set(key: "agg_type",value: "count_temp")
|
|
38
|
+
|> to(bucket: "downsampled", org: "my-org", tagColumns: ["agg_type"])
|
|
39
|
+
*/
|
|
40
|
+
|
|
26
41
|
#GetSTSCountGenericService = async (filterClause: string, groupClause: string, showOutput: boolean = false): Promise<any> => {
|
|
42
|
+
try {
|
|
43
|
+
const query = `data = from(bucket: "${this.options.bucket}")
|
|
44
|
+
|> range(start: -5s)
|
|
45
|
+
|> filter(fn: (r) => r["_measurement"] == "all" and r["modelType"] == "service" ${filterClause})
|
|
46
|
+
|
|
47
|
+
r1 = data
|
|
48
|
+
|> filter(fn: (r) => r["_field"] == "requestCount"
|
|
49
|
+
or r["_field"] == "errorCount"
|
|
50
|
+
or r["_field"] == "retryCount"
|
|
51
|
+
or r["_field"] == "authenticationCount"
|
|
52
|
+
or r["_field"] == "activeRequestCount"
|
|
53
|
+
or r["_field"] == "connectionCount"
|
|
54
|
+
or r["_field"] == "connectionPoolCount"
|
|
55
|
+
or r["_field"] == "connectionIdleCount"
|
|
56
|
+
or r["_field"] == "connectionWaitingCount"
|
|
57
|
+
or r["_field"] == "coreCount"
|
|
58
|
+
or r["_field"] == "cpu"
|
|
59
|
+
or r["_field"] == "systemcpu"
|
|
60
|
+
or r["_field"] == "velocity"
|
|
61
|
+
or r["_field"] == "timer"
|
|
62
|
+
or r["_field"] == "duration"
|
|
63
|
+
or r["_field"] == "latency")
|
|
64
|
+
|> last()
|
|
65
|
+
|> ${groupClause}
|
|
66
|
+
|> sum()
|
|
67
|
+
|
|
68
|
+
r2 = data
|
|
69
|
+
|> filter(fn: (r) => r["_field"] == "memory")
|
|
70
|
+
|> last()
|
|
71
|
+
|
|
72
|
+
union(tables: [r1, r2])`;
|
|
73
|
+
|
|
74
|
+
if (showOutput) {
|
|
75
|
+
console.log(query);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
return this.queryApi.collectRows(query)
|
|
79
|
+
} catch (error) {
|
|
80
|
+
console.error(`${_logPrefix}#GetSTSCountGeneric: Error: [${error}]`.red);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
// Counter metrics
|
|
85
|
+
#GetSTSCountGenericServiceOld = async (filterClause: string, groupClause: string, showOutput: boolean = false): Promise<any> => {
|
|
27
86
|
try {
|
|
28
87
|
const query = `dostscountex = (q, d) =>
|
|
29
88
|
from(bucket: "${this.options.bucket}")
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
2
|
import cluster from 'node:cluster';
|
|
3
3
|
|
|
4
|
-
import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper,
|
|
4
|
+
import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace } from './../index'
|
|
5
5
|
|
|
6
6
|
//import { Socket, Namespace } from "socket.io";
|
|
7
7
|
import { Socket } from "socket.io";
|
|
@@ -57,7 +57,7 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
57
57
|
if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
|
|
58
58
|
//console.log(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`.grey);
|
|
59
59
|
console.log(`WorkerProcess.ReceivedMessageFromMaster`.grey);
|
|
60
|
-
const { socketId, workerId
|
|
60
|
+
const { socketId, workerId } = messageData; //@@ type
|
|
61
61
|
|
|
62
62
|
if (cluster.worker && cluster.worker.id !== workerId) {
|
|
63
63
|
// Invalid data - this workerId must match
|
|
@@ -71,7 +71,7 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
71
71
|
if (socket.id.localeCompare(socketId) === 0) {
|
|
72
72
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`.green);
|
|
73
73
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
74
|
-
socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
74
|
+
//socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"AACA,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;AAIpF,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;
|
|
1
|
+
{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"AACA,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;AAIpF,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAmLK,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;IAqBnG,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD/E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA+C,oBAAoB,EAAE,MAAM,YAAY,CAAA;AASjH,oBAAY,0BAA0B;IACrC,OAAO,YAAY;IAEnB,SAAS,mCAAmC;IAC5C,WAAW,qCAAqC;IAChD,oBAAoB,6CAA6C;CACjE;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAEhB,IAAI,EAAE,GAAG,CAAA;CACT;AAED,oBAAY,2BAA2B;IACtC,mBAAmB,6CAA6C;CAChE;AAED,oBAAY,WAAW;IACtB,uBAAuB,4BAA4B;CACnD;AAED,qBAAa,aAAc,SAAQ,iBAAiB;;gBAIpC,OAAO,EAAE,GAAG;IAcxB,yBAAyB,gBAAuB,GAAG,mBAgClD;IAwBD,aAAa,IAAI,GAAG;IAkDpB,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,IAAI,CAKrD;CACJ"}
|