@nsshunt/stsdatamanagement 1.18.200 → 1.18.202
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 +20 -14
- package/dist/cliworker.js.map +1 -1
- package/dist/commonTypes.js.map +1 -1
- package/dist/dalUserManager.js +19 -19
- package/dist/dalUserManager.js.map +1 -1
- package/dist/dalUserManager.test.js +34 -34
- package/dist/dalUserManager.test.js.map +1 -1
- package/dist/databaseutils.js +11 -11
- package/dist/databaseutils.js.map +1 -1
- package/dist/datagenerator.js +77 -67
- package/dist/datagenerator.js.map +1 -1
- package/dist/dbAccessLayerManager.js +2 -2
- package/dist/dbAccessLayerManager.js.map +1 -1
- package/dist/dbaccess.js +7 -7
- package/dist/dbaccess.js.map +1 -1
- package/dist/dbbuild.test.js +41 -46
- package/dist/dbbuild.test.js.map +1 -1
- package/dist/dberrors.js +5 -5
- package/dist/dberrors.js.map +1 -1
- package/dist/pcaccesslayer-entity.test.js +189 -167
- package/dist/pcaccesslayer-entity.test.js.map +1 -1
- package/dist/pcaccesslayer.test.js +186 -164
- package/dist/pcaccesslayer.test.js.map +1 -1
- package/dist/pgaccesslayer-old.js +514 -264
- package/dist/pgaccesslayer-old.js.map +1 -1
- package/dist/pgpoolmanager.js +26 -22
- package/dist/pgpoolmanager.js.map +1 -1
- package/dist/pgutils.js +10 -9
- package/dist/pgutils.js.map +1 -1
- package/dist/setupdb.js +5 -7
- package/dist/setupdb.js.map +1 -1
- package/package.json +16 -15
- package/types/cliworker.d.ts +1 -1
- package/types/cliworker.d.ts.map +1 -1
- package/types/commonTypes.d.ts +3 -3
- package/types/commonTypes.d.ts.map +1 -1
- package/types/dalUserManager.d.ts +1 -1
- package/types/dalUserManager.d.ts.map +1 -1
- package/types/dalUserManager.test.d.ts.map +1 -1
- package/types/databaseutils.d.ts +2 -2
- package/types/databaseutils.d.ts.map +1 -1
- package/types/datagenerator.d.ts +3 -3
- package/types/datagenerator.d.ts.map +1 -1
- package/types/dbAccessLayerManager.d.ts +1 -1
- package/types/dbAccessLayerManager.d.ts.map +1 -1
- package/types/dbaccess.d.ts +7 -7
- package/types/dbaccess.d.ts.map +1 -1
- package/types/dberrors.d.ts +1 -1
- package/types/dberrors.d.ts.map +1 -1
- package/types/pgaccesslayer-old.d.ts +4 -4
- package/types/pgaccesslayer-old.d.ts.map +1 -1
- package/types/pgpoolmanager.d.ts +4 -4
- package/types/pgpoolmanager.d.ts.map +1 -1
- package/types/pgutils.d.ts +1 -1
- package/types/pgutils.d.ts.map +1 -1
- package/types/setupdb.d.ts +1 -1
- package/types/setupdb.d.ts.map +1 -1
package/dist/cliworker.js
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
// https://stackoverflow.com/questions/56356655/structuring-a-typescript-project-with-workers
|
|
2
2
|
//let faker = require('faker');
|
|
3
3
|
//import { parentPort } from 'node:worker_threads';
|
|
4
|
-
import crypto from
|
|
5
|
-
import { PGPoolManager } from
|
|
6
|
-
import { PGAccessLayer } from
|
|
4
|
+
import crypto from "crypto";
|
|
5
|
+
import { PGPoolManager } from "./pgpoolmanager.js";
|
|
6
|
+
import { PGAccessLayer } from "./pgaccesslayer-old.js";
|
|
7
7
|
/*
|
|
8
8
|
const { parentPort, workerData } = require('node:worker_threads');
|
|
9
9
|
//require('node:crypto');
|
|
10
10
|
const { PGPoolManager } = require('./pgpoolmanager')
|
|
11
11
|
const { PGAccessLayer } = require('./pgaccesslayer')
|
|
12
12
|
*/
|
|
13
|
-
const userid =
|
|
14
|
-
const resfakerprefix =
|
|
15
|
-
const rescopyprefix =
|
|
13
|
+
const userid = "dbinitrunner";
|
|
14
|
+
const resfakerprefix = "RESFK-";
|
|
15
|
+
const rescopyprefix = "RESCP-";
|
|
16
16
|
export class CliWorker {
|
|
17
17
|
#options;
|
|
18
18
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -31,25 +31,28 @@ export class CliWorker {
|
|
|
31
31
|
const accesslayer = new PGAccessLayer({
|
|
32
32
|
poolManager: new PGPoolManager({
|
|
33
33
|
usedefaultdb: false,
|
|
34
|
-
logger: this.#options.logger
|
|
34
|
+
logger: this.#options.logger,
|
|
35
35
|
}),
|
|
36
|
-
logger: this.#options.logger
|
|
36
|
+
logger: this.#options.logger,
|
|
37
37
|
});
|
|
38
38
|
if (datamax > 0) {
|
|
39
|
-
datamax =
|
|
39
|
+
datamax =
|
|
40
|
+
datamax <= this.#options.datamin
|
|
41
|
+
? this.#options.datamin + 1
|
|
42
|
+
: datamax;
|
|
40
43
|
}
|
|
41
44
|
for (let i = 0; i < this.#options.iterations; i++) {
|
|
42
45
|
//let randcard = faker.helpers.createCard();
|
|
43
46
|
const coreRecordSizeRange = crypto.randomInt(128, 192);
|
|
44
47
|
//const coreRecordSizeRange = 128;
|
|
45
48
|
const coreRecordSize = Math.floor(coreRecordSizeRange / 2);
|
|
46
|
-
let randcard = crypto.randomBytes(coreRecordSize).toString(
|
|
49
|
+
let randcard = crypto.randomBytes(coreRecordSize).toString("hex");
|
|
47
50
|
//let randcard = 'helloworld'
|
|
48
51
|
if (datamax > 0) {
|
|
49
52
|
const n = crypto.randomInt(this.#options.datamin, datamax);
|
|
50
53
|
//const n = 1024;
|
|
51
54
|
const n2 = Math.floor(n / 2);
|
|
52
|
-
const rndid = crypto.randomBytes(n2).toString(
|
|
55
|
+
const rndid = crypto.randomBytes(n2).toString("hex");
|
|
53
56
|
//const rndid = 'helloworld'
|
|
54
57
|
randcard += rndid;
|
|
55
58
|
}
|
|
@@ -57,7 +60,7 @@ export class CliWorker {
|
|
|
57
60
|
//const randcardstring = JSON.stringify(randcard);
|
|
58
61
|
this.totalDataSize += randcardstring.length;
|
|
59
62
|
this.avgDataSize = Math.floor(this.totalDataSize / (i + 1));
|
|
60
|
-
const pn = (
|
|
63
|
+
const pn = ("" + count++).padStart(10, "0");
|
|
61
64
|
const id = resfakerprefix + pn;
|
|
62
65
|
const cpid = rescopyprefix + pn;
|
|
63
66
|
const datanow = new Date().toISOString();
|
|
@@ -70,13 +73,16 @@ export class CliWorker {
|
|
|
70
73
|
validfrom: datanow,
|
|
71
74
|
validto: null,
|
|
72
75
|
dbaction: 1,
|
|
73
|
-
dbactionuser: userid
|
|
76
|
+
dbactionuser: userid,
|
|
74
77
|
};
|
|
75
78
|
this.fakerdataarray.push(fakerdata);
|
|
76
79
|
const fakerdata2 = Object.assign({}, fakerdata);
|
|
77
80
|
fakerdata2.resname = cpid;
|
|
78
81
|
this.fakerdataarray2.push(fakerdata2);
|
|
79
|
-
this.#options.progress({
|
|
82
|
+
this.#options.progress({
|
|
83
|
+
totalDataSize: this.totalDataSize,
|
|
84
|
+
avgDataSize: this.avgDataSize,
|
|
85
|
+
});
|
|
80
86
|
if ((i + 1) % this.copybatchsize === 0) {
|
|
81
87
|
await accesslayer.bulkInsert(this.fakerdataarray);
|
|
82
88
|
await accesslayer.bulkInsert(this.fakerdataarray2);
|
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,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"cliworker.js","sourceRoot":"","sources":["../src/cliworker.ts"],"names":[],"mappings":"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"}
|
package/dist/commonTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commonTypes.js","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,cAAc,GAAG,YAAY,CAAC;AAC3C,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AAqBtC,MAAM,CAAN,IAAY,WA8BX;AA9BD,WAAY,WAAW;IACnB,8CAA+B,CAAA;IAC/B,0CAA2B,CAAA;IAC3B,oDAAqC,CAAA;IACrC,gDAAiC,CAAA;IAEjC,4CAA6B,CAAA;IAC7B,kDAAmC,CAAA;IACnC,0CAA2B,CAAA;IAC3B,gDAAiC,CAAA;IAEjC,gDAAiC,CAAA;IACjC,0CAA2B,CAAA;IAC3B,gDAAiC,CAAA;IACjC,8CAA+B,CAAA;IAC/B,gDAAiC,CAAA;IAEjC,kDAAmC,CAAA;IACnC,gDAAiC,CAAA;IACjC,kDAAmC,CAAA;IAEnC,4CAA6B,CAAA;IAC7B,sCAAuB,CAAA;IACvB,4CAA6B,CAAA;IAC7B,0CAA2B,CAAA;IAC3B,4CAA6B,CAAA;IAE7B,gDAAiC,CAAA;IACjC,8CAA+B,CAAA;IAC/B,gDAAiC,CAAA;AACrC,CAAC,EA9BW,WAAW,KAAX,WAAW,QA8BtB;AAmED,MAAM,CAAN,IAAY,eAcX;AAdD,WAAY,eAAe;IACvB,4CAAyB,CAAA;IACzB,kCAAe,CAAA;IACf,kCAAe,CAAA;IACf,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,kCAAe,CAAA;IACf,8CAA2B,CAAA;IAC3B,8DAA2C,CAAA;IAC3C,oDAAiC,CAAA;IACjC,kDAA+B,CAAA;IAC/B,kCAAe,CAAA;IACf,gEAA6C,CAAA;IAC7C,kEAA+C,CAAA;AACnD,CAAC,EAdW,eAAe,KAAf,eAAe,QAc1B;AAWD,MAAM,CAAN,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC5B,+DAAuC,CAAA;AAC3C,CAAC,EAFW,oBAAoB,KAApB,oBAAoB,QAE/B;AAED,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,oCAAkB,CAAA;IAClB,mCAAiB,CAAA;IACjB,2CAAyB,CAAA;AAC7B,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB"}
|
package/dist/dalUserManager.js
CHANGED
|
@@ -1,32 +1,32 @@
|
|
|
1
|
-
import { SYSTEM_USER_ID } from
|
|
2
|
-
import { DBAccessLayerManager } from
|
|
1
|
+
import { SYSTEM_USER_ID, } from "./commonTypes.js";
|
|
2
|
+
import { DBAccessLayerManager } from "./dbAccessLayerManager.js";
|
|
3
3
|
export class DALUserManager {
|
|
4
4
|
#accessLayer;
|
|
5
5
|
#userResource;
|
|
6
6
|
constructor(options) {
|
|
7
7
|
this.#accessLayer = new DBAccessLayerManager().CreateAccessLayer({
|
|
8
8
|
accessLayerType: options.accessLayerType,
|
|
9
|
-
accessLayerOptions: options.accessLayerOptions
|
|
9
|
+
accessLayerOptions: options.accessLayerOptions,
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
#GetUserResource = async () => {
|
|
13
13
|
if (!this.#userResource) {
|
|
14
14
|
this.#userResource = (await this.#accessLayer.GetResource({
|
|
15
15
|
filters: {
|
|
16
|
-
entname:
|
|
17
|
-
}
|
|
16
|
+
entname: "stsuser",
|
|
17
|
+
},
|
|
18
18
|
})).detail;
|
|
19
19
|
if (!this.#userResource) {
|
|
20
20
|
const userResourceType = {
|
|
21
|
-
name:
|
|
22
|
-
description:
|
|
23
|
-
notes:
|
|
21
|
+
name: "stsuser",
|
|
22
|
+
description: "stsuser description",
|
|
23
|
+
notes: "stsuser notes",
|
|
24
24
|
};
|
|
25
25
|
this.#userResource = (await this.#accessLayer.CreateResource({
|
|
26
26
|
filters: {
|
|
27
|
-
dbactionuser:
|
|
28
|
-
resname:
|
|
29
|
-
}
|
|
27
|
+
dbactionuser: "jesttest",
|
|
28
|
+
resname: "stsuser",
|
|
29
|
+
},
|
|
30
30
|
}, userResourceType)).detail;
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -37,8 +37,8 @@ export class DALUserManager {
|
|
|
37
37
|
const retVal = await this.#accessLayer.GetEntity({
|
|
38
38
|
filters: {
|
|
39
39
|
resname: userResource.resname,
|
|
40
|
-
entname: user.name
|
|
41
|
-
}
|
|
40
|
+
entname: user.name,
|
|
41
|
+
},
|
|
42
42
|
});
|
|
43
43
|
if (retVal.error) {
|
|
44
44
|
if (ecb) {
|
|
@@ -56,8 +56,8 @@ export class DALUserManager {
|
|
|
56
56
|
filters: {
|
|
57
57
|
dbactionuser: SYSTEM_USER_ID,
|
|
58
58
|
resname: userResource.resname,
|
|
59
|
-
entname: user.name
|
|
60
|
-
}
|
|
59
|
+
entname: user.name,
|
|
60
|
+
},
|
|
61
61
|
}, user);
|
|
62
62
|
if (retVal.error) {
|
|
63
63
|
if (ecb) {
|
|
@@ -75,8 +75,8 @@ export class DALUserManager {
|
|
|
75
75
|
filters: {
|
|
76
76
|
dbactionuser: SYSTEM_USER_ID,
|
|
77
77
|
resname: userResource.resname,
|
|
78
|
-
entname: user.name
|
|
79
|
-
}
|
|
78
|
+
entname: user.name,
|
|
79
|
+
},
|
|
80
80
|
}, user);
|
|
81
81
|
if (retVal.error) {
|
|
82
82
|
if (ecb) {
|
|
@@ -94,8 +94,8 @@ export class DALUserManager {
|
|
|
94
94
|
filters: {
|
|
95
95
|
dbactionuser: SYSTEM_USER_ID,
|
|
96
96
|
resname: userResource.resname,
|
|
97
|
-
entname: user.name
|
|
98
|
-
}
|
|
97
|
+
entname: user.name,
|
|
98
|
+
},
|
|
99
99
|
});
|
|
100
100
|
if (retVal.error) {
|
|
101
101
|
if (ecb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dalUserManager.js","sourceRoot":"","sources":["../src/dalUserManager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dalUserManager.js","sourceRoot":"","sources":["../src/dalUserManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,cAAc,GACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,OAAO,cAAc;IACvB,YAAY,CAAiB;IAC7B,aAAa,CAAyC;IAEtD,YAAY,OAAqC;QAC7C,IAAI,CAAC,YAAY,GAAG,IAAI,oBAAoB,EAAE,CAAC,iBAAiB,CAAC;YAC7D,eAAe,EAAE,OAAO,CAAC,eAAe;YACxC,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SACjD,CAAC,CAAC;IACP,CAAC;IAED,gBAAgB,GAAG,KAAK,IAAyC,EAAE;QAC/D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACtB,IAAI,CAAC,aAAa,GAAG,CACjB,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAgB;gBAC/C,OAAO,EAAE;oBACL,OAAO,EAAE,SAAS;iBACrB;aACJ,CAAC,CACL,CAAC,MAAoC,CAAC;YAEvC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACtB,MAAM,gBAAgB,GAAkB;oBACpC,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,qBAAqB;oBAClC,KAAK,EAAE,eAAe;iBACzB,CAAC;gBACF,IAAI,CAAC,aAAa,GAAG,CACjB,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAClC;oBACI,OAAO,EAAE;wBACL,YAAY,EAAE,UAAU;wBACxB,OAAO,EAAE,SAAS;qBACrB;iBACJ,EACD,gBAAgB,CACnB,CACJ,CAAC,MAAoC,CAAC;YAC3C,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC,CAAC;IAEF,KAAK,CAAC,OAAO,CACT,IAAoB,EACpB,GAA4B;QAE5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,SAAS,CAAQ;YACpD,OAAO,EAAE;gBACL,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;aACrB;SACJ,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,OAAQ,MAAM,CAAC,MAA2B,CAAC,QAAQ,CAAC;QACxD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,IAAW,EACX,GAA4B;QAE5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAC/C;YACI,OAAO,EAAE;gBACL,YAAY,EAAE,cAAc;gBAC5B,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;aACrB;SACJ,EACD,IAAI,CACP,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,OAAQ,MAAM,CAAC,MAA2B,CAAC,QAAQ,CAAC;QACxD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,IAAW,EACX,GAA4B;QAE5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAC/C;YACI,OAAO,EAAE;gBACL,YAAY,EAAE,cAAc;gBAC5B,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;aACrB;SACJ,EACD,IAAI,CACP,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,OAAQ,MAAM,CAAC,MAA2B,CAAC,QAAQ,CAAC;QACxD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACZ,IAAoB,EACpB,GAA4B;QAE5B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAQ;YACvD,OAAO,EAAE;gBACL,YAAY,EAAE,cAAc;gBAC5B,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,OAAO,EAAE,IAAI,CAAC,IAAI;aACrB;SACJ,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,GAAG,EAAE,CAAC;gBACN,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;aAAM,CAAC;YACJ,OAAQ,MAAM,CAAC,MAA2B,CAAC,QAAQ,CAAC;QACxD,CAAC;IACL,CAAC;CACJ"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/* eslint @typescript-eslint/no-explicit-any: 0 */ // --> OFF
|
|
2
|
-
import { beforeAll, afterAll, test, describe, expect } from
|
|
3
|
-
import chalk from
|
|
4
|
-
import { goptions, $ResetOptions } from
|
|
5
|
-
import { defaultLogger, Sleep } from
|
|
6
|
-
import { DatabaseUtils } from
|
|
2
|
+
import { beforeAll, afterAll, test, describe, expect } from "vitest";
|
|
3
|
+
import chalk from "chalk";
|
|
4
|
+
import { goptions, $ResetOptions } from "@nsshunt/stsconfig";
|
|
5
|
+
import { defaultLogger, Sleep } from "@nsshunt/stsutils";
|
|
6
|
+
import { DatabaseUtils } from "./databaseutils.js";
|
|
7
7
|
import { GenericContainer } from "testcontainers";
|
|
8
|
-
import winston from
|
|
9
|
-
import { DBAccessLayerManager } from
|
|
10
|
-
import { accessLayerType } from
|
|
11
|
-
import { DALUserManager } from
|
|
8
|
+
import winston from "winston";
|
|
9
|
+
import { DBAccessLayerManager } from "./dbAccessLayerManager.js";
|
|
10
|
+
import { accessLayerType, } from "./commonTypes.js";
|
|
11
|
+
import { DALUserManager } from "./dalUserManager.js";
|
|
12
12
|
export var eResouceStatus;
|
|
13
13
|
(function (eResouceStatus) {
|
|
14
14
|
eResouceStatus["delete"] = "DELETED";
|
|
@@ -21,11 +21,9 @@ describe("Test pgaccesslayer", () => {
|
|
|
21
21
|
beforeAll(async () => {
|
|
22
22
|
winston.format.combine(winston.format.colorize(), winston.format.simple());
|
|
23
23
|
const logger = winston.createLogger({
|
|
24
|
-
level:
|
|
24
|
+
level: "silly",
|
|
25
25
|
format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
|
|
26
|
-
transports: [
|
|
27
|
-
new winston.transports.Console(),
|
|
28
|
-
]
|
|
26
|
+
transports: [new winston.transports.Console()],
|
|
29
27
|
});
|
|
30
28
|
postgresContainer = await new GenericContainer("postgres")
|
|
31
29
|
.withExposedPorts(5432)
|
|
@@ -33,13 +31,13 @@ describe("Test pgaccesslayer", () => {
|
|
|
33
31
|
POSTGRES_PASSWORD: "postgres",
|
|
34
32
|
//UV_THREADPOOL_SIZE: "64"
|
|
35
33
|
})
|
|
36
|
-
.withCommand([
|
|
34
|
+
.withCommand(["-c", "max_connections=20"])
|
|
37
35
|
.start();
|
|
38
36
|
await Sleep(1000);
|
|
39
37
|
const postgresHttpPort = postgresContainer.getMappedPort(5432);
|
|
40
38
|
const postgresHost = postgresContainer.getHost();
|
|
41
39
|
process.env.DB_HOST = `${postgresHost}:${postgresHttpPort}`;
|
|
42
|
-
process.env.POOL_SIZE =
|
|
40
|
+
process.env.POOL_SIZE = "10";
|
|
43
41
|
$ResetOptions();
|
|
44
42
|
logger.info(chalk.green(`httpPort: [${postgresHttpPort}]`));
|
|
45
43
|
logger.info(chalk.green(`host: [${postgresHost}]`));
|
|
@@ -50,11 +48,11 @@ describe("Test pgaccesslayer", () => {
|
|
|
50
48
|
iterations: 10000,
|
|
51
49
|
minextradata: 0,
|
|
52
50
|
maxextradata: 1000,
|
|
53
|
-
workerScriptFolder:
|
|
54
|
-
useMultiBar: false
|
|
51
|
+
workerScriptFolder: "./dist", //@@
|
|
52
|
+
useMultiBar: false,
|
|
55
53
|
};
|
|
56
54
|
const dbUtils = new DatabaseUtils({
|
|
57
|
-
logger
|
|
55
|
+
logger,
|
|
58
56
|
});
|
|
59
57
|
await dbUtils.CreateDatabase(dbOptions);
|
|
60
58
|
await Sleep(1000);
|
|
@@ -63,42 +61,44 @@ describe("Test pgaccesslayer", () => {
|
|
|
63
61
|
accessLayerType: accessLayerType.postgresql,
|
|
64
62
|
accessLayerOptions: {
|
|
65
63
|
logger: defaultLogger,
|
|
66
|
-
usedefaultdb: false
|
|
67
|
-
}
|
|
64
|
+
usedefaultdb: false,
|
|
65
|
+
},
|
|
68
66
|
});
|
|
69
67
|
logger.info(chalk.green(`accessLayer:startdatabase()`));
|
|
70
68
|
await accessLayer.StartDatabase();
|
|
71
69
|
}, 120000);
|
|
72
|
-
test(
|
|
70
|
+
test("Testing STSUser", async () => {
|
|
73
71
|
expect.assertions(6);
|
|
74
72
|
const userManager = new DALUserManager({
|
|
75
73
|
accessLayerType: accessLayerType.postgresql,
|
|
76
74
|
accessLayerOptions: {
|
|
77
75
|
logger: defaultLogger,
|
|
78
|
-
usedefaultdb: false
|
|
79
|
-
}
|
|
76
|
+
usedefaultdb: false,
|
|
77
|
+
},
|
|
80
78
|
});
|
|
81
79
|
const userRecord = {
|
|
82
|
-
name:
|
|
83
|
-
description:
|
|
84
|
-
notes:
|
|
85
|
-
eMail:
|
|
86
|
-
password:
|
|
80
|
+
name: "user01",
|
|
81
|
+
description: "user01 description",
|
|
82
|
+
notes: "user01 notes",
|
|
83
|
+
eMail: "user01@stsmda.org",
|
|
84
|
+
password: "user01password",
|
|
87
85
|
groupIds: [],
|
|
88
|
-
enabled: true
|
|
86
|
+
enabled: true,
|
|
89
87
|
};
|
|
90
88
|
const newUser01 = await userManager.CreateUser(userRecord);
|
|
91
89
|
expect(newUser01).toMatchObject(userRecord);
|
|
92
|
-
userRecord.description =
|
|
90
|
+
userRecord.description = "user01 updated at " + new Date().toString();
|
|
93
91
|
const updatedUser01 = await userManager.UpdateUser(userRecord);
|
|
94
92
|
expect(updatedUser01).toMatchObject(userRecord);
|
|
95
|
-
const getUser01 = await userManager.GetUser({ name:
|
|
93
|
+
const getUser01 = await userManager.GetUser({ name: "user01" });
|
|
96
94
|
expect(getUser01).toMatchObject(userRecord);
|
|
97
|
-
const getUser02 = await userManager.GetUser({ name:
|
|
95
|
+
const getUser02 = await userManager.GetUser({ name: "user02" });
|
|
98
96
|
expect(getUser02).toBeNull();
|
|
99
|
-
const deleteUser01 = await userManager.DeleteUser({ name:
|
|
97
|
+
const deleteUser01 = await userManager.DeleteUser({ name: "user01" });
|
|
100
98
|
expect(deleteUser01).toMatchObject(userRecord);
|
|
101
|
-
const getUser01AfterDelete = await userManager.GetUser({
|
|
99
|
+
const getUser01AfterDelete = await userManager.GetUser({
|
|
100
|
+
name: "user01",
|
|
101
|
+
});
|
|
102
102
|
expect(getUser01AfterDelete).toBeNull();
|
|
103
103
|
}, 120000);
|
|
104
104
|
afterAll(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dalUserManager.test.js","sourceRoot":"","sources":["../src/dalUserManager.test.ts"],"names":[],"mappings":"AAAA,kDAAkD,
|
|
1
|
+
{"version":3,"file":"dalUserManager.test.js","sourceRoot":"","sources":["../src/dalUserManager.test.ts"],"names":[],"mappings":"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"}
|
package/dist/databaseutils.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import chalk from
|
|
2
|
-
import { PGPoolManager } from
|
|
3
|
-
import { PGAccessLayer } from
|
|
4
|
-
import { PGUtils } from
|
|
5
|
-
import { DataGenerator } from
|
|
6
|
-
import fs from
|
|
1
|
+
import chalk from "chalk";
|
|
2
|
+
import { PGPoolManager } from "./pgpoolmanager.js";
|
|
3
|
+
import { PGAccessLayer } from "./pgaccesslayer-old.js";
|
|
4
|
+
import { PGUtils } from "./pgutils.js";
|
|
5
|
+
import { DataGenerator } from "./datagenerator.js";
|
|
6
|
+
import fs from "node:fs";
|
|
7
7
|
export class DatabaseUtils {
|
|
8
8
|
#options;
|
|
9
9
|
#accessLayer;
|
|
@@ -28,7 +28,7 @@ export class DatabaseUtils {
|
|
|
28
28
|
// options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
|
|
29
29
|
// user: { name: <string>, password: <string>, email: <string> } }
|
|
30
30
|
CreateDatabase = async (options) => {
|
|
31
|
-
const fname =
|
|
31
|
+
const fname = "CreateDatabase";
|
|
32
32
|
const { iterations, workerScriptFolder } = options;
|
|
33
33
|
let builddbscript01 = `./node_modules/@nsshunt/stsdatamanagement/db-scripts/builddb-01.sql`;
|
|
34
34
|
if (!fs.existsSync(builddbscript01)) {
|
|
@@ -58,9 +58,9 @@ export class DatabaseUtils {
|
|
|
58
58
|
localAccesslayer = new PGAccessLayer({
|
|
59
59
|
poolManager: new PGPoolManager({
|
|
60
60
|
usedefaultdb: false,
|
|
61
|
-
logger: this.#options.logger
|
|
61
|
+
logger: this.#options.logger,
|
|
62
62
|
}),
|
|
63
|
-
logger: this.#options.logger
|
|
63
|
+
logger: this.#options.logger,
|
|
64
64
|
});
|
|
65
65
|
// Build the database assets (tables, functions, etc.)
|
|
66
66
|
this.#LogDebugMessage(chalk.yellow(`Building database assets (01) (tables, functions, etc.).`));
|
|
@@ -68,13 +68,13 @@ export class DatabaseUtils {
|
|
|
68
68
|
this.#LogDebugMessage(chalk.yellow(`Building database assets (02) (tables, functions, etc.).`));
|
|
69
69
|
await localAccesslayer.executedbscript(builddbscript02);
|
|
70
70
|
//@@ make optional or move
|
|
71
|
-
if (typeof iterations !==
|
|
71
|
+
if (typeof iterations !== "undefined") {
|
|
72
72
|
// Add new faker entries
|
|
73
73
|
this.#LogDebugMessage(chalk.yellow(`Adding test data.`));
|
|
74
74
|
const dg = new DataGenerator({
|
|
75
75
|
accessLayer: localAccesslayer,
|
|
76
76
|
logger: this.#options.logger,
|
|
77
|
-
workerScriptFolder
|
|
77
|
+
workerScriptFolder,
|
|
78
78
|
});
|
|
79
79
|
await dg.RunAddFakerBulkInsert(options);
|
|
80
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../src/databaseutils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD,OAAO,EAAE,MAAM,SAAS,CAAC;AAOzB,MAAM,OAAO,aAAa;IACtB,QAAQ,CAAwB;IAChC,YAAY,CAAkB;IAE9B,YAAY,OAA8B;QACtC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;QAClD,CAAC;IACL,CAAC;IAED,8DAA8D;IAC9D,eAAe,CAAC,OAAY;QACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,CAAC;IAED,8DAA8D;IAC9D,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,8DAA8D;IAC9D,gBAAgB,CAAC,OAAY;QACzB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,wFAAwF;IACxF,mEAAmE;IACnE,cAAc,GAAG,KAAK,EAAE,OAA+B,EAAE,EAAE;QACvD,MAAM,KAAK,GAAG,gBAAgB,CAAC;QAC/B,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;QAEnD,IAAI,eAAe,GAAG,qEAAqE,CAAC;QAC5F,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,eAAe,GAAG,6BAA6B,CAAC;QACpD,CAAC;QACD,6DAA6D;QAC7D,iDAAiD;QACjD,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,8BAA8B,eAAe,GAAG,CAAC,CACjE,CAAC;QAEF,IAAI,eAAe,GAAG,qEAAqE,CAAC;QAC5F,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClC,eAAe,GAAG,6BAA6B,CAAC;QACpD,CAAC;QACD,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CAAC,8BAA8B,eAAe,GAAG,CAAC,CACjE,CAAC;QAEF,IAAI,gBAAgB,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC;YACD,IAAI,CAAC;gBACD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;gBAC1D,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,gBAAgB,CACjB,IAAI,KAAK,+BAA+B,KAAK,EAAE,CAClD,CAAC;gBACF,2FAA2F;YAC/F,CAAC;YAED,8BAA8B;YAC9B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,8BAA8B,CAAC,CAAC,CAAC;YACpE,MAAM,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEnD,gBAAgB,GAAG,IAAI,aAAa,CAAC;gBACjC,WAAW,EAAE,IAAI,aAAa,CAAC;oBAC3B,YAAY,EAAE,KAAK;oBACnB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;iBAC/B,CAAC;gBACF,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;aAC/B,CAAC,CAAC;YAEH,sDAAsD;YACtD,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CACR,0DAA0D,CAC7D,CACJ,CAAC;YACF,MAAM,gBAAgB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;YAExD,IAAI,CAAC,gBAAgB,CACjB,KAAK,CAAC,MAAM,CACR,0DAA0D,CAC7D,CACJ,CAAC;YACF,MAAM,gBAAgB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;YAExD,0BAA0B;YAC1B,IAAI,OAAO,UAAU,KAAK,WAAW,EAAE,CAAC;gBACpC,wBAAwB;gBACxB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACzD,MAAM,EAAE,GAAG,IAAI,aAAa,CAAC;oBACzB,WAAW,EAAE,gBAAgB;oBAC7B,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM;oBAC5B,kBAAkB;iBACrB,CAAC,CAAC;gBACH,MAAM,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,eAAe,CAChB,KAAK,CAAC,KAAK,CAAC,qCAAqC,CAAC,CACrD,CAAC;QACN,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,gBAAgB,CACjB,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAC1D,CAAC;YACF,IAAI,CAAC,gBAAgB,CACjB,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAC1D,CAAC;QACN,CAAC;gBAAS,CAAC;YACP,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAC5B,MAAM,gBAAgB,CAAC,WAAW,EAAE,CAAC;YACzC,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEF,aAAa,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,CAAC;QAC3D,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC;CACL"}
|