Merge branch 'feature/mqtt-connection-type'

src/NATS.Server/Monitoring/ClosedClient.cs

@@ -22,4 +22,5 @@ public sealed record ClosedClient
     public TimeSpan Rtt { get; init; }
     public string TlsVersion { get; init; } = "";
     public string TlsCipherSuite { get; init; } = "";
+    public string MqttClient { get; init; } = "";
 }

src/NATS.Server/Monitoring/Connz.cs

@@ -204,6 +204,8 @@ public sealed class ConnzOptions
 
     public string FilterSubject { get; set; } = "";
 
+    public string MqttClient { get; set; } = "";
+
     public int Offset { get; set; }
 
     public int Limit { get; set; } = 1024;

src/NATS.Server/Monitoring/ConnzHandler.cs

@@ -28,6 +28,10 @@ public sealed class ConnzHandler(NatsServer server)
             connInfos.AddRange(server.GetClosedClients().Select(c => BuildClosedConnInfo(c, now, opts)));
         }
 
+        // Filter by MQTT client ID
+        if (!string.IsNullOrEmpty(opts.MqttClient))
+            connInfos = connInfos.Where(c => c.MqttClient == opts.MqttClient).ToList();
+
         // Validate sort options that require closed state
         if (opts.Sort is SortOpt.ByStop or SortOpt.ByReason && opts.State == ConnState.Open)
             opts.Sort = SortOpt.ByCid; // Fallback
@@ -142,6 +146,7 @@ public sealed class ConnzHandler(NatsServer server)
             Rtt = FormatRtt(closed.Rtt),
             TlsVersion = closed.TlsVersion,
             TlsCipherSuite = closed.TlsCipherSuite,
+            MqttClient = closed.MqttClient,
         };
     }
 
@@ -197,6 +202,9 @@ public sealed class ConnzHandler(NatsServer server)
         if (q.TryGetValue("limit", out var limit) && int.TryParse(limit, out var l))
             opts.Limit = l;
 
+        if (q.TryGetValue("mqtt_client", out var mqttClient))
+            opts.MqttClient = mqttClient.ToString();
+
         return opts;
     }
 

src/NATS.Server/Monitoring/Varz.cs

@@ -355,8 +355,29 @@ public sealed class MqttOptsVarz
     [JsonPropertyName("port")]
     public int Port { get; set; }
 
+    [JsonPropertyName("no_auth_user")]
+    public string NoAuthUser { get; set; } = "";
+
+    [JsonPropertyName("auth_timeout")]
+    public double AuthTimeout { get; set; }
+
+    [JsonPropertyName("tls_map")]
+    public bool TlsMap { get; set; }
+
     [JsonPropertyName("tls_timeout")]
     public double TlsTimeout { get; set; }
+
+    [JsonPropertyName("tls_pinned_certs")]
+    public string[] TlsPinnedCerts { get; set; } = [];
+
+    [JsonPropertyName("js_domain")]
+    public string JsDomain { get; set; } = "";
+
+    [JsonPropertyName("ack_wait")]
+    public long AckWait { get; set; }
+
+    [JsonPropertyName("max_ack_pending")]
+    public ushort MaxAckPending { get; set; }
 }
 
 /// <summary>

src/NATS.Server/Monitoring/VarzHandler.cs

@@ -121,6 +121,7 @@ public sealed class VarzHandler : IDisposable
                 Subscriptions = _server.SubList.Count,
                 ConfigLoadTime = _server.StartTime,
                 HttpReqStats = stats.HttpReqStats.ToDictionary(kv => kv.Key, kv => (ulong)kv.Value),
+                Mqtt = BuildMqttVarz(),
             };
         }
         finally
@@ -134,6 +135,27 @@ public sealed class VarzHandler : IDisposable
         _varzMu.Dispose();
     }
 
+    private MqttOptsVarz BuildMqttVarz()
+    {
+        var mqtt = _options.Mqtt;
+        if (mqtt is null)
+            return new MqttOptsVarz();
+
+        return new MqttOptsVarz
+        {
+            Host = mqtt.Host,
+            Port = mqtt.Port,
+            NoAuthUser = mqtt.NoAuthUser ?? "",
+            AuthTimeout = mqtt.AuthTimeout,
+            TlsMap = mqtt.TlsMap,
+            TlsTimeout = mqtt.TlsTimeout,
+            TlsPinnedCerts = mqtt.TlsPinnedCerts?.ToArray() ?? [],
+            JsDomain = mqtt.JsDomain ?? "",
+            AckWait = (long)mqtt.AckWait.TotalNanoseconds,
+            MaxAckPending = mqtt.MaxAckPending,
+        };
+    }
+
     /// <summary>
     /// Formats a TimeSpan as a human-readable uptime string matching Go server format.
     /// </summary>