@nsshunt/stsappframework 2.19.241 → 2.19.242
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/testing/appWorkerWSS.js +9 -0
- package/dist/testing/appWorkerWSS.js.map +1 -1
- package/dist/testing/singleservertest.test.js +21 -2
- package/dist/testing/singleservertest.test.js.map +1 -1
- package/package.json +1 -1
- package/src/testing/appWorkerWSS.ts +10 -0
- package/src/testing/singleservertest.test.ts +22 -2
- package/src/testing/wsevents.ts +12 -1
- package/types/testing/appWorkerWSS.d.ts.map +1 -1
- package/types/testing/wsevents.d.ts +4 -0
- package/types/testing/wsevents.d.ts.map +1 -1
|
@@ -28,6 +28,8 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
28
28
|
constructor(options) {
|
|
29
29
|
super(options);
|
|
30
30
|
//this.socketIoHelper = new SocketIoHelper(this as IProcessBase);
|
|
31
|
+
// Use ClientToServerEvents<true> when the client will pass a request to server with a call back expected with a timeout
|
|
32
|
+
//@@this.socketIoServerHelper = new SocketIoServerHelper<ClientToServerEvents<true>, ServerToClientEvents>({
|
|
31
33
|
this.socketIoServerHelper = new index_1.SocketIoServerHelper({
|
|
32
34
|
logger: this.LogEx
|
|
33
35
|
});
|
|
@@ -121,6 +123,13 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
121
123
|
this.#SendIPCMessageToMaster(socket, 'done', {});
|
|
122
124
|
socket.emit('doneAck');
|
|
123
125
|
});
|
|
126
|
+
socket.on('compute', (arg, cb) => {
|
|
127
|
+
const res = arg * 2;
|
|
128
|
+
cb(res.toString());
|
|
129
|
+
});
|
|
130
|
+
socket.on('compute2', (arg, cb) => {
|
|
131
|
+
cb({ data: arg * 2 });
|
|
132
|
+
});
|
|
124
133
|
});
|
|
125
134
|
}
|
|
126
135
|
else {
|
|
@@ -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;AAEjD,gEAAmC;AAEnC,sCACoE;AAYpE,IAAY,0BAMX;AAND,WAAY,0BAA0B;IACrC,iDAAmB,CAAA;IAEnB,0EAA4C,CAAA;IAC5C,8EAAgD,CAAA;IAChD,+FAAiE,CAAA;AAClE,CAAC,EANW,0BAA0B,0CAA1B,0BAA0B,QAMrC;AASD,IAAY,2BAEX;AAFD,WAAY,2BAA2B;IACtC,+FAAgE,CAAA;AACjE,CAAC,EAFW,2BAA2B,2CAA3B,2BAA2B,QAEtC;AAED,IAAY,WAEX;AAFD,WAAY,WAAW;IACtB,kEAAmD,CAAA;AACpD,CAAC,EAFW,WAAW,2BAAX,WAAW,QAEtB;AAED,MAAa,aAAc,SAAQ,yBAAiB;IAEhD,UAAU,GAAG,KAAK,CAAC;IAEnB,YAAY,OAAY;QAEpB,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,iEAAiE;
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,8 @@ const index_1 = require("./../index");
|
|
|
61
61
|
rejectUnauthorized: goptions.isProduction // Allows self signed certs in non production mode(s)
|
|
62
62
|
}
|
|
63
63
|
};
|
|
64
|
+
// Use ServerToClientEvents<true> when the client will pass a request to server with a call back expected with a timeout
|
|
65
|
+
//@@const socketUtils = new SocketIoClientHelper<ServerToClientEvents<true>, ClientToServerEvents>(socketUtilsoptions);
|
|
64
66
|
const socketUtils = new stssocketio_client_1.SocketIoClientHelper(socketUtilsoptions);
|
|
65
67
|
const instrumentManagerAddress = `${endpoint}:${goptions.rest01port}/${index_1.STSNamespace.STSMonitor}/`;
|
|
66
68
|
const HandleError = (error) => {
|
|
@@ -239,7 +241,7 @@ const index_1 = require("./../index");
|
|
|
239
241
|
}
|
|
240
242
|
}, 10000);
|
|
241
243
|
(0, vitest_1.test)('client socket testing', async () => {
|
|
242
|
-
vitest_1.expect.assertions(
|
|
244
|
+
vitest_1.expect.assertions(8);
|
|
243
245
|
let complete = false;
|
|
244
246
|
const socket = socketUtils.SetupClientSideSocket('STSUITerm',
|
|
245
247
|
// The address defines the namespace to connect to (i.e. io.of('/address'))
|
|
@@ -263,9 +265,10 @@ const index_1 = require("./../index");
|
|
|
263
265
|
debug('subscribeKeepAliveAck'.yellow);
|
|
264
266
|
(0, vitest_1.expect)(data.data).toMatch(/(ok)/i);
|
|
265
267
|
});
|
|
266
|
-
socket.on('doneAck', () => {
|
|
268
|
+
socket.on('doneAck', async () => {
|
|
267
269
|
debug('doneAck'.yellow);
|
|
268
270
|
(0, vitest_1.expect)(1).toEqual(1);
|
|
271
|
+
await (0, stsutils_1.Sleep)(500);
|
|
269
272
|
complete = true;
|
|
270
273
|
});
|
|
271
274
|
});
|
|
@@ -276,6 +279,22 @@ const index_1 = require("./../index");
|
|
|
276
279
|
socket.emit('subscribeKeepAlive', { data: 'ok' });
|
|
277
280
|
socket.emit('sendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 } });
|
|
278
281
|
//socket.emit('done');
|
|
282
|
+
socket.timeout(250).emit('compute', 10, (err, arg) => {
|
|
283
|
+
if (err) {
|
|
284
|
+
console.log(err);
|
|
285
|
+
}
|
|
286
|
+
else {
|
|
287
|
+
(0, vitest_1.expect)(arg).toEqual('20');
|
|
288
|
+
}
|
|
289
|
+
});
|
|
290
|
+
socket.timeout(250).emit('compute2', 10, (err, arg) => {
|
|
291
|
+
if (err) {
|
|
292
|
+
console.log(err);
|
|
293
|
+
}
|
|
294
|
+
else {
|
|
295
|
+
(0, vitest_1.expect)(arg.data).toEqual(20);
|
|
296
|
+
}
|
|
297
|
+
});
|
|
279
298
|
while (!complete) {
|
|
280
299
|
await (0, stsutils_1.Sleep)(100);
|
|
281
300
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/testing/singleservertest.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"singleservertest.test.js","sourceRoot":"","sources":["../../src/testing/singleservertest.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -48,6 +48,9 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
48
48
|
super(options);
|
|
49
49
|
|
|
50
50
|
//this.socketIoHelper = new SocketIoHelper(this as IProcessBase);
|
|
51
|
+
|
|
52
|
+
// Use ClientToServerEvents<true> when the client will pass a request to server with a call back expected with a timeout
|
|
53
|
+
//@@this.socketIoServerHelper = new SocketIoServerHelper<ClientToServerEvents<true>, ServerToClientEvents>({
|
|
51
54
|
this.socketIoServerHelper = new SocketIoServerHelper<ClientToServerEvents, ServerToClientEvents>({
|
|
52
55
|
logger: this.LogEx
|
|
53
56
|
});
|
|
@@ -146,6 +149,13 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
146
149
|
this.#SendIPCMessageToMaster(socket, 'done', {})
|
|
147
150
|
socket.emit('doneAck');
|
|
148
151
|
});
|
|
152
|
+
socket.on('compute', (arg: number, cb) => {
|
|
153
|
+
const res = arg * 2;
|
|
154
|
+
cb(res.toString());
|
|
155
|
+
});
|
|
156
|
+
socket.on('compute2', (arg, cb) => {
|
|
157
|
+
cb({data: arg*2});
|
|
158
|
+
});
|
|
149
159
|
})
|
|
150
160
|
} else {
|
|
151
161
|
throw new Error('WorkerProcess:WorkerStarted(): this.socketIoHelper is null')
|
|
@@ -56,6 +56,8 @@ describe("Single Server Test", () =>
|
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
+
// Use ServerToClientEvents<true> when the client will pass a request to server with a call back expected with a timeout
|
|
60
|
+
//@@const socketUtils = new SocketIoClientHelper<ServerToClientEvents<true>, ClientToServerEvents>(socketUtilsoptions);
|
|
59
61
|
const socketUtils = new SocketIoClientHelper<ServerToClientEvents, ClientToServerEvents>(socketUtilsoptions);
|
|
60
62
|
|
|
61
63
|
const instrumentManagerAddress =
|
|
@@ -257,7 +259,7 @@ describe("Single Server Test", () =>
|
|
|
257
259
|
|
|
258
260
|
test('client socket testing', async () =>
|
|
259
261
|
{
|
|
260
|
-
expect.assertions(
|
|
262
|
+
expect.assertions(8);
|
|
261
263
|
|
|
262
264
|
let complete = false;
|
|
263
265
|
|
|
@@ -283,9 +285,10 @@ describe("Single Server Test", () =>
|
|
|
283
285
|
debug('subscribeKeepAliveAck'.yellow);
|
|
284
286
|
expect(data.data).toMatch(/(ok)/i);
|
|
285
287
|
});
|
|
286
|
-
socket.on('doneAck', () => {
|
|
288
|
+
socket.on('doneAck', async () => {
|
|
287
289
|
debug('doneAck'.yellow);
|
|
288
290
|
expect(1).toEqual(1);
|
|
291
|
+
await Sleep(500);
|
|
289
292
|
complete = true;
|
|
290
293
|
});
|
|
291
294
|
}
|
|
@@ -303,6 +306,23 @@ describe("Single Server Test", () =>
|
|
|
303
306
|
socket.emit('sendToRoom', ['room3'], { command: 'doneAck', payload: { somedata: 1 }})
|
|
304
307
|
//socket.emit('done');
|
|
305
308
|
|
|
309
|
+
socket.timeout(250).emit('compute', 10, (err, arg) => {
|
|
310
|
+
if (err) {
|
|
311
|
+
console.log(err);
|
|
312
|
+
} else {
|
|
313
|
+
expect(arg).toEqual('20');
|
|
314
|
+
}
|
|
315
|
+
});
|
|
316
|
+
|
|
317
|
+
socket.timeout(250).emit('compute2', 10, (err, arg) => {
|
|
318
|
+
if (err) {
|
|
319
|
+
console.log(err);
|
|
320
|
+
} else {
|
|
321
|
+
expect(arg.data).toEqual(20);
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
|
|
325
|
+
|
|
306
326
|
while (!complete) {
|
|
307
327
|
await Sleep(100);
|
|
308
328
|
}
|
package/src/testing/wsevents.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { STSServerToClientEvents, STSClientToServerEvents } from '@nsshunt/stssocketio-client'
|
|
2
2
|
|
|
3
|
+
// Syntax sugar from socket.io
|
|
4
|
+
// https://socket.io/docs/v4/typescript/#emitting-with-a-timeout
|
|
5
|
+
type WithTimeoutAck<isSender extends boolean, args extends any[]> = isSender extends true ? [Error, ...args] : args;
|
|
6
|
+
|
|
7
|
+
//export interface ServerToClientEvents<isSender extends boolean = false> extends STSServerToClientEvents {
|
|
3
8
|
export interface ServerToClientEvents extends STSServerToClientEvents {
|
|
4
|
-
|
|
9
|
+
/*
|
|
5
10
|
noArg: () => void;
|
|
6
11
|
basicEmit: (a: number, b: string, c: Buffer) => void;
|
|
7
12
|
withAck: (d: string, callback: (e: number) => void) => void;
|
|
@@ -13,9 +18,15 @@ export interface ServerToClientEvents extends STSServerToClientEvents {
|
|
|
13
18
|
doneAck: () => void;
|
|
14
19
|
}
|
|
15
20
|
|
|
21
|
+
//export interface ClientToServerEvents<isSender extends boolean = false> extends STSClientToServerEvents {
|
|
16
22
|
export interface ClientToServerEvents extends STSClientToServerEvents {
|
|
17
23
|
subscribe: (data: any) => void;
|
|
18
24
|
unsubscribe: (data: any) => void;
|
|
19
25
|
subscribeKeepAlive: (data: any) => void;
|
|
20
26
|
done: () => void;
|
|
27
|
+
|
|
28
|
+
//compute: (arg: number, callback: (...args: WithTimeoutAck<isSender, [string]>) => void) => void;
|
|
29
|
+
//compute2: (arg: number, callback: (...args: WithTimeoutAck<isSender, [{ data: any}]>) => void) => void;
|
|
30
|
+
compute: (arg: number, callback: (data: string) => void) => void;
|
|
31
|
+
compute2: (arg: number, callback: (data: { data: any}) => void) => void;
|
|
21
32
|
}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IAcxB,yBAAyB,gBAAuB,GAAG,mBAgClD;IAwBD,aAAa,IAAI,GAAG;IAiDpB,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,IAAI,CAKrD;CACJ"}
|
|
@@ -10,5 +10,9 @@ export interface ClientToServerEvents extends STSClientToServerEvents {
|
|
|
10
10
|
unsubscribe: (data: any) => void;
|
|
11
11
|
subscribeKeepAlive: (data: any) => void;
|
|
12
12
|
done: () => void;
|
|
13
|
+
compute: (arg: number, callback: (data: string) => void) => void;
|
|
14
|
+
compute2: (arg: number, callback: (data: {
|
|
15
|
+
data: any;
|
|
16
|
+
}) => void) => void;
|
|
13
17
|
}
|
|
14
18
|
//# sourceMappingURL=wsevents.d.ts.map
|
|
@@ -1 +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;
|
|
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;AAO9F,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;AAGD,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;IAIjB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;IACjE,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,GAAG,CAAA;KAAC,KAAK,IAAI,KAAK,IAAI,CAAC;CAC3E"}
|