Add RUDP transport option. Merge #45

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project are documented below.
 The format is based on [keep a changelog](http://keepachangelog.com/) and this project uses [semantic versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- RUDP transport option.
 
 ## [0.9.0] - 2017-10-17
 ### Added

Nakama.Tests/MatchTest.cs

@@ -272,7 +272,7 @@ public void SendDataMatch()
                 d = matchData;
                 evt2.Set();
             };
-            client1.Send(NMatchDataSendMessage.Default(m.Id, opCode, data), (bool completed) =>
+            client1.Send(NMatchDataSendMessage.Default(m.Id, opCode, data), false, (bool completed) =>
             {
                 // No action.
             }, (INError err) => {
@@ -314,7 +314,7 @@ public void SendDataNoEchoMatch()
                 d = data;
                 evt2.Set();
             };
-            client1.Send(NMatchDataSendMessage.Default(m.Id, 9, Encoding.ASCII.GetBytes("test-data")), (bool completed) =>
+            client1.Send(NMatchDataSendMessage.Default(m.Id, 9, Encoding.ASCII.GetBytes("test-data")), false, (bool completed) =>
             {
                 // No action.
             }, (INError err) => {
@@ -374,7 +374,7 @@ public void SendDataSubsetMatch()
                 evt2.Set();
             };
             var msg = new NMatchDataSendMessage.Builder(m.Id, opCode, data).Presences(new INUserPresence[]{p}).Build();
-            client2.Send(msg, (bool completed) =>
+            client2.Send(msg, false, (bool completed) =>
             {
                 // No action.
             }, (INError err) => {

Nakama.Tests/Nakama.Tests.csproj

@@ -62,4 +62,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

Nakama/INClient.cs

@@ -74,6 +74,8 @@ public interface INClient
 
         void Send<T>(INCollatedMessage<T> message, Action<T> callback, Action<INError> errback);
 
+        void Send(INUncollatedMessage message, bool reliable, Action<bool> callback, Action<INError> errback);
+
         void Send(INUncollatedMessage message, Action<bool> callback, Action<INError> errback);
     }
 }

Nakama/INCollatedMessage.cs

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+using Google.Protobuf;
+
 namespace Nakama
 {
-    public interface INCollatedMessage<T> : INMessage
+    public interface INCollatedMessage<T>
     {
+        IMessage Payload { get; }
         void SetCollationId(string id);
     }
 }

Nakama/INSession.cs

@@ -29,6 +29,8 @@ public interface INSession
         byte[] Id { get; }
 
         string Token { get; }
+
+        byte[] UdpToken { get; }
 
         bool HasExpired(DateTime dateTime);
     }

Nakama/INTransport.cs

@@ -1,7 +1,31 @@
-using System;
+/**
+ * Copyright 2017 The Nakama Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
 
 namespace Nakama
 {
+    public enum TransportType : int
+    {
+        // WebSocket transport default.
+        WebSocket = 0,
+        // UDP transport.
+        Udp = 1
+    }
+
     internal interface INTransport
     {
         bool Trace { get; set;  }
@@ -16,46 +40,46 @@ void Post(string uri,
             Action<byte[]> successAction,
             Action<Exception> errorAction);
 
-        void Connect(string uri, bool noDelay);
-        void ConnectAsync(string uri, bool noDelay, Action<bool> callback);
+        void Connect(string uri, byte[] token);
+        void ConnectAsync(string uri, byte[] token, Action<bool> callback);
         void Close();
         void CloseAsync(Action callback);
-        void Send(byte[] data);
-        void SendAsync(byte[] data, Action<bool> completed);
+        void Send(byte[] data, bool reliable);
+        void SendAsync(byte[] data, bool reliable, Action<bool> completed);
 
-        event EventHandler<WebSocketCloseEventArgs> OnClose;
-        event EventHandler<WebSocketErrorEventArgs> OnError;
-        event EventHandler<WebSocketMessageEventArgs> OnMessage;
+        event EventHandler<SocketCloseEventArgs> OnClose;
+        event EventHandler<SocketErrorEventArgs> OnError;
+        event EventHandler<SocketMessageEventArgs> OnMessage;
         event EventHandler OnOpen;
     }
 
-    public class WebSocketMessageEventArgs : EventArgs
+    public class SocketMessageEventArgs : EventArgs
     {
         public byte[] Data { get ; private set; }
 
-        internal WebSocketMessageEventArgs(byte[] data)
+        internal SocketMessageEventArgs(byte[] data)
         {
             Data = data;
         }
     }
 
-    public class WebSocketCloseEventArgs : EventArgs
+    public class SocketCloseEventArgs : EventArgs
     {
         public int Code { get; private set; }
         public string Reason{ get; private set; }
 
-        internal WebSocketCloseEventArgs(int code, string reason)
+        internal SocketCloseEventArgs(int code, string reason)
         {
             Code = code;
             Reason = reason;
         }
     }
 
-    public class WebSocketErrorEventArgs : EventArgs
+    public class SocketErrorEventArgs : EventArgs
     {
         public Exception Error { get ; private set; }
 
-        internal WebSocketErrorEventArgs(Exception error)
+        internal SocketErrorEventArgs(Exception error)
         {
             Error = error;
         }

Nakama/INUncollatedMessage.cs

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+using Google.Protobuf;
+
 namespace Nakama
 {
-    public interface INUncollatedMessage : INMessage
+    public interface INUncollatedMessage
     {
+        IMessage Payload { get; }
     }
 }