Merge pull request #1199 from ably/feature/integration-2.0

[SDK-3703] Feature/integration 2.0

Author: sacOO7

.github/workflows/package.yml

@@ -18,8 +18,8 @@ jobs:
         with:
           dotnet-version: |
             3.1.x
-            6.0.x
-            7.0.x
+            6.0.403
+            7.0.100
       - name: Download fake-cli
         run:  dotnet tool restore
       - name: Package
@@ -45,8 +45,8 @@ jobs:
         with:
           dotnet-version: |
             3.1.x
-            6.0.x
-            7.0.x
+            6.0.403
+            7.0.100
       - name: Download fake-cli
         run:  dotnet tool install fake-cli --version 5.20.4 --tool-path .
       - name: Restore packages
@@ -73,7 +73,7 @@ jobs:
           with:
             dotnet-version: |
               2.x.x
-              6.x.x
+              6.0.403
 
         # Checkout unity packager
         - name: Checkout unity-packager repo

.github/workflows/run-tests-linux.yml

@@ -24,8 +24,8 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
+            6.0.403
+            7.0.100
 
       - name: Download dotnet build-script tools
         run:  dotnet tool restore

.github/workflows/run-tests-macos.yml

@@ -24,8 +24,8 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
+            6.0.403
+            7.0.100
 
       - name: Download dotnet build-script tools
         run:  dotnet tool restore

.github/workflows/run-tests-windows.yml

@@ -24,8 +24,8 @@ jobs:
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
+            6.0.403
+            7.0.100
 
       - name: Download dotnet build-script tools
         run: dotnet tool restore

src/IO.Ably.Shared/AblyRealtime.cs

@@ -67,7 +67,7 @@ internal AblyRealtime(ClientOptions options, Func<ClientOptions, IMobileDevice,
             RestClient = createRestFunc != null ? createRestFunc.Invoke(options, mobileDevice) : new AblyRest(options, mobileDevice);
             Push = new PushRealtime(RestClient, Logger);
 
-            Connection = new Connection(this, options.NowFunc, options.Logger);
+            Connection = new Connection(this, options.NowFunc, Logger);
             Connection.Initialise();
 
             if (options.AutomaticNetworkStateMonitoring)

src/IO.Ably.Shared/ClientOptions.cs

@@ -91,7 +91,7 @@ internal string GetClientId()
         /// <summary>
         /// A connection recovery string, specified by a client when initializing the library
         /// with the intention of inheriting the state of an earlier connection. See the Ably
-        /// Realtime API documentation for further information on connection state recovery.
+        /// Realtime API documentation for further information on connection state recovery. (RTN16i)
         /// Default: null.
         /// </summary>
         public string Recover { get; set; }
@@ -358,7 +358,7 @@ public bool UseBinaryProtocol
         /// Default before 1.2: false.
         /// Default from 1.2: true.
         /// </summary>
-        public bool IdempotentRestPublishing { get; set; } = Defaults.ProtocolVersionNumber >= 1.2;
+        public bool IdempotentRestPublishing { get; set; } = true;
 
         /// <summary>
         /// Additional parameters to be sent in the querystring when initiating a realtime connection.

src/IO.Ably.Shared/Defaults.cs

@@ -6,10 +6,8 @@
 
 namespace IO.Ably
 {
-    internal static class Defaults
+    internal class Defaults
     {
-        internal static readonly float ProtocolVersionNumber = 1.2F;
-
         internal static readonly string LibraryVersion = GetVersion();
 
         internal static string GetVersion()
@@ -18,7 +16,7 @@ internal static string GetVersion()
             return version.Split('.').Take(3).JoinStrings(".");
         }
 
-        public static string ProtocolVersion { get; } = ProtocolVersionNumber.ToString(CultureInfo.InvariantCulture);
+        public const string ProtocolVersion = "2"; // CSV2
 
         public const int QueryLimit = 100;
 

src/IO.Ably.Shared/Extensions/PresenceExtensions.cs

@@ -7,13 +7,16 @@ public static bool IsSynthesized(this PresenceMessage msg)
             return msg.Id == null || !msg.Id.StartsWith(msg.ConnectionId);
         }
 
+        // RTP2b, RTP2c
         public static bool IsNewerThan(this PresenceMessage thisMessage, PresenceMessage thatMessage)
         {
+            // RTP2b1
             if (thisMessage.IsSynthesized() || thatMessage.IsSynthesized())
             {
                 return thisMessage.Timestamp > thatMessage.Timestamp;
             }
 
+            // RTP2b2
             var thisValues = thisMessage.Id.Split(':');
             var thatValues = thatMessage.Id.Split(':');
 

src/IO.Ably.Shared/Http/AblyHttpClient.cs

@@ -73,7 +73,7 @@ internal void SetPreferredHost(string currentHost)
         internal void CreateInternalHttpClient(TimeSpan timeout, HttpMessageHandler messageHandler)
         {
             Client = messageHandler != null ? new HttpClient(messageHandler) : new HttpClient();
-            Client.DefaultRequestHeaders.Add("X-Ably-Version", Defaults.ProtocolVersion);
+            Client.DefaultRequestHeaders.Add("X-Ably-Version", Defaults.ProtocolVersion); // RSC7a
             Client.DefaultRequestHeaders.Add(Agent.AblyAgentHeader, Agent.AblyAgentIdentifier(Options.Agents)); // RSC7d
             Client.Timeout = timeout;
         }

src/IO.Ably.Shared/IO.Ably.Shared.projitems

@@ -55,6 +55,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\Presence.GetParams.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\Presence.QueuedPresenceMessage.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\PresenceMap.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Realtime\RecoveryKeyContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\Workflows\ChannelCommands.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\Workflows\IQueueCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Realtime\Workflows\PingRequest.cs" />