@nsshunt/stsuxvue 1.0.46 → 1.0.48

package/dist/stsuxvue.mjs

@@ -1,14 +1,3 @@
-var __defProp = Object.defineProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var _socket, _observabilitySocketIOSubscriber, _logger, _observabilitySubscriptionManager, _store, _state, _modelId, _options2, _tinyEmitter, _id, _SocketIOConnect, _SetupObservabilitySubscriber, _SetupSocketIO, _SocketConnect, _ProcessSocketError, _ProcessSocketEvents;
 import { defineStore } from "pinia";
 import _cloneDeep from "lodash.clonedeep";
 import { defineComponent, defineAsyncComponent, ref, createElementBlock, openBlock, createVNode, unref, reactive, computed, watch, resolveComponent, createBlock, withCtx, createTextVNode, toDisplayString, createElementVNode, createCommentVNode, Fragment, renderList, onMounted, onBeforeUnmount, resolveDynamicComponent, isRef } from "vue";
@@ -5088,7 +5077,7 @@ function requireDecode() {
   var sorter = function(a, b) {
     return a < b ? 1 : -1;
   };
-  decode.decodeHTML = function() {
+  decode.decodeHTML = (function() {
     var legacy = Object.keys(legacy_json_1.default).sort(sorter);
     var keys = Object.keys(entities_json_1.default).sort(sorter);
     for (var i = 0, j = 0; i < keys.length; i++) {
@@ -5109,7 +5098,7 @@ function requireDecode() {
     return function(str) {
       return String(str).replace(re, replacer);
     };
-  }();
+  })();
   function getReplacer(map2) {
     return function replace(str) {
       if (str.charAt(1) === "#") {
@@ -5733,7 +5722,7 @@ function requireAnsi_to_html() {
     }
     return stickyStack;
   }
-  var Filter = /* @__PURE__ */ function() {
+  var Filter = /* @__PURE__ */ (function() {
     function Filter2(options) {
       _classCallCheck(this, Filter2);
       options = options || {};
@@ -5773,7 +5762,7 @@ function requireAnsi_to_html() {
       }
     }]);
     return Filter2;
-  }();
+  })();
   ansi_to_html = Filter;
   return ansi_to_html;
 }
@@ -9954,13 +9943,9 @@ function rng() {
 }
 const randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
 const native = { randomUUID };
-function v4(options, buf, offset) {
-  var _a;
-  if (native.randomUUID && true && !options) {
-    return native.randomUUID();
-  }
+function _v4(options, buf, offset) {
   options = options || {};
-  const rnds = options.random ?? ((_a = options.rng) == null ? void 0 : _a.call(options)) ?? rng();
+  const rnds = options.random ?? options.rng?.() ?? rng();
   if (rnds.length < 16) {
     throw new Error("Random bytes length must be >= 16");
   }
@@ -9968,25 +9953,29 @@ function v4(options, buf, offset) {
   rnds[8] = rnds[8] & 63 | 128;
   return unsafeStringify(rnds);
 }
-var __typeError2 = (msg) => {
-  throw TypeError(msg);
-};
-var __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError2("Cannot " + msg);
-var __privateGet2 = (obj, member, getter) => (__accessCheck2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd2 = (obj, member, value) => member.has(obj) ? __typeError2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet2 = (obj, member, value, setter) => (__accessCheck2(obj, member, "write to private field"), member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck2(obj, member, "access private method"), method);
-var _options, _sockets, _SocketIoClientHelper_instances, LogDebugMessage_fn, LogErrorMessage_fn, EstablishSocketConnect_fn;
+function v4(options, buf, offset) {
+  if (native.randomUUID && true && !options) {
+    return native.randomUUID();
+  }
+  return _v4(options);
+}
 const isNode = Object.prototype.toString.call(typeof process !== "undefined" ? process : 0) === "[object process]";
 class SocketIoClientHelper {
+  #options;
+  #sockets = {};
   constructor(options) {
-    __privateAdd2(this, _SocketIoClientHelper_instances);
-    __privateAdd2(this, _options);
-    __privateAdd2(this, _sockets, {});
-    __privateSet2(this, _options, options);
+    this.#options = options;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  #LogDebugMessage(message) {
+    if (this.#options.logger) this.#options.logger.debug(message);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  #LogErrorMessage(message) {
+    if (this.#options.logger) this.#options.logger.error(message);
   }
   get sockets() {
-    return __privateGet2(this, _sockets);
+    return this.#sockets;
   }
   SetupClientSideSocket(name, address, socketIoCustomPath, onConnectCallBack, socketEventsCallBack, errorCallBack) {
     this.sockets[name] = {
@@ -9995,7 +9984,7 @@ class SocketIoClientHelper {
       socket: null,
       errorCallBack
     };
-    __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack);
+    this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack);
     return this.sockets[name].socket;
   }
   GetSocket(name) {
@@ -10004,127 +9993,117 @@ class SocketIoClientHelper {
   GetSocketDetail(name) {
     return this.sockets[name];
   }
-}
-_options = /* @__PURE__ */ new WeakMap();
-_sockets = /* @__PURE__ */ new WeakMap();
-_SocketIoClientHelper_instances = /* @__PURE__ */ new WeakSet();
-LogDebugMessage_fn = function(message) {
-  if (__privateGet2(this, _options).logger) __privateGet2(this, _options).logger.debug(message);
-};
-LogErrorMessage_fn = function(message) {
-  if (__privateGet2(this, _options).logger) __privateGet2(this, _options).logger.error(message);
-};
-EstablishSocketConnect_fn = function(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack) {
-  const socketDetail = this.sockets[name];
-  if (socketDetail.socket !== null) {
-    if (socketDetail.socket.connected === true) {
-      socketDetail.socket.disconnect();
+  #EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack) {
+    const socketDetail = this.sockets[name];
+    if (socketDetail.socket !== null) {
+      if (socketDetail.socket.connected === true) {
+        socketDetail.socket.disconnect();
+      }
+      socketDetail.socket = null;
+      if (isNode) {
+        setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+      } else {
+        setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
+      }
+      return;
     }
-    socketDetail.socket = null;
+    let socketOptions;
     if (isNode) {
-      setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+      socketOptions = {
+        transports: ["websocket"]
+      };
+      if (this.#options.agentManager) {
+        socketOptions.agent = this.#options.agentManager.GetAgent(socketDetail.address);
+      }
     } else {
-      setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
+      socketOptions = {
+        transports: ["websocket"]
+      };
     }
-    return;
-  }
-  let socketOptions;
-  if (isNode) {
-    socketOptions = {
-      transports: ["websocket"]
-    };
-    if (__privateGet2(this, _options).agentManager) {
-      socketOptions.agent = __privateGet2(this, _options).agentManager.GetAgent(socketDetail.address);
+    if (socketIoCustomPath && socketIoCustomPath.localeCompare("") !== 0) {
+      socketOptions.path = socketIoCustomPath;
     }
-  } else {
-    socketOptions = {
-      transports: ["websocket"]
-    };
-  }
-  if (socketIoCustomPath && socketIoCustomPath.localeCompare("") !== 0) {
-    socketOptions.path = socketIoCustomPath;
-  }
-  socketDetail.socket = io(socketDetail.address, socketOptions);
-  socketDetail.socket.io.on("error", (err) => {
-    __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('error'): [${err}]`);
-  });
-  socketDetail.socket.io.on("reconnect_error", (err) => {
-    __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('reconnect_error'): [${err}]`);
-  });
-  socketDetail.socket.io.on("reconnect", (attempt) => {
-    __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.io.on('reconnect'): Number: [${attempt}]`);
-  });
-  socketDetail.socket.on("connect_error", (err) => {
-    __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.on('connect_error'): [${err}]`);
-  });
-  socketDetail.socket.on("connect_timeout", () => {
-    __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, `SocketIoClientHelper(): socketDetail.socket.on('connect_timeout')`);
-  });
-  socketDetail.socket.on("connect", () => {
-    if (socketDetail.socket) {
-      __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, `SocketIoClientHelper(): Socket: [${socketDetail.socket.id}]: connected`);
-      if (onConnectCallBack) {
-        setTimeout(() => {
-          onConnectCallBack(socketDetail.socket);
-        }, 0);
-      }
-      if (socketEventsCallBack) {
-        socketEventsCallBack(socketDetail.socket);
+    socketDetail.socket = io(socketDetail.address, socketOptions);
+    socketDetail.socket.io.on("error", (err) => {
+      this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('error'): [${err}]`);
+    });
+    socketDetail.socket.io.on("reconnect_error", (err) => {
+      this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect_error'): [${err}]`);
+    });
+    socketDetail.socket.io.on("reconnect", (attempt) => {
+      this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect'): Number: [${attempt}]`);
+    });
+    socketDetail.socket.on("connect_error", (err) => {
+      this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.on('connect_error'): [${err}]`);
+    });
+    socketDetail.socket.on("connect_timeout", () => {
+      this.#LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.on('connect_timeout')`);
+    });
+    socketDetail.socket.on("connect", () => {
+      if (socketDetail.socket) {
+        this.#LogDebugMessage(`SocketIoClientHelper(): Socket: [${socketDetail.socket.id}]: connected`);
+        if (onConnectCallBack) {
+          setTimeout(() => {
+            onConnectCallBack(socketDetail.socket);
+          }, 0);
+        }
+        if (socketEventsCallBack) {
+          socketEventsCallBack(socketDetail.socket);
+        }
+      } else {
+        const errorMessage = "SocketIoClientHelper(): Could not get socket object from socket.io";
+        this.#LogErrorMessage(errorMessage);
+        socketDetail.errorCallBack(new Error(errorMessage));
       }
-    } else {
-      const errorMessage = "SocketIoClientHelper(): Could not get socket object from socket.io";
-      __privateMethod(this, _SocketIoClientHelper_instances, LogErrorMessage_fn).call(this, errorMessage);
-      socketDetail.errorCallBack(new Error(errorMessage));
-    }
-  });
-  socketDetail.socket.on("disconnect", (reason) => {
-    var _a;
-    __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): socket disconnect: " + reason);
-    switch (reason) {
-      case "io server disconnect":
-        {
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
-          const socketDetail2 = this.sockets[name];
-          socketDetail2.socket = null;
-          if (isNode) {
-            if (__privateGet2(this, _options).agentManager) {
-              __privateGet2(this, _options).agentManager.ResetAgent();
+    });
+    socketDetail.socket.on("disconnect", (reason) => {
+      this.#LogDebugMessage("SocketIoClientHelper(): socket disconnect: " + reason);
+      switch (reason) {
+        case "io server disconnect":
+          {
+            this.#LogDebugMessage("SocketIoClientHelper(): The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
+            this.#LogDebugMessage("SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
+            const socketDetail2 = this.sockets[name];
+            socketDetail2.socket = null;
+            if (isNode) {
+              if (this.#options.agentManager) {
+                this.#options.agentManager.ResetAgent();
+              }
+              setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+            } else {
+              setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
             }
-            setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
-          } else {
-            setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
-          }
-        }
-        break;
-      case "io client disconnect":
-        __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
-        __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will not be re-established automatically.");
-        break;
-      case "transport close":
-      case "ping timeout":
-      case "transport error":
-        {
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, `SocketIoClientHelper(): Server unexpectedly disconnected. Reason: [${reason}]`);
-          __privateMethod(this, _SocketIoClientHelper_instances, LogDebugMessage_fn).call(this, "SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
-          const socketDetail2 = this.sockets[name];
-          if (socketDetail2.socket) {
-            socketDetail2.socket.disconnect();
           }
-          socketDetail2.socket = null;
-          if (isNode) {
-            if (__privateGet2(this, _options).agentManager) {
-              (_a = __privateGet2(this, _options).agentManager) == null ? void 0 : _a.ResetAgent();
+          break;
+        case "io client disconnect":
+          this.#LogDebugMessage("SocketIoClientHelper(): The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
+          this.#LogDebugMessage("SocketIoClientHelper(): The connection will not be re-established automatically.");
+          break;
+        case "transport close":
+        case "ping timeout":
+        case "transport error":
+          {
+            this.#LogDebugMessage(`SocketIoClientHelper(): Server unexpectedly disconnected. Reason: [${reason}]`);
+            this.#LogDebugMessage("SocketIoClientHelper(): The connection will be re-established when the server becomes available.");
+            const socketDetail2 = this.sockets[name];
+            if (socketDetail2.socket) {
+              socketDetail2.socket.disconnect();
+            }
+            socketDetail2.socket = null;
+            if (isNode) {
+              if (this.#options.agentManager) {
+                this.#options.agentManager?.ResetAgent();
+              }
+              setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
+            } else {
+              setTimeout(() => this.#EstablishSocketConnect(name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
             }
-            setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100).unref();
-          } else {
-            setTimeout(() => __privateMethod(this, _SocketIoClientHelper_instances, EstablishSocketConnect_fn).call(this, name, socketIoCustomPath, onConnectCallBack, socketEventsCallBack), 100);
           }
-        }
-        break;
-    }
-  });
-};
+          break;
+      }
+    });
+  }
+}
 var tinyEmitter = { exports: {} };
 var hasRequiredTinyEmitter;
 function requireTinyEmitter() {
@@ -10181,220 +10160,199 @@ function requireTinyEmitter() {
 var tinyEmitterExports = requireTinyEmitter();
 const SOCKET_NAMESPACE = "stsinstrumentmanager/stsmonitor";
 class ObservabilitySubscriberManager {
+  #socket = null;
+  #observabilitySocketIOSubscriber = null;
+  #logger;
+  #observabilitySubscriptionManager = null;
+  #store;
+  #state = "init";
+  #modelId;
+  #options;
+  #tinyEmitter;
+  #id;
   constructor(options) {
-    __privateAdd(this, _socket, null);
-    __privateAdd(this, _observabilitySocketIOSubscriber, null);
-    __privateAdd(this, _logger);
-    __privateAdd(this, _observabilitySubscriptionManager, null);
-    __privateAdd(this, _store);
-    __privateAdd(this, _state, "init");
-    __privateAdd(this, _modelId);
-    __privateAdd(this, _options2);
-    __privateAdd(this, _tinyEmitter);
-    __privateAdd(this, _id);
-    __privateAdd(this, _SocketIOConnect, (socket) => {
-      var _a, _b;
-      try {
-        console.log(chalk.cyan(`SocketIOConnect(): Starting`));
-        console.log(chalk.cyan(`SocketIOConnect(): State: [${__privateGet(this, _state)}]`));
-        console.log(chalk.cyan(`SocketIOConnect(): Current Model Subscriptions: [${(_a = __privateGet(this, _observabilitySubscriptionManager)) == null ? void 0 : _a.subscriptions}]`));
-        if (__privateGet(this, _observabilitySocketIOSubscriber) instanceof ObservabilitySocketIOSubscriber) {
-          if (socket.id) {
-            const observabilitySocketIOSubscriberSocketId = __privateGet(this, _observabilitySocketIOSubscriber).socket.id;
-            if (observabilitySocketIOSubscriberSocketId) {
-              if (socket.id.localeCompare(observabilitySocketIOSubscriberSocketId) === 0) {
-                __privateGet(this, _logger).debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnectSocket(): ids are the same - ignoring`));
-              }
+    this.#id = v4();
+    this.#options = options;
+    this.#modelId = options.modelId;
+    this.#logger = defaultLogger;
+    this.#store = ModelStore();
+    this.#tinyEmitter = new tinyEmitterExports.TinyEmitter();
+    if (!this.#options.consumeInstrumentationMode) {
+      this.#options.consumeInstrumentationMode = "PROXY";
+    }
+  }
+  get id() {
+    return this.#id;
+  }
+  #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}]`));
+      if (this.#observabilitySocketIOSubscriber instanceof 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`));
             }
           }
-          __privateGet(this, _logger).debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): Socket ids are different - update with new socket`));
-          __privateGet(this, _observabilitySocketIOSubscriber).socket = socket;
-          (_b = __privateGet(this, _observabilitySubscriptionManager)) == null ? void 0 : _b.Stop();
-          if (__privateGet(this, _state).localeCompare("started") === 0) {
-            setTimeout(() => {
-              var _a2;
-              __privateGet(this, _logger).debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager Start`));
-              (_a2 = __privateGet(this, _observabilitySubscriptionManager)) == null ? void 0 : _a2.Start();
-              __privateGet(this, _tinyEmitter).emit("connected");
-            }, 2500);
-          } else {
-            __privateGet(this, _logger).debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): state not in the started state, current state: [${__privateGet(this, _state)}]`));
-            __privateGet(this, _tinyEmitter).emit("connected");
-          }
-        } else {
-          __privateGet(this, _logger).debug(chalk.cyan(`SocketIOConnect(): this.#observabilitySocketIOSubscriber not instance of ObservabilitySocketIOSubscriber`));
-          __privateGet(this, _logger).debug(chalk.cyan(__privateGet(this, _observabilitySocketIOSubscriber)));
-          __privateGet(this, _tinyEmitter).emit("connected");
         }
-      } catch (error) {
-        __privateGet(this, _logger).error(chalk.red(`SocketIOConnect(): Error: [${error}]`));
-        __privateGet(this, _tinyEmitter).emit("connected");
-      } finally {
-        __privateGet(this, _logger).debug(chalk.cyan(`SocketIOConnect(): Ended`));
-      }
-    });
-    __privateAdd(this, _SetupObservabilitySubscriber, () => {
-      __privateGet(this, _logger).debug(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): consumeInstrumentationMode: [${__privateGet(this, _options2).consumeInstrumentationMode}]`);
-      switch (__privateGet(this, _options2).consumeInstrumentationMode) {
-        case "PROXY":
-          __privateSet(this, _observabilitySocketIOSubscriber, new ObservabilitySocketIOSubscriber({
-            socket: __privateGet(this, _socket),
-            keepAlive: 2500,
-            //@@
-            logger: __privateGet(this, _logger)
-          }));
-          break;
-        case "REST":
-          __privateSet(this, _observabilitySocketIOSubscriber, new ObservabilityRESTAPISubscriber({
-            keepAlive: 1e3,
-            //@@
-            urlBase: `${__privateGet(this, _options2).instrumentManagerEndpoint}:${__privateGet(this, _options2).instrumentManagerPort}${__privateGet(this, _options2).instrumentManagerAPIRoot}`,
-            logger: __privateGet(this, _logger)
-          }));
-          break;
-        default:
-          __privateGet(this, _logger).error(chalk.red(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${__privateGet(this, _options2).consumeInstrumentationMode}]`));
-          return;
-      }
-      __privateSet(this, _observabilitySubscriptionManager, new ObservabilitySubscriptionManager({
-        logger: __privateGet(this, _logger),
-        maxLogLength: 100
-      }));
-      __privateGet(this, _observabilitySubscriptionManager).observabilitySocketIOSubscriber = __privateGet(this, _observabilitySocketIOSubscriber);
-    });
-    __publicField(this, "Start", () => {
-      return new Promise((resolve) => {
-        if (__privateGet(this, _options2).consumeInstrumentationMode.localeCompare("PROXY") === 0) {
-          const onConnected = () => {
-            __privateGet(this, _tinyEmitter).off("connected", onConnected);
-            __privateGet(this, _logger).debug(chalk.cyan(`ObservabilitySubscriberManager:Start() connected`));
-            resolve(true);
-          };
-          __privateGet(this, _tinyEmitter).on("connected", onConnected);
-          __privateGet(this, _SetupSocketIO).call(this);
+        this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): Socket ids are different - update with new socket`));
+        this.#observabilitySocketIOSubscriber.socket = socket;
+        this.#observabilitySubscriptionManager?.Stop();
+        if (this.#state.localeCompare("started") === 0) {
+          setTimeout(() => {
+            this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): observabilitySubscriptionManager Start`));
+            this.#observabilitySubscriptionManager?.Start();
+            this.#tinyEmitter.emit("connected");
+          }, 2500);
         } else {
-          __privateGet(this, _SetupObservabilitySubscriber).call(this);
-          resolve(true);
+          this.#logger.debug(chalk.cyan(`AgentSocketClient:constructor:SocketIOConnect(): state not in the started state, current state: [${this.#state}]`));
+          this.#tinyEmitter.emit("connected");
         }
-      });
-    });
-    __privateAdd(this, _SetupSocketIO, () => {
-      const socketUtils = new SocketIoClientHelper({});
-      __privateSet(this, _socket, socketUtils.SetupClientSideSocket(
-        "STSVueTilsTester",
-        `${__privateGet(this, _options2).instrumentManagerEndpoint}:${__privateGet(this, _options2).instrumentManagerPort}/${SOCKET_NAMESPACE}/`,
-        "",
-        // use default /socket.io/ path
-        __privateGet(this, _SocketConnect),
-        // Connected call back
-        __privateGet(this, _ProcessSocketEvents),
-        // Custom Events
-        __privateGet(this, _ProcessSocketError)
-        // Handle socket errors
-      ));
-    });
-    __privateAdd(this, _SocketConnect, (socket) => {
-      defaultLogger.debug(chalk.magenta(`SocketIOConnect(): Socket ID: [${socket.id}]`));
-      if (__privateGet(this, _observabilitySubscriptionManager) === null) {
-        __privateGet(this, _SetupObservabilitySubscriber).call(this);
+      } else {
+        this.#logger.debug(chalk.cyan(`SocketIOConnect(): this.#observabilitySocketIOSubscriber not instance of ObservabilitySocketIOSubscriber`));
+        this.#logger.debug(chalk.cyan(this.#observabilitySocketIOSubscriber));
+        this.#tinyEmitter.emit("connected");
       }
-      __privateGet(this, _SocketIOConnect).call(this, socket);
-    });
-    __privateAdd(this, _ProcessSocketError, (error) => {
-      defaultLogger.error(chalk.red(`SetupClientSideSocket error callback: [${error}]`));
-    });
-    __privateAdd(this, _ProcessSocketEvents, (socket) => {
-    });
-    __privateSet(this, _id, v4());
-    __privateSet(this, _options2, options);
-    __privateSet(this, _modelId, options.modelId);
-    __privateSet(this, _logger, defaultLogger);
-    __privateSet(this, _store, ModelStore());
-    __privateSet(this, _tinyEmitter, new tinyEmitterExports.TinyEmitter());
-    if (!__privateGet(this, _options2).consumeInstrumentationMode) {
-      __privateGet(this, _options2).consumeInstrumentationMode = "PROXY";
+    } catch (error) {
+      this.#logger.error(chalk.red(`SocketIOConnect(): Error: [${error}]`));
+      this.#tinyEmitter.emit("connected");
+    } finally {
+      this.#logger.debug(chalk.cyan(`SocketIOConnect(): Ended`));
     }
-  }
-  get id() {
-    return __privateGet(this, _id);
-  }
+  };
+  #SetupObservabilitySubscriber = () => {
+    this.#logger.debug(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): consumeInstrumentationMode: [${this.#options.consumeInstrumentationMode}]`);
+    switch (this.#options.consumeInstrumentationMode) {
+      case "PROXY":
+        this.#observabilitySocketIOSubscriber = new ObservabilitySocketIOSubscriber({
+          socket: this.#socket,
+          keepAlive: 2500,
+          //@@
+          logger: this.#logger
+        });
+        break;
+      case "REST":
+        this.#observabilitySocketIOSubscriber = new ObservabilityRESTAPISubscriber({
+          keepAlive: 1e3,
+          //@@
+          urlBase: `${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}${this.#options.instrumentManagerAPIRoot}`,
+          logger: this.#logger
+        });
+        break;
+      default:
+        this.#logger.error(chalk.red(`ObservabilitySubscriberManager:SetupObservabilitySubscriber(): Unsupported consumeInstrumentationMode mode: [${this.#options.consumeInstrumentationMode}]`));
+        return;
+    }
+    this.#observabilitySubscriptionManager = new ObservabilitySubscriptionManager({
+      logger: this.#logger,
+      maxLogLength: 100
+    });
+    this.#observabilitySubscriptionManager.observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
+  };
   UpdateModelCursor(subscriptions) {
-    var _a;
-    __privateGet(this, _logger).debug(chalk.yellow(`UpdateModelCursor`));
-    (_a = __privateGet(this, _observabilitySubscriptionManager)) == null ? void 0 : _a.Stop();
-    __privateSet(this, _state, "stopped");
+    this.#logger.debug(chalk.yellow(`UpdateModelCursor`));
+    this.#observabilitySubscriptionManager?.Stop();
+    this.#state = "stopped";
     setTimeout(() => {
-      if (__privateGet(this, _observabilitySubscriptionManager)) {
-        __privateGet(this, _observabilitySubscriptionManager).subscriptions = subscriptions;
-        __privateGet(this, _observabilitySubscriptionManager).Start();
+      if (this.#observabilitySubscriptionManager) {
+        this.#observabilitySubscriptionManager.subscriptions = subscriptions;
+        this.#observabilitySubscriptionManager.Start();
       } else {
-        __privateGet(this, _logger).debug(chalk.yellow(`UpdateModelCursor(): Could not update subscriptions, this.#observabilitySubscriptionManager not set`));
+        this.#logger.debug(chalk.yellow(`UpdateModelCursor(): Could not update subscriptions, this.#observabilitySubscriptionManager not set`));
       }
-      __privateSet(this, _state, "started");
+      this.#state = "started";
     }, 0);
   }
   TransformSubscriptionPayloadCallback(subscriptionPayload) {
     try {
-      if (__privateGet(this, _observabilitySubscriptionManager)) {
-        __privateGet(this, _observabilitySubscriptionManager).TransformSubscriptionPayloadCallback(subscriptionPayload, false);
+      if (this.#observabilitySubscriptionManager) {
+        this.#observabilitySubscriptionManager.TransformSubscriptionPayloadCallback(subscriptionPayload, false);
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.AllAgentsCombined) === 0) {
-          const agentModel = __privateGet(this, _observabilitySubscriptionManager).agentModel;
-          __privateGet(this, _store).UpdateAgentModel(__privateGet(this, _modelId), agentModel, subscriptionPayload.subscriptionKey);
+          const agentModel = this.#observabilitySubscriptionManager.agentModel;
+          this.#store.UpdateAgentModel(this.#modelId, agentModel, subscriptionPayload.subscriptionKey);
         }
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.AllServicesCombined) === 0) {
-          const serviceModel = __privateGet(this, _observabilitySubscriptionManager).serviceModel;
-          __privateGet(this, _store).UpdateServiceModel(__privateGet(this, _modelId), serviceModel, subscriptionPayload.subscriptionKey);
+          const serviceModel = this.#observabilitySubscriptionManager.serviceModel;
+          this.#store.UpdateServiceModel(this.#modelId, serviceModel, subscriptionPayload.subscriptionKey);
         }
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.Services) === 0) {
-          const serviceModel = __privateGet(this, _observabilitySubscriptionManager).serviceModel;
-          __privateGet(this, _store).UpdateServiceModel(__privateGet(this, _modelId), serviceModel, subscriptionPayload.subscriptionKey);
+          const serviceModel = this.#observabilitySubscriptionManager.serviceModel;
+          this.#store.UpdateServiceModel(this.#modelId, serviceModel, subscriptionPayload.subscriptionKey);
         }
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.ServiceInstances) === 0) {
-          const serviceModel = __privateGet(this, _observabilitySubscriptionManager).serviceModel;
-          __privateGet(this, _store).UpdateServiceModel(__privateGet(this, _modelId), serviceModel, subscriptionPayload.subscriptionKey);
+          const serviceModel = this.#observabilitySubscriptionManager.serviceModel;
+          this.#store.UpdateServiceModel(this.#modelId, serviceModel, subscriptionPayload.subscriptionKey);
         }
         if (subscriptionPayload.subscriptionKey.topic.localeCompare(SubscriptionTopic.ServiceInstance) === 0) {
-          const serviceModel = __privateGet(this, _observabilitySubscriptionManager).serviceModel;
-          __privateGet(this, _store).UpdateServiceModel(__privateGet(this, _modelId), serviceModel, subscriptionPayload.subscriptionKey);
+          const serviceModel = this.#observabilitySubscriptionManager.serviceModel;
+          this.#store.UpdateServiceModel(this.#modelId, serviceModel, subscriptionPayload.subscriptionKey);
         }
       } else {
-        __privateGet(this, _logger).error(`TransformSubscriptionPayloadCallback(): observabilitySubscriptionManager not set`);
+        this.#logger.error(`TransformSubscriptionPayloadCallback(): observabilitySubscriptionManager not set`);
       }
     } catch (error) {
-      __privateGet(this, _logger).error(`TransformSubscriptionPayloadCallback(): #modelId: [${__privateGet(this, _modelId)}], Error: [${error}]`);
+      this.#logger.error(`TransformSubscriptionPayloadCallback(): #modelId: [${this.#modelId}], Error: [${error}]`);
     }
   }
   Unsubscribe() {
-    var _a;
-    __privateGet(this, _logger).debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe()`));
-    __privateSet(this, _state, "stopped");
-    (_a = __privateGet(this, _observabilitySubscriptionManager)) == null ? void 0 : _a.Stop();
-    if (__privateGet(this, _options2).consumeInstrumentationMode.localeCompare("PROXY") === 0) {
+    this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe()`));
+    this.#state = "stopped";
+    this.#observabilitySubscriptionManager?.Stop();
+    if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
       setTimeout(() => {
-        var _a2;
-        __privateGet(this, _logger).debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe() socket.disconnect`));
-        (_a2 = __privateGet(this, _socket)) == null ? void 0 : _a2.disconnect();
-        __privateSet(this, _socket, null);
+        this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Unsubscribe() socket.disconnect`));
+        this.#socket?.disconnect();
+        this.#socket = null;
       }, 1e3);
     }
   }
+  Start = () => {
+    return new Promise((resolve) => {
+      if (this.#options.consumeInstrumentationMode.localeCompare("PROXY") === 0) {
+        const onConnected = () => {
+          this.#tinyEmitter.off("connected", onConnected);
+          this.#logger.debug(chalk.cyan(`ObservabilitySubscriberManager:Start() connected`));
+          resolve(true);
+        };
+        this.#tinyEmitter.on("connected", onConnected);
+        this.#SetupSocketIO();
+      } else {
+        this.#SetupObservabilitySubscriber();
+        resolve(true);
+      }
+    });
+  };
+  #SetupSocketIO = () => {
+    const socketUtils = new SocketIoClientHelper({});
+    this.#socket = socketUtils.SetupClientSideSocket(
+      "STSVueTilsTester",
+      `${this.#options.instrumentManagerEndpoint}:${this.#options.instrumentManagerPort}/${SOCKET_NAMESPACE}/`,
+      "",
+      // use default /socket.io/ path
+      this.#SocketConnect,
+      // Connected call back
+      this.#ProcessSocketEvents,
+      // Custom Events
+      this.#ProcessSocketError
+      // Handle socket errors
+    );
+  };
+  #SocketConnect = (socket) => {
+    defaultLogger.debug(chalk.magenta(`SocketIOConnect(): Socket ID: [${socket.id}]`));
+    if (this.#observabilitySubscriptionManager === null) {
+      this.#SetupObservabilitySubscriber();
+    }
+    this.#SocketIOConnect(socket);
+  };
+  #ProcessSocketError = (error) => {
+    defaultLogger.error(chalk.red(`SetupClientSideSocket error callback: [${error}]`));
+  };
+  #ProcessSocketEvents = (socket) => {
+  };
 }
-_socket = new WeakMap();
-_observabilitySocketIOSubscriber = new WeakMap();
-_logger = new WeakMap();
-_observabilitySubscriptionManager = new WeakMap();
-_store = new WeakMap();
-_state = new WeakMap();
-_modelId = new WeakMap();
-_options2 = new WeakMap();
-_tinyEmitter = new WeakMap();
-_id = new WeakMap();
-_SocketIOConnect = new WeakMap();
-_SetupObservabilitySubscriber = new WeakMap();
-_SetupSocketIO = new WeakMap();
-_SocketConnect = new WeakMap();
-_ProcessSocketError = new WeakMap();
-_ProcessSocketEvents = new WeakMap();
 const _hoisted_1$1 = { class: "d-flex flex-wrap justify-space-between" };
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "UXModelNavigator",
@@ -10407,7 +10365,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const store = ModelStore();
     let observabilitySubscriberManager = null;
     const TransformSubscriptionPayloadCallback = (subscriptionPayload) => {
-      observabilitySubscriberManager == null ? void 0 : observabilitySubscriberManager.TransformSubscriptionPayloadCallback(subscriptionPayload);
+      observabilitySubscriberManager?.TransformSubscriptionPayloadCallback(subscriptionPayload);
     };
     let rootLevelSubscriptions = [{
       subscriptionKey: {
@@ -10490,10 +10448,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       }
     });
     const clicked = function(id) {
-      var _a, _b;
       if (store._models[props.modelId]) {
         if (store._models[props.modelId].serviceModelSubscriptionKey) {
-          switch ((_a = store._models[props.modelId].serviceModelSubscriptionKey) == null ? void 0 : _a.topic) {
+          switch (store._models[props.modelId].serviceModelSubscriptionKey?.topic) {
             case SubscriptionTopic.AllServicesCombined:
               navigate(ServicesSubscriptions);
               break;
@@ -10501,7 +10458,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               navigate(GetServiceInstancesSubscriptions(id));
               break;
             case SubscriptionTopic.ServiceInstances:
-              navigate(GetServiceInstanceSubscriptions((_b = store._models[props.modelId].serviceModelSubscriptionKey) == null ? void 0 : _b.key, id));
+              navigate(GetServiceInstanceSubscriptions(store._models[props.modelId].serviceModelSubscriptionKey?.key, id));
               break;
           }
         }
@@ -10511,7 +10468,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       obj.subscriptions.push(navSubscriptions);
       navSubscriptions = subscriptions;
       obj.currentSubscriptions = subscriptions;
-      observabilitySubscriberManager == null ? void 0 : observabilitySubscriberManager.UpdateModelCursor(subscriptions);
+      observabilitySubscriberManager?.UpdateModelCursor(subscriptions);
     };
     const GoBack = function() {
       if (obj.subscriptions.length > 0) {
@@ -10519,7 +10476,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         if (key) {
           navSubscriptions = key;
           obj.currentSubscriptions = key;
-          observabilitySubscriberManager == null ? void 0 : observabilitySubscriberManager.UpdateModelCursor(navSubscriptions);
+          observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
         }
       }
     };
@@ -10527,7 +10484,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       obj.subscriptions = [];
       navSubscriptions = rootLevelSubscriptions;
       obj.currentSubscriptions = rootLevelSubscriptions;
-      observabilitySubscriberManager == null ? void 0 : observabilitySubscriberManager.UpdateModelCursor(navSubscriptions);
+      observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
     };
     onMounted(() => {
       console.log(`UXModelNavigator: onMounted()`);
@@ -10552,7 +10509,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       store.UpdateObservabilitySubscriberManager(observabilitySubscriberManager.id, observabilitySubscriberManager);
       await observabilitySubscriberManager.Start();
       obj.currentSubscriptions = rootLevelSubscriptions;
-      observabilitySubscriberManager == null ? void 0 : observabilitySubscriberManager.UpdateModelCursor(rootLevelSubscriptions);
+      observabilitySubscriberManager?.UpdateModelCursor(rootLevelSubscriptions);
       store.UpdateSate(props.modelId, _estate.STARTED);
     };
     __expose({