@nsshunt/stsappframework 3.1.135 → 3.1.137

package/src/fhir/dalFhirManagerPGResEntity.ts

@@ -0,0 +1,123 @@
+import { DBAccessLayerManager, IDBAccessLayer, IDBAccessLayerManagerOptions, IDBResource, IDBEntity } from '@nsshunt/stsdatamanagement'
+
+import { IDomainResource, IFHIRResource, IDALFhirDataAccessManager } from './STSFhirTypes'
+
+export interface IFhirManagerPGResEntityOptions extends IDBAccessLayerManagerOptions {
+    resourceName: string
+    dbactionuser: string
+}
+
+export class DALFhirManagerPGResEntity<T> implements IDALFhirDataAccessManager<T> {
+    #options: IFhirManagerPGResEntityOptions;
+    #accessLayer: IDBAccessLayer;
+    #fhirResource: IDBResource<IFHIRResource> | undefined;
+
+    constructor(options: IFhirManagerPGResEntityOptions) {
+        this.#options = options;
+        this.#accessLayer = new DBAccessLayerManager().CreateAccessLayer({
+            accessLayerType: options.accessLayerType,
+            accessLayerOptions: options.accessLayerOptions
+        });
+    }
+
+    #GetSTSFhirBaseResource = async (): Promise<IDBResource<IFHIRResource>> => {
+        if (!this.#fhirResource) {
+            this.#fhirResource = ((await this.#accessLayer.GetResource<IFHIRResource>({
+                filters: {
+                    resname: this.#options.resourceName
+                }
+            })).detail as IDBResource<IFHIRResource>);
+
+            if (!this.#fhirResource) {
+                const fhirResourceType: IFHIRResource = {
+                    name: this.#options.resourceName,
+                    description: `${this.#options.resourceName} description`,
+                    notes: `${this.#options.resourceName} notes`,
+                }
+                this.#fhirResource = ((await this.#accessLayer.CreateResource<IFHIRResource>({
+                    filters: {
+                        dbactionuser: this.#options.dbactionuser,
+                        resname: this.#options.resourceName
+                    }
+                }, fhirResourceType)).detail as IDBResource<IFHIRResource>);
+            }
+        }
+
+        return this.#fhirResource;
+    }
+
+    async GetFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+        const fhirResource = await this.#GetSTSFhirBaseResource();
+        const retVal = await this.#accessLayer.GetEntity<T>({
+            filters: {
+                resname: fhirResource.resname,
+                entname: (fhir as Partial<IDomainResource>).id
+            }
+        });
+        if (retVal.error) {
+            if (ecb) {
+                ecb(retVal.error.error);
+            }
+            return null;
+        } else {
+            return (retVal.detail as IDBEntity<T>).entvalue;
+        }
+    }
+
+    async CreateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+        const fhirResource = await this.#GetSTSFhirBaseResource();
+        const retVal = await this.#accessLayer.CreateEntity<T>({
+            filters: {
+                dbactionuser: this.#options.dbactionuser,
+                resname: fhirResource.resname,
+                entname: (fhir as Partial<IDomainResource>).id
+            }
+        }, fhir);
+        if (retVal.error) {
+            if (ecb) {
+                ecb(retVal.error.error);
+            }
+            return null;
+        } else {
+            return (retVal.detail as IDBEntity<T>).entvalue;
+        }
+    }
+
+    async UpdateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+        const fhirResource = await this.#GetSTSFhirBaseResource();
+        const retVal = await this.#accessLayer.UpdateEntity<T>({
+            filters: {
+                dbactionuser: this.#options.dbactionuser,
+                resname: fhirResource.resname,
+                entname: (fhir as Partial<IDomainResource>).id
+            }
+        }, fhir);
+        if (retVal.error) {
+            if (ecb) {
+                ecb(retVal.error.error);
+            }
+            return null;
+        } else {
+            return (retVal.detail as IDBEntity<T>).entvalue;
+        }
+    }
+
+    async DeleteFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+        const fhirResource = await this.#GetSTSFhirBaseResource();
+        const retVal = await this.#accessLayer.DeleteEntity<T>({
+            filters: {
+                dbactionuser: this.#options.dbactionuser,
+                resname: fhirResource.resname,
+                entname: (fhir as Partial<IDomainResource>).id
+            }
+        });
+        if (retVal.error) {
+            if (ecb) {
+                ecb(retVal.error.error);
+            }
+            return null;
+        } else {
+            return (retVal.detail as IDBEntity<T>).entvalue;
+        }
+    }
+}

package/src/fhir/dalFhirManagerRedisJson.test.ts

@@ -0,0 +1,44 @@
+/* eslint @typescript-eslint/no-explicit-any: 0 */  // --> OFF
+import { beforeAll, afterAll, test, describe, expect } from 'vitest';
+
+import { DALFhirManagerRedisJson } from './dalFhirManagerRedisJson'
+
+import { IPerson } from './STSFhirTypes'
+
+import { TestHelpers } from './dalFhirTestHelpers'
+
+import { JestSleep } from '@nsshunt/stsutils'
+
+describe.skip("Test hl7 fhir resource data access layer - RedisJson", () =>
+{
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let personManager: DALFhirManagerRedisJson<IPerson>;
+    let testHelpers: TestHelpers;
+
+    beforeAll(async () => 
+    {
+        testHelpers = new TestHelpers();
+        await testHelpers.StartRedis();
+
+        personManager = new DALFhirManagerRedisJson<IPerson>({
+            //const personManager = new DALFhirManagerPGRes<IPerson>({
+            //const personManager = new DALFhirManagerPGResEntity<IPerson>({
+            resourceName: 'STSFhirPerson',
+            redisUrl: testHelpers.ioRedisMessageProcessorUrl
+        });
+        personManager.Start();
+    }, 30000);
+
+    test('Testing Person', async () => {
+        expect.assertions(6);
+
+        await testHelpers.TestFhirPerson(personManager);
+    }, 30000);
+
+    afterAll(async () =>
+    {
+        personManager.Stop();
+        await JestSleep();
+        await testHelpers.StopRedis();
+    }, 5000);
+});

package/src/fhir/dalFhirManagerRedisJson.ts

@@ -0,0 +1,92 @@
+import { IDomainResource, IDALFhirDataAccessManager } from './STSFhirTypes'
+
+import { Redis, RedisOptions } from "ioredis";
+
+export interface IFhirManagerRedisJsonOptions {
+    redisUrl: string
+    resourceName: string
+}
+
+export class DALFhirManagerRedisJson<T> implements IDALFhirDataAccessManager<T> {
+    #options: IFhirManagerRedisJsonOptions;
+    #redisSubscriber: Redis | null = null;
+
+    constructor(options: IFhirManagerRedisJsonOptions) {
+        this.#options = options;
+    }
+
+    Start() {
+        const redisOptions: RedisOptions = {
+            showFriendlyErrorStack: true,
+            maxRetriesPerRequest: 20
+        }
+
+        this.#redisSubscriber = new Redis(this.#options.redisUrl, redisOptions);
+    }
+
+    Stop() {
+        if (this.#redisSubscriber) {
+            this.#redisSubscriber.quit();
+            this.#redisSubscriber.disconnect();
+        }
+    }
+
+    GetResourceType(fhir: Partial<T>): string {
+        return `${this.#options.resourceName}_${(fhir as Partial<IDomainResource>).id}`;
+    }
+
+    async GetFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+        if (this.#redisSubscriber) {
+            const retValRaw = await this.#redisSubscriber?.get(this.GetResourceType(fhir))
+            if (retValRaw) {
+                try {
+                    return JSON.parse(retValRaw) as T;
+                } catch (error: unknown) {
+                    if (ecb) {
+                        ecb(error as Error);
+                    }
+                    return null;
+                }
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+    async CreateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+        const retVal = await this.#redisSubscriber?.set(this.GetResourceType(fhir), JSON.stringify(fhir));
+        if (retVal) {
+            return fhir;
+        } else {
+            return null;
+        }
+    }
+
+    // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+    async UpdateFhirResource(fhir: T, ecb?: (error: Error) => void): Promise<T | null> {
+        const retVal = await this.#redisSubscriber?.set(this.GetResourceType(fhir), JSON.stringify(fhir));
+        if (retVal) {
+            return fhir;
+        } else {
+            return null;
+        }
+    }
+
+    // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+    async DeleteFhirResource(fhir: Partial<T>, ecb?: (error: Error) => void): Promise<T | null> {
+        const deleteResource = await this.GetFhirResource(fhir);
+        if (deleteResource) {
+            const retVal = await this.#redisSubscriber?.del(this.GetResourceType(fhir));
+            if (retVal) {
+                return deleteResource;
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+}

package/src/fhir/dalFhirTestHelpers.ts

@@ -0,0 +1,163 @@
+import { expect } from 'vitest';
+import { IDALFhirDataAccessManager, INarrative, IPerson } from './STSFhirTypes'
+import { v4 as uuidv4 } from 'uuid';
+
+import chalk from 'chalk';
+
+import { goptions, $ResetOptions } from '@nsshunt/stsconfig'
+
+import { JestSleep, defaultLogger, Sleep } from '@nsshunt/stsutils'
+
+import { DatabaseUtils, DBAccessLayerManager, IDBAccessLayer, accessLayerType, IPGAccessLayerOptions } from '@nsshunt/stsdatamanagement'
+
+import { GenericContainer } from "testcontainers";
+
+import winston from 'winston'
+
+export class TestHelpers {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    #postgresContainer: any;
+    #accessLayer: IDBAccessLayer | null = null;
+    #logger: winston.Logger;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    #ioRedisContainer: any;
+    #ioRedisMessageProcessorUrl = '';
+
+    constructor() {
+        winston.format.combine(
+            winston.format.colorize(),
+            winston.format.simple()
+        );
+    
+        this.#logger = winston.createLogger({
+            level: 'silly',
+            format: winston.format.combine(
+                winston.format.colorize(),
+                winston.format.simple()
+            ),
+            transports: [
+                new winston.transports.Console(),
+            ]});
+    }
+
+    get logger(): winston.Logger {
+        return this.#logger;
+    }
+
+    TestFhirPerson = async (personManager: IDALFhirDataAccessManager<IPerson>) => {
+        expect.assertions(6);
+
+        const id = uuidv4();
+
+        const personRecord: IPerson = {
+            id,
+            _resourceType: 'Person',
+            name: [
+                {
+                    family: 'family',
+                    given: [ 'given' ],
+                    use: 'usual'
+                }
+            ],
+            text: {
+                div: 'New Record',
+                status: 'generated'
+            }
+        };
+
+        const newPerson01 = await personManager.CreateFhirResource(personRecord);
+        expect(newPerson01).toMatchObject(personRecord);
+
+        (personRecord.text as INarrative).div = 'user01 updated at ' + new Date().toString();
+        const updatedPerson01 = await personManager.UpdateFhirResource(personRecord);
+        expect(updatedPerson01).toMatchObject(personRecord);
+
+        const getPerson01 = await personManager.GetFhirResource({id})
+        expect(getPerson01).toMatchObject(personRecord);
+
+        const getPerson02 = await personManager.GetFhirResource({id:'willnotfind'})
+        expect(getPerson02).toBeNull();
+
+        const deletePerson01 = await personManager.DeleteFhirResource({id})
+        expect(deletePerson01).toMatchObject(personRecord);
+
+        const getPerson01AfterDelete = await personManager.GetFhirResource({id})
+        expect(getPerson01AfterDelete).toBeNull();
+    }
+
+    StartDatabase = async() => {
+        this.#postgresContainer = await new GenericContainer("postgres")
+            .withExposedPorts(5432)
+            .withEnvironment({
+                POSTGRES_PASSWORD: "postgres",
+                //UV_THREADPOOL_SIZE: "64"
+            })
+            .withCommand(['-c', 'max_connections=20'])
+            .start();
+
+        await Sleep(1000);
+
+        const postgresHttpPort = this.#postgresContainer.getMappedPort(5432);
+        const postgresHost = this.#postgresContainer.getHost();
+
+        process.env.DB_HOST = `${postgresHost}:${postgresHttpPort}`;
+        process.env.POOL_SIZE = '10';
+
+        $ResetOptions();
+
+        this.logger.info(chalk.green(`httpPort: [${postgresHttpPort}]`));
+        this.logger.info(chalk.green(`host: [${postgresHost}]`));
+        this.logger.info(chalk.yellow(`connectionString: [${goptions.connectionString}]`));
+        this.logger.info(chalk.yellow(`defaultDatabaseConnectionString: [${goptions.defaultDatabaseConnectionString }]`));
+
+        const dbOptions = {
+            start: 0,
+            iterations: 10000,
+            minextradata: 0,
+            maxextradata: 1000,
+            workerScriptFolder: './dist', //@@
+            useMultiBar: false
+        }
+
+        const dbUtils = new DatabaseUtils({
+            logger: this.logger
+        });
+        await dbUtils.CreateDatabase(dbOptions);
+
+        await Sleep(1000);
+
+        this.logger.info(chalk.green(`Starting accessLayer`));
+
+        this.#accessLayer = new DBAccessLayerManager().CreateAccessLayer({
+            accessLayerType: accessLayerType.postgresql,
+            accessLayerOptions: {
+                logger: defaultLogger,
+                usedefaultdb: false
+            } as IPGAccessLayerOptions
+        })
+
+        this.logger.info(chalk.green(`accessLayer:startdatabase()`));
+        await this.#accessLayer.StartDatabase();
+    }
+
+    StopDatabase = async () => {
+        await this.#accessLayer?.EndDatabase();
+        await JestSleep();
+        await this.#postgresContainer.stop();
+    }
+
+    StartRedis = async () => {
+        this.#ioRedisContainer = await new GenericContainer("redis")
+            .withExposedPorts(6379)
+            .start();
+        this.#ioRedisMessageProcessorUrl = `redis://${this.#ioRedisContainer.getHost()}:${this.#ioRedisContainer.getMappedPort(6379)}`;            
+    }
+
+    get ioRedisMessageProcessorUrl() {
+        return this.#ioRedisMessageProcessorUrl;
+    }
+
+    StopRedis = async () => {
+        await this.#ioRedisContainer.stop();
+    }
+}

package/src/index.ts

@@ -26,3 +26,5 @@ export * from './ipcMessageProcessorPrimary'
 export * from './ipcMessageProcessorWorker'
 export * from './ipcMessageManager'
 export * from './redisMessageHandler'
+export * from './fhir/STSFhirTypes'
+export * from './fhir/dalFhirManagerPGResEntity'

package/src/masterprocessbase.ts

@@ -32,6 +32,8 @@ import { ISTSLogger, JSONObject } from "@nsshunt/stsutils";
 
 import { RedisMessageHandler } from './redisMessageHandler';
 
+import { GetFirstNetworkInterface } from './network';
+
 export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
 {
     //static WORKER_MESSAGE_EVENT = 'sts_worker_message_event';
@@ -632,6 +634,13 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
         });
         */
 
+        this.redisMessageHandler.AddGroup('primary');
+
+        this.redisMessageHandler.on('GetSystemInformation', async (args: JSONObject, callback: any) => {
+            const retVal = await this.#GetSystemInformation();
+            callback(retVal);
+        });
+
         this.MasterStarted();
 
         this.LogInfoMessage(chalk.green(`Master process:${process.pid} started`));
@@ -651,4 +660,48 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
             //@@this.LogInfoMessage(error);
         }
     }
+
+    #GetSystemInformation = async (): Promise<JSONObject> => {
+        // https://systeminformation.io/
+        const valueObject = {
+            system: '*',
+            osInfo: '*',
+            cpu: '*',
+            mem: '*',
+            dockerInfo: '*',
+            //dockerImages: '*',
+            dockerContainers: '*',
+        }
+    
+        const sysinfo = await si.get(valueObject);
+        const numCPUs = await this.GetNumCPUs();
+        const hostname = sysinfo.osInfo.hostname;
+    
+        const hostaddr = GetFirstNetworkInterface();
+    
+        const promArray: Promise<any>[] = [ ];
+    
+        sysinfo.dockerContainers.forEach((dc: { id: string; }) => {
+            const dcs = promArray.push(si.dockerContainerStats(dc.id));
+            console.log(dcs);
+        });
+        const dockerContainerStats = await Promise.all(promArray);
+    
+        const sysInfo = {
+            serviceProcessContext: this.options.serviceProcessContext,
+            hostname,
+            numCPUs,
+            hostaddr,
+            system: sysinfo.system,
+            osInfo: sysinfo.osInfo,
+            cpu: sysinfo.cpu,
+            mem: sysinfo.mem,
+            dockerInfo: sysinfo.dockerInfo,
+            //dockerImages: sysinfo.dockerImages,
+            dockerContainers: sysinfo.dockerContainers,
+            dockerContainerStats
+        }
+
+        return sysInfo;
+    }
 }

package/src/redisMessageHandler.ts

@@ -341,6 +341,29 @@ export class RedisMessageHandler extends TinyEmitter {
         return this;
     }
 
+    emitWithError(event: string, args: JSONObject, responseCb: (response: JSONObject | undefined) => void, errorCb: (error: any) => void): this {
+        (async () => {
+            try {
+                const retVal = await this.#ipcMessageManager?.SendMessage({
+                    __eventName: event,
+                    args: [ args ]
+                } as IEventPayload);            
+                // Invoke the response callback
+                responseCb(retVal);
+            } catch (error) {
+                if (this.#options.ignoreEvents) {
+                    //console.log(chalk.red(`RedisMessageHandler:emit(): ignoreEvents: [${this.#options.ignoreEvents}]`))
+                    if (this.#options.ignoreEvents.indexOf((error as any).__eventName) !== -1) {
+                        return;
+                    }
+                }
+                //this.#options.logger.error(chalk.red(`RedisMessageHandler:emit(): Error: [${JSON.stringify(error)}]`));
+                errorCb(error);
+            }
+        })();
+        return this;
+    }
+
     emitex = async(event: string, ...args: any[]): Promise<JSONObject> => {
         return (this.#ipcMessageManager as IPCMessageManager).SendMessage({
             __eventName: event,

package/src/testing/app.ts

@@ -385,7 +385,7 @@ if (cluster.isPrimary) {
                 })();
             }, 250);
         }
-        setTimeout(() => xxx(), 1000);
+        //setTimeout(() => xxx(), 1000);
 
 
 
@@ -435,11 +435,12 @@ if (cluster.isPrimary) {
             ListClients();
         }, 1000).unref();
     }
-    ListClients();
+    //ListClients();
 
 
 } else {
-    new WorkerProcess(ServiceConfigOptions(true, cluster.isPrimary)).SetupServer();
+    const worker = new WorkerProcess(ServiceConfigOptions(true, cluster.isPrimary));
+    worker.SetupServer();
     //StartTestWorker();
 
     setTimeout(async () => {
@@ -521,5 +522,22 @@ if (cluster.isPrimary) {
             }
         }, 1000);
         */
+
+        worker.redisMessageHandler.emit('GetSystemInformation', {
+            group: 'primary'
+        }, (response: any) => {
+            console.log(`------------------------------------------------------------------------`);
+            console.log(response);
+        });
+
+        worker.redisMessageHandler.emitWithError('GetSystemInformation', {
+            group: 'primary'
+        }, (response: any) => {
+            console.log(`************************************************************************`);
+            console.log(response);
+        }, (error: any) => {
+            console.log(chalk.red(`GetSystemInformation Error: [${error}]`));
+        });
+
     }, 2000);
 }

package/src/workerprocessbase.ts

@@ -300,6 +300,8 @@ export class WorkerProcessBase extends ServerProcessBase implements IWorkerProce
                 */
         //        });
 
+        this.redisMessageHandler.AddGroup('worker');
+
         this.WorkerStarted();
 
         this.LogInfoMessage(chalk.green(`Worker process:${process.pid} started`));