From 228532cf1f429188e434b0c4f053300ba61be628 Mon Sep 17 00:00:00 2001 From: Kevin Viglucci Date: Sun, 3 Apr 2022 22:40:08 -0500 Subject: [PATCH] refactor!: update namespace to drop Runtime --- .../UnityRSocket/Example/ClientManager.cs | 179 +++++++++--------- .../UnityRSocket/Runtime/BufferUtils.cs | 2 +- .../Runtime/CancellableRequestableWrapper.cs | 2 +- .../Runtime/CancellableWrapper.cs | 2 +- ...ientServerInputMultiplexerDemultiplexer.cs | 4 +- .../Runtime/DefaultConnectionFrameHandler.cs | 6 +- .../Viglucci/UnityRSocket/Runtime/Deferred.cs | 2 +- .../UnityRSocket/Runtime/EpochUtils.cs | 2 +- .../Runtime/Frame/AbstractRequestFrame.cs | 2 +- .../Runtime/Frame/FrameDeserializer.cs | 2 +- .../UnityRSocket/Runtime/Frame/FrameType.cs | 2 +- .../UnityRSocket/Runtime/Frame/FrameUtils.cs | 2 +- .../Runtime/Frame/ISerializableFrame.cs | 2 +- .../Frame/RSocketFrame.AbstractFrame.cs | 2 +- .../RSocketFrame.AbstractRequestFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.CancelFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.ErrorFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.ExtFrame.cs | 2 +- .../Frame/RSocketFrame.KeepAliveFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.LeaseFrame.cs | 2 +- .../Frame/RSocketFrame.MetadataPushFrame.cs | 2 +- .../Frame/RSocketFrame.PayloadFrame.cs | 2 +- .../Frame/RSocketFrame.RequestChannelFrame.cs | 2 +- .../Frame/RSocketFrame.RequestFnfFrame.cs | 2 +- .../Frame/RSocketFrame.RequestNFrame.cs | 2 +- .../RSocketFrame.RequestResponseFrame.cs | 2 +- .../Frame/RSocketFrame.RequestStreamFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.ResumeFrame.cs | 2 +- .../Frame/RSocketFrame.ResumeOkFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.SetupFrame.cs | 2 +- .../Frame/RSocketFrame.UnsupportedFrame.cs | 2 +- .../Runtime/Frame/RSocketFrame.cs | 2 +- .../Runtime/KeepAlive/KeepAliveHandler.cs | 6 +- .../Runtime/KeepAlive/KeepAliveSender.cs | 6 +- .../Runtime/Metadata/CompositeMetadata.cs | 2 +- .../Metadata/CompositeMetadataBuilder.cs | 2 +- .../UnityRSocket/Runtime/Metadata/Metadata.cs | 2 +- .../UnityRSocket/Runtime/Metadata/Routing.cs | 2 +- .../Runtime/Metadata/WellKnownMimeType.cs | 2 +- .../UnityRSocket/Runtime/RSocketConnector.cs | 6 +- .../UnityRSocket/Runtime/RSocketError.cs | 2 +- .../UnityRSocket/Runtime/RSocketErrorCodes.cs | 2 +- .../UnityRSocket/Runtime/RSocketFlagType.cs | 2 +- .../UnityRSocket/Runtime/RSocketFlagUtils.cs | 2 +- .../UnityRSocket/Runtime/RSocketPayload.cs | 2 +- .../UnityRSocket/Runtime/RSocketRequester.cs | 4 +- .../Runtime/RSocketStreamHandler.cs | 2 +- .../UnityRSocket/Runtime/RSocketTypes.cs | 4 +- .../Runtime/Scheduling/IScheduler.cs | 2 +- .../Scheduling/MonoBehaviorScheduler.cs | 2 +- .../UnityRSocket/Runtime/StreamIdGenerator.cs | 2 +- .../UnityRSocket/Runtime/Subscriber.cs | 2 +- .../UnityRSocket/Runtime/Transport.meta | 8 + .../{ => Transport}/TcpClientTransport.cs | 2 +- .../TcpClientTransport.cs.meta | 0 .../{ => Transport}/TcpDuplexConnection.cs | 4 +- .../TcpDuplexConnection.cs.meta | 0 .../Viglucci/UnityRSocket/Runtime/UInt24.cs | 2 +- .../viglucci.unityrsocket.Runtime.asmdef | 3 - .../Runtime/viglucci.unityrsocket.asmdef | 3 + ...meta => viglucci.unityrsocket.asmdef.meta} | 0 .../Scripts/ClientManager.cs | 1 + .../Assets/Viglucci/UnityRSocket/package.json | 2 +- ...ci.unityrsocket.Runtime.csproj.DotSettings | 2 + 64 files changed, 172 insertions(+), 158 deletions(-) create mode 100644 UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport.meta rename UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/{ => Transport}/TcpClientTransport.cs (96%) rename UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/{ => Transport}/TcpClientTransport.cs.meta (100%) rename UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/{ => Transport}/TcpDuplexConnection.cs (97%) rename UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/{ => Transport}/TcpDuplexConnection.cs.meta (100%) delete mode 100644 UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef create mode 100644 UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef rename UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/{viglucci.unityrsocket.Runtime.asmdef.meta => viglucci.unityrsocket.asmdef.meta} (100%) create mode 100644 UnityRSocket/viglucci.unityrsocket.Runtime.csproj.DotSettings diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Example/ClientManager.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Example/ClientManager.cs index 5b166dc..7dce4c9 100644 --- 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(), - metadata: new List(), - dataMimeType: - Metadata.WellKnownMimeTypeToString( + SetupOptions setupOptions = new SetupOptions( + keepAliveInterval, + keepAliveTimeout, + data: new List(), + metadata: new List(), + 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 data = new List(Encoding.UTF8.GetBytes("{ \"key\": \"value\"}")); - List metadata = new List(); + List data = new List(Encoding.UTF8.GetBytes("{ \"key\": \"value\"}")); + List metadata = new List(); - 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 + )); + } } } \ No newline at end of file diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/BufferUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/BufferUtils.cs index 72e9db5..94ebfa0 100644 --- 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 index 3497b21..29d67ae 100644 --- 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 index 5d30980..e564089 100644 --- 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/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs index 0d97523..8b1cbee 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs +++ b/UnityRSocket/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 index 6c5c12e..169a3cd 100644 --- 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 index 5146408..7e2421f 100644 --- 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 index 50048ce..b216522 100644 --- 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 index bbbff40..390dea5 100644 --- 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 index 476eb37..3e493cf 100644 --- 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 index d1a9b92..c589775 100644 --- 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 index a7d1431..5e30f52 100644 --- 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 index 02a2d9f..441dd3e 100644 --- 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 { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs index 0481744..80a15e7 100644 --- 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 index fccb1b5..77322e8 100644 --- 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 index 94c9b38..6a81272 100644 --- 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 index d814185..8aca293 100644 --- 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 index c5c100b..7872853 100644 --- 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 index 12516dd..fbcf174 100644 --- 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 index ab99755..ebe8aed 100644 --- 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 index d00ab7f..96a7cea 100644 --- 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 index 30d2172..e6d3398 100644 --- 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 index 8168b0d..3b67999 100644 --- 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 { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.cs index 27b9ebf..78526a7 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.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.RequestNFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestNFrame.cs index 0f9a9da..8ce877e 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestNFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestNFrame.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.RequestResponseFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestResponseFrame.cs index 84a7e36..931acd6 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestResponseFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestResponseFrame.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.RequestStreamFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestStreamFrame.cs index eb78c6d..90480dc 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestStreamFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestStreamFrame.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.ResumeFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeFrame.cs index bcd0020..b00aa73 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeFrame.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.ResumeOkFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeOkFrame.cs index f0828a2..b226a3e 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeOkFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.ResumeOkFrame.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.SetupFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.SetupFrame.cs index aa71794..291dca9 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.SetupFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.SetupFrame.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Viglucci.UnityRSocket.Runtime.Frame +namespace Viglucci.UnityRSocket.Frame { public static partial class RSocketFrame { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.UnsupportedFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.UnsupportedFrame.cs index 2ad7f0a..4c05090 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.UnsupportedFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.UnsupportedFrame.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.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.cs index 3d63a1c..2ad4eee 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.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/KeepAlive/KeepAliveHandler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveHandler.cs index f0443f0..53a7b5d 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveHandler.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveHandler.cs @@ -1,9 +1,9 @@ using System; using UnityEngine; -using Viglucci.UnityRSocket.Runtime.Frame; -using Viglucci.UnityRSocket.Runtime.Scheduling; +using Viglucci.UnityRSocket.Frame; +using Viglucci.UnityRSocket.Scheduling; -namespace Viglucci.UnityRSocket.Runtime.KeepAlive +namespace Viglucci.UnityRSocket.KeepAlive { public class KeepAliveHandler : Deferred, IFrameHandler { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveSender.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveSender.cs index 837dab2..f6e4e8a 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveSender.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveSender.cs @@ -1,7 +1,7 @@ -using Viglucci.UnityRSocket.Runtime.Frame; -using Viglucci.UnityRSocket.Runtime.Scheduling; +using Viglucci.UnityRSocket.Frame; +using Viglucci.UnityRSocket.Scheduling; -namespace Viglucci.UnityRSocket.Runtime.KeepAlive +namespace Viglucci.UnityRSocket.KeepAlive { public class KeepAliveSender : Deferred { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs index 4c338bd..4b74f23 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime.Metadata +namespace Viglucci.UnityRSocket.Metadata { public class CompositeMetadata { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadataBuilder.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadataBuilder.cs index 9ed0d21..bfd6883 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadataBuilder.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadataBuilder.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime.Metadata +namespace Viglucci.UnityRSocket.Metadata { public class CompositeMetadataBuilder { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Metadata.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Metadata.cs index fc9a471..0863813 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Metadata.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Metadata.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime.Metadata +namespace Viglucci.UnityRSocket.Metadata { public static class Metadata { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs index fc3dee2..3e5c66e 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Viglucci.UnityRSocket.Runtime.Metadata +namespace Viglucci.UnityRSocket.Metadata { public static class Routing { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/WellKnownMimeType.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/WellKnownMimeType.cs index cf67479..f55bf4f 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/WellKnownMimeType.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/WellKnownMimeType.cs @@ -1,4 +1,4 @@ -namespace Viglucci.UnityRSocket.Runtime.Metadata +namespace Viglucci.UnityRSocket.Metadata { public enum WellKnownMimeType { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketConnector.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketConnector.cs index 98c1fc4..39c6442 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketConnector.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketConnector.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; -using Viglucci.UnityRSocket.Runtime.KeepAlive; -using Viglucci.UnityRSocket.Runtime.Scheduling; +using Viglucci.UnityRSocket.KeepAlive; +using Viglucci.UnityRSocket.Scheduling; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class SetupOptions { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketError.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketError.cs index 75ead1a..8e94edd 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketError.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketError.cs @@ -1,6 +1,6 @@ using System; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class RSocketError : Exception { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketErrorCodes.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketErrorCodes.cs index cc1f776..07522ee 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketErrorCodes.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketErrorCodes.cs @@ -1,4 +1,4 @@ -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public enum RSocketErrorCodes : uint { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagType.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagType.cs index bdc88f1..804b2d0 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagType.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagType.cs @@ -1,4 +1,4 @@ -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public enum RSocketFlagType { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs index a5d95b8..e13a86e 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs @@ -1,4 +1,4 @@ -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class RSocketFlagUtils { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketPayload.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketPayload.cs index b2bcf20..735d5cc 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketPayload.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketPayload.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class RSocketPayload : IPayload { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs index dc44f7c..f715019 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Viglucci.UnityRSocket.Runtime.Frame; +using Viglucci.UnityRSocket.Frame; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class RSocketRequester : Deferred, IRSocket { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketStreamHandler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketStreamHandler.cs index 5b22792..4e4dc3c 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketStreamHandler.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketStreamHandler.cs @@ -1,5 +1,5 @@ -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class RSocketStreamHandler { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketTypes.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketTypes.cs index 7641ada..01c24c9 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketTypes.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketTypes.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using Viglucci.UnityRSocket.Runtime.Frame; +using Viglucci.UnityRSocket.Frame; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public interface IPayload { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/IScheduler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/IScheduler.cs index d5bf91d..3d97564 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/IScheduler.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/IScheduler.cs @@ -1,6 +1,6 @@ using System; -namespace Viglucci.UnityRSocket.Runtime.Scheduling +namespace Viglucci.UnityRSocket.Scheduling { public interface IScheduler { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/MonoBehaviorScheduler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/MonoBehaviorScheduler.cs index d57f201..c28cb43 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/MonoBehaviorScheduler.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Scheduling/MonoBehaviorScheduler.cs @@ -4,7 +4,7 @@ using System.Threading; using UnityEngine; -namespace Viglucci.UnityRSocket.Runtime.Scheduling +namespace Viglucci.UnityRSocket.Scheduling { internal class MainThreadCoroutineHelpingMonoBehaviour : MonoBehaviour { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/StreamIdGenerator.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/StreamIdGenerator.cs index 93e9d92..1fbb4e0 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/StreamIdGenerator.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/StreamIdGenerator.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class StreamIdGenerator : IStreamIdGenerator { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Subscriber.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Subscriber.cs index f82c7f9..768256c 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Subscriber.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Subscriber.cs @@ -1,6 +1,6 @@ using System; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public class Subscriber : ISubscriber { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport.meta new file mode 100644 index 0000000..01045ef --- /dev/null +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a03da1731f1be648a0a4f61ffa71113 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpClientTransport.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpClientTransport.cs similarity index 96% rename from UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpClientTransport.cs rename to UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpClientTransport.cs index 74db6cc..92ca61e 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpClientTransport.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpClientTransport.cs @@ -1,7 +1,7 @@ using System; using System.Net.Sockets; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket.Transport { public class TcpClientTransport : IClientTransport { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpClientTransport.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpClientTransport.cs.meta similarity index 100% rename from UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpClientTransport.cs.meta rename to UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpClientTransport.cs.meta diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpDuplexConnection.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpDuplexConnection.cs similarity index 97% rename from UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpDuplexConnection.cs rename to UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpDuplexConnection.cs index 700416b..6ede1c8 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpDuplexConnection.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpDuplexConnection.cs @@ -3,9 +3,9 @@ using System.Linq; using System.Net.Sockets; using System.Threading; -using Viglucci.UnityRSocket.Runtime.Frame; +using Viglucci.UnityRSocket.Frame; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket.Transport { public class TcpDuplexConnection : ClientServerInputMultiplexerDemultiplexer, IDuplexConnection { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpDuplexConnection.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpDuplexConnection.cs.meta similarity index 100% rename from UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/TcpDuplexConnection.cs.meta rename to UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Transport/TcpDuplexConnection.cs.meta diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/UInt24.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/UInt24.cs index 44f8a18..d22502d 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/UInt24.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/UInt24.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Viglucci.UnityRSocket.Runtime +namespace Viglucci.UnityRSocket { public struct UInt24 { diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef deleted file mode 100644 index 183b68b..0000000 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "viglucci.unityrsocket.Runtime" -} diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef new file mode 100644 index 0000000..7a6b5e3 --- /dev/null +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef @@ -0,0 +1,3 @@ +{ + "name": "viglucci.unityrsocket" +} diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef.meta similarity index 100% rename from UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.Runtime.asmdef.meta rename to UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/viglucci.unityrsocket.asmdef.meta diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Samples~/BasicClientManager/Scripts/ClientManager.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Samples~/BasicClientManager/Scripts/ClientManager.cs index fcabac5..f7c3e67 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/Samples~/BasicClientManager/Scripts/ClientManager.cs +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/Samples~/BasicClientManager/Scripts/ClientManager.cs @@ -4,6 +4,7 @@ using DTO; using IO.Viglucci.Unity.RSocket; using IO.Viglucci.Unity.RSocket.CompositeMetadata; +using IO.Viglucci.Unity.RSocket.Transport; using UnityEngine; public class ClientManager : MonoBehaviour diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/package.json b/UnityRSocket/Assets/Viglucci/UnityRSocket/package.json index 5b2eedc..56308fa 100644 --- a/UnityRSocket/Assets/Viglucci/UnityRSocket/package.json +++ b/UnityRSocket/Assets/Viglucci/UnityRSocket/package.json @@ -1,6 +1,6 @@ { "name": "io.viglucci.unityrsocket", - "version": "0.1.0", + "version": "0.2.0", "description": "Unity compatible implementation of RSocket, an application protocol providing Reactive Streams semantics", "displayName": "RSocket for Unity", "unity": "2018.3", diff --git a/UnityRSocket/viglucci.unityrsocket.Runtime.csproj.DotSettings b/UnityRSocket/viglucci.unityrsocket.Runtime.csproj.DotSettings new file mode 100644 index 0000000..b9ee995 --- /dev/null +++ b/UnityRSocket/viglucci.unityrsocket.Runtime.csproj.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file