@nsshunt/stsappframework 2.19.239 → 2.19.241
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/commonTypes.js.map +1 -1
- package/dist/processbase.js.map +1 -1
- package/dist/socketIoServerHelper.js +14 -24
- package/dist/socketIoServerHelper.js.map +1 -1
- package/dist/testing/appWorkerWSS.js +29 -28
- package/dist/testing/appWorkerWSS.js.map +1 -1
- package/dist/testing/singleservertest.test.js +47 -13
- package/dist/testing/singleservertest.test.js.map +1 -1
- package/dist/testing/wsevents.js +3 -0
- package/dist/testing/wsevents.js.map +1 -0
- package/package.json +4 -3
- package/src/commonTypes.ts +14 -27
- package/src/processbase.ts +5 -3
- package/src/socketIoServerHelper.ts +31 -33
- package/src/testing/appWorkerWSS.ts +42 -34
- package/src/testing/singleservertest.test.ts +56 -12
- package/src/testing/wsevents.ts +21 -0
- package/types/commonTypes.d.ts +10 -31
- package/types/commonTypes.d.ts.map +1 -1
- package/types/processbase.d.ts +3 -2
- package/types/processbase.d.ts.map +1 -1
- package/types/socketIoServerHelper.d.ts +8 -6
- package/types/socketIoServerHelper.d.ts.map +1 -1
- package/types/testing/appWorkerWSS.d.ts.map +1 -1
- package/types/testing/wsevents.d.ts +14 -0
- package/types/testing/wsevents.d.ts.map +1 -0
package/dist/commonTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;;AAQA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IACzB,4CAAuB,CAAA;IACvB,kDAA6B,CAAA;AACjC,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B;AA2FD,IAAY,YAGX;AAHD,WAAY,YAAY;IACvB,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;AAC1B,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB;AAED,IAAY,OAQX;AARD,WAAY,OAAO;IAClB,mBAAmB;IACnB,0DAA+C,CAAA;IAC/C,kFAAuE,CAAA;IAEvE,mBAAmB;IACnB,0CAA+B,CAAA;IAC/B,kDAAuC,CAAA;AACxC,CAAC,EARW,OAAO,uBAAP,OAAO,QAQlB;AAED,IAAY,QAyBX;AAzBD,WAAY,QAAQ;IACnB,oBAAoB;IACpB,mDAAuC,CAAA;IACvC,yDAA6C,CAAA;IAC7C,6DAAiD,CAAA;IAEjD,2EAA+D,CAAA;IAC/D,yEAA6D,CAAA;IAE7D,mBAAmB;IACnB,iCAAqB,CAAA;IACrB,+BAAmB,CAAA;IACnB,iCAAqB,CAAA;IACrB,mCAAuB,CAAA;IACvB,yCAA6B,CAAA;IAC7B,iFAAiF;IACjF,0EAA0E;IAC1E,2DAA+C,CAAA;IAC/C,6DAAiD,CAAA;IACjD,8EAA8E;IAE9E,wCAA4B,CAAA;IAE5B,yBAAyB;IACzB,+BAAmB,CAAA;AACpB,CAAC,EAzBW,QAAQ,wBAAR,QAAQ,QAyBnB"}
|
package/dist/processbase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,qCAA2C;AAC3C,0DAA6B;AAC7B,gEAAkC;AAClC,oDAA2B;AAC3B,0EAAkC,CAAC,gCAAgC;AACnE,uCAAoD;AAEpD,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;AAE7D,oEAAyJ;AAEzJ,kEAAiG;AAEjG,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,qDAAgE;AAChE,gDAA8D;AAC9D,yDAA+C;AAE/C,oEAE4F;AAE5F,4FAA4F;AAE5F,mDAAwC;AAExC,4CAAoB;
|
|
1
|
+
{"version":3,"file":"processbase.js","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ class SocketIoServerHelper {
|
|
|
13
13
|
}
|
|
14
14
|
#namespace = {};
|
|
15
15
|
LogMessage = (namespace, message) => {
|
|
16
|
-
this.#socketIoServerHelperOptions.logger(`${namespace.
|
|
16
|
+
this.#socketIoServerHelperOptions.logger(`${namespace.namespace}: ${message}`);
|
|
17
17
|
/*
|
|
18
18
|
this.#stsApp.UpdateInstrument(Gauge.LOGGER, {
|
|
19
19
|
LogMessage: message
|
|
@@ -76,24 +76,6 @@ class SocketIoServerHelper {
|
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
78
|
};
|
|
79
|
-
#SetupCustomEvents = (socket, serverSocketEvents) => {
|
|
80
|
-
for (let i = 0; i < serverSocketEvents.length; i++) {
|
|
81
|
-
const socketEvent = serverSocketEvents[i];
|
|
82
|
-
if (socketEvent.serverEventName === 'connect') {
|
|
83
|
-
// Handle the special case of the connect event call back.
|
|
84
|
-
// This will execute as soon as the namespace connection event occurs.
|
|
85
|
-
setTimeout(() => {
|
|
86
|
-
socketEvent.serverEventCb(socket, null);
|
|
87
|
-
}, 0).unref();
|
|
88
|
-
}
|
|
89
|
-
else {
|
|
90
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
91
|
-
socket.on(socketEvent.serverEventName, (data) => {
|
|
92
|
-
socketEvent.serverEventCb(socket, data);
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
}
|
|
96
|
-
};
|
|
97
79
|
// Use this middleward to check every incomming connection
|
|
98
80
|
#SetupConnectionMiddleware = (nameSpace) => {
|
|
99
81
|
nameSpace.socketionamespace.use((socket, next) => {
|
|
@@ -123,10 +105,10 @@ class SocketIoServerHelper {
|
|
|
123
105
|
next();
|
|
124
106
|
});
|
|
125
107
|
};
|
|
126
|
-
SetupNamespace = (io, namespace, rooms, autoJoinRooms, serverSocketEvents) => {
|
|
108
|
+
SetupNamespace = (io, namespace, rooms, autoJoinRooms, /* serverSocketEvents: ServerSocketEvent[], */ socketConnectCallBack, socketEventsCallBack) => {
|
|
127
109
|
// Create STS Command Centre Client namespace
|
|
128
110
|
this.#namespace[namespace] = {
|
|
129
|
-
|
|
111
|
+
namespace: namespace,
|
|
130
112
|
pid: process.pid,
|
|
131
113
|
socketionamespace: io.of(`/${namespace}/`)
|
|
132
114
|
};
|
|
@@ -143,11 +125,16 @@ class SocketIoServerHelper {
|
|
|
143
125
|
});
|
|
144
126
|
}
|
|
145
127
|
this.#SetupStandardEvents(this.#namespace[namespace], socket);
|
|
146
|
-
if (
|
|
147
|
-
|
|
128
|
+
if (socketConnectCallBack) {
|
|
129
|
+
setTimeout(() => {
|
|
130
|
+
socketConnectCallBack(socket);
|
|
131
|
+
}, 0);
|
|
132
|
+
}
|
|
133
|
+
if (socketEventsCallBack) {
|
|
134
|
+
socketEventsCallBack(socket);
|
|
148
135
|
}
|
|
149
136
|
});
|
|
150
|
-
return this.#namespace[namespace];
|
|
137
|
+
return this.#namespace[namespace].socketionamespace;
|
|
151
138
|
};
|
|
152
139
|
GetNamespace = (namespace) => {
|
|
153
140
|
return this.#namespace[namespace];
|
|
@@ -158,6 +145,9 @@ class SocketIoServerHelper {
|
|
|
158
145
|
}
|
|
159
146
|
this.#namespace = {};
|
|
160
147
|
};
|
|
148
|
+
SetupEvent(event, eventCb) {
|
|
149
|
+
return this;
|
|
150
|
+
}
|
|
161
151
|
}
|
|
162
152
|
exports.SocketIoServerHelper = SocketIoServerHelper;
|
|
163
153
|
//# sourceMappingURL=socketIoServerHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,QAAQ,OAAO,CAAC,GAAG,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,38 +89,39 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
89
89
|
console.error(`Error with WorkerProcess:SendIPCMessageToMaster(2): [${error}]`.red);
|
|
90
90
|
}
|
|
91
91
|
}
|
|
92
|
-
#GetServerSocketEvent(eventName) {
|
|
93
|
-
return {
|
|
94
|
-
serverEventName: eventName,
|
|
95
|
-
serverEventCb: (socket, data) => this.#SendIPCMessageToMaster(socket, eventName, data)
|
|
96
|
-
};
|
|
97
|
-
}
|
|
98
92
|
WorkerStarted() {
|
|
99
93
|
let socketIoNamespace = null;
|
|
100
94
|
if (this.socketIoServerHelper) {
|
|
101
|
-
socketIoNamespace = this.socketIoServerHelper.SetupNamespace(this.io, index_1.STSNamespace.STSMonitor,
|
|
95
|
+
socketIoNamespace = this.socketIoServerHelper.SetupNamespace(this.io, index_1.STSNamespace.STSMonitor,
|
|
96
|
+
// Auto joinn room list
|
|
97
|
+
[
|
|
102
98
|
index_1.STSRoom.STSInstrumentDataRoom,
|
|
103
|
-
index_1.STSRoom.STSRunnerRoom
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
{
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
99
|
+
index_1.STSRoom.STSRunnerRoom,
|
|
100
|
+
'room3'
|
|
101
|
+
], true, // Make any connecting client automatically join the room list above
|
|
102
|
+
// Connect call back when a client connects
|
|
103
|
+
(socket) => {
|
|
104
|
+
console.log(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${InstrumentManagerEventName.CONNECT}]`.grey);
|
|
105
|
+
},
|
|
106
|
+
// Custom client to server events
|
|
107
|
+
(socket) => {
|
|
108
|
+
socket.on('subscribe', (data) => {
|
|
109
|
+
this.#SendIPCMessageToMaster(socket, 'subscribe', data);
|
|
110
|
+
socket.emit('subscribeAck', data);
|
|
111
|
+
});
|
|
112
|
+
socket.on('unsubscribe', (data) => {
|
|
113
|
+
this.#SendIPCMessageToMaster(socket, 'unsubscribe', data);
|
|
114
|
+
socket.emit('unsubscribeAck', data);
|
|
115
|
+
});
|
|
116
|
+
socket.on('subscribeKeepAlive', (data) => {
|
|
117
|
+
this.#SendIPCMessageToMaster(socket, 'subscribeKeepAlive', data);
|
|
118
|
+
socket.emit('subscribeKeepAliveAck', data);
|
|
119
|
+
});
|
|
120
|
+
socket.on('done', () => {
|
|
121
|
+
this.#SendIPCMessageToMaster(socket, 'done', {});
|
|
122
|
+
socket.emit('doneAck');
|
|
123
|
+
});
|
|
124
|
+
});
|
|
124
125
|
}
|
|
125
126
|
else {
|
|
126
127
|
throw new Error('WorkerProcess:WorkerStarted(): this.socketIoHelper is null');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"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"}
|
|
@@ -181,6 +181,17 @@ const index_1 = require("./../index");
|
|
|
181
181
|
//goptions.asendpoint = testHelper.authHost;
|
|
182
182
|
//goptions.asport = testHelper.authPort;
|
|
183
183
|
*/
|
|
184
|
+
const clusterMode = true;
|
|
185
|
+
if (clusterMode) {
|
|
186
|
+
const appOptions = (0, appConfig_1.ServiceConfigOptions)(clusterMode, true);
|
|
187
|
+
appOptions.processExitOnTerminate = false;
|
|
188
|
+
app = new __1.MasterProcessBase(appOptions);
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
const appOptions = (0, appConfig_1.ServiceConfigOptions)(clusterMode, true);
|
|
192
|
+
appOptions.processExitOnTerminate = false;
|
|
193
|
+
app = new __1.SingleProcessBase(appOptions);
|
|
194
|
+
}
|
|
184
195
|
const appOptions = (0, appConfig_1.ServiceConfigOptions)(true, true);
|
|
185
196
|
appOptions.processExitOnTerminate = false;
|
|
186
197
|
//app = new SingleProcessBase(appOptions)
|
|
@@ -228,23 +239,46 @@ const index_1 = require("./../index");
|
|
|
228
239
|
}
|
|
229
240
|
}, 10000);
|
|
230
241
|
(0, vitest_1.test)('client socket testing', async () => {
|
|
231
|
-
vitest_1.expect.assertions(
|
|
242
|
+
vitest_1.expect.assertions(6);
|
|
232
243
|
let complete = false;
|
|
233
|
-
const
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
+
const socket = socketUtils.SetupClientSideSocket('STSUITerm',
|
|
245
|
+
// The address defines the namespace to connect to (i.e. io.of('/address'))
|
|
246
|
+
instrumentManagerAddress,
|
|
247
|
+
// Connected call back
|
|
248
|
+
(socket) => {
|
|
249
|
+
debug(`connected - 1`.green);
|
|
250
|
+
(0, vitest_1.expect)(1).toEqual(1);
|
|
251
|
+
},
|
|
252
|
+
// Custom Events
|
|
253
|
+
(socket) => {
|
|
254
|
+
socket.on('subscribeAck', (data) => {
|
|
255
|
+
debug('subscribeAck'.yellow);
|
|
256
|
+
(0, vitest_1.expect)(data.data).toMatch(/(subject01|subject02)/i);
|
|
257
|
+
});
|
|
258
|
+
socket.on('unsubscribeAck', (data) => {
|
|
259
|
+
debug('unsubscribeAck'.yellow);
|
|
260
|
+
(0, vitest_1.expect)(data.data).toMatch(/(subject02)/i);
|
|
261
|
+
});
|
|
262
|
+
socket.on('subscribeKeepAliveAck', (data) => {
|
|
263
|
+
debug('subscribeKeepAliveAck'.yellow);
|
|
264
|
+
(0, vitest_1.expect)(data.data).toMatch(/(ok)/i);
|
|
265
|
+
});
|
|
266
|
+
socket.on('doneAck', () => {
|
|
267
|
+
debug('doneAck'.yellow);
|
|
268
|
+
(0, vitest_1.expect)(1).toEqual(1);
|
|
269
|
+
complete = true;
|
|
270
|
+
});
|
|
271
|
+
});
|
|
272
|
+
socket.emit('joinRoom', 'room1').emit('joinRoom', 'room2');
|
|
273
|
+
socket.emit('subscribe', { data: 'subject01 ' });
|
|
274
|
+
socket.emit('subscribe', { data: 'subject02 ' });
|
|
275
|
+
socket.emit('unsubscribe', { data: 'subject02 ' });
|
|
276
|
+
socket.emit('subscribeKeepAlive', { data: 'ok' });
|
|
277
|
+
socket.emit('sendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 } });
|
|
278
|
+
//socket.emit('done');
|
|
244
279
|
while (!complete) {
|
|
245
280
|
await (0, stsutils_1.Sleep)(100);
|
|
246
281
|
}
|
|
247
|
-
//expect(1).toEqual(1);
|
|
248
282
|
}, 3000);
|
|
249
283
|
});
|
|
250
284
|
//# sourceMappingURL=singleservertest.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/testing/singleservertest.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,wBAAwB,CAAC,CAAC;AAEvE,kDAAyD;AAEzD,gDAAyC;AACzC,4BAA2D;AAE3D,2CAAkD;AAElD,kDAA4D;AAC5D,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAAmC;AAEnC,mCAAyE;AAEzE,oEAA+G;AAE/G,sCACqF;
|
|
1
|
+
{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/testing/singleservertest.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wsevents.js","sourceRoot":"","sources":["../../src/testing/wsevents.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.241",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"@typescript-eslint/eslint-plugin": "^5.60.1",
|
|
40
40
|
"@typescript-eslint/parser": "^5.60.1",
|
|
41
41
|
"@vitest/ui": "^0.32.2",
|
|
42
|
-
"eslint": "^8.
|
|
42
|
+
"eslint": "^8.44.0",
|
|
43
43
|
"jest": "^29.5.0",
|
|
44
44
|
"supertest": "^6.3.3",
|
|
45
45
|
"testcontainers": "^9.9.1",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"@nsshunt/stsdatamanagement": "^1.17.99",
|
|
51
51
|
"@nsshunt/stsinstrumentation": "^6.11.87",
|
|
52
52
|
"@nsshunt/stspublisherserver": "^1.15.84",
|
|
53
|
-
"@nsshunt/stssocketio-client": "^0.0.
|
|
53
|
+
"@nsshunt/stssocketio-client": "^0.0.14",
|
|
54
54
|
"@nsshunt/stsutils": "^1.16.6",
|
|
55
55
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
56
56
|
"@socket.io/redis-streams-adapter": "^0.1.0",
|
|
@@ -72,6 +72,7 @@
|
|
|
72
72
|
"prom-client": "^14.2.0",
|
|
73
73
|
"redis": "^4.6.7",
|
|
74
74
|
"socket.io": "^4.7.1",
|
|
75
|
+
"socket.io-client": "^4.7.1",
|
|
75
76
|
"systeminformation": "^5.18.6",
|
|
76
77
|
"tough-cookie": "^4.1.3",
|
|
77
78
|
"uuid": "^9.0.0",
|
package/src/commonTypes.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { STSOptionsBase, JSONObject } from "@nsshunt/stsutils"
|
|
|
4
4
|
import { PublishInstrumentController, InstrumentDefinitions } from '@nsshunt/stspublisherserver'
|
|
5
5
|
import { InstrumentBaseTelemetry, Gauge } from '@nsshunt/stsinstrumentation'
|
|
6
6
|
import { PGAccessLayer } from '@nsshunt/stsdatamanagement'
|
|
7
|
+
import { STSClientToServerEvents, STSServerToClientEvents, EventsMap } from '@nsshunt/stssocketio-client'
|
|
7
8
|
|
|
8
9
|
export enum IPCMessageCommand {
|
|
9
10
|
AddWorker = 'AddWorker',
|
|
@@ -39,8 +40,8 @@ export interface IProcessBase extends STSOptionsBase {
|
|
|
39
40
|
InstrumentExists(instrumentName: Gauge): boolean
|
|
40
41
|
ProcessTerminate: () => Promise<void>
|
|
41
42
|
GetUIController(): any
|
|
42
|
-
get socketIoServerHelper(): ISocketIoServerHelper | null
|
|
43
|
-
set socketIoServerHelper(value: ISocketIoServerHelper | null)
|
|
43
|
+
get socketIoServerHelper(): ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null
|
|
44
|
+
set socketIoServerHelper(value: ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null)
|
|
44
45
|
TerminateDatabase(): Promise<void>
|
|
45
46
|
get accessLayer(): PGAccessLayer | null
|
|
46
47
|
}
|
|
@@ -143,44 +144,30 @@ export enum STSEvent {
|
|
|
143
144
|
|
|
144
145
|
// https://socket.io/docs/v4/typescript/
|
|
145
146
|
|
|
146
|
-
export interface STSClientToServerEvents {
|
|
147
|
-
joinRoom: (room: STSRoom) => void;
|
|
148
|
-
leaveRoom: (room: STSRoom) => void;
|
|
149
|
-
register: (message: string) => void;
|
|
150
|
-
disconnecting: (reason: string) => void; // server event
|
|
151
|
-
disconnect: (reason: string) => void; // server and client event
|
|
152
|
-
sendToRoom: (rooms: STSRoom[], payload: { command: string, payload: JSONObject }) => void;
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
export interface STSServerToClient {
|
|
156
|
-
goodbye: (message: string) => void;
|
|
157
|
-
hello: (message: string) => void;
|
|
158
|
-
registerEcho: (message: { socketId: string, message: string }) => void;
|
|
159
|
-
disconnect: (reason: string) => void; // server and client event
|
|
160
|
-
connect: () => void; // client events
|
|
161
|
-
connect_error: () => void; // client event
|
|
162
|
-
start: () => void;
|
|
163
|
-
}
|
|
164
|
-
|
|
165
147
|
export interface InterServerEvents {
|
|
166
148
|
ping: () => void;
|
|
167
149
|
}
|
|
168
150
|
|
|
169
151
|
export interface STSSocketIONamespace {
|
|
170
|
-
|
|
152
|
+
namespace: string
|
|
171
153
|
pid: number
|
|
172
|
-
socketionamespace: Namespace<STSClientToServerEvents,
|
|
154
|
+
socketionamespace: Namespace<STSClientToServerEvents, STSServerToClientEvents, InterServerEvents>
|
|
173
155
|
}
|
|
174
156
|
|
|
175
|
-
export type STSServerSocket = Socket<STSClientToServerEvents,
|
|
176
|
-
export type STSClientSocket = Socket<
|
|
157
|
+
export type STSServerSocket = Socket<STSClientToServerEvents, STSServerToClientEvents, InterServerEvents>
|
|
158
|
+
export type STSClientSocket = Socket<STSServerToClientEvents, STSClientToServerEvents, InterServerEvents>
|
|
177
159
|
|
|
178
|
-
export interface ISocketIoServerHelper
|
|
160
|
+
export interface ISocketIoServerHelper<ClientToServerEvents extends EventsMap, ServerToClientEvents extends EventsMap>
|
|
179
161
|
{
|
|
180
162
|
LogMessage: (namespace: STSSocketIONamespace, message: string) => void
|
|
181
163
|
LeaveRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: STSRoom) => void
|
|
182
164
|
JoinRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: STSRoom) => void
|
|
183
|
-
SetupNamespace: (io: Server, namespace: STSNamespace, rooms:
|
|
165
|
+
SetupNamespace: (io: Server, namespace: STSNamespace, rooms: string[], autoJoinRooms: boolean,
|
|
166
|
+
/* serverSocketEvents: ServerSocketEvent[], */
|
|
167
|
+
socketConnectCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null,
|
|
168
|
+
socketEventsCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null
|
|
169
|
+
) => Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents>
|
|
184
170
|
GetNamespace: (namespace: any) => STSSocketIONamespace
|
|
185
171
|
DisconnectSockets: () => void
|
|
172
|
+
SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>
|
|
186
173
|
}
|
package/src/processbase.ts
CHANGED
|
@@ -33,6 +33,8 @@ import os from 'os';
|
|
|
33
33
|
import { IProcessBase, ISocketIoServerHelper } from './commonTypes'
|
|
34
34
|
import { TimeSeriesDuplicatePolicies } from 'redis';
|
|
35
35
|
|
|
36
|
+
import { STSClientToServerEvents, STSServerToClientEvents } from '@nsshunt/stssocketio-client'
|
|
37
|
+
|
|
36
38
|
type logFunction = (msg: any) => void
|
|
37
39
|
|
|
38
40
|
//import ProcessBrokerWorker from './processbrokerworker.js?worker'
|
|
@@ -41,7 +43,7 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
41
43
|
{
|
|
42
44
|
#instrumentController: PublishInstrumentController | null = null;
|
|
43
45
|
#systemInformationInterval: NodeJS.Timer | null = null;
|
|
44
|
-
#socketIoServerHelper: ISocketIoServerHelper | null = null;
|
|
46
|
+
#socketIoServerHelper: ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null = null;
|
|
45
47
|
#accessLayer: PGAccessLayer | null = null;
|
|
46
48
|
#poolManager: PGPoolManager | null = null;
|
|
47
49
|
#logEx: logFunction | null = null;
|
|
@@ -273,12 +275,12 @@ export abstract class ProcessBase extends STSOptionsBase implements IProcessBase
|
|
|
273
275
|
return null;
|
|
274
276
|
}
|
|
275
277
|
|
|
276
|
-
get socketIoServerHelper(): ISocketIoServerHelper | null
|
|
278
|
+
get socketIoServerHelper(): ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null
|
|
277
279
|
{
|
|
278
280
|
return this.#socketIoServerHelper;
|
|
279
281
|
}
|
|
280
282
|
|
|
281
|
-
set socketIoServerHelper(value: ISocketIoServerHelper | null)
|
|
283
|
+
set socketIoServerHelper(value: ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null)
|
|
282
284
|
{
|
|
283
285
|
this.#socketIoServerHelper = value;
|
|
284
286
|
}
|
|
@@ -4,16 +4,19 @@ const debug = Debug(`proc:${process.pid}:socketiohelper`);
|
|
|
4
4
|
import { Gauge, InstrumentLogTelemetry } from '@nsshunt/stsinstrumentation'
|
|
5
5
|
import { JSONObject } from '@nsshunt/stsutils'
|
|
6
6
|
|
|
7
|
-
import { Server } from "socket.io";
|
|
7
|
+
import { Server, Socket, Namespace } from "socket.io";
|
|
8
|
+
|
|
8
9
|
import { IProcessBase, STSSocketIONamespace, STSRoom, STSServerSocket,
|
|
9
|
-
ServerSocketEvent, STSNamespace, ISocketIoServerHelper } from './commonTypes'
|
|
10
|
+
ServerSocketEvent, STSNamespace, ISocketIoServerHelper, ServerEventCb, InterServerEvents } from './commonTypes'
|
|
11
|
+
|
|
12
|
+
import { STSClientToServerEvents, STSServerToClientEvents, EventsMap } from '@nsshunt/stssocketio-client'
|
|
10
13
|
|
|
11
14
|
export interface ISocketIoServerHelperOptions
|
|
12
15
|
{
|
|
13
16
|
logger: (message: string) => void;
|
|
14
17
|
}
|
|
15
18
|
|
|
16
|
-
export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
19
|
+
export class SocketIoServerHelper<ClientToServerEvents extends STSClientToServerEvents, ServerToClientEvents extends STSServerToClientEvents> implements ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>
|
|
17
20
|
{
|
|
18
21
|
#socketIoServerHelperOptions: ISocketIoServerHelperOptions
|
|
19
22
|
|
|
@@ -25,7 +28,7 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
25
28
|
|
|
26
29
|
LogMessage = (namespace: STSSocketIONamespace, message: string): void => {
|
|
27
30
|
|
|
28
|
-
this.#socketIoServerHelperOptions.logger(`${namespace.
|
|
31
|
+
this.#socketIoServerHelperOptions.logger(`${namespace.namespace}: ${message}`);
|
|
29
32
|
/*
|
|
30
33
|
this.#stsApp.UpdateInstrument(Gauge.LOGGER, {
|
|
31
34
|
LogMessage: message
|
|
@@ -33,7 +36,7 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
33
36
|
*/
|
|
34
37
|
};
|
|
35
38
|
|
|
36
|
-
LeaveRoom = (namespace: STSSocketIONamespace, socket: STSServerSocket, room:
|
|
39
|
+
LeaveRoom = (namespace: STSSocketIONamespace, socket: STSServerSocket, room: string): void => {
|
|
37
40
|
const logMessage = `${namespace.socketionamespace.name}: Leaving room [${room}]`;
|
|
38
41
|
debug(logMessage);
|
|
39
42
|
this.LogMessage(namespace, logMessage);
|
|
@@ -42,7 +45,7 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
42
45
|
namespace.socketionamespace.to(room).emit('goodbye', `${socket.id}: has left room: [${room}].`);
|
|
43
46
|
};
|
|
44
47
|
|
|
45
|
-
JoinRoom = (namespace: STSSocketIONamespace, socket: STSServerSocket, room:
|
|
48
|
+
JoinRoom = (namespace: STSSocketIONamespace, socket: STSServerSocket, room: string): void => {
|
|
46
49
|
const logMessage = `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
47
50
|
debug(logMessage);
|
|
48
51
|
this.LogMessage(namespace, logMessage);
|
|
@@ -75,19 +78,19 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
75
78
|
socket.emit(`registerEcho`, { socketId: socket.id, message: message });
|
|
76
79
|
});
|
|
77
80
|
|
|
78
|
-
socket.on('joinRoom', (room:
|
|
81
|
+
socket.on('joinRoom', (room: string): void => { //@@ names
|
|
79
82
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
80
83
|
debug(logMessage);
|
|
81
84
|
this.JoinRoom(namespace, socket, room);
|
|
82
85
|
});
|
|
83
86
|
|
|
84
|
-
socket.on('leaveRoom', (room:
|
|
87
|
+
socket.on('leaveRoom', (room: string): void => { //@@ names
|
|
85
88
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
|
|
86
89
|
debug(logMessage);
|
|
87
90
|
this.LeaveRoom(namespace, socket, room);
|
|
88
91
|
});
|
|
89
92
|
|
|
90
|
-
socket.on('sendToRoom', (rooms:
|
|
93
|
+
socket.on('sendToRoom', (rooms: string[], payload: { command: string, payload: JSONObject }): void => {
|
|
91
94
|
rooms.forEach((room) => {
|
|
92
95
|
const logMessage = `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`;
|
|
93
96
|
debug(logMessage);
|
|
@@ -97,24 +100,6 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
97
100
|
});
|
|
98
101
|
}
|
|
99
102
|
|
|
100
|
-
#SetupCustomEvents = (socket: STSServerSocket, serverSocketEvents: ServerSocketEvent[]): void => {
|
|
101
|
-
for (let i=0; i < serverSocketEvents.length; i++) {
|
|
102
|
-
const socketEvent = serverSocketEvents[i];
|
|
103
|
-
if (socketEvent.serverEventName === 'connect') {
|
|
104
|
-
// Handle the special case of the connect event call back.
|
|
105
|
-
// This will execute as soon as the namespace connection event occurs.
|
|
106
|
-
setTimeout(() => {
|
|
107
|
-
socketEvent.serverEventCb(socket, null);
|
|
108
|
-
}, 0).unref();
|
|
109
|
-
} else {
|
|
110
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
111
|
-
socket.on(socketEvent.serverEventName as any, (data: any) => {
|
|
112
|
-
socketEvent.serverEventCb(socket, data);
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
|
|
118
103
|
// Use this middleward to check every incomming connection
|
|
119
104
|
#SetupConnectionMiddleware = (nameSpace: STSSocketIONamespace) => {
|
|
120
105
|
nameSpace.socketionamespace.use((socket, next) => {
|
|
@@ -144,11 +129,14 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
144
129
|
next();
|
|
145
130
|
});
|
|
146
131
|
}
|
|
147
|
-
|
|
148
|
-
SetupNamespace = (io: Server, namespace: STSNamespace, rooms:
|
|
132
|
+
|
|
133
|
+
SetupNamespace = (io: Server, namespace: STSNamespace, rooms: string[], autoJoinRooms: boolean, /* serverSocketEvents: ServerSocketEvent[], */
|
|
134
|
+
socketConnectCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null,
|
|
135
|
+
socketEventsCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null
|
|
136
|
+
): Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents> => {
|
|
149
137
|
// Create STS Command Centre Client namespace
|
|
150
138
|
this.#namespace[namespace] = {
|
|
151
|
-
|
|
139
|
+
namespace: namespace,
|
|
152
140
|
pid: process.pid,
|
|
153
141
|
socketionamespace: io.of(`/${namespace}/`)
|
|
154
142
|
}
|
|
@@ -171,12 +159,18 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
171
159
|
|
|
172
160
|
this.#SetupStandardEvents(this.#namespace[namespace], socket);
|
|
173
161
|
|
|
174
|
-
if (
|
|
175
|
-
|
|
162
|
+
if (socketConnectCallBack) {
|
|
163
|
+
setTimeout(() => {
|
|
164
|
+
socketConnectCallBack(socket);
|
|
165
|
+
}, 0);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
if (socketEventsCallBack) {
|
|
169
|
+
socketEventsCallBack(socket);
|
|
176
170
|
}
|
|
177
171
|
});
|
|
178
172
|
|
|
179
|
-
return this.#namespace[namespace]
|
|
173
|
+
return this.#namespace[namespace].socketionamespace as Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents>;
|
|
180
174
|
}
|
|
181
175
|
|
|
182
176
|
GetNamespace = (namespace: string): STSSocketIONamespace => {
|
|
@@ -190,4 +184,8 @@ export class SocketIoServerHelper implements ISocketIoServerHelper
|
|
|
190
184
|
}
|
|
191
185
|
this.#namespace = { };
|
|
192
186
|
}
|
|
187
|
+
|
|
188
|
+
SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents> {
|
|
189
|
+
return this as any;
|
|
190
|
+
}
|
|
193
191
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import debugModule from 'debug'
|
|
2
2
|
const debug = debugModule(`proc:${process.pid}`);
|
|
3
3
|
|
|
4
|
-
import { Socket } from 'socket.io'
|
|
5
4
|
import cluster from 'node:cluster';
|
|
6
5
|
|
|
7
6
|
import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, ServerSocketEvent,
|
|
@@ -9,6 +8,14 @@ import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, ServerS
|
|
|
9
8
|
|
|
10
9
|
import { Sleep } from '@nsshunt/stsutils';
|
|
11
10
|
|
|
11
|
+
import { STSServerToClientEvents, STSClientToServerEvents } from '@nsshunt/stssocketio-client'
|
|
12
|
+
|
|
13
|
+
import { Server, Socket, Namespace } from "socket.io";
|
|
14
|
+
|
|
15
|
+
import { InterServerEvents } from './../commonTypes'
|
|
16
|
+
|
|
17
|
+
import { ClientToServerEvents, ServerToClientEvents } from './wsevents'
|
|
18
|
+
|
|
12
19
|
export enum InstrumentManagerEventName {
|
|
13
20
|
CONNECT = 'connect', //@@ should come from socketiohelper
|
|
14
21
|
|
|
@@ -41,7 +48,7 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
41
48
|
super(options);
|
|
42
49
|
|
|
43
50
|
//this.socketIoHelper = new SocketIoHelper(this as IProcessBase);
|
|
44
|
-
this.socketIoServerHelper = new SocketIoServerHelper({
|
|
51
|
+
this.socketIoServerHelper = new SocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>({
|
|
45
52
|
logger: this.LogEx
|
|
46
53
|
});
|
|
47
54
|
}
|
|
@@ -103,42 +110,43 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
103
110
|
}
|
|
104
111
|
}
|
|
105
112
|
|
|
106
|
-
#GetServerSocketEvent(eventName: any): ServerSocketEvent {
|
|
107
|
-
return {
|
|
108
|
-
serverEventName: eventName,
|
|
109
|
-
serverEventCb: (socket, data): void => this.#SendIPCMessageToMaster(socket, eventName, data)
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
|
|
113
113
|
WorkerStarted(): any
|
|
114
114
|
{
|
|
115
|
-
let socketIoNamespace:
|
|
115
|
+
let socketIoNamespace: Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents> | null = null;
|
|
116
116
|
if (this.socketIoServerHelper) {
|
|
117
|
-
socketIoNamespace = this.socketIoServerHelper.SetupNamespace(this.io as any, STSNamespace.STSMonitor,
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
serverEventCb: (socket, data): void => {
|
|
130
|
-
console.log(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${ InstrumentManagerEventName.CONNECT}]`.grey);
|
|
131
|
-
}
|
|
117
|
+
socketIoNamespace = this.socketIoServerHelper.SetupNamespace(this.io as any, STSNamespace.STSMonitor,
|
|
118
|
+
// Auto joinn room list
|
|
119
|
+
[
|
|
120
|
+
STSRoom.STSInstrumentDataRoom,
|
|
121
|
+
STSRoom.STSRunnerRoom,
|
|
122
|
+
'room3'
|
|
123
|
+
],
|
|
124
|
+
true, // Make any connecting client automatically join the room list above
|
|
125
|
+
|
|
126
|
+
// Connect call back when a client connects
|
|
127
|
+
(socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => {
|
|
128
|
+
console.log(`WorkerProcess.#SendIPCMessageToMaster: eventName: [${ InstrumentManagerEventName.CONNECT}]`.grey);
|
|
132
129
|
},
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
socket.emit('
|
|
139
|
-
}
|
|
140
|
-
|
|
141
|
-
|
|
130
|
+
|
|
131
|
+
// Custom client to server events
|
|
132
|
+
(socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => {
|
|
133
|
+
socket.on('subscribe', (data: any) => {
|
|
134
|
+
this.#SendIPCMessageToMaster(socket, 'subscribe', data)
|
|
135
|
+
socket.emit('subscribeAck', data);
|
|
136
|
+
});
|
|
137
|
+
socket.on('unsubscribe', (data: any) => {
|
|
138
|
+
this.#SendIPCMessageToMaster(socket, 'unsubscribe', data)
|
|
139
|
+
socket.emit('unsubscribeAck', data);
|
|
140
|
+
});
|
|
141
|
+
socket.on('subscribeKeepAlive', (data: any) => {
|
|
142
|
+
this.#SendIPCMessageToMaster(socket, 'subscribeKeepAlive', data)
|
|
143
|
+
socket.emit('subscribeKeepAliveAck', data);
|
|
144
|
+
});
|
|
145
|
+
socket.on('done', () => {
|
|
146
|
+
this.#SendIPCMessageToMaster(socket, 'done', {})
|
|
147
|
+
socket.emit('doneAck');
|
|
148
|
+
});
|
|
149
|
+
})
|
|
142
150
|
} else {
|
|
143
151
|
throw new Error('WorkerProcess:WorkerStarted(): this.socketIoHelper is null')
|
|
144
152
|
}
|
|
@@ -24,6 +24,10 @@ import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, ServerS
|
|
|
24
24
|
|
|
25
25
|
import { DockerComposeEnvironment, Wait, AlwaysPullPolicy } from 'testcontainers'
|
|
26
26
|
|
|
27
|
+
import { ServerToClientEvents, ClientToServerEvents } from './wsevents'
|
|
28
|
+
import { Socket } from 'socket.io-client'
|
|
29
|
+
import { TimeSeriesBucketTimestamp } from 'redis';
|
|
30
|
+
|
|
27
31
|
describe("Single Server Test", () =>
|
|
28
32
|
{
|
|
29
33
|
/*
|
|
@@ -52,7 +56,7 @@ describe("Single Server Test", () =>
|
|
|
52
56
|
}
|
|
53
57
|
}
|
|
54
58
|
|
|
55
|
-
const socketUtils = new SocketIoClientHelper(socketUtilsoptions);
|
|
59
|
+
const socketUtils = new SocketIoClientHelper<ServerToClientEvents, ClientToServerEvents>(socketUtilsoptions);
|
|
56
60
|
|
|
57
61
|
const instrumentManagerAddress =
|
|
58
62
|
`${endpoint}:${goptions.rest01port}/${STSNamespace.STSMonitor}/`;
|
|
@@ -181,6 +185,18 @@ describe("Single Server Test", () =>
|
|
|
181
185
|
//goptions.asport = testHelper.authPort;
|
|
182
186
|
*/
|
|
183
187
|
|
|
188
|
+
const clusterMode = true;
|
|
189
|
+
|
|
190
|
+
if (clusterMode) {
|
|
191
|
+
const appOptions = ServiceConfigOptions(clusterMode, true);
|
|
192
|
+
appOptions.processExitOnTerminate = false;
|
|
193
|
+
app = new MasterProcessBase(appOptions)
|
|
194
|
+
} else {
|
|
195
|
+
const appOptions = ServiceConfigOptions(clusterMode, true);
|
|
196
|
+
appOptions.processExitOnTerminate = false;
|
|
197
|
+
app = new SingleProcessBase(appOptions)
|
|
198
|
+
}
|
|
199
|
+
|
|
184
200
|
const appOptions = ServiceConfigOptions(true, true);
|
|
185
201
|
appOptions.processExitOnTerminate = false;
|
|
186
202
|
//app = new SingleProcessBase(appOptions)
|
|
@@ -241,28 +257,56 @@ describe("Single Server Test", () =>
|
|
|
241
257
|
|
|
242
258
|
test('client socket testing', async () =>
|
|
243
259
|
{
|
|
244
|
-
expect.assertions(
|
|
260
|
+
expect.assertions(6);
|
|
245
261
|
|
|
246
262
|
let complete = false;
|
|
247
263
|
|
|
248
|
-
const
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
264
|
+
const socket = socketUtils.SetupClientSideSocket('STSUITerm',
|
|
265
|
+
// The address defines the namespace to connect to (i.e. io.of('/address'))
|
|
266
|
+
instrumentManagerAddress,
|
|
267
|
+
// Connected call back
|
|
268
|
+
(socket: Socket<ServerToClientEvents, ClientToServerEvents>) => {
|
|
269
|
+
debug(`connected - 1`.green);
|
|
270
|
+
expect(1).toEqual(1);
|
|
271
|
+
},
|
|
272
|
+
// Custom Events
|
|
273
|
+
(socket: Socket<ServerToClientEvents, ClientToServerEvents>) => {
|
|
274
|
+
socket.on('subscribeAck', (data: any) => {
|
|
275
|
+
debug('subscribeAck'.yellow);
|
|
276
|
+
expect(data.data).toMatch(/(subject01|subject02)/i);
|
|
277
|
+
});
|
|
278
|
+
socket.on('unsubscribeAck', (data: any) => {
|
|
279
|
+
debug('unsubscribeAck'.yellow);
|
|
280
|
+
expect(data.data).toMatch(/(subject02)/i);
|
|
281
|
+
});
|
|
282
|
+
socket.on('subscribeKeepAliveAck', (data: any) => {
|
|
283
|
+
debug('subscribeKeepAliveAck'.yellow);
|
|
284
|
+
expect(data.data).toMatch(/(ok)/i);
|
|
285
|
+
});
|
|
286
|
+
socket.on('doneAck', () => {
|
|
287
|
+
debug('doneAck'.yellow);
|
|
253
288
|
expect(1).toEqual(1);
|
|
254
289
|
complete = true;
|
|
255
|
-
}
|
|
290
|
+
});
|
|
256
291
|
}
|
|
257
|
-
|
|
292
|
+
)
|
|
293
|
+
|
|
294
|
+
socket.emit('joinRoom', 'room1').emit('joinRoom', 'room2');
|
|
258
295
|
|
|
259
|
-
|
|
296
|
+
socket.emit('subscribe', { data: 'subject01 '});
|
|
297
|
+
socket.emit('subscribe', { data: 'subject02 '});
|
|
298
|
+
|
|
299
|
+
socket.emit('unsubscribe', { data: 'subject02 '});
|
|
300
|
+
|
|
301
|
+
socket.emit('subscribeKeepAlive', { data: 'ok'});
|
|
302
|
+
|
|
303
|
+
socket.emit('sendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 }})
|
|
304
|
+
//socket.emit('done');
|
|
260
305
|
|
|
261
306
|
while (!complete) {
|
|
262
307
|
await Sleep(100);
|
|
263
308
|
}
|
|
264
|
-
|
|
265
|
-
//expect(1).toEqual(1);
|
|
309
|
+
|
|
266
310
|
}, 3000);
|
|
267
311
|
});
|
|
268
312
|
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { STSServerToClientEvents, STSClientToServerEvents } from '@nsshunt/stssocketio-client'
|
|
2
|
+
|
|
3
|
+
export interface ServerToClientEvents extends STSServerToClientEvents {
|
|
4
|
+
/*
|
|
5
|
+
noArg: () => void;
|
|
6
|
+
basicEmit: (a: number, b: string, c: Buffer) => void;
|
|
7
|
+
withAck: (d: string, callback: (e: number) => void) => void;
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
subscribeAck: (data: any) => void;
|
|
11
|
+
unsubscribeAck: (data: any) => void;
|
|
12
|
+
subscribeKeepAliveAck: (data: any) => void;
|
|
13
|
+
doneAck: () => void;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export interface ClientToServerEvents extends STSClientToServerEvents {
|
|
17
|
+
subscribe: (data: any) => void;
|
|
18
|
+
unsubscribe: (data: any) => void;
|
|
19
|
+
subscribeKeepAlive: (data: any) => void;
|
|
20
|
+
done: () => void;
|
|
21
|
+
}
|
package/types/commonTypes.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { STSOptionsBase, JSONObject } from "@nsshunt/stsutils";
|
|
|
5
5
|
import { PublishInstrumentController, InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
6
6
|
import { InstrumentBaseTelemetry, Gauge } from '@nsshunt/stsinstrumentation';
|
|
7
7
|
import { PGAccessLayer } from '@nsshunt/stsdatamanagement';
|
|
8
|
+
import { STSClientToServerEvents, STSServerToClientEvents, EventsMap } from '@nsshunt/stssocketio-client';
|
|
8
9
|
export declare enum IPCMessageCommand {
|
|
9
10
|
AddWorker = "AddWorker",
|
|
10
11
|
DeleteWorker = "DeleteWorker"
|
|
@@ -33,8 +34,8 @@ export interface IProcessBase extends STSOptionsBase {
|
|
|
33
34
|
InstrumentExists(instrumentName: Gauge): boolean;
|
|
34
35
|
ProcessTerminate: () => Promise<void>;
|
|
35
36
|
GetUIController(): any;
|
|
36
|
-
get socketIoServerHelper(): ISocketIoServerHelper | null;
|
|
37
|
-
set socketIoServerHelper(value: ISocketIoServerHelper | null);
|
|
37
|
+
get socketIoServerHelper(): ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null;
|
|
38
|
+
set socketIoServerHelper(value: ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null);
|
|
38
39
|
TerminateDatabase(): Promise<void>;
|
|
39
40
|
get accessLayer(): PGAccessLayer | null;
|
|
40
41
|
}
|
|
@@ -105,45 +106,23 @@ export declare enum STSEvent {
|
|
|
105
106
|
STSSendToRoom = "sendToRoom",
|
|
106
107
|
connect = "connect"
|
|
107
108
|
}
|
|
108
|
-
export interface STSClientToServerEvents {
|
|
109
|
-
joinRoom: (room: STSRoom) => void;
|
|
110
|
-
leaveRoom: (room: STSRoom) => void;
|
|
111
|
-
register: (message: string) => void;
|
|
112
|
-
disconnecting: (reason: string) => void;
|
|
113
|
-
disconnect: (reason: string) => void;
|
|
114
|
-
sendToRoom: (rooms: STSRoom[], payload: {
|
|
115
|
-
command: string;
|
|
116
|
-
payload: JSONObject;
|
|
117
|
-
}) => void;
|
|
118
|
-
}
|
|
119
|
-
export interface STSServerToClient {
|
|
120
|
-
goodbye: (message: string) => void;
|
|
121
|
-
hello: (message: string) => void;
|
|
122
|
-
registerEcho: (message: {
|
|
123
|
-
socketId: string;
|
|
124
|
-
message: string;
|
|
125
|
-
}) => void;
|
|
126
|
-
disconnect: (reason: string) => void;
|
|
127
|
-
connect: () => void;
|
|
128
|
-
connect_error: () => void;
|
|
129
|
-
start: () => void;
|
|
130
|
-
}
|
|
131
109
|
export interface InterServerEvents {
|
|
132
110
|
ping: () => void;
|
|
133
111
|
}
|
|
134
112
|
export interface STSSocketIONamespace {
|
|
135
|
-
|
|
113
|
+
namespace: string;
|
|
136
114
|
pid: number;
|
|
137
|
-
socketionamespace: Namespace<STSClientToServerEvents,
|
|
115
|
+
socketionamespace: Namespace<STSClientToServerEvents, STSServerToClientEvents, InterServerEvents>;
|
|
138
116
|
}
|
|
139
|
-
export type STSServerSocket = Socket<STSClientToServerEvents,
|
|
140
|
-
export type STSClientSocket = Socket<
|
|
141
|
-
export interface ISocketIoServerHelper {
|
|
117
|
+
export type STSServerSocket = Socket<STSClientToServerEvents, STSServerToClientEvents, InterServerEvents>;
|
|
118
|
+
export type STSClientSocket = Socket<STSServerToClientEvents, STSClientToServerEvents, InterServerEvents>;
|
|
119
|
+
export interface ISocketIoServerHelper<ClientToServerEvents extends EventsMap, ServerToClientEvents extends EventsMap> {
|
|
142
120
|
LogMessage: (namespace: STSSocketIONamespace, message: string) => void;
|
|
143
121
|
LeaveRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: STSRoom) => void;
|
|
144
122
|
JoinRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: STSRoom) => void;
|
|
145
|
-
SetupNamespace: (io: Server, namespace: STSNamespace, rooms:
|
|
123
|
+
SetupNamespace: (io: Server, namespace: STSNamespace, rooms: string[], autoJoinRooms: boolean, socketConnectCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null, socketEventsCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null) => Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents>;
|
|
146
124
|
GetNamespace: (namespace: any) => STSSocketIONamespace;
|
|
147
125
|
DisconnectSockets: () => void;
|
|
126
|
+
SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>;
|
|
148
127
|
}
|
|
149
128
|
//# sourceMappingURL=commonTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9D,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAChG,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
|
package/types/processbase.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { ProcessOptions } from './processoptions';
|
|
|
5
5
|
import { STSOptionsBase } from '@nsshunt/stsutils';
|
|
6
6
|
import { PublishInstrumentController, InstrumentDefinitions } from '@nsshunt/stspublisherserver';
|
|
7
7
|
import { IProcessBase, ISocketIoServerHelper } from './commonTypes';
|
|
8
|
+
import { STSClientToServerEvents, STSServerToClientEvents } from '@nsshunt/stssocketio-client';
|
|
8
9
|
export declare abstract class ProcessBase extends STSOptionsBase implements IProcessBase {
|
|
9
10
|
#private;
|
|
10
11
|
constructor(options: ProcessOptions);
|
|
@@ -23,8 +24,8 @@ export declare abstract class ProcessBase extends STSOptionsBase implements IPro
|
|
|
23
24
|
* @returns UIController instance to manage a console based user interface associated for this node application.
|
|
24
25
|
*/
|
|
25
26
|
GetUIController(): any;
|
|
26
|
-
get socketIoServerHelper(): ISocketIoServerHelper | null;
|
|
27
|
-
set socketIoServerHelper(value: ISocketIoServerHelper | null);
|
|
27
|
+
get socketIoServerHelper(): ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null;
|
|
28
|
+
set socketIoServerHelper(value: ISocketIoServerHelper<STSClientToServerEvents, STSServerToClientEvents> | null);
|
|
28
29
|
TerminateDatabase(): Promise<void>;
|
|
29
30
|
get accessLayer(): PGAccessLayer | null;
|
|
30
31
|
GetNumCPUs: () => Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAA+E,MAAM,6BAA6B,CAAA;AAEzJ,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAKjG,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAEvC,MAAM,6BAA6B,CAAA;AAQ5F,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"processbase.d.ts","sourceRoot":"","sources":["../src/processbase.ts"],"names":[],"mappings":"AAIA,OAAO,MAAM,MAAM,QAAQ,CAAA;AAO3B,OAAO,EAAE,KAAK,EAAE,uBAAuB,EAA+E,MAAM,6BAA6B,CAAA;AAEzJ,OAAO,EAAE,aAAa,EAAyC,MAAM,4BAA4B,CAAA;AAKjG,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAA;AAChE,OAAO,EAAE,cAAc,EAAc,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,2BAA2B,EAAuC,qBAAqB,EAEvC,MAAM,6BAA6B,CAAA;AAQ5F,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAGnE,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAM9F,8BAAsB,WAAY,SAAQ,cAAe,YAAW,YAAY;;gBAShE,OAAO,EAAE,cAAc;IAUnC,IAAa,OAAO,IAAI,cAAc,CAErC;IAkGD,oBAAoB;IAuBpB,wBAAwB,IAAI,qBAAqB;IAIjD,0BAA0B,IAAI,IAAI;IAIlC,cAAc,aAuCb;IAED,gBAAgB,mBAAoB,KAAK,aAAa,uBAAuB,UAI5E;IAED,IAAI,oBAAoB,IAAI,2BAA2B,GAAG,IAAI,CAE7D;IAED,KAAK,YAAa,GAAG,UASpB;IAED,gBAAgB,CAAC,cAAc,EAAE,KAAK,GAAG,OAAO;IAQhD,gBAAgB,sBAMf;IAED;;;OAGA;IACA,eAAe,IAAI,GAAG;IAItB,IAAI,oBAAoB,IAAI,qBAAqB,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,GAAG,IAAI,CAGzG;IAED,IAAI,oBAAoB,CAAC,KAAK,EAAE,qBAAqB,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,GAAG,IAAI,EAG7G;IAgBK,iBAAiB;IAOvB,IAAI,WAAW,IAAI,aAAa,GAAG,IAAI,CAyBtC;IAED,UAAU,QAAa,QAAQ,MAAM,CAAC,CAkBrC;IAED,kBAAkB,sBA0BjB;IAED,eAAe,WAAY,GAAG,kBAQ5B;CACL"}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import { Server } from "socket.io";
|
|
2
|
-
import { STSSocketIONamespace,
|
|
1
|
+
import { Server, Socket, Namespace } from "socket.io";
|
|
2
|
+
import { STSSocketIONamespace, STSServerSocket, STSNamespace, ISocketIoServerHelper, ServerEventCb, InterServerEvents } from './commonTypes';
|
|
3
|
+
import { STSClientToServerEvents, STSServerToClientEvents } from '@nsshunt/stssocketio-client';
|
|
3
4
|
export interface ISocketIoServerHelperOptions {
|
|
4
5
|
logger: (message: string) => void;
|
|
5
6
|
}
|
|
6
|
-
export declare class SocketIoServerHelper implements ISocketIoServerHelper {
|
|
7
|
+
export declare class SocketIoServerHelper<ClientToServerEvents extends STSClientToServerEvents, ServerToClientEvents extends STSServerToClientEvents> implements ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents> {
|
|
7
8
|
#private;
|
|
8
9
|
constructor(options: ISocketIoServerHelperOptions);
|
|
9
10
|
LogMessage: (namespace: STSSocketIONamespace, message: string) => void;
|
|
10
|
-
LeaveRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room:
|
|
11
|
-
JoinRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room:
|
|
12
|
-
SetupNamespace: (io: Server, namespace: STSNamespace, rooms:
|
|
11
|
+
LeaveRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: string) => void;
|
|
12
|
+
JoinRoom: (namespace: STSSocketIONamespace, socket: STSServerSocket, room: string) => void;
|
|
13
|
+
SetupNamespace: (io: Server, namespace: STSNamespace, rooms: string[], autoJoinRooms: boolean, socketConnectCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null, socketEventsCallBack: ((socket: Socket<ClientToServerEvents, ServerToClientEvents, InterServerEvents>) => void) | null) => Namespace<ClientToServerEvents, ServerToClientEvents, InterServerEvents>;
|
|
13
14
|
GetNamespace: (namespace: string) => STSSocketIONamespace;
|
|
14
15
|
DisconnectSockets: () => void;
|
|
16
|
+
SetupEvent(event: ClientToServerEvents, eventCb: ServerEventCb): ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>;
|
|
15
17
|
}
|
|
16
18
|
//# sourceMappingURL=socketIoServerHelper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketIoServerHelper.d.ts","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"socketIoServerHelper.d.ts","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAgB,oBAAoB,EAAW,eAAe,EAC9C,YAAY,EAAE,qBAAqB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEnH,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAa,MAAM,6BAA6B,CAAA;AAEzG,MAAM,WAAW,4BAA4B;IAEzC,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAED,qBAAa,oBAAoB,CAAC,oBAAoB,SAAS,uBAAuB,EAAE,oBAAoB,SAAS,uBAAuB,CAAE,YAAW,qBAAqB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;;gBAI1M,OAAO,EAAE,4BAA4B;IAMjD,UAAU,cAAe,oBAAoB,WAAW,MAAM,KAAG,IAAI,CAQnE;IAEF,SAAS,cAAe,oBAAoB,UAAU,eAAe,QAAQ,MAAM,KAAG,IAAI,CAOxF;IAEF,QAAQ,cAAe,oBAAoB,UAAU,eAAe,QAAQ,MAAM,KAAG,IAAI,CAOvF;IA8EF,cAAc,OAAQ,MAAM,aAAa,YAAY,SAAS,MAAM,EAAE,iBAAiB,OAAO,mCACzD,OAAO,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,KAAK,IAAI,0CAC/E,OAAO,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,KAAK,IAAI,aAC/G,UAAU,oBAAoB,EAAE,oBAAoB,EAAE,iBAAiB,CAAC,CAsC1E;IAED,YAAY,cAAe,MAAM,KAAG,oBAAoB,CAEvD;IAED,iBAAiB,QAAO,IAAI,CAM3B;IAED,UAAU,CAAC,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,GAAG,qBAAqB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;CAGrI"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EACE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAYpE,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;IAWxB,yBAAyB,gBAAuB,GAAG,mBAgClD;IAwBD,aAAa,IAAI,GAAG;IA0CpB,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,IAAI,CAKrD;CACJ"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { STSServerToClientEvents, STSClientToServerEvents } from '@nsshunt/stssocketio-client';
|
|
2
|
+
export interface ServerToClientEvents extends STSServerToClientEvents {
|
|
3
|
+
subscribeAck: (data: any) => void;
|
|
4
|
+
unsubscribeAck: (data: any) => void;
|
|
5
|
+
subscribeKeepAliveAck: (data: any) => void;
|
|
6
|
+
doneAck: () => void;
|
|
7
|
+
}
|
|
8
|
+
export interface ClientToServerEvents extends STSClientToServerEvents {
|
|
9
|
+
subscribe: (data: any) => void;
|
|
10
|
+
unsubscribe: (data: any) => void;
|
|
11
|
+
subscribeKeepAlive: (data: any) => void;
|
|
12
|
+
done: () => void;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=wsevents.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wsevents.d.ts","sourceRoot":"","sources":["../../src/testing/wsevents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAE9F,MAAM,WAAW,oBAAqB,SAAQ,uBAAuB;IAOjE,YAAY,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACpC,qBAAqB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,oBAAqB,SAAQ,uBAAuB;IACjE,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,WAAW,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACjC,kBAAkB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IACxC,IAAI,EAAE,MAAM,IAAI,CAAC;CACpB"}
|