Other/improve cleanup

modules/websocket_streaming_server_module/include/websocket_streaming_server_module/websocket_streaming_server_impl.h

@@ -30,6 +30,7 @@ class WebsocketStreamingServerImpl : public Server
     explicit WebsocketStreamingServerImpl(const DevicePtr& rootDevice,
                                           const PropertyObjectPtr& config,
                                           const ContextPtr& context);
+    ~WebsocketStreamingServerImpl() override;
     static PropertyObjectPtr createDefaultConfig(const ContextPtr& context);
     static ServerTypePtr createType(const ContextPtr& context);
     static PropertyObjectPtr populateDefaultConfig(const PropertyObjectPtr& config, const ContextPtr& context);

modules/websocket_streaming_server_module/src/websocket_streaming_server_impl.cpp

@@ -23,6 +23,11 @@ WebsocketStreamingServerImpl::WebsocketStreamingServerImpl(const DevicePtr& root
     websocketStreamingServer.start();
 }
 
+WebsocketStreamingServerImpl::~WebsocketStreamingServerImpl()
+{
+    websocketStreamingServer.stop();
+}
+
 void WebsocketStreamingServerImpl::populateDefaultConfigFromProvider(const ContextPtr& context, const PropertyObjectPtr& config)
 {
     if (!context.assigned())

opendaq_ref

@@ -1 +1 @@
-4757349a1db30721bead0cb695ec3a147913aef4
+05d65e97c9d6f0cea5c23c423855a65426c30baf

shared/libraries/websocket_streaming/include/websocket_streaming/streaming_server.h

@@ -52,7 +52,9 @@ class StreamingServer
 
     void start(uint16_t port = daq::streaming_protocol::WEBSOCKET_LISTENING_PORT,
                uint16_t controlPort = daq::streaming_protocol::HTTP_CONTROL_PORT);
+
     void stop();
+    void clearCallbacks();
 
     void onAccept(const OnAcceptCallback& callback);
     void onStartSignalsRead(const OnStartSignalsReadCallback& callback);

shared/libraries/websocket_streaming/include/websocket_streaming/websocket_streaming_server.h

@@ -43,6 +43,7 @@ class WebsocketStreamingServer
     DevicePtr device;
     ContextPtr context;
 
+    bool stopped = false;
     uint16_t streamingPort = 0;
     uint16_t controlPort = 0;
     daq::websocket_streaming::StreamingServer streamingServer;

shared/libraries/websocket_streaming/src/streaming_server.cpp

@@ -104,6 +104,17 @@ void StreamingServer::stop()
 
     this->server.reset();
     this->controlServer.reset();
+
+    clearCallbacks();
+}
+
+void StreamingServer::clearCallbacks()
+{
+    onAcceptCallback = nullptr;
+    onStartSignalsReadCallback = nullptr;
+    onStopSignalsReadCallback = nullptr;
+    clientConnectedHandler = nullptr;
+    clientDisconnectedHandler = nullptr;
 }
 
 void StreamingServer::onAccept(const OnAcceptCallback& callback)

shared/libraries/websocket_streaming/src/websocket_streaming_server.cpp

@@ -13,7 +13,6 @@ BEGIN_NAMESPACE_OPENDAQ_WEBSOCKET_STREAMING
 
 WebsocketStreamingServer::~WebsocketStreamingServer()
 {
-    this->context.getOnCoreEvent() -= event(this, &WebsocketStreamingServer::coreEventCallback);
     stopInternal();
 }
 
@@ -104,7 +103,10 @@ void WebsocketStreamingServer::start()
 }
 
 void WebsocketStreamingServer::stop()
-{
+{    
+    if (stopped)
+        return;
+
     if (device.assigned() && !device.isRemoved())
     {
         const auto info = this->device.getInfo();
@@ -124,8 +126,15 @@ void WebsocketStreamingServer::stop()
 
 void WebsocketStreamingServer::stopInternal()
 {
+    if (stopped)
+        return;
+
+    this->context.getOnCoreEvent() -= event(this, &WebsocketStreamingServer::coreEventCallback);
+
     packetReader.stop();
     streamingServer.stop();
+
+    stopped = true;
 }
 
 void WebsocketStreamingServer::coreEventCallback(ComponentPtr& sender, CoreEventArgsPtr& eventArgs)