@nsshunt/stsdatamanagement 1.17.18 → 1.17.19

package/.eslintrc.json

@@ -19,10 +19,8 @@
     ],
     "ignorePatterns": ["temp.js", "**/k6scripts/*.js", "**/public/*", "**/dist/*", "**/types/*"],
     "rules": {
-        "indent": ["error", "tab"],
-        //"no-mixed-spaces-and-tabs": [2, "smart-tabs"],
+        "indent": ["error", 4],
         "no-mixed-spaces-and-tabs": [2],
-        //"no-mixed-spaces-and-tabs": 0, // disable rule
         "@typescript-eslint/no-var-requires": "warn"
     }
 }

package/.github/workflows/npm-publish.yml

@@ -13,10 +13,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 19
       - run: npm ci
       - run: npm run lint
       - run: npm test
@@ -25,10 +25,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 19
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run build

package/cliworker.ts

@@ -1,7 +1,7 @@
 // https://stackoverflow.com/questions/56356655/structuring-a-typescript-project-with-workers
 //let faker = require('faker');
-const { parentPort, workerData } = require('worker_threads');
-const crypto = require('crypto');
+import { parentPort, workerData } from 'worker_threads';
+import crypto from 'crypto';
 
 import { PGPoolManager } from './pgpoolmanager'
 import { PGAccessLayer } from './pgaccesslayer'
@@ -22,74 +22,73 @@ const copybatchsize = 250;
 
 (async () =>
 {
-	const accesslayer = new PGAccessLayer(new PGPoolManager());
-
-	if (datamax > 0)
-	{
-		datamax = (datamax <= datamin) ? datamin + 1 : datamax;
-	}
-	for (let i=0; i < iterations; i++)
-	{
-		//let randcard = faker.helpers.createCard();
+    const accesslayer = new PGAccessLayer(new PGPoolManager());
+
+    if (datamax > 0)
+    {
+        datamax = (datamax <= datamin) ? datamin + 1 : datamax;
+    }
+    for (let i=0; i < iterations; i++)
+    {
+        //let randcard = faker.helpers.createCard();
 		
-		const coreRecordSizeRange = crypto.randomInt(128, 192);
-		const coreRecordSize = Math.floor(coreRecordSizeRange / 2);
-		let randcard = crypto.randomBytes(coreRecordSize).toString('hex');
-
-		if (datamax > 0)
-		{
-			const n = crypto.randomInt(datamin, datamax);
-			const n2 = Math.floor(n / 2);
-			const rndid = crypto.randomBytes(n2).toString('hex');
-			randcard += rndid;
-		}
-
-		const randcardstring = randcard;
-		//const randcardstring = JSON.stringify(randcard);
-
-		totalDataSize += randcardstring.length;
-		avgDataSize = Math.floor(totalDataSize / (i+1));
-
-		const pn = ('' + count++).padStart(10, '0');
-		const id = resfakerprefix + pn;
-		const cpid = rescopyprefix + pn;
-
-		const datanow = new Date().toISOString();
-		//let datanow = new Date().toUTCString();
-
-		const fakerdata = 
-		{ 
-			//oid: i
-			resname: id
-			,resdesc: randcardstring
-			,vnum: 1
-			,validfrom: datanow
-			,validto: null
-			,dbaction: 1
-			,dbactionuser: userid
-		};
-
-		fakerdataarray.push(fakerdata);
-		const fakerdata2 = Object.assign({}, fakerdata);
-		fakerdata2.resname = cpid;
-		fakerdataarray2.push(fakerdata2);
-
-		parentPort.postMessage( { command: '', data: { totalDataSize: totalDataSize, avgDataSize: avgDataSize } } );
-
-		if ((i+1) % copybatchsize === 0)
-		{
-			await accesslayer.bulkInsert(fakerdataarray);
-			await accesslayer.bulkInsert(fakerdataarray2);
-			fakerdataarray = [ ];
-			fakerdataarray2 = [ ];
-		}
-	}
-
-	if (fakerdataarray.length > 0)
-	{
-		await accesslayer.bulkInsert(fakerdataarray);
-		await accesslayer.bulkInsert(fakerdataarray2);
-	}
-
-	parentPort.postMessage( { command: 'done', data: null } );
+        const coreRecordSizeRange = crypto.randomInt(128, 192);
+        const coreRecordSize = Math.floor(coreRecordSizeRange / 2);
+        let randcard = crypto.randomBytes(coreRecordSize).toString('hex');
+
+        if (datamax > 0)
+        {
+            const n = crypto.randomInt(datamin, datamax);
+            const n2 = Math.floor(n / 2);
+            const rndid = crypto.randomBytes(n2).toString('hex');
+            randcard += rndid;
+        }
+
+        const randcardstring = randcard;
+        //const randcardstring = JSON.stringify(randcard);
+
+        totalDataSize += randcardstring.length;
+        avgDataSize = Math.floor(totalDataSize / (i+1));
+
+        const pn = ('' + count++).padStart(10, '0');
+        const id = resfakerprefix + pn;
+        const cpid = rescopyprefix + pn;
+
+        const datanow = new Date().toISOString();
+        //let datanow = new Date().toUTCString();
+
+        const fakerdata = { 
+            //oid: i
+            resname: id
+            ,resdesc: randcardstring
+            ,vnum: 1
+            ,validfrom: datanow
+            ,validto: null
+            ,dbaction: 1
+            ,dbactionuser: userid
+        };
+
+        fakerdataarray.push(fakerdata);
+        const fakerdata2 = Object.assign({}, fakerdata);
+        fakerdata2.resname = cpid;
+        fakerdataarray2.push(fakerdata2);
+
+        parentPort.postMessage( { command: '', data: { totalDataSize: totalDataSize, avgDataSize: avgDataSize } } );
+
+        if ((i+1) % copybatchsize === 0)
+        {
+            await accesslayer.bulkInsert(fakerdataarray);
+            await accesslayer.bulkInsert(fakerdataarray2);
+            fakerdataarray = [ ];
+            fakerdataarray2 = [ ];
+        }
+    }
+
+    if (fakerdataarray.length > 0)
+    {
+        await accesslayer.bulkInsert(fakerdataarray);
+        await accesslayer.bulkInsert(fakerdataarray2);
+    }
+
+    parentPort.postMessage( { command: 'done', data: null } );
 })();

package/databaseutils.ts

@@ -2,9 +2,6 @@ import prompts from 'prompts'
 
 import 'colors'
 
-import { $Options } from '@nsshunt/stsconfig'
-const goptions = $Options()
-
 import { PGPoolManager } from './pgpoolmanager'
 import { PGAccessLayer } from './pgaccesslayer'
 import { PGUtils } from './pgutils'
@@ -17,88 +14,88 @@ import { ICreateDatabaseOptions } from './stsDataManagementTypes'
 
 export class DatabaseUtils
 {
-	private _accessLayer = null;
-
-	constructor(accessLayer?: any)
-	{
-		this._accessLayer = accessLayer;
-	}
-
-	// options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
-	//		user: { name: <string>, password: <string>, email: <string> } }
-	CreateDatabase = async (options: ICreateDatabaseOptions) =>
-	{
-		const fname = 'CreateDatabase';
-		const { start, iterations, minextradata, maxextradata, workerScriptFolder, useMultiBar } = options;
-		const builddbscript = `${options.databaseScriptFolder}/builddb.sql`;
-		debug(`Database Build Script: [${builddbscript}]`.yellow);
-
-		let localAccesslayer = null;
-		try
-		{
-			try
-			{
-				debug(`Dropping database.`.yellow);
-				await PGUtils.dropdatabase();
-			} catch (error)
-			{
-				console.error(`[${fname}]: Could not drop database: ${error}`);
-				// Do not re-throw. If there is no initial database, this will throw an error, ignore this.
-			}
-
-			// Create a new empty database
-			debug(`Creating new empty database.`.yellow);
-			await PGUtils.createdatabase();
-
-			localAccesslayer = new PGAccessLayer(new PGPoolManager());
-
-			// Build the database assets (tables, functions, etc.)
-			debug(`Building database assets (tables, functions, etc.).`.yellow);
-			await localAccesslayer.executedbscript(builddbscript);
-
-			//@@ make optional or move
-			if (typeof iterations !== 'undefined') {
-				// Add new faker entries
-				debug(`Adding test data.`.yellow);
-				const dg = new DataGenerator(localAccesslayer, workerScriptFolder);
-				await dg.RunAddFakerBulkInsert(options);
-			}
-
-			//@@ double logging
-			debug(`Database successfully initiailized.`.green);
-			console.log(`Database successfully initiailized.`.green);
-		} catch (error)
-		{
-			console.error(`[${fname}]: Could not create fresh database: ${error}`);
-			debug(`[${fname}]: Could not create fresh database: ${error}`);
-		} finally {
-			if (localAccesslayer !== null) {
-				await localAccesslayer.enddatabase();
-			}
-		}
-
-	};
-
-	ResourceCount = async () =>
-	{
-		const retVal = await this._accessLayer.getResourceCount();
-		return retVal;
-	};
-
-	ExecuteDatabaseScript = async (scriptfile) =>
-	{
-		const retVal = await this._accessLayer.executedbscript(scriptfile);
-		return retVal;
-	};
-
-	ExecutedCustomScript = async () =>
-	{
-		const response = await prompts({
-			type: 'text',
-			name: 'script',
-			message: 'Script name to execute (stsrest01.sql)',
-			initial: './db-scripts/stsrest01.sql'
-		});
-		return this.ExecuteDatabaseScript(response.script);
-	};
+    private _accessLayer: PGAccessLayer;
+
+    constructor(accessLayer?: PGAccessLayer)
+    {
+        this._accessLayer = accessLayer;
+    }
+
+    // options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
+    //		user: { name: <string>, password: <string>, email: <string> } }
+    CreateDatabase = async (options: ICreateDatabaseOptions) =>
+    {
+        const fname = 'CreateDatabase';
+        const { iterations, workerScriptFolder } = options;
+        const builddbscript = `${options.databaseScriptFolder}/builddb.sql`;
+        debug(`Database Build Script: [${builddbscript}]`.yellow);
+
+        let localAccesslayer = null;
+        try
+        {
+            try
+            {
+                debug(`Dropping database.`.yellow);
+                await PGUtils.dropdatabase();
+            } catch (error)
+            {
+                console.error(`[${fname}]: Could not drop database: ${error}`);
+                // Do not re-throw. If there is no initial database, this will throw an error, ignore this.
+            }
+
+            // Create a new empty database
+            debug(`Creating new empty database.`.yellow);
+            await PGUtils.createdatabase();
+
+            localAccesslayer = new PGAccessLayer(new PGPoolManager());
+
+            // Build the database assets (tables, functions, etc.)
+            debug(`Building database assets (tables, functions, etc.).`.yellow);
+            await localAccesslayer.executedbscript(builddbscript);
+
+            //@@ make optional or move
+            if (typeof iterations !== 'undefined') {
+                // Add new faker entries
+                debug(`Adding test data.`.yellow);
+                const dg = new DataGenerator(localAccesslayer, workerScriptFolder);
+                await dg.RunAddFakerBulkInsert(options);
+            }
+
+            //@@ double logging
+            debug(`Database successfully initiailized.`.green);
+            console.log(`Database successfully initiailized.`.green);
+        } catch (error)
+        {
+            console.error(`[${fname}]: Could not create fresh database: ${error}`);
+            debug(`[${fname}]: Could not create fresh database: ${error}`);
+        } finally {
+            if (localAccesslayer !== null) {
+                await localAccesslayer.enddatabase();
+            }
+        }
+
+    };
+
+    ResourceCount = async () =>
+    {
+        const retVal = await this._accessLayer.getResourceCount();
+        return retVal;
+    };
+
+    ExecuteDatabaseScript = async (scriptfile) =>
+    {
+        const retVal = await this._accessLayer.executedbscript(scriptfile);
+        return retVal;
+    };
+
+    ExecutedCustomScript = async () =>
+    {
+        const response = await prompts({
+            type: 'text',
+            name: 'script',
+            message: 'Script name to execute (stsrest01.sql)',
+            initial: './db-scripts/stsrest01.sql'
+        });
+        return this.ExecuteDatabaseScript(response.script);
+    };
 }