@nsshunt/stsuxvue 1.0.61 → 1.0.63

package/dist/stsuxvue.cjs

@@ -10324,7 +10324,6 @@ const SOCKET_NAMESPACE = "stsinstrumentmanager/stsmonitor";
 class ObservabilitySubscriberManager extends SocketIoClient {
   #socket = null;
   #observabilitySocketIOSubscriber = null;
-  #logger;
   #observabilitySubscriptionManager = null;
   #store;
   #state = "init";
@@ -10332,12 +10331,12 @@ class ObservabilitySubscriberManager extends SocketIoClient {
   #options;
   #tinyEmitter;
   #id;
+  logPrefix = `stsuxvue:ObservabilitySubscriberManager:`;
   constructor(options) {
     super("STSVueTilsTester");
     this.#id = v4();
     this.#options = options;
     this.#modelId = options.modelId;
-    this.#logger = stsutils.defaultLogger;
     this.#store = ModelStore();
     this.#tinyEmitter = new tinyEmitterExports.TinyEmitter();
     if (!this.#options.consumeInstrumentationMode) {
@@ -10349,74 +10348,105 @@ class ObservabilitySubscriberManager extends SocketIoClient {
   }
   #SocketIOConnect = (socket) => {
     try {
-      console.log(chalk.cyan(`SocketIOConnect(): Starting`));
-      console.log(chalk.cyan(`SocketIOConnect(): State: [${this.#state}]`));
-      console.log(chalk.cyan(`SocketIOConnect(): Current Model Subscriptions: [${this.#observabilitySubscriptionManager?.subscriptions}]`));
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Starting`));
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): State: [${this.#state}]`));
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Current Model Subscriptions: [${this.#observabilitySubscriptionManager?.subscriptions}]`));
       if (this.#observabilitySocketIOSubscriber instanceof stsobservability.ObservabilitySocketIOSubscriber) {
+        const observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
         if (socket.id) {
-          const observabilitySocketIOSubscriberSocketId = this.#observabilitySocketIOSubscriber.socket.id;
-          if (observabilitySocketIOSubscriberSocketId) {
-            if (socket.id.localeCompare(observabilitySocketIOSubscriberSocketId) === 0) {
-              this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnectSocket(): ids are the same - ignoring`));
+          if (observabilitySocketIOSubscriber.socket) {
+            const observabilitySocketIOSubscriberSocketId = observabilitySocketIOSubscriber.socket.id;
+            if (observabilitySocketIOSubscriberSocketId) {
+              if (socket.id.localeCompare(observabilitySocketIOSubscriberSocketId) === 0) {
+                this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnectSocket(): Socket IDs are the same, Socket ID: [${observabilitySocketIOSubscriberSocketId}]`));
+                this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnectSocket(): Ignoring any further actions on this socket.`));
+                return;
+              }
             }
+          } else {
+            (this.logger ?? stsutils.defaultLogger).warn(chalk.rgb(255, 165, 0)(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySocketIOSubscriber.socket does not exist`));
+            (this.logger ?? stsutils.defaultLogger).warn(chalk.rgb(255, 165, 0)(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): this should have been set when the initial subscription manager was created`));
           }
         }
-        this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): Socket ids are different - update with new socket`));
-        this.#observabilitySocketIOSubscriber.socket = socket;
-        this.#observabilitySubscriptionManager?.Stop();
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): Socket ids are different - update with new socket`));
+        if (observabilitySocketIOSubscriber.socket) {
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect():  -> Current Socket ID: [${observabilitySocketIOSubscriber.socket.id}]`));
+        } else {
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect():  -> Current Socket ID: [NONE - No current socket exists]`));
+        }
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect():  -> New (updated) Socket ID: [${socket.id}]`));
+        if (this.#observabilitySubscriptionManager) {
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager.Stop()`));
+          this.#observabilitySubscriptionManager?.Stop();
+        } else {
+          this.LogErrorMessage(chalk.red(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager does not exist`));
+        }
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): Setting new socket into observabilitySocketIOSubscriber, Socket ID: [${socket.id}]`));
+        observabilitySocketIOSubscriber.socket = socket;
         if (this.#state.localeCompare("started") === 0) {
           setTimeout(() => {
-            this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager Start`));
+            this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager Start`));
             this.#observabilitySubscriptionManager?.Start();
             this.#tinyEmitter.emit("connected");
           }, 2500);
         } else {
-          this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): state not in the started state, current state: [${this.#state}]`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): state not in the started state, current state: [${this.#state}]`));
           this.#tinyEmitter.emit("connected");
         }
       } else {
-        this.#logger.debug(chalk.cyan(`SocketIOConnect(): this.#observabilitySocketIOSubscriber not instance of ObservabilitySocketIOSubscriber`));
-        this.#logger.debug(chalk.cyan(this.#observabilitySocketIOSubscriber));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): this.#observabilitySocketIOSubscriber not instance of ObservabilitySocketIOSubscriber`));
+        this.LogDebugMessage(chalk.cyan(this.#observabilitySocketIOSubscriber));
         this.#tinyEmitter.emit("connected");
       }
     } catch (error) {
-      this.#logger.error(chalk.red(`SocketIOConnect(): Error: [${error}]`));
+      this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketIOConnect(): Error: [${error}]`));
       this.#tinyEmitter.emit("connected");
     } finally {
-      this.#logger.debug(chalk.cyan(`SocketIOConnect(): Ended`));
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Ended`));
     }
   };
-  #SetupObservabilitySubscriber = () => {
-    this.#logger.debug(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): consumeInstrumentationMode: [${this.#options.consumeInstrumentationMode}]`);
+  #SetupObservabilitySubscriber = (socket) => {
+    this.LogDebugMessage(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): consumeInstrumentationMode: [${this.#options.consumeInstrumentationMode}]`);
     switch (this.#options.consumeInstrumentationMode) {
       case "PROXY":
-        this.#observabilitySocketIOSubscriber = new stsobservability.ObservabilitySocketIOSubscriber({
-          socket: this.#socket,
-          keepAlive: 2500,
-          //@@
-          logger: this.#logger
-        });
+        {
+          if (socket) {
+            const keepAlive = 2500;
+            this.LogDebugMessage(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Creating ObservabilitySocketIOSubscriber(): Socket ID: [${socket.id}], keepAlive: [${keepAlive}]`);
+            this.#observabilitySocketIOSubscriber = new stsobservability.ObservabilitySocketIOSubscriber({
+              socket,
+              keepAlive,
+              logger: this.logger ?? stsutils.defaultLogger
+            });
+          } else {
+            this.LogErrorMessage(chalk.red(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Socket not defined. Cannot create ObservabilitySocketIOSubscriber() without socket defined.`));
+          }
+        }
         break;
       case "REST":
-        this.#observabilitySocketIOSubscriber = new stsobservability.ObservabilityRESTAPISubscriber({
-          keepAlive: 1e3,
-          //@@
-          urlBase: `${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}${this.#options.instrumentManagerAPIRoot}`,
-          logger: this.#logger
-        });
+        {
+          const urlBase = `${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}${this.#options.instrumentManagerAPIRoot}`;
+          const keepAlive = 1e3;
+          this.LogDebugMessage(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Creating ObservabilityRESTAPISubscriber(): Url Base: [${urlBase}], keepAlive: [${keepAlive}]`);
+          this.#observabilitySocketIOSubscriber = new stsobservability.ObservabilityRESTAPISubscriber({
+            keepAlive,
+            urlBase,
+            logger: this.logger ?? stsutils.defaultLogger
+          });
+        }
         break;
       default:
-        this.#logger.error(chalk.red(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${this.#options.consumeInstrumentationMode}]`));
+        this.LogErrorMessage(chalk.red(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${this.#options.consumeInstrumentationMode}]`));
         return;
     }
     this.#observabilitySubscriptionManager = new stsobservability.ObservabilitySubscriptionManager({
-      logger: this.#logger,
+      logger: this.logger ?? stsutils.defaultLogger,
       maxLogLength: 100
     });
     this.#observabilitySubscriptionManager.observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
   };
   UpdateModelCursor(subscriptions) {
-    this.#logger.debug(chalk.yellow(`UpdateModelCursor`));
+    this.LogDebugMessage(chalk.yellow(`${this.logPrefix}UpdateModelCursor`));
     this.#observabilitySubscriptionManager?.Stop();
     this.#state = "stopped";
     setTimeout(() => {
@@ -10424,7 +10454,7 @@ class ObservabilitySubscriberManager extends SocketIoClient {
         this.#observabilitySubscriptionManager.subscriptions = subscriptions;
         this.#observabilitySubscriptionManager.Start();
       } else {
-        this.#logger.debug(chalk.yellow(`UpdateModelCursor(): Could not update subscriptions, this.#observabilitySubscriptionManager not set`));
+        this.LogDebugMessage(chalk.yellow(`${this.logPrefix}UpdateModelCursor(): Could not update subscriptions, this.#observabilitySubscriptionManager not set`));
       }
       this.#state = "started";
     }, 0);
@@ -10454,19 +10484,19 @@ class ObservabilitySubscriberManager extends SocketIoClient {
           this.#store.UpdateServiceModel(this.#modelId, serviceModel, subscriptionPayload.subscriptionKey);
         }
       } else {
-        this.#logger.error(`TransformSubscriptionPayloadCallback(): observabilitySubscriptionManager not set`);
+        this.LogErrorMessage(`${this.logPrefix}TransformSubscriptionPayloadCallback(): observabilitySubscriptionManager not set`);
       }
     } catch (error) {
-      this.#logger.error(`TransformSubscriptionPayloadCallback(): #modelId: [${this.#modelId}], Error: [${error}]`);
+      this.LogErrorMessage(`${this.logPrefix}TransformSubscriptionPayloadCallback(): #modelId: [${this.#modelId}], Error: [${error}]`);
     }
   }
   Unsubscribe() {
-    this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe()`));
+    this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Unsubscribe()`));
     this.#state = "stopped";
     this.#observabilitySubscriptionManager?.Stop();
     if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
       setTimeout(() => {
-        this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe() socket.disconnect`));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Unsubscribe() socket.disconnect`));
         this.#socket?.disconnect();
         this.#socket = null;
       }, 1e3);
@@ -10477,11 +10507,11 @@ class ObservabilitySubscriberManager extends SocketIoClient {
       if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
         const onConnected = () => {
           this.#tinyEmitter.off("connected", onConnected);
-          this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Start() connected`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Start() connected`));
           resolve(true);
         };
         this.#tinyEmitter.on("connected", onConnected);
-        this.WithAddress(`${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}/${SOCKET_NAMESPACE}/`).WithLogger(this.#logger).SetupSocket();
+        this.WithAddress(`${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}/${SOCKET_NAMESPACE}/`).WithLogger(this.logger ?? stsutils.defaultLogger).SetupSocket();
       } else {
         this.#SetupObservabilitySubscriber();
         resolve(true);
@@ -10489,14 +10519,14 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     });
   };
   ConnectCallBack(socket) {
-    stsutils.defaultLogger.debug(chalk.magenta(`SocketIOConnect(): Socket ID: [${socket.id}]`));
+    this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketIOConnect:ConnectCallBack(): Socket ID: [${socket.id}]`));
     if (this.#observabilitySubscriptionManager === null) {
-      this.#SetupObservabilitySubscriber();
+      this.#SetupObservabilitySubscriber(socket);
     }
     this.#SocketIOConnect(socket);
   }
   ErrorCallBack(error) {
-    stsutils.defaultLogger.error(chalk.red(`SetupClientSideSocket error callback: [${error}]`));
+    this.LogErrorMessage(chalk.red(`${this.logPrefix}SetupClientSideSocket error callback: [${error}]`));
   }
   SocketEventsCallBack(socket) {
   }