YangWX/MQTTnet
1
0
Fork 0
mirror of https://github.com/dotnet/MQTTnet.git synced 2026-10-15 00:15:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve the compatibility of MqttClientOptionsBuilder.WithConnectionUri() (#2107)

Browse Source 
* Improve the compatibility of MqttClientOptionsBuilder.WithConnectionUri() method.

* Force UseTls to true for secure schemes.

* Add support for UnixDomainSocket.
This commit is contained in:
老九
2024-12-01 14:10:58 +01:00
committed by GitHub
parent 7d4027958c
commit 6ef6b57064
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MQTTnet/Options/MqttClientOptionsBuilder.cs
+29 -10
View File
@@ -1,15 +1,15 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using MQTTnet.Formatter;
using MQTTnet.Packets;
using MQTTnet.Protocol;
using System;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Text;
using MQTTnet.Formatter;
using MQTTnet.Packets;
using MQTTnet.Protocol;
namespace MQTTnet;
@@ -138,20 +138,39 @@ public sealed class MqttClientOptionsBuilder
{
case "tcp":
case "mqtt":
WithTcpServer(uri.Host, port);
WithTcpServer(uri.Host, port)
.WithAddressFamily(AddressFamily.Unspecified)
.WithProtocolType(ProtocolType.Tcp)
.WithTlsOptions(o => o.UseTls(false));
break;
case "mqtts":
WithTcpServer(uri.Host, port)
.WithTlsOptions(
o =>
{
});
.WithAddressFamily(AddressFamily.Unspecified)
.WithProtocolType(ProtocolType.Tcp)
.WithTlsOptions(o => o.UseTls(true));
break;
case "ws":
WithWebSocketServer(o => o.WithUri(uri.ToString()))
.WithAddressFamily(AddressFamily.Unspecified)
.WithProtocolType(ProtocolType.Tcp)
.WithTlsOptions(o => o.UseTls(false));
break;
case "wss":
WithWebSocketServer(o => o.WithUri(uri.ToString()));
WithWebSocketServer(o => o.WithUri(uri.ToString()))
.WithAddressFamily(AddressFamily.Unspecified)
.WithProtocolType(ProtocolType.Tcp)
.WithTlsOptions(o => o.UseTls(true));
break;
// unix:///path/to/socket
case "unix":
WithEndPoint(new UnixDomainSocketEndPoint(uri.AbsolutePath))
.WithAddressFamily(AddressFamily.Unix)
.WithProtocolType(ProtocolType.Unspecified)
.WithTlsOptions(o => o.UseTls(false));
break;
default:
Source/MQTTnet/Options/MqttClientWebSocketOptionsBuilder.cs
+6
View File
@@ -66,6 +66,12 @@ public sealed class MqttClientWebSocketOptionsBuilder
public MqttClientWebSocketOptionsBuilder WithUri(string uri)
{
var webSocketUri = new Uri(uri, UriKind.Absolute);
if (webSocketUri.Scheme != Uri.UriSchemeWs && webSocketUri.Scheme != Uri.UriSchemeWss)
{
throw new ArgumentException("The scheme of the WebSocket Uri must be ws or wss.");
}
_webSocketOptions.Uri = uri;
return this;
}