Serialization so far working. Event issue AFAIK solved. Some testing …

…will be done to ensure that it really is solved. Culprits: nullptr and non-referenced script

SkyUtilities/Net/HTTP/RequestManager.cpp

@@ -146,7 +146,7 @@ namespace SKU::Net::HTTP {
 
     Plugin::Log(LOGL_VERBOSE, "(HTTP) RequestManager: Start");
 
-    should_run = true; // TODO: Initialize and should_run should be placed somewhere else
+    should_run = true;
 
     if (processing_thread.valid() == false
       || processing_thread.wait_for(std::chrono::seconds(0)) != std::future_status::timeout)
@@ -159,7 +159,6 @@ namespace SKU::Net::HTTP {
   void RequestManager::Process()
   {
     RequestManager::Ptr &mgr = Plugin::GetInstance()->GetNetInterface()->GetHTTPRequestManager();
-    std::list<Request::Ptr> requests;
     int handle_reset_counter = 0, no_request_counter = 0;
 
     mgr->curl_last_error = CURLM_OK;
@@ -396,7 +395,7 @@ namespace SKU::Net::HTTP {
       Request::Ptr request = GetRequestByHandle(info->easy_handle);
 
       if (request == nullptr) // Request not found.
-      {						// TODO: Remove request ..
+      {
         Plugin::Log(LOGL_WARNING, "(HTTP) RequestManager: Request was answered but (internally) not found.");
 
         curl_easy_cleanup(info->easy_handle); // Let the dead rest.
@@ -452,7 +451,11 @@ namespace SKU::Net::HTTP {
 
   void RequestManager::OnRequestAdded(Request::Ptr request)
   {
-    Start();
+    if (Plugin::GetInstance()->IsActive() == true)
+    {
+      Plugin::Log(LOGL_VERBOSE, "(HTTP) RequestManager: Starting..");
+      Start();
+    }
   }
 
   void RequestManager::OnRequestRemoval(Request::Ptr request)
@@ -541,7 +544,7 @@ namespace SKU::Net::HTTP {
       SerializeIntegral(serialized, request->GetHandler()->GetTypeID());
       SerializeString(serialized, ctx->url);
       SerializeString(serialized, ctx->body);
-      SerializeIntegral(serialized, ctx->method);
+      SerializeIntegral<uint32_t>(serialized, ctx->method);
 
       if (std::get<ISerializeable::idStream>(serialized).fail() == true)
       {
@@ -565,12 +568,16 @@ namespace SKU::Net::HTTP {
   {
     int unfinished_requests = 0;
 
+    int id;
+    uint32_t timeout, handler_type_id, method;
+    std::string url, body;
+
     if (IsRequestedSerialization(serialized) == false)
     {
       return;
     }
 
-    if (std::get<ISerializeable::idStream>(serialized).tellg() == std::streampos(0))
+    if (std::get<ISerializeable::idStream>(serialized).tellp() == std::streampos(0))
     {
       Plugin::Log(LOGL_VERBOSE, "(HTTP) RequestManager: Nothing to load.");
       return;
@@ -583,10 +590,11 @@ namespace SKU::Net::HTTP {
 
     for (int i = 0; i < unfinished_requests; i++)
     {
-      int id;
-      uint32_t timeout, handler_type_id;
-      std::string url, body;
-      RequestProtocolContext::Method method;
+      Plugin::Log(LOGL_DETAILED, "(HTTP) RequestManager: Deserializing Request..");
+
+      id = timeout = handler_type_id = method = 0;
+      url.clear();
+      body.clear();
 
       DeserializeIntegral(serialized, id);
       DeserializeIntegral(serialized, timeout);
@@ -595,8 +603,14 @@ namespace SKU::Net::HTTP {
       DeserializeString(serialized, body);
       DeserializeIntegral(serialized, method);
 
-      Plugin::Log(LOGL_DETAILED, "(HTTP) RequestManager: Deserialized.. ID=%d, Timeout=%d, Handler=%d, URL=%s, Body=%s, Method=%d",
-        id, timeout, handler_type_id, url.c_str(), body.c_str(), method);
+      if (std::get<ISerializeable::idStream>(serialized).fail() == true)
+      {
+        Plugin::Log(LOGL_WARNING, "(HTTP) RequestManager: Failed to deserialize data.. Aborting.");
+        return;
+      }
+
+      Plugin::Log(LOGL_DETAILED, "(HTTP) RequestManager: Deserialized.. ID=%d, Timeout=%d, Handler=%d, URL=%s, Body=%d (length), Method=%d",
+        id, timeout, handler_type_id, url.c_str(), body.length(), method);
 
       Request::Ptr request = Request::Create<RequestProtocolContext>(id);
       HTTP::RequestProtocolContext::Ptr ctx = request->GetProtocolContext<RequestProtocolContext>();
@@ -622,9 +636,8 @@ namespace SKU::Net::HTTP {
       }
 
       request->SetTimeout(timeout);
-      ctx->Initialize(method, url, body);
-
-      AddRequest(request);
+      ctx->Initialize(static_cast<HTTP::RequestProtocolContext::Method>(method), url, body);
+      AddRequest(std::move(request));
     }
 
     if (std::get<ISerializeable::idStream>(serialized).fail() == true)

SkyUtilities/Net/HTTP/RequestManager.h

@@ -15,7 +15,7 @@
 
 #define RESPONSE_MAX_SIZE 1024 * 256 // TODO: Configuration
 
-namespace SKU::Net::HTTP { // TODO: (protection) request creation frequency // TODO: request accessor class instead of lock.. move ptr around and back on "release" <-- ctx only accessible through that one
+namespace SKU::Net::HTTP { // TODO: request accessor class instead of lock.. move ptr around and back on "release" <-- ctx only accessible through that one
   class RequestManager : public SKU::Net::RequestManagerBase, public ISerializeable
   {
     public:

SkyUtilities/Net/HTTP/RequestProtocolContext.cpp

@@ -5,9 +5,13 @@
 #include <exception>
 
 namespace SKU::Net::HTTP {
+  RequestProtocolContext::RequestProtocolContext()
+    : curl_handle(nullptr), curl_last_error(CURLE_OK), method(mNotSet)
+  {}
+
   RequestProtocolContext::~RequestProtocolContext()
   {
-    Cleanup();
+    // Cleanup();
   }
 
   void RequestProtocolContext::Initialize()

SkyUtilities/Net/HTTP/RequestProtocolContext.h

@@ -12,11 +12,13 @@ namespace SKU::Net::HTTP {
     using Ptr = std::shared_ptr<RequestProtocolContext>;
 
     public:
+    RequestProtocolContext();
     ~RequestProtocolContext();
 
     public:
     enum Method
     {
+      mNotSet,
       mPOST = 0,
       mGET,
     };

SkyUtilities/Net/NetInterface.cpp

@@ -31,7 +31,12 @@ namespace SKU::Net { // TODO: Consider writing class with control management (St
     Plugin::GetInstance()->GetPapyrusEventManager()->Register(GetEventString(evHTTPRequestFinished));
     Plugin::GetInstance()->GetPapyrusEventManager()->Register(GetEventString(evModInfoRetrieval));
 
-    http_requestmanager = std::make_unique<HTTP::RequestManager>();
+    if (http_requestmanager == nullptr)
+    {
+      http_requestmanager = std::make_unique<HTTP::RequestManager>();
+    }
+
+    http_requestmanager->Start(); // in case there were requests loaded.
   }
 
   void Interface::Stop()
@@ -44,7 +49,7 @@ namespace SKU::Net { // TODO: Consider writing class with control management (St
     Plugin::GetInstance()->GetPapyrusEventManager()->Unregister(GetEventString(evHTTPRequestFinished));
 
     // request manager
-    this->http_requestmanager.reset();
+    this->http_requestmanager = std::make_unique<HTTP::RequestManager>();
 
     // internal state
     Plugin::Log(LOGL_VERBOSE, "Net: Stopped.");
@@ -76,9 +81,10 @@ namespace SKU::Net { // TODO: Consider writing class with control management (St
   }
 
   long Interface::HTTPRequest(uint32_t request_handler_type_id, TESForm *form, HTTP::RequestProtocolContext::Method method, std::string url, std::string body, long timeout)
-  {// TODO: check if scripts are paused, too..
+  {
+    // TODO: check if scripts are paused, too..
+    // TODO: own class for script call frequency check and blacklist..
     using namespace std::chrono;
-
     struct ScriptCallsTimeInformation
     {
       std::vector<steady_clock::time_point> last_known_calls;
@@ -153,7 +159,7 @@ namespace SKU::Net { // TODO: Consider writing class with control management (St
       request->SetTimeout(timeout);
       request->GetProtocolContext<HTTP::RequestProtocolContext>()->Initialize(method, url, body);
 
-      if (HTTP::LLabModInfoRequestEventHandler::TypeID < request_handler_type_id // TODO: Fix this whole TypeID mess.
+      if (HTTP::LLabModInfoRequestEventHandler::TypeID < request_handler_type_id
         || true == Plugin::GetInstance()->GetNetInterface()->http_requestmanager->AddRequest(request))
       {
         if (form != nullptr)
@@ -285,6 +291,8 @@ namespace SKU::Net { // TODO: Consider writing class with control management (St
 
   bool Interface::IsRequestedSerialization(ISerializeable::SerializationEntity &serialized)
   {
+    http_requestmanager = std::make_unique<HTTP::RequestManager>();
+
     return http_requestmanager->IsRequestedSerialization(serialized);
   }
 

SkyUtilities/Net/Request.cpp

@@ -60,14 +60,6 @@ namespace SKU::Net {
     return handler;
   }
 
-  void Request::SetID(int id) noexcept // TODO: check if it's still used
-  {
-    if (GLOBAL_REQUEST_ID_COUNTER < id)
-      GLOBAL_REQUEST_ID_COUNTER = id + 10;
-
-    this->id = id;
-  }
-
   void Request::SetState(State state) noexcept
   {
     this->state = state;

SkyUtilities/Net/Request.h

@@ -29,7 +29,7 @@ namespace SKU::Net {
     };
 
     public:
-    Request(int pre_set_id = -1) noexcept;
+    explicit Request(int pre_set_id) noexcept;
     ~Request();
 
     public:
@@ -51,7 +51,6 @@ namespace SKU::Net {
     typename ProtocolContextType::Ptr GetProtocolContext();
 
     public:
-    void SetID(int id) noexcept;
     void SetState(State state) noexcept;
     void SetTimeout(unsigned ms) noexcept;
     void SetHandler(RequestEventHandler::Ptr handler);

SkyUtilities/Net/Request.inl

@@ -9,7 +9,7 @@ Request::Ptr Request::Create(int pre_set_id)
     throw std::bad_exception();
   }
 
-  new_request->proto_ctx = std::make_shared<ProtocolContextType>();
+  new_request->proto_ctx = std::make_shared<ProtocolContextType>(); // TODO: read if it even returns a nullptr.. most likely throws a f.. an exception
 
   if (new_request->proto_ctx == nullptr)
   {

SkyUtilities/Net/RequestEventHandler.h

@@ -5,20 +5,26 @@
 #define REQUEST_EVENT_HANDLER_DEF(type_id)\
 public:\
 const static uint32_t TypeID = type_id;\
-inline uint32_t GetTypeID(){ return type_id; }
+virtual inline uint32_t GetTypeID() final { return type_id; }
 
 namespace SKU::Net {
   class Request;
 
   class RequestEventHandler // TODO: implement request into class
   {
-    REQUEST_EVENT_HANDLER_DEF(0)
-
     public:
     using Ptr = std::shared_ptr<RequestEventHandler>;
 
     public:
     virtual void OnRequestFinished(std::shared_ptr<Request> request)
     {}
+
+    public:
+    const static uint32_t TypeID = 0;
+
+    virtual inline uint32_t GetTypeID()
+    {
+      return 0;
+    }
   };
 }

SkyUtilities/Net/RequestManagerBase.cpp

@@ -3,20 +3,25 @@
 #include "Plugin.h"
 
 namespace SKU::Net {
+  RequestManagerBase::RequestManagerBase()
+    : pool()
+  {}
+
   bool RequestManagerBase::AddRequest(Request::Ptr request) noexcept
   {
     try
     {
-      pool.Get().insert(request);
+      if (pool.AddRequest(request).second == true)
+      {
+        OnRequestAdded(request);
+        return true;
+      }
     }
     catch (std::exception e)
     {
-      return false;
     }
 
-    OnRequestAdded(request);
-
-    return true;
+    return false;
   }
 
   void RequestManagerBase::RemoveRequest(Request::Ptr request)

SkyUtilities/Net/RequestManagerBase.h

@@ -7,6 +7,9 @@
 namespace SKU::Net {
   class RequestManagerBase
   {
+    public:
+    RequestManagerBase();
+
     public:
     bool AddRequest(Request::Ptr request) noexcept;
     virtual void RemoveRequest(Request::Ptr request);

SkyUtilities/Net/RequestPool.cpp

@@ -5,6 +5,10 @@
 #include <algorithm>
 
 namespace SKU::Net {
+  RequestPool::RequestPool()
+    : pool()
+  {}
+
   Request::Ptr RequestPool::GetRequestByID(int id)
   {
     auto& request_pos = std::find_if(pool.begin(), pool.end(), [&] (Request::Ptr request) -> bool
@@ -51,6 +55,11 @@ namespace SKU::Net {
     });
   }
 
+  std::pair< std::set<Request::Ptr>::iterator, bool > RequestPool::AddRequest(Request::Ptr request)
+  {
+    return pool.emplace(request);
+  }
+
   std::set<Request::Ptr> &RequestPool::Get() noexcept
   {
     return pool;

SkyUtilities/Net/RequestPool.h

@@ -13,13 +13,19 @@ namespace SKU::Net {
     public:
     Request::Ptr GetRequestByID(int id);
 
+    public:
+    RequestPool();
+
     public:
     std::vector<Request::Ptr> GetRequestsByState(Request::State state);
 
     public:
     int GetCountByState(Request::State state);
     int GetCountByStateExceptions(std::initializer_list<Request::State> state_list);
 
+    public:
+    std::pair< std::set<Request::Ptr>::iterator, bool > AddRequest(Request::Ptr request);
+
     public:
     std::set<Request::Ptr> &Get() noexcept;
 

SkyUtilities/PapyrusEventManager.cpp

@@ -180,7 +180,10 @@ namespace SKU {
     Plugin::Log(LOGL_VERBOSE, "PapyrusEventManager: Adding recipient '%s' to event '%s'.",
       recipient->GetFullName(), event_name.c_str());
 
-    recipient_map.at(event_name).emplace(recipient_handle);
+    if (recipient_map.at(event_name).emplace(recipient_handle).second == true)
+    {
+      policy->AddRef(recipient_handle);
+    }
 
     return true;
   }
@@ -242,7 +245,7 @@ namespace SKU {
       return;
     }
 
-    if (std::get<ISerializeable::idStream>(serialized).tellg() == std::streampos(0))
+    if (std::get<ISerializeable::idStream>(serialized).tellp() == std::streampos(0))
     {
       Plugin::Log(LOGL_VERBOSE, "PapyrusEventManager: No events were registered.");
       return;
@@ -258,7 +261,7 @@ namespace SKU {
       DeserializeString(serialized, event_name);
       DeserializeIntegral(serialized, recipient_amount);
 
-      Plugin::Log(LOGL_DETAILED, "PapyrusEventManager: Setting up event '%d' with %d recipients",
+      Plugin::Log(LOGL_DETAILED, "PapyrusEventManager: Setting up event '%s' with %d recipients",
         event_name.c_str(), recipient_amount);
 
       if (recipient_amount > 0)

SkyUtilities/PapyrusEventManager.h

@@ -65,7 +65,7 @@ namespace SKU {
     virtual bool IsRequestedSerialization(ISerializeable::SerializationEntity &serialized) final;
 
     private:
-    using RecipientMap = std::unordered_map</* event name: */std::string, std::unordered_set< PapyrusEventRecipient > >;
+    using RecipientMap = std::unordered_map</* event name: */std::string, std::unordered_set< PapyrusEventRecipient > >; // TODO: turn around.. makes more sense
     using EventMap = std::unordered_map </* event name: */std::string, std::unordered_set< std::unique_ptr<PapyrusEvent> > >;
     using EventKeyMap = std::unordered_map < std::string, BSFixedString >;