Initial Implementation of External Command Processor

TheStarport · Aug 13, 2023 · bb2cc7d · bb2cc7d
1 parent 1dc40a7
commit bb2cc7d
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 3 deletions.
diff --git a/include/Core/Commands/ExternalCommandProcessor.hpp b/include/Core/Commands/ExternalCommandProcessor.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+class ExternalCommandProcessor
+{
+        // clang-format off
+        std::unordered_map<std::wstring, std::function<nlohmann::json(const nlohmann::json&)>> functions =
+        {
+            {
+               std::wstring(L"beam"), Beam
+            },
+            {
+
+            }
+        };
+        // clang-format on
+
+       static nlohmann::json Beam(const nlohmann::json& parameters);
+
+    public:
+        std::optional<nlohmann::json> ProcessCommand(const nlohmann::json& command);
+};
diff --git a/include/Core/MessageHandler.hpp b/include/Core/MessageHandler.hpp
@@ -36,11 +36,13 @@ class MessageHandler final : public AMQP::ConnectionHandler, public Singleton<Me
 	enum class Queue
 	{
 		ServerStats,
+		ExternalCommands,
 	};
 
 	static std::wstring_view QueueToStr(const Queue queue) { return magic_enum::enum_name<Queue>(queue); }
 	void Subscribe(const std::wstring& queue, QueueOnData callback, std::optional<QueueOnFail> onFail = std::nullopt);
 	void Publish(const std::wstring& jsonData, const std::wstring& exchange = L"", const std::wstring& queue = L"") const;
 	void DeclareQueue(const std::wstring& queue, int flags = 0) const;
 	void DeclareExchange(const std::wstring& exchange, AMQP::ExchangeType type = AMQP::fanout, int flags = 0) const;
+    void RemoteProcedureCall(nlohmann::json call);
 };
diff --git a/include/PCH.hpp b/include/PCH.hpp
@@ -24,9 +24,7 @@
 #include <vector>
 #include <random>
 
-
 #include "Core/Templates/Constexpr.hpp"
-#include "Core/Templates/Typedefs.hpp"
 
 #define MAGIC_ENUM_USING_ALIAS_STRING_VIEW using string_view = std::wstring_view;
 #define MAGIC_ENUM_USING_ALIAS_STRING      using string = std::wstring;
@@ -68,7 +66,6 @@
 #include "Core/Codec.hpp"
 
 #include "Core/Action.hpp"
-#include "Core/MessageHandler.hpp"
 #include "Core/TempBan.hpp"
 #include "Defs/ServerStats.hpp"
 

diff --git a/project/FLHook.vcxproj b/project/FLHook.vcxproj
@@ -33,6 +33,7 @@
     <ClCompile Include="..\Source\Core\Codec.cpp" />
     <ClCompile Include="..\Source\Core\Commands\AdminCommandProcessor.cpp" />
     <ClCompile Include="..\Source\Core\Commands\CommandLineParser.cpp" />
+    <ClCompile Include="..\Source\Core\Commands\ExternalCommandProcessor.cpp" />
     <ClCompile Include="..\Source\Core\Commands\UserCommandProcessor.cpp" />
     <ClCompile Include="..\Source\Core\Debug.cpp" />
     <ClCompile Include="..\Source\Core\FLPacket.cpp" />
@@ -104,6 +105,7 @@
     <ClInclude Include="..\Include\Core\Commands\AbstractUserCommandProcessor.hpp" />
     <ClInclude Include="..\Include\Core\Commands\AdminCommandProcessor.hpp" />
     <ClInclude Include="..\Include\Core\Commands\CommandLineParser.hpp" />
+    <ClInclude Include="..\Include\Core\Commands\ExternalCommandProcessor.hpp" />
     <ClInclude Include="..\Include\Core\Commands\UserCommandProcessor.hpp" />
     <ClInclude Include="..\Include\Core\Detour.hpp" />
     <ClInclude Include="..\Include\Core\Exceptions\ErrorInfo.hpp" />

diff --git a/project/FLHook.vcxproj.filters b/project/FLHook.vcxproj.filters
@@ -262,6 +262,9 @@
     <ClCompile Include="..\Source\Hooks\ClientServerInterface\HookEntry.cpp">
       <Filter>Source\Hooks\ClientServerInterface</Filter>
     </ClCompile>
+    <ClCompile Include="..\Source\Core\Commands\ExternalCommandProcessor.cpp">
+      <Filter>Source\Core\Commands</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Include\Core\Commands\AbstractAdminCommandProcessor.hpp">
@@ -405,5 +408,8 @@
     <ClInclude Include="..\Include\API\API.hpp">
       <Filter>Include\API</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\Core\Commands\ExternalCommandProcessor.hpp">
+      <Filter>Include\Core\Commands</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/source/API/FLHook/MessageHandler.cpp b/source/API/FLHook/MessageHandler.cpp
@@ -138,3 +138,7 @@ void MessageHandler::Publish(const std::wstring& jsonData, const std::wstring& e
 	channel->publish(StringUtils::wstos(exchange), StringUtils::wstos(queue), StringUtils::wstos(jsonData));
 }
 
+void MessageHandler::RemoteProcedureCall(nlohmann::json call)
+{
+
+}
diff --git a/source/Core/Commands/ExternalCommandProcessor.cpp b/source/Core/Commands/ExternalCommandProcessor.cpp
@@ -0,0 +1,28 @@
+#include "PCH.hpp"
+#include "Core/Commands/ExternalCommandProcessor.hpp"
+#include "API/API.hpp"
+
+
+
+std::optional<nlohmann::json> ExternalCommandProcessor::ProcessCommand(const nlohmann::json& command)
+{
+    try
+    {
+        std::wstring functionName = command.at("command").get<std::wstring>();
+
+        return functions[functionName](command);
+    }
+    catch (nlohmann::json::exception& ex)
+    {
+        Logger::i()->Log(LogLevel::Warn, std::format(L"Exception was thrown while trying to process an external command. {}",StringUtils::stows(ex.what())));
+    }
+
+}
+
+nlohmann::json ExternalCommandProcessor::Beam(const nlohmann::json& parameters)
+{
+    const auto client = Hk::Client::GetClientIdFromCharName(parameters.at("characterName").get<std::wstring>()).Handle();
+    Hk::Player::Beam(client, parameters.at("baseName").get<std::wstring>());
+
+    return {};
+}
diff --git a/source/Core/Timers.cpp b/source/Core/Timers.cpp
@@ -5,6 +5,7 @@
 #include "Global.hpp"
 
 #include "API/API.hpp"
+#include "Core/MessageHandler.hpp"
 
 PerfTimer::PerfTimer(const std::wstring& func, uint warn) : function(func), warning(warn) {}