itsi 0.2.16 → 0.2.18

data/crates/itsi_server/src/services/static_file_server.rs

@@ -2,7 +2,7 @@ use crate::{
     default_responses::NOT_FOUND_RESPONSE,
     prelude::*,
     server::{
-        http_message_types::{HttpRequest, HttpResponse, RequestExt, ResponseFormat},
+        http_message_types::{HttpBody, HttpRequest, HttpResponse, RequestExt, ResponseFormat},
         middleware_stack::ErrorResponse,
         redirect_type::RedirectType,
     },
@@ -16,7 +16,6 @@ use http::{
     },
     HeaderName, HeaderValue, Response, StatusCode,
 };
-use http_body_util::{combinators::BoxBody, Full};
 use itsi_error::Result;
 use parking_lot::{Mutex, RwLock};
 use percent_encoding::percent_decode_str;
@@ -28,7 +27,6 @@ use std::{
     borrow::Cow,
     cmp::Ordering,
     collections::HashMap,
-    convert::Infallible,
     fs::Metadata,
     ops::Deref,
     path::{Path, PathBuf},
@@ -324,7 +322,7 @@ impl StaticFileServer {
             }) => Response::builder()
                 .status(StatusCode::MOVED_PERMANENTLY)
                 .header(header::LOCATION, redirect_to)
-                .body(BoxBody::new(Full::new(Bytes::new())))
+                .body(HttpBody::empty())
                 .unwrap(),
             Err(not_found_behavior) => match not_found_behavior {
                 NotFoundBehavior::Error(error_response) => {
@@ -340,7 +338,7 @@ impl StaticFileServer {
                 NotFoundBehavior::Redirect(redirect) => Response::builder()
                     .status(redirect.r#type.status_code())
                     .header(header::LOCATION, redirect.to)
-                    .body(BoxBody::new(Full::new(Bytes::new())))
+                    .body(HttpBody::empty())
                     .unwrap(),
             },
         })
@@ -407,7 +405,7 @@ impl StaticFileServer {
 
         Response::builder()
             .status(StatusCode::NOT_FOUND)
-            .body(BoxBody::new(Full::new(Bytes::new())))
+            .body(HttpBody::empty())
             .unwrap()
     }
 
@@ -648,15 +646,8 @@ impl StaticFileServer {
         Err(nf)
     }
 
-    async fn stream_file_range(
-        &self,
-        path: PathBuf,
-        start: u64,
-        end: u64,
-    ) -> Option<BoxBody<Bytes, Infallible>> {
+    async fn stream_file_range(&self, path: PathBuf, start: u64, end: u64) -> Option<HttpBody> {
         use futures::TryStreamExt;
-        use http_body_util::StreamBody;
-        use hyper::body::Frame;
         use tokio::io::AsyncSeekExt;
         use tokio_util::io::ReaderStream;
 
@@ -687,32 +678,25 @@ impl StaticFileServer {
         let range_length = end - start + 1;
         let limited_reader = tokio::io::AsyncReadExt::take(file, range_length);
         let path_clone = path.clone();
-        let stream = ReaderStream::with_capacity(limited_reader, 64 * 1024)
-            .map_ok(Frame::data)
-            .map_err(move |e| {
-                warn!("Error streaming file {}: {}", path_clone.display(), e);
-                unreachable!("We handle IO errors above")
-            });
-
-        Some(BoxBody::new(StreamBody::new(stream)))
+        let stream = ReaderStream::with_capacity(limited_reader, 64 * 1024).map_err(move |e| {
+            warn!("Error streaming file {}: {}", path_clone.display(), e);
+            unreachable!("We handle IO errors above")
+        });
+        Some(HttpBody::stream(stream))
     }
 
-    async fn stream_file(&self, path: PathBuf) -> Option<BoxBody<Bytes, Infallible>> {
+    async fn stream_file(&self, path: PathBuf) -> Option<HttpBody> {
         use futures::TryStreamExt;
-        use http_body_util::StreamBody;
-        use hyper::body::Frame;
         use tokio_util::io::ReaderStream;
 
         match File::open(&path).await {
             Ok(file) => {
                 let path_clone = path.clone();
-                let stream = ReaderStream::with_capacity(file, 64 * 1024)
-                    .map_ok(Frame::data)
-                    .map_err(move |e| {
-                        warn!("Error streaming file {}: {}", path_clone.display(), e);
-                        unreachable!("We handle IO errors above")
-                    });
-                Some(BoxBody::new(StreamBody::new(stream)))
+                let stream = ReaderStream::with_capacity(file, 64 * 1024).map_err(move |e| {
+                    warn!("Error streaming file {}: {}", path_clone.display(), e);
+                    unreachable!("We handle IO errors above")
+                });
+                Some(HttpBody::stream(stream))
             }
             Err(e) => {
                 warn!(
@@ -749,7 +733,7 @@ impl StaticFileServer {
             return Response::builder()
                 .status(StatusCode::RANGE_NOT_SATISFIABLE)
                 .header("Content-Range", format!("bytes */{}", content_length))
-                .body(BoxBody::new(Full::new(Bytes::new())))
+                .body(HttpBody::empty())
                 .unwrap();
         }
 
@@ -795,7 +779,7 @@ impl StaticFileServer {
                 builder = builder.header("Content-Range", range);
             }
 
-            return builder.body(BoxBody::new(Full::new(Bytes::new()))).unwrap();
+            return builder.body(HttpBody::empty()).unwrap();
         }
 
         // For GET requests, prepare the actual content
@@ -829,10 +813,7 @@ impl StaticFileServer {
         }
     }
 
-    fn serve_cached_content(
-        &self,
-        serve_cache_args: ServeCacheArgs,
-    ) -> http::Response<BoxBody<Bytes, Infallible>> {
+    fn serve_cached_content(&self, serve_cache_args: ServeCacheArgs) -> HttpResponse {
         let ServeCacheArgs(
             cache_entry,
             start,
@@ -855,7 +836,7 @@ impl StaticFileServer {
             return Response::builder()
                 .status(StatusCode::RANGE_NOT_SATISFIABLE)
                 .header("Content-Range", format!("bytes */{}", content_length))
-                .body(BoxBody::new(Full::new(Bytes::new())))
+                .body(HttpBody::empty())
                 .unwrap();
         }
 
@@ -904,7 +885,7 @@ impl StaticFileServer {
                 builder = builder.header("Content-Range", range);
             }
 
-            return builder.body(BoxBody::new(Full::new(Bytes::new()))).unwrap();
+            return builder.body(HttpBody::empty()).unwrap();
         }
 
         if is_range_request {
@@ -920,7 +901,7 @@ impl StaticFileServer {
                 cache_entry.last_modified_http_date.clone(),
                 content_range,
                 &self.headers,
-                BoxBody::new(Full::new(range_bytes)),
+                HttpBody::full(range_bytes),
             )
         } else {
             // Return the full content
@@ -987,15 +968,15 @@ fn format_http_date_header(time: SystemTime) -> HeaderValue {
         .unwrap()
 }
 
-fn build_ok_body(bytes: Arc<Bytes>) -> BoxBody<Bytes, Infallible> {
-    BoxBody::new(Full::new(bytes.as_ref().clone()))
+fn build_ok_body(bytes: Arc<Bytes>) -> HttpBody {
+    HttpBody::full(bytes.as_ref().clone())
 }
 
 // Helper function to handle not modified responses
-fn build_not_modified_response() -> http::Response<BoxBody<Bytes, Infallible>> {
+fn build_not_modified_response() -> HttpResponse {
     Response::builder()
         .status(StatusCode::NOT_MODIFIED)
-        .body(BoxBody::new(Full::new(Bytes::new())))
+        .body(HttpBody::empty())
         .unwrap()
 }
 
@@ -1009,8 +990,8 @@ fn build_file_response(
     last_modified_http_date: HeaderValue,
     range_header: Option<String>,
     headers: &Option<HashMap<String, String>>,
-    body: BoxBody<Bytes, Infallible>,
-) -> http::Response<BoxBody<Bytes, Infallible>> {
+    body: HttpBody,
+) -> HttpResponse {
     let mut response = Response::new(body);
 
     *response.status_mut() = status;

data/docs/benchmark-dashboard/.gitignore

@@ -0,0 +1,27 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts

data/docs/benchmark-dashboard/app/api/benchmarks/route.ts

@@ -0,0 +1,22 @@
+import { NextResponse } from "next/server"
+
+// This would be your actual API endpoint to fetch benchmark data
+export async function GET() {
+  try {
+    // In a real implementation, you would:
+    // 1. Scan the directory structure
+    // 2. Read and parse the JSON files
+    // 3. Return the aggregated data
+
+    // For demo purposes, we're returning a mock response
+    return NextResponse.json({
+      success: true,
+      data: [
+        // Your benchmark data would go here
+      ],
+    })
+  } catch (error) {
+    console.error("Error fetching benchmark data:", error)
+    return NextResponse.json({ success: false, error: "Failed to fetch benchmark data" }, { status: 500 })
+  }
+}

data/docs/benchmark-dashboard/app/globals.css

@@ -0,0 +1,94 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+body {
+  font-family: Arial, Helvetica, sans-serif;
+}
+
+@layer utilities {
+  .text-balance {
+    text-wrap: balance;
+  }
+}
+
+@layer base {
+  :root {
+    --background: 0 0% 100%;
+    --foreground: 0 0% 3.9%;
+    --card: 0 0% 100%;
+    --card-foreground: 0 0% 3.9%;
+    --popover: 0 0% 100%;
+    --popover-foreground: 0 0% 3.9%;
+    --primary: 0 0% 9%;
+    --primary-foreground: 0 0% 98%;
+    --secondary: 0 0% 96.1%;
+    --secondary-foreground: 0 0% 9%;
+    --muted: 0 0% 96.1%;
+    --muted-foreground: 0 0% 45.1%;
+    --accent: 0 0% 96.1%;
+    --accent-foreground: 0 0% 9%;
+    --destructive: 0 84.2% 60.2%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 0 0% 89.8%;
+    --input: 0 0% 89.8%;
+    --ring: 0 0% 3.9%;
+    --chart-1: 12 76% 61%;
+    --chart-2: 173 58% 39%;
+    --chart-3: 197 37% 24%;
+    --chart-4: 43 74% 66%;
+    --chart-5: 27 87% 67%;
+    --radius: 0.5rem;
+    --sidebar-background: 0 0% 98%;
+    --sidebar-foreground: 240 5.3% 26.1%;
+    --sidebar-primary: 240 5.9% 10%;
+    --sidebar-primary-foreground: 0 0% 98%;
+    --sidebar-accent: 240 4.8% 95.9%;
+    --sidebar-accent-foreground: 240 5.9% 10%;
+    --sidebar-border: 220 13% 91%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+  .dark {
+    --background: 0 0% 3.9%;
+    --foreground: 0 0% 98%;
+    --card: 0 0% 3.9%;
+    --card-foreground: 0 0% 98%;
+    --popover: 0 0% 3.9%;
+    --popover-foreground: 0 0% 98%;
+    --primary: 0 0% 98%;
+    --primary-foreground: 0 0% 9%;
+    --secondary: 0 0% 14.9%;
+    --secondary-foreground: 0 0% 98%;
+    --muted: 0 0% 14.9%;
+    --muted-foreground: 0 0% 63.9%;
+    --accent: 0 0% 14.9%;
+    --accent-foreground: 0 0% 98%;
+    --destructive: 0 62.8% 30.6%;
+    --destructive-foreground: 0 0% 98%;
+    --border: 0 0% 14.9%;
+    --input: 0 0% 14.9%;
+    --ring: 0 0% 83.1%;
+    --chart-1: 220 70% 50%;
+    --chart-2: 160 60% 45%;
+    --chart-3: 30 80% 55%;
+    --chart-4: 280 65% 60%;
+    --chart-5: 340 75% 55%;
+    --sidebar-background: 240 5.9% 10%;
+    --sidebar-foreground: 240 4.8% 95.9%;
+    --sidebar-primary: 224.3 76.3% 48%;
+    --sidebar-primary-foreground: 0 0% 100%;
+    --sidebar-accent: 240 3.7% 15.9%;
+    --sidebar-accent-foreground: 240 4.8% 95.9%;
+    --sidebar-border: 240 3.7% 15.9%;
+    --sidebar-ring: 217.2 91.2% 59.8%;
+  }
+}
+
+@layer base {
+  * {
+    @apply border-border;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}

data/docs/benchmark-dashboard/app/layout.tsx

@@ -0,0 +1,20 @@
+import type { Metadata } from 'next'
+import './globals.css'
+
+export const metadata: Metadata = {
+  title: 'v0 App',
+  description: 'Created with v0',
+  generator: 'v0.dev',
+}
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode
+}>) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}

data/docs/benchmark-dashboard/app/page.tsx

@@ -0,0 +1,252 @@
+"use client"
+
+import { useState, useEffect } from "react"
+import { BenchmarkDashboard } from "@/components/benchmark-dashboard"
+import { LoadingSpinner } from "@/components/ui/loading-spinner"
+
+// Updated sample data with the new group hierarchy and longer version strings
+const sampleHierarchicalData = [
+  {
+    cpu: "apple_m1_pro",
+    groups: [
+      {
+        group: "rack",
+        tests: [
+          {
+            test: "chunked",
+            servers: [
+              {
+                server: "agoo",
+                results: [
+                  {
+                    server: "agoo",
+                    test_case: "chunked",
+                    version: "Agoo v1.2.3 (Ruby 3.2.0) with experimental HTTP/2 support",
+                    threads: 1,
+                    workers: 1,
+                    http2: false,
+                    concurrency: 10,
+                    rss_mb: 1.77,
+                    results: {
+                      successRate: 1.0,
+                      total: 20000.0,
+                      slowest: 5000000.0,
+                      fastest: 200000.0,
+                      average: 2500000.0,
+                      requestsPerSec: 6500.0,
+                      totalData: 0,
+                      sizePerRequest: 0.0,
+                      sizePerSec: 0.0,
+                      errorDistribution: {},
+                      p95_latency: 4.8,
+                    },
+                    timestamp: "2025-05-24T10:41:17Z",
+                  },
+                  {
+                    server: "agoo",
+                    test_case: "chunked",
+                    version: "Agoo v1.2.3 (Ruby 3.2.0) with experimental HTTP/2 support",
+                    threads: 1,
+                    workers: 1,
+                    http2: false,
+                    concurrency: 50,
+                    rss_mb: 1.77,
+                    results: {
+                      successRate: 0.95,
+                      total: 28000.0,
+                      slowest: 12000000.0,
+                      fastest: 400000.0,
+                      average: 6000000.0,
+                      requestsPerSec: 9500.0,
+                      totalData: 0,
+                      sizePerRequest: 0.0,
+                      sizePerSec: 0.0,
+                      errorDistribution: {
+                        timeout: 50,
+                      },
+                      p95_latency: 10.2,
+                    },
+                    timestamp: "2025-05-24T10:41:17Z",
+                  },
+                ],
+              },
+              {
+                server: "puma",
+                results: [
+                  {
+                    server: "puma",
+                    test_case: "chunked",
+                    version:
+                      "Puma version 6.6.0+h2o version 2.3.0-DEV@87e2aa634 (Ruby 3.2.2) with HTTP/2 support enabled",
+                    threads: 1,
+                    workers: 1,
+                    http2: true,
+                    concurrency: 10,
+                    results: {
+                      successRate: 1.0,
+                      total: 15000.0,
+                      slowest: 4000000.0,
+                      fastest: 200000.0,
+                      average: 2000000.0,
+                      requestsPerSec: 5000.0,
+                      totalData: 150000000,
+                      sizePerRequest: 10000.0,
+                      sizePerSec: 50000000.0,
+                      errorDistribution: {},
+                      p95_latency: 3.8,
+                    },
+                  },
+                  {
+                    server: "puma",
+                    test_case: "chunked",
+                    version:
+                      "Puma version 6.6.0+h2o version 2.3.0-DEV@87e2aa634 (Ruby 3.2.2) with HTTP/2 support enabled",
+                    threads: 1,
+                    workers: 1,
+                    http2: true,
+                    concurrency: 50,
+                    results: {
+                      successRate: 1.0,
+                      total: 22000.0,
+                      slowest: 12000000.0,
+                      fastest: 400000.0,
+                      average: 6000000.0,
+                      requestsPerSec: 7500.0,
+                      totalData: 220000000,
+                      sizePerRequest: 10000.0,
+                      sizePerSec: 75000000.0,
+                      errorDistribution: {},
+                      p95_latency: 11.2,
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            test: "io_party",
+            servers: [
+              {
+                server: "itsi",
+                results: [
+                  {
+                    server: "itsi",
+                    test_case: "io_party",
+                    version:
+                      "ITSI v0.9.1-beta.3 (Experimental) with advanced IO processing and HTTP/2 multiplexing support",
+                    threads: 1,
+                    workers: 1,
+                    http2: true,
+                    concurrency: 10,
+                    rss_mb: 64.11,
+                    results: {
+                      successRate: 1.0,
+                      total: 48591.0,
+                      slowest: 2850375.0,
+                      fastest: 116292.0,
+                      average: 486975.0,
+                      requestsPerSec: 16196.49,
+                      totalData: 0,
+                      sizePerRequest: 0.0,
+                      sizePerSec: 0.0,
+                      errorDistribution: {},
+                      p95_latency: 0.977999,
+                    },
+                    timestamp: "2025-05-15T03:43:50Z",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      {
+        group: "sinatra",
+        tests: [
+          {
+            test: "hello_world",
+            servers: [
+              {
+                server: "falcon",
+                results: [
+                  {
+                    server: "falcon",
+                    test_case: "hello_world",
+                    version:
+                      "Falcon v0.51.1 (Ruby 3.3.0-preview1) with HTTP/2 and WebSocket support, running on Async::HTTP::Protocol::HTTP2 implementation",
+                    threads: 2,
+                    workers: 2,
+                    http2: true,
+                    concurrency: 10,
+                    results: {
+                      successRate: 1.0,
+                      total: 30000.0,
+                      slowest: 10000000.0,
+                      fastest: 400000.0,
+                      average: 5000000.0,
+                      requestsPerSec: 10000.0,
+                      totalData: 0,
+                      sizePerRequest: 0.0,
+                      sizePerSec: 0.0,
+                      errorDistribution: {},
+                      p95_latency: 8.5,
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+]
+
+export default function Home() {
+  const [isLoading, setIsLoading] = useState(true)
+  const [benchmarkData, setBenchmarkData] = useState([])
+  const [error, setError] = useState<string | null>(null)
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        // In a real app, this would fetch from your API endpoint
+        // For demo purposes, we're using the sample hierarchical data
+        setBenchmarkData(sampleHierarchicalData)
+        setIsLoading(false)
+      } catch (err) {
+        console.error("Error fetching benchmark data:", err)
+        setError("Failed to load benchmark data. Please try again.")
+        setIsLoading(false)
+      }
+    }
+
+    fetchData()
+  }, [])
+
+  if (isLoading) {
+    return (
+      <div className="flex h-screen items-center justify-center">
+        <LoadingSpinner />
+        <span className="ml-2">Loading benchmark data...</span>
+      </div>
+    )
+  }
+
+  if (error) {
+    return (
+      <div className="flex h-screen items-center justify-center">
+        <div className="text-center">
+          <h2 className="text-2xl font-bold text-red-600">Error</h2>
+          <p className="mt-2">{error}</p>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <main className="container mx-auto p-2">
+      <BenchmarkDashboard data={benchmarkData} />
+    </main>
+  )
+}