@nsshunt/stsappframework 2.19.185 → 2.19.187
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/singleprocessbase.js +20 -3
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/workerprocessbase.js +2 -7
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +9 -9
- package/src/singleprocessbase.ts +19 -4
- package/src/workerprocessbase.ts +3 -9
- package/types/singleprocessbase.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts.map +1 -1
|
@@ -20,10 +20,11 @@ const processbase_1 = require("./processbase");
|
|
|
20
20
|
const network_js_1 = require("./network.js");
|
|
21
21
|
const server_1 = require("./server");
|
|
22
22
|
const redis_streams_adapter_1 = require("@socket.io/redis-streams-adapter");
|
|
23
|
-
const
|
|
23
|
+
const redis_1 = require("redis");
|
|
24
24
|
class SingleProcessBase extends processbase_1.ProcessBase {
|
|
25
25
|
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
26
26
|
#io = null;
|
|
27
|
+
#redisClient = null;
|
|
27
28
|
#expressServer = null;
|
|
28
29
|
#shuttingDown = false;
|
|
29
30
|
#additionalInstruments = null;
|
|
@@ -187,6 +188,7 @@ class SingleProcessBase extends processbase_1.ProcessBase {
|
|
|
187
188
|
}
|
|
188
189
|
this.socketIoHelper = null;
|
|
189
190
|
this.#io = null;
|
|
191
|
+
// Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
|
|
190
192
|
}
|
|
191
193
|
if (this.options.httpServer === true) {
|
|
192
194
|
LogEx(`Closing httpServer.`);
|
|
@@ -257,8 +259,23 @@ class SingleProcessBase extends processbase_1.ProcessBase {
|
|
|
257
259
|
//,path: '/zzz'
|
|
258
260
|
};
|
|
259
261
|
this.#io = new socket_io_1.Server(this.#httpServer, options);
|
|
260
|
-
|
|
261
|
-
|
|
262
|
+
if (this.options.useRedisAdaptor) {
|
|
263
|
+
LogEx(`Using Redis for socket.io cluster management (worker)`);
|
|
264
|
+
if (this.options.redisAdaptorUrl) {
|
|
265
|
+
LogEx(`Redis url: [${this.options.redisAdaptorUrl}]`);
|
|
266
|
+
this.#redisClient = (0, redis_1.createClient)({ url: this.options.redisAdaptorUrl });
|
|
267
|
+
}
|
|
268
|
+
else {
|
|
269
|
+
LogEx(`Redis url: [localhost]`);
|
|
270
|
+
this.#redisClient = (0, redis_1.createClient)();
|
|
271
|
+
}
|
|
272
|
+
await this.#redisClient.connect();
|
|
273
|
+
this.#io.adapter((0, redis_streams_adapter_1.createAdapter)(this.#redisClient));
|
|
274
|
+
LogEx(`Redis successfully connected.`);
|
|
275
|
+
}
|
|
276
|
+
else {
|
|
277
|
+
LogEx(`Not using any adaptors for socket.io cluster management.}`);
|
|
278
|
+
}
|
|
262
279
|
// To use a seperate socket server, the code below can be applied.
|
|
263
280
|
// this.#io = require("socket.io")(options);
|
|
264
281
|
// this.#io.listen(3006);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,0EAAkC,CAAC,gCAAgC;AAEnE,4CAAoB;AACpB,MAAM,OAAO,GAAG,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;AAEjC,yCAAkD;AAElD,iCAAyD;AACzD,+BAAmC;AAEnC,gDAA0C;AAE1C,oDAA2B;AAE3B,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,oEAAiH;AAGjH,+CAA4C;AAK5C,6CAAwD;AAExD,qCAA2C;AAE3C,4EAAiE;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,6 @@ const socket_io_1 = require("socket.io");
|
|
|
20
20
|
const uuid_1 = require("uuid");
|
|
21
21
|
const commonTypes_1 = require("./commonTypes");
|
|
22
22
|
const server_1 = require("./server");
|
|
23
|
-
//import Redis from 'ioredis';
|
|
24
23
|
const redis_1 = require("redis");
|
|
25
24
|
/**
|
|
26
25
|
* todo
|
|
@@ -197,11 +196,7 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
|
|
|
197
196
|
}
|
|
198
197
|
this.socketIoHelper = null;
|
|
199
198
|
this.#io = null;
|
|
200
|
-
|
|
201
|
-
if (this.#redisClient) {
|
|
202
|
-
await this.#redisClient.disconnect();
|
|
203
|
-
}
|
|
204
|
-
*/
|
|
199
|
+
// Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
|
|
205
200
|
}
|
|
206
201
|
if (this.options.httpServer === true) {
|
|
207
202
|
LogEx(`Closing httpServer.`);
|
|
@@ -326,7 +321,7 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
|
|
|
326
321
|
}
|
|
327
322
|
else {
|
|
328
323
|
this.#io.adapter((0, cluster_adapter_1.createAdapter)());
|
|
329
|
-
LogEx(`Using nodejs cluster mode for socket.io cluster management
|
|
324
|
+
LogEx(`Using nodejs cluster mode for socket.io cluster management`);
|
|
330
325
|
}
|
|
331
326
|
// To use a seperate socket server, the code below can be applied.
|
|
332
327
|
// this.#io = require("socket.io")(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+B;AAC/B,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAEjD,4CAAmB;AACnB,oDAA2B;AAE3B,gEAAkF;AAClF,4EAAiE;AAEjE,oEAA6E;AAC7E,gDAAqD;AAGrD,+CAA4C;AAE5C,6CAA0F;AAE1F,iCAAyD;AACzD,+BAAmC;AACnC,yCAAkD;AAElD,+BAAoC;AAEpC,+CAAkI;AAClI,qCAA4C;AAG5C,8BAA8B;AAC9B,iCAA0E;AAE1E;;;;GAIG;AACH,MAAa,iBAAkB,SAAQ,yBAAW;IAE9C,GAAG,GAAkB,IAAI,CAAC;IAC1B,YAAY,GAA2B,IAAI,CAAC;IAC5C,WAAW,GAAQ,IAAI,CAAC;IACxB,cAAc,GAA4B,IAAI,CAAC;IAC/C,gBAAgB,GAAgB,EAAG,CAAA;IACnC,8BAA8B,GAAG,IAAI,CAAC,CAAC,WAAW;IAElD,YAAY,OAAuB;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kGAAkG;IAClG,yBAAyB,CAAC,GAAQ;QAC9B,mCAAmC;IACvC,CAAC;IAEQ,0BAA0B;QAC/B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;YACtD,+DAA+D;YAC/D,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,sBAAsB,EAAE;gBAChD,GAAG,EAAE,KAAK;aACe,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,2BAA2B,GAAG,CAAC,OAA0B,EAAuB,EAAE;QAC9E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACnC,MAAM,CAAC,qBAAqB,OAAO,CAAC,EAAE,+DAA+D,CAAC,CAAC;aAC1G;iBAAM;gBACH,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG;oBAChC,iBAAiB,EAAE,EAAE,GAAG,OAAO,EAAE;oBACjC,EAAE,EAAE,GAAG,EAAE;wBACL,MAAM,MAAM,GAAe,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,cAA4B,CAAA;wBAC3G,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;wBACxD,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,KAAK,CAAC,wCAAwC,OAAO,CAAC,EAAE,4CAA4C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;wBAClL,OAAO,CAAC,MAAM,CAAC,CAAC;oBACpB,CAAC;oBACD,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE;wBACrB,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC7C,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;wBACd,KAAK,CAAC,gCAAgC,IAAI,CAAC,8BAA8B,yBAAyB,OAAO,CAAC,EAAE,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;wBACxM,MAAM,CAAC,+CAA+C,CAAC,CAAC;oBAC5D,CAAC,EAAE,IAAI,CAAC,8BAA8B,CAAC,CAAC,8BAA8B;iBACzE,CAAA;gBACD,KAAK,CAAC,6BAA6B,OAAO,CAAC,EAAE,0CAA0C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACrK,OAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,+DAA+D;IAC/D,SAAS,GAAG,KAAK,EAAE,OAAY,EAAmB,EAAE;QAChD,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,SAAS;YACpC,aAAa,EAAE;gBACX,OAAO;aACV;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC,QAAQ,CAAC;IACnC,CAAC,CAAA;IAED,+DAA+D;IAC/D,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,OAAY,EAAuB,EAAE;QACzE,MAAM,cAAc,GAAe,MAAM,IAAI,CAAC,2BAA2B,CAAC;YACtE,eAAe,EAAE,IAAI;YACrB,EAAE,EAAE,IAAA,SAAM,GAAE;YACZ,OAAO,EAAE,+BAAiB,CAAC,YAAY;YACvC,aAAa,EAAE;gBACX,OAAO;gBACP,QAAQ;aACX;SACJ,CAAC,CAAC;QACH,OAAO,cAAc,CAAC;IAC1B,CAAC,CAAA;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,sCAAsC;IACtC,yBAAyB,GAAG,CAAC,aAAsB,EAAE,EAAE;QACnD,sHAAsH;QACtH,IAAI,gCAAkB,EAAE,CAAC;QAEzB,MAAM,MAAM,GAAG,MAAM,CAAC;QAEtB,IAAA,mCAAqB,EAAC;YAClB,MAAM,EAAE,EAAE,iBAAiB,EAAE,OAAO,CAAC,GAAG,EAAE;YAC1C,MAAM,EAAE,MAAM;SACjB,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,IAAI,qBAAO,CAAC;YAClB,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,sBAAsB;YAC5B,UAAU,EAAE,CAAC,MAAM,CAAC;SACvB,CAAC,CAAC;QAEH,WAAW,CAAC,GAAG,EAAE;YACb,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;QACzB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QAEjB,WAAW,CAAC,GAAG,EAAE;YACb,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YACrB,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7C,CAAC,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;QAEhB,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;YACvD,IAAI;gBACA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,sBAAQ,CAAC,WAAW,CAAC,CAAC;gBAC9C,GAAG,CAAC,GAAG,CAAC,MAAM,sBAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;aACrC;YAAC,OAAO,EAAE,EAAE;gBACT,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;QAEH,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC/D,IAAI;gBACA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,sBAAQ,CAAC,WAAW,CAAC,CAAC;gBAC9C,GAAG,CAAC,GAAG,CAAC,MAAM,sBAAQ,CAAC,uBAAuB,CAAC,cAAc,CAAC,CAAC,CAAC;aACnE;YAAC,OAAO,EAAE,EAAE;gBACT,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;IAED,WAAW,GAAG,KAAK,IAAI,EAAE;QAErB,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,aAAa,EAAE,CAAC;QACzB,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC,CAAA;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,OAAO,CAAC,yBAAyB,IAAI,IAAI,CAAC,OAAO,CAAC,+BAA+B,EAAE;YACxF,IAAI,CAAC,cAAc,GAAG,IAAI,yBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,IAA0B,CAAC,CAAC;SACxF;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB;;;;;UAKJ;QAEI,KAAK,CAAC,mDAAmD,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAE5F,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,MAAM,SAAS,GAAG,KAAK,EAAE,WAAW,GAAG,IAAI,EAAiB,EAAE;YAE1D,IAAI,YAAY,KAAK,KAAK,EAC1B;gBACI,YAAY,GAAG,IAAI,CAAC;gBAEpB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAE9B,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAE1B,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC/B,sCAAsC;gBAEtC,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,EACxD;oBACI,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBAC7B,IAAI,IAAI,CAAC,cAAc,KAAK,IAAI,EAAE;wBAC9B,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;qBAC3C;yBAAM;wBACH,IAAI,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;qBAChC;oBACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;oBAC3B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;oBAEhB;;;;sBAIE;iBACL;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;oBAClC,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBAC7B,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;iBAClC;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;oBAC1B,KAAK,CAAC,wCAAwC,CAAC,CAAC;oBAChD,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;oBAC/B,uCAAuC;iBAC1C;gBAED,KAAK,CAAC,2BAA2B,WAAW,GAAG,CAAC,CAAC;gBACjD,IAAI,WAAW,EAAE;oBACb,KAAK,CAAC,mDAAmD,CAAC,CAAC;iBAC9D;qBAAM;oBACH,KAAK,CAAC,qFAAqF,CAAC,CAAC;iBAChG;gBAED,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3E,UAAU,CAAC,GAAG,EAAE;wBACZ,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC3E,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;yBACnD;oBACL,CAAC,EAAE,GAAG,CAAC,CAAC;iBACX;gBAED,sDAAsD;gBACtD,kDAAkD;gBAClD,8EAA8E;gBAC9E,gFAAgF;gBAChF,qEAAqE;gBAErE,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,mCAAmC;gBAEtD,IAAI,WAAW,EAAE;oBACb,UAAU,CAAC,GAAG,EAAE;wBACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpB,CAAC,EAAE,CAAC,CAAC,CAAC;iBACT;aACJ;iBAAM;gBACH,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACzC;QACL,CAAC,CAAA;QAED,4CAA4C;QAC5C,oBAAoB;QAEpB,+DAA+D;QAC/D,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAQ,EAAE,EAAE;YACrC,IAAI,GAAG,CAAC,eAAe,EAAE;gBACrB,MAAM,iBAAiB,GAAsB,GAAwB,CAAC;gBACtE,IAAI,iBAAiB,CAAC,EAAE,EAAE;oBACtB,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE;wBAC7C,MAAM,eAAe,GAAe,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;wBAChF,eAAe,CAAC,iBAAiB,CAAC,cAAc,GAAG,EAAE,GAAG,iBAAiB,CAAC,cAAc,EAAE,CAAA;wBAC1F,eAAe,CAAC,EAAE,EAAE,CAAC;qBACxB;yBAAM;wBACH,MAAM,IAAI,KAAK,CAAC,qDAAqD,iBAAiB,CAAC,EAAE,GAAG,CAAC,CAAC;qBACjG;iBACJ;qBAAM;oBACH,MAAM,IAAI,KAAK,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;iBACjG;gBACD,OAAO;aACV;YACD,IAAI,GAAG,CAAC,OAAO,EAAE,cAAc;aAC/B;gBACI,QAAQ,GAAG,CAAC,OAAO,EACnB;oBACA,KAAK,WAAW;wBACZ,KAAK,CAAC,CAAC,WAAW,GAAG,gBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,6BAA6B,CAAC,CAAC,IAAI,CAAC,CAAC;wBAC5F,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,2EAA2E;wBACnG,MAAM;oBACV,KAAK,kBAAkB;wBACnB,KAAK,CAAC,CAAC,WAAW,GAAG,gBAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,6BAA6B,CAAC,CAAC,IAAI,CAAC,CAAC;wBAC5F,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;wBACtB,MAAM;oBACV,KAAK,SAAS;wBACV,KAAK,CAAC,CAAC,WAAW,GAAG,gBAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,6BAA6B,CAAC,CAAC,IAAI,CAAC,CAAC;wBAC1F,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;wBACzC,MAAM;oBACV,KAAK,UAAU,EAAG,iDAAiD;wBAC/D,GAAG,CAAC,OAAO,CAAA;iBACd;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,KAAK,IAAI,EAAE;YAClC,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE;gBACnC,MAAM,OAAO,GAAG;oBACZ,GAAG,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;oBACrD,IAAI,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC;iBACjE,CAAC;gBACF,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAiB,EAAC,OAAO,EAAG,IAAI,CAAC,cAAmC,CAAC,GAAG,CAAC,CAAC;aAChG;iBAAM;gBACH,IAAI,CAAC,WAAW,GAAG,IAAA,mBAAY,EAAE,IAAI,CAAC,cAAmC,CAAC,GAAG,CAAC,CAAC;aAClF;YACD,uCAAuC;YAEvC,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,KAAK,IAAI,EAAE;gBACzC,IAAI,CAAC,yBAAyB,CAAE,IAAI,CAAC,cAAmC,CAAC,GAAG,CAAC,CAAC;aACjF;YAED,4DAA4D;YAC5D,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,IAAI,EAAE;gBACjC,YAAY;gBACZ,YAAY;gBACZ,MAAM,OAAO,GAA2B;oBACpC,UAAU,EAAE,CAAE,WAAW,CAAE,CAAC,oFAAoF;oBAChH,iCAAiC;oBACjC,0DAA0D;oBAC1D,eAAe;iBAClB,CAAC;gBAGF,6DAA6D;gBAC7D,IAAI,CAAC,GAAG,GAAG,IAAI,kBAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;gBAEjD,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;oBAC9B,KAAK,CAAC,uDAAuD,CAAC,CAAC;oBAC/D,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;wBAC9B,KAAK,CAAC,eAAe,IAAI,CAAC,OAAO,CAAC,eAAe,GAAG,CAAC,CAAC;wBACtD,IAAI,CAAC,YAAY,GAAG,IAAA,oBAAY,EAAC,EAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,EAAC,CAAC,CAAC;qBACzE;yBAAM;wBACH,KAAK,CAAC,wBAAwB,CAAC,CAAC;wBAChC,IAAI,CAAC,YAAY,GAAG,IAAA,oBAAY,GAAE,CAAC;qBACtC;oBACD,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;oBAClC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,qCAAa,EAAC,IAAI,CAAC,YAAY,CAAQ,CAAC,CAAC;oBAC1D,KAAK,CAAC,+BAA+B,CAAC,CAAC;iBAC1C;qBAAM;oBACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,+BAAoB,GAAS,CAAC,CAAC;oBAChD,KAAK,CAAC,6DAA6D,CAAC,CAAC;iBACxE;gBAED,kEAAkE;gBAClE,4CAA4C;gBAC5C,qCAAqC;gBACrC,yBAAyB;gBACzB,2BAA2B;gBAE3B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;oBAC3C,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;oBACrC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC;oBACjD,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,sDAAsD;oBAC1E,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,gCAAgC;gBACxD,CAAC,CAAC,CAAC;aACN;YAED,IAAI;gBACA,2FAA2F;gBAC3F,kEAAkE;gBAClE,0EAA0E;gBAC1E,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,EAAE;oBAClD,sCAAsC;gBAC1C,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;oBAEpB,KAAK,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;gBAChG,CAAC,CAAC,CAAC;aACN;YAAC,OAAO,KAAK,EACd;gBACI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,MAAM,KAAK,CAAC;aACf;SACJ;QAED;;;;;;UAMJ;QAEI,eAAe;QACf,6CAA6C;QAC7C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAE7B,KAAK,CAAC,uCAAuC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAC5D,MAAM,SAAS,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAE5B,KAAK,CAAC,sCAAsC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;YAC3D,MAAM,SAAS,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC,CAAC;CACL;AAnZD,8CAmZC"}
|
|
1
|
+
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nsshunt/stsappframework",
|
|
3
|
-
"version": "2.19.
|
|
3
|
+
"version": "2.19.187",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -33,20 +33,20 @@
|
|
|
33
33
|
"@types/jsonwebtoken": "^9.0.1",
|
|
34
34
|
"@types/pg": "^8.6.6",
|
|
35
35
|
"@types/uuid": "^9.0.1",
|
|
36
|
-
"@typescript-eslint/eslint-plugin": "^5.59.
|
|
37
|
-
"@typescript-eslint/parser": "^5.59.
|
|
36
|
+
"@typescript-eslint/eslint-plugin": "^5.59.1",
|
|
37
|
+
"@typescript-eslint/parser": "^5.59.1",
|
|
38
38
|
"eslint": "^8.39.0",
|
|
39
39
|
"jest": "^29.5.0",
|
|
40
40
|
"supertest": "^6.3.3",
|
|
41
|
-
"testcontainers": "^9.
|
|
41
|
+
"testcontainers": "^9.6.0",
|
|
42
42
|
"typescript": "^5.0.4"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@nsshunt/stsconfig": "^1.25.
|
|
46
|
-
"@nsshunt/stsdatamanagement": "^1.17.
|
|
47
|
-
"@nsshunt/stsinstrumentation": "^6.11.
|
|
48
|
-
"@nsshunt/stspublisherserver": "^1.15.
|
|
49
|
-
"@nsshunt/stsutils": "^1.16.
|
|
45
|
+
"@nsshunt/stsconfig": "^1.25.44",
|
|
46
|
+
"@nsshunt/stsdatamanagement": "^1.17.97",
|
|
47
|
+
"@nsshunt/stsinstrumentation": "^6.11.84",
|
|
48
|
+
"@nsshunt/stspublisherserver": "^1.15.45",
|
|
49
|
+
"@nsshunt/stsutils": "^1.16.2",
|
|
50
50
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
51
51
|
"@socket.io/redis-streams-adapter": "^0.1.0",
|
|
52
52
|
"@types/pidusage": "^2.0.2",
|
package/src/singleprocessbase.ts
CHANGED
|
@@ -29,7 +29,8 @@ import { GetFirstNetworkInterface } from './network.js';
|
|
|
29
29
|
import { STSExpressServer } from './server'
|
|
30
30
|
|
|
31
31
|
import { createAdapter } from "@socket.io/redis-streams-adapter";
|
|
32
|
-
|
|
32
|
+
|
|
33
|
+
import { createClient, RedisClientType } from 'redis';
|
|
33
34
|
|
|
34
35
|
export type EventCb = (socket: any, data: any) => void
|
|
35
36
|
|
|
@@ -37,6 +38,7 @@ export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
|
37
38
|
{
|
|
38
39
|
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
39
40
|
#io: any = null;
|
|
41
|
+
#redisClient: RedisClientType | null = null;
|
|
40
42
|
#expressServer: STSExpressServer | null = null;
|
|
41
43
|
#shuttingDown = false;
|
|
42
44
|
#additionalInstruments = null;
|
|
@@ -234,6 +236,7 @@ export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
|
234
236
|
}
|
|
235
237
|
this.socketIoHelper = null;
|
|
236
238
|
this.#io = null;
|
|
239
|
+
// Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
|
|
237
240
|
}
|
|
238
241
|
|
|
239
242
|
if (this.options.httpServer === true) {
|
|
@@ -319,9 +322,21 @@ export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
|
319
322
|
|
|
320
323
|
this.#io = new Server(this.#httpServer, options);
|
|
321
324
|
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
+
if (this.options.useRedisAdaptor) {
|
|
326
|
+
LogEx(`Using Redis for socket.io cluster management (worker)`);
|
|
327
|
+
if (this.options.redisAdaptorUrl) {
|
|
328
|
+
LogEx(`Redis url: [${this.options.redisAdaptorUrl}]`);
|
|
329
|
+
this.#redisClient = createClient({url: this.options.redisAdaptorUrl});
|
|
330
|
+
} else {
|
|
331
|
+
LogEx(`Redis url: [localhost]`);
|
|
332
|
+
this.#redisClient = createClient();
|
|
333
|
+
}
|
|
334
|
+
await this.#redisClient.connect();
|
|
335
|
+
this.#io.adapter(createAdapter(this.#redisClient) as any);
|
|
336
|
+
LogEx(`Redis successfully connected.`);
|
|
337
|
+
} else {
|
|
338
|
+
LogEx(`Not using any adaptors for socket.io cluster management.}`);
|
|
339
|
+
}
|
|
325
340
|
|
|
326
341
|
// To use a seperate socket server, the code below can be applied.
|
|
327
342
|
// this.#io = require("socket.io")(options);
|
package/src/workerprocessbase.ts
CHANGED
|
@@ -25,8 +25,7 @@ import { IPCMessage, IPCMessages, IPCMessagePayload, IPCMessageCommand, IWorkerP
|
|
|
25
25
|
import { STSExpressServer } from './server';
|
|
26
26
|
import { Express } from 'express'
|
|
27
27
|
|
|
28
|
-
|
|
29
|
-
import { createClient, RedisClientOptions, RedisClientType } from 'redis';
|
|
28
|
+
import { createClient, RedisClientType } from 'redis';
|
|
30
29
|
|
|
31
30
|
/**
|
|
32
31
|
* todo
|
|
@@ -236,12 +235,7 @@ export class WorkerProcessBase extends ProcessBase implements IWorkerProcessBase
|
|
|
236
235
|
}
|
|
237
236
|
this.socketIoHelper = null;
|
|
238
237
|
this.#io = null;
|
|
239
|
-
|
|
240
|
-
/*
|
|
241
|
-
if (this.#redisClient) {
|
|
242
|
-
await this.#redisClient.disconnect();
|
|
243
|
-
}
|
|
244
|
-
*/
|
|
238
|
+
// Note that this.#redisClient.disconnect() is not required becuase DisconnectSockets performs this action.
|
|
245
239
|
}
|
|
246
240
|
|
|
247
241
|
if (this.options.httpServer === true) {
|
|
@@ -376,7 +370,7 @@ export class WorkerProcessBase extends ProcessBase implements IWorkerProcessBase
|
|
|
376
370
|
LogEx(`Redis successfully connected.`);
|
|
377
371
|
} else {
|
|
378
372
|
this.#io.adapter(clusterCreateAdapter() as any);
|
|
379
|
-
LogEx(`Using nodejs cluster mode for socket.io cluster management
|
|
373
|
+
LogEx(`Using nodejs cluster mode for socket.io cluster management`);
|
|
380
374
|
}
|
|
381
375
|
|
|
382
376
|
// To use a seperate socket server, the code below can be applied.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAInE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.d.ts","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAInE,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;AAEtD,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,kBAAkB;;IAc5E;;;OAGA;gBACY,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAGb;IAEQ,0BAA0B,IAAI,IAAI;IAQlC,wBAAwB,IAAI,qBAAqB;IAS1D;;;OAGA;IACS,eAAe,IAAI,GAAG;IAI/B,cAAc;IAId,IAAI,EAAE,QAEL;IAED,kBAAkB;IAIlB,IAAI,aAAa,4BAEhB;IAED,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IA6B/B,aAAa,sBAuPZ;IAEK,SAAS;CAKlB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAS,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,OAAO,EAAE,MAAM,EAAiB,MAAM,WAAW,CAAC;AAIlD,OAAO,EAAiE,kBAAkB,EAAmB,MAAM,eAAe,CAAA;AAClI,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAAS,MAAM,mBAAmB,CAAA;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,OAAO,EAAE,MAAM,EAAiB,MAAM,WAAW,CAAC;AAIlD,OAAO,EAAiE,kBAAkB,EAAmB,MAAM,eAAe,CAAA;AAClI,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAK5C;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,kBAAkB;;gBAShE,OAAO,EAAE,cAAc;IAInC,IAAI,UAAU,QAEb;IAED,aAAa;IAKb,yBAAyB,CAAC,GAAG,EAAE,GAAG;IAIzB,0BAA0B,IAAI,IAAI;IAS3C,IAAI,EAAE,+LAEL;IAiCD,SAAS,YAAmB,GAAG,KAAG,QAAQ,MAAM,CAAC,CAUhD;IAGD,YAAY,aAAoB,MAAM,WAAW,GAAG,KAAG,QAAQ,UAAU,CAAC,CAWzE;IAED,kBAAkB;IAkDlB,IAAI,aAAa,4BAEhB;IAED,WAAW,sBAMV;IAED,aAAa,sBA+OX;CACL"}
|