@nsshunt/stsappframework 3.1.10 → 3.1.12
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/socketIoServerHelper.js +10 -32
- package/dist/socketIoServerHelper.js.map +1 -1
- package/dist/vitesttesting/appConfig.js +1 -1
- package/dist/vitesttesting/appConfig.js.map +1 -1
- package/package.json +1 -1
- package/src/socketIoServerHelper.ts +13 -33
- package/src/vitesttesting/appConfig.ts +1 -1
- package/types/socketIoServerHelper.d.ts +1 -1
- package/types/socketIoServerHelper.d.ts.map +1 -1
|
@@ -1,59 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.SocketIoServerHelper = void 0;
|
|
7
|
-
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
8
|
-
const debug_1 = __importDefault(require("debug"));
|
|
9
|
-
const debug = (0, debug_1.default)(`proc:${process.pid}:socketiohelper`);
|
|
10
4
|
class SocketIoServerHelper {
|
|
11
5
|
#socketIoServerHelperOptions;
|
|
12
6
|
constructor(options) {
|
|
13
7
|
this.#socketIoServerHelperOptions = options;
|
|
14
8
|
}
|
|
9
|
+
LogMessage(namespace, message) {
|
|
10
|
+
this.#socketIoServerHelperOptions.logger.debug(`${namespace.namespace}: ${message}`);
|
|
11
|
+
}
|
|
15
12
|
#namespace = {};
|
|
16
|
-
LogMessage = (namespace, message) => {
|
|
17
|
-
this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
|
|
18
|
-
};
|
|
19
13
|
LeaveRoom = (namespace, socket, room) => {
|
|
20
|
-
|
|
21
|
-
debug(logMessage);
|
|
22
|
-
this.LogMessage(namespace, logMessage);
|
|
14
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: Leaving room [${room}]`);
|
|
23
15
|
socket.leave(room);
|
|
24
16
|
};
|
|
25
17
|
JoinRoom = (namespace, socket, room) => {
|
|
26
|
-
|
|
27
|
-
debug(logMessage);
|
|
28
|
-
this.LogMessage(namespace, logMessage);
|
|
18
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`);
|
|
29
19
|
socket.join(room);
|
|
30
20
|
};
|
|
31
21
|
#SetupStandardEvents = (namespace, socket) => {
|
|
32
22
|
socket.on("__STSdisconnect", (reason) => {
|
|
33
|
-
|
|
23
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
|
|
34
24
|
});
|
|
35
25
|
socket.on("__STSdisconnecting", (reason, callBackResult) => {
|
|
36
|
-
|
|
26
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
|
|
37
27
|
callBackResult("__STSdisconnecting accepted by server.");
|
|
38
28
|
});
|
|
39
29
|
socket.on('__STSjoinRoom', (rooms) => {
|
|
40
30
|
rooms.forEach((room) => {
|
|
41
|
-
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
42
|
-
debug(logMessage);
|
|
43
31
|
this.JoinRoom(namespace, socket, room);
|
|
44
32
|
});
|
|
45
33
|
});
|
|
46
34
|
socket.on('__STSleaveRoom', (rooms) => {
|
|
47
35
|
rooms.forEach((room) => {
|
|
48
|
-
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
|
|
49
|
-
debug(logMessage);
|
|
50
36
|
this.LeaveRoom(namespace, socket, room);
|
|
51
37
|
});
|
|
52
38
|
});
|
|
53
39
|
socket.on('__STSsendToRoom', (rooms, payload) => {
|
|
54
40
|
rooms.forEach((room) => {
|
|
55
|
-
|
|
56
|
-
debug(logMessage);
|
|
41
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`);
|
|
57
42
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
58
43
|
namespace.socketionamespace.to(room).emit(payload.command, payload);
|
|
59
44
|
});
|
|
@@ -62,9 +47,6 @@ class SocketIoServerHelper {
|
|
|
62
47
|
// Use this middleward to check every incomming connection
|
|
63
48
|
#SetupConnectionMiddleware = (nameSpace) => {
|
|
64
49
|
nameSpace.socketionamespace.use((socket, next) => {
|
|
65
|
-
//this.#LogInfoMessage(JSON.stringify(socket));
|
|
66
|
-
//this.#LogInfoMessage(JSON.stringify(socket.handshake.auth));
|
|
67
|
-
//this.#LogInfoMessage(JSON.stringify(socket.handshake.headers));
|
|
68
50
|
//if (isValid(socket.request)) {
|
|
69
51
|
const a = 5; // for lint purposes
|
|
70
52
|
if (a === 5) {
|
|
@@ -78,8 +60,6 @@ class SocketIoServerHelper {
|
|
|
78
60
|
// Use this middleware to check very packet being received
|
|
79
61
|
#SetupMessageMiddleware = (socket) => {
|
|
80
62
|
socket.use(([event, ...args], next) => {
|
|
81
|
-
//this.#LogInfoMessage(JSON.stringify(event));
|
|
82
|
-
//this.#LogInfoMessage(JSON.stringify(args));
|
|
83
63
|
/*
|
|
84
64
|
if (isUnauthorized(event)) {
|
|
85
65
|
return next(new Error("unauthorized event"));
|
|
@@ -97,10 +77,8 @@ class SocketIoServerHelper {
|
|
|
97
77
|
};
|
|
98
78
|
this.#SetupConnectionMiddleware(this.#namespace[namespace]);
|
|
99
79
|
this.#namespace[namespace].socketionamespace.on("connection", socket => {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
this.LogMessage(this.#namespace[namespace], logMessage);
|
|
103
|
-
debug(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
80
|
+
this.LogMessage(this.#namespace[namespace], `${namespace}: Socket connected, ID: [${socket.id}]`);
|
|
81
|
+
this.LogMessage(this.#namespace[namespace], `${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
104
82
|
this.#SetupMessageMiddleware(socket);
|
|
105
83
|
if (autoJoinRooms) {
|
|
106
84
|
rooms.map((room) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":";;;AAcA,MAAa,oBAAoB;IAE7B,4BAA4B,CAA8B;IAE1D,YAAY,OAAqC;QAC7C,IAAI,CAAC,4BAA4B,GAAG,OAAO,CAAC;IAChD,CAAC;IAED,UAAU,CAAC,SAA+B,EAAE,OAAY;QACpD,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,UAAU,GAAyC,EAAG,CAAC;IAEvD,SAAS,GAAG,CAAC,SAA+B,EAAE,MAA0D,EAAE,IAAY,EAAQ,EAAE;QAC5H,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,mBAAmB,IAAI,GAAG,CAAC,CAAC;QAC1F,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,QAAQ,GAAG,CAAC,SAA+B,EAAE,MAA0D,EAAE,IAAY,EAAQ,EAAE;QAC3H,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,0BAA0B,IAAI,WAAW,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QACrH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,oBAAoB,GAAG,CAAC,SAA+B,EAAE,MAA8E,EAAQ,EAAE;QAC7I,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,MAAc,EAAE,EAAE;YAC5C,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,6BAA6B,MAAM,CAAC,EAAE,MAAM,MAAM,GAAG,CAAC,CAAC;QACzH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE;YACvD,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,gCAAgC,MAAM,CAAC,EAAE,MAAM,MAAM,GAAG,CAAC,CAAC;YACxH,cAAc,CAAC,wCAAwC,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,KAAe,EAAQ,EAAE;YACjD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,KAAe,EAAQ,EAAE;YAClD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,iBAAiB,EAAE,CAAC,KAAe,EAAE,OAAiD,EAAQ,EAAE;YACtG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,iBAAiB,CAAC,IAAI,2CAA2C,IAAI,WAAW,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;gBACtI,+DAA+D;gBAC/D,SAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAc,EAAE,OAAO,CAAC,CAAC;YAC/E,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,0DAA0D;IAC1D,0BAA0B,GAAG,CAAC,SAA+B,EAAE,EAAE;QAC7D,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAC7C,gCAAgC;YAChC,MAAM,CAAC,GAAC,CAAC,CAAC,CAAC,oBAAoB;YAC/B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACV,IAAI,EAAE,CAAC;YACX,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,0DAA0D;IAC1D,uBAAuB,GAAG,CAAC,MAAuB,EAAE,EAAE;QAClD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE;YAClC;;;;cAIE;YACF,IAAI,EAAE,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,cAAc,GAAG,CAAC,EAAU,EAAE,SAAuB,EAAE,KAAe,EAAE,aAAsB,EAAE,8CAA8C,CAC1I,qBAAuH,EACvH,oBAAsH,EAC9C,EAAE;QAC1E,6CAA6C;QAC7C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG;YACzB,SAAS,EAAE,SAAS;YACpB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,iBAAiB,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,SAAS,GAAG,CAAC;SAC7C,CAAA;QAED,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAE5D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE;YACnE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,4BAA4B,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;YAClG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,SAAS,gCAAgC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElI,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAErC,IAAI,aAAa,EAAE,CAAC;gBAChB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC;YACP,CAAC;YAED,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;YAE9D,IAAI,qBAAqB,EAAE,CAAC;gBACxB,UAAU,CAAC,GAAG,EAAE;oBACZ,qBAAqB,CAAC,MAAM,CAAC,CAAC;gBAClC,CAAC,EAAE,CAAC,CAAC,CAAC;YACV,CAAC;YAED,IAAI,oBAAoB,EAAE,CAAC;gBACvB,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,iBAA6F,CAAC;IACpI,CAAC,CAAA;IAED,uBAAuB,GAAG,CAAC,SAAiB,EAAwB,EAAE;QAClE,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC,CAAA;IAED,iBAAiB,GAAG,GAAS,EAAE;QAE3B,KAAK,MAAM,CAAC,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1D,SAAS,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,EAAG,CAAC;IAC1B,CAAC,CAAA;IAED,UAAU,CAAC,KAA2B,EAAE,OAAsB;QAC1D,OAAO,IAAW,CAAC;IACvB,CAAC;CACJ;AAxID,oDAwIC"}
|
|
@@ -64,7 +64,7 @@ function ServiceConfigOptions(clusterMode, isMaster) {
|
|
|
64
64
|
prometheusClusterPort: goptions.rest01prometheusclusterport,
|
|
65
65
|
serviceName: goptions.rest01servicename,
|
|
66
66
|
serviceVersion: goptions.rest01serviceversion,
|
|
67
|
-
consoleLogging:
|
|
67
|
+
consoleLogging: false, //@@
|
|
68
68
|
instrumentLogging: true,
|
|
69
69
|
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
70
70
|
instrumentationTimeWindow: goptions.instrumentationTimeWindow,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/vitesttesting/appConfig.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAoC;AAGpC,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,4BAAkE;AAElE,qCAAiD;AAEjD,sDAA6B;AAE7B;;;;;;;;;;;;;;;;EAgBE;AAEF,SAAgB,oBAAoB,CAAC,WAAoB,EAAE,QAAiB;IACxE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAClB,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B,CAAC;IAEF,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;QAChC,KAAK,EAAE,OAAO;QACd,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B;QACD,UAAU,EAAE;YACR,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;SACnC;KACJ,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,iBAAO,CAAC,YAAY,CAAC;QACzC,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,iBAAO,CAAC,MAAM,CAAC,OAAO,CAC1B,iBAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EACzB,iBAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAC1B;QACD,UAAU,EAAE;YACR,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;SACnC;KACJ,CAAC,CAAC;IAEH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,iBAAiB,GAAG,IAAA,SAAM,GAAE,CAAC;QACnC,MAAM,IAAI,GAAmB;YACzB,UAAU,EAAE,iBAAa,CAAC,WAAW;YACrC,WAAW,EAAE,WAAW;YACxB,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,IAAI;YAChB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;YAC/C,0BAA0B,EAAE,QAAQ,CAAC,mBAAmB;YACxD,sBAAsB,EAAE,IAAI;YAC5B,iBAAiB,EAAE,iBAAiB;YACpC,WAAW,EAAE,KAAK;YAElB,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,QAAQ,CAAC,cAAc;YACjC,OAAO,EAAE,QAAQ,CAAC,aAAa;YAC/B,UAAU,EAAE,QAAQ,CAAC,cAAc;YACnC,IAAI,EAAE,QAAQ,CAAC,UAAU;YACzB,iBAAiB,EAAE,QAAQ,CAAC,uBAAuB;YACnD,qBAAqB,EAAE,QAAQ,CAAC,2BAA2B;YAC3D,WAAW,EAAE,QAAQ,CAAC,iBAAiB;YACvC,cAAc,EAAE,QAAQ,CAAC,oBAAoB;YAC7C,cAAc,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"appConfig.js","sourceRoot":"","sources":["../../src/vitesttesting/appConfig.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */ // --> OFF
|
|
2
|
-
import Debug from "debug";
|
|
3
|
-
const debug = Debug(`proc:${process.pid}:socketiohelper`);
|
|
4
|
-
|
|
5
2
|
import { JSONObject, ISTSLogger } from '@nsshunt/stsutils'
|
|
6
3
|
|
|
7
4
|
import { Server, Namespace, Socket } from "socket.io";
|
|
@@ -11,8 +8,7 @@ import { STSSocketIONamespace, STSServerSocket, STSNamespace,
|
|
|
11
8
|
|
|
12
9
|
import { STSDefaultClientToServerEvents, STSDefaultServerToClientEvents } from '@nsshunt/stssocketio-client'
|
|
13
10
|
|
|
14
|
-
export interface ISocketIoServerHelperOptions
|
|
15
|
-
{
|
|
11
|
+
export interface ISocketIoServerHelperOptions {
|
|
16
12
|
logger: ISTSLogger
|
|
17
13
|
}
|
|
18
14
|
|
|
@@ -24,56 +20,47 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
|
|
|
24
20
|
this.#socketIoServerHelperOptions = options;
|
|
25
21
|
}
|
|
26
22
|
|
|
27
|
-
|
|
23
|
+
LogMessage(namespace: STSSocketIONamespace, message: any) {
|
|
24
|
+
this.#socketIoServerHelperOptions.logger.debug(`${namespace.namespace}: ${message}`);
|
|
25
|
+
}
|
|
28
26
|
|
|
29
|
-
|
|
30
|
-
this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
|
|
31
|
-
};
|
|
27
|
+
#namespace: Record<string, STSSocketIONamespace> = { };
|
|
32
28
|
|
|
33
29
|
LeaveRoom = (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string): void => {
|
|
34
|
-
|
|
35
|
-
debug(logMessage);
|
|
36
|
-
this.LogMessage(namespace, logMessage);
|
|
30
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: Leaving room [${room}]`);
|
|
37
31
|
socket.leave(room);
|
|
38
32
|
};
|
|
39
33
|
|
|
40
34
|
JoinRoom = (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string): void => {
|
|
41
|
-
|
|
42
|
-
debug(logMessage);
|
|
43
|
-
this.LogMessage(namespace, logMessage);
|
|
35
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`);
|
|
44
36
|
socket.join(room);
|
|
45
37
|
};
|
|
46
38
|
|
|
47
39
|
#SetupStandardEvents = (namespace: STSSocketIONamespace, socket: Socket<STSDefaultClientToServerEvents, STSDefaultServerToClientEvents>): void => {
|
|
48
|
-
socket.on("__STSdisconnect", (reason) => {
|
|
49
|
-
|
|
40
|
+
socket.on("__STSdisconnect", (reason: string) => {
|
|
41
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
|
|
50
42
|
});
|
|
51
43
|
|
|
52
44
|
socket.on("__STSdisconnecting", (reason, callBackResult) => {
|
|
53
|
-
|
|
45
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
|
|
54
46
|
callBackResult("__STSdisconnecting accepted by server.");
|
|
55
47
|
});
|
|
56
48
|
|
|
57
49
|
socket.on('__STSjoinRoom', (rooms: string[]): void => { //@@ names
|
|
58
50
|
rooms.forEach((room) => {
|
|
59
|
-
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
|
|
60
|
-
debug(logMessage);
|
|
61
51
|
this.JoinRoom(namespace, socket, room)
|
|
62
52
|
});
|
|
63
53
|
});
|
|
64
54
|
|
|
65
55
|
socket.on('__STSleaveRoom', (rooms: string[]): void => { //@@ names
|
|
66
56
|
rooms.forEach((room) => {
|
|
67
|
-
const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
|
|
68
|
-
debug(logMessage);
|
|
69
57
|
this.LeaveRoom(namespace, socket, room);
|
|
70
58
|
});
|
|
71
59
|
});
|
|
72
60
|
|
|
73
61
|
socket.on('__STSsendToRoom', (rooms: string[], payload: { command: string, payload: JSONObject }): void => {
|
|
74
62
|
rooms.forEach((room) => {
|
|
75
|
-
|
|
76
|
-
debug(logMessage);
|
|
63
|
+
this.LogMessage(namespace, `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`);
|
|
77
64
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
78
65
|
namespace.socketionamespace.to(room).emit(payload.command as any, payload);
|
|
79
66
|
});
|
|
@@ -83,9 +70,6 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
|
|
|
83
70
|
// Use this middleward to check every incomming connection
|
|
84
71
|
#SetupConnectionMiddleware = (nameSpace: STSSocketIONamespace) => {
|
|
85
72
|
nameSpace.socketionamespace.use((socket, next) => {
|
|
86
|
-
//this.#LogInfoMessage(JSON.stringify(socket));
|
|
87
|
-
//this.#LogInfoMessage(JSON.stringify(socket.handshake.auth));
|
|
88
|
-
//this.#LogInfoMessage(JSON.stringify(socket.handshake.headers));
|
|
89
73
|
//if (isValid(socket.request)) {
|
|
90
74
|
const a=5; // for lint purposes
|
|
91
75
|
if (a === 5) {
|
|
@@ -99,8 +83,6 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
|
|
|
99
83
|
// Use this middleware to check very packet being received
|
|
100
84
|
#SetupMessageMiddleware = (socket: STSServerSocket) => {
|
|
101
85
|
socket.use(([event, ...args], next) => {
|
|
102
|
-
//this.#LogInfoMessage(JSON.stringify(event));
|
|
103
|
-
//this.#LogInfoMessage(JSON.stringify(args));
|
|
104
86
|
/*
|
|
105
87
|
if (isUnauthorized(event)) {
|
|
106
88
|
return next(new Error("unauthorized event"));
|
|
@@ -124,10 +106,8 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
|
|
|
124
106
|
this.#SetupConnectionMiddleware(this.#namespace[namespace]);
|
|
125
107
|
|
|
126
108
|
this.#namespace[namespace].socketionamespace.on("connection", socket => {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
this.LogMessage(this.#namespace[namespace], logMessage);
|
|
130
|
-
debug(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
109
|
+
this.LogMessage(this.#namespace[namespace], `${namespace}: Socket connected, ID: [${socket.id}]`);
|
|
110
|
+
this.LogMessage(this.#namespace[namespace], `${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
|
|
131
111
|
|
|
132
112
|
this.#SetupMessageMiddleware(socket);
|
|
133
113
|
|
|
@@ -78,7 +78,7 @@ export function ServiceConfigOptions(clusterMode: boolean, isMaster: boolean): P
|
|
|
78
78
|
prometheusClusterPort: goptions.rest01prometheusclusterport,
|
|
79
79
|
serviceName: goptions.rest01servicename,
|
|
80
80
|
serviceVersion: goptions.rest01serviceversion,
|
|
81
|
-
consoleLogging:
|
|
81
|
+
consoleLogging: false, //@@
|
|
82
82
|
instrumentLogging: true,
|
|
83
83
|
|
|
84
84
|
instrumentationObservationInterval: goptions.instrumentationObservationInterval,
|
|
@@ -8,7 +8,7 @@ export interface ISocketIoServerHelperOptions {
|
|
|
8
8
|
export declare class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientToServerEvents, ServerToClientEvents extends STSDefaultServerToClientEvents> implements ISocketIoServerHelper<ClientToServerEvents, ServerToClientEvents> {
|
|
9
9
|
#private;
|
|
10
10
|
constructor(options: ISocketIoServerHelperOptions);
|
|
11
|
-
LogMessage
|
|
11
|
+
LogMessage(namespace: STSSocketIONamespace, message: any): void;
|
|
12
12
|
LeaveRoom: (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string) => void;
|
|
13
13
|
JoinRoom: (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string) => void;
|
|
14
14
|
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>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socketIoServerHelper.d.ts","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socketIoServerHelper.d.ts","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAE,oBAAoB,EAAmB,YAAY,EACxD,qBAAqB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAElF,OAAO,EAAE,8BAA8B,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAA;AAE5G,MAAM,WAAW,4BAA4B;IACzC,MAAM,EAAE,UAAU,CAAA;CACrB;AAED,qBAAa,oBAAoB,CAAC,oBAAoB,SAAS,8BAA8B,EAAE,oBAAoB,SAAS,8BAA8B,CAAE,YAAW,qBAAqB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;;gBAIxN,OAAO,EAAE,4BAA4B;IAIjD,UAAU,CAAC,SAAS,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG;IAMxD,SAAS,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAG3H;IAEF,QAAQ,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAG1H;IA0DF,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,CAoC1E;IAED,uBAAuB,cAAe,MAAM,KAAG,oBAAoB,CAElE;IAED,iBAAiB,QAAO,IAAI,CAM3B;IAED,UAAU,CAAC,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,aAAa,GAAG,qBAAqB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;CAGrI"}
|