vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Working NetworkingService without net vars

Browse Source
This commit is contained in:
Evil Factory
2026-02-07 18:22:19 -03:00
committed by Maplewheels
parent 87dc9be10e
commit ba10d9d031
15 changed files with 226 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/LuaCs/Compatibility/ILuaCsNetworking.cs
+1 -1
View File
@@ -1,6 +1,6 @@
namespace Barotrauma.LuaCs.Compatibility;
internal partial interface ILuaCsNetworking : ILuaCsShim
public interface ILuaCsNetworking : ILuaCsShim
{
}
Barotrauma/BarotraumaShared/SharedSource/LuaCs/IEvents.cs
+18
View File
@@ -121,6 +121,24 @@ public interface IEventDrawUpdate : IEvent<IEventDrawUpdate>
}.ActLike<IEventDrawUpdate>();
}
#if CLIENT
public interface IEventServerRawNetMessageReceived : IEvent<IEventServerRawNetMessageReceived>
{
void OnReceivedServerNetMessage(IReadMessage netMessage, ServerPacketHeader serverPacketHeader);
}
public interface IEventConnectedToServer : IEvent<IEventConnectedToServer>
{
void OnConnectedToServer();
}
#elif SERVER
public interface IEventClientRawNetMessageReceived : IEvent<IEventClientRawNetMessageReceived>
{
void OnReceivedClientNetMessage(IReadMessage netMessage, ClientPacketHeader serverPacketHeader, NetworkConnection sender);
}
#endif
#endregion
#region Networking
Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs
+13 -4
View File
@@ -184,7 +184,7 @@ namespace Barotrauma
servicesProvider.RegisterServiceResolver<IPluginManagementService>(factory => factory.GetInstance<IAssemblyManagementService>());
servicesProvider.RegisterServiceType<ILuaScriptManagementService, LuaScriptManagementService>(ServiceLifetime.Singleton);
servicesProvider.RegisterServiceType<IConfigService, ConfigService>(ServiceLifetime.Singleton);
// TODO: INetworkingService
servicesProvider.RegisterServiceType<INetworkingService, NetworkingService>(ServiceLifetime.Singleton);
// Extension/Sub Services
servicesProvider.RegisterServiceType<IAssemblyLoaderService.IFactory, AssemblyLoader.Factory>(ServiceLifetime.Transient);
@@ -296,10 +296,11 @@ namespace Barotrauma
Logger.LogResults(PackageManagementService.UnloadAllPackages());
}
EventService.Reset();
ConfigService.Reset();
LuaScriptManagementService.Reset();
PackageManagementService.Reset();
EventService.Reset();
NetworkingService.Reset();
SubscribeToLuaCsEvents();
@@ -343,10 +344,18 @@ namespace Barotrauma
#if DEBUG
Logger.LogResults(PackageManagementService.ExecuteLoadedPackages(ContentPackageManager.EnabledPackages.All.ToImmutableArray(), true));
#else
Logger.LogResults(PackageManagementService.ExecuteLoadedPackages(ContentPackageManager.EnabledPackages.All.ToImmutableArray(), IsCsEnabled));
Logger.LogResults(PackageManagementService.ExecuteLoadedPackages(ContentPackageManager.EnabledPackages.All.ToImmutableArray(), IsCsEnabled));
#endif
}
#if CLIENT
// Technically not very accurate, but we want to call after we run mods anyway
if (GameMain.Client != null)
{
EventService.PublishEvent<IEventConnectedToServer>(static p => p.OnConnectedToServer());
}
#endif
CurrentRunState = RunState.Running;
}
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LuaScriptManagementService.cs
+5 -3
View File
@@ -47,7 +47,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
private readonly ILuaCsTimer _luaCsTimer;
private readonly IDefaultLuaRegistrar _defaultLuaRegistrar;
private readonly IPluginManagementService _pluginManagementService;
//private readonly ILuaCsNetworking _luaCsNetworking;
private readonly INetworkingService _networkingService;
//private readonly ILuaCsUtility _luaCsUtility;
public LuaScriptManagementService(
@@ -58,9 +58,9 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
IDefaultLuaRegistrar defaultLuaRegistrar,
ILuaScriptServicesConfig luaScriptServicesConfig,
IPluginManagementService pluginManagementService,
INetworkingService networkingService,
LuaGame luaGame,
IEventService eventService,
//ILuaCsNetworking luaCsNetworking,
//ILuaCsUtility luaCsUtility,
ILuaCsTimer luaCsTimer
)
@@ -72,6 +72,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
_luaScriptServicesConfig = luaScriptServicesConfig;
_loggerService = loggerService;
_pluginManagementService = pluginManagementService;
_networkingService = networkingService;
_luaGame = luaGame;
_eventService = eventService;
@@ -192,6 +193,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
UserData.RegisterType(typeof(ILuaScriptResourceInfo));
UserData.RegisterType(typeof(IResourceInfo));
UserData.RegisterType(typeof(IUserDataDescriptor));
UserData.RegisterType(typeof(INetworkingService));
new LuaConverters(_script).RegisterLuaConverters();
@@ -211,7 +213,7 @@ class LuaScriptManagementService : ILuaScriptManagementService, ILuaDataService
_script.Globals["Hook"] = _eventService;
_script.Globals["Timer"] = _luaCsTimer;
_script.Globals["File"] = UserData.CreateStatic<LuaCsFile>();
//_script.Globals["Networking"] = _luaCsNetworking;
_script.Globals["Networking"] = _networkingService;
//_script.Globals["Steam"] = Steam;
if (GameMain.LuaCs.IsCsEnabled)
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/NetworkingService.cs
+87 -37
View File
@@ -1,52 +1,88 @@
using Barotrauma.LuaCs;
using Barotrauma.LuaCs.Compatibility;
using Barotrauma.LuaCs.Events;
using Barotrauma.Networking;
using FluentResults;
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
namespace Barotrauma.LuaCs;
internal partial class NetworkingService : INetworkingService
public partial class NetworkingService : INetworkingService
{
private enum LuaCsClientToServer
public readonly record struct NetId
{
NetMessageId,
NetMessageString,
RequestSingleId,
RequestAllIds,
private readonly string _value;
public NetId(string netId)
{
_value = netId;
}
public static void Write(IWriteMessage message, NetId netId)
{
message.WriteString(netId._value);
}
public static NetId Read(IReadMessage message)
{
return new NetId(message.ReadString());
}
}
private enum LuaCsServerToClient
private enum ClientToServer
{
NetMessageId,
NetMessageString,
ReceiveIds
NetMessageInternalId,
NetMessageNetId,
RequestSingleNetId,
RequestAllNetIds,
}
private Dictionary<Guid, INetworkSyncVar> netVars = new Dictionary<Guid, INetworkSyncVar>();
private Dictionary<Guid, NetMessageReceived> netReceives = new Dictionary<Guid, NetMessageReceived>();
private Dictionary<ushort, Guid> packetToId = new Dictionary<ushort, Guid>();
private Dictionary<Guid, ushort> idToPacket = new Dictionary<Guid, ushort>();
private enum ServerToClient
{
NetMessageInternalId,
NetMessageNetId,
ReceiveNetIds
}
private Dictionary<NetId, NetMessageReceived> netReceives = new Dictionary<NetId, NetMessageReceived>();
private Dictionary<ushort, NetId> packetToId = new Dictionary<ushort, NetId>();
private Dictionary<NetId, ushort> idToPacket = new Dictionary<NetId, ushort>();
public bool IsActive
{
get
{
return GameMain.NetworkMember != null; // ehh?
return GameMain.NetworkMember != null;
}
}
public bool IsSynchronized { get; private set; }
public bool IsDisposed { get; private set; }
public void Initialize()
private readonly IEventService _eventService;
private readonly ILoggerService _loggerService;
public NetworkingService(IEventService eventService, ILoggerService loggerService)
{
_eventService = eventService;
_loggerService = loggerService;
#if SERVER
IsSynchronized = true;
#elif CLIENT
SendSyncMessage();
#endif
SubscribeToEvents();
}
public void Receive(Guid netId, NetMessageReceived callback)
public void Receive(string netIdString, NetMessageReceived callback) => Receive(new NetId(netIdString), callback);
public void Receive(Guid netIdGuid, NetMessageReceived callback) => Receive(new NetId(netIdGuid.ToString()), callback);
public IWriteMessage Start(string netIdString) => Start(new NetId(netIdString));
public IWriteMessage Start(Guid netIdGuid) => Start(new NetId(netIdGuid.ToString()));
public void Receive(NetId netId, NetMessageReceived callback)
{
#if SERVER
RegisterId(netId);
@@ -56,18 +92,21 @@ internal partial class NetworkingService : INetworkingService
netReceives[netId] = callback;
}
private void HandleNetMessage(IReadMessage netMessage, Guid netId, Client client = null)
private void HandleNetMessage(IReadMessage netMessage, NetId netId, Client client = null)
{
if (netReceives.ContainsKey(netId))
{
try
{
#if CLIENT
netReceives[netId](netMessage);
#elif SERVER
netReceives[netId](netMessage, client.Connection);
#endif
}
catch (Exception e)
{
LuaCsLogger.LogError($"Exception thrown inside NetMessageReceive({netId})", LuaCsMessageOrigin.CSharpMod);
LuaCsLogger.HandleException(e, LuaCsMessageOrigin.CSharpMod);
_loggerService.LogResults(new ExceptionalError("Exception thrown inside NetMessageReceive({netId})", e));
}
}
else
@@ -75,9 +114,9 @@ internal partial class NetworkingService : INetworkingService
if (GameSettings.CurrentConfig.VerboseLogging)
{
#if SERVER
LuaCsLogger.LogError($"Received NetMessage for unknown netid {netId} from {GameServer.ClientLogName(client)}.");
_loggerService.LogError($"Received NetMessage for unknown netid {netId} from {GameServer.ClientLogName(client)}.");
#else
LuaCsLogger.LogError($"Received NetMessage for unknown netid {netId} from server.");
_loggerService.LogError($"Received NetMessage for unknown netid {netId} from server.");
#endif
}
}
@@ -85,23 +124,19 @@ internal partial class NetworkingService : INetworkingService
private void HandleNetMessageString(IReadMessage netMessage, Client client = null)
{
Guid guid = new Guid(netMessage.ReadBytes(16));
NetId netId = NetId.Read(netMessage);
HandleNetMessage(netMessage, guid, client);
HandleNetMessage(netMessage, netId, client);
}
public FluentResults.Result Reset()
private void SubscribeToEvents()
{
IsSynchronized = false;
netReceives = new Dictionary<Guid, NetMessageReceived>();
packetToId = new Dictionary<ushort, Guid>();
idToPacket = new Dictionary<Guid, ushort>();
return FluentResults.Result.Ok();
}
public void Dispose()
{
IsDisposed = true;
#if CLIENT
_eventService.Subscribe<IEventConnectedToServer>(this);
_eventService.Subscribe<IEventServerRawNetMessageReceived>(this);
#elif SERVER
_eventService.Subscribe<IEventClientRawNetMessageReceived>(this);
#endif
}
public Guid GetNetworkIdForInstance(INetworkSyncVar var)
@@ -118,4 +153,19 @@ internal partial class NetworkingService : INetworkingService
{
throw new NotImplementedException();
}
public FluentResults.Result Reset()
{
IsSynchronized = false;
netReceives = new Dictionary<NetId, NetMessageReceived>();
packetToId = new Dictionary<ushort, NetId>();
idToPacket = new Dictionary<NetId, ushort>();
SubscribeToEvents();
return FluentResults.Result.Ok();
}
public void Dispose()
{
IsDisposed = true;
}
}
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Interfaces/INetworkingService.cs
+16 -10
View File
@@ -6,26 +6,32 @@ using Barotrauma.Networking;
namespace Barotrauma.LuaCs;
internal delegate void NetMessageReceived(IReadMessage netMessage);
#if CLIENT
public delegate void NetMessageReceived(IReadMessage netMessage);
#elif SERVER
public delegate void NetMessageReceived(IReadMessage netMessage, NetworkConnection connection);
#endif
internal partial interface INetworkingService : IReusableService, ILuaCsNetworking, IEntityNetworkingService
public interface INetworkingService : IReusableService, ILuaCsNetworking, IEntityNetworkingService
{
bool IsActive { get; }
bool IsSynchronized { get; }
public IWriteMessage Start(Guid netId);
public void Receive(Guid netId, NetMessageReceived action);
IWriteMessage Start(string netId);
IWriteMessage Start(Guid netId);
void Receive(string netId, NetMessageReceived action);
void Receive(Guid netId, NetMessageReceived action);
#if SERVER
public void Send(IWriteMessage netMessage, NetworkConnection connection = null, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable);
void SendToClient(IWriteMessage netMessage, NetworkConnection connection = null, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable);
#elif CLIENT
public void Send(IWriteMessage netMessage, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable);
void SendToServer(IWriteMessage netMessage, DeliveryMethod deliveryMethod = DeliveryMethod.Reliable);
#endif
}
public interface IEntityNetworkingService
{
public Guid GetNetworkIdForInstance(INetworkSyncVar var);
public void RegisterNetVar(INetworkSyncVar netVar);
public void SendNetVar(INetworkSyncVar netVar);
Guid GetNetworkIdForInstance(INetworkSyncVar var);
void RegisterNetVar(INetworkSyncVar netVar);
void SendNetVar(INetworkSyncVar netVar);
}
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/DefaultLuaRegistrar.cs
-3
View File
@@ -49,12 +49,9 @@ public class DefaultLuaRegistrar : IDefaultLuaRegistrar
continue;
}
_loggerService.LogMessage($"Registered {type.FullName}");
_userDataService.RegisterType(type.FullName);
}
_userDataService.RegisterType("Barotrauma.LuaSByte");
_userDataService.RegisterType("Barotrauma.LuaByte");
_userDataService.RegisterType("Barotrauma.LuaInt16");
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/_Lua/LuaClasses/LuaConverters.cs
+16
View File
@@ -134,6 +134,22 @@ namespace Barotrauma
RegisterHandler(f => (GUITextBlock.ClickableArea.OnClickDelegate)(
(a1, a2) => Call(f, a1, a2)));
}
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(NetMessageReceived), v => (NetMessageReceived)((arg1) =>
{
if (v.Function.OwnerScript == _script)
{
Call(v.Function, arg1);
}
}));
#elif SERVER
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Function, typeof(NetMessageReceived), v => (NetMessageReceived)((arg1, arg2) =>
{
if (v.Function.OwnerScript == _script)
{
Call(v.Function, arg1, arg2);
}
}));
#endif
Script.GlobalOptions.CustomConverters.SetScriptToClrCustomConversion(DataType.Table, typeof(Pair<JobPrefab, int>), v =>