@nsshunt/stsappframework 2.19.154 → 2.19.155
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/commonTypes.ts +97 -5
- package/dist/commonTypes.js +38 -1
- package/dist/commonTypes.js.map +1 -1
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/masterprocessbase.js +0 -6
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/processbase.js +36 -21
- package/dist/processbase.js.map +1 -1
- package/dist/singleprocessbase.js +1 -2
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/socketioHelper.js +15 -51
- package/dist/socketioHelper.js.map +1 -1
- package/dist/workerprocessbase.js +1 -1
- package/dist/workerprocessbase.js.map +1 -1
- package/index.ts +0 -1
- package/masterprocessbase.ts +0 -7
- package/package.json +2 -1
- package/processbase.ts +50 -23
- package/singleprocessbase.ts +3 -5
- package/socketioHelper.ts +13 -87
- package/tsconfig.json +2 -1
- package/types/commonTypes.d.ts +74 -3
- package/types/commonTypes.d.ts.map +1 -1
- package/types/index.d.ts +0 -1
- package/types/index.d.ts.map +1 -1
- package/types/masterprocessbase.d.ts.map +1 -1
- package/types/processbase.d.ts +3 -4
- package/types/processbase.d.ts.map +1 -1
- package/types/singleprocessbase.d.ts +2 -1
- package/types/singleprocessbase.d.ts.map +1 -1
- package/types/socketioHelper.d.ts +5 -67
- package/types/socketioHelper.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts.map +1 -1
- package/workerprocessbase.ts +2 -2
- package/dist/log.js +0 -43
- package/dist/log.js.map +0 -1
- package/log.ts +0 -45
- package/types/log.d.ts +0 -15
- package/types/log.d.ts.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketioHelper.js","sourceRoot":"","sources":["../socketioHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,QAAQ,OAAO,CAAC,GAAG,iBAAiB,CAAC,CAAC;AAE1D,oEAA2E;
|
|
1
|
+
{"version":3,"file":"socketioHelper.js","sourceRoot":"","sources":["../socketioHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -356,7 +356,7 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
|
|
|
356
356
|
CollectAdditionalTelemetry() {
|
|
357
357
|
this.httpServer.getConnections((error, count) => {
|
|
358
358
|
//@@this.instruments[Gauge.CONNECTION_COUNT_GAUGE].val = count;
|
|
359
|
-
|
|
359
|
+
this.UpdateInstrument(stsinstrumentation_1.Gauge.CONNECTION_COUNT_GAUGE, {
|
|
360
360
|
val: count
|
|
361
361
|
});
|
|
362
362
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../workerprocessbase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../workerprocessbase.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
package/masterprocessbase.ts
CHANGED
|
@@ -30,7 +30,6 @@ import { GetFirstNetworkInterface } from './network'
|
|
|
30
30
|
|
|
31
31
|
import { ProcessOptions } from './processoptions'
|
|
32
32
|
import { ProcessBase } from './processbase';
|
|
33
|
-
//import { $stsgd } from '@nsshunt/stsutils'
|
|
34
33
|
import { IMasterProcessBase } from './commonTypes';
|
|
35
34
|
|
|
36
35
|
import { InstrumentDefinitions } from '@nsshunt/stspublisherserver'
|
|
@@ -69,7 +68,6 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
|
69
68
|
|
|
70
69
|
override CollectAdditionalTelemetry() {
|
|
71
70
|
si.get(this.#siValueObject).then(data => {
|
|
72
|
-
//$stsgd.app.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
73
71
|
this.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
74
72
|
val: data.currentLoad.currentLoad
|
|
75
73
|
} as InstrumentGaugeTelemetry);
|
|
@@ -214,14 +212,10 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
|
214
212
|
timeInMs = (end[0]* 1000000000 + end[1]) / 1000000;
|
|
215
213
|
timeInMs = parseFloat(timeInMs.toFixed(4));
|
|
216
214
|
|
|
217
|
-
//@@$stsgd.app.instruments[Gauge.DURATION_HISTOGRAM_GAUGE].val = timeInMs;
|
|
218
|
-
//$stsgd.app.UpdateInstrument(Gauge.LATENCY_HISTOGRAM_GAUGE, {
|
|
219
215
|
this.UpdateInstrument(Gauge.LATENCY_HISTOGRAM_GAUGE, {
|
|
220
216
|
val: timeInMs
|
|
221
217
|
} as InstrumentHistogramTelemetry);
|
|
222
218
|
|
|
223
|
-
//@@$stsgd.app.instruments[Gauge.DURATION_GAUGE].val = timeInMs;
|
|
224
|
-
//$stsgd.app.UpdateInstrument(Gauge.LATENCY_GAUGE, {
|
|
225
219
|
this.UpdateInstrument(Gauge.LATENCY_GAUGE, {
|
|
226
220
|
val: timeInMs
|
|
227
221
|
} as InstrumentGaugeTelemetry);
|
|
@@ -299,7 +293,6 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
|
299
293
|
|
|
300
294
|
#UpdateWorkersInstrument = (): void => {
|
|
301
295
|
setTimeout(() => {
|
|
302
|
-
//$stsgd.app.UpdateInstrument(Gauge.CORE_COUNT_GAUGE, {
|
|
303
296
|
this.UpdateInstrument(Gauge.CORE_COUNT_GAUGE, {
|
|
304
297
|
val: this.#workers
|
|
305
298
|
} as InstrumentGaugeTelemetry);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.155",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@babel/preset-env": "^7.21.4",
|
|
27
27
|
"@babel/preset-typescript": "^7.21.4",
|
|
28
|
+
"@types/debug": "^4.1.7",
|
|
28
29
|
"@types/express": "^4.17.17",
|
|
29
30
|
"@types/jest": "^29.5.0",
|
|
30
31
|
"@typescript-eslint/eslint-plugin": "^5.57.1",
|
package/processbase.ts
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
import pidusage from 'pidusage'
|
|
2
2
|
import { memoryUsage, exit } from 'process'
|
|
3
3
|
import path from 'node:path';
|
|
4
|
+
import cluster from 'node:cluster'
|
|
5
|
+
import colors from 'colors'
|
|
4
6
|
|
|
5
|
-
import
|
|
7
|
+
import debugModule from 'debug'
|
|
8
|
+
const debug = debugModule(`proc:${process.pid}:processBase`);
|
|
9
|
+
|
|
10
|
+
import { Gauge, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry, InstrumentLogTelemetry } from '@nsshunt/stsinstrumentation'
|
|
6
11
|
|
|
7
12
|
import { PGAccessLayer, PGPoolManager, PGPoolManagerEventName } from '@nsshunt/stsdatamanagement'
|
|
8
13
|
|
|
@@ -11,10 +16,8 @@ const goptions = $Options()
|
|
|
11
16
|
const { systemInformationInterval } = goptions;
|
|
12
17
|
|
|
13
18
|
import { ProcessOptions } from './processoptions'
|
|
14
|
-
import {
|
|
19
|
+
import { STSOptionsBase, JSONObject } from '@nsshunt/stsutils'
|
|
15
20
|
import { StatusCodes } from 'http-status-codes'
|
|
16
|
-
import { log, logFunction } from './log'
|
|
17
|
-
import { SocketIoHelper } from './socketioHelper'
|
|
18
21
|
|
|
19
22
|
import { PublishInstrumentController, IPublishInstrumentControllerOptions, InstrumentDefinitions,
|
|
20
23
|
IWorkerFactory, InstrumentPayloadType, TransportType, IPublishTransportRESTServerOptions, CreateServiceProcessContext } from '@nsshunt/stspublisherserver'
|
|
@@ -23,13 +26,15 @@ import { Worker } from 'worker_threads';
|
|
|
23
26
|
|
|
24
27
|
import os from 'os';
|
|
25
28
|
|
|
26
|
-
import { IProcessBase } from './commonTypes'
|
|
29
|
+
import { IProcessBase, ISocketIoHelper } from './commonTypes'
|
|
30
|
+
|
|
31
|
+
type logFunction = (msg) => void
|
|
27
32
|
|
|
28
33
|
export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
29
34
|
{
|
|
30
35
|
#instrumentController: PublishInstrumentController = null;
|
|
31
36
|
#systemInformationInterval: NodeJS.Timer = null;
|
|
32
|
-
#socketIoHelper:
|
|
37
|
+
#socketIoHelper: ISocketIoHelper = null;
|
|
33
38
|
#accessLayer: PGAccessLayer = null;
|
|
34
39
|
#poolManager: PGPoolManager = null;
|
|
35
40
|
#logEx: logFunction = null;
|
|
@@ -54,6 +59,30 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
54
59
|
}
|
|
55
60
|
*/
|
|
56
61
|
|
|
62
|
+
|
|
63
|
+
#log(appName): logFunction {
|
|
64
|
+
return (msg) =>
|
|
65
|
+
{
|
|
66
|
+
let prefix = '';
|
|
67
|
+
let col = null;
|
|
68
|
+
|
|
69
|
+
if (cluster.isPrimary)
|
|
70
|
+
{
|
|
71
|
+
prefix = 'M';
|
|
72
|
+
col = colors.bold.cyan;
|
|
73
|
+
} else {
|
|
74
|
+
prefix = 'W';
|
|
75
|
+
col = colors.green;
|
|
76
|
+
}
|
|
77
|
+
const msgEx = col(`${prefix}(${process.pid}) [${appName}]: ${msg}`);
|
|
78
|
+
debug(msgEx);
|
|
79
|
+
|
|
80
|
+
this.UpdateInstrument(Gauge.LOGGER, {
|
|
81
|
+
LogMessage: msgEx
|
|
82
|
+
} as InstrumentLogTelemetry);
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
|
|
57
86
|
#ServiceCollectorWorkerFactory: IWorkerFactory = {
|
|
58
87
|
createWorker: (): Worker => {
|
|
59
88
|
const mainpath = require.resolve('@nsshunt/stsappframework');
|
|
@@ -166,7 +195,7 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
166
195
|
a: usage.arrayBuffers,
|
|
167
196
|
}
|
|
168
197
|
|
|
169
|
-
|
|
198
|
+
this.UpdateInstrument(Gauge.OBJECT_GAUGE, {
|
|
170
199
|
val: telemetry
|
|
171
200
|
} as InstrumentObjectTelemetry);
|
|
172
201
|
|
|
@@ -174,7 +203,7 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
174
203
|
|
|
175
204
|
}, systemInformationInterval).unref();
|
|
176
205
|
|
|
177
|
-
this.#logEx = log(this.options.serviceName);
|
|
206
|
+
this.#logEx = this.#log(this.options.serviceName);
|
|
178
207
|
|
|
179
208
|
if (this.options.useDatabase) {
|
|
180
209
|
// Get the accessLayer to force DB connection test
|
|
@@ -225,30 +254,28 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
225
254
|
return null;
|
|
226
255
|
}
|
|
227
256
|
|
|
228
|
-
get socketIoHelper():
|
|
257
|
+
get socketIoHelper(): ISocketIoHelper
|
|
229
258
|
{
|
|
230
259
|
return this.#socketIoHelper;
|
|
231
260
|
}
|
|
232
261
|
|
|
233
|
-
set socketIoHelper(value:
|
|
262
|
+
set socketIoHelper(value: ISocketIoHelper)
|
|
234
263
|
{
|
|
235
264
|
this.#socketIoHelper = value;
|
|
236
265
|
}
|
|
237
266
|
|
|
238
267
|
#UpdatePGPoolManagerInstrument = (data) => {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
} as InstrumentGaugeTelemetry);
|
|
251
|
-
}
|
|
268
|
+
this.UpdateInstrument(Gauge.CONNECTION_POOL_TOTAL_GAUGE, {
|
|
269
|
+
val: data.totalCount
|
|
270
|
+
} as InstrumentGaugeTelemetry);
|
|
271
|
+
|
|
272
|
+
this.UpdateInstrument(Gauge.CONNECTION_POOL_IDLE_GAUGE, {
|
|
273
|
+
val: data.idleCount
|
|
274
|
+
} as InstrumentGaugeTelemetry);
|
|
275
|
+
|
|
276
|
+
this.UpdateInstrument(Gauge.CONNECTION_POOL_WAITING_GAUGE, {
|
|
277
|
+
val: data.waitingCount
|
|
278
|
+
} as InstrumentGaugeTelemetry);
|
|
252
279
|
}
|
|
253
280
|
|
|
254
281
|
async TerminateDatabase() {
|
package/singleprocessbase.ts
CHANGED
|
@@ -27,17 +27,15 @@ import { InstrumentDefinitions } from '@nsshunt/stspublisherserver'
|
|
|
27
27
|
|
|
28
28
|
import { GetFirstNetworkInterface } from './network.js';
|
|
29
29
|
|
|
30
|
-
import { $stsgd } from '@nsshunt/stsutils'
|
|
31
|
-
|
|
32
30
|
import { STSExpressServer } from './server'
|
|
33
31
|
|
|
34
|
-
export type EventCb = (socket, data) => void
|
|
32
|
+
export type EventCb = (socket: any, data: any) => void
|
|
35
33
|
|
|
36
34
|
export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
37
35
|
{
|
|
38
36
|
#masterProcessExitTime = masterProcessExitTime;
|
|
39
37
|
#io = null;
|
|
40
|
-
#expressServer = null;
|
|
38
|
+
#expressServer: STSExpressServer | null = null;
|
|
41
39
|
#shuttingDown = false;
|
|
42
40
|
#additionalInstruments = null;
|
|
43
41
|
#siValueObject = {
|
|
@@ -61,7 +59,7 @@ export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
|
61
59
|
|
|
62
60
|
CollectAdditionalTelemetry() {
|
|
63
61
|
si.get(this.#siValueObject).then(data => {
|
|
64
|
-
|
|
62
|
+
this.UpdateInstrument(Gauge.CPU_SYSTEM_LOAD_GAUGE, {
|
|
65
63
|
val: data.currentLoad.currentLoad
|
|
66
64
|
} as InstrumentGaugeTelemetry);
|
|
67
65
|
});
|
package/socketioHelper.ts
CHANGED
|
@@ -2,98 +2,24 @@ import Debug from "debug";
|
|
|
2
2
|
const debug = Debug(`proc:${process.pid}:socketiohelper`);
|
|
3
3
|
|
|
4
4
|
import { Gauge, InstrumentLogTelemetry } from '@nsshunt/stsinstrumentation'
|
|
5
|
-
import {
|
|
5
|
+
import { JSONObject } from '@nsshunt/stsutils'
|
|
6
6
|
|
|
7
|
-
import { Server
|
|
7
|
+
import { Server } from "socket.io";
|
|
8
|
+
import { IProcessBase, STSSocketIONamespace, STSRoom, STSServerSocket,
|
|
9
|
+
ServerSocketEvent, STSNamespace, ISocketIoHelper } from './commonTypes'
|
|
8
10
|
|
|
9
|
-
export
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
serverEventName: string,
|
|
13
|
-
serverEventCb: ServerEventCb
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
export enum STSNamespace {
|
|
17
|
-
STSMonitor = 'stsmonitor',
|
|
18
|
-
STSControl = 'stscontrol'
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export enum STSRoom {
|
|
22
|
-
// STSMonitor rooms
|
|
23
|
-
STSInstrumentDataRoom = 'stsinstrumentdataroom', // This room is for all instrument data messages
|
|
24
|
-
STSInstrumentDataSubscriptionRoom = 'stsinstrumentdatasubscriptionroom', // This room is only for subscribed instrument data messages
|
|
25
|
-
|
|
26
|
-
// STSControl rooms
|
|
27
|
-
STSRunnerRoom = 'stsrunnerroom',
|
|
28
|
-
STSNodeRunnerRoom = 'stsnoderunnerroom'
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export enum STSEvent {
|
|
32
|
-
// STSInstrumentData
|
|
33
|
-
STSInstrumentData = 'stsinstrumentdata',
|
|
34
|
-
STSSubInstrumentData = 'stssubinstrumentdata', // sub-scribed instrument data. This only outputs the nodes that have been subscribed by the client(s).
|
|
35
|
-
STSResetInstrumentData = 'stsresetinstrumentdata',
|
|
36
|
-
|
|
37
|
-
STSStartLoggingInstrumentData = 'stsStartLoggingInstrumentData',
|
|
38
|
-
STSStopLoggingInstrumentData = 'stsStopLoggingInstrumentData',
|
|
39
|
-
|
|
40
|
-
// STSRunner events
|
|
41
|
-
STSStart = 'stsstart', // Start a test run with options as payload.
|
|
42
|
-
STSStop = 'stsstop', // Stop test run(s).
|
|
43
|
-
STSPause = 'stspause', // Pause test run(s).
|
|
44
|
-
STSResume = 'stsresume', // Resume test run(s).
|
|
45
|
-
STSTerminate = 'ststerminate', // Terminate runner instances and exit applications.
|
|
46
|
-
// This may also be uysed to force trigger self healing (i.e. auto re-start) when
|
|
47
|
-
// running within a container orchestrator such as K8, K3 or Docker Swarm.
|
|
48
|
-
STSUpdateStaticConfig = 'stsupdatestaticconfig', // Update base configuration. Options as payload.
|
|
49
|
-
STSUpdateDynamicConfig = 'stsupdatedynamicconfig', // Update running configuration. This is used
|
|
50
|
-
// to control the runnning behaviour of test(s) in-flight. Options as payload.
|
|
51
|
-
|
|
52
|
-
STSSendToRoom = 'sendToRoom',
|
|
53
|
-
|
|
54
|
-
// Standard socket events
|
|
55
|
-
connect = 'connect'
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
// https://socket.io/docs/v4/typescript/
|
|
59
|
-
|
|
60
|
-
export interface STSClientToServerEvents {
|
|
61
|
-
joinRoom: (room: STSRoom) => void;
|
|
62
|
-
register: (message: string) => void;
|
|
63
|
-
disconnecting: (reason: string) => void; // server event
|
|
64
|
-
disconnect: (reason: string) => void; // server and client event
|
|
65
|
-
sendToRoom: (rooms: STSRoom[], payload: { command: string, payload: JSONObject }) => void;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
export interface STSServerToClient {
|
|
69
|
-
goodbye: (message: string) => void;
|
|
70
|
-
hello: (message: string) => void;
|
|
71
|
-
registerEcho: (message: { socketId: string, message: string }) => void;
|
|
72
|
-
disconnect: (reason: string) => void; // server and client event
|
|
73
|
-
connect: () => void; // client events
|
|
74
|
-
connect_error: () => void; // client event
|
|
75
|
-
start: () => void;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
export interface InterServerEvents {
|
|
79
|
-
ping: () => void;
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
export interface STSSocketIONamespace {
|
|
83
|
-
name: string
|
|
84
|
-
pid: number
|
|
85
|
-
socketionamespace: Namespace<STSClientToServerEvents, STSServerToClient, InterServerEvents>
|
|
86
|
-
}
|
|
11
|
+
export class SocketIoHelper implements ISocketIoHelper
|
|
12
|
+
{
|
|
13
|
+
#stsApp: IProcessBase
|
|
87
14
|
|
|
88
|
-
|
|
89
|
-
|
|
15
|
+
constructor(stsApp: IProcessBase) { // IProcessBase
|
|
16
|
+
this.#stsApp = stsApp;
|
|
17
|
+
}
|
|
90
18
|
|
|
91
|
-
export class SocketIoHelper
|
|
92
|
-
{
|
|
93
19
|
#namespace: Record<string, STSSocketIONamespace> = { };
|
|
94
20
|
|
|
95
21
|
LogMessage = (namespace: STSSocketIONamespace, message: string): void => {
|
|
96
|
-
|
|
22
|
+
this.#stsApp.UpdateInstrument(Gauge.LOGGER, {
|
|
97
23
|
LogMessage: message
|
|
98
24
|
} as InstrumentLogTelemetry);
|
|
99
25
|
};
|
|
@@ -164,7 +90,7 @@ export class SocketIoHelper
|
|
|
164
90
|
}, 0).unref();
|
|
165
91
|
} else {
|
|
166
92
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
167
|
-
socket.on(socketEvent.serverEventName as any, (data) => {
|
|
93
|
+
socket.on(socketEvent.serverEventName as any, (data: any) => {
|
|
168
94
|
socketEvent.serverEventCb(socket, data);
|
|
169
95
|
});
|
|
170
96
|
}
|
|
@@ -237,7 +163,7 @@ export class SocketIoHelper
|
|
|
237
163
|
return this.#namespace[namespace];
|
|
238
164
|
}
|
|
239
165
|
|
|
240
|
-
GetNamespace(namespace): STSSocketIONamespace {
|
|
166
|
+
GetNamespace = (namespace: string): STSSocketIONamespace => {
|
|
241
167
|
return this.#namespace[namespace];
|
|
242
168
|
}
|
|
243
169
|
|
package/tsconfig.json
CHANGED
package/types/commonTypes.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import {
|
|
3
|
+
import { Server, Socket, Namespace } from "socket.io";
|
|
4
4
|
import { STSOptionsBase, JSONObject } from "@nsshunt/stsutils";
|
|
5
5
|
import { PublishInstrumentController, InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
6
6
|
import { InstrumentBaseTelemetry, Gauge } from '@nsshunt/stsinstrumentation';
|
|
@@ -33,8 +33,8 @@ export interface IProcessBase extends STSOptionsBase {
|
|
|
33
33
|
InstrumentExists(instrumentName: Gauge): boolean;
|
|
34
34
|
ProcessTerminate: () => Promise<void>;
|
|
35
35
|
GetUIController(): any;
|
|
36
|
-
get socketIoHelper():
|
|
37
|
-
set socketIoHelper(value:
|
|
36
|
+
get socketIoHelper(): ISocketIoHelper;
|
|
37
|
+
set socketIoHelper(value: ISocketIoHelper);
|
|
38
38
|
TerminateDatabase(): Promise<void>;
|
|
39
39
|
get accessLayer(): PGAccessLayer;
|
|
40
40
|
}
|
|
@@ -74,4 +74,75 @@ export interface IWorkerProcessBase extends IProcessBase {
|
|
|
74
74
|
SetupServer: () => Promise<void>;
|
|
75
75
|
SetupServerEx: () => Promise<void>;
|
|
76
76
|
}
|
|
77
|
+
export type ServerEventCb = (socket: any, data: any) => void;
|
|
78
|
+
export interface ServerSocketEvent {
|
|
79
|
+
serverEventName: string;
|
|
80
|
+
serverEventCb: ServerEventCb;
|
|
81
|
+
}
|
|
82
|
+
export declare enum STSNamespace {
|
|
83
|
+
STSMonitor = "stsmonitor",
|
|
84
|
+
STSControl = "stscontrol"
|
|
85
|
+
}
|
|
86
|
+
export declare enum STSRoom {
|
|
87
|
+
STSInstrumentDataRoom = "stsinstrumentdataroom",
|
|
88
|
+
STSInstrumentDataSubscriptionRoom = "stsinstrumentdatasubscriptionroom",
|
|
89
|
+
STSRunnerRoom = "stsrunnerroom",
|
|
90
|
+
STSNodeRunnerRoom = "stsnoderunnerroom"
|
|
91
|
+
}
|
|
92
|
+
export declare enum STSEvent {
|
|
93
|
+
STSInstrumentData = "stsinstrumentdata",
|
|
94
|
+
STSSubInstrumentData = "stssubinstrumentdata",
|
|
95
|
+
STSResetInstrumentData = "stsresetinstrumentdata",
|
|
96
|
+
STSStartLoggingInstrumentData = "stsStartLoggingInstrumentData",
|
|
97
|
+
STSStopLoggingInstrumentData = "stsStopLoggingInstrumentData",
|
|
98
|
+
STSStart = "stsstart",
|
|
99
|
+
STSStop = "stsstop",
|
|
100
|
+
STSPause = "stspause",
|
|
101
|
+
STSResume = "stsresume",
|
|
102
|
+
STSTerminate = "ststerminate",
|
|
103
|
+
STSUpdateStaticConfig = "stsupdatestaticconfig",
|
|
104
|
+
STSUpdateDynamicConfig = "stsupdatedynamicconfig",
|
|
105
|
+
STSSendToRoom = "sendToRoom",
|
|
106
|
+
connect = "connect"
|
|
107
|
+
}
|
|
108
|
+
export interface STSClientToServerEvents {
|
|
109
|
+
joinRoom: (room: STSRoom) => void;
|
|
110
|
+
register: (message: string) => void;
|
|
111
|
+
disconnecting: (reason: string) => void;
|
|
112
|
+
disconnect: (reason: string) => void;
|
|
113
|
+
sendToRoom: (rooms: STSRoom[], payload: {
|
|
114
|
+
command: string;
|
|
115
|
+
payload: JSONObject;
|
|
116
|
+
}) => void;
|
|
117
|
+
}
|
|
118
|
+
export interface STSServerToClient {
|
|
119
|
+
goodbye: (message: string) => void;
|
|
120
|
+
hello: (message: string) => void;
|
|
121
|
+
registerEcho: (message: {
|
|
122
|
+
socketId: string;
|
|
123
|
+
message: string;
|
|
124
|
+
}) => void;
|
|
125
|
+
disconnect: (reason: string) => void;
|
|
126
|
+
connect: () => void;
|
|
127
|
+
connect_error: () => void;
|
|
128
|
+
start: () => void;
|
|
129
|
+
}
|
|
130
|
+
export interface InterServerEvents {
|
|
131
|
+
ping: () => void;
|
|
132
|
+
}
|
|
133
|
+
export interface STSSocketIONamespace {
|
|
134
|
+
name: string;
|
|
135
|
+
pid: number;
|
|
136
|
+
socketionamespace: Namespace<STSClientToServerEvents, STSServerToClient, InterServerEvents>;
|
|
137
|
+
}
|
|
138
|
+
export type STSServerSocket = Socket<STSClientToServerEvents, STSServerToClient, InterServerEvents>;
|
|
139
|
+
export type STSClientSocket = Socket<STSServerToClient, STSClientToServerEvents, InterServerEvents>;
|
|
140
|
+
export interface ISocketIoHelper {
|
|
141
|
+
LogMessage: (namespace: STSSocketIONamespace, message: string) => void;
|
|
142
|
+
LeaveRoom: (namespace: STSSocketIONamespace, room: STSRoom) => void;
|
|
143
|
+
JoinRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: STSRoom) => void;
|
|
144
|
+
SetupNamespace: (io: Server, namespace: STSNamespace, rooms: STSRoom[], autoJoinRooms: boolean, serverSocketEvents: ServerSocketEvent[]) => STSSocketIONamespace;
|
|
145
|
+
GetNamespace: (namespace: any) => STSSocketIONamespace;
|
|
146
|
+
DisconnectSockets: () => void;
|
|
147
|
+
}
|
|
77
148
|
//# sourceMappingURL=commonTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../commonTypes.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../commonTypes.ts"],"names":[],"mappings":"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"}
|
package/types/index.d.ts
CHANGED
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../masterprocessbase.ts"],"names":[],"mappings":";;;;AA8BA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"masterprocessbase.d.ts","sourceRoot":"","sources":["../masterprocessbase.ts"],"names":[],"mappings":";;;;AA8BA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAKnE,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,kBAAkB;;gBAkBhE,OAAO,EAAE,cAAc;IAW1B,0BAA0B;IAQ1B,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IAEA,kBAAkB,CAAC,GAAG,EAAE,GAAG;IAqI3B,WAAW,sBAMV;IAoBD,UAAU,OAAQ,MAAM,UAAU,OAAO,OAAO,WAAuB,GAAG,eAAe,OAAO,gBAAgB,OAAO,KAAG,OAAO,CAwBhI;IAED,WAAW,WAAY,OAAO,OAAO,KAAG,IAAI,CAgB3C;IAUD,UAAU,QAAO,IAAI,CAIpB;IAED,UAAU,QAAO,IAAI,CAIpB;IAGD,SAAS,YAAa,GAAG,KAAG,MAAM,CAOjC;IAkED,aAAa;IAIb,aAAa,sBA4NZ;IAED,sBAAsB,oCAarB;CACJ"}
|
package/types/processbase.d.ts
CHANGED
|
@@ -2,9 +2,8 @@ import { Gauge, InstrumentBaseTelemetry } from '@nsshunt/stsinstrumentation';
|
|
|
2
2
|
import { PGAccessLayer } from '@nsshunt/stsdatamanagement';
|
|
3
3
|
import { ProcessOptions } from './processoptions';
|
|
4
4
|
import { STSOptionsBase } from '@nsshunt/stsutils';
|
|
5
|
-
import { SocketIoHelper } from './socketioHelper';
|
|
6
5
|
import { PublishInstrumentController, InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
7
|
-
import { IProcessBase } from './commonTypes';
|
|
6
|
+
import { IProcessBase, ISocketIoHelper } from './commonTypes';
|
|
8
7
|
export declare abstract class ProcessBase extends STSOptionsBase implements IProcessBase {
|
|
9
8
|
#private;
|
|
10
9
|
constructor(options: ProcessOptions);
|
|
@@ -23,8 +22,8 @@ export declare abstract class ProcessBase extends STSOptionsBase implements IPro
|
|
|
23
22
|
* @returns UIController instance to manage a console based user interface associated for this node application.
|
|
24
23
|
*/
|
|
25
24
|
GetUIController(): any;
|
|
26
|
-
get socketIoHelper():
|
|
27
|
-
set socketIoHelper(value:
|
|
25
|
+
get socketIoHelper(): ISocketIoHelper;
|
|
26
|
+
set socketIoHelper(value: ISocketIoHelper);
|
|
28
27
|
TerminateDatabase(): Promise<void>;
|
|
29
28
|
get accessLayer(): PGAccessLayer;
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../processbase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAA+E,MAAM,6BAA6B,CAAA;AAEzJ,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAMjG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAC2B,MAAM,6BAA6B,CAAA;AAM9J,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAI7D,8BAAsB,WAAY,SAAQ,cAAe,YAAW,YAAY;;gBAShE,OAAO,EAAE,cAAc;IAUnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAwFD,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,gCAEvB;IAED,KAAK,yBASJ;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAIf;IAED;;;OAGA;IACA,eAAe;IAIf,IAAI,cAAc,IAAI,eAAe,CAGpC;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,eAAe,EAGxC;IAgBK,iBAAiB;IAOvB,IAAI,WAAW,IAAI,aAAa,CAyB/B;CACJ"}
|
|
@@ -2,6 +2,7 @@ import { ProcessOptions } from './processoptions';
|
|
|
2
2
|
import { ProcessBase } from './processbase';
|
|
3
3
|
import { ISingleProcessBase } from './commonTypes';
|
|
4
4
|
import { InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
5
|
+
import { STSExpressServer } from './server';
|
|
5
6
|
export type EventCb = (socket: any, data: any) => void;
|
|
6
7
|
export declare class SingleProcessBase extends ProcessBase implements ISingleProcessBase {
|
|
7
8
|
#private;
|
|
@@ -21,7 +22,7 @@ export declare class SingleProcessBase extends ProcessBase implements ISinglePro
|
|
|
21
22
|
ProcessStarted(): any;
|
|
22
23
|
get io(): any;
|
|
23
24
|
ProcessTerminating(): any;
|
|
24
|
-
get expressServer():
|
|
25
|
+
get expressServer(): STSExpressServer;
|
|
25
26
|
SetupServer(): Promise<boolean>;
|
|
26
27
|
SetupServerEx: () => Promise<void>;
|
|
27
28
|
Terminate(): Promise<void>;
|