rework multiplayer code to allow for upcoming Galaxy server overrides (#480)

2 files changed, 12 insertions, 107 deletions

diff --git a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
index 7f0fa4f7..44a71978 100644
--- a/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
+++ b/src/SMAPI/Framework/Networking/MultiplayerPeer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Lidgren.Network;
 using StardewValley.Network;
 
 namespace StardewModdingAPI.Framework.Networking
@@ -12,14 +11,8 @@ namespace StardewModdingAPI.Framework.Networking
         /*********
         ** Properties
         *********/
-        /// <summary>The server through which to send messages, if this is an incoming farmhand.</summary>
-        private readonly SLidgrenServer Server;
-
-        /// <summary>The client through which to send messages, if this is the host player.</summary>
-        private readonly SLidgrenClient Client;
-
-        /// <summary>The network connection to the player.</summary>
-        private readonly NetConnection ServerConnection;
+        /// <summary>A method which sends a message to the peer.</summary>
+        private readonly Action<OutgoingMessage> SendMessageImpl;
 
 
         /*********
@@ -53,11 +46,9 @@ namespace StardewModdingAPI.Framework.Networking
         /// <summary>Construct an instance.</summary>
         /// <param name="playerID">The player's unique ID.</param>
         /// <param name="model">The metadata to copy.</param>
-        /// <param name="server">The server through which to send messages.</param>
-        /// <param name="serverConnection">The server connection through which to send messages.</param>
-        /// <param name="client">The client through which to send messages.</param>
+        /// <param name="sendMessage">A method which sends a message to the peer.</param>
         /// <param name="isHost">Whether this is a connection to the host player.</param>
-        public MultiplayerPeer(long playerID, RemoteContextModel model, SLidgrenServer server, NetConnection serverConnection, SLidgrenClient client, bool isHost)
+        public MultiplayerPeer(long playerID, RemoteContextModel model, Action<OutgoingMessage> sendMessage, bool isHost)
         {
             this.PlayerID = playerID;
             this.IsHost = isHost;
@@ -68,43 +59,7 @@ namespace StardewModdingAPI.Framework.Networking
                 this.ApiVersion = model.ApiVersion;
                 this.Mods = model.Mods.Select(mod => new MultiplayerPeerMod(mod)).ToArray();
             }
-            this.Server = server;
-            this.ServerConnection = serverConnection;
-            this.Client = client;
-        }
-
-        /// <summary>Construct an instance for a connection to an incoming farmhand.</summary>
-        /// <param name="playerID">The player's unique ID.</param>
-        /// <param name="model">The metadata to copy, if available.</param>
-        /// <param name="server">The server through which to send messages.</param>
-        /// <param name="serverConnection">The server connection through which to send messages.</param>
-        public static MultiplayerPeer ForConnectionToFarmhand(long playerID, RemoteContextModel model, SLidgrenServer server, NetConnection serverConnection)
-        {
-            return new MultiplayerPeer(
-                playerID: playerID,
-                model: model,
-                server: server,
-                serverConnection: serverConnection,
-                client: null,
-                isHost: false
-            );
-        }
-
-        /// <summary>Construct an instance for a connection to the host player.</summary>
-        /// <param name="playerID">The player's unique ID.</param>
-        /// <param name="model">The metadata to copy.</param>
-        /// <param name="client">The client through which to send messages.</param>
-        /// <param name="isHost">Whether this connection is for the host player.</param>
-        public static MultiplayerPeer ForConnectionToHost(long playerID, RemoteContextModel model, SLidgrenClient client, bool isHost)
-        {
-            return new MultiplayerPeer(
-                playerID: playerID,
-                model: model,
-                server: null,
-                serverConnection: null,
-                client: client,
-                isHost: isHost
-            );
+            this.SendMessageImpl = sendMessage;
         }
 
         /// <summary>Get metadata for a mod installed by the player.</summary>
@@ -123,10 +78,7 @@ namespace StardewModdingAPI.Framework.Networking
         /// <param name="message">The message to send.</param>
         public void SendMessage(OutgoingMessage message)
         {
-            if (this.IsHost)
-                this.Client.sendMessage(message);
-            else
-                this.Server.SendMessage(this.ServerConnection, message);
+            this.SendMessageImpl(message);
         }
     }
 }
diff --git a/src/SMAPI/Framework/Networking/SLidgrenServer.cs b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
index 060b433b..36f96bc3 100644
--- a/src/SMAPI/Framework/Networking/SLidgrenServer.cs
+++ b/src/SMAPI/Framework/Networking/SLidgrenServer.cs
@@ -20,24 +20,15 @@ namespace StardewModdingAPI.Framework.Networking
         /// <summary>The constructor for the internal <c>NetBufferReadStream</c> type.</summary>
         private readonly ConstructorInfo NetBufferReadStreamConstructor = SLidgrenServer.GetNetBufferReadStreamConstructor();
 
-        /// <summary>The constructor for the internal <c>NetBufferWriteStream</c> type.</summary>
-        private readonly ConstructorInfo NetBufferWriteStreamConstructor = SLidgrenServer.GetNetBufferWriteStreamConstructor();
-
         /// <summary>A method which reads farmer data from the given binary reader.</summary>
         private readonly Func<BinaryReader, NetFarmerRoot> ReadFarmer;
 
-        /// <summary>A callback to raise when receiving a message. This receives the server instance, raw/parsed incoming message, and a callback to run the default logic.</summary>
-        private readonly Action<SLidgrenServer, NetIncomingMessage, IncomingMessage, Action> OnProcessingMessage;
-
-        /// <summary>A callback to raise when sending a message. This receives the server instance, outgoing connection, outgoing message, target player ID, and a callback to run the default logic.</summary>
-        private readonly Action<SLidgrenServer, NetConnection, OutgoingMessage, Action> OnSendingMessage;
+        /// <summary>A callback to raise when receiving a message. This receives the incoming message, a method to send a message, and a callback to run the default logic.</summary>
+        private readonly Action<IncomingMessage, Action<OutgoingMessage>, Action> OnProcessingMessage;
 
         /// <summary>The peer connections.</summary>
         private readonly Bimap<long, NetConnection> Peers;
 
-        /// <summary>The underlying net server.</summary>
-        private readonly IReflectedField<NetServer> Server;
-
 
         /*********
         ** Public methods
@@ -46,34 +37,13 @@ namespace StardewModdingAPI.Framework.Networking
         /// <param name="gameServer">The underlying game server.</param>
         /// <param name="reflection">Simplifies access to private code.</param>
         /// <param name="readFarmer">A method which reads farmer data from the given binary reader.</param>
-        /// <param name="onProcessingMessage">A callback to raise when receiving a message. This receives the server instance, raw/parsed incoming message, and a callback to run the default logic.</param>
-        /// <param name="onSendingMessage">A callback to raise when sending a message. This receives the server instance, outgoing connection, outgoing message, and a callback to run the default logic.</param>
-        public SLidgrenServer(IGameServer gameServer, Reflector reflection, Func<BinaryReader, NetFarmerRoot> readFarmer, Action<SLidgrenServer, NetIncomingMessage, IncomingMessage, Action> onProcessingMessage, Action<SLidgrenServer, NetConnection, OutgoingMessage, Action> onSendingMessage)
+        /// <param name="onProcessingMessage">A callback to raise when receiving a message. This receives the incoming message, a method to send a message, and a callback to run the default logic.</param>
+        public SLidgrenServer(IGameServer gameServer, Reflector reflection, Func<BinaryReader, NetFarmerRoot> readFarmer, Action<IncomingMessage, Action<OutgoingMessage>, Action> onProcessingMessage)
             : base(gameServer)
         {
             this.ReadFarmer = readFarmer;
             this.OnProcessingMessage = onProcessingMessage;
-            this.OnSendingMessage = onSendingMessage;
             this.Peers = reflection.GetField<Bimap<long, NetConnection>>(this, "peers").GetValue();
-            this.Server = reflection.GetField<NetServer>(this, "server");
-        }
-
-        /// <summary>Send a message to a remote server.</summary>
-        /// <param name="connection">The network connection.</param>
-        /// <param name="message">The message to send.</param>
-        /// <remarks>This is an implementation of <see cref="LidgrenServer.sendMessage(NetConnection, OutgoingMessage)"/> which calls <see cref="OnSendingMessage"/>. This method is invoked via <see cref="LidgrenServerPatch.Prefix_LidgrenServer_SendMessage"/>.</remarks>
-        public void SendMessage(NetConnection connection, OutgoingMessage message)
-        {
-            this.OnSendingMessage(this, connection, message, () =>
-            {
-                NetServer server = this.Server.GetValue();
-                NetOutgoingMessage netMessage = server.CreateMessage();
-                using (Stream bufferWriteStream = (Stream)this.NetBufferWriteStreamConstructor.Invoke(new object[] { netMessage }))
-                using (BinaryWriter writer = new BinaryWriter(bufferWriteStream))
-                    message.Write(writer);
-
-                server.SendMessage(netMessage, connection, NetDeliveryMethod.ReliableOrdered);
-            });
         }
 
         /// <summary>Parse a data message from a client.</summary>
@@ -91,14 +61,14 @@ namespace StardewModdingAPI.Framework.Networking
                 while (rawMessage.LengthBits - rawMessage.Position >= 8)
                 {
                     message.Read(reader);
-                    this.OnProcessingMessage(this, rawMessage, message, () =>
+                    this.OnProcessingMessage(message, outgoing => this.sendMessage(rawMessage.SenderConnection, outgoing), () =>
                     {
                         if (this.Peers.ContainsLeft(message.FarmerID) && this.Peers[message.FarmerID] == peer)
                             this.gameServer.processIncomingMessage(message);
                         else if (message.MessageType == Multiplayer.playerIntroduction)
                         {
                             NetFarmerRoot farmer = this.ReadFarmer(message.Reader);
-                            this.gameServer.checkFarmhandRequest("", farmer, msg => this.SendMessage(peer, msg), () => this.Peers[farmer.Value.UniqueMultiplayerID] = peer);
+                            this.gameServer.checkFarmhandRequest("", farmer, msg => this.sendMessage(peer, msg), () => this.Peers[farmer.Value.UniqueMultiplayerID] = peer);
                         }
                     });
                 }
@@ -127,22 +97,5 @@ namespace StardewModdingAPI.Framework.Networking
 
             return constructor;
         }
-
-        /// <summary>Get the constructor for the internal <c>NetBufferWriteStream</c> type.</summary>
-        private static ConstructorInfo GetNetBufferWriteStreamConstructor()
-        {
-            // get type
-            string typeName = $"StardewValley.Network.NetBufferWriteStream, {Constants.GameAssemblyName}";
-            Type type = Type.GetType(typeName);
-            if (type == null)
-                throw new InvalidOperationException($"Can't find type: {typeName}");
-
-            // get constructor
-            ConstructorInfo constructor = type.GetConstructor(new[] { typeof(NetBuffer) });
-            if (constructor == null)
-                throw new InvalidOperationException($"Can't find constructor for type: {typeName}");
-
-            return constructor;
-        }
     }
 }