@nsshunt/stsappframework 2.19.174 → 2.19.176
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/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/masterprocessbase.js +1 -3
- package/dist/masterprocessbase.js.map +1 -1
- package/dist/singleprocessbase.js +4 -0
- package/dist/singleprocessbase.js.map +1 -1
- package/dist/workerprocessbase.js +6 -2
- package/dist/workerprocessbase.js.map +1 -1
- package/package.json +7 -6
- package/src/index.ts +0 -1
- package/src/masterprocessbase.ts +1 -1
- package/src/singleprocessbase.ts +7 -0
- package/src/workerprocessbase.ts +9 -2
- package/types/index.d.ts +0 -1
- package/types/index.d.ts.map +1 -1
- package/types/singleprocessbase.d.ts.map +1 -1
- package/types/workerprocessbase.d.ts.map +1 -1
- package/dist/testHelpers.js +0 -295
- package/dist/testHelpers.js.map +0 -1
- package/src/testHelpers.ts +0 -326
- package/types/testHelpers.d.ts +0 -26
- package/types/testHelpers.d.ts.map +0 -1
package/dist/index.js
CHANGED
|
@@ -18,7 +18,6 @@ __exportStar(require("./commonTypes"), exports);
|
|
|
18
18
|
__exportStar(require("./processoptions"), exports);
|
|
19
19
|
__exportStar(require("./authDefs"), exports);
|
|
20
20
|
__exportStar(require("./authutilsnode"), exports);
|
|
21
|
-
__exportStar(require("./testHelpers"), exports);
|
|
22
21
|
__exportStar(require("./stsrouterbase"), exports);
|
|
23
22
|
__exportStar(require("./stscontrollerbase"), exports);
|
|
24
23
|
__exportStar(require("./singleprocessbase"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,6CAA0B;AAC1B,kDAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA6B;AAC7B,mDAAgC;AAChC,6CAA0B;AAC1B,kDAA+B;AAC/B,kDAA+B;AAC/B,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,sDAAmC;AACnC,mDAAgC;AAChC,yDAAsC;AACtC,oDAAiC"}
|
|
@@ -13,8 +13,6 @@ const os_1 = __importDefault(require("os"));
|
|
|
13
13
|
let numCPUs = os_1.default.cpus().length;
|
|
14
14
|
const colors_1 = __importDefault(require("colors"));
|
|
15
15
|
const express_1 = __importDefault(require("express"));
|
|
16
|
-
//const { setupPrimary } = require("@socket.io/cluster-adapter");
|
|
17
|
-
const cluster_adapter_1 = require("@socket.io/cluster-adapter");
|
|
18
16
|
const https_2 = require("https");
|
|
19
17
|
const http_1 = require("http");
|
|
20
18
|
const prom_client_1 = require("prom-client");
|
|
@@ -388,7 +386,7 @@ class MasterProcessBase extends processbase_1.ProcessBase {
|
|
|
388
386
|
LogEx(`Memory: ${JSON.stringify(sysinfo.mem)}`);
|
|
389
387
|
// socket.io
|
|
390
388
|
// setup connections between the workers
|
|
391
|
-
|
|
389
|
+
//@@setupPrimary();
|
|
392
390
|
if (this.options.prometheusSupport === true) {
|
|
393
391
|
this.#SetupPrometheusForMaster(LogEx);
|
|
394
392
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../src/masterprocessbase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"masterprocessbase.js","sourceRoot":"","sources":["../src/masterprocessbase.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,0EAAkC,CAAC,gCAAgC;AACnE,kDAAyB;AAEzB,kDAA0B;AAE1B,gEAA8C;AAE9C,4CAAoB;AACpB,IAAI,OAAO,GAAG,YAAE,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC;AAE/B,oDAA2B;AAE3B,sDAA6B;AAI7B,iCAAyD;AACzD,+BAAmC;AACnC,6CAAgD;AAEhD,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,kDAA+B;AAE/B,oEAA+I;AAC/I,uCAAoD;AAGpD,+CAA4C;AAI5C,+CAAoE;AAEpE,IAAI,YAAY,GAAG,KAAK,CAAC,CAAC,8BAA8B;AAExD,MAAa,iBAAkB,SAAQ,yBAAW;IAE9C,2DAA2D;IAC3D,sBAAsB,GAAG,QAAQ,CAAC,qBAAqB,CAAC;IACxD,qBAAqB,GAAG,QAAQ,CAAC,oBAAoB,CAAC;IACtD,cAAc,GAAG;QACb,WAAW,EAAE,aAAa;KAC7B,CAAA;IACD,WAAW,GAAQ,IAAI,CAAC,CAAC,sGAAsG;IAC/H,cAAc,GAAO,IAAI,CAAC;IAC1B,mBAAmB,GAAQ,IAAI,CAAC;IAChC,WAAW,CAAM;IACjB,MAAM,GAAG,IAAA,eAAW,EAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5C,aAAa,GAA0B,IAAI,CAAC;IAC5C,YAAY,GAA2B,EAAG,CAAC;IAC3C,QAAQ,GAAG,CAAC,CAAC,CAAC,oCAAoC;IAElD,YAAY,OAAuB;QAE/B,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,WAAW,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;YAC/B,0DAA0D;YAC1D,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,kBAAkB,EAAE,QAAQ,CAAC,YAAY,CAAC,oDAAoD;SACjG,CAAC,CAAC;IACP,CAAC;IAEQ,0BAA0B;QAC/B,2BAAE,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACpC,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,qBAAqB,EAAE;gBAC/C,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW;aACR,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,wBAAwB;QAC7B,OAAO;YACH,CAAE,0BAAK,CAAC,qBAAqB,EAAE,+BAAU,CAAC,gBAAgB,EAAE;oBACxD,QAAQ,EAAE,QAAQ,CAAC,kCAAkC;oBACrD,UAAU,EAAE,QAAQ,CAAC,yBAAyB;iBACvB,CAAC;SAC/B,CAAA;IACL,CAAC;IAED;;;OAGA;IACA,kGAAkG;IAClG,kBAAkB,CAAC,GAAQ;QAEvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+DAA+D;IAC/D,mBAAmB,CAAC,GAAQ;QAExB,IAAI,GAAG,CAAC,OAAO,EAAE;YACb,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;SAChC;IACL,CAAC;IAED,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE;QAE1B,sBAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;YACzB,IAAI,YAAY,GAAG,IAAI,CAAC;YACxB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAO,CAAC,OAA8B,CAAC,EAAE;gBACxE,IAAI,MAAM,EAAE,WAAW,EAAE;oBACrB,YAAY,GAAG,KAAK,CAAC;oBACrB,MAAM;iBACT;aACJ;YAED,IAAI,YAAY,EAAE;gBACd,KAAK,CAAC,2BAA2B,CAAC,CAAC;aACtC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,uEAAuE;IACvE,yBAAyB,GAAG,CAAC,KAAU,EAAE,EAAE;QACvC,IAAI,CAAC,cAAc,GAAG,IAAA,iBAAO,GAAE,CAAC;QAChC,IAAI,CAAC,mBAAmB,GAAG,IAAI,gCAAkB,EAAE,CAAC;QAEpD,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,EAAE;YACnC,MAAM,OAAO,GAAG;gBACZ,GAAG,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;gBACrD,IAAI,EAAE,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC;aACjE,CAAC;YACF,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAiB,EAAC,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SAC1E;aAAM;YACH,IAAI,CAAC,WAAW,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;SAC5D;QACD,uCAAuC;QAEvC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAQ,EAAE,GAAQ,EAAE,EAAE;YACrE,IAAI;gBACA,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,cAAc,EAAE,CAAC;gBAChE,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;gBAC9D,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACrB;YAAC,OAAO,EAAO,EAAE;gBACd,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;aACxB;QACL,CAAC,CAAC,CAAC;QAEH,mBAAmB;QAEnB,IAAI;YACA,2FAA2F;YAC3F,kEAAkE;YAClE,0EAA0E;YAC1E,0EAA0E;YAC1E,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,GAAG,EAAE;gBAC7D,sCAAsC;YAC1C,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBAEpB,KAAK,CAAC,wCAAwC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,qBAAqB,UAAU,CAAC,CAAC;YACzH,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EACd;YACI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACf;IACL,CAAC,CAAA;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC,CAAA;IAED,+DAA+D;IAC/D,WAAW,GAAG,KAAK,IAAkB,EAAE;QACnC,+DAA+D;QAC/D,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,qHAAqH;QACrH,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,UAAU,CAAC;QAC3F,MAAM,OAAO,GAAG;YACZ,cAAc,EAAE,kBAAkB;SACrC,CAAC;QACF,IAAI;YACA,MAAM,GAAG,MAAM,IAAA,eAAK,EAAC;gBACjB,GAAG,EAAE,GAAG;gBACP,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,IAAI,CAAC,WAAW;aAChC,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,yEAAyE,MAAM,CAAC,MAAM,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC/G,OAAO,IAAI,CAAC;aACf;YACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;SAC7B;QAAC,OAAO,KAAU,EAAE;YACjB,IAAI,CAAC,MAAM,CAAC,iDAAiD,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE;gBACvC,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAC1E;SACJ;IACL,CAAC,CAAA;IAED,wBAAwB,GAAG,CAAC,KAAU,EAAE,EAAE;QACtC,qCAAqC;QACrC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,QAAQ,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAE,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QACnD,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3C,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,uBAAuB,EAAE;YACjD,GAAG,EAAE,QAAQ;SACgB,CAAC,CAAC;QAEnC,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,aAAa,EAAE;YACvC,GAAG,EAAE,QAAQ;SACY,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,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,YAAY,GAAG,CAAC,EAAU,EAAE,MAAsB,EAAE,WAAoB,EAAW,EAAE;QACjF,IAAI,sBAAO,CAAC,OAAO,IAAI,sBAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACxC,MAAM,MAAM,GAAG,sBAAO,CAAC,OAAO,CAAC,EAAE,CAAW,CAAC;YAC7C,IAAI,MAAM,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,IAAI,GAAG,iBAAiB,MAAM,GAAG,CAAC,MAAM,GAAG,oBAAoB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;gBAClI,MAAM,OAAO,GAAW,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;gBACzE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAE,EAAE,OAAO,EAAE,CAAE,CAAC;gBACnC,OAAO,IAAI,CAAC;aACf;iBAAM;gBACH,IAAI,CAAC,KAAK,CAAC,mCAAmC,EAAE,gCAAgC,CAAC,GAAG,CAAC,CAAC;gBACtF,OAAO,KAAK,CAAC;aAChB;SACJ;aAAM;YACH,IAAI,CAAC,KAAK,CAAC,mCAAmC,EAAE,oDAAoD,CAAC,GAAG,CAAC,CAAC;YAC1G,OAAO,KAAK,CAAC;SAChB;IACL,CAAC,CAAA;IAED,+DAA+D;IAC/D,UAAU,GAAG,CAAC,EAAU,EAAE,SAAyB,SAAS,EAAE,OAAY,EAAE,WAAoB,EAAE,YAAqB,EAAW,EAAE;QAChI,IAAI,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,sBAAO,CAAC,OAA8B,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAChF,IAAI,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAO,CAAC,OAA8B,CAAC,CAAC;gBACjE,KAAK,IAAI,CAAC,GAAC,IAAI,CAAC,MAAM,GAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;oBAClC,6DAA6D;oBAC7D,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;oBACb,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,EAAE;wBACxB,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;wBAC3B,2FAA2F;wBAC3F,UAAU,CAAC,GAAG,EAAE;4BACZ,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;wBACjC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI;wBACtB,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;qBACrD;iBACJ;gBACD,OAAO,KAAK,CAAC;aAChB;iBAAM;gBACH,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;aACrD;SACJ;aAAM;YACH,IAAI,CAAC,KAAK,CAAC,8CAA8C,CAAC,MAAM,CAAC,CAAC;YAClE,OAAO,KAAK,CAAC;SAChB;IACL,CAAC,CAAA;IAED,WAAW,GAAG,CAAC,MAAsB,EAAQ,EAAE;QAC3C,IAAI;YACA,KAAK,MAAM,EAAE,IAAI,sBAAO,CAAC,OAAO,EAAE;gBAC9B,IAAI;oBACA,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;oBAC/C,2CAA2C;oBAE3C,uEAAuE;oBACvE,qCAAqC;iBACxC;gBAAC,OAAO,KAAK,EAAE;oBACZ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;iBACrB;aACJ;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACrB;IACL,CAAC,CAAA;IAED,wBAAwB,GAAG,GAAS,EAAE;QAClC,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,gBAAgB,CAAC,0BAAK,CAAC,gBAAgB,EAAE;gBAC1C,GAAG,EAAE,IAAI,CAAC,QAAQ;aACO,CAAC,CAAC;QACnC,CAAC,EAAE,IAAI,CAAC,CAAC;IACb,CAAC,CAAA;IAED,UAAU,GAAG,GAAS,EAAE;QACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,uCAAuC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrE,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACpC,CAAC,CAAA;IAED,UAAU,GAAG,GAAS,EAAE;QACpB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,uCAAuC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrE,IAAI,CAAC,wBAAwB,EAAE,CAAC;IACpC,CAAC,CAAA;IAED,+DAA+D;IAC/D,SAAS,GAAG,CAAC,OAAY,EAAU,EAAE;QACjC,MAAM,QAAQ,GAAW,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,MAAM,CAAC,8BAA8B,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,eAAe,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACjE;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC,CAAA;IAED,kBAAkB,GAAG,KAAK,EAAE,iBAAoC,EAA8B,EAAE;QAC5F,IAAI,CAAC,MAAM,CAAC,kCAAkC,iBAAiB,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;QACnF,QAAQ,iBAAiB,CAAC,OAAO,EAAE;YACnC,KAAK,+BAAiB,CAAC,SAAU,CAAC,CAAC;gBAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;gBAC1E,iBAAiB,CAAC,cAAc,GAAG;oBAC/B,QAAQ;iBACX,CAAA;gBACD,OAAO,iBAAiB,CAAC;aAC5B;YACD,KAAK,+BAAiB,CAAC,YAAa,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,aAAa,EAAE,QAAQ,CAAC;gBAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,iBAAiB,CAAC,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBACjH,IAAI,CAAC,MAAM,CAAC,6BAA6B,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC;gBAC7D,iBAAiB,CAAC,cAAc,GAAG;oBAC/B,QAAQ;oBACR,YAAY;iBACf,CAAA;gBACD,OAAO,iBAAiB,CAAC;aAC5B;YACD,OAAQ,CAAC,CAAC;gBACN,MAAM,YAAY,GAAG,+BAA+B,iBAAiB,CAAC,OAAO,IAAI,CAAC;gBAClF,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,EAAE,CAAC,GAAG,CAAC,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aACjC;SACA;IACL,CAAC,CAAA;IAED,+DAA+D;IAC/D,YAAY,GAAG,CAAC,kBAAwB,EAAU,EAAE;QAChD,MAAM,SAAS,GAAQ,EAAG,CAAC;QAC3B,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,kBAAkB,EAAE;YACpB,SAAS,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;SACrE;QACD,MAAM,MAAM,GAAG,sBAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,EAAE,CAAC;QAElB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAC/B,IAAI,MAAM,EAAE;gBACR,IAAI,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,0BAA0B,MAAM,EAAE,CAAC,CAAC;aAC/E;iBAAM,IAAI,IAAI,KAAK,CAAC,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,4BAA4B,IAAI,EAAE,CAAC,CAAC;aAC/E;iBAAM;gBACH,IAAI,CAAC,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,+BAA+B,IAAI,aAAa,MAAM,EAAE,CAAC,CAAC;aACrG;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YACnC,sDAAsD;YACtD,IAAI,OAAO,CAAC,eAAe,EAAE;gBACzB,MAAM,iBAAiB,GAAsB,OAA4B,CAAC;gBAC1E,IAAI,CAAC,MAAM,CAAC,8BAA8B,iBAAiB,CAAC,EAAE,mBAAmB,MAAM,CAAC,OAAO,CAAC,GAAG,gBAAgB,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAChK,MAAM,QAAQ,GAAsB,MAAM,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;gBACrF,IAAI,CAAC,MAAM,CAAC,sCAAsC,iBAAiB,CAAC,EAAE,iBAAiB,MAAM,CAAC,OAAO,CAAC,GAAG,gBAAgB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5J,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACzB;iBAAM;gBACH,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;aACrC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,aAAa;IAEb,CAAC;IAED,aAAa,GAAG,KAAK,IAAI,EAAE;QAEvB,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB;;;;;UAKJ;QAEI,gCAAgC;QAChC,MAAM,WAAW,GAAG;YAChB,MAAM,EAAE,GAAG;YACX,MAAM,EAAE,GAAG;YACX,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,GAAG;SACX,CAAA;QAED,MAAM,OAAO,GAAG,MAAM,2BAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAE1C,IAAI,QAAQ,CAAC,OAAO,GAAG,CAAC,EAAE;YACtB,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,EAAE;gBACvB,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;aAC9B;iBAAM;gBACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;aAC9D;SACJ;aAAM;YACH,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;SACvC;QAED,KAAK,CAAC,4CAA4C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,CAAC,CAAC;QAErF,MAAM,QAAQ,GAAG,IAAA,kCAAwB,GAAE,CAAC;QAC5C,IAAI,QAAQ,KAAK,IAAI,EACrB;YACI,KAAK,CAAC,iBAAiB,QAAQ,EAAE,CAAC,CAAC;SACtC;aAAM;YACH,KAAK,CAAC,uBAAuB,CAAC,CAAC;SAClC;QACD,KAAK,CAAC,wBAAwB,OAAO,gBAAgB,CAAC,CAAC;QAEvD,KAAK,CAAC,aAAa,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9C,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnD,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpD,KAAK,CAAC,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC7C,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEhD,YAAY;QACZ,wCAAwC;QACxC,mBAAmB;QAEnB,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,KAAK,IAAI,EAAE;YACzC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;SACzC;QAED,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;SACvB;QAED,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAEzB;;;;UAIJ;QAEI,sBAAO,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAExC,KAAK,CAAC,kBAAkB,MAAM,CAAC,OAAO,CAAC,GAAG,6BAA6B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtG,CAAC,CAAC,CAAC;QAEH,2DAA2D;QAC3D,sBAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;YAE1B,KAAK,CAAC,kBAAkB,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,sBAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;YAExC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,EAC1D;gBACI,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,qCAAqC,IAAI,aAAa,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;gBACzG,IAAI,CAAC,UAAU,EAAE,CAAC;aACrB;iBAAM,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,EACnE;gBACI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,KAAK,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,GAAG,0BAA0B,IAAI,aAAa,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;aAC/F;iBAAM;gBACH,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,KAAK,CAAC,UAAU,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC/C,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC3B,KAAK,CAAC,WAAW,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC/B,KAAK,CAAC,sCAAsC,CAAC,GAAG,CAAC,CAAC;gBAClD,IAAI,QAAQ,CAAC,aAAa,KAAK,IAAI,EACnC;oBACI,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBACrC,IAAI,CAAC,YAAY,EAAE,CAAC;iBACvB;aACJ;QACL,CAAC,CAAC,CAAC;QAGH,MAAM,eAAe,GAAG,CAAC,MAAW,EAAE,EAAE;YAEpC,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,MAAM,IAAI,MAAM,KAAK,QAAQ,EACjC;gBACI,QAAQ,GAAG,gBAAM,CAAC,MAAM,CAAC;aAC5B;iBAAM;gBACH,QAAQ,GAAG,gBAAM,CAAC,GAAG,CAAC;aACzB;YACD,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC;QAEF,sBAAsB;QACtB,sCAAsC;QACtC,sBAAsB;QACtB,8BAA8B;QAC9B,iCAAiC;QACjC,YAAY;QACZ,2BAA2B;QAC3B,MAAM,SAAS,GAAG,KAAK,EAAE,MAAW,EAAE,EAAE;YAEpC,IAAI,YAAY,KAAK,KAAK,EAC1B;gBACI,YAAY,GAAG,IAAI,CAAC;gBAEpB,IAAI,IAAI,CAAC,aAAa,EAAE;oBACpB,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;iBAC7B;gBAED,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAE9B,IAAI,IAAI,CAAC,eAAe,EAAE,KAAK,IAAI,EACnC;oBACI,KAAK,CAAC,wCAAwC,CAAC,CAAC;oBAChD,IAAI,CAAC,eAAe,EAAE,CAAC,SAAS,EAAE,CAAC;iBACtC;gBAED,IAAI,MAAM,EAAE;oBACR,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,iCAAiC,OAAO,CAAC,GAAG,qBAAqB,MAAM,EAAE,CAAC,CAAC,CAAC;iBAC7G;qBAAM;oBACH,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,iCAAiC,OAAO,CAAC,GAAG,qCAAqC,CAAC,CAAC,CAAC;iBACnH;gBAED,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBACjC,yBAAyB;gBAEzB,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,EAAE;oBAC3B,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBAC7B,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;oBAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;iBAC3B;gBAED,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC/B,sCAAsC;gBAEtC,yCAAyC;gBAEzC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBAC1B,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBAEzB,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,iFAAiF;gBACjF,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3E,KAAK,CAAC,mBAAmB,CAAC,CAAC;oBAC3B,UAAU,CAAC,GAAG,EAAE;wBACZ,IAAI,IAAI,CAAC,oBAAoB,EAAE;4BAC3B,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,EAAE,CAAC;yBACnD;oBACL,CAAC,EAAE,GAAG,CAAC,CAAC;iBACX;gBAED,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,IAAI,IAAI,CAAC,OAAO,CAAC,sBAAsB,KAAK,IAAI,EAAE;oBACrF,UAAU,CAAC,GAAG,EAAE;wBACZ,KAAK,CAAC,6BAA6B,CAAC,CAAC;wBACrC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpB,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,gDAAgD;iBACjH;qBAAM;oBACH,KAAK,CAAC,yCAAyC,CAAC,CAAC;iBACpD;aACJ;QACL,CAAC,CAAA;QAED,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAE5B,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAE7B,MAAM,SAAS,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAExB,IAAI,IAAI,KAAK,CAAC,EACd;gBACI,KAAK,CAAC,iBAAiB,OAAO,CAAC,GAAG,qCAAqC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;aACxF;iBAAM;gBACH,KAAK,CAAC,iBAAiB,OAAO,CAAC,GAAG,0BAA0B,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC;aAC3E;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACzB,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;gBAClC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;SACpB;QAED,IAAI,CAAC,aAAa,EAAE,CAAC;QAErB,KAAK,CAAC,kBAAkB,OAAO,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACzD,CAAC,CAAA;IAED,sBAAsB,GAAG,CAAC,OAAY,EAAE,IAAS,EAAE,EAAE;QACjD,IAAI;YACA,KAAK,MAAM,EAAE,IAAI,sBAAO,CAAC,OAAO,EAAE;gBAC9B,IAAI;oBACA,oFAAoF;oBACnF,sBAAO,CAAC,OAAO,CAAC,EAAE,CAAY,CAAC,OAAO,CAAC,IAAI,CAAE,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAE,CAAC;iBACpF;gBAAC,OAAO,KAAK,EAAE;oBACZ,iBAAiB;iBACpB;aACJ;SACJ;QAAC,OAAO,KAAK,EAAE;YACZ,iBAAiB;SACpB;IACL,CAAC,CAAA;CACJ;AA1kBD,8CA0kBC"}
|
|
@@ -19,6 +19,8 @@ const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
|
19
19
|
const processbase_1 = require("./processbase");
|
|
20
20
|
const network_js_1 = require("./network.js");
|
|
21
21
|
const server_1 = require("./server");
|
|
22
|
+
const redis_streams_adapter_1 = require("@socket.io/redis-streams-adapter");
|
|
23
|
+
const ioredis_1 = __importDefault(require("ioredis"));
|
|
22
24
|
class SingleProcessBase extends processbase_1.ProcessBase {
|
|
23
25
|
#masterProcessExitTime = goptions.masterProcessExitTime;
|
|
24
26
|
#io = null;
|
|
@@ -255,6 +257,8 @@ class SingleProcessBase extends processbase_1.ProcessBase {
|
|
|
255
257
|
//,path: '/zzz'
|
|
256
258
|
};
|
|
257
259
|
this.#io = new socket_io_1.Server(this.#httpServer, options);
|
|
260
|
+
const redisClient = new ioredis_1.default({ host: "localhost", port: 6379 });
|
|
261
|
+
this.#io.adapter((0, redis_streams_adapter_1.createAdapter)(redisClient));
|
|
258
262
|
// To use a seperate socket server, the code below can be applied.
|
|
259
263
|
// this.#io = require("socket.io")(options);
|
|
260
264
|
// 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;
|
|
1
|
+
{"version":3,"file":"singleprocessbase.js","sourceRoot":"","sources":["../src/singleprocessbase.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
8
8
|
const debug = (0, debug_1.default)(`proc:${process.pid}`);
|
|
9
9
|
const fs_1 = __importDefault(require("fs"));
|
|
10
10
|
const colors_1 = __importDefault(require("colors"));
|
|
11
|
-
|
|
11
|
+
//import { createAdapter } from '@socket.io/cluster-adapter'
|
|
12
|
+
const redis_streams_adapter_1 = require("@socket.io/redis-streams-adapter");
|
|
12
13
|
const stsinstrumentation_1 = require("@nsshunt/stsinstrumentation");
|
|
13
14
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
14
15
|
const processbase_1 = require("./processbase");
|
|
@@ -19,6 +20,7 @@ const socket_io_1 = require("socket.io");
|
|
|
19
20
|
const uuid_1 = require("uuid");
|
|
20
21
|
const commonTypes_1 = require("./commonTypes");
|
|
21
22
|
const server_1 = require("./server");
|
|
23
|
+
const ioredis_1 = __importDefault(require("ioredis"));
|
|
22
24
|
/**
|
|
23
25
|
* todo
|
|
24
26
|
* @typedef {Object} options - todo
|
|
@@ -301,7 +303,9 @@ class WorkerProcessBase extends processbase_1.ProcessBase {
|
|
|
301
303
|
};
|
|
302
304
|
//this.#io = require("socket.io")(this.#httpServer, options);
|
|
303
305
|
this.#io = new socket_io_1.Server(this.#httpServer, options);
|
|
304
|
-
|
|
306
|
+
const redisClient = new ioredis_1.default({ host: "localhost", port: 6379 });
|
|
307
|
+
this.#io.adapter((0, redis_streams_adapter_1.createAdapter)(redisClient));
|
|
308
|
+
//this.#io.adapter(createAdapter() as any);
|
|
305
309
|
// To use a seperate socket server, the code below can be applied.
|
|
306
310
|
// this.#io = require("socket.io")(options);
|
|
307
311
|
// this.#io.adapter(createAdapter());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.js","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"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"}
|
|
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.176",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "./types/index.d.ts",
|
|
@@ -37,18 +37,18 @@
|
|
|
37
37
|
"@typescript-eslint/parser": "^5.59.0",
|
|
38
38
|
"eslint": "^8.39.0",
|
|
39
39
|
"jest": "^29.5.0",
|
|
40
|
-
"jest-date": "^1.1.6",
|
|
41
40
|
"supertest": "^6.3.3",
|
|
42
41
|
"testcontainers": "^9.5.0",
|
|
43
42
|
"typescript": "^5.0.4"
|
|
44
43
|
},
|
|
45
44
|
"dependencies": {
|
|
46
|
-
"@nsshunt/stsconfig": "^1.25.
|
|
47
|
-
"@nsshunt/stsdatamanagement": "^1.17.
|
|
48
|
-
"@nsshunt/stsinstrumentation": "^6.11.
|
|
49
|
-
"@nsshunt/stspublisherserver": "^1.15.
|
|
45
|
+
"@nsshunt/stsconfig": "^1.25.42",
|
|
46
|
+
"@nsshunt/stsdatamanagement": "^1.17.96",
|
|
47
|
+
"@nsshunt/stsinstrumentation": "^6.11.83",
|
|
48
|
+
"@nsshunt/stspublisherserver": "^1.15.41",
|
|
50
49
|
"@nsshunt/stsutils": "^1.16.1",
|
|
51
50
|
"@socket.io/cluster-adapter": "^0.2.2",
|
|
51
|
+
"@socket.io/redis-streams-adapter": "^0.1.0",
|
|
52
52
|
"@types/pidusage": "^2.0.2",
|
|
53
53
|
"@types/tough-cookie": "^4.0.2",
|
|
54
54
|
"axios": "^1.3.6",
|
|
@@ -63,6 +63,7 @@
|
|
|
63
63
|
"jwt-decode": "^3.1.2",
|
|
64
64
|
"pidusage": "^3.0.2",
|
|
65
65
|
"prom-client": "^14.2.0",
|
|
66
|
+
"redis": "^4.6.5",
|
|
66
67
|
"socket.io": "^4.6.1",
|
|
67
68
|
"systeminformation": "^5.17.12",
|
|
68
69
|
"tough-cookie": "^4.1.2",
|
package/src/index.ts
CHANGED
package/src/masterprocessbase.ts
CHANGED
|
@@ -435,7 +435,7 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
|
|
|
435
435
|
|
|
436
436
|
// socket.io
|
|
437
437
|
// setup connections between the workers
|
|
438
|
-
setupPrimary();
|
|
438
|
+
//@@setupPrimary();
|
|
439
439
|
|
|
440
440
|
if (this.options.prometheusSupport === true) {
|
|
441
441
|
this.#SetupPrometheusForMaster(LogEx);
|
package/src/singleprocessbase.ts
CHANGED
|
@@ -28,6 +28,9 @@ import { GetFirstNetworkInterface } from './network.js';
|
|
|
28
28
|
|
|
29
29
|
import { STSExpressServer } from './server'
|
|
30
30
|
|
|
31
|
+
import { createAdapter } from "@socket.io/redis-streams-adapter";
|
|
32
|
+
import Redis from 'ioredis';
|
|
33
|
+
|
|
31
34
|
export type EventCb = (socket: any, data: any) => void
|
|
32
35
|
|
|
33
36
|
export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
@@ -316,6 +319,10 @@ export class SingleProcessBase extends ProcessBase implements ISingleProcessBase
|
|
|
316
319
|
|
|
317
320
|
this.#io = new Server(this.#httpServer, options);
|
|
318
321
|
|
|
322
|
+
|
|
323
|
+
const redisClient = new Redis({ host: "localhost", port: 6379 });
|
|
324
|
+
this.#io.adapter(createAdapter(redisClient) as any);
|
|
325
|
+
|
|
319
326
|
// To use a seperate socket server, the code below can be applied.
|
|
320
327
|
// this.#io = require("socket.io")(options);
|
|
321
328
|
// this.#io.listen(3006);
|
package/src/workerprocessbase.ts
CHANGED
|
@@ -4,7 +4,8 @@ const debug = debugModule(`proc:${process.pid}`);
|
|
|
4
4
|
import fs from "fs"
|
|
5
5
|
import colors from 'colors'
|
|
6
6
|
|
|
7
|
-
import { createAdapter } from '@socket.io/cluster-adapter'
|
|
7
|
+
//import { createAdapter } from '@socket.io/cluster-adapter'
|
|
8
|
+
import { createAdapter } from "@socket.io/redis-streams-adapter";
|
|
8
9
|
|
|
9
10
|
import { Gauge, InstrumentGaugeTelemetry } from '@nsshunt/stsinstrumentation'
|
|
10
11
|
import { JSONObject, Sleep } from '@nsshunt/stsutils'
|
|
@@ -24,6 +25,8 @@ import { IPCMessage, IPCMessages, IPCMessagePayload, IPCMessageCommand, IWorkerP
|
|
|
24
25
|
import { STSExpressServer } from './server';
|
|
25
26
|
import { Express } from 'express'
|
|
26
27
|
|
|
28
|
+
import Redis from 'ioredis';
|
|
29
|
+
|
|
27
30
|
/**
|
|
28
31
|
* todo
|
|
29
32
|
* @typedef {Object} options - todo
|
|
@@ -347,9 +350,13 @@ export class WorkerProcessBase extends ProcessBase implements IWorkerProcessBase
|
|
|
347
350
|
//,path: '/zzz'
|
|
348
351
|
};
|
|
349
352
|
|
|
353
|
+
|
|
350
354
|
//this.#io = require("socket.io")(this.#httpServer, options);
|
|
351
355
|
this.#io = new Server(this.#httpServer, options);
|
|
352
|
-
|
|
356
|
+
|
|
357
|
+
const redisClient = new Redis({ host: "localhost", port: 6379 });
|
|
358
|
+
this.#io.adapter(createAdapter(redisClient) as any);
|
|
359
|
+
//this.#io.adapter(createAdapter() as any);
|
|
353
360
|
|
|
354
361
|
// To use a seperate socket server, the code below can be applied.
|
|
355
362
|
// this.#io = require("socket.io")(options);
|
package/types/index.d.ts
CHANGED
|
@@ -2,7 +2,6 @@ export * from './commonTypes';
|
|
|
2
2
|
export * from './processoptions';
|
|
3
3
|
export * from './authDefs';
|
|
4
4
|
export * from './authutilsnode';
|
|
5
|
-
export * from './testHelpers';
|
|
6
5
|
export * from './stsrouterbase';
|
|
7
6
|
export * from './stscontrollerbase';
|
|
8
7
|
export * from './singleprocessbase';
|
package/types/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,YAAY,CAAA;AAC1B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,iBAAiB,CAAA;AAC/B,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,qBAAqB,CAAA;AACnC,cAAc,kBAAkB,CAAA;AAChC,cAAc,wBAAwB,CAAA;AACtC,cAAc,mBAAmB,CAAA"}
|
|
@@ -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;AAK3C,MAAM,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,IAAI,CAAA;AAEtD,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,kBAAkB;;IAa5E;;;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,sBA0OZ;IAEK,SAAS;CAKlB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerprocessbase.d.ts","sourceRoot":"","sources":["../src/workerprocessbase.ts"],"names":[],"mappings":"
|
|
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;;gBAQhE,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,sBAiOX;CACL"}
|
package/dist/testHelpers.js
DELETED
|
@@ -1,295 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.TestHelper = void 0;
|
|
30
|
-
const debug_1 = __importDefault(require("debug"));
|
|
31
|
-
const debug = (0, debug_1.default)(`proc:${process.pid}:testHelper`);
|
|
32
|
-
const tough = __importStar(require("tough-cookie"));
|
|
33
|
-
const https_1 = __importDefault(require("https"));
|
|
34
|
-
const crypto_1 = __importDefault(require("crypto"));
|
|
35
|
-
require("jest-date");
|
|
36
|
-
const axios_1 = __importDefault(require("axios"));
|
|
37
|
-
const testcontainers_1 = require("testcontainers");
|
|
38
|
-
const stsconfig_1 = require("@nsshunt/stsconfig");
|
|
39
|
-
let goptions = (0, stsconfig_1.$Options)();
|
|
40
|
-
const stsutils_1 = require("@nsshunt/stsutils");
|
|
41
|
-
const authutilsnode_1 = require("./authutilsnode");
|
|
42
|
-
class TestHelper {
|
|
43
|
-
//#regexBase64URL = /^[A-Za-z0-9_-]+$/ // Base64URL - https://base64.guru/standards/base64url
|
|
44
|
-
#regexURLSafeStringComponent = /[-a-zA-Z0-9@:%._+~#=]{1,256}/; // URL safe string component
|
|
45
|
-
//#regexBase64 = /(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64 - https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
|
|
46
|
-
#regexSTSBase64 = /SES_(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/; // Base64
|
|
47
|
-
#regexJWT = /[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+/; // JWT (Base64URL.Base64URL.Base64URL)
|
|
48
|
-
#authUtilsNode = new authutilsnode_1.AuthUtilsNode();
|
|
49
|
-
#databaseContainer;
|
|
50
|
-
#stsAuthContainer;
|
|
51
|
-
#network;
|
|
52
|
-
#authEndpoint = '';
|
|
53
|
-
#authPort = '';
|
|
54
|
-
#authHost = '';
|
|
55
|
-
#httpsAgent = null;
|
|
56
|
-
constructor() {
|
|
57
|
-
this.#authEndpoint = 'https://localhost:3002'; //@@
|
|
58
|
-
}
|
|
59
|
-
#GetHttpsAgent = () => {
|
|
60
|
-
if (this.#httpsAgent === null) {
|
|
61
|
-
// https://nodejs.org/api/http.html#class-httpagent
|
|
62
|
-
this.#httpsAgent = new https_1.default.Agent({
|
|
63
|
-
keepAlive: goptions.keepAlive,
|
|
64
|
-
maxSockets: goptions.maxSockets,
|
|
65
|
-
maxTotalSockets: goptions.maxTotalSockets,
|
|
66
|
-
maxFreeSockets: goptions.maxFreeSockets,
|
|
67
|
-
timeout: goptions.timeout,
|
|
68
|
-
rejectUnauthorized: false
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
return this.#httpsAgent;
|
|
72
|
-
};
|
|
73
|
-
StartNetwork = async () => {
|
|
74
|
-
this.#network = await new testcontainers_1.Network().start();
|
|
75
|
-
};
|
|
76
|
-
StopNetwork = async () => {
|
|
77
|
-
await this.#network.stop();
|
|
78
|
-
};
|
|
79
|
-
get network() {
|
|
80
|
-
return this.#network;
|
|
81
|
-
}
|
|
82
|
-
get authPort() {
|
|
83
|
-
return this.#authPort;
|
|
84
|
-
}
|
|
85
|
-
get authHost() {
|
|
86
|
-
return this.#authHost;
|
|
87
|
-
}
|
|
88
|
-
get authEndpoint() {
|
|
89
|
-
return this.#authEndpoint;
|
|
90
|
-
}
|
|
91
|
-
get getHttpsAgent() {
|
|
92
|
-
return this.#GetHttpsAgent();
|
|
93
|
-
}
|
|
94
|
-
CreateRandomString = () => {
|
|
95
|
-
const charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_~.'; // /[0-9A-Za-z\-_~.]/
|
|
96
|
-
let random = '';
|
|
97
|
-
const randomValues = Array.from(crypto_1.default.getRandomValues(new Uint8Array(43)));
|
|
98
|
-
randomValues.forEach(v => (random += charset[v % charset.length]));
|
|
99
|
-
return random;
|
|
100
|
-
};
|
|
101
|
-
Login = async (username, password) => {
|
|
102
|
-
const client_id = process.env.CLIENT_ID;
|
|
103
|
-
const nonce = crypto_1.default.randomBytes(43).toString('base64'); //CreateRandomString();
|
|
104
|
-
const response_type = 'code';
|
|
105
|
-
const redirect_uri = process.env.REDIRECT_URI;
|
|
106
|
-
const response_mode = 'query';
|
|
107
|
-
const scope = process.env.SCOPE;
|
|
108
|
-
const state = crypto_1.default.randomBytes(43).toString('base64'); // CreateRandomString();
|
|
109
|
-
const code_verifier = this.CreateRandomString();
|
|
110
|
-
const code_challenge = crypto_1.default.createHash('sha256').update(code_verifier).digest('base64');
|
|
111
|
-
const code_challenge_method = 'S256';
|
|
112
|
-
const authoriseOptions = {
|
|
113
|
-
email: username,
|
|
114
|
-
password,
|
|
115
|
-
client_id,
|
|
116
|
-
nonce,
|
|
117
|
-
response_type,
|
|
118
|
-
redirect_uri,
|
|
119
|
-
response_mode,
|
|
120
|
-
scope,
|
|
121
|
-
state,
|
|
122
|
-
code_challenge,
|
|
123
|
-
code_challenge_method
|
|
124
|
-
};
|
|
125
|
-
const url = `${this.#authEndpoint}${goptions.asapiroot}/login`;
|
|
126
|
-
const headers = { 'Content-Type': 'application/json' };
|
|
127
|
-
const retVal = await (0, axios_1.default)({
|
|
128
|
-
url,
|
|
129
|
-
method: 'post',
|
|
130
|
-
data: authoriseOptions,
|
|
131
|
-
headers: headers,
|
|
132
|
-
httpsAgent: this.#GetHttpsAgent()
|
|
133
|
-
});
|
|
134
|
-
//const cookieString = retVal.headers['set-cookie'];
|
|
135
|
-
/*
|
|
136
|
-
const api = request(this.#endpoint);
|
|
137
|
-
const retVal: any = await (api as any)
|
|
138
|
-
.post(`${goptions.asapiroot}/login`)
|
|
139
|
-
.send(authoriseOptions)
|
|
140
|
-
//.expect('set-cookie', /consent_cookie=.*; Max-Age=86; Path=\/; Expires=.*; HttpOnly; Secure; SameSite=Strict/);
|
|
141
|
-
|
|
142
|
-
const cookieString = retVal.header['set-cookie'];
|
|
143
|
-
|
|
144
|
-
if (cookieString) {
|
|
145
|
-
retVal.cookie = new Cookie(cookieString[0]);
|
|
146
|
-
}
|
|
147
|
-
*/
|
|
148
|
-
return retVal;
|
|
149
|
-
};
|
|
150
|
-
GetAuthServerAPITokenFromServer = async () => {
|
|
151
|
-
return await this.#authUtilsNode.GetAPITokenFromAuthServer(authutilsnode_1.STSClientID.STSTestingService, "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==", goptions.asapiidentifier, this.#authEndpoint);
|
|
152
|
-
};
|
|
153
|
-
ValidateJWT = async (token) => {
|
|
154
|
-
return await this.#authUtilsNode.ValidateJWT(token, goptions.asapiidentifier, this.#authEndpoint);
|
|
155
|
-
};
|
|
156
|
-
StartDatabase = async () => {
|
|
157
|
-
this.#databaseContainer = await new testcontainers_1.GenericContainer("postgres")
|
|
158
|
-
.withExposedPorts(5432)
|
|
159
|
-
.withEnvironment({
|
|
160
|
-
POSTGRES_PASSWORD: "postgres",
|
|
161
|
-
//UV_THREADPOOL_SIZE: "64"
|
|
162
|
-
})
|
|
163
|
-
.withNetwork(this.#network)
|
|
164
|
-
.withNetworkAliases("database")
|
|
165
|
-
.start();
|
|
166
|
-
const httpPort = this.#databaseContainer.getMappedPort(5432);
|
|
167
|
-
const host = this.#databaseContainer.getHost();
|
|
168
|
-
const networkIpAddress = this.#databaseContainer.getIpAddress(this.#network.getName());
|
|
169
|
-
process.env.DB_PORT = httpPort;
|
|
170
|
-
process.env.DB_HOST = host;
|
|
171
|
-
(0, stsconfig_1.$ResetOptions)();
|
|
172
|
-
goptions = (0, stsconfig_1.$Options)();
|
|
173
|
-
debug(`httpPort: [${httpPort}]`.green);
|
|
174
|
-
debug(`host: [${host}]`.green);
|
|
175
|
-
debug(`networkIpAddress: [${networkIpAddress}]`.green);
|
|
176
|
-
debug(`connectionString: [${goptions.connectionString}]`.green);
|
|
177
|
-
debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString}]`.green);
|
|
178
|
-
};
|
|
179
|
-
StopDatabase = async () => {
|
|
180
|
-
if (this.#databaseContainer) {
|
|
181
|
-
await this.#databaseContainer.stop();
|
|
182
|
-
debug(`Used the following parameters for the database during testing:`.yellow);
|
|
183
|
-
debug(`connectionString: [${goptions.connectionString}]`.yellow);
|
|
184
|
-
debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString}]`.yellow);
|
|
185
|
-
}
|
|
186
|
-
};
|
|
187
|
-
// Note: .withCopyFilesToContainer and .withCopyContentToContainer have a defect in that Jest will not close. A file handle/stream is left open
|
|
188
|
-
// within the underlying code.
|
|
189
|
-
InitializeDatabase = async () => {
|
|
190
|
-
const stsAuthContainerInit = await new testcontainers_1.GenericContainer("serza/stsauth:latest")
|
|
191
|
-
.withEnvironment({
|
|
192
|
-
DB_USER: "postgres",
|
|
193
|
-
DB_PASSWORD: "postgres",
|
|
194
|
-
DB_HOST: "database",
|
|
195
|
-
DB_PORT: "5432",
|
|
196
|
-
POOL_SIZE: "50",
|
|
197
|
-
MAX_CPU: "2",
|
|
198
|
-
DEBUG: "proc*",
|
|
199
|
-
HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
|
|
200
|
-
HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
|
|
201
|
-
AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
|
|
202
|
-
AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
|
|
203
|
-
AS_ENDPOINT: "https://stscore.stsmda.org"
|
|
204
|
-
})
|
|
205
|
-
.withCommand(["node", "dist/app", "create"])
|
|
206
|
-
.withNetwork(this.#network)
|
|
207
|
-
.withNetworkAliases("stsauthrunnerinit")
|
|
208
|
-
.withWaitStrategy(testcontainers_1.Wait.forLogMessage(`User Permissions: {"status":200,"detail":["STSREST01ReadPermission","STSREST01CreatePermission","STSREST01UpdatePermission","STSREST01DeletePermission"]}`))
|
|
209
|
-
.start();
|
|
210
|
-
await (0, stsutils_1.Sleep)(200);
|
|
211
|
-
await stsAuthContainerInit.stop();
|
|
212
|
-
};
|
|
213
|
-
StartAuthService = async () => {
|
|
214
|
-
this.#stsAuthContainer = await new testcontainers_1.GenericContainer("serza/stsauth:latest")
|
|
215
|
-
.withExposedPorts(3002)
|
|
216
|
-
.withEnvironment({
|
|
217
|
-
DB_USER: "postgres",
|
|
218
|
-
DB_PASSWORD: "postgres",
|
|
219
|
-
DB_HOST: "database",
|
|
220
|
-
DB_PORT: "5432",
|
|
221
|
-
POOL_SIZE: "50",
|
|
222
|
-
MAX_CPU: "2",
|
|
223
|
-
DEBUG: "proc*",
|
|
224
|
-
HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
|
|
225
|
-
HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
|
|
226
|
-
AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
|
|
227
|
-
AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
|
|
228
|
-
AS_ENDPOINT: "https://stscore.stsmda.org"
|
|
229
|
-
})
|
|
230
|
-
.withNetwork(this.#network)
|
|
231
|
-
.withNetworkAliases("stsauthrunner")
|
|
232
|
-
.withWaitStrategy(testcontainers_1.Wait.forHttp("/stsauth/v1.0/latency", 3002).usingTls().allowInsecure())
|
|
233
|
-
.start();
|
|
234
|
-
const httpAuthPort = this.#stsAuthContainer.getMappedPort(3002);
|
|
235
|
-
await (0, stsutils_1.Sleep)(200);
|
|
236
|
-
debug(`-------------------------------------------------------------------------------------------`.green);
|
|
237
|
-
debug(` *** STSAuth Started ***: [${httpAuthPort}]`.green);
|
|
238
|
-
debug(`-------------------------------------------------------------------------------------------`.green);
|
|
239
|
-
this.#authHost = 'https://localhost';
|
|
240
|
-
this.#authPort = httpAuthPort;
|
|
241
|
-
this.#authEndpoint = `${this.#authHost}:${this.#authPort}`;
|
|
242
|
-
};
|
|
243
|
-
StopAuthService = async () => {
|
|
244
|
-
if (this.#stsAuthContainer) {
|
|
245
|
-
await this.#stsAuthContainer.stop();
|
|
246
|
-
await (0, stsutils_1.Sleep)(200);
|
|
247
|
-
}
|
|
248
|
-
};
|
|
249
|
-
TestLoginAndVerify = async () => {
|
|
250
|
-
expect.assertions(4);
|
|
251
|
-
const retVal = await this.Login('user01@stsmda.com.au', 'user01password');
|
|
252
|
-
expect(retVal.status).toEqual(200);
|
|
253
|
-
debug(`${JSON.stringify(retVal.data)}`.red);
|
|
254
|
-
debug(`${JSON.stringify(retVal.headers)}`.magenta);
|
|
255
|
-
debug(`${JSON.stringify(retVal.headers['set-cookie'])}`.yellow);
|
|
256
|
-
const cookies = retVal.headers['set-cookie'];
|
|
257
|
-
debug(`${cookies[0]}`.yellow);
|
|
258
|
-
debug(`${JSON.stringify(tough.Cookie.parse(cookies[0]))}`.green);
|
|
259
|
-
const cookie = tough.Cookie.parse(cookies[0]);
|
|
260
|
-
const desiredCookieResultAxios = {
|
|
261
|
-
key: 'consent_cookie',
|
|
262
|
-
value: expect.stringMatching(this.#regexURLSafeStringComponent),
|
|
263
|
-
path: '/',
|
|
264
|
-
secure: true,
|
|
265
|
-
httpOnly: true,
|
|
266
|
-
sameSite: 'strict',
|
|
267
|
-
};
|
|
268
|
-
const cookieResult = JSON.parse(JSON.stringify(cookie));
|
|
269
|
-
expect(cookieResult).toMatchObject(desiredCookieResultAxios);
|
|
270
|
-
const cookieExpireDate = new Date(cookie.expires);
|
|
271
|
-
expect(cookieExpireDate).toBeAfter(new Date());
|
|
272
|
-
const desiredResult = {
|
|
273
|
-
sessionId: expect.stringMatching(this.#regexSTSBase64),
|
|
274
|
-
id_token: expect.stringMatching(this.#regexJWT),
|
|
275
|
-
consentRequired: ['res01.create', 'res01.read', 'res01.update', 'res01.delete']
|
|
276
|
-
};
|
|
277
|
-
expect(retVal.data.detail).toMatchObject(desiredResult);
|
|
278
|
-
};
|
|
279
|
-
TestValidateJWT = async () => {
|
|
280
|
-
expect.assertions(1);
|
|
281
|
-
const access_token = await this.GetAuthServerAPITokenFromServer();
|
|
282
|
-
debug(`access_token: [${access_token}]`.green);
|
|
283
|
-
const retVal = await this.ValidateJWT(access_token);
|
|
284
|
-
// https://jestjs.io/docs/expect#tomatchobjectobject
|
|
285
|
-
const desiredJWT = {
|
|
286
|
-
scope: 'offline_access session.read session.update',
|
|
287
|
-
iss: 'https://stsmda.com.au/stsauth/',
|
|
288
|
-
aud: 'https://stsmda.com.au/stsauthapi/v1.0/',
|
|
289
|
-
sub: 'session'
|
|
290
|
-
};
|
|
291
|
-
expect(retVal).toMatchObject(desiredJWT);
|
|
292
|
-
};
|
|
293
|
-
}
|
|
294
|
-
exports.TestHelper = TestHelper;
|
|
295
|
-
//# sourceMappingURL=testHelpers.js.map
|
package/dist/testHelpers.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"testHelpers.js","sourceRoot":"","sources":["../src/testHelpers.ts"],"names":[],"mappings":"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"}
|
package/src/testHelpers.ts
DELETED
|
@@ -1,326 +0,0 @@
|
|
|
1
|
-
import debugModule from 'debug'
|
|
2
|
-
const debug = debugModule(`proc:${process.pid}:testHelper`);
|
|
3
|
-
|
|
4
|
-
import * as tough from 'tough-cookie'
|
|
5
|
-
|
|
6
|
-
import https from 'https'
|
|
7
|
-
import crypto from 'crypto';
|
|
8
|
-
|
|
9
|
-
import 'jest-date'
|
|
10
|
-
|
|
11
|
-
import axios from 'axios';
|
|
12
|
-
|
|
13
|
-
import { GenericContainer, Network, Wait } from "testcontainers";
|
|
14
|
-
|
|
15
|
-
import { $Options, $ResetOptions } from '@nsshunt/stsconfig'
|
|
16
|
-
let goptions = $Options()
|
|
17
|
-
|
|
18
|
-
import { Sleep } from '@nsshunt/stsutils'
|
|
19
|
-
|
|
20
|
-
import { AuthUtilsNode, STSClientID } from './authutilsnode'
|
|
21
|
-
|
|
22
|
-
export class TestHelper {
|
|
23
|
-
//#regexBase64URL = /^[A-Za-z0-9_-]+$/ // Base64URL - https://base64.guru/standards/base64url
|
|
24
|
-
#regexURLSafeStringComponent = /[-a-zA-Z0-9@:%._+~#=]{1,256}/ // URL safe string component
|
|
25
|
-
//#regexBase64 = /(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64 - https://stackoverflow.com/questions/475074/regex-to-parse-or-validate-base64-data
|
|
26
|
-
#regexSTSBase64 = /SES_(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?/ // Base64
|
|
27
|
-
#regexJWT = /[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+/ // JWT (Base64URL.Base64URL.Base64URL)
|
|
28
|
-
|
|
29
|
-
#authUtilsNode = new AuthUtilsNode();
|
|
30
|
-
|
|
31
|
-
#databaseContainer: any;
|
|
32
|
-
#stsAuthContainer: any;
|
|
33
|
-
#network: any;
|
|
34
|
-
#authEndpoint = '';
|
|
35
|
-
#authPort = '';
|
|
36
|
-
#authHost = '';
|
|
37
|
-
#httpsAgent: https.Agent | null = null;
|
|
38
|
-
|
|
39
|
-
constructor() {
|
|
40
|
-
this.#authEndpoint = 'https://localhost:3002'; //@@
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
#GetHttpsAgent = () =>
|
|
44
|
-
{
|
|
45
|
-
if (this.#httpsAgent === null) {
|
|
46
|
-
// https://nodejs.org/api/http.html#class-httpagent
|
|
47
|
-
this.#httpsAgent = new https.Agent({
|
|
48
|
-
keepAlive: goptions.keepAlive,
|
|
49
|
-
maxSockets: goptions.maxSockets,
|
|
50
|
-
maxTotalSockets: goptions.maxTotalSockets,
|
|
51
|
-
maxFreeSockets: goptions.maxFreeSockets,
|
|
52
|
-
timeout: goptions.timeout,
|
|
53
|
-
rejectUnauthorized: false
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
return this.#httpsAgent;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
StartNetwork = async () => {
|
|
60
|
-
this.#network = await new Network().start();
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
StopNetwork = async () => {
|
|
64
|
-
await this.#network.stop();
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
get network() {
|
|
68
|
-
return this.#network;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
get authPort() {
|
|
72
|
-
return this.#authPort;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
get authHost() {
|
|
76
|
-
return this.#authHost;
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
get authEndpoint() {
|
|
80
|
-
return this.#authEndpoint;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
get getHttpsAgent() {
|
|
84
|
-
return this.#GetHttpsAgent();
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
CreateRandomString = () => {
|
|
88
|
-
const charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_~.'; // /[0-9A-Za-z\-_~.]/
|
|
89
|
-
let random = '';
|
|
90
|
-
const randomValues: number[] = Array.from(crypto.getRandomValues(new Uint8Array(43)));
|
|
91
|
-
randomValues.forEach(v => (random += charset[v % charset.length]));
|
|
92
|
-
return random;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
Login = async (username: string, password: string) => {
|
|
96
|
-
const client_id = process.env.CLIENT_ID as string;
|
|
97
|
-
const nonce = crypto.randomBytes(43).toString('base64'); //CreateRandomString();
|
|
98
|
-
const response_type = 'code';
|
|
99
|
-
const redirect_uri = process.env.REDIRECT_URI as string;
|
|
100
|
-
const response_mode = 'query';
|
|
101
|
-
const scope = process.env.SCOPE as string;
|
|
102
|
-
const state = crypto.randomBytes(43).toString('base64'); // CreateRandomString();
|
|
103
|
-
const code_verifier = this.CreateRandomString();
|
|
104
|
-
const code_challenge = crypto.createHash('sha256').update(code_verifier).digest('base64');
|
|
105
|
-
const code_challenge_method = 'S256';
|
|
106
|
-
|
|
107
|
-
const authoriseOptions: any = {
|
|
108
|
-
email: username,
|
|
109
|
-
password,
|
|
110
|
-
client_id,
|
|
111
|
-
nonce,
|
|
112
|
-
response_type,
|
|
113
|
-
redirect_uri,
|
|
114
|
-
response_mode,
|
|
115
|
-
scope,
|
|
116
|
-
state,
|
|
117
|
-
code_challenge,
|
|
118
|
-
code_challenge_method
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
const url = `${this.#authEndpoint}${goptions.asapiroot}/login`;
|
|
123
|
-
const headers = { 'Content-Type': 'application/json'};
|
|
124
|
-
|
|
125
|
-
const retVal = await axios({
|
|
126
|
-
url
|
|
127
|
-
,method: 'post'
|
|
128
|
-
,data: authoriseOptions
|
|
129
|
-
,headers: headers
|
|
130
|
-
,httpsAgent: this.#GetHttpsAgent()
|
|
131
|
-
});
|
|
132
|
-
|
|
133
|
-
//const cookieString = retVal.headers['set-cookie'];
|
|
134
|
-
|
|
135
|
-
/*
|
|
136
|
-
const api = request(this.#endpoint);
|
|
137
|
-
const retVal: any = await (api as any)
|
|
138
|
-
.post(`${goptions.asapiroot}/login`)
|
|
139
|
-
.send(authoriseOptions)
|
|
140
|
-
//.expect('set-cookie', /consent_cookie=.*; Max-Age=86; Path=\/; Expires=.*; HttpOnly; Secure; SameSite=Strict/);
|
|
141
|
-
|
|
142
|
-
const cookieString = retVal.header['set-cookie'];
|
|
143
|
-
|
|
144
|
-
if (cookieString) {
|
|
145
|
-
retVal.cookie = new Cookie(cookieString[0]);
|
|
146
|
-
}
|
|
147
|
-
*/
|
|
148
|
-
|
|
149
|
-
return retVal;
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
GetAuthServerAPITokenFromServer = async (): Promise<string> => {
|
|
153
|
-
return await this.#authUtilsNode.GetAPITokenFromAuthServer(STSClientID.STSTestingService,
|
|
154
|
-
"eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
|
|
155
|
-
goptions.asapiidentifier, this.#authEndpoint)
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
ValidateJWT = async (token: string): Promise<string> => {
|
|
159
|
-
return await this.#authUtilsNode.ValidateJWT(token, goptions.asapiidentifier, this.#authEndpoint);
|
|
160
|
-
}
|
|
161
|
-
|
|
162
|
-
StartDatabase = async () => {
|
|
163
|
-
this.#databaseContainer = await new GenericContainer("postgres")
|
|
164
|
-
.withExposedPorts(5432)
|
|
165
|
-
.withEnvironment({
|
|
166
|
-
POSTGRES_PASSWORD: "postgres",
|
|
167
|
-
//UV_THREADPOOL_SIZE: "64"
|
|
168
|
-
})
|
|
169
|
-
.withNetwork(this.#network)
|
|
170
|
-
.withNetworkAliases("database")
|
|
171
|
-
.start();
|
|
172
|
-
|
|
173
|
-
const httpPort = this.#databaseContainer.getMappedPort(5432);
|
|
174
|
-
const host = this.#databaseContainer.getHost();
|
|
175
|
-
const networkIpAddress = this.#databaseContainer.getIpAddress(this.#network.getName());
|
|
176
|
-
|
|
177
|
-
process.env.DB_PORT = httpPort;
|
|
178
|
-
process.env.DB_HOST = host;
|
|
179
|
-
|
|
180
|
-
$ResetOptions();
|
|
181
|
-
goptions = $Options()
|
|
182
|
-
|
|
183
|
-
debug(`httpPort: [${httpPort}]`.green)
|
|
184
|
-
debug(`host: [${host}]`.green)
|
|
185
|
-
debug(`networkIpAddress: [${networkIpAddress}]`.green)
|
|
186
|
-
debug(`connectionString: [${goptions.connectionString}]`.green)
|
|
187
|
-
debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString }]`.green)
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
StopDatabase = async () => {
|
|
191
|
-
if (this.#databaseContainer) {
|
|
192
|
-
await this.#databaseContainer.stop();
|
|
193
|
-
|
|
194
|
-
debug(`Used the following parameters for the database during testing:`.yellow);
|
|
195
|
-
debug(`connectionString: [${goptions.connectionString}]`.yellow);
|
|
196
|
-
debug(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString }]`.yellow);
|
|
197
|
-
}
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
// Note: .withCopyFilesToContainer and .withCopyContentToContainer have a defect in that Jest will not close. A file handle/stream is left open
|
|
201
|
-
// within the underlying code.
|
|
202
|
-
InitializeDatabase = async () => {
|
|
203
|
-
const stsAuthContainerInit = await new GenericContainer("serza/stsauth:latest")
|
|
204
|
-
.withEnvironment({
|
|
205
|
-
DB_USER: "postgres",
|
|
206
|
-
DB_PASSWORD: "postgres",
|
|
207
|
-
DB_HOST: "database", // "192.168.14.101",
|
|
208
|
-
DB_PORT: "5432",
|
|
209
|
-
POOL_SIZE: "50",
|
|
210
|
-
MAX_CPU: "2",
|
|
211
|
-
DEBUG: "proc*",
|
|
212
|
-
HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
|
|
213
|
-
HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
|
|
214
|
-
AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
|
|
215
|
-
AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
|
|
216
|
-
AS_ENDPOINT: "https://stscore.stsmda.org"
|
|
217
|
-
})
|
|
218
|
-
.withCommand(["node", "dist/app", "create"])
|
|
219
|
-
.withNetwork(this.#network)
|
|
220
|
-
.withNetworkAliases("stsauthrunnerinit")
|
|
221
|
-
.withWaitStrategy(Wait.forLogMessage(`User Permissions: {"status":200,"detail":["STSREST01ReadPermission","STSREST01CreatePermission","STSREST01UpdatePermission","STSREST01DeletePermission"]}`))
|
|
222
|
-
.start();
|
|
223
|
-
|
|
224
|
-
await Sleep(200);
|
|
225
|
-
|
|
226
|
-
await stsAuthContainerInit.stop();
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
StartAuthService = async () => {
|
|
230
|
-
this.#stsAuthContainer = await new GenericContainer("serza/stsauth:latest")
|
|
231
|
-
.withExposedPorts(3002)
|
|
232
|
-
.withEnvironment({
|
|
233
|
-
DB_USER: "postgres",
|
|
234
|
-
DB_PASSWORD: "postgres",
|
|
235
|
-
DB_HOST: "database",
|
|
236
|
-
DB_PORT: "5432",
|
|
237
|
-
POOL_SIZE: "50",
|
|
238
|
-
MAX_CPU: "2",
|
|
239
|
-
DEBUG: "proc*",
|
|
240
|
-
HTTPS_SERVER_KEY_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.key",
|
|
241
|
-
HTTPS_SERVER_CERT_PATH: "/var/lib/sts/stsglobalresources/keys-tmp/server.cert",
|
|
242
|
-
AS_CLIENT_ID: "q6a9F0kksXDDcrsCUKRwHKDnTNh7yZfxCShAgIJqfGg=",
|
|
243
|
-
AS_CLIENT_SECRET: "eN9u0mHZLGWZrdnE1zit2vL6xwUFW466sTZcbkXDml5KWxlvKaZ1uiOZmA==",
|
|
244
|
-
AS_ENDPOINT: "https://stscore.stsmda.org"
|
|
245
|
-
})
|
|
246
|
-
.withNetwork(this.#network)
|
|
247
|
-
.withNetworkAliases("stsauthrunner")
|
|
248
|
-
.withWaitStrategy(Wait.forHttp("/stsauth/v1.0/latency", 3002).usingTls().allowInsecure())
|
|
249
|
-
.start();
|
|
250
|
-
|
|
251
|
-
const httpAuthPort = this.#stsAuthContainer.getMappedPort(3002);
|
|
252
|
-
|
|
253
|
-
await Sleep(200);
|
|
254
|
-
debug(`-------------------------------------------------------------------------------------------`.green)
|
|
255
|
-
debug(` *** STSAuth Started ***: [${httpAuthPort}]`.green)
|
|
256
|
-
debug(`-------------------------------------------------------------------------------------------`.green)
|
|
257
|
-
|
|
258
|
-
this.#authHost = 'https://localhost'
|
|
259
|
-
this.#authPort = httpAuthPort;
|
|
260
|
-
this.#authEndpoint = `${this.#authHost}:${this.#authPort}`;
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
StopAuthService = async () => {
|
|
264
|
-
if (this.#stsAuthContainer) {
|
|
265
|
-
await this.#stsAuthContainer.stop();
|
|
266
|
-
await Sleep(200);
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
TestLoginAndVerify = async () => {
|
|
271
|
-
expect.assertions(4);
|
|
272
|
-
|
|
273
|
-
const retVal = await this.Login('user01@stsmda.com.au', 'user01password');
|
|
274
|
-
expect(retVal.status).toEqual(200);
|
|
275
|
-
|
|
276
|
-
debug(`${JSON.stringify(retVal.data)}`.red);
|
|
277
|
-
debug(`${JSON.stringify(retVal.headers)}`.magenta);
|
|
278
|
-
debug(`${JSON.stringify(retVal.headers['set-cookie'])}`.yellow);
|
|
279
|
-
|
|
280
|
-
const cookies = retVal.headers['set-cookie'] as string[];
|
|
281
|
-
debug(`${cookies[0]}`.yellow);
|
|
282
|
-
debug(`${JSON.stringify(tough.Cookie.parse(cookies[0]))}`.green);
|
|
283
|
-
|
|
284
|
-
const cookie = tough.Cookie.parse(cookies[0]) as tough.Cookie;
|
|
285
|
-
|
|
286
|
-
const desiredCookieResultAxios = {
|
|
287
|
-
key: 'consent_cookie',
|
|
288
|
-
value: expect.stringMatching(this.#regexURLSafeStringComponent),
|
|
289
|
-
path: '/',
|
|
290
|
-
secure: true,
|
|
291
|
-
httpOnly: true,
|
|
292
|
-
sameSite: 'strict',
|
|
293
|
-
}
|
|
294
|
-
|
|
295
|
-
const cookieResult = JSON.parse(JSON.stringify(cookie));
|
|
296
|
-
expect(cookieResult).toMatchObject(desiredCookieResultAxios);
|
|
297
|
-
|
|
298
|
-
const cookieExpireDate = new Date(cookie.expires);
|
|
299
|
-
expect(cookieExpireDate).toBeAfter(new Date());
|
|
300
|
-
|
|
301
|
-
const desiredResult = {
|
|
302
|
-
sessionId: expect.stringMatching(this.#regexSTSBase64),
|
|
303
|
-
id_token: expect.stringMatching(this.#regexJWT),
|
|
304
|
-
consentRequired: [ 'res01.create', 'res01.read', 'res01.update', 'res01.delete' ]
|
|
305
|
-
}
|
|
306
|
-
expect(retVal.data.detail).toMatchObject(desiredResult);
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
TestValidateJWT = async () => {
|
|
310
|
-
expect.assertions(1);
|
|
311
|
-
|
|
312
|
-
const access_token = await this.GetAuthServerAPITokenFromServer();
|
|
313
|
-
debug(`access_token: [${access_token}]`.green);
|
|
314
|
-
|
|
315
|
-
const retVal = await this.ValidateJWT(access_token);
|
|
316
|
-
// https://jestjs.io/docs/expect#tomatchobjectobject
|
|
317
|
-
const desiredJWT = {
|
|
318
|
-
scope: 'offline_access session.read session.update',
|
|
319
|
-
iss: 'https://stsmda.com.au/stsauth/',
|
|
320
|
-
aud: 'https://stsmda.com.au/stsauthapi/v1.0/',
|
|
321
|
-
sub: 'session'
|
|
322
|
-
};
|
|
323
|
-
|
|
324
|
-
expect(retVal).toMatchObject(desiredJWT);
|
|
325
|
-
}
|
|
326
|
-
}
|
package/types/testHelpers.d.ts
DELETED
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
import https from 'https';
|
|
3
|
-
import 'jest-date';
|
|
4
|
-
export declare class TestHelper {
|
|
5
|
-
#private;
|
|
6
|
-
constructor();
|
|
7
|
-
StartNetwork: () => Promise<void>;
|
|
8
|
-
StopNetwork: () => Promise<void>;
|
|
9
|
-
get network(): any;
|
|
10
|
-
get authPort(): string;
|
|
11
|
-
get authHost(): string;
|
|
12
|
-
get authEndpoint(): string;
|
|
13
|
-
get getHttpsAgent(): https.Agent;
|
|
14
|
-
CreateRandomString: () => string;
|
|
15
|
-
Login: (username: string, password: string) => Promise<import("axios").AxiosResponse<any, any>>;
|
|
16
|
-
GetAuthServerAPITokenFromServer: () => Promise<string>;
|
|
17
|
-
ValidateJWT: (token: string) => Promise<string>;
|
|
18
|
-
StartDatabase: () => Promise<void>;
|
|
19
|
-
StopDatabase: () => Promise<void>;
|
|
20
|
-
InitializeDatabase: () => Promise<void>;
|
|
21
|
-
StartAuthService: () => Promise<void>;
|
|
22
|
-
StopAuthService: () => Promise<void>;
|
|
23
|
-
TestLoginAndVerify: () => Promise<void>;
|
|
24
|
-
TestValidateJWT: () => Promise<void>;
|
|
25
|
-
}
|
|
26
|
-
//# sourceMappingURL=testHelpers.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"testHelpers.d.ts","sourceRoot":"","sources":["../src/testHelpers.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,WAAW,CAAA;AAalB,qBAAa,UAAU;;;IAqCnB,YAAY,sBAEX;IAED,WAAW,sBAEV;IAED,IAAI,OAAO,QAEV;IAED,IAAI,QAAQ,WAEX;IAED,IAAI,QAAQ,WAEX;IAED,IAAI,YAAY,WAEf;IAED,IAAI,aAAa,gBAEhB;IAED,kBAAkB,eAMjB;IAED,KAAK,aAAoB,MAAM,YAAY,MAAM,sDAuDhD;IAED,+BAA+B,QAAa,QAAQ,MAAM,CAAC,CAI1D;IAED,WAAW,UAAiB,MAAM,KAAG,QAAQ,MAAM,CAAC,CAEnD;IAED,aAAa,sBA0BZ;IAED,YAAY,sBAQX;IAID,kBAAkB,sBAyBjB;IAED,gBAAgB,sBAgCf;IAED,eAAe,sBAKd;IAED,kBAAkB,sBAqCjB;IAED,eAAe,sBAgBd;CACJ"}
|