@nsshunt/stsdatamanagement 1.18.199 → 1.18.201
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/pgaccesslayer.js +5 -2
- package/dist/pgaccesslayer.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 +15 -2
- 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/pgaccesslayer.d.ts +2 -0
- package/types/pgaccesslayer.d.ts.map +1 -1
- package/types/pgpoolmanager.d.ts +5 -9
- 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/datagenerator.js
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
// https://medium.com/netscape/a-guide-to-create-a-nodejs-command-line-package-c2166ad0452e
|
|
2
2
|
// https://developer.okta.com/blog/2019/06/18/command-line-app-with-nodejs
|
|
3
|
-
import { goptions } from
|
|
4
|
-
import si from
|
|
5
|
-
import { randomUUID } from
|
|
6
|
-
import chalk from
|
|
7
|
-
import path from
|
|
8
|
-
import { fileURLToPath } from
|
|
3
|
+
import { goptions } from "@nsshunt/stsconfig";
|
|
4
|
+
import si from "systeminformation"; // https://systeminformation.io/
|
|
5
|
+
import { randomUUID } from "node:crypto";
|
|
6
|
+
import chalk from "chalk";
|
|
7
|
+
import path from "node:path";
|
|
8
|
+
import { fileURLToPath } from "node:url";
|
|
9
9
|
//(global as any).appRoot = path.resolve(__dirname);
|
|
10
10
|
const __filename = fileURLToPath(import.meta.url);
|
|
11
11
|
const __dirname = path.dirname(__filename);
|
|
12
12
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
13
13
|
global.appRoot = path.resolve(__dirname);
|
|
14
|
-
import axios from
|
|
15
|
-
import cliProgress from
|
|
16
|
-
import prompts from
|
|
17
|
-
import { Sleep } from
|
|
18
|
-
const userid =
|
|
19
|
-
const resrandomuserprefix =
|
|
20
|
-
import { CliWorker } from
|
|
14
|
+
import axios from "axios";
|
|
15
|
+
import cliProgress from "cli-progress";
|
|
16
|
+
import prompts from "prompts";
|
|
17
|
+
import { Sleep } from "@nsshunt/stsutils";
|
|
18
|
+
const userid = "dbinitrunner";
|
|
19
|
+
const resrandomuserprefix = "RESRU-";
|
|
20
|
+
import { CliWorker } from "./cliworker.js";
|
|
21
21
|
export class DataGenerator {
|
|
22
22
|
#options;
|
|
23
23
|
#accessLayer;
|
|
@@ -45,40 +45,42 @@ export class DataGenerator {
|
|
|
45
45
|
AskAddRandomUser = async () => {
|
|
46
46
|
const response = await prompts([
|
|
47
47
|
{
|
|
48
|
-
type:
|
|
49
|
-
name:
|
|
50
|
-
message:
|
|
51
|
-
initial: 10
|
|
48
|
+
type: "number",
|
|
49
|
+
name: "iterations",
|
|
50
|
+
message: "Number of iterations:",
|
|
51
|
+
initial: 10,
|
|
52
52
|
},
|
|
53
53
|
{
|
|
54
|
-
type:
|
|
55
|
-
name:
|
|
56
|
-
message:
|
|
57
|
-
initial: 500
|
|
54
|
+
type: "number",
|
|
55
|
+
name: "blocksize",
|
|
56
|
+
message: "Block Size for randomuser microservice:",
|
|
57
|
+
initial: 500,
|
|
58
58
|
},
|
|
59
59
|
{
|
|
60
|
-
type:
|
|
61
|
-
name:
|
|
62
|
-
message:
|
|
63
|
-
initial: 1
|
|
60
|
+
type: "number",
|
|
61
|
+
name: "chunksize",
|
|
62
|
+
message: "Number of simultaneous async calls to the randomname service:",
|
|
63
|
+
initial: 1,
|
|
64
64
|
},
|
|
65
65
|
{
|
|
66
|
-
type:
|
|
67
|
-
name:
|
|
68
|
-
message:
|
|
69
|
-
initial: 1000
|
|
70
|
-
}
|
|
66
|
+
type: "number",
|
|
67
|
+
name: "sleepsize",
|
|
68
|
+
message: "Duration to sleep (in ms) between chunked call blocks:",
|
|
69
|
+
initial: 1000,
|
|
70
|
+
},
|
|
71
71
|
]);
|
|
72
72
|
await this.RunAddRandomUser(response.iterations, response.blocksize, response.chunksize, response.sleepsize);
|
|
73
73
|
};
|
|
74
74
|
RunAddRandomUser = async (iterations, blocksize, chunksize, sleepsize) => {
|
|
75
75
|
// create new progress bar
|
|
76
76
|
const b1 = new cliProgress.SingleBar({
|
|
77
|
-
format:
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
format: "Random User |" +
|
|
78
|
+
chalk.cyan("{bar}") +
|
|
79
|
+
"| {percentage}% || {value}/{total} Iterations || Size: {totalDataSize} || ETA: {eta_formatted}",
|
|
80
|
+
barCompleteChar: "\u2588",
|
|
81
|
+
barIncompleteChar: "\u2591",
|
|
80
82
|
hideCursor: true,
|
|
81
|
-
etaBuffer: 1000
|
|
83
|
+
etaBuffer: 1000,
|
|
82
84
|
});
|
|
83
85
|
// initialize the bar - defining payload token "speed" with the default value "N/A"
|
|
84
86
|
b1.start(iterations * blocksize, 0, {});
|
|
@@ -86,7 +88,9 @@ export class DataGenerator {
|
|
|
86
88
|
let promarray = [];
|
|
87
89
|
for (let i = 0; i < iterations; i++) {
|
|
88
90
|
const pp = async () => {
|
|
89
|
-
const retVal = await axios
|
|
91
|
+
const retVal = await axios
|
|
92
|
+
.get(`https://randomuser.me/api/?results=${blocksize}&nat=au,nz,us,gb`)
|
|
93
|
+
.catch((error) => {
|
|
90
94
|
this.#LogErrorMessage(`Error in randomuser get: ${error}`);
|
|
91
95
|
if (error.response) {
|
|
92
96
|
// Request made and server responded
|
|
@@ -105,7 +109,7 @@ export class DataGenerator {
|
|
|
105
109
|
return null;
|
|
106
110
|
});
|
|
107
111
|
if (retVal === null) {
|
|
108
|
-
this.#LogErrorMessage(
|
|
112
|
+
this.#LogErrorMessage("Skipping this test as we cannot control the randomuser service.");
|
|
109
113
|
return;
|
|
110
114
|
}
|
|
111
115
|
const randomusers = retVal.data.results;
|
|
@@ -134,37 +138,37 @@ export class DataGenerator {
|
|
|
134
138
|
AskAddFaker = async () => {
|
|
135
139
|
const response = await prompts([
|
|
136
140
|
{
|
|
137
|
-
type:
|
|
138
|
-
name:
|
|
139
|
-
message:
|
|
140
|
-
initial: -1
|
|
141
|
+
type: "number",
|
|
142
|
+
name: "start",
|
|
143
|
+
message: "Start number for iterations (use -1 to append to current sequence):",
|
|
144
|
+
initial: -1,
|
|
141
145
|
},
|
|
142
146
|
{
|
|
143
|
-
type:
|
|
144
|
-
name:
|
|
145
|
-
message:
|
|
146
|
-
initial: 10000
|
|
147
|
+
type: "number",
|
|
148
|
+
name: "iterations",
|
|
149
|
+
message: "Number of iterations:",
|
|
150
|
+
initial: 10000,
|
|
147
151
|
},
|
|
148
152
|
{
|
|
149
|
-
type:
|
|
150
|
-
name:
|
|
151
|
-
message:
|
|
152
|
-
initial: 0
|
|
153
|
+
type: "number",
|
|
154
|
+
name: "datamin",
|
|
155
|
+
message: "Minimum Extra Data Size:",
|
|
156
|
+
initial: 0,
|
|
153
157
|
},
|
|
154
158
|
{
|
|
155
|
-
type:
|
|
156
|
-
name:
|
|
157
|
-
message:
|
|
158
|
-
initial: 1024
|
|
159
|
-
}
|
|
159
|
+
type: "number",
|
|
160
|
+
name: "datamax",
|
|
161
|
+
message: "Maximum Extra Data Size:",
|
|
162
|
+
initial: 1024,
|
|
163
|
+
},
|
|
160
164
|
]);
|
|
161
165
|
const dbOptions = {
|
|
162
166
|
start: response.start,
|
|
163
167
|
iterations: response.iterations,
|
|
164
168
|
minextradata: response.datamin,
|
|
165
169
|
maxextradata: response.datamax,
|
|
166
|
-
workerScriptFolder:
|
|
167
|
-
useMultiBar: true
|
|
170
|
+
workerScriptFolder: "./node_modules/@nsshunt/stsdatamanagement/dist",
|
|
171
|
+
useMultiBar: true,
|
|
168
172
|
};
|
|
169
173
|
await this.RunAddFakerBulkInsert(dbOptions);
|
|
170
174
|
};
|
|
@@ -173,17 +177,19 @@ export class DataGenerator {
|
|
|
173
177
|
let multibar = null;
|
|
174
178
|
if (this.#useMultiBar === true) {
|
|
175
179
|
multibar = new cliProgress.MultiBar({
|
|
176
|
-
format:
|
|
180
|
+
format: "Faker |" +
|
|
181
|
+
chalk.cyan("{bar}") +
|
|
182
|
+
"| {percentage}% || {value}/{total} Iterations || Avg Size: {avgDataSize} || Size: {totalDataSize} || Duration: {duration_formatted} || ETA: {eta_formatted}",
|
|
177
183
|
clearOnComplete: false,
|
|
178
|
-
hideCursor: true
|
|
184
|
+
hideCursor: true,
|
|
179
185
|
}, cliProgress.Presets.shades_grey);
|
|
180
186
|
}
|
|
181
187
|
const pa = [];
|
|
182
188
|
const valueObject = {
|
|
183
|
-
system:
|
|
184
|
-
osInfo:
|
|
185
|
-
cpu:
|
|
186
|
-
mem:
|
|
189
|
+
system: "*",
|
|
190
|
+
osInfo: "*",
|
|
191
|
+
cpu: "*",
|
|
192
|
+
mem: "*",
|
|
187
193
|
};
|
|
188
194
|
const sysinfo = await si.get(valueObject);
|
|
189
195
|
const useCPUs = goptions.useCPUs;
|
|
@@ -212,29 +218,33 @@ export class DataGenerator {
|
|
|
212
218
|
}
|
|
213
219
|
const bars = [];
|
|
214
220
|
for (let i = 0; i < numCPUs; i++) {
|
|
215
|
-
const iterations =
|
|
221
|
+
const iterations = i === numCPUs - 1 ? lastBlockSize : blocksize;
|
|
216
222
|
let bar = null;
|
|
217
223
|
if (multibar !== null) {
|
|
218
224
|
bar = multibar.create(iterations, 0);
|
|
219
225
|
}
|
|
220
|
-
if (typeof bar ===
|
|
226
|
+
if (typeof bar === "undefined") {
|
|
221
227
|
this.#LogDebugMessage(chalk.yellow(`No TTY available for multi-bar progress.`));
|
|
222
228
|
bar = null;
|
|
223
229
|
}
|
|
224
230
|
bars.push(bar);
|
|
225
|
-
pa.push(this.StartWorkerThread(count +
|
|
231
|
+
pa.push(this.StartWorkerThread(count + i * blocksize, iterations, options.minextradata, options.maxextradata, bars[i]));
|
|
226
232
|
}
|
|
227
233
|
await Promise.all(pa);
|
|
228
234
|
if (this.#useMultiBar === true) {
|
|
229
235
|
multibar?.stop();
|
|
230
236
|
}
|
|
231
237
|
};
|
|
238
|
+
StartWorkerThread = async (start, iterations, datamin, datamax,
|
|
232
239
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
233
|
-
|
|
240
|
+
bar) => {
|
|
234
241
|
let totalIterations = 0;
|
|
235
242
|
const progress = (data) => {
|
|
236
243
|
if (bar !== null) {
|
|
237
|
-
bar.increment({
|
|
244
|
+
bar.increment({
|
|
245
|
+
totalDataSize: data?.totalDataSize,
|
|
246
|
+
avgDataSize: data?.avgDataSize,
|
|
247
|
+
});
|
|
238
248
|
}
|
|
239
249
|
else {
|
|
240
250
|
totalIterations++;
|
|
@@ -249,7 +259,7 @@ export class DataGenerator {
|
|
|
249
259
|
datamin,
|
|
250
260
|
datamax,
|
|
251
261
|
progress,
|
|
252
|
-
logger: this.#options.logger
|
|
262
|
+
logger: this.#options.logger,
|
|
253
263
|
};
|
|
254
264
|
const worker = new CliWorker(options);
|
|
255
265
|
return worker.Run();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,0EAA0E;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"datagenerator.js","sourceRoot":"","sources":["../src/datagenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { accessLayerType } from
|
|
2
|
-
import { PGAccessLayer } from
|
|
1
|
+
import { accessLayerType, } from "./commonTypes.js";
|
|
2
|
+
import { PGAccessLayer } from "./pgaccesslayer.js";
|
|
3
3
|
export class DBAccessLayerManager {
|
|
4
4
|
CreateAccessLayer(options) {
|
|
5
5
|
switch (options.accessLayerType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbAccessLayerManager.js","sourceRoot":"","sources":["../src/dbAccessLayerManager.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"dbAccessLayerManager.js","sourceRoot":"","sources":["../src/dbAccessLayerManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,eAAe,GAElB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,OAAO,oBAAoB;IAC7B,iBAAiB,CAAC,OAAqC;QACnD,QAAQ,OAAO,CAAC,eAAe,EAAE,CAAC;YAC9B,KAAK,eAAe,CAAC,UAAU;gBAC3B,OAAO,IAAI,aAAa,CACpB,OAAO,CAAC,kBAA2C,CACtD,CAAC;YACN;gBACI,MAAM,IAAI,KAAK,CACX,kDAAkD,OAAO,CAAC,eAAe,GAAG,CAC/E,CAAC;QACV,CAAC;IACL,CAAC;CACJ"}
|
package/dist/dbaccess.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export * from
|
|
6
|
-
export * from
|
|
7
|
-
export * from
|
|
1
|
+
export * from "./commonTypes.js";
|
|
2
|
+
export * from "./pgutils.js";
|
|
3
|
+
export * from "./databaseutils.js";
|
|
4
|
+
export * from "./datagenerator.js";
|
|
5
|
+
export * from "./setupdb.js";
|
|
6
|
+
export * from "./dberrors.js";
|
|
7
|
+
export * from "./dbAccessLayerManager.js";
|
|
8
8
|
//# sourceMappingURL=dbaccess.js.map
|
package/dist/dbaccess.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbaccess.js","sourceRoot":"","sources":["../src/dbaccess.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,
|
|
1
|
+
{"version":3,"file":"dbaccess.js","sourceRoot":"","sources":["../src/dbaccess.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC"}
|
package/dist/dbbuild.test.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { beforeAll, afterAll, test, describe, expect } from
|
|
2
|
-
import chalk from
|
|
3
|
-
import { goptions, $ResetOptions } from
|
|
4
|
-
import { Sleep } from
|
|
5
|
-
import { DatabaseUtils } from
|
|
1
|
+
import { beforeAll, afterAll, test, describe, expect } from "vitest";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
import { goptions, $ResetOptions } from "@nsshunt/stsconfig";
|
|
4
|
+
import { Sleep } from "@nsshunt/stsutils";
|
|
5
|
+
import { DatabaseUtils } from "./databaseutils.js";
|
|
6
6
|
import { GenericContainer } from "testcontainers";
|
|
7
|
-
import winston from
|
|
8
|
-
import { PGAccessLayer } from
|
|
9
|
-
import { PGPoolManager } from
|
|
7
|
+
import winston from "winston";
|
|
8
|
+
import { PGAccessLayer } from "./pgaccesslayer-old.js";
|
|
9
|
+
import { PGPoolManager } from "./pgpoolmanager.js";
|
|
10
10
|
// keep skipped
|
|
11
11
|
describe.skip("Test dbbuild", () => {
|
|
12
12
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -15,11 +15,9 @@ describe.skip("Test dbbuild", () => {
|
|
|
15
15
|
beforeAll(async () => {
|
|
16
16
|
winston.format.combine(winston.format.colorize(), winston.format.simple());
|
|
17
17
|
const logger = winston.createLogger({
|
|
18
|
-
level:
|
|
18
|
+
level: "silly",
|
|
19
19
|
format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
|
|
20
|
-
transports: [
|
|
21
|
-
new winston.transports.Console(),
|
|
22
|
-
]
|
|
20
|
+
transports: [new winston.transports.Console()],
|
|
23
21
|
});
|
|
24
22
|
container = await new GenericContainer("postgres")
|
|
25
23
|
.withExposedPorts(5432)
|
|
@@ -27,13 +25,13 @@ describe.skip("Test dbbuild", () => {
|
|
|
27
25
|
POSTGRES_PASSWORD: "postgres",
|
|
28
26
|
//UV_THREADPOOL_SIZE: "64",
|
|
29
27
|
})
|
|
30
|
-
.withCommand([
|
|
28
|
+
.withCommand(["-c", "max_connections=20"])
|
|
31
29
|
.start();
|
|
32
30
|
await Sleep(1000);
|
|
33
31
|
const httpPort = container.getMappedPort(5432);
|
|
34
32
|
const host = container.getHost();
|
|
35
33
|
process.env.DB_HOST = `${host}:${httpPort}`;
|
|
36
|
-
process.env.POOL_SIZE =
|
|
34
|
+
process.env.POOL_SIZE = "10";
|
|
37
35
|
$ResetOptions();
|
|
38
36
|
logger.info(chalk.green(`httpPort: [${httpPort}]`));
|
|
39
37
|
logger.info(chalk.green(`host: [${host}]`));
|
|
@@ -44,11 +42,11 @@ describe.skip("Test dbbuild", () => {
|
|
|
44
42
|
iterations: 10000,
|
|
45
43
|
minextradata: 0,
|
|
46
44
|
maxextradata: 1000,
|
|
47
|
-
workerScriptFolder:
|
|
48
|
-
useMultiBar: false
|
|
45
|
+
workerScriptFolder: "./dist", //@@
|
|
46
|
+
useMultiBar: false,
|
|
49
47
|
};
|
|
50
48
|
const dbUtils = new DatabaseUtils({
|
|
51
|
-
logger
|
|
49
|
+
logger,
|
|
52
50
|
});
|
|
53
51
|
await dbUtils.CreateDatabase(dbOptions);
|
|
54
52
|
await Sleep(1000);
|
|
@@ -58,14 +56,14 @@ describe.skip("Test dbbuild", () => {
|
|
|
58
56
|
logger,
|
|
59
57
|
usedefaultdb: false,
|
|
60
58
|
}),
|
|
61
|
-
logger
|
|
59
|
+
logger,
|
|
62
60
|
});
|
|
63
61
|
logger.info(chalk.green(`accessLayer:startdatabase()`));
|
|
64
62
|
await accessLayer.startdatabase();
|
|
65
63
|
logger.info(chalk.green(`accessLayer:deleteResources()`));
|
|
66
|
-
await accessLayer.deleteResources(
|
|
64
|
+
await accessLayer.deleteResources("JTST%", "jesttest");
|
|
67
65
|
}, 120000);
|
|
68
|
-
test(
|
|
66
|
+
test("Testing Database entity delete and creates", async () => {
|
|
69
67
|
const outerIterations = 50;
|
|
70
68
|
expect.assertions(4 + outerIterations);
|
|
71
69
|
const start = 100;
|
|
@@ -74,78 +72,75 @@ describe.skip("Test dbbuild", () => {
|
|
|
74
72
|
for (let j = 0; j < outerIterations; j++) {
|
|
75
73
|
const myarray = [];
|
|
76
74
|
for (let i = start; i < start + num; i++) {
|
|
77
|
-
const resid =
|
|
75
|
+
const resid = "JTST" + index;
|
|
78
76
|
const testmetadata = {
|
|
79
77
|
resourceid: resid,
|
|
80
78
|
address: "http://localhost:3000",
|
|
81
79
|
iterations: num,
|
|
82
80
|
startnum: start,
|
|
83
81
|
count: index,
|
|
84
|
-
data:
|
|
82
|
+
data: "created record",
|
|
85
83
|
};
|
|
86
84
|
myarray.push(testmetadata);
|
|
87
85
|
index++;
|
|
88
86
|
}
|
|
89
|
-
const allPromises = myarray.map(async (data) => accessLayer.createResource(
|
|
87
|
+
const allPromises = myarray.map(async (data) => accessLayer.createResource("jesttest", data.resourceid, JSON.stringify(data)));
|
|
90
88
|
const retval = await Promise.all(allPromises);
|
|
91
|
-
expect(retval.map(rval => rval.status)).toEqual(retval.map(() => 201));
|
|
89
|
+
expect(retval.map((rval) => rval.status)).toEqual(retval.map(() => 201));
|
|
92
90
|
await Sleep(10);
|
|
93
91
|
}
|
|
94
92
|
const userResourceType = {
|
|
95
|
-
name:
|
|
93
|
+
name: "user",
|
|
96
94
|
};
|
|
97
|
-
const userResourceTypeSaveRecord = await accessLayer.saveResourceEx(
|
|
95
|
+
const userResourceTypeSaveRecord = await accessLayer.saveResourceEx("jesttest", "user", userResourceType);
|
|
98
96
|
console.log(`userResourceTypeSaveRecord: [${JSON.stringify(userResourceTypeSaveRecord)}]`);
|
|
99
97
|
const userResourceTypeReadRecord = await accessLayer.getResourceEx({
|
|
100
|
-
resname:
|
|
98
|
+
resname: "user",
|
|
101
99
|
});
|
|
102
100
|
console.log(`userResourceTypeReadRecord: [${JSON.stringify(userResourceTypeReadRecord)}]`);
|
|
103
101
|
const userResource1 = {
|
|
104
|
-
userId:
|
|
105
|
-
userName:
|
|
102
|
+
userId: "user1",
|
|
103
|
+
userName: "user1 name",
|
|
106
104
|
};
|
|
107
105
|
const userResource2 = {
|
|
108
|
-
userId:
|
|
109
|
-
userName:
|
|
106
|
+
userId: "user2",
|
|
107
|
+
userName: "user2 name",
|
|
110
108
|
};
|
|
111
|
-
const userResourceSaveRecord1 = await accessLayer.createEntity(
|
|
112
|
-
const userResourceSaveRecord2 = await accessLayer.createEntityEx(
|
|
109
|
+
const userResourceSaveRecord1 = await accessLayer.createEntity("jesttest", "user", 1, "user1", JSON.stringify(userResource1));
|
|
110
|
+
const userResourceSaveRecord2 = await accessLayer.createEntityEx("jesttest", "user", 1, "user2", userResource2);
|
|
113
111
|
console.log(userResourceSaveRecord1);
|
|
114
112
|
console.log(userResourceSaveRecord2);
|
|
115
113
|
const userEntity1 = await accessLayer.getEntityEx({
|
|
116
|
-
resname:
|
|
117
|
-
entname:
|
|
114
|
+
resname: "user",
|
|
115
|
+
entname: "user1",
|
|
118
116
|
});
|
|
119
117
|
expect(userEntity1.detail).toMatchObject(userResource1);
|
|
120
118
|
const userEntity2 = await accessLayer.getEntityEx({
|
|
121
|
-
resname:
|
|
122
|
-
entname:
|
|
119
|
+
resname: "user",
|
|
120
|
+
entname: "user2",
|
|
123
121
|
});
|
|
124
122
|
expect(userEntity2.detail).toMatchObject(userResource2);
|
|
125
123
|
const entities1 = await accessLayer.getEntities({
|
|
126
|
-
resname:
|
|
124
|
+
resname: "user",
|
|
127
125
|
});
|
|
128
126
|
expect(entities1.detail).toMatchObject([
|
|
129
127
|
userResourceSaveRecord1.detail,
|
|
130
|
-
userResourceSaveRecord2.detail
|
|
128
|
+
userResourceSaveRecord2.detail,
|
|
131
129
|
]);
|
|
132
130
|
const entities2 = await accessLayer.getEntitiesEx({
|
|
133
|
-
resname:
|
|
131
|
+
resname: "user",
|
|
134
132
|
});
|
|
135
|
-
expect(entities2.detail).toMatchObject([
|
|
136
|
-
userResource1,
|
|
137
|
-
userResource2
|
|
138
|
-
]);
|
|
133
|
+
expect(entities2.detail).toMatchObject([userResource1, userResource2]);
|
|
139
134
|
}, 120000);
|
|
140
135
|
afterAll(async () => {
|
|
141
|
-
await accessLayer.deleteResources(
|
|
136
|
+
await accessLayer.deleteResources("JTST%", "testsystemuserid");
|
|
142
137
|
await accessLayer.enddatabase();
|
|
143
138
|
await Sleep(250);
|
|
144
139
|
if (container) {
|
|
145
140
|
await container.stop();
|
|
146
141
|
}
|
|
147
142
|
}, 30000);
|
|
148
|
-
test(
|
|
143
|
+
test("Testing JWKS", async () => {
|
|
149
144
|
expect.assertions(1);
|
|
150
145
|
expect(200).toEqual(200);
|
|
151
146
|
});
|
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,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErE,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,oBAAoB,
|
|
1
|
+
{"version":3,"file":"dbbuild.test.js","sourceRoot":"","sources":["../src/dbbuild.test.ts"],"names":[],"mappings":"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"}
|
package/dist/dberrors.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { StatusCodes } from
|
|
1
|
+
import { StatusCodes } from "http-status-codes";
|
|
2
2
|
// https://javascript.info/custom-errors
|
|
3
3
|
// https://rclayton.silvrback.com/custom-errors-in-node-js
|
|
4
4
|
export class STSDataManagementError extends Error {
|
|
@@ -26,7 +26,7 @@ export class STSResourceNotFoundError extends STSDataManagementError {
|
|
|
26
26
|
super(`Resource [${resource}] not found using ID: [${resourceId}]`, sourceError);
|
|
27
27
|
this.detail = {
|
|
28
28
|
resourceId,
|
|
29
|
-
resource
|
|
29
|
+
resource,
|
|
30
30
|
};
|
|
31
31
|
this.status = StatusCodes.NOT_FOUND;
|
|
32
32
|
}
|
|
@@ -39,7 +39,7 @@ export class STSResourceMalformedError extends STSDataManagementError {
|
|
|
39
39
|
resource,
|
|
40
40
|
resourceRaw,
|
|
41
41
|
error,
|
|
42
|
-
extraDetail
|
|
42
|
+
extraDetail,
|
|
43
43
|
};
|
|
44
44
|
this.status = StatusCodes.INTERNAL_SERVER_ERROR;
|
|
45
45
|
}
|
|
@@ -50,7 +50,7 @@ export class STSDatabaseAccessError extends STSDataManagementError {
|
|
|
50
50
|
this.detail = {
|
|
51
51
|
resourceId,
|
|
52
52
|
resource,
|
|
53
|
-
error
|
|
53
|
+
error,
|
|
54
54
|
};
|
|
55
55
|
this.status = StatusCodes.INTERNAL_SERVER_ERROR;
|
|
56
56
|
}
|
|
@@ -70,7 +70,7 @@ export class STSNotAuthorized extends STSDataManagementError {
|
|
|
70
70
|
super(`Not Authorized: [${clientId}:${audience}]`, sourceError);
|
|
71
71
|
this.detail = {
|
|
72
72
|
clientId,
|
|
73
|
-
audience
|
|
73
|
+
audience,
|
|
74
74
|
};
|
|
75
75
|
this.status = StatusCodes.INTERNAL_SERVER_ERROR;
|
|
76
76
|
}
|
package/dist/dberrors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dberrors.js","sourceRoot":"","sources":["../src/dberrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,wCAAwC;AACxC,0DAA0D;AAC1D,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC7C,+DAA+D;IAC/D,MAAM,GAAQ,IAAI,CAAC;IACnB,MAAM,GAAgB,WAAW,CAAC,qBAAqB,CAAC;IACxD,YAAY,
|
|
1
|
+
{"version":3,"file":"dberrors.js","sourceRoot":"","sources":["../src/dberrors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,wCAAwC;AACxC,0DAA0D;AAC1D,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC7C,+DAA+D;IAC/D,MAAM,GAAQ,IAAI,CAAC;IACnB,MAAM,GAAgB,WAAW,CAAC,qBAAqB,CAAC;IACxD,YAAY,CAAS;IAErB,YAAY,OAAe,EAAE,WAAmB;QAC5C,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,WAAW,EAAE,CAAC;YACd,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QACpC,CAAC;QAED,8DAA8D;QAC9D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAElC,8DAA8D;QAC9D,kFAAkF;QAClF,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;CACJ;AAED,MAAM,OAAO,wBAAyB,SAAQ,sBAAsB;IAChE,YAAY,QAAgB,EAAE,UAAkB,EAAE,WAAmB;QACjE,KAAK,CACD,aAAa,QAAQ,0BAA0B,UAAU,GAAG,EAC5D,WAAW,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG;YACV,UAAU;YACV,QAAQ;SACX,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC;IACxC,CAAC;CACJ;AAED,MAAM,OAAO,yBAA0B,SAAQ,sBAAsB;IACjE,YACI,QAAgB,EAChB,UAAkB,EAClB,WAAmB,EACnB,KAAa,EACb,WAAmB,EACnB,WAAmB;QAEnB,KAAK,CACD,aAAa,QAAQ,IAAI,UAAU,iBAAiB,EACpD,WAAW,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG;YACV,UAAU;YACV,QAAQ;YACR,WAAW;YACX,KAAK;YACL,WAAW;SACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC;IACpD,CAAC;CACJ;AAED,MAAM,OAAO,sBAAuB,SAAQ,sBAAsB;IAC9D,YACI,QAAgB,EAChB,UAAkB,EAClB,KAAa,EACb,WAAmB;QAEnB,KAAK,CACD,4CAA4C,QAAQ,IAAI,UAAU,GAAG,EACrE,WAAW,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG;YACV,UAAU;YACV,QAAQ;YACR,KAAK;SACR,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC;IACpD,CAAC;CACJ;AAED,MAAM,OAAO,qBAAsB,SAAQ,sBAAsB;IAC7D,YAAY,QAAgB,EAAE,UAAkB,EAAE,WAAmB;QACjE,KAAK,CACD,sCAAsC,QAAQ,IAAI,UAAU,GAAG,EAC/D,WAAW,CACd,CAAC;QACF,IAAI,CAAC,MAAM,GAAG;YACV,UAAU;YACV,QAAQ;SACX,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC;IACpD,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,sBAAsB;IACxD,YAAY,QAAgB,EAAE,QAAgB,EAAE,WAAmB;QAC/D,KAAK,CAAC,oBAAoB,QAAQ,IAAI,QAAQ,GAAG,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG;YACV,QAAQ;YACR,QAAQ;SACX,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,qBAAqB,CAAC;IACpD,CAAC;CACJ"}
|