measurement: name the kinds by protocol and action, add the http_request kind and QUIC settings

backend/shared/tests/MoShiro.Protocol.Tests/CatalogTests.cs

@@ -35,7 +35,7 @@ public sealed class CatalogTests
     public void DefaultLineTemplates_StayWithinTheLineBudget()
     {
         long total = 0;
-        foreach (KindSpec kind in new[] { Kinds.UdpEcho, Kinds.TcpEcho })
+        foreach (KindSpec kind in new[] { Kinds.QuicPing, Kinds.TcpPing })
         {
             total += kind.BudgetBitsPerSecond(ParamResolver.Resolve(kind.Params, null).Values!);
         }
@@ -52,7 +52,7 @@ public sealed class CatalogTests
             ["size"] = Json("\"big\""),
             ["bogus"] = Json("1"),
         };
-        ParamResolution result = ParamResolver.Resolve(Kinds.UdpEcho.Params, input);
+        ParamResolution result = ParamResolver.Resolve(Kinds.QuicPing.Params, input);
 
         Assert.False(result.IsValid);
         Assert.Contains("between 1 and 200", result.Errors["rate_hz"]);
@@ -64,13 +64,13 @@ public sealed class CatalogTests
     [Fact]
     public void Resolve_AcceptsBoundariesAndRejectsJustOutside()
     {
-        Assert.True(ParamResolver.Resolve(Kinds.UdpEcho.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("1") }).IsValid);
-        Assert.True(ParamResolver.Resolve(Kinds.UdpEcho.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("200") }).IsValid);
-        Assert.False(ParamResolver.Resolve(Kinds.UdpEcho.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("0") }).IsValid);
-        Assert.False(ParamResolver.Resolve(Kinds.UdpEcho.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("201") }).IsValid);
-        Assert.False(ParamResolver.Resolve(Kinds.UdpEcho.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("1.5") }).IsValid);
-        Assert.False(ParamResolver.Resolve(Kinds.UdpTrain.Params, new Dictionary<string, JsonElement> { ["direction"] = Json("\"sideways\"") }).IsValid);
-        Assert.False(ParamResolver.Resolve(Kinds.TcpEcho.Params, new Dictionary<string, JsonElement> { ["tls"] = Json("1") }).IsValid);
+        Assert.True(ParamResolver.Resolve(Kinds.QuicPing.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("1") }).IsValid);
+        Assert.True(ParamResolver.Resolve(Kinds.QuicPing.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("200") }).IsValid);
+        Assert.False(ParamResolver.Resolve(Kinds.QuicPing.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("0") }).IsValid);
+        Assert.False(ParamResolver.Resolve(Kinds.QuicPing.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("201") }).IsValid);
+        Assert.False(ParamResolver.Resolve(Kinds.QuicPing.Params, new Dictionary<string, JsonElement> { ["rate_hz"] = Json("1.5") }).IsValid);
+        Assert.False(ParamResolver.Resolve(Kinds.QuicStream.Params, new Dictionary<string, JsonElement> { ["direction"] = Json("\"sideways\"") }).IsValid);
+        Assert.False(ParamResolver.Resolve(Kinds.TcpPing.Params, new Dictionary<string, JsonElement> { ["tls"] = Json("1") }).IsValid);
     }
 
     [Fact]
@@ -98,7 +98,7 @@ public sealed class CatalogTests
         var set = new TaskSet
         {
             Version = 7,
-            Tasks = [new TaskSpec { Id = new TaskId("tsk_1"), Kind = "udp_echo", Params = new Dictionary<string, JsonElement> { ["rate_hz"] = Json("10") } }],
+            Tasks = [new TaskSpec { Id = new TaskId("tsk_1"), Kind = "quic_ping", Params = new Dictionary<string, JsonElement> { ["rate_hz"] = Json("10") } }],
             Peers = [new PeerSpec { NodeId = new Fleet.Core.NodeId("agt_1"), PublicKey = "AAAA" }],
         };
         string text = JsonSerializer.Serialize(set, MoShiroJsonContext.Default.TaskSet);
@@ -114,9 +114,9 @@ public sealed class CatalogTests
     [Fact]
     public void NodeEnrollMeta_ToleratesUnknownFields_AndKeepsDefaults()
     {
-        NodeEnrollMeta meta = JsonSerializer.Deserialize("{\"kinds\":[\"udp_echo\"],\"future\":1}", MoShiroJsonContext.Default.NodeEnrollMeta)!;
+        NodeEnrollMeta meta = JsonSerializer.Deserialize("{\"kinds\":[\"quic_ping\"],\"future\":1}", MoShiroJsonContext.Default.NodeEnrollMeta)!;
         Assert.Equal(0, meta.TcpPort); // 没有端口表示这个节点不监听
-        Assert.Equal(["udp_echo"], meta.Kinds);
+        Assert.Equal(["quic_ping"], meta.Kinds);
     }
 
     [Fact]

backend/shared/tests/MoShiro.Protocol.Tests/RawChunkCodecTests.cs

@@ -28,7 +28,7 @@ public sealed class RawChunkCodecTests
     private static RawChunk SampleChunk()
     {
         RawChunk chunk = ChunkFactory.Echo(
-            s_agent, "udp_echo", 1_700_000_000_000, 6, 100,
+            s_agent, "quic_ping", 1_700_000_000_000, 6, 100,
             i => new EchoPacket(LostUp: i == 2, LostDown: i == 4, 20_000 + (i * 100), 21_000));
         chunk.Header.ChunkId = new ChunkId(Guid.Parse("01890000-0000-7000-8000-000000000001"));
         return chunk;
@@ -41,7 +41,7 @@ public sealed class RawChunkCodecTests
         RawChunk decoded = RawChunkCodec.Decode(RawChunkCodec.Encode(original)).Value;
 
         Assert.Equal(original.Header.ChunkId, decoded.Header.ChunkId);
-        Assert.Equal("udp_echo", decoded.Header.Kind);
+        Assert.Equal("quic_ping", decoded.Header.Kind);
         Assert.Equal(original.Header.Clock.DialerOffsetUs, decoded.Header.Clock.DialerOffsetUs);
         RawStream before = original.Find("msg")!;
         RawStream after = decoded.Find("msg")!;
@@ -100,7 +100,7 @@ public sealed class RawChunkCodecTests
         string columns = Convert.ToHexStringLower(body.AsSpan(4 + (int)headerLength));
         string header = System.Text.Encoding.UTF8.GetString(body.AsSpan(4, (int)headerLength));
 
-        Assert.StartsWith("{\"chunk_id\":\"01890000-0000-7000-8000-000000000001\",\"container_version\":1,\"kind\":\"udp_echo\"", header);
+        Assert.StartsWith("{\"chunk_id\":\"01890000-0000-7000-8000-000000000001\",\"container_version\":1,\"kind\":\"quic_ping\"", header);
         Assert.Contains("\"streams\":[{\"name\":\"msg\",\"count\":6,\"columns\":[{\"name\":\"seq\",\"type\":\"u32\",\"enc\":\"delta\",\"nullable\":false},", header);
         Assert.Equal(GoldenColumns, columns);
     }
@@ -181,7 +181,7 @@ public sealed class RawChunkCodecTests
     [Fact]
     public void Encode_IsSmallerThanTheNaiveRepresentation()
     {
-        // 10 Hz 的 udp_echo 一个 10 秒块应当远小于每行 6×8 字节
+        // 10 Hz 的 quic_ping 一个 10 秒块应当远小于每行 6×8 字节
         RawChunk chunk = ChunkFactory.UdpEchoClean(s_agent, 1_700_000_000_000);
         Assert.True(RawChunkCodec.Encode(chunk).Length < 100 * 6 * 8 / 4);
     }

backend/shared/tests/MoShiro.Protocol.Tests/TargetHostTests.cs

@@ -0,0 +1,28 @@
+using MoShiro.Protocol;
+
+namespace MoShiro.Protocol.Tests;
+
+public sealed class TargetHostTests
+{
+    [Theory]
+    [InlineData("http_request", "https://Example.com/health?x=1", "https://example.com/health?x=1")]
+    [InlineData("http_request", "http://192.0.2.1:8080", "http://192.0.2.1:8080/")]
+    [InlineData("tcp_connect", "Example.com:443", "example.com:443")]
+    [InlineData("tcp_connect", "192.0.2.1", "192.0.2.1")]
+    [InlineData("tcp_connect", "[2001:db8::1]:443", "[2001:db8::1]:443")]
+    [InlineData("icmp_ping", "2001:db8::1", "2001:db8::1")]
+    public void Normalize_AcceptsTheTargetFormOfTheKind(string kind, string target, string expected) =>
+        Assert.Equal(expected, TargetHost.Normalize(kind, target));
+
+    [Theory]
+    [InlineData("http_request", "example.com")]            // http 必须是 URL
+    [InlineData("http_request", "ftp://example.com/")]
+    [InlineData("http_request", "https://user:pw@example.com/")]
+    [InlineData("tcp_connect", "https://example.com/")]    // 其余 Kind 不能是 URL
+    [InlineData("tcp_connect", "example.com:0")]
+    [InlineData("tcp_connect", "exa mple.com")]
+    [InlineData("tcp_connect", "-bad.example.com")]
+    [InlineData("tcp_connect", "")]
+    public void Normalize_RejectsTheWrongFormForTheKind(string kind, string target) =>
+        Assert.Null(TargetHost.Normalize(kind, target));
+}