refactor: cleanup locations of util classes and move HasMetaData to FlagUtils

viglucci · viglucci · commit e05af375f420 · 2022-04-05T20:15:54.000-05:00
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/ClientServerInputMultiplexerDemultiplexer.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using UnityEngine;
 using Viglucci.UnityRSocket.Frame;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/EpochUtils.cs.meta
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameDeserializer.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/FrameDeserializer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
@@ -32,20 +33,20 @@ public static class FrameDeserializer
         public static RSocketFrame.AbstractFrame DeserializeFrame(List<byte> frameBuffer)
         {
             int offset = 0;
-            
+
             (int value, int nextOffset) streamId = BufferUtils.ReadUInt32BigEndian(frameBuffer, offset);
             offset = streamId.nextOffset;
-            
+
             (int value, int nextOffset) typeAndFlags = BufferUtils.ReadUint16BigEndian(frameBuffer, offset);
-            
+
             // keep highest 6 bits
-            int type = (int)((uint)typeAndFlags.value >> RSocketFlagUtils.FrameTypeOffset);
-            
+            int type = (int)((uint)typeAndFlags.value >> FlagUtils.FrameTypeOffset);
+
             // keep lowest 10 bits
-            int flags = typeAndFlags.value & RSocketFlagUtils.FlagsMask;
-            
+            int flags = typeAndFlags.value & FlagUtils.FlagsMask;
+
             offset = typeAndFlags.nextOffset;
-            
+
             return (FrameType)type switch
             {
                 FrameType.PAYLOAD => DeserializePayloadFrame(frameBuffer, streamId.value, flags, offset),
@@ -68,7 +69,7 @@ private static RSocketFrame.AbstractFrame DeserializeKeepAliveFrame(
             return new RSocketFrame.KeepAliveFrame(streamId)
             {
                 LastReceivedPosition = lastReceivedPosition.value,
-                Flags = (ushort) flags
+                Flags = (ushort)flags
             };
         }
 
@@ -98,18 +99,18 @@ private static RSocketFrame.AbstractFrame DeserializePayloadFrame(
             {
                 Flags = (ushort)flags
             };
-            
+
             ReadPayload(frameBuffer, frame, offset);
-            
+
             return frame;
         }
 
         private static void ReadPayload(List<byte> frameBuffer, RSocketFrame.AbstractRequestFrame frame, int offset)
         {
             frame.Metadata = new List<byte>();
             frame.Data = new List<byte>();
-            
-            if (RSocketFlagUtils.HasMetadata(frame.Flags))
+
+            if (FlagUtils.HasMetadata(frame.Flags))
             {
                 (int value, int nextOffset) metadataLength
                     = BufferUtils.ReadUInt24BigEndian(frameBuffer, offset);
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractFrame.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractRequestFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.AbstractRequestFrame.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
@@ -16,7 +17,7 @@ protected AbstractRequestFrame(int streamId) : base(streamId)
             protected void WritePayload(List<byte> bytes)
             {
                 // Check if Metadata flag is set
-                if (FrameUtils.HasMetadataFlag(Flags))
+                if (FlagUtils.HasMetadata(Flags))
                 {
                     // Write metadata with length prefix if we have metadata
                     if (Metadata != null)
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.CancelFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.CancelFrame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.KeepAliveFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.KeepAliveFrame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestFnfFrame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestResponseFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestResponseFrame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestStreamFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.RequestStreamFrame.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.SetupFrame.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Frame/RSocketFrame.SetupFrame.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Frame
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveHandler.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/KeepAlive/KeepAliveHandler.cs
@@ -2,6 +2,7 @@
 using UnityEngine;
 using Viglucci.UnityRSocket.Frame;
 using Viglucci.UnityRSocket.Scheduling;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.KeepAlive
 {
@@ -23,7 +24,7 @@ public KeepAliveHandler(IDuplexConnection connection, int keepAliveTimeoutDurati
         public void Handle(RSocketFrame.AbstractFrame abstractFrame)
         {
             _lastReceivedMillis = DateTimeOffset.Now.ToUnixTimeMilliseconds();
-            if (RSocketFlagUtils.HasRespond(abstractFrame.Flags))
+            if (FlagUtils.HasRespond(abstractFrame.Flags))
             {
                 _duplexConnection.ConnectionOutbound.Send(new RSocketFrame.KeepAliveFrame(0)
                 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/CompositeMetadata.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Metadata
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Metadata/Routing.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket.Metadata
 {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketFlagUtils.cs
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/RSocketRequester.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Viglucci.UnityRSocket.Frame;
+using Viglucci.UnityRSocket.Util;
 
 namespace Viglucci.UnityRSocket
 {
@@ -147,9 +148,9 @@ private void HandleErrorFrame(RSocketFrame.ErrorFrame abstractFrame)
 
         private void HandlePayloadFrame(RSocketFrame.AbstractRequestFrame abstractFrame)
         {
-            bool hasComplete = RSocketFlagUtils.HasComplete(abstractFrame.Flags);
-            bool hasPayload = RSocketFlagUtils.HasNext(abstractFrame.Flags);
-            bool hasFollows = RSocketFlagUtils.HasFollows(abstractFrame.Flags);
+            bool hasComplete = FlagUtils.HasComplete(abstractFrame.Flags);
+            bool hasPayload = FlagUtils.HasNext(abstractFrame.Flags);
+            bool hasFollows = FlagUtils.HasFollows(abstractFrame.Flags);
 
             if (hasComplete || !hasFollows)
             {
@@ -311,9 +312,9 @@ private void HandleErrorFrame(RSocketFrame.ErrorFrame abstractFrame)
 
         private void HandlePayloadFrame(RSocketFrame.AbstractRequestFrame abstractFrame)
         {
-            bool hasComplete = RSocketFlagUtils.HasComplete(abstractFrame.Flags);
-            bool hasPayload = RSocketFlagUtils.HasNext(abstractFrame.Flags);
-            bool hasFollows = RSocketFlagUtils.HasFollows(abstractFrame.Flags);
+            bool hasComplete = FlagUtils.HasComplete(abstractFrame.Flags);
+            bool hasPayload = FlagUtils.HasNext(abstractFrame.Flags);
+            bool hasFollows = FlagUtils.HasFollows(abstractFrame.Flags);
 
             if (hasComplete || !hasFollows)
             {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util.meta
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/BufferUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/BufferUtils.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Viglucci.UnityRSocket
+namespace Viglucci.UnityRSocket.Util
 {
     public static class BufferUtils
     {
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/BufferUtils.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/BufferUtils.cs.meta
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FlagUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FlagUtils.cs
@@ -0,0 +1,43 @@
+namespace Viglucci.UnityRSocket.Util
+{
+    public class FlagUtils
+    {
+        public static int FrameTypeOffset { get; } = 10;
+        public static int FlagsMask { get; } = 1023;
+
+        public static bool HasMetadata(int flags)
+        {
+            return (flags & (int)RSocketFlagType.METADATA) == (int)RSocketFlagType.METADATA;
+        }
+
+        public static bool HasComplete(int flags)
+        {
+            return (flags & (int)RSocketFlagType.COMPLETE) == (int)RSocketFlagType.COMPLETE;
+        }
+
+        public static bool HasNext(int flags)
+        {
+            return (flags & (int)RSocketFlagType.NEXT) == (int)RSocketFlagType.NEXT;
+        }
+
+        public static bool HasFollows(int flags)
+        {
+            return (flags & (int)RSocketFlagType.FOLLOWS) == (int)RSocketFlagType.FOLLOWS;
+        }
+
+        public static bool HasIgnore(int flags)
+        {
+            return (flags & (int)RSocketFlagType.IGNORE) == (int)RSocketFlagType.IGNORE;
+        }
+
+        public static bool HasRespond(int flags)
+        {
+            return (flags & (int)RSocketFlagType.RESPOND) == (int)RSocketFlagType.RESPOND;
+        }
+
+        public static bool HasLease(int flags)
+        {
+            return (flags & (int)RSocketFlagType.LEASE) == (int)RSocketFlagType.LEASE;
+        }
+    }
+}
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FlagUtils.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FlagUtils.cs.meta
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FrameUtils.cs b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FrameUtils.cs
@@ -1,4 +1,6 @@
-namespace Viglucci.UnityRSocket.Frame
+using Viglucci.UnityRSocket.Frame;
+
+namespace Viglucci.UnityRSocket.Util
 {
     public static class FrameUtils
     {
@@ -12,10 +14,5 @@ public static bool IsRequestFrame(RSocketFrame.AbstractFrame abstractFrame)
             return FrameType.REQUEST_RESPONSE <= abstractFrame.Type
                    && abstractFrame.Type <= FrameType.REQUEST_CHANNEL;
         }
-
-        public static bool HasMetadataFlag(ushort flags)
-        {
-            return (flags & (int)RSocketFlagType.METADATA) == (int)RSocketFlagType.METADATA;
-        }
     }
 }
diff --git a/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FrameUtils.cs.meta b/UnityRSocket/Assets/Viglucci/UnityRSocket/Runtime/Util/FrameUtils.cs.meta

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using UnityEngine;`
`5`	`5`	`using Viglucci.UnityRSocket.Frame;`
	`6`	`+using Viglucci.UnityRSocket.Util;`
`6`	`7`
`7`	`8`	`namespace Viglucci.UnityRSocket`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
	`2`	`+using Viglucci.UnityRSocket.Util;`
`2`	`3`
`3`	`4`	`namespace Viglucci.UnityRSocket.Frame`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using Viglucci.UnityRSocket.Util;`
`3`	`4`
`4`	`5`	`namespace Viglucci.UnityRSocket.Frame`
`5`	`6`	`{`