Initial work on Game Coordinator

Author: NicknineTheEagle

dll/dll/econ_item.h

@@ -18,6 +18,8 @@
 #ifndef __INCLUDED_ECON_ITEM_H__
 #define __INCLUDED_ECON_ITEM_H__
 
+#include "base.h"
+
 struct Econ_Item_Attribute
 {
     uint32 def;
@@ -32,7 +34,29 @@ struct Econ_Item
     EItemQuality quality;
     uint32 inv_pos;
     uint32 quantity;
+    uint8 flags;
+    uint8 origin;
+    std::string custom_name;
+    std::string custom_desc;
+    bool in_use;
+    uint64 original_id;
     std::vector<Econ_Item_Attribute> attributes;
 };
 
+inline bool check_econ_item_name(const std::string &name)
+{
+    if (name.size() > 40)
+        return false;
+
+    return true;
+}
+
+inline bool check_econ_item_desc(const std::string &desc)
+{
+    if (desc.size() > 80)
+        return false;
+
+    return true;
+}
+
 #endif

dll/dll/steam_game_coordinator.h

@@ -19,32 +19,65 @@
 #define __INCLUDED_STEAM_GAME_COORDINATOR_H__
 
 #include "base.h"
+#include "econ_item.h"
+
+class Steam_User_Items;
+class Steam_GameServer_Items;
 
 class Steam_Game_Coordinator :
 public ISteamGameCoordinator
 {
+    static constexpr const auto gc_user_file = "gc.json";
     constexpr const static uint32 protobuf_mask = 0x80000000;
 
     class Settings *settings{};
     class Networking *network{};
-    class SteamCallResults *callback_results{};
+    class Local_Storage *local_storage{};
     class SteamCallBacks *callbacks{};
     class RunEveryRunCB *run_every_runcb{};
+    bool is_server{};
+
+    struct GC_Message
+    {
+        uint32 msg_type;
+        std::string msg_body;
+        std::chrono::high_resolution_clock::time_point created{};
+        double post_in{};
+    };
+
+    std::vector<GC_Message> pending_messages{};
+    std::queue<GC_Message> incoming_messages{};
+
+    int gc_version{};
+    bool gc_initialized{};
+
+    void parse_gc_config();
+    bool gc_enabled();
+    Steam_User_Items *client_items();
+    Steam_GameServer_Items *server_items();
+    void push_incoming(uint32 msg_type, const std::string &message, double delay = 0.1);
+    void initialize_gc();
+
+    void handle_set_item_pos(const void *input, uint32 input_size);
+    void handle_delete_item(const void *input, uint32 input_size);
+    void handle_respawn(const void *input, uint32 input_size);
+    void handle_motd_request(const void *input, uint32 input_size);
 
-    std::queue<std::string> outgoing_messages{};
-
-    void push_incoming(std::string message);
-
-    static void steam_callback(void *object, Common_Message *msg);
     static void steam_run_every_runcb(void *object);
 
     void RunCallbacks();
-    void Callback(Common_Message *msg);
 
 public:
-    Steam_Game_Coordinator(class Settings *settings, class Networking *network, class SteamCallResults *callback_results, class SteamCallBacks *callbacks, class RunEveryRunCB *run_every_runcb);
+    Steam_Game_Coordinator(class Settings *settings, class Networking *network, class Local_Storage *local_storage, class SteamCallBacks *callbacks, class RunEveryRunCB *run_every_runcb, bool is_server);
     ~Steam_Game_Coordinator();
 
+    void on_client_connected(CSteamID steam_id);
+    void on_client_disconnected(CSteamID steam_id);
+    void on_items_received(CSteamID steam_id, const std::vector<Econ_Item> &items);
+    void on_item_pos_updated(CSteamID steam_id, const Econ_Item &item);
+    void on_item_deleted(CSteamID steam_id, uint64 item_id);
+    void on_respawn_request(CSteamID steam_id);
+
     // sends a message to the Game Coordinator
     EGCResults SendMessage_( uint32 unMsgType, const void *pubData, uint32 cubData );
 

dll/dll/steam_gameserver_items.h

@@ -21,6 +21,8 @@
 #include "base.h"
 #include "econ_item.h"
 
+class Steam_Game_Coordinator;
+
 class Steam_GameServer_Items :
 public ISteamGameServerItems001,
 public ISteamGameServerItems002,
@@ -38,11 +40,14 @@ public ISteamGameServerItems
         std::chrono::high_resolution_clock::time_point created{};
         CSteamID steam_id{};
         SteamAPICall_t steam_api_call;
+        bool is_gc{};
     };
 
     std::map<CSteamID, std::vector<Econ_Item>> all_user_items;
     std::vector<RequestInventory> pending_items_requests{};
 
+    Steam_Game_Coordinator *gc();
+
     void network_callback_inventory_response(Common_Message *msg);
     void network_callback_inventory_pos_update(Common_Message *msg);
     void network_callback_item_deletion(Common_Message *msg);
@@ -56,6 +61,9 @@ public ISteamGameServerItems
     Steam_GameServer_Items(class Settings *settings, class Networking *network, class SteamCallBacks *callbacks, class SteamCallResults *callback_results, class RunEveryRunCB *run_every_runcb);
     ~Steam_GameServer_Items();
 
+    SteamAPICall_t request_user_items(CSteamID steam_id, bool is_gc);
+    void remove_user_items(CSteamID steam_id);
+
     SteamAPICall_t LoadItems( CSteamID ownerID );
     void LoadItems_old( CSteamID ownerID );
     SteamAPICall_t GetItemCount( CSteamID ownerID );

dll/dll/steam_user_items.h

@@ -38,18 +38,25 @@ public ISteamUserItems
     std::vector<Econ_Item> items;
     bool items_loaded{};
 
+    uint64 item_id_local_to_network(uint64 item_id);
+    uint64 item_id_network_to_local(uint64 item_id);
+
     void network_callback_inventory_request(Common_Message *msg);
     void network_callback(Common_Message *msg);
 
     static void steam_user_items_network_callback(void *object, Common_Message *msg);
 
-    void load_items_from_file();
-    void save_items_to_file();
-
 public:
     Steam_User_Items(class Settings *settings, class Networking *network, class Local_Storage *local_storage, class SteamCallBacks *callbacks, class SteamCallResults *callback_results);
     ~Steam_User_Items();
 
+    const std::vector<Econ_Item> &load_items_from_file();
+    void save_items_to_file();
+    void send_items(uint64 server_steamid, SteamAPICall_t steam_api_call, bool is_gc);
+    const Econ_Item *set_item_pos(uint64 item_id, uint32 inv_pos, bool is_gc);
+    bool delete_item(uint64 item_id, bool is_gc);
+    void respawn_on_loadout_change();
+
     SteamAPICall_t LoadItems();
     void LoadItems_old();
     SteamAPICall_t GetItemCount();

dll/net.proto

@@ -337,6 +337,11 @@ message GameServer_Items_Messages {
         uint32 inv_pos = 5;
         uint32 quantity = 6;
         repeated Attribute attributes = 7;
+        uint32 flags = 8;
+        uint32 origin = 9;
+        string custom_name = 10;
+        string custom_desc = 11;
+        uint64 original_id = 12;
     }
     message InventoryRequest {
         uint64 steam_api_call = 1;
@@ -358,14 +363,16 @@ message GameServer_Items_Messages {
         Response_Inventory = 1;
         Request_UpdateInventoryPos = 2;
         Request_DeleteItem = 3;
+        Request_Respawn = 4;
     }
 
     Types type = 1;
+    bool is_gc = 2;
     oneof data_messages {
-        InventoryRequest inventory_request = 2;
-        InventoryResponse inventory_response = 3;
-        InventoryPosUpdate inventory_pos_update = 4;
-        ItemDeletion item_deletion = 5;
+        InventoryRequest inventory_request = 3;
+        InventoryResponse inventory_response = 4;
+        InventoryPosUpdate inventory_pos_update = 5;
+        ItemDeletion item_deletion = 6;
     }
 }
 

dll/steam_client.cpp

@@ -126,7 +126,7 @@ Steam_Client::Steam_Client()
     steam_networking_sockets = new Steam_Networking_Sockets(settings_client, network, callback_results_client, callbacks_client, run_every_runcb, NULL);
     steam_networking_sockets_serialized = new Steam_Networking_Sockets_Serialized(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
     steam_networking_messages = new Steam_Networking_Messages(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
-    steam_game_coordinator = new Steam_Game_Coordinator(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
+    steam_game_coordinator = new Steam_Game_Coordinator(settings_client, network, local_storage, callbacks_client, run_every_runcb, false);
     steam_networking_utils = new Steam_Networking_Utils(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
     steam_unified_messages = new Steam_Unified_Messages(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
     steam_game_search = new Steam_Game_Search(settings_client, network, callback_results_client, callbacks_client, run_every_runcb);
@@ -154,7 +154,7 @@ Steam_Client::Steam_Client()
     steam_gameserver_networking_sockets = new Steam_Networking_Sockets(settings_server, network, callback_results_server, callbacks_server, run_every_runcb, steam_networking_sockets->get_shared_between_client_server());
     steam_gameserver_networking_sockets_serialized = new Steam_Networking_Sockets_Serialized(settings_server, network, callback_results_server, callbacks_server, run_every_runcb);
     steam_gameserver_networking_messages = new Steam_Networking_Messages(settings_server, network, callback_results_server, callbacks_server, run_every_runcb);
-    steam_gameserver_game_coordinator = new Steam_Game_Coordinator(settings_server, network, callback_results_server, callbacks_server, run_every_runcb);
+    steam_gameserver_game_coordinator = new Steam_Game_Coordinator(settings_server, network, local_storage, callbacks_server, run_every_runcb, true);
     steam_masterserver_updater = new Steam_Masterserver_Updater(settings_server, network, callback_results_server, callbacks_server, run_every_runcb, steam_gameserver);
     steam_gameserver_gamestats = new Steam_GameStats(settings_server, network, callback_results_server, callbacks_server, run_every_runcb);
     steam_gameserver_items = new Steam_GameServer_Items(settings_server, network, callbacks_server, callback_results_server, run_every_runcb);