@nsshunt/stsuxvue 1.0.70 → 1.0.72

package/dist/stsuxvue.cjs

@@ -10331,7 +10331,6 @@ class ObservabilitySubscriberManager extends SocketIoClient {
   #options;
   #tinyEmitter;
   #id;
-  logPrefix = `stsuxvue:ObservabilitySubscriberManager:`;
   constructor(options) {
     super("STSVueTilsTester");
     this.#id = v4();
@@ -10346,11 +10345,18 @@ class ObservabilitySubscriberManager extends SocketIoClient {
   get id() {
     return this.#id;
   }
+  get logPrefix() {
+    if (this.#options) {
+      return `stsuxvue:ObservabilitySubscriberManager[${this.#options.consumeInstrumentationMode}]:`;
+    } else {
+      return `stsuxvue:ObservabilitySubscriberManager:`;
+    }
+  }
   #SocketIOConnect = (socket) => {
     try {
       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}]`));
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Current Model Subscriptions: [${JSON.stringify(this.#observabilitySubscriptionManager?.subscriptions)}]`));
       if (this.#observabilitySocketIOSubscriber instanceof stsobservability.ObservabilitySocketIOSubscriber) {
         const observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
         if (socket.id) {
@@ -10368,10 +10374,10 @@ class ObservabilitySubscriberManager extends SocketIoClient {
         }
         if (this.#state.localeCompare("init") === 0) {
           this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): state = init`));
-          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager Start`));
-          this.#observabilitySubscriptionManager?.Start();
-          this.#state = "started";
           this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): state = started`));
+          this.#state = "started";
+          this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): tinyEmitter.emit('connected')`));
+          this.#tinyEmitter.emit("connected");
         } else {
           this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): Socket ids are different - update with new socket`));
           if (observabilitySocketIOSubscriber.socket) {
@@ -10381,8 +10387,12 @@ class ObservabilitySubscriberManager extends SocketIoClient {
           }
           this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect():  -> New (updated) Socket ID: [${socket.id}]`));
           if (this.#observabilitySubscriptionManager) {
-            this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager.Stop()`));
-            this.#observabilitySubscriptionManager?.Stop();
+            if (this.#observabilitySubscriptionManager.runState !== stsobservability.runStates.stopped) {
+              this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager.Stop()`));
+              this.#observabilitySubscriptionManager?.Stop();
+            } else {
+              this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager.runState: [${this.#observabilitySubscriptionManager.runState}] already stopped.`));
+            }
           } else {
             this.LogErrorMessage(chalk.red(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager does not exist`));
           }
@@ -10390,8 +10400,12 @@ class ObservabilitySubscriberManager extends SocketIoClient {
           observabilitySocketIOSubscriber.socket = socket;
           if (this.#state.localeCompare("started") === 0) {
             setTimeout(() => {
-              this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager Start`));
-              this.#observabilitySubscriptionManager?.Start();
+              if (this.#observabilitySubscriptionManager?.runState !== stsobservability.runStates.started) {
+                this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager Start`));
+                this.#observabilitySubscriptionManager?.Start();
+              } else {
+                this.LogDebugMessage(chalk.cyan(`${this.logPrefix}SocketIOConnect(): observabilitySubscriptionManager runState: [${this.#observabilitySubscriptionManager?.runState}] already started.`));
+              }
               this.#tinyEmitter.emit("connected");
             }, 2500);
           } else {
@@ -10452,8 +10466,12 @@ class ObservabilitySubscriberManager extends SocketIoClient {
     this.#observabilitySubscriptionManager.observabilitySocketIOSubscriber = this.#observabilitySocketIOSubscriber;
   };
   UpdateModelCursor(subscriptions) {
-    this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager.Stop()`));
-    this.#observabilitySubscriptionManager?.Stop();
+    if (this.#observabilitySubscriptionManager?.runState !== stsobservability.runStates.stopped) {
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager.Stop()`));
+      this.#observabilitySubscriptionManager?.Stop();
+    } else {
+      this.LogDebugMessage(chalk.cyan(`${this.logPrefix}UpdateModelCursor(): observabilitySubscriptionManager runState: [${this.#observabilitySubscriptionManager?.runState}] already stopped.`));
+    }
     this.#state = "stopped";
     setTimeout(() => {
       if (this.#observabilitySubscriptionManager) {
@@ -10582,7 +10600,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     const props = __props;
     const store = ModelStore();
     let observabilitySubscriberManager = null;
-    const baseColour = chalk.hex("#A85E57");
+    const baseColour = chalk.hex("#57A1A8");
     const LogDebug = (message) => {
       stsutils.defaultLogger.debug(baseColour(`stsuxvue:UXModelNavigator:${message}`));
     };
@@ -10737,13 +10755,13 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     const Start = async (options) => {
       LogDebug(`Start()`);
       store.UpdateSate(props.modelId, _estate.STARTING);
-      LogDebug(`Start(): new ObservabilitySubscriberManager()`);
+      LogDebug(`Start(): new ObservabilitySubscriberManager(), Options: ${JSON.stringify(options)}`);
       observabilitySubscriberManager = new ObservabilitySubscriberManager(options);
       store.UpdateObservabilitySubscriberManager(observabilitySubscriberManager.id, observabilitySubscriberManager);
-      LogDebug(`Start(): observabilitySubscriberManager().Start()`);
+      LogDebug(`Start(): observabilitySubscriberManager().Start(): Mode: [${options.consumeInstrumentationMode}]`);
       await observabilitySubscriberManager.Start();
       obj.currentSubscriptions = rootLevelSubscriptions;
-      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(rootLevelSubscriptions)})`);
+      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(): Mode: [${options.consumeInstrumentationMode}] rootLevelSubscriptions: [(${JSON.stringify(rootLevelSubscriptions)}]`);
       observabilitySubscriberManager?.UpdateModelCursor(rootLevelSubscriptions);
       store.UpdateSate(props.modelId, _estate.STARTED);
     };