OneSync prototype support side-by-side with classical servers (for internal consumption only)

Author: copernicium

.gitlab-ci.yml

@@ -62,6 +62,7 @@ build_proot_linux:
     - tags
     - master
     - feature/update-to-1290
+    - feature/cloning-stuff-releng
   tags:
     - linux
 

.gitmodules

@@ -85,3 +85,6 @@
 [submodule "vendor/nanomsg"]
 	path = vendor/nanomsg
 	url = https://github.com/nanomsg/nanomsg.git
+[submodule "vendor/lz4"]
+	path = vendor/lz4
+	url = https://github.com/lz4/lz4.git

code/client/clrcore/External/World.cs

@@ -1,4 +1,4 @@
-using CitizenFX.Core.Native;
+using CitizenFX.Core.Native;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;

code/client/shared/CrossLibraryInterfaces.h

@@ -13,6 +13,8 @@ class INetLibrary
 public:
 	virtual uint16_t GetServerNetID() = 0;
 
+	virtual uint16_t GetServerSlotID() = 0;
+
 	virtual uint16_t GetHostNetID() = 0;
 
 	virtual uint32_t GetHostBase() = 0;

code/client/shared/ICoreGameInit.h

@@ -31,6 +31,8 @@ class ICoreGameInit
 
 	bool EnhancedHostSupport = false;
 
+	bool OneSyncEnabled = false;
+
 private:
 	std::set<std::string, std::less<>> VariableList;
 

code/components/citizen-playernames-five/src/HookPlayerNameHandling.cpp

@@ -17,6 +17,7 @@
 
 static NetLibrary* g_netLibrary;
 static std::unordered_map<int, std::string> g_netIdToNames;
+static std::unordered_map<int, int> g_netIdToSlots;
 
 // needs to be kept in sync with gta:net:five
 struct ScInAddr
@@ -37,6 +38,11 @@ struct ScInAddr
 
 static const char* GetPlayerNameFromScAddr(ScInAddr* addr)
 {
+	if (addr == (void*)0x20)
+	{
+		return "** Invalid **";
+	}
+
 	if (addr->ipLan != addr->ipOnline || addr->ipLan != addr->ipUnk)
 	{
 		return (char*)addr + sizeof(ScInAddr) + (92 - 64);
@@ -47,7 +53,7 @@ static const char* GetPlayerNameFromScAddr(ScInAddr* addr)
 
 	if (it == g_netIdToNames.end())
 	{
-		return "** Invalid **";
+		return va("player %d", netId);
 	}
 
 	return it->second.c_str();
@@ -92,7 +98,7 @@ static InitFunction initFunction([] ()
 			eventComponent->OnTriggerEvent.Connect([] (const std::string& eventName, const std::string& eventPayload, const std::string& eventSource, bool* eventCanceled)
 			{
 				// if this is the event 'we' handle...
-				if (eventName == "onPlayerJoining")
+				if (eventName == "onPlayerJoining" || eventName == "onPlayerDropped")
 				{
 					try
 					{
@@ -115,8 +121,33 @@ static InitFunction initFunction([] ()
 							int netId = arguments[0].as<int>();
 							std::string name = arguments[1].as<std::string>();
 
-							// and add to the list
-							g_netIdToNames[netId] = name;
+							if (eventName == "onPlayerJoining")
+							{
+								// and add to the list
+								g_netIdToNames[netId] = name;
+							}
+
+							if (arguments.size() >= 3)
+							{
+								uint32_t slotId = arguments[2].as<uint32_t>();
+
+								g_netIdToSlots[netId] = slotId;
+
+								// trickle the event down the stack
+								NetLibraryClientInfo clientInfo;
+								clientInfo.netId = netId;
+								clientInfo.name = name;
+								clientInfo.slotId = slotId;
+
+								if (eventName == "onPlayerJoining")
+								{
+									g_netLibrary->OnClientInfoReceived(clientInfo);
+								}
+								else if (eventName == "onPlayerDropped")
+								{
+									g_netLibrary->OnClientInfoDropped(clientInfo);
+								}
+							}
 						}
 					}
 					catch (std::runtime_error& e)

code/components/citizen-resources-client/src/LevelDBVFSEnvironment.cpp

@@ -483,15 +483,21 @@ namespace leveldb
 
 	Status VFSEnvironment::LockFile(const std::string& fname, FileLock** lock)
 	{
+#ifdef _DEBUG
+		return Status();
+#else
 		auto vfsLock = new VFSFileLock(fname);
 		*lock = vfsLock;
 
 		return vfsLock->IsValid() ? Status() : Status::IOError("Could not lock file.");
+#endif
 	}
 
 	Status VFSEnvironment::UnlockFile(FileLock* lock)
 	{
+#ifndef _DEBUG
 		delete lock;
+#endif
 
 		return Status();
 	}

code/components/citizen-resources-core/include/RpcConfiguration.h

@@ -0,0 +1,116 @@
+#pragma once
+
+#include <rapidjson/document.h>
+
+#ifdef COMPILING_CITIZEN_RESOURCES_CORE
+#define RESOURCES_CORE_EXPORT DLL_EXPORT
+#else
+#define RESOURCES_CORE_EXPORT DLL_IMPORT
+#endif
+
+class RESOURCES_CORE_EXPORT RpcConfiguration
+{
+public:
+	enum class ArgumentType
+	{
+		Entity,
+		Float,
+		Int,
+		Bool,
+		String,
+		Player,
+		Hash
+	};
+
+	enum class RpcType
+	{
+		EntityContext,
+		EntityCreate
+	};
+
+	class Argument
+	{
+	public:
+		Argument();
+
+		void Initialize(rapidjson::Value& value);
+
+		inline ArgumentType GetType() const
+		{
+			return m_type;
+		}
+
+		inline bool GetTranslated() const
+		{
+			return m_translate;
+		}
+
+	private:
+		ArgumentType m_type;
+		bool m_translate;
+	};
+
+	class Native
+	{
+	public:
+		Native();
+
+		void Initialize(rapidjson::Value& value);
+
+		inline const std::string& GetName() const
+		{
+			return m_name;
+		}
+
+		inline uint64_t GetGameHash() const
+		{
+			return m_gameHash;
+		}
+
+		inline int GetContextIndex() const
+		{
+			return m_contextArgument;
+		}
+
+		inline ArgumentType GetContextType() const
+		{
+			return m_contextType;
+		}
+
+		inline RpcType GetRpcType() const
+		{
+			return m_rpcType;
+		}
+
+		inline const std::vector<Argument>& GetArguments() const
+		{
+			return m_arguments;
+		}
+
+	private:
+		std::string m_name;
+		uint64_t m_gameHash;
+
+		int m_contextArgument;
+		ArgumentType m_contextType;
+
+		RpcType m_rpcType;
+
+		std::vector<Argument> m_arguments;
+	};
+
+public:
+	RpcConfiguration();
+
+	virtual ~RpcConfiguration();
+
+	inline const std::vector<std::shared_ptr<Native>>& GetNatives() const
+	{
+		return m_natives;
+	}
+
+	static std::shared_ptr<RpcConfiguration> Load(std::string_view path);
+
+private:
+	std::vector<std::shared_ptr<Native>> m_natives;
+};