@nsshunt/stsuxvue 1.0.63 → 1.0.65

package/dist/stsuxvue.cjs

@@ -10358,39 +10358,38 @@ class ObservabilitySubscriberManager extends SocketIoClient {
             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.`));
+                this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Socket IDs are the same, Socket ID: [${observabilitySocketIOSubscriberSocketId}]`));
                 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 ?? stsutils.defaultLogger).warn(chalk.rgb(255, 165, 0)(`${this.logPrefix}SocketIOConnect(): observabilitySocketIOSubscriber.socket does not exist`));
+            (this.logger ?? stsutils.defaultLogger).warn(chalk.rgb(255, 165, 0)(`${this.logPrefix}SocketIOConnect(): this should have been set when the initial subscription manager was created`));
           }
         }
-        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): Socket ids are different - update with new socket`));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}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}]`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}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}SocketIOConnect():  -> Current Socket ID: [NONE - No current socket exists]`));
         }
-        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect():  -> New (updated) Socket ID: [${socket.id}]`));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect():  -> New (updated) Socket ID: [${socket.id}]`));
         if (this.#observabilitySubscriptionManager) {
-          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager.Stop()`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager.Stop()`));
           this.#observabilitySubscriptionManager?.Stop();
         } else {
-          this.LogErrorMessage(chalk.red(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager does not exist`));
+          this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager does not exist`));
         }
-        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): Setting new socket into observabilitySocketIOSubscriber, Socket ID: [${socket.id}]`));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Setting new socket into observabilitySocketIOSubscriber, Socket ID: [${socket.id}]`));
         observabilitySocketIOSubscriber.socket = socket;
         if (this.#state.localeCompare("started") === 0) {
           setTimeout(() => {
-            this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager Start`));
+            this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager Start`));
             this.#observabilitySubscriptionManager?.Start();
             this.#tinyEmitter.emit("connected");
           }, 2500);
         } else {
-          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}AgentSocketClient:constructor:SocketIOConnect(): state not in the started state, current state: [${this.#state}]`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): state not in the started state, current state: [${this.#state}]`));
           this.#tinyEmitter.emit("connected");
         }
       } else {
@@ -10406,20 +10405,20 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     }
   };
   #SetupObservabilitySubscriber = (socket) => {
-    this.LogDebugMessage(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): consumeInstrumentationMode: [${this.#options.consumeInstrumentationMode}]`);
+    this.LogDebugMessage(`${this.logPrefix}SetupObservabilitySubscriber(): consumeInstrumentationMode: [${this.#options.consumeInstrumentationMode}]`);
     switch (this.#options.consumeInstrumentationMode) {
       case "PROXY":
         {
           if (socket) {
             const keepAlive = 2500;
-            this.LogDebugMessage(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Creating ObservabilitySocketIOSubscriber(): Socket ID: [${socket.id}], keepAlive: [${keepAlive}]`);
+            this.LogDebugMessage(`${this.logPrefix}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.`));
+            this.LogErrorMessage(chalk.red(`${this.logPrefix}SetupObservabilitySubscriber(): Socket not defined. Cannot create ObservabilitySocketIOSubscriber() without socket defined.`));
           }
         }
         break;
@@ -10427,7 +10426,7 @@ class ObservabilitySubscriberManager extends SocketIoClient {
         {
           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.LogDebugMessage(`${this.logPrefix}SetupObservabilitySubscriber(): Creating ObservabilityRESTAPISubscriber(): Url Base: [${urlBase}], keepAlive: [${keepAlive}]`);
           this.#observabilitySocketIOSubscriber = new stsobservability.ObservabilityRESTAPISubscriber({
             keepAlive,
             urlBase,
@@ -10436,7 +10435,7 @@ class ObservabilitySubscriberManager extends SocketIoClient {
         }
         break;
       default:
-        this.LogErrorMessage(chalk.red(`${this.logPrefix}ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${this.#options.consumeInstrumentationMode}]`));
+        this.LogErrorMessage(chalk.red(`${this.logPrefix}SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${this.#options.consumeInstrumentationMode}]`));
         return;
     }
     this.#observabilitySubscriptionManager = new stsobservability.ObservabilitySubscriptionManager({
@@ -10446,12 +10445,14 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     this.#observabilitySubscriptionManager.observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
   };
   UpdateModelCursor(subscriptions) {
-    this.LogDebugMessage(chalk.yellow(`${this.logPrefix}UpdateModelCursor`));
+    this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager.Stop()`));
     this.#observabilitySubscriptionManager?.Stop();
     this.#state = "stopped";
     setTimeout(() => {
       if (this.#observabilitySubscriptionManager) {
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager.subscriptions: [${subscriptions}]`));
         this.#observabilitySubscriptionManager.subscriptions = subscriptions;
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager.Start()`));
         this.#observabilitySubscriptionManager.Start();
       } else {
         this.LogDebugMessage(chalk.yellow(`${this.logPrefix}UpdateModelCursor(): Could not update subscriptions, this.#observabilitySubscriptionManager not set`));
@@ -10491,12 +10492,12 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     }
   }
   Unsubscribe() {
-    this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Unsubscribe()`));
     this.#state = "stopped";
+    this.LogDebugMessage(chalk.cyan(`${this.logPrefix}Unsubscribe() observabilitySubscriptionManager.Stop()`));
     this.#observabilitySubscriptionManager?.Stop();
     if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
       setTimeout(() => {
-        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Unsubscribe() socket.disconnect`));
+        this.LogDebugMessage(chalk.cyan(`${this.logPrefix}Unsubscribe() socket.disconnect`));
         this.#socket?.disconnect();
         this.#socket = null;
       }, 1e3);
@@ -10507,7 +10508,7 @@ class ObservabilitySubscriberManager extends SocketIoClient {
       if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
         const onConnected = () => {
           this.#tinyEmitter.off("connected", onConnected);
-          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}ObservabilitySubscriberManager:Start() connected`));
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}Start(): connected`));
           resolve(true);
         };
         this.#tinyEmitter.on("connected", onConnected);
@@ -10519,14 +10520,14 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     });
   };
   ConnectCallBack(socket) {
-    this.LogDebugMessage(chalk.magenta(`${this.logPrefix}SocketIOConnect:ConnectCallBack(): Socket ID: [${socket.id}]`));
+    this.LogDebugMessage(chalk.magenta(`${this.logPrefix}ConnectCallBack(): Socket ID: [${socket.id}]`));
     if (this.#observabilitySubscriptionManager === null) {
       this.#SetupObservabilitySubscriber(socket);
     }
     this.#SocketIOConnect(socket);
   }
   ErrorCallBack(error) {
-    this.LogErrorMessage(chalk.red(`${this.logPrefix}SetupClientSideSocket error callback: [${error}]`));
+    this.LogErrorMessage(chalk.red(`${this.logPrefix}ErrorCallBack(): Error callback: [${error}]`));
   }
   SocketEventsCallBack(socket) {
   }