first iteration

2026-10-16 17:23:04 +08:00 · 2018-06-16 17:20:00 +02:00
parent caea7910b4
commit c758ae89f4
7 changed files with 313 additions and 4 deletions
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Connections;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class ConnectionBuilderExtensions
+    {
+        public static IConnectionBuilder UseMqtt(this IConnectionBuilder builder)
+        {
+            return builder.UseConnectionHandler<MqttConnectionHandler>();
+        }
+    }
+}
@@ -0,0 +1,136 @@
+using Microsoft.AspNetCore.Connections;
+using MQTTnet.Adapter;
+using MQTTnet.Packets;
+using MQTTnet.Serializer;
+using System;
+using System.Collections.Generic;
+using System.IO.Pipelines;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MQTTnet.AspNetCore
+{
+    public class MqttConnectionContext : IMqttChannelAdapter
+    {
+        public IMqttPacketSerializer PacketSerializer { get; }
+        public ConnectionContext Connection { get; }
+
+        public string Endpoint => Connection.ConnectionId;
+
+        public MqttConnectionContext(
+            IMqttPacketSerializer packetSerializer,
+            ConnectionContext connection)
+        {
+            PacketSerializer = packetSerializer;
+            Connection = connection;
+        }
+
+        public Task ConnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task DisconnectAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        {
+            Connection.Transport.Input.Complete();
+            Connection.Transport.Output.Complete();
+            return Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+        }
+
+        public async Task<MqttBasePacket> ReceivePacketAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        {
+            var input = Connection.Transport.Input;
+
+            while (!cancellationToken.IsCancellationRequested)
+            {
+                ReadResult readResult;
+                
+                var readTask = input.ReadAsync(cancellationToken);
+                if (readTask.IsCompleted)
+                {
+                    readResult = readTask.Result;
+                }
+                else
+                {
+                    readResult = await readTask;
+                }
+
+                var buffer = readResult.Buffer;
+
+                var consumed = buffer.Start;
+                var observed = buffer.Start;
+
+                try
+                {
+                    if (!buffer.IsEmpty)
+                    {
+                        if (PacketSerializer.TryDeserialize(buffer, out var packet, out consumed, out observed))
+                        {
+                            return packet;
+                        }
+                    }
+                    else if (readResult.IsCompleted)
+                    {
+                        break;
+                    }
+                }
+                finally
+                {
+                    // The buffer was sliced up to where it was consumed, so we can just advance to the start.
+                    // We mark examined as buffer.End so that if we didn't receive a full frame, we'll wait for more data
+                    // before yielding the read again.
+                    input.AdvanceTo(consumed, observed);
+                }
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+            return null;
+        }       
+
+        public async Task SendPacketsAsync(TimeSpan timeout, IEnumerable<MqttBasePacket> packets, CancellationToken cancellationToken)
+        {
+            foreach (var packet in packets)
+            {
+                await WriteAsync(packet);
+            }
+        }
+
+        public async Task WriteAsync(MqttBasePacket packet)
+        {
+            var buffer = PacketSerializer.Serialize(packet);
+            await Connection.Transport.Output.WriteAsync(buffer.AsMemory());
+        }
+
+        private int messageId;
+        public Task PublishAsync(MqttPublishPacket packet)
+        {
+            if (!packet.PacketIdentifier.HasValue && packet.QualityOfServiceLevel > MQTTnet.Protocol.MqttQualityOfServiceLevel.AtMostOnce)
+            {
+                packet.PacketIdentifier = (ushort)Interlocked.Increment(ref messageId);
+            }
+            return WriteAsync(packet);
+        }
+
+        public Task SubscribeAsync(MqttSubscribePacket packet)
+        {
+            if (!packet.PacketIdentifier.HasValue)
+            {
+                packet.PacketIdentifier = (ushort)Interlocked.Increment(ref messageId);
+            }
+            return WriteAsync(packet);
+        }
+
+        public Task ConnectAsync(MqttConnectPacket packet)
+        {
+            if (string.IsNullOrEmpty(packet.ClientId))
+            {
+                packet.ClientId = Guid.NewGuid().ToString();
+            }
+            return WriteAsync(packet);
+        }
+    }
+}
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Connections;
+using MQTTnet.Adapter;
+using MQTTnet.Serializer;
+using MQTTnet.Server;
+using System;
+using System.Threading.Tasks;
+
+namespace MQTTnet.AspNetCore
+{
+    public class MqttConnectionHandler : ConnectionHandler, IMqttServerAdapter
+    {        
+        public event EventHandler<MqttServerAdapterClientAcceptedEventArgs> ClientAccepted;
+
+        public override async Task OnConnectedAsync(ConnectionContext connection)
+        {
+            var serializer = new MqttPacketSerializer();
+            using (var adapter = new MqttConnectionContext(serializer, connection))
+            {
+                var args = new MqttServerAdapterClientAcceptedEventArgs(adapter);
+                ClientAccepted?.Invoke(this, args);
+
+                await args.SessionTask;
+            }
+        }
+
+        public Task StartAsync(IMqttServerOptions options)
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync()
+        {
+            return Task.CompletedTask;
+        }
+        
+        public void Dispose()
+        {
+        }
+    }
+}
@@ -0,0 +1,115 @@
+using System;
+using System.Buffers;
+using System.IO;
+using MQTTnet.Exceptions;
+using MQTTnet.Packets;
+using MQTTnet.Protocol;
+using MQTTnet.Serializer;
+
+namespace MQTTnet.AspNetCore
+{
+    public static class ReaderExtensions 
+    {
+        public static MqttPacketHeader ReadHeader(this ref ReadOnlySequence<byte> input)
+        {
+            if (input.Length < 2)
+            {
+                return null;
+            }
+
+            var fixedHeader = input.First.Span[0];
+            var controlPacketType = (MqttControlPacketType)(fixedHeader >> 4);
+            var bodyLength = ReadBodyLength(ref input);
+
+            return new MqttPacketHeader
+            {
+                FixedHeader = fixedHeader,
+                ControlPacketType = controlPacketType,
+                BodyLength = bodyLength
+            };
+        }
+
+        private static int ReadBodyLength(ref ReadOnlySequence<byte> input)
+        {
+            // Alorithm taken from https://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html.
+            var multiplier = 1;
+            var value = 0;
+            byte encodedByte;
+            var index = 1;
+
+            var temp = input.Slice(0, Math.Min(5, input.Length)).GetArray();
+
+            do
+            {
+                encodedByte = temp[index];
+                index++;
+
+                value += (byte)(encodedByte & 127) * multiplier;
+                if (multiplier > 128 * 128 * 128)
+                {
+                    throw new MqttProtocolViolationException($"Remaining length is invalid (Data={string.Join(",", temp.AsSpan(1, index).ToArray())}).");
+                }
+
+                multiplier *= 128;
+            } while ((encodedByte & 128) != 0);
+
+            input = input.Slice(index);
+
+            return value;
+        }
+
+
+
+        public static byte[] GetArray(this in ReadOnlySequence<byte> input)
+        {
+            if (input.IsSingleSegment)
+            {
+                return input.First.Span.ToArray();
+            }
+
+            // Should be rare
+            return input.ToArray();
+        }
+
+        public static bool TryDeserialize(this IMqttPacketSerializer serializer, ref ReadOnlySequence<byte> input, out MqttBasePacket packet)
+        {
+            packet = null;
+            var copy = input;
+            var header = copy.ReadHeader();
+            if (header == null || copy.Length < header.BodyLength)
+            {
+                return false;
+            }
+
+            input = copy.Slice(header.BodyLength);
+            var bodySlice = copy.Slice(0, header.BodyLength);
+            using (var body = new MemoryStream(bodySlice.GetArray()))
+            {
+                packet = serializer.Deserialize(header, body);
+                return true;
+            }
+        }
+
+        public static bool TryDeserialize(this IMqttPacketSerializer serializer, in ReadOnlySequence<byte> input, out MqttBasePacket packet, out SequencePosition consumed, out SequencePosition observed)
+        {
+            packet = null;
+            var copy = input;
+            var header = copy.ReadHeader();
+            if (header == null || copy.Length < header.BodyLength)
+            {
+                consumed = input.Start;
+                observed = input.End;
+                return false;
+            }
+
+            var bodySlice = copy.Slice(0, header.BodyLength);
+            using (var body = new MemoryStream(bodySlice.GetArray()))
+            {
+                packet = serializer.Deserialize(header, body);
+                consumed = bodySlice.End;
+                observed = bodySlice.End;
+                return true;
+            }
+        }
+    }
+}
@@ -9,6 +9,7 @@
    <Company />
    <Authors />
    <PackageId />
+    <LangVersion>7.2</LangVersion>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -16,9 +17,11 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0-rc1-final" />
  </ItemGroup>

  <ItemGroup>
@@ -30,7 +30,8 @@ namespace MQTTnet.AspNetCore

            if (options.DefaultEndpointOptions.IsEnabled)
            {
-                services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttTcpServerAdapter>());
+                services.AddSingleton<MqttConnectionHandler>();
+                services.AddSingleton<IMqttServerAdapter>(s => s.GetService<MqttConnectionHandler>());
            }

            return services;
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
+using MQTTnet.AspNetCore;

 namespace MQTTnet.TestApp.AspNetCore2
 {
@@ -12,6 +13,7 @@ namespace MQTTnet.TestApp.AspNetCore2

        private static IWebHost BuildWebHost(string[] args) =>
            WebHost.CreateDefaultBuilder(args)
+                .UseKestrel(o => o.ListenAnyIP(1883, l => l.UseMqtt()))
                .UseStartup<Startup>()
                .Build();
    }