@nsshunt/stsappframework 3.1.209 → 3.1.211

package/src/commonTypes.ts

@@ -7,7 +7,7 @@ import { PublishInstrumentController, InstrumentDefinitions, IContextBase, Instr
     STSDefaultClientToServerEvents, STSDefaultServerToClientEvents } from '@nsshunt/stsobservability'
 import { IDBAccessLayer } from '@nsshunt/stsdatamanagement'
 import { Consumer, KafkaMessage } from 'kafkajs'
-import { RedisMessageHandler } from './redisMessageHandler'
+//@@import { RedisMessageHandler } from '@nsshunt/stsmessaging'
 import { TinyEmitter } from "tiny-emitter";
 
 export interface IServiceProcessContext extends IContextBase {
@@ -101,7 +101,7 @@ export interface IProcessBase extends TinyEmitter {
     TerminateDatabase(): Promise<void>
     get accessLayer(): IDBAccessLayer | null
     get shuttingDown(): boolean
-    get redisMessageHandler(): RedisMessageHandler
+    //@@get redisMessageHandler(): RedisMessageHandler
 }
 
 export interface IMasterProcessBase extends IProcessBase {
@@ -251,14 +251,6 @@ export interface IInfluxDBManagerOptions {
     logger: ISTSLogger
 }
 
-/*
-export interface InstrumentPayload {
-	//nid: string
-	context: ServiceProcessContext
-	instruments: Record<string, InstrumentBase>
-}
-*/
-
 export type ConsumeMessageCB = (topic: string, partition: number, message: KafkaMessage, heartbeat: () => Promise<void>, pause: () => () => void) => void;
 export type ConsumeMessageErrorCB = (error: any) => void;
 
@@ -272,29 +264,6 @@ export interface IKafkaConsumer {
     StartConsumingMessages: (autoCommit: boolean, cb: ConsumeMessageCB, errorCb: ConsumeMessageErrorCB) => Promise<void>
 }
 
-export interface IIPCMessageProcessorIPCPayload {
-    header: string
-    messageId: string
-    senderId: string
-    senderRole: string
-    requestPayload: JSONObject
-    responsePayload: JSONObject
-    pid: string
-    messageType: 'REQUEST' | 'RESPONSE'
-}
-
-export interface IIPCMessageProcessorWorkerRecord {
-    messageId: string
-    senderId: string
-    requestPayload: IIPCMessageProcessorIPCPayload
-    responses: Record<string, IIPCMessageProcessorIPCPayload> // The key here will be the pid
-    startTime: number
-    endTime: number
-    timeout: NodeJS.Timeout | null
-    callBack: (payload: IIPCMessageProcessorIPCPayload, options: any) => void
-    errorCallBack: (payload: IIPCMessageProcessorIPCPayload, option: any) => void
-}
-
 export const iss = `https://stscore.stsmda.org/oauth2/v2.0`;
 
 export interface STSExpressServer {

package/src/index.ts

@@ -20,8 +20,3 @@ export * from './influxdb/influxDBManagerLambda'
 export * from './publishertransports/publishTransportUtils'
 export * from './stsTransportWinston'
 export * from './stsTransportLoggerWinston'
-export * from './ipcMessageProcessorPrimary'
-export * from './ipcMessageProcessorWorker'
-export * from './ipcMessageManager'
-export * from './ipcMessageHandler'
-export * from './redisMessageHandler'

package/src/masterprocessbase.ts

@@ -27,9 +27,7 @@ import { InstrumentDefinitions } from '@nsshunt/stsobservability'
 import { IPCMessagePayload, IPCMessageCommand } from './commonTypes'
 
 import { STSTransportLoggerWinston } from './stsTransportLoggerWinston'
-import { ISTSLogger, JSONObject } from "@nsshunt/stsutils";
-
-import { RedisMessageHandler } from './redisMessageHandler';
+import { JSONObject } from "@nsshunt/stsutils";
 
 import { GetFirstNetworkInterface } from './network';
 
@@ -619,27 +617,13 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
         }
 
         /*
-        const stsServiceControl: RedisMessageHandler = new RedisMessageHandler({
-            logger: this.options.logger,
-            role: 'SERVER',
-            redisUrl: goptions.imRedisMessageProcessorUrl,
-            namespace: 'stsServiceControl',
-            groups: [ 'stsServiceControlGroup' ]
-        });
-        stsServiceControl.Start();
-
-        stsServiceControl.on('ping_ex', (pingData: JSONObject, callback: any) => {
-            console.log(chalk.yellow(`${process.pid}: stsServiceControl.on(ping): [${JSON.stringify(pingData)}]`));
-            callback({pingData, dateTime: new Date().getTime()})
-        });
-        */
-
         this.redisMessageHandler.AddGroup('primary');
 
         this.redisMessageHandler.on('GetSystemInformation', async (args: JSONObject, callback: any) => {
             const retVal = await this.#GetSystemInformation();
             callback(retVal);
         });
+        */
 
         this.MasterStarted();
 
@@ -661,6 +645,7 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
         }
     }
 
+    /*
     #GetSystemInformation = async (): Promise<JSONObject> => {
         // https://systeminformation.io/
         const valueObject = {
@@ -704,4 +689,5 @@ export class MasterProcessBase extends ProcessBase implements IMasterProcessBase
 
         return sysInfo;
     }
+    */
 }

package/src/processbase.ts

@@ -1,14 +1,13 @@
 /* eslint @typescript-eslint/no-explicit-any: 0, @typescript-eslint/no-unused-vars: 0 */  // --> OFF
 import pidusage from 'pidusage'
 import { memoryUsage } from 'process'
-import path from 'node:path';
 import cluster from 'node:cluster'
 import si from 'systeminformation' // https://systeminformation.io/
 import { GetFirstNetworkInterface } from './network'
 
 import chalk from 'chalk';
 
-import { Gauge, GaugeTypes, InstrumentObjectOptions, InstrumentLogOptions, InstrumentGaugeOptions, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry, InstrumentLogTelemetry } from '@nsshunt/stsobservability'
+import { Gauge, InstrumentBaseTelemetry, InstrumentGaugeTelemetry, InstrumentObjectTelemetry, InstrumentLogTelemetry } from '@nsshunt/stsobservability'
 
 import { IDBAccessLayer, accessLayerType, DBAccessLayerManager, IDBAccessLayerEvents } from '@nsshunt/stsdatamanagement'
 
@@ -19,19 +18,14 @@ import { StatusCodes } from 'http-status-codes'
 
 import { PublishInstrumentController, IPublishInstrumentControllerOptions, InstrumentDefinitions, 
     TransportType, IPublishTransportRESTServerOptions, 
-    PublishTransportRESTServer, IPublisherTransport,
     STSDefaultClientToServerEvents, STSDefaultServerToClientEvents, GetInstruments } from '@nsshunt/stsobservability'
 
 import os from 'os';
 
 import { IProcessBase, ISocketIoServerHelper, CreateServiceProcessContext, ProcessOptions, STSServerType } from './commonTypes'
 
-import { RedisMessageHandler } from './redisMessageHandler'
+//@@import { RedisMessageHandler } from '@nsshunt/stsmessaging'
 import { TinyEmitter } from 'tiny-emitter';
-import { WorkerInstance } from './testertesting/workerInstance';
-
-import { Worker } from 'worker_threads'
-import { status } from '@grpc/grpc-js';
 
 export abstract class ProcessBase extends TinyEmitter implements IProcessBase 
 {
@@ -40,7 +34,7 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
     #systemInformationInterval: NodeJS.Timeout | null = null;
     #socketIoServerHelper: ISocketIoServerHelper<STSDefaultClientToServerEvents, STSDefaultServerToClientEvents> | null = null;
     #accessLayer: IDBAccessLayer | null = null;
-    #redisMessageHandler: RedisMessageHandler | null = null;
+    //#redisMessageHandler: RedisMessageHandler | null = null;
 
     constructor(options: ProcessOptions) {
         super();
@@ -272,18 +266,7 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
             const accessLayer = this.accessLayer;
         }
 
-        this.LogInfoMessage(`RedisMessageHandler: redisUrl: [${goptions.imRedisMessageProcessorUrl}]`);
-        
-        this.#redisMessageHandler = new RedisMessageHandler({
-            logger: this.options.logger,
-            role: 'CLIENT',
-            redisUrl: goptions.imRedisMessageProcessorUrl,
-            namespace: 'stsServiceControl',
-            groups: [ ],
-            ignoreEvents: [ 'ping' ],
-            processOptions: this.options
-        });
-        this.#redisMessageHandler.Start();
+        //@@this.LogInfoMessage(`RedisMessageHandler: redisUrl: [${goptions.imRedisMessageProcessorUrl}]`);
     }
 
     UpdateInstrument = (instrumentName: Gauge, telemetry: InstrumentBaseTelemetry) => {
@@ -312,7 +295,7 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
         }
         this.#systemInformationInterval = null;
 
-        this.#redisMessageHandler?.Stop();
+        //@@this.#redisMessageHandler?.Stop();
     }
 
     /**
@@ -445,7 +428,9 @@ export abstract class ProcessBase extends TinyEmitter implements IProcessBase
         return msgcolor;
     };
 
+    /*@@
     get redisMessageHandler(): RedisMessageHandler {
         return this.#redisMessageHandler as RedisMessageHandler;
     }
+    */
 }