@nsshunt/stsappframework 3.0.44 → 3.0.46
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.
|
@@ -40,7 +40,7 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
40
40
|
if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
|
|
41
41
|
//console.log(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`.grey);
|
|
42
42
|
console.log(`WorkerProcess.ReceivedMessageFromMaster`.grey);
|
|
43
|
-
const { socketId, workerId
|
|
43
|
+
const { socketId, workerId } = messageData; //@@ type
|
|
44
44
|
if (node_cluster_1.default.worker && node_cluster_1.default.worker.id !== workerId) {
|
|
45
45
|
// Invalid data - this workerId must match
|
|
46
46
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Invalid workerId: [${workerId}]. Should have been: [${node_cluster_1.default.worker.id}].`.red);
|
|
@@ -54,7 +54,7 @@ class WorkerProcess extends index_1.WorkerProcessBase {
|
|
|
54
54
|
if (socket.id.localeCompare(socketId) === 0) {
|
|
55
55
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`.green);
|
|
56
56
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
57
|
-
socket.emit(
|
|
57
|
+
//socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAkD,CAAE,UAAU;AAC9D,gEAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.js","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.46",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@nsshunt/stsdatamanagement": "^1.17.127",
|
|
52
52
|
"@nsshunt/stsinstrumentation": "^7.0.3",
|
|
53
53
|
"@nsshunt/stspublisherserver": "^2.0.18",
|
|
54
|
-
"@nsshunt/stssocketio-client": "^0.0.
|
|
54
|
+
"@nsshunt/stssocketio-client": "^0.0.34",
|
|
55
55
|
"@nsshunt/stsutils": "^1.16.12",
|
|
56
56
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
57
57
|
"@socket.io/redis-streams-adapter": "^0.1.0",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
2
|
import cluster from 'node:cluster';
|
|
3
3
|
|
|
4
|
-
import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper,
|
|
4
|
+
import { WorkerProcessBase, STSNamespace, STSRoom, SocketIoServerHelper, STSSocketIONamespace } from './../index'
|
|
5
5
|
|
|
6
6
|
//import { Socket, Namespace } from "socket.io";
|
|
7
7
|
import { Socket } from "socket.io";
|
|
@@ -57,7 +57,7 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
57
57
|
if (messageData.subCommand.localeCompare(InstrumentManagerSubCommand.OUTPUT_SUBSCRIPTION) === 0) {
|
|
58
58
|
//console.log(`WorkerProcess.ReceivedMessageFromMaster: messageData: [${JSON.stringify(messageData)}]`.grey);
|
|
59
59
|
console.log(`WorkerProcess.ReceivedMessageFromMaster`.grey);
|
|
60
|
-
const { socketId, workerId
|
|
60
|
+
const { socketId, workerId } = messageData; //@@ type
|
|
61
61
|
|
|
62
62
|
if (cluster.worker && cluster.worker.id !== workerId) {
|
|
63
63
|
// Invalid data - this workerId must match
|
|
@@ -71,7 +71,7 @@ export class WorkerProcess extends WorkerProcessBase
|
|
|
71
71
|
if (socket.id.localeCompare(socketId) === 0) {
|
|
72
72
|
console.log(`WorkerProcess.ReceivedMessageFromMaster: Sending payload to subscribed client.`.green);
|
|
73
73
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
74
|
-
socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
74
|
+
//socket.emit(STSEvent.STSSubInstrumentData as any, model);
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"appWorkerWSS.d.ts","sourceRoot":"","sources":["../../src/testing/appWorkerWSS.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAA+C,oBAAoB,EAAE,MAAM,YAAY,CAAA;AASjH,oBAAY,0BAA0B;IACrC,OAAO,YAAY;IAEnB,SAAS,mCAAmC;IAC5C,WAAW,qCAAqC;IAChD,oBAAoB,6CAA6C;CACjE;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAEhB,IAAI,EAAE,GAAG,CAAA;CACT;AAED,oBAAY,2BAA2B;IACtC,mBAAmB,6CAA6C;CAChE;AAED,oBAAY,WAAW;IACtB,uBAAuB,4BAA4B;CACnD;AAED,qBAAa,aAAc,SAAQ,iBAAiB;;gBAIpC,OAAO,EAAE,GAAG;IAcxB,yBAAyB,gBAAuB,GAAG,mBAgClD;IAwBD,aAAa,IAAI,GAAG;IAkDpB,IAAI,mBAAmB,IAAI,oBAAoB,GAAG,IAAI,CAKrD;CACJ"}
|