@nsshunt/stsappframework 3.1.167 → 3.1.169

package/dist/testertesting/workerWorkerTestRunner01.js

@@ -3,137 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkerTestCases = exports.WorkerWorkerTestRunner01 = void 0;
-/* eslint @typescript-eslint/no-unused-vars: 0,  @typescript-eslint/no-explicit-any: 0 */ // --> OFF
-const chalk_1 = __importDefault(require("chalk"));
-// Force chalk level
-chalk_1.default.level = 3;
+exports.WorkerTestCases = void 0;
 const workerInstance_1 = require("./workerInstance");
 const testCase01_1 = require("./testCase01");
-const debug = (message) => {
-    console.log(chalk_1.default.blue(`pid: [${process.pid}] workerWorkerTestRunner01::${message}`));
-};
-// This will execute within a worker thread context
-class WorkerWorkerTestRunner01 extends workerInstance_1.WorkerInstance {
-    #logMessageDataSet = {};
-    constructor() {
-        super();
-        debug(`constructor`);
-    }
-    StartWork = async (runner) => {
-        debug(`StartWork::Options: [${JSON.stringify(this.Options)}]`);
-        //this.#access_token = await this.#GetAccessToken();
-        //await Sleep(this.GetRandomInt(1000));
-        return this.PerformTest(runner);
-    };
-    GenLogMessage = (runner) => {
-        if (!this.#logMessageDataSet[runner.id]) {
-            this.#logMessageDataSet[runner.id] = {
-                adder: 1,
-                indent: 0
-            };
-        }
-        const logMessageData = this.#logMessageDataSet[runner.id];
-        let message = `${' '.repeat(logMessageData.indent)}>> Hello World <<`;
-        const colorCode = runner.asyncRunnerContext.asyncRunnerId % 4;
-        switch (colorCode) {
-            case 0:
-                message = chalk_1.default.green(`${message}`);
-                break;
-            case 1:
-                message = chalk_1.default.yellow(`${message}`);
-                break;
-            case 2:
-                message = chalk_1.default.magenta(`${message}`);
-                break;
-            case 3:
-                message = chalk_1.default.white(`${message}`);
-                break;
-        }
-        console.log(message);
-        runner.instrumentData.message.push(message);
-        logMessageData.indent += logMessageData.adder;
-        if (logMessageData.indent > 20) {
-            logMessageData.adder = -1;
-        }
-        else if (logMessageData.indent === 0) {
-            logMessageData.adder = 1;
-        }
-    };
-    PerformTest = async (runner) => {
-        debug(`WorkerWorkerTestRunner01::PerformTest`);
-        const message = `ID: [${runner.asyncRunnerContext.id}], Worker: [${runner.asyncRunnerContext.threadId}], Runner: [${runner.asyncRunnerContext.asyncRunnerId}] starting ...`;
-        console.log(message);
-        runner.instrumentData.message = [message];
-        this.PostTelemetry(runner);
-        runner.instrumentData.message = [];
-        /*
-        const tester = new TestRest01Service(this.#access_token, runner.options as IRunnerOptionsEx);
-
-        tester.on('rx', (val: string) => {
-            runner.instrumentData.rx += parseInt(val);
-            //console.log(runner.instrumentData.rx);
-        });
-
-        tester.on('tx', (val: string) => {
-            runner.instrumentData.tx += parseInt(val);
-        });
-        */
-        /*
-        while (runner.state !== IRunnerState.stopped) {
-
-            await Sleep(0);
-            //let retVal = await tester.StartTest();
-
-            runner.instrumentData.coreCount = 1;
-
-
-            const options = runner.options as IRunnerOptionsEx;
-
-            await Sleep(options.sleepDuration);
-
-            runner.instrumentData.timer++;
-            runner.instrumentData.requestCount++;
-            runner.instrumentData.velocity = options.messageMod;
-
-            //runner.instrumentData.tx += 256;
-            //runner.instrumentData.rx += 6500;
-
-            if (runner.instrumentData.requestCount % options.logMessageMod === 0) {
-                this.GenLogMessage(runner);
-            }
-
-            if (runner.instrumentData.requestCount % options.messageMod === 0) {
-                this.PostTelemetry(runner);
-                runner.instrumentData.message = [ ];
-                runner.instrumentData.tx = 0;
-                runner.instrumentData.rx = 0;
-            }
-            if (runner.instrumentData.requestCount % 1000 === 0) {
-                const message = `Worker: [${runner.asyncRunnerContext.threadId}], Runner: [${runner.asyncRunnerContext.asyncRunnerId}] has completed: [${runner.instrumentData.requestCount}] iterations of max: [${options.iterations}]`;
-                console.log(message);
-                runner.instrumentData.message = [message]
-                this.PostTelemetry(runner);
-                runner.instrumentData.message = [ ];
-                runner.instrumentData.tx = 0;
-                runner.instrumentData.rx = 0;
-    
-            }
-            if (runner.instrumentData.requestCount > options.iterations) {
-                runner.state = IRunnerState.stopped;
-                const message = `Worker: [${runner.asyncRunnerContext.threadId}], Runner: [${runner.asyncRunnerContext.asyncRunnerId}] stopping ...`;
-                console.log(message);
-                runner.instrumentData.message = [message]
-                this.PostTelemetry(runner);
-                runner.instrumentData.message = [ ];
-                runner.instrumentData.tx = 0;
-                runner.instrumentData.rx = 0;
-            }
-        }
-            */
-    };
-}
-exports.WorkerWorkerTestRunner01 = WorkerWorkerTestRunner01;
+const detect_node_1 = __importDefault(require("detect-node"));
+const worker_threads_1 = require("worker_threads");
 class WorkerTestCases extends workerInstance_1.WorkerInstance {
     constructor() {
         super();
@@ -148,24 +22,14 @@ class WorkerTestCases extends workerInstance_1.WorkerInstance {
     };
 }
 exports.WorkerTestCases = WorkerTestCases;
-const worker_threads_1 = require("worker_threads");
-let messagePort;
 const worker = new WorkerTestCases();
 worker_threads_1.parentPort?.on('message', (data) => {
-    worker.ProcessMessage(data);
-    /*
-
-    if (data.cmd.localeCompare('portmessage') === 0) {
-        messagePort = data.port;
-        messagePort.on('message', (data) => {
-            LogInfoMessage(`webWorker (${process.pid}): message from passed message port = [${data}]`);
-            messagePort.postMessage(data);
-        });
-    } else {
-        LogInfoMessage(`webWorker (${process.pid}): message from parent = [${JSON.stringify(data)}]`);
-        parentPort?.postMessage(data);
+    if (detect_node_1.default) {
+        worker.ProcessMessage(data);
+    }
+    else {
+        // const payloadMessage: IIWMessagePayload = data.data as IIWMessagePayload; // browser version
+        worker.ProcessMessage(data.data); // browser version
     }
-        */
 });
-debug(`file completed ...`);
 //# sourceMappingURL=workerWorkerTestRunner01.js.map

package/dist/testertesting/workerWorkerTestRunner01.js.map

@@ -1 +1 @@
-{"version":3,"file":"workerWorkerTestRunner01.js","sourceRoot":"","sources":["../../src/testertesting/workerWorkerTestRunner01.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workerWorkerTestRunner01.js","sourceRoot":"","sources":["../../src/testertesting/workerWorkerTestRunner01.ts"],"names":[],"mappings":";;;;;;AAEA,qDAAiD;AACjD,6CAAyC;AAEzC,8DAAgC;AAEhC,mDAA4C;AAE5C,MAAa,eAAgB,SAAQ,+BAAc;IAC/C;QACI,KAAK,EAAE,CAAA;IACX,CAAC;IAEQ,iBAAiB,GAAG,CAAC,0BAAuD,EAA0B,EAAE;QAC7G,MAAM,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAAC;QAC9C,QAAQ,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YAClC,KAAK,YAAY;gBACb,OAAO,IAAI,uBAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACvC,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;CACJ;AAbD,0CAaC;AAED,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;AAErC,2BAAU,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,IAAS,EAAE,EAAE;IACpC,IAAI,qBAAM,EAAE,CAAC;QACT,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;SAAM,CAAC;QACJ,+FAA+F;QAC/F,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB;IACxD,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nsshunt/stsappframework",
-  "version": "3.1.167",
+  "version": "3.1.169",
   "description": "",
   "main": "dist/index.js",
   "types": "./types/index.d.ts",
@@ -32,6 +32,7 @@
     "@tsconfig/node20": "^20.1.4",
     "@types/cookie-parser": "^1.4.7",
     "@types/debug": "^4.1.12",
+    "@types/detect-node": "^2.0.2",
     "@types/express": "^4.17.21",
     "@types/jest": "^29.5.12",
     "@types/jsonwebtoken": "^9.0.6",
@@ -65,6 +66,7 @@
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "debug": "^4.3.6",
+    "detect-node": "^2.1.0",
     "express": "^4.19.1",
     "http-status-codes": "^2.3.0",
     "jayson": "^4.1.1",

package/src/testertesting/app.ts

@@ -83,6 +83,7 @@ if (cluster.isPrimary) {
     const agentId = 'agent01';
     const userAgent = 'userAgent01'
 
+    // Root level / master async runner context
     const asyncRunnerContext: IAsyncRunnerContext = {
         nid: `\
     ${hostName}${ModelDelimeter.COMPONENT_SEPERATOR}${agentId}-${userAgent}\
@@ -168,16 +169,11 @@ if (cluster.isPrimary) {
     agentInstrumentController.StartPublish();
 
     const workerFactory: IWorkerFactory = {
-     
         createWorkerThreadWorker: (): Worker => {
-
             LogInfoMessage(`createWorkerThreadWorker`);
-
             const fileName ='./dist/testertesting/workerWorkerTestRunner01.js';
-
             const publishCollectorWebWorker = new Worker(fileName);
             publishCollectorWebWorker.unref();
-
             return publishCollectorWebWorker;
         },
         get workerThreadWorkerOptions(): IWorkerOptions {
@@ -262,6 +258,67 @@ if (cluster.isPrimary) {
                 }, 2000);
             }, 2000);
         }, 2000);
+
+
+
+
+
+
+
+        const worker2 = await wm.AddWorker();
+
+        const runnerOptions2: IRunnerOptionsEx = {
+            testType: 'TestCase01',
+            executionProfile: {
+                iterations: 50,
+                delayBetweenIterations: 250
+            },
+            sleepDuration: 0,
+            messageMod: 1,
+            logMessageMod: 1
+        };
+
+        const runnerW2R1 = worker2.AddRunner(runnerOptions2);
+        runnerW2R1.on('Completed', () => {
+            console.log(chalk.rgb(10, 100, 250)(`Completed event handler for worker 2 runner 1`));
+        });
+        worker2.StartRunner(runnerW2R1);
+
+        const runnerW2R2 = worker2.AddRunner(runnerOptions2);
+        runnerW2R2.on('Completed', () => {
+            console.log(chalk.rgb(10, 100, 250)(`Completed event handler for worker 2 runner 2`));
+        });
+        worker2.StartRunner(runnerW2R2);
+
+        setTimeout(() => {
+            worker2.Pause();
+            setTimeout(() => {
+                worker2.Resume();
+                setTimeout(() => {
+                    worker2.Stop();
+                    setTimeout(async () => {
+                        await worker2.Reset();
+                        const newOptions = { ...runnerOptions2 };
+                        newOptions.sleepDuration = 50;
+                        await worker2.UpdateOptions(newOptions);
+                        await worker2.Start();
+                        setTimeout(async () => {
+                            await worker2.Pause();
+                            await worker2.Execute();
+                            await worker2.Execute();
+                            await worker2.Execute();
+                            await worker2.Execute();
+                            await worker2.Execute();
+                            setTimeout(async () => {
+                                await worker2.Resume();
+                            }, 5000);
+                        }, 5000);
+                    }, 5000);
+                }, 5000);
+            }, 5000);
+        }, 5000);
+
+
     };
     PerformTesting();
     

package/src/testertesting/commonTypes.ts

@@ -28,8 +28,8 @@ export enum eIWMessageCommands {
 	InstrumentTelemetry ='__STS__InstrumentTelemetry', // Used to send instrument telemetry
 	MessagePort = '__STS__MessagePort',
 	MessagePortResponse = '__STS__MessagePortResponse',
-	AddAsyncRunner = '__STS__AddAsyncRunner',
-	StopAllAsyncRunners = '__STS__StopAllAsyncRunners',
+	AddRunner = '__STS__AddRunner',
+	StopAllRunners = '__STS__StopAllRunners',
 	StartRunner = '__STS__StartRunner',
 	StopRunner = '__STS__StopRunner',
 	PauseRunner = '__STS__PauseRunner',
@@ -106,9 +106,9 @@ export interface IRunner {
 export interface IRunnerEx extends IRunner {
     publishInstrumentController: PublishInstrumentController
     Start: () => Promise<boolean> // Start runner iterations
+	Stop: () => Promise<boolean> // Stop iteration processing and keep the current iteration number. Currently, this is the same as Pause.
     Pause: () => Promise<boolean> // Pause iteration processing and keep the current iteration number.
     Resume: () => Promise<boolean> // Resume iteration processing from the previously paused iteration number.
-	Stop: () => Promise<boolean> // Stop iteration processing and keep the current iteration number. Currently, this is the same as Pause.
 	Terminate: () => Promise<boolean> // Stop the runner iterations and terminate the instance, stop any instrument publishers.
 	Reset: () => Promise<boolean> // Stop the current iterations and reset the iteration count back to 0.
 	Execute: (iteration: number) => Promise<boolean> // Execute a single iteration for this test.
@@ -117,15 +117,15 @@ export interface IRunnerEx extends IRunner {
 }
 
 export interface IRunnerInstance {
-	Execute: (iteration: number) => Promise<boolean> // Execute a single iteration for this test
 	StartRunner: () => Promise<boolean>
 	StopRunner: () => Promise<boolean>
-	TerminateRunner: () => Promise<boolean>
-	Completed: () => Promise<boolean>
 	PauseRunner: () => Promise<boolean>
 	ResumeRunner: () => Promise<boolean>
+	TerminateRunner: () => Promise<boolean>
 	ResetRunner: () => Promise<boolean>
+	Execute: (iteration: number) => Promise<boolean> // Execute a single iteration for this test
 	UpdateOptions: () => Promise<boolean>
+	Completed: () => Promise<boolean>
 }
 
 export enum IWorkerState {
@@ -133,7 +133,6 @@ export enum IWorkerState {
 	started = 'started',
 	stopped = 'stopped'
 }
-
  
 export interface IWorkerOptions {
 	id: string
@@ -174,11 +173,24 @@ export interface IWorkerEx extends IWorker {
 	runnersEvents: Record<string, IRunnerEvent[]>
 	GetRunner(id: string): IRunnerEx | null
 	AddRunner: (runnerOptions: IRunnerOptions) => IRunnerEx
+
 	StartRunner: (runner: IRunnerEx) => Promise<boolean>
 	StopRunner: (runner: IRunnerEx) => Promise<boolean>
 	PauseRunner: (runner: IRunnerEx) => Promise<boolean>
 	ResumeRunner: (runner: IRunnerEx) => Promise<boolean>
+	TerminateRunner: (runner: IRunnerEx) => Promise<boolean>
+	ResetRunner: (runner: IRunnerEx) => Promise<boolean>
+	ExecuteRunner: (runner: IRunnerEx) => Promise<boolean>
+	UpdateOptionsRunner: (runner: IRunnerEx, options: IRunnerOptions) => Promise<boolean>
+
+	Start: () => Promise<boolean>
 	Stop: () => Promise<boolean>
+	Pause: () => Promise<boolean>
+	Resume: () => Promise<boolean>
+	Terminate: () => Promise<boolean>
+	Reset: () => Promise<boolean>
+	Execute: () => Promise<boolean> // Execute a single iteration
+	UpdateOptions: (options: IRunnerOptions) => Promise<boolean>
 }
 
 export interface ISTSTestWorkerOptions {

package/src/testertesting/testCase01.ts

@@ -79,8 +79,8 @@ export class TestCase01 implements IRunnerInstance {
         this.#runner.instrumentData.requestCount++;
         this.#runner.instrumentData.velocity = options.messageMod;
 
-        //runner.instrumentData.tx += 256;
-        //runner.instrumentData.rx += 6500;
+        //this.#runner.instrumentData.tx += 256000;
+        //this.#runner.instrumentData.rx += 6500000;
 
         if (this.#runner.instrumentData.requestCount % options.logMessageMod === 0) {
             this.#GenLogMessage(this.#runner, iteration);

package/src/testertesting/workerInstance.ts

@@ -1,12 +1,12 @@
 /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */  // --> OFF
 import { MessagePort } from 'worker_threads';
 
+import isNode from 'detect-node'
+
 import { IIWMessagePayload, eIWMessageCommands, IIWMessagePayloadContentBase, IRunnerInstance,
     ISTSAgentWorkerMessagePort, IRunner, ITestRunnerTelemetryPayload, IWorkerOptions
 } from './commonTypes'
 
-import { RequestResponseHelper } from './requestResponseHelper'
-
 import chalk from 'chalk';
 // Force chalk level
 chalk.level = 3;
@@ -28,7 +28,6 @@ export interface IRunnerEx2RunState {
 
 export abstract class WorkerInstance {
     #collectorCollectorPort: MessagePort | null = null;
-    #requestResponseHelper: RequestResponseHelper | null = null;
     #runners: Record<string, IRunnerEx2RunState> = { };
     #options: IWorkerOptions | null = null;
 
@@ -68,10 +67,6 @@ export abstract class WorkerInstance {
         }
     }
 
-    get RequestResponseHelper(): RequestResponseHelper | null {
-        return this.#requestResponseHelper;
-    }
-
     get CollectorCollectorPort(): MessagePort | null {
         return this.#collectorCollectorPort;
     }
@@ -85,18 +80,16 @@ export abstract class WorkerInstance {
         this.#collectorCollectorPort = workerMessagePort.port as MessagePort;
 
         // NodeJS version
-        this.#collectorCollectorPort.on('message', (data: any) => {
-            this.#debug(`collectorCollectorPort onmessage: ${data.data}`);
-        });
-
-        // Browser Version
-        /*
-        this.#collectorCollectorPort.onmessage = function(data: MessageEvent) {
-            console.log(`collectorCollectorPort onmessage: ${data.data}`);
-        }
-        */
 
-        this.#requestResponseHelper = new RequestResponseHelper(this.#collectorCollectorPort);
+        if (isNode) {
+            this.#collectorCollectorPort.on('message', (data: any) => {
+                this.#debug(`collectorCollectorPort onmessage: ${data.data}`);
+            });
+        } else {
+            (this.#collectorCollectorPort as any).onmessage = function(data: any) { // MessageEvent
+                console.log(`collectorCollectorPort onmessage: ${data.data}`);
+            }
+        }
 
         const response: IIWMessagePayload = {
             command: eIWMessageCommands.MessagePortResponse,
@@ -110,8 +103,8 @@ export abstract class WorkerInstance {
         return null;
     }
 
-    #AddAsyncRunner = (testRunnerTelemetryPayload: ITestRunnerTelemetryPayload): IRunner => {
-        this.#debug(`AddAsyncRunner`)
+    #AddRunner = (testRunnerTelemetryPayload: ITestRunnerTelemetryPayload): IRunner => {
+        this.#debug(`AddRunner`)
         const { runner } = testRunnerTelemetryPayload;
         const asyncRunnerInstance = this.CreateAsyncRunner(testRunnerTelemetryPayload);
         if (asyncRunnerInstance) {
@@ -128,8 +121,6 @@ export abstract class WorkerInstance {
         return runner;
     }
 
-    //@@ re4set iteration count - need a reset
-
     #StartRunner = async (testRunnerTelemetryPayload: ITestRunnerTelemetryPayload) => {
         const { runner } = testRunnerTelemetryPayload;
         this.#debug(`${chalk.magenta(`runner: [${runner.id}]`)} StartRunner`)
@@ -170,10 +161,10 @@ export abstract class WorkerInstance {
         ExecuteLoop();
     }
 
-    #StopRunners = async (testRunnerTelemetryPayload: ITestRunnerTelemetryPayload) => {
-        this.#debug(`StopRunners`);
+    #StopAllRunners = async (testRunnerTelemetryPayload: ITestRunnerTelemetryPayload) => {
+        this.#debug(`StopAllRunners`);
         for (const [, runner] of Object.entries(this.#runners)) {
-            this.#debug(`${chalk.magenta(`runner: [${runner.runner.id}]`)} StopRunners`)
+            this.#debug(`${chalk.magenta(`runner: [${runner.runner.id}]`)} StopAllRunners`)
             runner.terminate = true;
             await runner.runnerInstance.StopRunner();
         }
@@ -246,7 +237,6 @@ export abstract class WorkerInstance {
     ProcessMessage = async(data: any) => {
         this.#debug(`ProcessMessage: data: [${JSON.stringify(data)}]`)
         try {
-            // const payloadMessage: IIWMessagePayload = data.data as IIWMessagePayload; // browser version
             const payloadMessage: IIWMessagePayload = data as IIWMessagePayload;
             switch (payloadMessage.command) {
             case eIWMessageCommands.MessagePort :
@@ -255,13 +245,13 @@ export abstract class WorkerInstance {
                 this.#options = (payloadMessage.payload as ISTSAgentWorkerMessagePort).options;
                 this.#debug(`ProcessMessage::#options: [${JSON.stringify(this.#options)}]`)
                 break;
-            case eIWMessageCommands.AddAsyncRunner :
-                this.#debug(`ProcessMessage::AddAsyncRunner`)
-                this.#AddAsyncRunner(payloadMessage.payload as ITestRunnerTelemetryPayload);
+            case eIWMessageCommands.AddRunner :
+                this.#debug(`ProcessMessage::AddRunner`)
+                this.#AddRunner(payloadMessage.payload as ITestRunnerTelemetryPayload);
                 break;
-            case eIWMessageCommands.StopAllAsyncRunners :
-                this.#debug(`ProcessMessage::StopAllAsyncRunners`)
-                this.#StopRunners(payloadMessage.payload as ITestRunnerTelemetryPayload);
+            case eIWMessageCommands.StopAllRunners :
+                this.#debug(`ProcessMessage::StopAllRunners`)
+                this.#StopAllRunners(payloadMessage.payload as ITestRunnerTelemetryPayload);
                 break;
             case eIWMessageCommands.StartRunner :
                 this.#debug(`ProcessMessage::StartRunner`)