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

backend/shared/MoShiro.Protocol/Catalog/Kinds/Kinds.cs

@@ -10,7 +10,7 @@ public static class Kinds
 
     /// <summary>这个任务可能达到的最高探测频率（Hz）：自适应时是 <c>rate_max_hz</c>，否则是固定的 <c>rate_hz</c>。预算、限速和准入都按它算。</summary>
     public static long PeakRateHz(string kindId, ParamValues values) =>
-        (kindId is "udp_echo" or "tcp_echo") && values.GetBool("adaptive") ? Math.Max(values.GetInt("rate_max_hz"), values.GetInt("rate_min_hz")) : values.GetInt("rate_hz");
+        (kindId is "quic_ping" or "tcp_ping") && values.GetBool("adaptive") ? Math.Max(values.GetInt("rate_max_hz"), values.GetInt("rate_min_hz")) : values.GetInt("rate_hz");
 
     private static readonly StreamSpec s_echoMsg = new(
         "msg",
@@ -30,8 +30,8 @@ public static class Kinds
         ],
         Union: true);
 
-    public static readonly KindSpec UdpEcho = new(
-        "udp_echo",
+    public static readonly KindSpec QuicPing = new(
+        "quic_ping",
         "QUIC Datagram echo",
         "Fixed-rate QUIC Datagram echo with four timestamps per packet.",
         Scope.Line,
@@ -47,10 +47,10 @@ public static class Kinds
             P.Int("port", 7443, 1, 65535),
         ],
         [s_echoMsg],
-        p => Bandwidth.UdpEcho(PeakRateHz("udp_echo", p), p.GetInt("size")));
+        p => Bandwidth.UdpEcho(PeakRateHz("quic_ping", p), p.GetInt("size")));
 
-    public static readonly KindSpec UdpTrain = new(
-        "udp_train",
+    public static readonly KindSpec QuicStream = new(
+        "quic_stream",
         "QUIC Datagram train",
         "Fixed-rate or laddered one-way QUIC Datagram stream (Agent to 拨号方) for loss and delay variation under load.",
         Scope.Line,
@@ -68,8 +68,8 @@ public static class Kinds
         ],
         p => (long)(p.GetNumber("mbps") * 1_000_000));
 
-    public static readonly KindSpec TcpEcho = new(
-        "tcp_echo",
+    public static readonly KindSpec TcpPing = new(
+        "tcp_ping",
         "TCP echo",
         "Small TCP messages echoed with four timestamps, plus periodic kernel tcp_info samples.",
         Scope.Line,
@@ -88,10 +88,10 @@ public static class Kinds
             P.Bool("tls", false),
         ],
         [s_echoMsg, s_tcpInfo],
-        p => Bandwidth.TcpEcho(PeakRateHz("tcp_echo", p), p.GetInt("max")));
+        p => Bandwidth.TcpEcho(PeakRateHz("tcp_ping", p), p.GetInt("max")));
 
-    public static readonly KindSpec TcpBulk = new(
-        "tcp_bulk",
+    public static readonly KindSpec TcpTransfer = new(
+        "tcp_transfer",
         "TCP bulk",
         "Bulk TCP transfer on several streams with periodic byte counters and tcp_info.",
         Scope.Line,
@@ -110,8 +110,8 @@ public static class Kinds
         ],
         _ => 0);
 
-    public static readonly KindSpec Connect = new(
-        "connect",
+    public static readonly KindSpec TcpConnect = new(
+        "tcp_connect",
         "Connect",
         "Repeated TCP and TLS connection establishment with per-phase timings and outcome.",
         Scope.Line | Scope.Target,
@@ -129,8 +129,8 @@ public static class Kinds
         ],
         p => p.GetInt("per_minute") * 4000 / 60);
 
-    public static readonly KindSpec Hold = new(
-        "hold",
+    public static readonly KindSpec TlsHold = new(
+        "tls_hold",
         "Hold",
         "A long-lived TLS connection with periodic heartbeats; records resets and lifetime.",
         Scope.Line,
@@ -144,8 +144,38 @@ public static class Kinds
         ],
         p => 2000 / Math.Max(1, p.GetInt("heartbeat_s")) * 8);
 
-    public static readonly KindSpec IcmpEcho = new(
-        "icmp_echo",
+    public static readonly KindSpec HttpRequest = new(
+        "http_request",
+        "HTTP request",
+        "One Agent requests a URL over HTTP/1.1, HTTP/2 or HTTP/3 and records DNS, TCP, time to first byte, total time and status. Target is the URL.",
+        Scope.Target,
+        new BlockSet("http", "fixed", "fixed", "request", []),
+        [
+            P.Enum("version", "h2", ["h1", "h2", "h3"], "HTTP version; the request fails instead of falling back."),
+            P.Enum("method", "GET", ["GET", "HEAD"]),
+            P.Bool("adaptive", true, "Adapt the request rate to the failure rate: low while the target answers, up to rate_max_per_min when it fails, exponential back-off while it is unreachable."),
+            P.Int("per_minute", 6, 1, 120, "/min", "Fixed rate, used when adaptive is false."),
+            P.Int("rate_min_per_min", 1, 1, 120, "/min"),
+            P.Int("rate_max_per_min", 12, 1, 120, "/min", "Highest rate, and the reference grid for sample weights."),
+            P.Number("tau_pct", 5, 0.1, 50, "%", "Failure rate a quiet target has to be able to prove below, at 95% confidence."),
+            P.Int("timeout_ms", 10000, 500, 60000, "ms"),
+            P.Int("read_kb", 16, 0, 1024, "KiB", "Body bytes to read before the request counts as finished (0: headers only)."),
+            P.Int("ok_status", 0, 0, 599, null, "Status that counts as success; 0 means any status below 400."),
+            P.Bool("tls_verify", true),
+        ],
+        [
+            new StreamSpec(
+                "req",
+                [
+                    Col.Seq("attempt"), Col.TsDialer("ts"), Col.U16("w"),
+                    Col.U32("dns_us", nullable: true), Col.U32("tcp_us", nullable: true), Col.U32("ttfb_us", nullable: true), Col.U32("total_us", nullable: true),
+                    Col.U16("status", nullable: true), Col.U8("proto", nullable: true), Col.U8("outcome"),
+                ]),
+        ],
+        p => p.GetInt("rate_max_per_min") * (2000 + p.GetInt("read_kb") * 1024) * 8 / 60);
+
+    public static readonly KindSpec IcmpPing = new(
+        "icmp_ping",
         "ICMP echo",
         "拨号方 or Agent side ICMP echo to a target address.",
         Scope.Target,
@@ -159,7 +189,7 @@ public static class Kinds
         ],
         p => Bandwidth.UdpEcho(p.GetInt("rate_hz"), p.GetInt("size")));
 
-    public static readonly IReadOnlyList<KindSpec> All = [UdpEcho, UdpTrain, TcpEcho, TcpBulk, Connect, Hold, IcmpEcho];
+    public static readonly IReadOnlyList<KindSpec> All = [QuicPing, QuicStream, TcpPing, TcpTransfer, TcpConnect, TlsHold, HttpRequest, IcmpPing];
 
     public static KindSpec? Find(string id)
     {