@nsshunt/stsappframework 3.1.9 → 3.1.11

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.
@@ -1,64 +1,54 @@
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
  }
15
- #namespace = {};
16
- LogMessage = (namespace, message) => {
9
+ #LogDebugMessage(message) {
10
+ this.#socketIoServerHelperOptions.logger.debug(message);
11
+ }
12
+ LogMessage(namespace, message) {
17
13
  this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
18
- /*
19
- this.#stsApp.UpdateInstrument(Gauge.LOGGER, {
20
- LogMessage: message
21
- } as InstrumentLogTelemetry);
22
- */
23
- };
14
+ }
15
+ #namespace = {};
24
16
  LeaveRoom = (namespace, socket, room) => {
25
17
  const logMessage = `${namespace.socketionamespace.name}: Leaving room [${room}]`;
26
- debug(logMessage);
27
18
  this.LogMessage(namespace, logMessage);
28
19
  socket.leave(room);
29
20
  };
30
21
  JoinRoom = (namespace, socket, room) => {
31
22
  const logMessage = `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`;
32
- debug(logMessage);
33
23
  this.LogMessage(namespace, logMessage);
34
24
  socket.join(room);
35
25
  };
36
26
  #SetupStandardEvents = (namespace, socket) => {
37
27
  socket.on("__STSdisconnect", (reason) => {
38
- debug(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
28
+ this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
39
29
  });
40
30
  socket.on("__STSdisconnecting", (reason, callBackResult) => {
41
- debug(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
31
+ this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
42
32
  callBackResult("__STSdisconnecting accepted by server.");
43
33
  });
44
34
  socket.on('__STSjoinRoom', (rooms) => {
45
35
  rooms.forEach((room) => {
46
36
  const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
47
- debug(logMessage);
37
+ this.#LogDebugMessage(logMessage);
48
38
  this.JoinRoom(namespace, socket, room);
49
39
  });
50
40
  });
51
41
  socket.on('__STSleaveRoom', (rooms) => {
52
42
  rooms.forEach((room) => {
53
43
  const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
54
- debug(logMessage);
44
+ this.#LogDebugMessage(logMessage);
55
45
  this.LeaveRoom(namespace, socket, room);
56
46
  });
57
47
  });
58
48
  socket.on('__STSsendToRoom', (rooms, payload) => {
59
49
  rooms.forEach((room) => {
60
50
  const logMessage = `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`;
61
- debug(logMessage);
51
+ this.#LogDebugMessage(logMessage);
62
52
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
63
53
  namespace.socketionamespace.to(room).emit(payload.command, payload);
64
54
  });
@@ -67,9 +57,6 @@ class SocketIoServerHelper {
67
57
  // Use this middleward to check every incomming connection
68
58
  #SetupConnectionMiddleware = (nameSpace) => {
69
59
  nameSpace.socketionamespace.use((socket, next) => {
70
- //this.#LogInfoMessage(JSON.stringify(socket));
71
- //this.#LogInfoMessage(JSON.stringify(socket.handshake.auth));
72
- //this.#LogInfoMessage(JSON.stringify(socket.handshake.headers));
73
60
  //if (isValid(socket.request)) {
74
61
  const a = 5; // for lint purposes
75
62
  if (a === 5) {
@@ -83,8 +70,6 @@ class SocketIoServerHelper {
83
70
  // Use this middleware to check very packet being received
84
71
  #SetupMessageMiddleware = (socket) => {
85
72
  socket.use(([event, ...args], next) => {
86
- //this.#LogInfoMessage(JSON.stringify(event));
87
- //this.#LogInfoMessage(JSON.stringify(args));
88
73
  /*
89
74
  if (isUnauthorized(event)) {
90
75
  return next(new Error("unauthorized event"));
@@ -103,9 +88,8 @@ class SocketIoServerHelper {
103
88
  this.#SetupConnectionMiddleware(this.#namespace[namespace]);
104
89
  this.#namespace[namespace].socketionamespace.on("connection", socket => {
105
90
  const logMessage = `${namespace}: Socket connected, ID: [${socket.id}]`;
106
- debug(logMessage);
107
91
  this.LogMessage(this.#namespace[namespace], logMessage);
108
- debug(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
92
+ this.#LogDebugMessage(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
109
93
  this.#SetupMessageMiddleware(socket);
110
94
  if (autoJoinRooms) {
111
95
  rooms.map((room) => {
@@ -1 +1 @@
1
- {"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"socketIoServerHelper.js","sourceRoot":"","sources":["../src/socketIoServerHelper.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.1.9",
3
+ "version": "3.1.11",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "./types/index.d.ts",
@@ -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,46 +20,42 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
24
20
  this.#socketIoServerHelperOptions = options;
25
21
  }
26
22
 
27
- #namespace: Record<string, STSSocketIONamespace> = { };
28
-
29
- LogMessage = (namespace: STSSocketIONamespace, message: string): void => {
23
+ #LogDebugMessage(message: any) {
24
+ this.#socketIoServerHelperOptions.logger.debug(message);
25
+ }
30
26
 
27
+ LogMessage(namespace: STSSocketIONamespace, message: any) {
31
28
  this.#socketIoServerHelperOptions.logger.info(`${namespace.namespace}: ${message}`);
32
- /*
33
- this.#stsApp.UpdateInstrument(Gauge.LOGGER, {
34
- LogMessage: message
35
- } as InstrumentLogTelemetry);
36
- */
37
- };
29
+ }
30
+
31
+ #namespace: Record<string, STSSocketIONamespace> = { };
38
32
 
39
33
  LeaveRoom = (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string): void => {
40
34
  const logMessage = `${namespace.socketionamespace.name}: Leaving room [${room}]`;
41
- debug(logMessage);
42
35
  this.LogMessage(namespace, logMessage);
43
36
  socket.leave(room);
44
37
  };
45
38
 
46
39
  JoinRoom = (namespace: STSSocketIONamespace, socket: Socket<ClientToServerEvents, ServerToClientEvents>, room: string): void => {
47
40
  const logMessage = `${namespace.socketionamespace.name}: Socket joining room [${room}], ID: [${socket.id}]`;
48
- debug(logMessage);
49
41
  this.LogMessage(namespace, logMessage);
50
42
  socket.join(room);
51
43
  };
52
44
 
53
45
  #SetupStandardEvents = (namespace: STSSocketIONamespace, socket: Socket<STSDefaultClientToServerEvents, STSDefaultServerToClientEvents>): void => {
54
46
  socket.on("__STSdisconnect", (reason) => {
55
- debug(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
47
+ this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnect, ID: [${socket.id}] [${reason}]`);
56
48
  });
57
49
 
58
50
  socket.on("__STSdisconnecting", (reason, callBackResult) => {
59
- debug(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
51
+ this.#LogDebugMessage(`${namespace.socketionamespace.name}: socket disconnecting, ID: [${socket.id}] [${reason}]`);
60
52
  callBackResult("__STSdisconnecting accepted by server.");
61
53
  });
62
54
 
63
55
  socket.on('__STSjoinRoom', (rooms: string[]): void => { //@@ names
64
56
  rooms.forEach((room) => {
65
57
  const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket joining room [${room}], ID: [${socket.id}]`;
66
- debug(logMessage);
58
+ this.#LogDebugMessage(logMessage);
67
59
  this.JoinRoom(namespace, socket, room)
68
60
  });
69
61
  });
@@ -71,7 +63,7 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
71
63
  socket.on('__STSleaveRoom', (rooms: string[]): void => { //@@ names
72
64
  rooms.forEach((room) => {
73
65
  const logMessage = `${namespace.socketionamespace.name}:socket.on:joinRoom: Socket leaving room [${room}], ID: [${socket.id}]`;
74
- debug(logMessage);
66
+ this.#LogDebugMessage(logMessage);
75
67
  this.LeaveRoom(namespace, socket, room);
76
68
  });
77
69
  });
@@ -79,7 +71,7 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
79
71
  socket.on('__STSsendToRoom', (rooms: string[], payload: { command: string, payload: JSONObject }): void => {
80
72
  rooms.forEach((room) => {
81
73
  const logMessage = `${namespace.socketionamespace.name}:socket.on:sendToRoom: Sending to room [${room}], ID: [${socket.id}]`;
82
- debug(logMessage);
74
+ this.#LogDebugMessage(logMessage);
83
75
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
84
76
  namespace.socketionamespace.to(room).emit(payload.command as any, payload);
85
77
  });
@@ -89,9 +81,6 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
89
81
  // Use this middleward to check every incomming connection
90
82
  #SetupConnectionMiddleware = (nameSpace: STSSocketIONamespace) => {
91
83
  nameSpace.socketionamespace.use((socket, next) => {
92
- //this.#LogInfoMessage(JSON.stringify(socket));
93
- //this.#LogInfoMessage(JSON.stringify(socket.handshake.auth));
94
- //this.#LogInfoMessage(JSON.stringify(socket.handshake.headers));
95
84
  //if (isValid(socket.request)) {
96
85
  const a=5; // for lint purposes
97
86
  if (a === 5) {
@@ -105,8 +94,6 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
105
94
  // Use this middleware to check very packet being received
106
95
  #SetupMessageMiddleware = (socket: STSServerSocket) => {
107
96
  socket.use(([event, ...args], next) => {
108
- //this.#LogInfoMessage(JSON.stringify(event));
109
- //this.#LogInfoMessage(JSON.stringify(args));
110
97
  /*
111
98
  if (isUnauthorized(event)) {
112
99
  return next(new Error("unauthorized event"));
@@ -131,9 +118,9 @@ export class SocketIoServerHelper<ClientToServerEvents extends STSDefaultClientT
131
118
 
132
119
  this.#namespace[namespace].socketionamespace.on("connection", socket => {
133
120
  const logMessage = `${namespace}: Socket connected, ID: [${socket.id}]`;
134
- debug(logMessage);
135
121
  this.LogMessage(this.#namespace[namespace], logMessage);
136
- debug(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
122
+
123
+ this.#LogDebugMessage(`${namespace}: Authentication Handshake: [${JSON.stringify(socket.handshake.auth)}]`);
137
124
 
138
125
  this.#SetupMessageMiddleware(socket);
139
126
 
@@ -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: (namespace: STSSocketIONamespace, message: string) => void;
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":"AAIA,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;IAEzC,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;IAMjD,UAAU,cAAe,oBAAoB,WAAW,MAAM,KAAG,IAAI,CAQnE;IAEF,SAAS,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAK3H;IAEF,QAAQ,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAK1H;IAoEF,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,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"}
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;IAQjD,UAAU,CAAC,SAAS,EAAE,oBAAoB,EAAE,OAAO,EAAE,GAAG;IAMxD,SAAS,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAI3H;IAEF,QAAQ,cAAe,oBAAoB,UAAU,OAAO,oBAAoB,EAAE,oBAAoB,CAAC,QAAQ,MAAM,KAAG,IAAI,CAI1H;IA+DF,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,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"}