refactor!: update namespace to drop Runtime

viglucci · Apr 4, 2022 · 228532c · 228532c
1 parent 6dc148f
commit 228532c
Show file tree

Hide file tree

Showing 64 changed files with 172 additions and 158 deletions.
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Example/ClientManager.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Example/ClientManager.cs
@@ -2,123 +2,126 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
-using Viglucci.UnityRSocket.Runtime;
-using Viglucci.UnityRSocket.Runtime.Metadata;
-using Viglucci.UnityRSocket.Runtime.Scheduling;
+using Viglucci.UnityRSocket.Metadata;
+using Viglucci.UnityRSocket.Scheduling;
+using Viglucci.UnityRSocket.Transport;
 
-public class ClientManager : MonoBehaviour
+namespace Viglucci.UnityRSocket.Example
 {
-    private static ClientManager _instance;
+    public class ClientManager : MonoBehaviour
+    {
+        private static ClientManager _instance;
 
-    /**
+        /**
      * How often to send KeepAlive frames.
      */
-    public int keepAliveInterval = 10_000;
+        public int keepAliveInterval = 10_000;
 
-    /**
+        /**
      * The max delay between a keep alive frame and a server ACK. Client will disconnect if server does not
      * respond to a KeepAlive frame within this time period.
      */
-    public int keepAliveTimeout = 60_000;
-
-    private IRSocket _rSocket;
-    private IClientTransport _transport;
+        public int keepAliveTimeout = 60_000;
 
-    private void Awake()
-    {
-        Debug.Log("Awake");
+        private IRSocket _rSocket;
+        private IClientTransport _transport;
 
-        if (_instance == null)
-        {
-            _instance = this;
-        }
-        else if (_instance != this)
+        private void Awake()
         {
-            Debug.LogWarning(
-                $"Instance of {GetType().Name} already exists. Newly created instance will be destroyed.");
-            Destroy(this);
+            Debug.Log("Awake");
+
+            if (_instance == null)
+            {
+                _instance = this;
+            }
+            else if (_instance != this)
+            {
+                Debug.LogWarning(
+                    $"Instance of {GetType().Name} already exists. Newly created instance will be destroyed.");
+                Destroy(this);
+            }
         }
-    }
 
-    private void Start()
-    {
-        Debug.Log("Start");
+        private void Start()
+        {
+            Debug.Log("Start");
 
-        _transport = new TcpClientTransport("localhost", 9090);
+            _transport = new TcpClientTransport("localhost", 9090);
 
-        SetupOptions setupOptions = new SetupOptions(
-            keepAliveInterval,
-            keepAliveTimeout,
-            data: new List<byte>(),
-            metadata: new List<byte>(),
-            dataMimeType:
-                Metadata.WellKnownMimeTypeToString(
+            SetupOptions setupOptions = new SetupOptions(
+                keepAliveInterval,
+                keepAliveTimeout,
+                data: new List<byte>(),
+                metadata: new List<byte>(),
+                dataMimeType:
+                Metadata.Metadata.WellKnownMimeTypeToString(
                     WellKnownMimeType.APPLICATION_JSON),
-            metadataMimeType:
-                Metadata.WellKnownMimeTypeToString(
+                metadataMimeType:
+                Metadata.Metadata.WellKnownMimeTypeToString(
                     WellKnownMimeType.MESSAGE_RSOCKET_COMPOSITE_METADATA)
-        );
+            );
 
-        RSocketConnector connector = new RSocketConnector(
-            _transport,
-            setupOptions,
-            new MonoBehaviorScheduler());
+            RSocketConnector connector = new RSocketConnector(
+                _transport,
+                setupOptions,
+                new MonoBehaviorScheduler());
 
-        IRSocket rSocket = connector.Bind();
+            IRSocket rSocket = connector.Bind();
 
-        try
-        {
-            Debug.Log("Binding connector");
-            _rSocket = connector.Bind();
+            try
+            {
+                Debug.Log("Binding connector");
+                _rSocket = connector.Bind();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+                return;
+            }
+
+            OnRSocketConnected();
         }
-        catch (Exception e)
+
+        private void Update()
         {
-            Debug.LogError(e);
-            return;
+            _transport.ProcessMessages();
         }
 
-        OnRSocketConnected();
-    }
-
-    private void Update()
-    {
-        _transport.ProcessMessages();
-    }
-
-    private void OnRSocketConnected()
-    {
-        _rSocket.OnClose((ex) =>
+        private void OnRSocketConnected()
         {
-            Debug.Log("RSocket connection closed.");
-            if (ex != null)
-                Debug.LogError(ex);
-        });
+            _rSocket.OnClose((ex) =>
+            {
+                Debug.Log("RSocket connection closed.");
+                if (ex != null)
+                    Debug.LogError(ex);
+            });
 
-        List<byte> data = new List<byte>(Encoding.UTF8.GetBytes("{ \"key\": \"value\"}"));
-        List<byte> metadata = new List<byte>();
+            List<byte> data = new List<byte>(Encoding.UTF8.GetBytes("{ \"key\": \"value\"}"));
+            List<byte> metadata = new List<byte>();
 
-        ICancellable cancellable = _rSocket.RequestResponse(new RSocketPayload
-            {
-                Data = data,
-                Metadata = metadata
-            },
-            new Subscriber(
-                (payload, isComplete) =>
+            ICancellable cancellable = _rSocket.RequestResponse(new RSocketPayload
                 {
-                    string decodedData = Encoding.UTF8.GetString(payload.Data.ToArray());
-                    string decodedMetadata = Encoding.UTF8.GetString(payload.Metadata.ToArray());
-
-                    Debug.Log($"data: {decodedData}");
-                    Debug.Log($"metadata: {decodedMetadata}");
-                    Debug.Log($"isComplete: {isComplete}");
-
-                    if (isComplete)
-                    {
-                        Debug.Log("RequestResponse done");
-                    }
+                    Data = data,
+                    Metadata = metadata
                 },
-                () => Debug.Log("RequestResponse done"),
-                Debug.LogError
-            ));
+                new Subscriber(
+                    (payload, isComplete) =>
+                    {
+                        string decodedData = Encoding.UTF8.GetString(payload.Data.ToArray());
+                        string decodedMetadata = Encoding.UTF8.GetString(payload.Metadata.ToArray());
+
+                        Debug.Log($"data: {decodedData}");
+                        Debug.Log($"metadata: {decodedMetadata}");
+                        Debug.Log($"isComplete: {isComplete}");
+
+                        if (isComplete)
+                        {
+                            Debug.Log("RequestResponse done");
+                        }
+                    },
+                    () => Debug.Log("RequestResponse done"),
+                    Debug.LogError
+                ));
+        }
     }
 }
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/BufferUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/BufferUtils.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public static class BufferUtils
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/CancellableRequestableWrapper.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/CancellableRequestableWrapper.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public class CancellableRequestableWrapper : ICancellableRequestable
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/CancellableWrapper.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/CancellableWrapper.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public class CancellableWrapper : ICancellable
     {

diff --git a/...RSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs b/...RSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-using Viglucci.UnityRSocket.Runtime.Frame;
+using Viglucci.UnityRSocket.Frame;
 
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public abstract class ClientServerInputMultiplexerDemultiplexer : Deferred, IMultiplexer, IStream
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/DefaultConnectionFrameHandler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/DefaultConnectionFrameHandler.cs
@@ -1,8 +1,8 @@
 using System;
-using Viglucci.UnityRSocket.Runtime.Frame;
-using Viglucci.UnityRSocket.Runtime.KeepAlive;
+using Viglucci.UnityRSocket.Frame;
+using Viglucci.UnityRSocket.KeepAlive;
 
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public class DefaultConnectionFrameHandler : IConnectionFrameHandler
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Deferred.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Deferred.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public class Deferred : ICloseable
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime
+namespace Viglucci.UnityRSocket
 {
     public class EpochUtils
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/AbstractRequestFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/AbstractRequestFrame.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameDeserializer.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameDeserializer.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static class FrameDeserializer
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameType.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameType.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public enum FrameType
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameUtils.cs
@@ -1,4 +1,4 @@
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static class FrameUtils
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/ISerializableFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/ISerializableFrame.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public interface ISerializableFrame<out T>
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractRequestFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractRequestFrame.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.CancelFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.CancelFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ErrorFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ErrorFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ExtFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ExtFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.KeepAliveFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.KeepAliveFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.LeaseFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.LeaseFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.MetadataPushFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.MetadataPushFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.PayloadFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.PayloadFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {

diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestChannelFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestChannelFrame.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket.Runtime.Frame
+namespace Viglucci.UnityRSocket.Frame
 {
     public static partial class RSocketFrame
     {