space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate CreateNetMessage<T>.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2022-04-15 18:47:42 +02:00
parent 24b124fb17
commit 45d906ba7e
26 changed files with 55 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Robust.Client/Console/ClientConsoleHost.cs
View File

@@ -134,7 +134,7 @@ namespace Robust.Client.Console
if (!NetManager.IsConnected) // we don't care about session on client
return;
var msg = NetManager.CreateNetMessage<MsgConCmd>();
var msg = new MsgConCmd();
msg.Text = command;
NetManager.ClientSendMessage(msg);
}
@@ -198,7 +198,7 @@ namespace Robust.Client.Console
if (!NetManager.IsConnected)
return;
var msg = NetManager.CreateNetMessage<MsgConCmdReg>();
var msg = new MsgConCmdReg();
NetManager.ClientSendMessage(msg);
_requestedCommands = true;

2
Robust.Client/Console/Commands/SendGarbageCommand.cs
View File

@@ -15,7 +15,7 @@ namespace Robust.Client.Console.Commands
// MsgStringTableEntries is registered as NetMessageAccept.Client so the server will immediately deny it.
// And kick us.
var net = IoCManager.Resolve<IClientNetManager>();
var msg = net.CreateNetMessage<MsgStringTableEntries>();
var msg = new MsgStringTableEntries();
msg.Entries = new MsgStringTableEntries.Entry[0];
net.ClientSendMessage(msg);
}

4
Robust.Client/Console/ScriptClient.ScriptConsoleServer.cs
View File

@@ -35,7 +35,7 @@ namespace Robust.Client.Console
RunButton.Disabled = true;
var msg = _client._netManager.CreateNetMessage<MsgScriptEval>();
var msg = new MsgScriptEval();
msg.ScriptSession = _session;
msg.Code = _lastEnteredText = InputBar.Text;
@@ -48,7 +48,7 @@ namespace Robust.Client.Console
protected override void Complete()
{
var msg = _client._netManager.CreateNetMessage<MsgScriptCompletion>();
var msg = new MsgScriptCompletion();
msg.ScriptSession = _session;
msg.Code = InputBar.Text;
msg.Cursor = InputBar.CursorPosition;

4
Robust.Client/Console/ScriptClient.cs
View File

@@ -65,7 +65,7 @@ namespace Robust.Client.Console
throw new InvalidOperationException("We do not have scripting permission.");
}
var msg = _netManager.CreateNetMessage<MsgScriptStart>();
var msg = new MsgScriptStart();
msg.ScriptSession = _nextSessionId++;
_netManager.ClientSendMessage(msg);
}
@@ -74,7 +74,7 @@ namespace Robust.Client.Console
{
_activeConsoles.Remove(session);
var msg = _netManager.CreateNetMessage<MsgScriptStop>();
var msg = new MsgScriptStop();
msg.ScriptSession = session;
_netManager.ClientSendMessage(msg);
}

2
Robust.Client/GameObjects/ClientEntityManager.cs
View File

@@ -86,7 +86,7 @@ namespace Robust.Client.GameObjects
public void SendSystemNetworkMessage(EntityEventArgs message, uint sequence)
{
var msg = _networkManager.CreateNetMessage<MsgEntity>();
var msg = new MsgEntity();
msg.Type = EntityMessageType.SystemMessage;
msg.SystemMessage = message;
msg.SourceTick = _gameTiming.CurTick;

2
Robust.Client/GameStates/ClientGameStateManager.cs
View File

@@ -409,7 +409,7 @@ namespace Robust.Client.GameStates
private void AckGameState(GameTick sequence)
{
var msg = _network.CreateNetMessage<MsgStateAck>();
var msg = new MsgStateAck();
msg.Sequence = sequence;
_network.ClientSendMessage(msg);
}

6
Robust.Client/Placement/PlacementManager.cs
View File

@@ -418,7 +418,7 @@ namespace Robust.Client.Placement
if (!IsActive || !Eraser) return;
if (Hijack != null && Hijack.HijackDeletion(entity)) return;
var msg = NetworkManager.CreateNetMessage<MsgPlacement>();
var msg = new MsgPlacement();
msg.PlaceType = PlacementManagerMessage.RequestEntRemove;
msg.EntityUid = entity;
NetworkManager.ClientSendMessage(msg);
@@ -426,7 +426,7 @@ namespace Robust.Client.Placement
public void HandleRectDeletion(EntityCoordinates start, Box2 rect)
{
var msg = NetworkManager.CreateNetMessage<MsgPlacement>();
var msg = new MsgPlacement();
msg.PlaceType = PlacementManagerMessage.RequestRectRemove;
msg.EntityCoordinates = new EntityCoordinates(StartPoint.EntityId, rect.BottomLeft);
msg.RectSize = rect.Size;
@@ -748,7 +748,7 @@ namespace Robust.Client.Placement
_pendingTileChanges.Add(tuple);
}
var message = NetworkManager.CreateNetMessage<MsgPlacement>();
var message = new MsgPlacement();
message.PlaceType = PlacementManagerMessage.RequestPlacement;
message.Align = CurrentMode.ModeName;

2
Robust.Client/Player/PlayerManager.cs
View File

@@ -89,7 +89,7 @@ namespace Robust.Client.Player
{
LocalPlayer = new LocalPlayer();
var msgList = _network.CreateNetMessage<MsgPlayerListReq>();
var msgList = new MsgPlayerListReq();
// message is empty
_network.ClientSendMessage(msgList);
}

2
Robust.Client/Prototypes/ClientPrototypeManager.cs
View File

@@ -57,7 +57,7 @@ namespace Robust.Client.Prototypes
#if !FULL_RELEASE
var sw = Stopwatch.StartNew();
var msg = _netManager.CreateNetMessage<MsgReloadPrototypes>();
var msg = new MsgReloadPrototypes();
msg.Paths = _reloadQueue.ToArray();
_netManager.ClientSendMessage(msg);

8
Robust.Client/ViewVariables/ViewVariablesManager.cs
View File

@@ -277,7 +277,7 @@ namespace Robust.Client.ViewVariables
public Task<ViewVariablesRemoteSession> RequestSession(ViewVariablesObjectSelector selector)
{
var msg = _netManager.CreateNetMessage<MsgViewVariablesReqSession>();
var msg = new MsgViewVariablesReqSession();
msg.Selector = selector;
msg.RequestId = _nextReqId++;
_netManager.ClientSendMessage(msg);
@@ -293,7 +293,7 @@ namespace Robust.Client.ViewVariables
throw new ArgumentException("Session is closed", nameof(session));
}
var msg = _netManager.CreateNetMessage<MsgViewVariablesReqData>();
var msg = new MsgViewVariablesReqData();
var reqId = msg.RequestId = _nextReqId++;
msg.RequestMeta = meta;
msg.SessionId = session.SessionId;
@@ -315,7 +315,7 @@ namespace Robust.Client.ViewVariables
throw new ArgumentException();
}
var closeMsg = _netManager.CreateNetMessage<MsgViewVariablesCloseSession>();
var closeMsg = new MsgViewVariablesCloseSession();
closeMsg.SessionId = session.SessionId;
_netManager.ClientSendMessage(closeMsg);
}
@@ -332,7 +332,7 @@ namespace Robust.Client.ViewVariables
throw new ArgumentException();
}
var msg = _netManager.CreateNetMessage<MsgViewVariablesModifyRemote>();
var msg = new MsgViewVariablesModifyRemote();
msg.SessionId = session.SessionId;
msg.ReinterpretValue = reinterpretValue;
msg.PropertyIndex = propertyIndex;

6
Robust.Server/Console/ServerConsoleHost.cs
View File

@@ -33,7 +33,7 @@ namespace Robust.Server.Console
if (!NetManager.IsConnected || session is null)
return;
var msg = NetManager.CreateNetMessage<MsgConCmd>();
var msg = new MsgConCmd();
msg.Text = command;
NetManager.ServerSendMessage(msg, ((IPlayerSession)session).ConnectedClient);
}
@@ -121,7 +121,7 @@ namespace Robust.Server.Console
private void HandleRegistrationRequest(INetChannel senderConnection)
{
var netMgr = IoCManager.Resolve<IServerNetManager>();
var message = netMgr.CreateNetMessage<MsgConCmdReg>();
var message = new MsgConCmdReg();
var counter = 0;
message.Commands = new MsgConCmdReg.Command[RegisteredCommands.Count];
@@ -154,7 +154,7 @@ namespace Robust.Server.Console
{
if (session != null)
{
var replyMsg = NetManager.CreateNetMessage<MsgConCmdAck>();
var replyMsg = new MsgConCmdAck();
replyMsg.Error = error;
replyMsg.Text = text;
NetManager.ServerSendMessage(replyMsg, session.ConnectedClient);

4
Robust.Server/GameObjects/ServerEntityManager.cs
View File

@@ -206,7 +206,7 @@ namespace Robust.Server.GameObjects
/// <inheritdoc />
public void SendSystemNetworkMessage(EntityEventArgs message)
{
var newMsg = _networkManager.CreateNetMessage<MsgEntity>();
var newMsg = new MsgEntity();
newMsg.Type = EntityMessageType.SystemMessage;
newMsg.SystemMessage = message;
newMsg.SourceTick = _gameTiming.CurTick;
@@ -217,7 +217,7 @@ namespace Robust.Server.GameObjects
/// <inheritdoc />
public void SendSystemNetworkMessage(EntityEventArgs message, INetChannel targetConnection)
{
var newMsg = _networkManager.CreateNetMessage<MsgEntity>();
var newMsg = new MsgEntity();
newMsg.Type = EntityMessageType.SystemMessage;
newMsg.SystemMessage = message;
newMsg.SourceTick = _gameTiming.CurTick;

2
Robust.Server/GameStates/ServerGameStateManager.cs
View File

@@ -219,7 +219,7 @@ namespace Robust.Server.GameStates
InterlockedHelper.Min(ref oldestAckValue, lastAck.Value);
// actually send the state
var stateUpdateMessage = _networkManager.CreateNetMessage<MsgState>();
var stateUpdateMessage = new MsgState();
stateUpdateMessage.State = state;
// If the state is too big we let Lidgren send it reliably.

6
Robust.Server/Placement/PlacementManager.cs
View File

@@ -230,7 +230,7 @@ namespace Robust.Server.Placement
if (playerConnection == null)
return;
var message = _networkManager.CreateNetMessage<MsgPlacement>();
var message = new MsgPlacement();
message.PlaceType = PlacementManagerMessage.StartPlacement;
message.Range = range;
message.IsTile = false;
@@ -251,7 +251,7 @@ namespace Robust.Server.Placement
if (playerConnection == null)
return;
var message = _networkManager.CreateNetMessage<MsgPlacement>();
var message = new MsgPlacement();
message.PlaceType = PlacementManagerMessage.StartPlacement;
message.Range = range;
message.IsTile = true;
@@ -272,7 +272,7 @@ namespace Robust.Server.Placement
if (playerConnection == null)
return;
var message = _networkManager.CreateNetMessage<MsgPlacement>();
var message = new MsgPlacement();
message.PlaceType = PlacementManagerMessage.CancelPlacement;
_networkManager.ServerSendMessage(message, playerConnection);
}

2
Robust.Server/Player/PlayerManager.cs
View File

@@ -445,7 +445,7 @@ namespace Robust.Server.Player
{
var channel = message.MsgChannel;
var players = Sessions;
var netMsg = channel.CreateNetMessage<MsgPlayerList>();
var netMsg = new MsgPlayerList();
// client session is complete, set their status accordingly.
// This is done before the packet is built, so that the client

6
Robust.Server/Scripting/ScriptHost.cs
View File

@@ -75,7 +75,7 @@ namespace Robust.Server.Scripting
private void ReceiveScriptStart(MsgScriptStart message)
{
var reply = _netManager.CreateNetMessage<MsgScriptStartAck>();
var reply = new MsgScriptStartAck();
reply.ScriptSession = message.ScriptSession;
reply.WasAccepted = false;
if (!_playerManager.TryGetSessionByChannel(message.MsgChannel, out var session))
@@ -128,7 +128,7 @@ namespace Robust.Server.Scripting
return;
}
var replyMessage = _netManager.CreateNetMessage<MsgScriptResponse>();
var replyMessage = new MsgScriptResponse();
replyMessage.ScriptSession = message.ScriptSession;
var code = message.Code;
@@ -259,7 +259,7 @@ namespace Robust.Server.Scripting
!instances.TryGetValue(message.ScriptSession, out var instance))
return;
var replyMessage = _netManager.CreateNetMessage<MsgScriptCompletionResponse>();
var replyMessage = new MsgScriptCompletionResponse();
replyMessage.ScriptSession = message.ScriptSession;
// Everything below here cribbed from

8
Robust.Server/ViewVariables/ViewVariablesHost.cs
View File

@@ -91,7 +91,7 @@ namespace Robust.Server.ViewVariables
var blob = session.DataRequest(message.RequestMeta);
var dataMsg = _netManager.CreateNetMessage<MsgViewVariablesRemoteData>();
var dataMsg = new MsgViewVariablesRemoteData();
dataMsg.RequestId = message.RequestId;
dataMsg.Blob = blob;
_netManager.ServerSendMessage(dataMsg, message.MsgChannel);
@@ -101,7 +101,7 @@ namespace Robust.Server.ViewVariables
{
void Deny(DenyReason reason)
{
var denyMsg = _netManager.CreateNetMessage<MsgViewVariablesDenySession>();
var denyMsg = new MsgViewVariablesDenySession();
denyMsg.RequestId = message.RequestId;
denyMsg.Reason = reason;
_netManager.ServerSendMessage(denyMsg, message.MsgChannel);
@@ -217,7 +217,7 @@ namespace Robust.Server.ViewVariables
_sessions.Add(sessionId, session);
var allowMsg = _netManager.CreateNetMessage<MsgViewVariablesOpenSession>();
var allowMsg = new MsgViewVariablesOpenSession();
allowMsg.RequestId = message.RequestId;
allowMsg.SessionId = session.SessionId;
_netManager.ServerSendMessage(allowMsg, message.MsgChannel);
@@ -245,7 +245,7 @@ namespace Robust.Server.ViewVariables
return;
}
var closeMsg = _netManager.CreateNetMessage<MsgViewVariablesCloseSession>();
var closeMsg = new MsgViewVariablesCloseSession();
closeMsg.SessionId = session.SessionId;
_netManager.ServerSendMessage(closeMsg, player.ConnectedClient);
}

8
Robust.Shared/Configuration/NetConfigurationManager.cs
View File

@@ -276,7 +276,7 @@ namespace Robust.Shared.Configuration
// replicate if needed
if (_netManager.IsClient)
{
var msg = _netManager.CreateNetMessage<MsgConVars>();
var msg = new MsgConVars();
msg.Tick = _timing.CurTick;
msg.NetworkedVars = new List<(string name, object value)>
{
@@ -286,7 +286,7 @@ namespace Robust.Shared.Configuration
}
else // Server
{
var msg = _netManager.CreateNetMessage<MsgConVars>();
var msg = new MsgConVars();
msg.Tick = _timing.CurTick;
msg.NetworkedVars = new List<(string name, object value)>
{
@@ -304,7 +304,7 @@ namespace Robust.Shared.Configuration
Logger.InfoS("cfg", $"{client}: Sending server info...");
var msg = _netManager.CreateNetMessage<MsgConVars>();
var msg = new MsgConVars();
msg.Tick = _timing.CurTick;
msg.NetworkedVars = GetReplicatedVars();
_netManager.ServerSendMessage(msg, client);
@@ -318,7 +318,7 @@ namespace Robust.Shared.Configuration
Logger.InfoS("cfg", "Sending client info...");
var msg = _netManager.CreateNetMessage<MsgConVars>();
var msg = new MsgConVars();
msg.Tick = default;
msg.NetworkedVars = GetReplicatedVars();
_netManager.ClientSendMessage(msg);

3
Robust.Shared/Network/INetChannel.cs
View File

@@ -66,8 +66,9 @@ namespace Robust.Shared.Network
/// </summary>
/// <typeparam name="T">The derived NetMessage type to send.</typeparam>
/// <returns>A new instance of the net message.</returns>
[Obsolete("Just new NetMessage directly")]
T CreateNetMessage<T>()
where T : NetMessage;
where T : NetMessage, new();
/// <summary>
/// Sends a NetMessage over this NetChannel.

3
Robust.Shared/Network/INetManager.cs
View File

@@ -138,6 +138,7 @@ namespace Robust.Shared.Network
/// </remarks>
/// <typeparam name="T">Type of NetMessage to send.</typeparam>
/// <returns>Instance of the NetMessage.</returns>
T CreateNetMessage<T>() where T : NetMessage;
[Obsolete("Just new NetMessage directly")]
T CreateNetMessage<T>() where T : NetMessage, new();
}
}

2
Robust.Shared/Network/NetManager.NetChannel.cs
View File

@@ -67,7 +67,7 @@ namespace Robust.Shared.Network
/// <inheritdoc />
public T CreateNetMessage<T>()
where T : NetMessage
where T : NetMessage, new()
{
return _manager.CreateNetMessage<T>();
}

42
Robust.Shared/Network/NetManager.cs
View File

@@ -106,10 +106,6 @@ namespace Robust.Shared.Network
// Used for processing incoming net messages.
private readonly NetMsgEntry[] _netMsgFunctions = new NetMsgEntry[256];
// Used for processing outgoing net messages.
private readonly Dictionary<Type, Func<NetMessage>> _blankNetMsgFunctions =
new();
private readonly Dictionary<Type, long> _bandwidthUsage = new();
[Dependency] private readonly IConfigurationManagerInternal _config = default!;
@@ -413,8 +409,6 @@ namespace Robust.Shared.Network
{
Reset(reason);
_blankNetMsgFunctions.Clear();
_messages.Clear();
_config.UnsubValueChanged(CVars.NetVerbose, NetVerboseChanged);
@@ -990,45 +984,13 @@ namespace Robust.Shared.Network
CacheNetMsgFunction((byte) id);
}
}
// This means we *will* be caching creation delegates for messages that are never sent (by this side).
// But it means the caching logic isn't behind a TryGetValue in CreateNetMessage<T>,
// so it no thread safety crap.
CacheBlankFunction(typeof(T));
}
/// <inheritdoc />
public T CreateNetMessage<T>()
where T : NetMessage
where T : NetMessage, new()
{
return (T) _blankNetMsgFunctions[typeof(T)]();
}
private void CacheBlankFunction(Type type)
{
var dynamicMethod = new DynamicMethod($"_netMsg<>{type.Name}", typeof(NetMessage), Array.Empty<Type>(),
type, false);
var gen = dynamicMethod.GetILGenerator().GetRobustGen();
// Obsolete path for content
if (type.GetConstructor(new[] {typeof(INetChannel)}) is { } constructor)
{
gen.Emit(OpCodes.Ldnull);
gen.Emit(OpCodes.Newobj, constructor);
gen.Emit(OpCodes.Ret);
}
else
{
constructor = type.GetConstructor(Type.EmptyTypes)!;
DebugTools.AssertNotNull(constructor);
gen.Emit(OpCodes.Newobj, constructor);
gen.Emit(OpCodes.Ret);
}
var @delegate = (Func<NetMessage>) dynamicMethod.CreateDelegate(typeof(Func<NetMessage>));
_blankNetMsgFunctions.Add(type, @delegate);
return new T();
}
private NetOutgoingMessage BuildMessage(NetMessage message, NetPeer peer)

4
Robust.Shared/Network/StringTable.cs
View File

@@ -236,7 +236,7 @@ namespace Robust.Shared.Network
if (!_network.IsRunning)
return;
var message = _network.CreateNetMessage<MsgStringTableEntries>();
var message = new MsgStringTableEntries();
message.Entries = new MsgStringTableEntries.Entry[1];
message.Entries[0].Id = id;
@@ -254,7 +254,7 @@ namespace Robust.Shared.Network
if (_network.IsClient)
return;
var message = _network.CreateNetMessage<MsgStringTableEntries>();
var message = new MsgStringTableEntries();
var count = _strings.Count;
message.Entries = new MsgStringTableEntries.Entry[count];

8
Robust.Shared/Serialization/RobustMappedStringSerializer.cs
View File

@@ -154,7 +154,7 @@ namespace Robust.Shared.Serialization
_incompleteHandshakes.Add(channel, new InProgressHandshake(tcs));
var message = _net.CreateNetMessage<MsgMapStrServerHandshake>();
var message = new MsgMapStrServerHandshake();
message.Hash = _stringMapHash;
_net.ServerSendMessage(message, channel);
@@ -354,7 +354,7 @@ namespace Robust.Shared.Serialization
handshake.HasRequestedStrings = true;
var strings = _net.CreateNetMessage<MsgMapStrStrings>();
var strings = new MsgMapStrStrings();
strings.Package = _mappedStringsPackage;
LogSzr.Debug(
$"Sending {_mappedStringsPackage!.Length} bytes sized mapped strings package to {channel.UserName}.");
@@ -409,7 +409,7 @@ namespace Robust.Shared.Serialization
if (fileName == null || !File.Exists(fileName))
{
LogSzr.Debug($"No string cache for {hashStr}.");
var handshake = _net.CreateNetMessage<MsgMapStrClientHandshake>();
var handshake = new MsgMapStrClientHandshake();
LogSzr.Debug("Asking server to send mapped strings.");
handshake.NeedsStrings = true;
msgMapStr.MsgChannel.SendMessage(handshake);
@@ -438,7 +438,7 @@ namespace Robust.Shared.Serialization
private void OnClientCompleteHandshake(INetManager net, INetChannel channel)
{
LogSzr.Debug("Letting server know we're good to go.");
var handshake = net.CreateNetMessage<MsgMapStrClientHandshake>();
var handshake = new MsgMapStrClientHandshake();
handshake.NeedsStrings = false;
channel.SendMessage(handshake);

2
Robust.UnitTesting/IntegrationMappedStringSerializer.cs
View File

@@ -21,7 +21,7 @@ namespace Robust.UnitTesting
public Task Handshake(INetChannel channel)
{
var message = _net.CreateNetMessage<MsgMapStrServerHandshake>();
var message = new MsgMapStrServerHandshake();
message.Hash = _hash;
_net.ServerSendMessage(message, channel);

4
Robust.UnitTesting/RobustIntegrationTest.NetManager.cs
View File

@@ -287,7 +287,7 @@ namespace Robust.UnitTesting
_callbacks.Add(typeof(T), msg => rxCallback((T) msg));
}
public T CreateNetMessage<T>() where T : NetMessage
public T CreateNetMessage<T>() where T : NetMessage, new()
{
var type = typeof(T);
@@ -429,7 +429,7 @@ namespace Robust.UnitTesting
RemoteUid = remoteUid;
}
public T CreateNetMessage<T>() where T : NetMessage
public T CreateNetMessage<T>() where T : NetMessage, new()
{
return _owner.CreateNetMessage<T>();
}