Merge pull request #223 from MDA2AV/reso442

update results - upload

Author: MDA2AV

frameworks/actix/Cargo.toml

@@ -14,6 +14,7 @@ num_cpus = "1"
 rusqlite = { version = "0.31", features = ["bundled"] }
 tokio-postgres = { version = "0.7", features = ["with-serde_json-1"] }
 deadpool-postgres = { version = "0.14", features = ["rt_tokio_1"] }
+futures-util = "0.3"
 
 [profile.release]
 opt-level = 3

frameworks/actix/src/main.rs

@@ -1,5 +1,6 @@
 use actix_web::http::header::{ContentType, HeaderValue, SERVER};
 use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
+use futures_util::StreamExt;
 use deadpool_postgres::{Manager, ManagerConfig, Pool, RecyclingMethod};
 use rusqlite::Connection;
 use rustls::ServerConfig;
@@ -161,11 +162,17 @@ async fn baseline11_get(req: HttpRequest) -> HttpResponse {
         .body(sum.to_string())
 }
 
-async fn upload(body: web::Bytes) -> HttpResponse {
+async fn upload(mut payload: web::Payload) -> HttpResponse {
+    let mut size: usize = 0;
+    while let Some(chunk) = payload.next().await {
+        if let Ok(data) = chunk {
+            size += data.len();
+        }
+    }
     HttpResponse::Ok()
         .insert_header((SERVER, SERVER_HDR.clone()))
         .content_type(ContentType::plaintext())
-        .body(body.len().to_string())
+        .body(size.to_string())
 }
 
 async fn baseline11_post(req: HttpRequest, body: web::Bytes) -> HttpResponse {

frameworks/aspnet-minimal/Handlers.cs

@@ -15,9 +15,14 @@ public static async ValueTask<int> SumBody(int a, int b, HttpRequest req)
 
     public static async Task<IResult> Upload(HttpRequest req)
     {
-        using var ms = new MemoryStream();
-        await req.Body.CopyToAsync(ms);
-        return Results.Text(ms.Length.ToString());
+        long size = 0;
+        var buffer = new byte[65536];
+        int read;
+        while ((read = await req.Body.ReadAsync(buffer)) > 0)
+        {
+            size += read;
+        }
+        return Results.Text(size.ToString());
     }
 
     public static IResult Json()

frameworks/bun/server.ts

@@ -194,11 +194,13 @@ async function handleRequest(req: Request): Promise<Response> {
   }
 
   if (path === "/upload" && req.method === "POST") {
-    return req.arrayBuffer().then((ab) => {
-      return new Response(String(ab.byteLength), {
-        headers: { "content-type": "text/plain" },
-      });
-    });
+    let size = 0;
+    if (req.body) {
+      for await (const chunk of req.body) {
+        size += chunk.byteLength;
+      }
+    }
+    return new Response(String(size), { headers: { "content-type": "text/plain" } });
   }
 
   // /baseline11 — GET or POST

frameworks/caddy/handler.go

@@ -234,10 +234,10 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
 
 	case "/upload":
 		if r.Method == "POST" && r.Body != nil {
-			body, _ := io.ReadAll(r.Body)
+			n, _ := io.Copy(io.Discard, r.Body)
 			w.Header().Set("Content-Type", "text/plain")
 			w.Header().Set("Server", "caddy")
-			fmt.Fprintf(w, "%d", len(body))
+			fmt.Fprintf(w, "%d", n)
 		} else {
 			http.Error(w, "POST required", 405)
 		}

frameworks/chi/main.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
-	"fmt"
 	"io"
 	"math"
 	"mime"
@@ -239,9 +238,9 @@ func main() {
 	})
 
 	r.Post("/upload", func(w http.ResponseWriter, r *http.Request) {
-		body, _ := io.ReadAll(r.Body)
+		size, _ := io.Copy(io.Discard, r.Body)
 		w.Header().Set("Server", "chi")
-		w.Write([]byte(fmt.Sprintf("%d", len(body))))
+		w.Write([]byte(strconv.FormatInt(size, 10)))
 	})
 
 	r.Get("/db", func(w http.ResponseWriter, r *http.Request) {

frameworks/deno/main.ts

@@ -158,8 +158,13 @@ export default {
         }
 
         if (path === "/upload" && req.method === "POST") {
-            const buf = new Uint8Array(await req.arrayBuffer());
-            return new Response(String(buf.byteLength), { headers: PLAIN });
+            let size = 0;
+            if (req.body) {
+                for await (const chunk of req.body) {
+                    size += chunk.byteLength;
+                }
+            }
+            return new Response(String(size), { headers: PLAIN });
         }
 
         // /baseline11

frameworks/echo/main.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
-	"fmt"
 	"io"
 	"math"
 	"mime"
@@ -241,9 +240,9 @@ func main() {
 	})
 
 	e.POST("/upload", func(c echo.Context) error {
-		body, _ := io.ReadAll(c.Request().Body)
+		size, _ := io.Copy(io.Discard, c.Request().Body)
 		c.Response().Header().Set("Server", "echo")
-		return c.String(http.StatusOK, fmt.Sprintf("%d", len(body)))
+		return c.String(http.StatusOK, strconv.FormatInt(size, 10))
 	})
 
 	e.GET("/db", func(c echo.Context) error {

frameworks/elysia/server.ts

@@ -187,8 +187,13 @@ function addRoutes(app: Elysia) {
     })
 
     .post("/upload", async ({ request }) => {
-      const ab = await request.arrayBuffer();
-      return new Response(String(ab.byteLength), {
+      let size = 0;
+      if (request.body) {
+        for await (const chunk of request.body) {
+          size += chunk.byteLength;
+        }
+      }
+      return new Response(String(size), {
         headers: { "content-type": "text/plain" },
       });
     })

frameworks/express/server.js

@@ -88,7 +88,16 @@ function startWorker() {
     const express = require('express');
     const app = express();
 
-    // Raw body parsing
+    // --- /upload --- (defined before body-parsing middleware so the stream is not buffered)
+    app.post('/upload', (req, res) => {
+        let size = 0;
+        req.on('data', chunk => { size += chunk.length; });
+        req.on('end', () => {
+            res.set('server', SERVER_NAME).set('Content-Type', 'text/plain').send(String(size));
+        });
+    });
+
+    // Raw body parsing (applied to all routes except /upload which is already defined above)
     app.use(express.raw({ type: 'application/octet-stream', limit: '50mb' }));
     app.use(express.text({ type: 'text/plain', limit: '50mb' }));
     app.use(express.raw({ type: '*/*', limit: '50mb' }));
@@ -204,12 +213,6 @@ function startWorker() {
         }
     });
 
-    // --- /upload ---
-    app.post('/upload', (req, res) => {
-        const body = Buffer.isBuffer(req.body) ? req.body : Buffer.from(req.body || '');
-        res.set('server', SERVER_NAME).type('text/plain').send(String(body.length));
-    });
-
     // Start HTTP/1.1 server
     const server = http.createServer(app);
     server.listen(8080, '0.0.0.0', () => {