@nsshunt/stsappframework 3.0.19 → 3.0.21

package/src/influxdb/influxDBManagerAgent.ts

@@ -5,7 +5,7 @@ import { Gauge, InstrumentVelocity } from '@nsshunt/stsinstrumentation'
 
 import { InfluxDBManagerBase } from './influxDBManagerBase'
 
-import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes'
+import { IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload, SubscriptionTopic } from './../commonTypes'
 
 const _logPrefix = 'InfluxDBManagerService:'
 
@@ -122,64 +122,63 @@ export class InfluxDBManagerAgent extends InfluxDBManagerBase
     
     // Metric queries -------------------------------------------------------------------------------------------------
     // Root level metrics
-    async GetInfluxDBResultsRootAgent() {
+    async GetInfluxDBResultsRootAgent(): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericAgent('agent', '', 'group(columns: ["_field"])'),
                 this.#GetSTSQuantileGenericAgent(`agent`, '', 'group(columns: ["_field"])'),
                 this.#GetSTSHistoGenericService('agent', '', 'group(columns: ["_field"])')],
             [ ])
-        
-            return { SubscriptionType: "ID_Agent_Root", data: combinedResults };
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsRootAgent: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.AllAgentsCombined, data: retVal };
     }
 
     // Service level metrics
-    async GetInfluxDBResultsAgent() {
+    async GetInfluxDBResultsAgent(): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericAgent('agent', '', 'group(columns: ["agentName", "_field"])'),
                 this.#GetSTSQuantileGenericAgent(`agent`, '', 'group(columns: ["agentName", "_field"])'),
                 this.#GetSTSHistoGenericService('agent', '', 'group(columns: ["agentName", "_field"])')],
             ['agentName'])
-            
-            return { SubscriptionType: "ID_Agent_Agents", data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsAgent: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.Agents, data: retVal };
     }
 
     // Service instance metrics for a particular service type
-    async GetInfluxDBResultsAgentThreads(agentName: string) {
+    async GetInfluxDBResultsAgentThreads(agentName: string): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericAgent('agent', `and r["agentName"] == "${agentName}"`, `group(columns: ["agentName", "threadId", "_field"])`),
                 this.#GetSTSQuantileGenericAgent(`agent`, `and r["agentName"] == "${agentName}"`, 'group(columns: ["agentName", "threadId", "_field"])'),
                 this.#GetSTSHistoGenericService('agent', `and r["agentName"] == "${agentName}"`, 'group(columns: ["agentName", "threadId", "_field"])')],
             ['agentName', 'threadId'])
-
-            return { SubscriptionType: `ID_Agent_Agent_Threads_${agentName}`, data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsAgentThreads: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.AgentWorkers, key: agentName, data: retVal };
     }
 
     // Service instance thread metrics for a particular service instance
-    async GetInfluxDBResultsAgentThread(agentName: string, threadId: string) {
+    async GetInfluxDBResultsAgentThread(agentName: string, threadId: string): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericAgent('agent', `and r["agentName"] == "${agentName}" and r["threadId"] == "${threadId}"`, `group(columns: ["agentName", "threadId", "asyncRunnerId", "_field"])`),
                 this.#GetSTSQuantileGenericAgent(`agent`, `and r["agentName"] == "${agentName}" and r["threadId"] == "${threadId}"`, 'group(columns: ["agentName", "threadId", "asyncRunnerId", "_field"])'),
                 this.#GetSTSHistoGenericService('agent', `and r["agentName"] == "${agentName}" and r["threadId"] == "${threadId}"`, 'group(columns: ["agentName", "threadId", "asyncRunnerId", "_field"])')],
             ['agentName', 'threadId', 'asyncRunnerId'])
-
-            return { SubscriptionType: `ID_Agent_Agent_Thread_${agentName}_${threadId}`, data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsAgentThread: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.AgentWorker, key: agentName, subkey: threadId, data: retVal };
     }
     
     // Agent context payload

package/src/influxdb/influxDBManagerService.ts

@@ -5,7 +5,7 @@ import { Gauge, InstrumentVelocity } from '@nsshunt/stsinstrumentation'
 
 import { InfluxDBManagerBase } from './influxDBManagerBase'
 
-import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes'
+import { IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload, SubscriptionTopic } from './../commonTypes'
 
 const _logPrefix = 'InfluxDBManagerService:'
 
@@ -137,63 +137,63 @@ export class InfluxDBManagerService extends InfluxDBManagerBase
     
     // Metric queries -------------------------------------------------------------------------------------------------
     // Root level metrics
-    async GetInfluxDBResultsRootService() {
+    async GetInfluxDBResultsRootService(): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericService('', 'group(columns: ["_field"])'),
                 this.#GetSTSQuantileGenericService(`service`, '', 'group(columns: ["_field"])'),
                 this.#GetSTSHistoGenericService('service', '', 'group(columns: ["_field"])')],
             [ ])
-        
-            return { SubscriptionType: "ID_", data: combinedResults };
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsRoot: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.AllServicesCombined, data: retVal };
     }
 
     // Service level metrics
-    async GetInfluxDBResultsService() {
+    async GetInfluxDBResultsService(): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericService('', 'group(columns: ["serviceId", "_field"])'),
                 this.#GetSTSQuantileGenericService(`service`, '', 'group(columns: ["serviceId", "_field"])'),
                 this.#GetSTSHistoGenericService('service', '', 'group(columns: ["serviceId", "_field"])')],
             ['serviceId'])
-            
-            return { SubscriptionType: "ID_Service", data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsService: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.Services, data: retVal };
     }
 
     // Service instance metrics for a particular service type
-    async GetInfluxDBResultsServiceInstances(serviceId: string) {
+    async GetInfluxDBResultsServiceInstances(serviceId: string): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericService(`and r["serviceId"] == "${serviceId}"`, `group(columns: ["serviceId", "serviceInstanceId", "_field"])`),
                 this.#GetSTSQuantileGenericService(`service`, `and r["serviceId"] == "${serviceId}"`, 'group(columns: ["serviceId", "serviceInstanceId", "_field"])'),
                 this.#GetSTSHistoGenericService('service', `and r["serviceId"] == "${serviceId}"`, 'group(columns: ["serviceId", "serviceInstanceId", "_field"])')],
             ['serviceId', 'serviceInstanceId'])
-
-            return { SubscriptionType: `ID_ServiceInstances_${serviceId}`, data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsServiceInstances: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.ServiceInstances, key: serviceId, data: retVal };
     }
 
     // Service instance thread metrics for a particular service instance
-    async GetInfluxDBResultsServiceInstance(serviceInstanceId: string) {
+    async GetInfluxDBResultsServiceInstance(serviceInstanceId: string): Promise<ISubscriptionPayload> {
+        let retVal = null;
         try {
-            const combinedResults = await this.ProcessInfluxDBResults([
+            retVal = await this.ProcessInfluxDBResults([
                 this.#GetSTSCountGenericService(`and r["serviceInstanceId"] == "${serviceInstanceId}"`, `group(columns: ["serviceId", "serviceInstanceId", "serviceInstanceProcessId", "_field"])`),
                 this.#GetSTSQuantileGenericService(`service`, `and r["serviceInstanceId"] == "${serviceInstanceId}"`, 'group(columns: ["serviceId", "serviceInstanceId", "serviceInstanceProcessId", "_field"])'),
                 this.#GetSTSHistoGenericService('service', `and r["serviceInstanceId"] == "${serviceInstanceId}"`, 'group(columns: ["serviceId", "serviceInstanceId", "serviceInstanceProcessId", "_field"])')],
             ['serviceId', 'serviceInstanceId', 'serviceInstanceProcessId'])
-
-            return { SubscriptionType: `ID_ServiceInstance_${serviceInstanceId}`, data: combinedResults};
         } catch (error) {
             console.error(`${_logPrefix}GetInfluxDBResultsServiceInstance: Error: [${error}]`.red);
         }
+        return { topic: SubscriptionTopic.ServiceInstance, key: serviceInstanceId, data: retVal };
     }
     
     // Write data points ----------------------------------------------------------------------------------------------

package/src/instrumentationsubscriber.ts

@@ -0,0 +1,248 @@
+import { ISubscriptions, ISubscription, ISubscriptionPayload, SubscriptionTopic } from './commonTypes'
+import { KafkaManager, IKafkaManagerConfig } from './kafka/kafkamanager'
+import { InfluxDBManager } from './influxdb/influxDBManager'
+
+import { v4 as uuidv4 } from 'uuid';
+
+import { $Options } from '@nsshunt/stsconfig'
+import { STSOptionsBase } from '@nsshunt/stsutils';
+const goptions = $Options()
+
+export interface IInstrumentationSubscriberOptions {
+    SubscriptionInterval: number
+}
+
+export class InstrumentationSubscriber extends STSOptionsBase {
+    #subscriptions: Record<string, ISubscription> = { };
+    #influxDBManager: InfluxDBManager;
+    #interval: NodeJS.Timer | null = null;
+    #km: KafkaManager;
+    #KAFKA_PREFIX: string = '__STS__';
+
+    constructor(options: IInstrumentationSubscriberOptions) {
+        super(options);
+
+        this.#influxDBManager = new InfluxDBManager();
+
+        const kmc: IKafkaManagerConfig = {
+            clientId: goptions.kafka_clientId,
+            brokers: goptions.kafka_brokers.split(','),
+            keepAlive: goptions.kafka_keep_alive,
+            adminTimeout: goptions.kafka_admin_timeout,
+            connectionTimeout: goptions.kafka_connection_timeout,
+            logLevel: goptions.kafka_log_level,
+            useSSL: goptions.kafka_use_ssl,
+            requestTimeout: goptions.kafka_request_timeout
+        }
+        if (goptions.kafka_use_ssl) {
+            kmc.ssl = {
+                rejectUnauthorized: goptions.kafka_ssl_rejectUnauthorized,
+                cafile: goptions.kafka_ssl_cafile,
+                certfileFile: goptions.kafka_ssl_certfile,
+                keyfile: goptions.kafka_ssl_keyfile
+            }
+        }
+        this.#km = new KafkaManager(kmc);
+    }
+
+    async #UnSubscribeKafka(subscription: ISubscription): Promise<void> {
+        const unsubscribeKafka = async () => {
+            const kafka = subscription.kafka;
+            if (kafka) {
+                // Un-Subscribe from this kafka topic
+                console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Unsubscribe from Kafka topc: [${kafka.kafkaTopic}] Starting`.yellow)
+                await kafka.kafkaConsumer?.Stop();
+                await kafka.kafkaConsumer?.Disconnect();
+                console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Unsubscribe from Kafka topc: [${kafka.kafkaTopic}] Completed.`.yellow)
+            } else {
+                console.log(`InstrumentationSubscriber:#UnSubscribeKafka(): Kafka details do not eixsting for this topc: [${subscription.topic}].`.magenta)
+            }
+        };
+        return unsubscribeKafka();
+    }
+
+    async #SubscribeKafka(subscription: ISubscription): Promise<void> {
+        const kafkaSubscribe = async () => {
+            if (subscription.key) {
+                const kafkaSafeKey = `${this.#KAFKA_PREFIX}_${subscription.key}`.replace(/@/g, '_');
+                const kafkaGroupId = uuidv4();
+                subscription.kafka = {
+                    kafkaTopic: kafkaSafeKey,
+                    kafkaGroupId: kafkaGroupId,
+                    kafkaConsumer: this.#km.CreateConsumer(kafkaGroupId)
+                };
+                console.log(`InstrumentationSubscriber:#SubscribeKafka(): Subscribe to Kafka topc: [${subscription.kafka.kafkaTopic}] Starting`.yellow)
+
+                const kafka = subscription.kafka;
+                await kafka.kafkaConsumer.Connect();
+                await kafka.kafkaConsumer.Subscribe([kafka.kafkaTopic], false );
+                // eslint-disable-next-line  @typescript-eslint/no-unused-vars
+                await kafka.kafkaConsumer.StartConsumingMessages((topic, key, partition, value, headers) => {
+                    try {
+                        if (key != "" && value != "") {
+                            if (topic.localeCompare(key) === 0) {
+                                subscription.cb({
+                                    topic: SubscriptionTopic.LogProcessing,
+                                    key: subscription.key, // Original requested topic (may be kafka un-safe)
+                                    data: { 
+                                        kafkaTopic: kafka.kafkaTopic, // Safe kafka topic key with prefix. kafkaTopic, topic and key should be same value
+                                        kafkaGroupId: kafka.kafkaGroupId,
+                                        partition,
+                                        topic, // kafkaTopic, topic and key should be same value
+                                        key, // kafkaTopic, topic and key should be same value
+                                        value
+                                    }
+                                });
+                            } else {
+                                console.log(`InstrumentationSubscriber:#SubscribeKafka(): Invalid message format from Kafka data, topic: [${topic}] and key: [${key}] do not match`.red);
+                            }
+                        } else {
+                            console.log(`InstrumentationSubscriber:#SubscribeKafka(): Invalid message format from Kafka data, topic: [${topic}], key: [${key}], value: [${value}]`.red);
+                        }
+                    } catch (error) {
+                        console.log(`InstrumentationSubscriber:#SubscribeKafka(): Error: [${error}]`.red);
+                    }
+                });
+                console.log(`InstrumentationSubscriber:#SubscribeKafka(): Subscribe to Kafka topc: [${kafka.kafkaTopic}] Completed`.yellow)
+            } else {
+                console.log(`InstrumentationSubscriber:#SubscribeKafka(): Could not subscribe to Kafka topc, missing key for topic: [${subscription.topic}]`.magenta);
+            }
+        }
+        return kafkaSubscribe();
+    }
+
+    async #OutputSubscription(subscription: ISubscription): Promise<ISubscriptionPayload> {
+        // Service subscriptions
+        const { topic, key, subkey }  = subscription;
+        switch (topic) {
+        // Services -------------------------------------------------------------------------------------------
+        case SubscriptionTopic.AllServicesCombined :
+            return this.#influxDBManager.serviceManager.GetInfluxDBResultsRootService();
+        case SubscriptionTopic.Services :
+            return this.#influxDBManager.serviceManager.GetInfluxDBResultsService();
+        case SubscriptionTopic.ServiceInstances :
+            if (key) { // key = service_id
+                return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstances(key);
+            } else {
+                throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
+            }
+        case SubscriptionTopic.ServiceInstance :
+            if (key) { // key = service instance id
+                return this.#influxDBManager.serviceManager.GetInfluxDBResultsServiceInstance(key);
+            } else {
+                throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
+            }
+
+            // User Agents -------------------------------------------------------------------------------------------
+        case SubscriptionTopic.AllAgentsCombined :
+            return this.#influxDBManager.agentManager.GetInfluxDBResultsRootAgent();
+        case  SubscriptionTopic.Agents :
+            return this.#influxDBManager.agentManager.GetInfluxDBResultsAgent();
+        case  SubscriptionTopic.AgentWorkers :
+            if (key) { // key = agent instance id
+                return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThreads(key);
+            } else {
+                throw new Error(`#OutputSubscription: key not provided for subscription: [${topic}]`);
+            }
+        case SubscriptionTopic.AgentWorker :
+            if (key && subkey) { // key = agent instance id, subkey = agent instance worker id
+                return this.#influxDBManager.agentManager.GetInfluxDBResultsAgentThread(key, subkey);
+            } else {
+                throw new Error(`#OutputSubscription: key and/or subkey not provided for subscription: [${topic}]`);
+            }
+
+            // Logging (both service and agent) -----------------------------------------------------------------------
+        case SubscriptionTopic.LogProcessing :
+            // Kafka processing will be handled by a dedicated kafka run consumer
+            return { topic, data: null };
+        default :
+            return { topic, data: null };
+        }   
+    }
+
+    #ExecuteSubscriptions = async () => {
+        const promArray: Promise<ISubscriptionPayload>[] = [ ];
+        const indexArray: ISubscriptions = [ ];
+
+        for (const [, subscription] of Object.entries(this.#subscriptions)) {
+            promArray.push(this.#OutputSubscription(subscription));
+            indexArray.push(subscription);
+        }
+        const retVal = await Promise.all(promArray);
+        try {
+            for (let i=0; i < retVal.length; i++) {
+                indexArray[i].cb(retVal[i]);
+            }
+        } catch (error) {
+            console.log(`${error} -- ${JSON.stringify(retVal)}`.red);
+        }
+    }
+
+    Subscribe(subscriptions: ISubscriptions) {
+        if (this.#interval) {
+            clearInterval(this.#interval);
+        }
+        for (let i=0; i < subscriptions.length; i++) {
+            if (this.#subscriptions[subscriptions[i].topic]) {
+                // Subscription already exists - ignoring
+                console.log(`InstrumentationSubscriber.Subscribe(): Subscription already exists - ignoring.`.magenta);
+            } else {
+                this.#subscriptions[subscriptions[i].topic] = subscriptions[i];
+                console.log(`InstrumentationSubscriber.Subscribe(): topicKey: [${subscriptions[i].topic}] successfully subscribed.`.grey);
+                if (subscriptions[i].topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
+                    this.#SubscribeKafka(subscriptions[i]);
+                }
+            }
+        }
+
+        if (!this.#interval) {
+            // Output subscription immediately and then iterate ...
+            this.#ExecuteSubscriptions();
+            let interval = 1000; // default
+            if (this.options) {
+                interval = this.options.SubscriptionInterval
+            }
+            this.#interval = setInterval(() => {
+                this.#ExecuteSubscriptions();
+            }, interval);
+        }
+    }
+
+    UnSubscribe(subscriptions: ISubscriptions) {
+        for (let i=0; i < subscriptions.length; i++) {
+            if (subscriptions[i].topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
+                this.#UnSubscribeKafka(subscriptions[i]);
+            }
+            delete this.#subscriptions[subscriptions[i].topic];
+        }
+        if (Object.keys(this.#subscriptions).length === 0) {
+            if (this.#interval) {
+                clearInterval(this.#interval);
+                this.#interval = null;
+            }
+        }
+    }
+
+    #UnSubscribeAll() {
+        if (this.#interval) {
+            clearInterval(this.#interval);
+            this.#interval = null;
+        }
+        for (const [, subscription] of Object.entries(this.#subscriptions)) {
+            if (subscription.topic.localeCompare(SubscriptionTopic.LogProcessing) === 0) {
+                this.#UnSubscribeKafka(subscription);
+            }
+        }
+
+        this.#subscriptions = { };
+    }
+
+    async Start() {
+        return this.#influxDBManager.Start();
+    }
+
+    async Stop() {
+        this.#UnSubscribeAll();
+        return this.#influxDBManager.Terminate();
+    }
+}

package/src/kafka/kafkaconsumer.ts

@@ -1,6 +1,7 @@
 import { Kafka, Consumer, IHeaders } from 'kafkajs'
+import { IKafkaConsumer } from './../commonTypes'
 
-export class KafkaConsumer {
+export class KafkaConsumer implements IKafkaConsumer {
     #id: string
     #groupId: string
     #consumer: Consumer;

package/types/commonTypes.d.ts

@@ -6,6 +6,7 @@ import { PublishInstrumentControllerV2, InstrumentDefinitions } from '@nsshunt/s
 import { InstrumentBaseTelemetry, Gauge, InstrumentBase } from '@nsshunt/stsinstrumentation';
 import { PGAccessLayer } from '@nsshunt/stsdatamanagement';
 import { STSDefaultClientToServerEvents, STSDefaultServerToClientEvents } from '@nsshunt/stssocketio-client';
+import { Consumer, IHeaders } from 'kafkajs';
 export declare enum IPCMessageCommand {
     AddWorker = "AddWorker",
     DeleteWorker = "DeleteWorker"
@@ -162,4 +163,43 @@ export interface InstrumentPayload {
     context: ServiceProcessContext;
     instruments: Record<string, InstrumentBase>;
 }
+export declare enum SubscriptionTopic {
+    AllServicesCombined = "AllServicesCombined",
+    Services = "Services",
+    ServiceInstances = "ServiceInstances",
+    ServiceInstance = "ServiceInstance",
+    AllAgentsCombined = "AllAgentsCombined",
+    Agents = "Agents",
+    AgentWorkers = "AgentWorkers",
+    AgentWorker = "AgentWorker",
+    LogProcessing = "LogProcessing"
+}
+export interface IKafkaConsumer {
+    get consumer(): Consumer;
+    get id(): string;
+    Connect(): Promise<void>;
+    Disconnect(): Promise<void>;
+    Subscribe: (topics: string[], fromBeginning: boolean) => Promise<void>;
+    Stop: () => Promise<void>;
+    StartConsumingMessages: (cb: (topic: string, key: string, partition: number, value: string, headers: IHeaders | undefined) => void) => Promise<void>;
+}
+export interface ISubscriptionPayload {
+    topic: SubscriptionTopic;
+    key?: string;
+    subkey?: string;
+    data: any;
+}
+export interface IKafkaSubscription {
+    kafkaTopic: string;
+    kafkaGroupId: string;
+    kafkaConsumer: IKafkaConsumer;
+}
+export interface ISubscription {
+    topic: SubscriptionTopic;
+    key?: string;
+    subkey?: string;
+    kafka?: IKafkaSubscription;
+    cb: (payload: ISubscriptionPayload) => void;
+}
+export type ISubscriptions = ISubscription[];
 //# sourceMappingURL=commonTypes.d.ts.map

package/types/commonTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"commonTypes.d.ts","sourceRoot":"","sources":["../src/commonTypes.ts"],"names":[],"mappings":"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"}

package/types/influxdb/influxDBManagerAgent.d.ts

@@ -1,26 +1,14 @@
 import { WriteApi, QueryApi } from '@influxdata/influxdb-client';
 import { InfluxDBManagerBase } from './influxDBManagerBase';
-import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes';
+import { IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload } from './../commonTypes';
 export declare class InfluxDBManagerAgent extends InfluxDBManagerBase {
     #private;
     constructor(options: IInfluxDBManagerOptions, queryApi: QueryApi, writeClient: WriteApi);
     get modelType(): string;
-    GetInfluxDBResultsRootAgent(): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsAgent(): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsAgentThreads(agentName: string): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsAgentThread(agentName: string, threadId: string): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
+    GetInfluxDBResultsRootAgent(): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsAgent(): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsAgentThreads(agentName: string): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsAgentThread(agentName: string, threadId: string): Promise<ISubscriptionPayload>;
     OutputInfluxDB(instrumentPayload: InstrumentPayload): Promise<boolean>;
 }
 //# sourceMappingURL=influxDBManagerAgent.d.ts.map

package/types/influxdb/influxDBManagerAgent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI7E,qBAAa,oBAAqB,SAAQ,mBAAmB;;gBAE7C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAyGK,2BAA2B;;;;IAe3B,uBAAuB;;;;IAevB,8BAA8B,CAAC,SAAS,EAAE,MAAM;;;;IAgBhD,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;IAiBjE,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsC/E"}
+{"version":3,"file":"influxDBManagerAgent.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerAgent.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAItH,qBAAa,oBAAqB,SAAQ,mBAAmB;;gBAE7C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAyGK,2BAA2B,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe5D,uBAAuB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAexD,8BAA8B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAehF,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiBjG,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsC/E"}

package/types/influxdb/influxDBManagerService.d.ts

@@ -1,26 +1,14 @@
 import { WriteApi, QueryApi } from '@influxdata/influxdb-client';
 import { InfluxDBManagerBase } from './influxDBManagerBase';
-import { IInfluxDBManagerOptions, InstrumentPayload } from './../commonTypes';
+import { IInfluxDBManagerOptions, InstrumentPayload, ISubscriptionPayload } from './../commonTypes';
 export declare class InfluxDBManagerService extends InfluxDBManagerBase {
     #private;
     constructor(options: IInfluxDBManagerOptions, queryApi: QueryApi, writeClient: WriteApi);
     get modelType(): string;
-    GetInfluxDBResultsRootService(): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsService(): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsServiceInstances(serviceId: string): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
-    GetInfluxDBResultsServiceInstance(serviceInstanceId: string): Promise<{
-        SubscriptionType: string;
-        data: any;
-    } | undefined>;
+    GetInfluxDBResultsRootService(): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsService(): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsServiceInstances(serviceId: string): Promise<ISubscriptionPayload>;
+    GetInfluxDBResultsServiceInstance(serviceInstanceId: string): Promise<ISubscriptionPayload>;
     OutputInfluxDB(instrumentPayload: InstrumentPayload): Promise<boolean>;
 }
 //# sourceMappingURL=influxDBManagerService.d.ts.map

package/types/influxdb/influxDBManagerService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAI7E,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAwHK,6BAA6B;;;;IAe7B,yBAAyB;;;;IAezB,kCAAkC,CAAC,SAAS,EAAE,MAAM;;;;IAepD,iCAAiC,CAAC,iBAAiB,EAAE,MAAM;;;;IAiB3D,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD/E"}
+{"version":3,"file":"influxDBManagerService.d.ts","sourceRoot":"","sources":["../../src/influxdb/influxDBManagerService.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,QAAQ,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAIvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAE3D,OAAO,EAAE,uBAAuB,EAAE,iBAAiB,EAAE,oBAAoB,EAAqB,MAAM,kBAAkB,CAAA;AAItH,qBAAa,sBAAuB,SAAQ,mBAAmB;;gBAE/C,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ;IAIvF,IAAa,SAAS,IAAI,MAAM,CAE/B;IAwHK,6BAA6B,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe9D,yBAAyB,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAe1D,kCAAkC,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAepF,iCAAiC,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiB3F,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CAsD/E"}

package/types/instrumentationsubscriber.d.ts

@@ -0,0 +1,14 @@
+import { ISubscriptions } from './commonTypes';
+import { STSOptionsBase } from '@nsshunt/stsutils';
+export interface IInstrumentationSubscriberOptions {
+    SubscriptionInterval: number;
+}
+export declare class InstrumentationSubscriber extends STSOptionsBase {
+    #private;
+    constructor(options: IInstrumentationSubscriberOptions);
+    Subscribe(subscriptions: ISubscriptions): void;
+    UnSubscribe(subscriptions: ISubscriptions): void;
+    Start(): Promise<void>;
+    Stop(): Promise<void>;
+}
+//# sourceMappingURL=instrumentationsubscriber.d.ts.map

package/types/instrumentationsubscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentationsubscriber.d.ts","sourceRoot":"","sources":["../src/instrumentationsubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAA0D,MAAM,eAAe,CAAA;AAOtG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD,MAAM,WAAW,iCAAiC;IAC9C,oBAAoB,EAAE,MAAM,CAAA;CAC/B;AAED,qBAAa,yBAA0B,SAAQ,cAAc;;gBAO7C,OAAO,EAAE,iCAAiC;IA+JtD,SAAS,CAAC,aAAa,EAAE,cAAc;IA8BvC,WAAW,CAAC,aAAa,EAAE,cAAc;IA6BnC,KAAK;IAIL,IAAI;CAIb"}

package/types/kafka/kafkaconsumer.d.ts

@@ -1,5 +1,6 @@
 import { Kafka, Consumer, IHeaders } from 'kafkajs';
-export declare class KafkaConsumer {
+import { IKafkaConsumer } from './../commonTypes';
+export declare class KafkaConsumer implements IKafkaConsumer {
     #private;
     constructor(kafka: Kafka, id: string, groupId: string);
     get consumer(): Consumer;

package/types/kafka/kafkaconsumer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kafkaconsumer.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAEnD,qBAAa,aAAa;;gBAOV,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAOrD,IAAI,QAAQ,aAEX;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,SAAS,WAAiB,MAAM,EAAE,iBAAiB,OAAO,KAAG,QAAQ,IAAI,CAAC,CAMzE;IAED,IAAI,QAAY,QAAQ,IAAI,CAAC,CAI5B;IAED,sBAAsB,eAAsB,MAAM,OAAO,MAAM,aAAa,MAAM,SAAS,MAAM,WAAW,QAAQ,GAAG,SAAS,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CA2BxJ;CACJ"}
+{"version":3,"file":"kafkaconsumer.d.ts","sourceRoot":"","sources":["../../src/kafka/kafkaconsumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,qBAAa,aAAc,YAAW,cAAc;;gBAOpC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAOrD,IAAI,QAAQ,aAEX;IAED,IAAI,EAAE,IAAI,MAAM,CAEf;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAOxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC,SAAS,WAAiB,MAAM,EAAE,iBAAiB,OAAO,KAAG,QAAQ,IAAI,CAAC,CAMzE;IAED,IAAI,QAAY,QAAQ,IAAI,CAAC,CAI5B;IAED,sBAAsB,eAAsB,MAAM,OAAO,MAAM,aAAa,MAAM,SAAS,MAAM,WAAW,QAAQ,GAAG,SAAS,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CA2BxJ;CACJ"}