@nsshunt/stsdatamanagement 1.17.156 → 1.17.158
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/cliworker.js +7 -1
- package/dist/cliworker.js.map +1 -1
- package/dist/databaseutils.js +41 -19
- package/dist/databaseutils.js.map +1 -1
- package/dist/datagenerator.js +28 -15
- package/dist/datagenerator.js.map +1 -1
- package/dist/dbbuild.test.js +12 -1
- package/dist/dbbuild.test.js.map +1 -1
- package/dist/pgaccesslayer.js +59 -91
- package/dist/pgaccesslayer.js.map +1 -1
- package/dist/pgpoolmanager.js +33 -30
- package/dist/pgpoolmanager.js.map +1 -1
- package/dist/pgutils.js +15 -10
- package/dist/pgutils.js.map +1 -1
- package/dist/setupdb.js +17 -3
- package/dist/setupdb.js.map +1 -1
- package/package.json +7 -5
- package/types/cliworker.d.ts +2 -1
- package/types/cliworker.d.ts.map +1 -1
- package/types/databaseutils.d.ts +6 -1
- package/types/databaseutils.d.ts.map +1 -1
- package/types/datagenerator.d.ts +7 -1
- package/types/datagenerator.d.ts.map +1 -1
- package/types/pgaccesslayer.d.ts +6 -2
- package/types/pgaccesslayer.d.ts.map +1 -1
- package/types/pgpoolmanager.d.ts +3 -1
- package/types/pgpoolmanager.d.ts.map +1 -1
- package/types/pgutils.d.ts +4 -3
- package/types/pgutils.d.ts.map +1 -1
- package/types/setupdb.d.ts.map +1 -1
package/dist/cliworker.js
CHANGED
|
@@ -34,7 +34,13 @@ class CliWorker {
|
|
|
34
34
|
Run = async () => {
|
|
35
35
|
let datamax = this.#options.datamax;
|
|
36
36
|
let count = this.#options.start;
|
|
37
|
-
const accesslayer = new pgaccesslayer_1.PGAccessLayer(
|
|
37
|
+
const accesslayer = new pgaccesslayer_1.PGAccessLayer({
|
|
38
|
+
poolManager: new pgpoolmanager_1.PGPoolManager({
|
|
39
|
+
usedefaultdb: false,
|
|
40
|
+
logger: this.#options.logger
|
|
41
|
+
}),
|
|
42
|
+
logger: this.#options.logger
|
|
43
|
+
});
|
|
38
44
|
if (datamax > 0) {
|
|
39
45
|
datamax = (datamax <= this.#options.datamin) ? this.#options.datamin + 1 : datamax;
|
|
40
46
|
}
|
package/dist/cliworker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cliworker.js","sourceRoot":"","sources":["../src/cliworker.ts"],"names":[],"mappings":";AAAA,6FAA6F;AAC7F,+BAA+B;;;;;;AAE/B,mDAAmD;AACnD,oDAA4B;AAE5B,mDAA+C;AAC/C,mDAA+C;AAI/C;;;;;EAKE;AAEF,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,cAAc,GAAG,QAAQ,CAAC;AAChC,MAAM,aAAa,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"cliworker.js","sourceRoot":"","sources":["../src/cliworker.ts"],"names":[],"mappings":"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"}
|
package/dist/databaseutils.js
CHANGED
|
@@ -10,12 +10,26 @@ const pgpoolmanager_1 = require("./pgpoolmanager");
|
|
|
10
10
|
const pgaccesslayer_1 = require("./pgaccesslayer");
|
|
11
11
|
const pgutils_1 = require("./pgutils");
|
|
12
12
|
const datagenerator_1 = require("./datagenerator");
|
|
13
|
-
const debug_1 = __importDefault(require("debug"));
|
|
14
|
-
const debug = (0, debug_1.default)(`proc:${process.pid}:DatabaseUtils`);
|
|
15
13
|
class DatabaseUtils {
|
|
14
|
+
#options;
|
|
16
15
|
#accessLayer;
|
|
17
|
-
constructor(
|
|
18
|
-
this.#
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.#options = options;
|
|
18
|
+
if (this.#options.accessLayer) {
|
|
19
|
+
this.#accessLayer = this.#options.accessLayer;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
23
|
+
#LogInfoMessage(message) {
|
|
24
|
+
this.#options.logger.info(message);
|
|
25
|
+
}
|
|
26
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
|
+
#LogErrorMessage(message) {
|
|
28
|
+
this.#options.logger.error(message);
|
|
29
|
+
}
|
|
30
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
31
|
+
#LogDebugMessage(message) {
|
|
32
|
+
this.#options.logger.debug(message);
|
|
19
33
|
}
|
|
20
34
|
// options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
|
|
21
35
|
// user: { name: <string>, password: <string>, email: <string> } }
|
|
@@ -23,38 +37,46 @@ class DatabaseUtils {
|
|
|
23
37
|
const fname = 'CreateDatabase';
|
|
24
38
|
const { iterations, workerScriptFolder } = options;
|
|
25
39
|
const builddbscript = `${options.databaseScriptFolder}/builddb.sql`;
|
|
26
|
-
|
|
40
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`Database Build Script: [${builddbscript}]`));
|
|
27
41
|
let localAccesslayer = null;
|
|
28
42
|
try {
|
|
29
43
|
try {
|
|
30
|
-
|
|
31
|
-
await pgutils_1.PGUtils.dropdatabase();
|
|
44
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`Dropping database.`));
|
|
45
|
+
await pgutils_1.PGUtils.dropdatabase(this.#options.logger);
|
|
32
46
|
}
|
|
33
47
|
catch (error) {
|
|
34
|
-
|
|
48
|
+
this.#LogErrorMessage(`[${fname}]: Could not drop database: ${error}`);
|
|
35
49
|
// Do not re-throw. If there is no initial database, this will throw an error, ignore this.
|
|
36
50
|
}
|
|
37
51
|
// Create a new empty database
|
|
38
|
-
|
|
39
|
-
await pgutils_1.PGUtils.createdatabase();
|
|
40
|
-
localAccesslayer = new pgaccesslayer_1.PGAccessLayer(
|
|
52
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`Creating new empty database.`));
|
|
53
|
+
await pgutils_1.PGUtils.createdatabase(this.#options.logger);
|
|
54
|
+
localAccesslayer = new pgaccesslayer_1.PGAccessLayer({
|
|
55
|
+
poolManager: new pgpoolmanager_1.PGPoolManager({
|
|
56
|
+
usedefaultdb: false,
|
|
57
|
+
logger: this.#options.logger
|
|
58
|
+
}),
|
|
59
|
+
logger: this.#options.logger
|
|
60
|
+
});
|
|
41
61
|
// Build the database assets (tables, functions, etc.)
|
|
42
|
-
|
|
62
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`Building database assets (tables, functions, etc.).`));
|
|
43
63
|
await localAccesslayer.executedbscript(builddbscript);
|
|
44
64
|
//@@ make optional or move
|
|
45
65
|
if (typeof iterations !== 'undefined') {
|
|
46
66
|
// Add new faker entries
|
|
47
|
-
|
|
48
|
-
const dg = new datagenerator_1.DataGenerator(
|
|
67
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`Adding test data.`));
|
|
68
|
+
const dg = new datagenerator_1.DataGenerator({
|
|
69
|
+
accessLayer: localAccesslayer,
|
|
70
|
+
logger: this.#options.logger,
|
|
71
|
+
workerScriptFolder
|
|
72
|
+
});
|
|
49
73
|
await dg.RunAddFakerBulkInsert(options);
|
|
50
74
|
}
|
|
51
|
-
|
|
52
|
-
debug(chalk_1.default.green(`Database successfully initiailized.`));
|
|
53
|
-
console.log(chalk_1.default.green(`Database successfully initiailized.`));
|
|
75
|
+
this.#LogInfoMessage(chalk_1.default.green(`Database successfully initiailized.`));
|
|
54
76
|
}
|
|
55
77
|
catch (error) {
|
|
56
|
-
|
|
57
|
-
|
|
78
|
+
this.#LogErrorMessage(`[${fname}]: Could not create fresh database: ${error}`);
|
|
79
|
+
this.#LogDebugMessage(`[${fname}]: Could not create fresh database: ${error}`);
|
|
58
80
|
}
|
|
59
81
|
finally {
|
|
60
82
|
if (localAccesslayer !== null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAE7B,kDAA0B;AAE1B,mDAA+C;AAC/C,mDAA+C;AAC/C,uCAAmC;AACnC,mDAA+C;
|
|
1
|
+
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":"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"}
|
package/dist/datagenerator.js
CHANGED
|
@@ -20,16 +20,28 @@ const prompts_1 = __importDefault(require("prompts"));
|
|
|
20
20
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
21
21
|
const userid = 'dbinitrunner';
|
|
22
22
|
const resrandomuserprefix = 'RESRU-';
|
|
23
|
-
const debug_1 = __importDefault(require("debug"));
|
|
24
|
-
const debug = (0, debug_1.default)(`proc:${process.pid}:DataGenerator`);
|
|
25
23
|
const cliworker_1 = require("./cliworker");
|
|
26
24
|
class DataGenerator {
|
|
25
|
+
#options;
|
|
27
26
|
#accessLayer;
|
|
28
27
|
#useMultiBar = false;
|
|
29
28
|
#workerScriptFolder;
|
|
30
|
-
constructor(
|
|
31
|
-
this.#
|
|
32
|
-
this.#
|
|
29
|
+
constructor(options) {
|
|
30
|
+
this.#options = options;
|
|
31
|
+
this.#accessLayer = this.#options.accessLayer;
|
|
32
|
+
this.#workerScriptFolder = this.#options.workerScriptFolder;
|
|
33
|
+
}
|
|
34
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
35
|
+
#LogDebugMessage(message) {
|
|
36
|
+
this.#options.logger.debug(message);
|
|
37
|
+
}
|
|
38
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
39
|
+
#LogInfoMessage(message) {
|
|
40
|
+
this.#options.logger.info(message);
|
|
41
|
+
}
|
|
42
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
43
|
+
#LogErrorMessage(message) {
|
|
44
|
+
this.#options.logger.error(message);
|
|
33
45
|
}
|
|
34
46
|
//@@ JSON to come from config file if bound to a K6 script - so each K6 script should also have a prompts JSON for configuration - make generic
|
|
35
47
|
AskAddRandomUser = async () => {
|
|
@@ -77,25 +89,25 @@ class DataGenerator {
|
|
|
77
89
|
for (let i = 0; i < iterations; i++) {
|
|
78
90
|
const pp = async () => {
|
|
79
91
|
const retVal = await axios_1.default.get(`https://randomuser.me/api/?results=${blocksize}&nat=au,nz,us,gb`).catch(error => {
|
|
80
|
-
|
|
92
|
+
this.#LogErrorMessage(`Error in randomuser get: ${error}`);
|
|
81
93
|
if (error.response) {
|
|
82
94
|
// Request made and server responded
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
95
|
+
this.#LogErrorMessage("DATA:" + error.response.data);
|
|
96
|
+
this.#LogErrorMessage("STATUS: " + error.response.status);
|
|
97
|
+
this.#LogErrorMessage("HEADERS: " + error.response.headers);
|
|
86
98
|
}
|
|
87
99
|
else if (error.request) {
|
|
88
100
|
// The request was made but no response was received
|
|
89
|
-
|
|
101
|
+
this.#LogErrorMessage("REQUEST: " + error.request);
|
|
90
102
|
}
|
|
91
103
|
else {
|
|
92
104
|
// Something happened in setting up the request that triggered an Error
|
|
93
|
-
|
|
105
|
+
this.#LogErrorMessage(`ERROR: [${error}]`);
|
|
94
106
|
}
|
|
95
107
|
return null;
|
|
96
108
|
});
|
|
97
109
|
if (retVal === null) {
|
|
98
|
-
|
|
110
|
+
this.#LogErrorMessage('Skipping this test as we cannot control the randomuser service.');
|
|
99
111
|
return;
|
|
100
112
|
}
|
|
101
113
|
const randomusers = retVal.data.results;
|
|
@@ -209,7 +221,7 @@ class DataGenerator {
|
|
|
209
221
|
bar = multibar.create(iterations, 0);
|
|
210
222
|
}
|
|
211
223
|
if (typeof bar === 'undefined') {
|
|
212
|
-
|
|
224
|
+
this.#LogDebugMessage(chalk_1.default.yellow(`No TTY available for multi-bar progress.`));
|
|
213
225
|
bar = null;
|
|
214
226
|
}
|
|
215
227
|
bars.push(bar);
|
|
@@ -230,7 +242,7 @@ class DataGenerator {
|
|
|
230
242
|
else {
|
|
231
243
|
totalIterations++;
|
|
232
244
|
if (totalIterations % 1000 === 0) {
|
|
233
|
-
|
|
245
|
+
this.#LogInfoMessage(`Iteration: [${totalIterations}] completed.`);
|
|
234
246
|
}
|
|
235
247
|
}
|
|
236
248
|
};
|
|
@@ -239,7 +251,8 @@ class DataGenerator {
|
|
|
239
251
|
iterations,
|
|
240
252
|
datamin,
|
|
241
253
|
datamax,
|
|
242
|
-
progress
|
|
254
|
+
progress,
|
|
255
|
+
logger: this.#options.logger
|
|
243
256
|
};
|
|
244
257
|
const worker = new cliworker_1.CliWorker(options);
|
|
245
258
|
return worker.Run();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":";;;;;;AAAA,2FAA2F;AAC3F,0EAA0E;AAC1E,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAC3B,0EAAkC,CAAC,gCAAgC;AAEnE,+BAAoC;AAEpC,kDAA0B;AAE1B,gDAAwB;AACxB,8DAA8D;AAC7D,MAAc,CAAC,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;AAElD,kDAA0B;AAC1B,gEAAuC;AAEvC,sDAA8B;AAE9B,
|
|
1
|
+
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":"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"}
|
package/dist/dbbuild.test.js
CHANGED
|
@@ -12,10 +12,19 @@ let goptions = (0, stsconfig_1.$Options)();
|
|
|
12
12
|
const stsutils_1 = require("@nsshunt/stsutils");
|
|
13
13
|
const databaseutils_1 = require("./databaseutils");
|
|
14
14
|
const testcontainers_1 = require("testcontainers");
|
|
15
|
+
const winston_1 = __importDefault(require("winston"));
|
|
15
16
|
(0, vitest_1.describe)("Test Auth Controller", () => {
|
|
16
17
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
17
18
|
let container;
|
|
18
19
|
(0, vitest_1.beforeAll)(async () => {
|
|
20
|
+
winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple());
|
|
21
|
+
const logger = winston_1.default.createLogger({
|
|
22
|
+
level: 'silly',
|
|
23
|
+
format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.simple()),
|
|
24
|
+
transports: [
|
|
25
|
+
new winston_1.default.transports.Console(),
|
|
26
|
+
]
|
|
27
|
+
});
|
|
19
28
|
container = await new testcontainers_1.GenericContainer("postgres")
|
|
20
29
|
.withExposedPorts(5432)
|
|
21
30
|
.withEnvironment({
|
|
@@ -41,7 +50,9 @@ const testcontainers_1 = require("testcontainers");
|
|
|
41
50
|
useMultiBar: false,
|
|
42
51
|
databaseScriptFolder: goptions.databasescriptfolder
|
|
43
52
|
};
|
|
44
|
-
const dbUtils = new databaseutils_1.DatabaseUtils(
|
|
53
|
+
const dbUtils = new databaseutils_1.DatabaseUtils({
|
|
54
|
+
logger
|
|
55
|
+
});
|
|
45
56
|
await dbUtils.CreateDatabase(dbOptions);
|
|
46
57
|
}, 30000);
|
|
47
58
|
(0, vitest_1.afterAll)(async () => {
|
package/dist/dbbuild.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbbuild.test.js","sourceRoot":"","sources":["../src/dbbuild.test.ts"],"names":[],"mappings":";;;;;AAAA,mCAAqE;AAErE,kDAA0B;AAE1B,+CAA+C;AAC/C,6BAA6B;AAE7B,kDAA4D;AAC5D,IAAI,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAEzB,gDAA6C;AAE7C,mDAA+C;AAE/C,mDAAkD;AAElD,IAAA,iBAAQ,EAAC,sBAAsB,EAAE,GAAG,EAAE;IAElC,8DAA8D;IAC9D,IAAI,SAAc,CAAC;IAEnB,IAAA,kBAAS,EAAC,KAAK,IAAI,EAAE;QAEjB,SAAS,GAAG,MAAM,IAAI,iCAAgB,CAAC,UAAU,CAAC;aAC7C,gBAAgB,CAAC,IAAI,CAAC;aACtB,eAAe,CAAC;YACb,iBAAiB,EAAE,UAAU;YAC7B,0BAA0B;SAC7B,CAAC;aACD,KAAK,EAAE,CAAC;QAEb,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAEjC,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,GAAG,IAAI,IAAI,QAAQ,EAAE,CAAC;QAE5C,IAAA,yBAAa,GAAE,CAAC;QAChB,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;QAErB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,cAAc,QAAQ,GAAG,CAAC,CAAC,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,sBAAsB,QAAQ,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,qCAAqC,QAAQ,CAAC,+BAAgC,GAAG,CAAC,CAAC,CAAC;QAE7G,MAAM,SAAS,GAAG;YACd,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,CAAC;YACf,YAAY,EAAE,IAAI;YAClB,kBAAkB,EAAE,QAAQ,EAAE,IAAI;YAClC,WAAW,EAAE,KAAK;YAClB,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;SACtD,CAAA;QAED,MAAM,OAAO,GAAG,IAAI,6BAAa,
|
|
1
|
+
{"version":3,"file":"dbbuild.test.js","sourceRoot":"","sources":["../src/dbbuild.test.ts"],"names":[],"mappings":"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"}
|