@nsshunt/stsuxvue 1.0.72 → 1.0.74

package/dist/stsuxvue.cjs

@@ -10077,21 +10077,33 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
   #socketIoCustomPath;
   #authToken;
   #socket;
+  #reconnectTimeout = 2e3;
+  // default
   constructor(name) {
     super();
     this.#name = name;
   }
+  get logPrefix() {
+    return `SocketIoClient[${this.#name}]:`;
+  }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   LogDebugMessage(message) {
-    if (this.#logger) this.#logger.debug(message);
+    if (this.#logger) this.#logger.debug(`${this.logPrefix}${message}`);
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   LogErrorMessage(message) {
-    if (this.#logger) this.#logger.error(message);
+    if (this.#logger) this.#logger.error(`${this.logPrefix}${message}`);
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  LogWarningMessage(message) {
+    if (this.#logger) this.#logger.warn(`${this.logPrefix}${message}`);
   }
   get name() {
     return this.#name;
   }
+  get reconnectTimeout() {
+    return this.#reconnectTimeout;
+  }
   get agentManager() {
     return this.#agentManager;
   }
@@ -10130,6 +10142,10 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
     this.#agentManager = agentManager;
     return this;
   }
+  WithReconnectTimeout(reconnectTimeout) {
+    this.#reconnectTimeout = reconnectTimeout;
+    return this;
+  }
   SetupSocket() {
     if (!this.#address) {
       throw new Error(`SocketIoClientHelper:SetupSocket(): Error: [address not provided]`);
@@ -10162,9 +10178,9 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
       }
       this.#socket = void 0;
       if (isNode) {
-        setTimeout(() => this.#EstablishSocketConnect(), 100).unref();
+        setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
       } else {
-        setTimeout(() => this.#EstablishSocketConnect(), 100);
+        setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
       }
       return;
     }
@@ -10175,7 +10191,7 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
       };
       if (this.#agentManager) {
         if (!this.#address) {
-          throw new Error(`SocketIoClientHelper:SetupSocket(): Error: [address not provided when using agentManager]`);
+          throw new Error(`SocketIoClient:SetupSocket(): Error: [address not provided when using agentManager]`);
         }
         socketOptions.agent = this.#agentManager.GetAgent(this.#address);
       }
@@ -10196,58 +10212,58 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
     }
     this.#socket = socket_ioClient.io(this.#address, socketOptions);
     this.#socket.io.on("error", (err) => {
-      this.LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('error'): [${err}] Address: [${this.#address}]`);
+      this.LogErrorMessage(`socketDetail.socket.io.on('error'): [${err}] Address: [${this.#address}]`);
     });
     this.#socket.io.on("reconnect_error", (err) => {
-      this.LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect_error'): [${err}] Address: [${this.#address}]`);
+      this.LogErrorMessage(`socketDetail.socket.io.on('reconnect_error'): [${err}] Address: [${this.#address}]`);
     });
     this.#socket.on("connect_error", (err) => {
-      this.LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.on('connect_error'): [${err}] Address: [${this.#address}]`);
+      this.LogErrorMessage(`socketDetail.socket.on('connect_error'): [${err}] Address: [${this.#address}]`);
     });
     this.#socket.io.on("reconnect", (attempt) => {
-      this.LogErrorMessage(`SocketIoClientHelper(): socketDetail.socket.io.on('reconnect'): Number: [${attempt}] Address: [${this.#address}]`);
+      this.LogErrorMessage(`socketDetail.socket.io.on('reconnect'): Number: [${attempt}] Address: [${this.#address}]`);
     });
     this.#socket.on("connect", () => {
       if (this.#socket) {
-        this.LogDebugMessage(`SocketIoClientHelper(): Socket: [${this.#socket.id}]: connected, Address: [${this.#address}]`);
+        this.LogDebugMessage(`Socket: [${this.#socket.id}]: connected, Address: [${this.#address}]`);
         setTimeout(() => {
           this.ConnectCallBack(this.#socket);
         }, 0);
         this.SocketEventsCallBack(this.#socket);
       } else {
-        const errorMessage = "SocketIoClientHelper(): Could not get socket object from socket.io, Address: [${socketDetail.address}]";
+        const errorMessage = "Could not get socket object from socket.io, Address: [${socketDetail.address}]";
         this.LogErrorMessage(errorMessage);
         this.ErrorCallBack(new Error(errorMessage));
       }
     });
     this.#socket.on("disconnect", (reason) => {
-      this.LogDebugMessage("SocketIoClientHelper(): socket disconnect: " + reason);
+      this.LogDebugMessage("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.");
+            this.LogDebugMessage("The server disconnected using disconnectSockets, i.e. normal safe shutdown from explicit disconnection by the server.");
+            this.LogDebugMessage("The connection will be re-established when the server becomes available.");
             this.#socket = void 0;
             if (isNode) {
               if (this.#agentManager) {
                 this.#agentManager.ResetAgent();
               }
-              setTimeout(() => this.#EstablishSocketConnect(), 100).unref();
+              setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
             } else {
-              setTimeout(() => this.#EstablishSocketConnect(), 100);
+              setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
             }
           }
           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.");
+          this.LogDebugMessage("The client disconnected using disconnectSockets, i.e. normal safe disconnection from explicit disconnection by the client.");
+          this.LogDebugMessage("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.");
+            this.LogDebugMessage(`Server unexpectedly disconnected. Reason: [${reason}]`);
+            this.LogDebugMessage("The connection will be re-established when the server becomes available.");
             if (this.#socket) {
               this.#socket.disconnect();
             }
@@ -10256,9 +10272,9 @@ class SocketIoClient extends tinyEmitterExports$1.TinyEmitter {
               if (this.#agentManager) {
                 this.#agentManager?.ResetAgent();
               }
-              setTimeout(() => this.#EstablishSocketConnect(), 100).unref();
+              setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout).unref();
             } else {
-              setTimeout(() => this.#EstablishSocketConnect(), 100);
+              setTimeout(() => this.#EstablishSocketConnect(), this.#reconnectTimeout);
             }
           }
           break;
@@ -10604,10 +10620,13 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     const LogDebug = (message) => {
       stsutils.defaultLogger.debug(baseColour(`stsuxvue:UXModelNavigator:${message}`));
     };
+    const LogWarning = (message) => {
+      stsutils.defaultLogger.warn(baseColour(`stsuxvue:UXModelNavigator:${message}`));
+    };
     const TransformSubscriptionPayloadCallback = (subscriptionPayload) => {
       observabilitySubscriberManager?.TransformSubscriptionPayloadCallback(subscriptionPayload);
     };
-    let rootLevelSubscriptions = [{
+    const GetRootLevelSubscriptions = () => [{
       subscriptionKey: {
         id: v4(),
         topic: stsobservability.SubscriptionTopic.AllServicesCombined
@@ -10620,7 +10639,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       },
       cb: TransformSubscriptionPayloadCallback
     }];
-    const ServicesSubscriptions = [{
+    const GetServicesSubscriptions = () => [{
       subscriptionKey: {
         id: v4(),
         topic: stsobservability.SubscriptionTopic.Services
@@ -10648,7 +10667,6 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
         cb: TransformSubscriptionPayloadCallback
       }];
     };
-    let navSubscriptions = rootLevelSubscriptions;
     let navigationSubscriptions = {
       subscriptions: [],
       currentSubscriptions: null
@@ -10692,7 +10710,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
         if (store._models[props.modelId].serviceModelSubscriptionKey) {
           switch (store._models[props.modelId].serviceModelSubscriptionKey?.topic) {
             case stsobservability.SubscriptionTopic.AllServicesCombined:
-              navigate(ServicesSubscriptions);
+              navigate(GetServicesSubscriptions());
               break;
             case stsobservability.SubscriptionTopic.Services:
               navigate(GetServiceInstancesSubscriptions(id));
@@ -10705,8 +10723,11 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const navigate = function(subscriptions) {
-      obj.subscriptions.push(navSubscriptions);
-      navSubscriptions = subscriptions;
+      if (obj.currentSubscriptions) {
+        obj.subscriptions.push(obj.currentSubscriptions);
+      } else {
+        LogWarning(`navigate: obj.currentSubscriptions not defined`);
+      }
       obj.currentSubscriptions = subscriptions;
       LogDebug(`navigate: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(subscriptions)})`);
       observabilitySubscriberManager?.UpdateModelCursor(subscriptions);
@@ -10715,10 +10736,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       if (obj.subscriptions.length > 0) {
         let key = obj.subscriptions.pop();
         if (key) {
-          navSubscriptions = key;
           obj.currentSubscriptions = key;
-          LogDebug(`GoBack: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(navSubscriptions)})`);
-          observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
+          LogDebug(`GoBack: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(obj.currentSubscriptions)})`);
+          observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
         } else {
           LogDebug(`GoBack: subscriptions key not defined`);
         }
@@ -10728,10 +10748,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     };
     const TopLevel = function() {
       obj.subscriptions = [];
-      navSubscriptions = rootLevelSubscriptions;
-      obj.currentSubscriptions = rootLevelSubscriptions;
-      LogDebug(`TopLevel: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(navSubscriptions)})`);
-      observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
+      obj.currentSubscriptions = GetRootLevelSubscriptions();
+      LogDebug(`TopLevel: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(obj.currentSubscriptions)})`);
+      observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
     };
     vue.onMounted(() => {
       LogDebug(`onMounted()`);
@@ -10760,9 +10779,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       store.UpdateObservabilitySubscriberManager(observabilitySubscriberManager.id, observabilitySubscriberManager);
       LogDebug(`Start(): observabilitySubscriberManager().Start(): Mode: [${options.consumeInstrumentationMode}]`);
       await observabilitySubscriberManager.Start();
-      obj.currentSubscriptions = rootLevelSubscriptions;
-      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(): Mode: [${options.consumeInstrumentationMode}] rootLevelSubscriptions: [(${JSON.stringify(rootLevelSubscriptions)}]`);
-      observabilitySubscriberManager?.UpdateModelCursor(rootLevelSubscriptions);
+      obj.currentSubscriptions = GetRootLevelSubscriptions();
+      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(): Mode: [${options.consumeInstrumentationMode}] rootLevelSubscriptions: [(${JSON.stringify(obj.currentSubscriptions)}]`);
+      observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
       store.UpdateSate(props.modelId, _estate.STARTED);
     };
     __expose({