@nsshunt/stsobservability 1.0.127 → 1.0.128

package/dist/stsobservability.umd.js

@@ -5402,9 +5402,6 @@
     #LogErrorMessage(message) {
       this.#options.logger.error(message);
     }
-    SubscribeOne(subscription) {
-      this.Subscribe([subscription]);
-    }
     async Subscribe(subscriptions) {
       subscriptions.map(async (subId) => {
         this.#RemoveKeepAlive(subId);
@@ -5417,9 +5414,6 @@
         }
       });
     }
-    UnSubscribeOne(subscription) {
-      this.UnSubscribe([subscription]);
-    }
     UnSubscribe(subscriptions) {
       subscriptions.map(async (subId) => {
         this.#RemoveKeepAlive(subId);
@@ -5580,168 +5574,10 @@
       }
     }
   }
-  const byteToHex = [];
-  for (let i = 0; i < 256; ++i) {
-    byteToHex.push((i + 256).toString(16).slice(1));
-  }
-  function unsafeStringify(arr, offset = 0) {
-    return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
-  }
-  let getRandomValues;
-  const rnds8 = new Uint8Array(16);
-  function rng() {
-    if (!getRandomValues) {
-      if (typeof crypto === "undefined" || !crypto.getRandomValues) {
-        throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
-      }
-      getRandomValues = crypto.getRandomValues.bind(crypto);
-    }
-    return getRandomValues(rnds8);
-  }
-  const randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
-  const native = { randomUUID };
-  function _v4(options, buf, offset) {
-    options = options || {};
-    const rnds = options.random ?? options.rng?.() ?? rng();
-    if (rnds.length < 16) {
-      throw new Error("Random bytes length must be >= 16");
-    }
-    rnds[6] = rnds[6] & 15 | 64;
-    rnds[8] = rnds[8] & 63 | 128;
-    return unsafeStringify(rnds);
-  }
-  function v4(options, buf, offset) {
-    if (native.randomUUID && true && !options) {
-      return native.randomUUID();
-    }
-    return _v4(options);
-  }
-  var messageStatus = /* @__PURE__ */ ((messageStatus2) => {
-    messageStatus2["INPROGRESS"] = "INPROGRESS";
-    messageStatus2["SUCCESS"] = "SUCCESS";
-    messageStatus2["FAIL"] = "FAIL";
-    messageStatus2["INRETRY"] = "INRETRY";
-    messageStatus2["KILLED"] = "KILLED";
-    return messageStatus2;
-  })(messageStatus || {});
-  var messageStatusResponse = /* @__PURE__ */ ((messageStatusResponse2) => {
-    messageStatusResponse2["SUBSCRIPTION_SUCCESSFULLY_ADDED"] = "SUBSCRIPTION_SUCCESSFULLY_ADDED";
-    messageStatusResponse2["SUBSCRIPTION_SUCCESSFULLY_REMOVED"] = "SUBSCRIPTION_SUCCESSFULLY_REMOVED";
-    messageStatusResponse2["SUBSCRIPTION_TIMEOUT_RENEWED"] = "SUBSCRIPTION_TIMEOUT_RENEWED";
-    messageStatusResponse2["NO_MATCHED_SUBSCRIPTION"] = "NO_MATCHED_SUBSCRIPTION";
-    return messageStatusResponse2;
-  })(messageStatusResponse || {});
-  class SocketIoMessageSender {
-    #messageWithAckPayloadRecords = {};
-    #socket;
-    #maxReties = 3;
-    //@@
-    #timeoutValue = 5e3;
-    //@@
-    #options;
-    #LogDebugMessage(message) {
-      this.#options.logger.debug(message);
-    }
-    constructor(options) {
-      this.#options = options;
-      this.#socket = options.socket;
-    }
-    get socket() {
-      return this.#socket;
-    }
-    set socket(socket) {
-      this.#LogDebugMessage(chalk.cyan(`SocketIoMessageSender:set socket(): new socket assigned`));
-      this.#socket = socket;
-    }
-    AckListener(message, payload) {
-      if (message.subscriptionKey.id.localeCompare(payload.id) === 0) {
-        clearTimeout(message.timeoutId);
-        delete message.timeoutId;
-        this.#socket.off(this.#GetSubscribeKeepAliveAckEventName(message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
-        message.endTime = performance.now();
-        message.duration = message.endTime - message.startTime;
-        message.status = "SUCCESS";
-        message.subscriptionKeyResponse = payload;
-        delete this.#messageWithAckPayloadRecords[message.id];
-        this.#LogDebugMessage(chalk.grey(`SocketIoMessageSender:AckListener(): ack received, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-        message.resolve(message);
-      }
-    }
-    ResponseTimout(message) {
-      this.#LogDebugMessage(chalk.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached: [${this.#timeoutValue}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-      delete message.timeoutId;
-      this.#socket.off(this.#GetSubscribeKeepAliveAckEventName(message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
-      message.endTime = performance.now();
-      if (message.retryCount >= this.#maxReties) {
-        message.status = "FAIL";
-        this.#LogDebugMessage(chalk.red(`SocketIoMessageSender:ResponseTimout(): timeout reached after ${this.#maxReties} retries, event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-        delete this.#messageWithAckPayloadRecords[message.id];
-        message.reject(message);
-        return;
-      }
-      message.status = "INRETRY";
-      message.retryCount++;
-      this.#LogDebugMessage(chalk.magenta(`SocketIoMessageSender:ResponseTimout(): timeout reached, retrying. Retries: [${message.retryCount}], event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-      this.SendMessage(message);
-    }
-    #GetSubscribeKeepAliveAckEventName(eventName, subscriptionKey) {
-      return `${eventName}Ack_${subscriptionKey.id}`;
-    }
-    SendMessage(message) {
-      message.startTime = performance.now();
-      message.timeoutId = setTimeout(() => {
-        this.ResponseTimout(message);
-      }, this.#timeoutValue);
-      const AckListenerCallback = (payload) => {
-        this.AckListener(message, payload);
-      };
-      message.BoundAckListenerCallback = AckListenerCallback.bind(this);
-      this.#socket.on(this.#GetSubscribeKeepAliveAckEventName(message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
-      this.#LogDebugMessage(chalk.gray(`SocketIoMessageSender:SendMessage(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-      this.#socket.emit(message.eventName, message.subscriptionKey);
-    }
-    SendMessageWithAck(eventName, subscriptionKey) {
-      const promise = new Promise((resolve, reject) => {
-        const message = {
-          id: v4(),
-          subscriptionKey,
-          retryCount: 0,
-          startTime: performance.now(),
-          status: "INPROGRESS",
-          eventName,
-          resolve,
-          reject
-        };
-        this.#messageWithAckPayloadRecords[message.id] = message;
-        this.SendMessage(message);
-      });
-      return promise;
-    }
-    KillMessageInFlight(subscriptionKey) {
-      const killIds = [];
-      for (const [, message] of Object.entries(this.#messageWithAckPayloadRecords)) {
-        if (message.subscriptionKey.id.localeCompare(subscriptionKey.id) === 0) {
-          this.#LogDebugMessage(chalk.blue(`SocketIoMessageSender:KillMessageInFlight(): event: [${message.eventName}], subscriptionKey: [${message.subscriptionKey.id}]`));
-          clearTimeout(message.timeoutId);
-          delete message.timeoutId;
-          this.#socket.off(this.#GetSubscribeKeepAliveAckEventName(message.eventName, message.subscriptionKey), message.BoundAckListenerCallback);
-          killIds.push(message.id);
-          message.status = "KILLED";
-          message.reject(message);
-        }
-      }
-      killIds.forEach((id) => {
-        delete this.#messageWithAckPayloadRecords[id];
-      });
-    }
-  }
   class ObservabilitySocketIOSubscriber {
-    #socketSubscribeKeepAlive = {};
     #socket;
     #options;
-    #socketIoMessageSender;
-    // This is required becuase each call to .bind create a new replica bound function - so we need the same instance for on/off event bindings.
-    KeepAliveAckBoundFunction;
+    subscriptions = {};
     #LogDebugMessage(message) {
       this.#options.logger.debug(message);
     }
@@ -5751,95 +5587,98 @@
     constructor(options) {
       this.#options = options;
       this.#socket = options.socket;
-      this.#socketIoMessageSender = new SocketIoMessageSender({
-        socket: this.#socket,
-        logger: this.#options.logger
-      });
     }
     get socket() {
       return this.#socket;
     }
     set socket(socket) {
       this.#LogDebugMessage(chalk.cyan(`ObservabilitySocketIOSubscriber:set socket(): new socket assigned`));
+      this.#socket.off("subscriptionData");
+      this.subscriptions = {};
+      if (this.#socket.connected) {
+        this.#socket.disconnect();
+      }
       this.#socket = socket;
-      this.#socketIoMessageSender.socket = socket;
-    }
-    SubscribeOne(subscription) {
-      this.Subscribe([subscription]);
+      this.#socket.on("subscriptionData", (data, cb) => {
+        const subId = data.subscriptionKey.id;
+        if (this.subscriptions[subId]) {
+          this.subscriptions[subId].cb(data);
+          cb(`subscriptionData Response: [${data}]`);
+        } else {
+          cb(`subscriptionData Response: Not subscription found in subscriptions: [${data}]`);
+        }
+      });
     }
     async Subscribe(subscriptions) {
-      const socket = this.#socket;
       subscriptions.map(async (subId) => {
-        this.#RemoveKeepAlive(subId);
-        this.#LogDebugMessage(chalk.yellow(`ObservabilitySocketIOSubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
         try {
-          const retVal = await this.#socketIoMessageSender.SendMessageWithAck("subscribe", subId.subscriptionKey);
-          this.#LogDebugMessage(chalk.green(`ObservabilitySocketIOSubscriber:Subscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
-          this.#AddKeepAlive(socket, subId);
-          socket.on(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
+          this.#LogDebugMessage(chalk.yellow(`ObservabilitySocketIOSubscriber:Subscribe(): Sending subscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+          this.#socket.timeout(1e3).emit("subscribe", subId.subscriptionKey, (error, data) => {
+            if (error) {
+              this.#LogErrorMessage(chalk.red(`ObservabilitySocketIOSubscriber:Subscribe(): Error: [${error}], data: [${data}]`));
+            } else {
+              this.#LogDebugMessage(chalk.green(`ObservabilitySocketIOSubscriber:Subscribe(): Response: [${JSON.stringify(data)}]`));
+              this.subscriptions[subId.subscriptionKey.id] = subId;
+            }
+          });
         } catch (error) {
           this.#LogErrorMessage(chalk.red(`ObservabilitySocketIOSubscriber:Subscribe(): Error: response: [${JSON.stringify(error)}]`));
-          socket.off(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
-          this.#RemoveKeepAlive(subId);
         }
       });
     }
-    UnSubscribeOne(subscription) {
-      this.UnSubscribe([subscription]);
-    }
     UnSubscribe(subscriptions) {
-      const socket = this.#socket;
       subscriptions.map(async (subId) => {
-        socket.off(GetSocketIOSubscriptionKey(subId.subscriptionKey), subId.cb);
-        this.#RemoveKeepAlive(subId);
-        this.#socketIoMessageSender.KillMessageInFlight(subId.subscriptionKey);
-        this.#LogDebugMessage(chalk.yellow(`ObservabilitySocketIOSubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
         try {
-          const retVal = await this.#socketIoMessageSender.SendMessageWithAck("unsubscribe", subId.subscriptionKey);
-          this.#LogDebugMessage(chalk.green(`ObservabilitySocketIOSubscriber:UnSubscribe(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
+          this.#LogDebugMessage(chalk.yellow(`ObservabilitySocketIOSubscriber:UnSubscribe(): Sending unsubscribe: subscriptionKey: [${subId.subscriptionKey.id}]`));
+          this.#socket.timeout(1e3).emit("unsubscribe", subId.subscriptionKey, (error, data) => {
+            if (error) {
+              this.#LogErrorMessage(chalk.red(`ObservabilitySocketIOSubscriber:UnSubscribe(): Error: [${error}], data: [${data}]`));
+            } else {
+              this.#LogDebugMessage(chalk.green(`ObservabilitySocketIOSubscriber:UnSubscribe(): Response: [${JSON.stringify(data)}]`));
+              delete this.subscriptions[subId.subscriptionKey.id];
+            }
+          });
         } catch (error) {
           this.#LogErrorMessage(chalk.red(`ObservabilitySocketIOSubscriber:UnSubscribe(): Error response: [${JSON.stringify(error)}]`));
         }
       });
     }
-    #AddKeepAlive(socket, subscription) {
-      this.#RemoveKeepAlive(subscription);
-      this.#socketSubscribeKeepAlive[subscription.subscriptionKey.id] = {
-        id: subscription.subscriptionKey.id,
-        timeout: setTimeout(async () => {
-          this.#LogDebugMessage(chalk.yellow(`ObservabilitySocketIOSubscriber:#AddKeepAlive:timeoutCheck(): Sending keepAlive: subscriptionKey: [${subscription.subscriptionKey.id}]`));
-          try {
-            const retVal = await this.#socketIoMessageSender.SendMessageWithAck("subscribeKeepAlive", subscription.subscriptionKey);
-            this.#LogDebugMessage(chalk.green(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): SendMessageWithAck response: [${JSON.stringify(retVal)}]`));
-            this.#AddKeepAlive(socket, subscription);
-          } catch (error) {
-            this.#LogErrorMessage(chalk.red(`ObservabilitySocketIOSubscriber:#AddKeepAlive(): Error response: [${JSON.stringify(error)}]`));
-            socket.off(GetSocketIOSubscriptionKey(subscription.subscriptionKey), subscription.cb);
-            this.#RemoveKeepAlive(subscription);
-          }
-        }, this.#options.keepAlive)
-      };
-    }
-    #RemoveKeepAlive(subscription) {
-      if (this.#socketSubscribeKeepAlive[subscription.subscriptionKey.id]) {
-        this.#LogDebugMessage(chalk.gray(`ObservabilitySocketIOSubscriber:#RemoveKeepAlive(): subscriptionKey: [${subscription.subscriptionKey.id}]`));
-        clearTimeout(this.#socketSubscribeKeepAlive[subscription.subscriptionKey.id].timeout);
-        delete this.#socketSubscribeKeepAlive[subscription.subscriptionKey.id];
+  }
+  const byteToHex = [];
+  for (let i = 0; i < 256; ++i) {
+    byteToHex.push((i + 256).toString(16).slice(1));
+  }
+  function unsafeStringify(arr, offset = 0) {
+    return (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + "-" + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + "-" + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + "-" + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + "-" + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase();
+  }
+  let getRandomValues;
+  const rnds8 = new Uint8Array(16);
+  function rng() {
+    if (!getRandomValues) {
+      if (typeof crypto === "undefined" || !crypto.getRandomValues) {
+        throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");
       }
+      getRandomValues = crypto.getRandomValues.bind(crypto);
     }
-    /*
-    override SocketIOConnect(socket: Socket<ServerToClientEvents, ClientToServerEvents>): void {
-        if (this.#observabilitySocketIOSubscriber instanceof ObservabilitySocketIOSubscriber) {
-            if (socket.id.localeCompare((this.#observabilitySocketIOSubscriber as ObservabilitySocketIOSubscriber).socket.id) === 0) {
-                //this.#LogMessage(chalk.gray(`Socket ids are the same - ignoring`));
-            } else {
-                //this.#LogMessage(chalk.yellow(`Socket ids are different - update with new socket`));
-                (this.#observabilitySocketIOSubscriber as ObservabilitySocketIOSubscriber).socket = socket;
-                this.#observabilitySubscriptionManager.Start();
-            }
-        }
+    return getRandomValues(rnds8);
+  }
+  const randomUUID = typeof crypto !== "undefined" && crypto.randomUUID && crypto.randomUUID.bind(crypto);
+  const native = { randomUUID };
+  function _v4(options, buf, offset) {
+    options = options || {};
+    const rnds = options.random ?? options.rng?.() ?? rng();
+    if (rnds.length < 16) {
+      throw new Error("Random bytes length must be >= 16");
     }
-    */
+    rnds[6] = rnds[6] & 15 | 64;
+    rnds[8] = rnds[8] & 63 | 128;
+    return unsafeStringify(rnds);
+  }
+  function v4(options, buf, offset) {
+    if (native.randomUUID && true && !options) {
+      return native.randomUUID();
+    }
+    return _v4(options);
   }
   var runStates = /* @__PURE__ */ ((runStates2) => {
     runStates2["idle"] = "idle";
@@ -5917,7 +5756,7 @@
       for (let i = 0; i < this.subscriptions.length; i++) {
         if (this.subscriptions[i].subscriptionKey.key?.localeCompare(keyToFind) === 0) {
           if (this.#observabilitySocketIOSubscriber) {
-            this.#observabilitySocketIOSubscriber.UnSubscribeOne(this.subscriptions[i]);
+            this.#observabilitySocketIOSubscriber.UnSubscribe([this.subscriptions[i]]);
           }
         } else {
           newSubscriptions.push(this.subscriptions[i]);
@@ -6436,15 +6275,12 @@
   exports2.RequestLoggerMiddlewareEventName = RequestLoggerMiddlewareEventName;
   exports2.STSInstrumentControllerPlugin = STSInstrumentControllerPlugin;
   exports2.STSInstrumentControllerPluginKey = STSInstrumentControllerPluginKey;
-  exports2.SocketIoMessageSender = SocketIoMessageSender;
   exports2.StopInstruments = StopInstruments;
   exports2.SubscriptionTopic = SubscriptionTopic;
   exports2.TransportType = TransportType;
   exports2.ePublishState = ePublishState;
   exports2.globalServiceDefinitions = globalServiceDefinitions;
   exports2.influxDBDataType = influxDBDataType;
-  exports2.messageStatus = messageStatus;
-  exports2.messageStatusResponse = messageStatusResponse;
   exports2.runStates = runStates;
   exports2.useSTSInstrumentControllerPlugin = useSTSInstrumentControllerPlugin;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });