Spaces:

euler314
/

speed_test

Sleeping

App Files Files Community

euler314 commited on 10 days ago

Commit

89408c1

verified ·

1 Parent(s): fb4f63a

Update app.py

Browse files

Files changed (1) hide show

app.py +71 -30

app.py CHANGED Viewed

@@ -1,20 +1,29 @@
 # app.py
 from flask import Flask, Response, request, jsonify
 import os
 app = Flask(__name__)
 # ——————————————————————————————
-# Pre-generate a 10 MiB random blob for download tests
 # ——————————————————————————————
-DOWNLOAD_SIZE_BYTES = 10 * 1024 * 1024
-_blob = os.urandom(DOWNLOAD_SIZE_BYTES)
 # ——————————————————————————————
-# Route: Root – serve the HTML + JS speed‐test page
 # ——————————————————————————————
 @app.route("/")
 def index():
@@ -23,7 +32,7 @@ def index():
     <html lang="en">
     <head>
       <meta charset="UTF-8" />
-      <title>Client-Side Speed Test</title>
       <style>
         body { font-family: sans-serif; max-width: 600px; margin: 2em auto; }
         button { padding: 0.5em 1em; font-size: 1rem; }
@@ -32,8 +41,8 @@ def index():
       </style>
     </head>
     <body>
-      <h2>Wi-Fi / Ethernet Speed Test</h2>
-      <p>This runs entirely in your browser—download a 10 MiB file and upload random data to measure your real Internet link.</p>
       <button id="startBtn">Start Speed Test</button>
       <div class="result" id="results" style="display: none;">
@@ -61,7 +70,7 @@ def index():
           ulSpan.textContent = "Testing…";
           pingSpan.textContent = "Testing…";
-          // 1) Ping: 5 small GETs to /ping_test
           let pingTimes = [];
           for (let i = 0; i < 5; i++) {
             const t0 = performance.now();
@@ -72,31 +81,55 @@ def index():
           const avgPing = pingTimes.reduce((a, b) => a + b, 0) / pingTimes.length;
           pingSpan.textContent = avgPing.toFixed(2) + " ms";
-          // 2) Download test: fetch 10 MiB blob
           const dlStart = performance.now();
           const response = await fetch("/download_test", { cache: "no-store" });
-          const blob = await response.blob();
           const dlEnd = performance.now();
-          const dlBytes = blob.size;
           const dlBits = dlBytes * 8;
           const dlDurationSec = (dlEnd - dlStart) / 1000;
           const dlSpeedBps = dlBits / dlDurationSec;
           dlSpan.textContent = toMbps(dlSpeedBps);
-          // 3) Upload test: send 10 MiB random data
-          const uploadSizeBytes = dlBytes;
-          const randomBuffer = new Uint8Array(uploadSizeBytes);
-          window.crypto.getRandomValues(randomBuffer);
           const ulStart = performance.now();
           await fetch("/upload_test", {
             method: "POST",
             headers: { "Content-Type": "application/octet-stream" },
-            body: randomBuffer
           });
           const ulEnd = performance.now();
           const ulDurationSec = (ulEnd - ulStart) / 1000;
-          const ulBits = uploadSizeBytes * 8;
           const ulSpeedBps = ulBits / ulDurationSec;
           ulSpan.textContent = toMbps(ulSpeedBps);
@@ -110,7 +143,7 @@ def index():
 # ——————————————————————————————
-# Route: /ping_test – empty 200 response (used for ping measurement)
 # ——————————————————————————————
 @app.route("/ping_test")
 def ping_test():
@@ -118,32 +151,40 @@ def ping_test():
 # ——————————————————————————————
-# Route: /download_test – serve the 10 MiB random blob
 # ——————————————————————————————
 @app.route("/download_test")
 def download_test():
     return Response(
-        _blob,
         mimetype="application/octet-stream",
-        headers={
-            "Content-Disposition": f"attachment; filename=\"test_{DOWNLOAD_SIZE_BYTES}.bin\""
-        }
     )
 # ——————————————————————————————
-# Route: /upload_test – accept upload, return JSON with received size
 # ——————————————————————————————
 @app.route("/upload_test", methods=["POST"])
 def upload_test():
-    data = request.get_data()  # read all bytes
-    size = len(data)
-    return jsonify({"received_bytes": size})
 # ——————————————————————————————
-# Run the Flask app
 # ——————————————————————————————
 if __name__ == "__main__":
-    # Bind to 0.0.0.0 so HF’s runtime can route traffic correctly
     app.run(host="0.0.0.0", port=7860, debug=False)

 # app.py
 from flask import Flask, Response, request, jsonify
 import os
 app = Flask(__name__)
 # ——————————————————————————————
+# Configuration: Test size = 1 GiB
+# ——————————————————————————————
+DOWNLOAD_SIZE_BYTES = 1 * 1024 * 1024 * 1024  # 1 GiB
+# ——————————————————————————————
+# Generator for streaming 1 GiB of random bytes in 10 MiB chunks
 # ——————————————————————————————
+def generate_random_blob():
+    sent = 0
+    chunk_size = 10 * 1024 * 1024  # 10 MiB per chunk
+    while sent < DOWNLOAD_SIZE_BYTES:
+        to_send = min(chunk_size, DOWNLOAD_SIZE_BYTES - sent)
+        yield os.urandom(to_send)
+        sent += to_send
 # ——————————————————————————————
+# Route: “/” – serve the HTML + JS client
 # ——————————————————————————————
 @app.route("/")
 def index():
     <html lang="en">
     <head>
       <meta charset="UTF-8" />
+      <title>Client-Side Speed Test (1 GiB)</title>
       <style>
         body { font-family: sans-serif; max-width: 600px; margin: 2em auto; }
         button { padding: 0.5em 1em; font-size: 1rem; }
       </style>
     </head>
     <body>
+      <h2>Wi-Fi / Ethernet Speed Test (Up to 1 GiB)</h2>
+      <p>This test will measure your real Internet speed by downloading <strong>1 GiB</strong> of random data and uploading <strong>1 GiB</strong> back to the server. All timing runs entirely in your browser.</p>
       <button id="startBtn">Start Speed Test</button>
       <div class="result" id="results" style="display: none;">
           ulSpan.textContent = "Testing…";
           pingSpan.textContent = "Testing…";
+          // 1) Measure ping: 5 tiny GETs to /ping_test
           let pingTimes = [];
           for (let i = 0; i < 5; i++) {
             const t0 = performance.now();
           const avgPing = pingTimes.reduce((a, b) => a + b, 0) / pingTimes.length;
           pingSpan.textContent = avgPing.toFixed(2) + " ms";
+          // 2) Download test: stream 1 GiB from /download_test
           const dlStart = performance.now();
           const response = await fetch("/download_test", { cache: "no-store" });
+          const reader = response.body.getReader();
+          let dlBytes = 0;
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            dlBytes += value.length;
+          }
           const dlEnd = performance.now();
           const dlBits = dlBytes * 8;
           const dlDurationSec = (dlEnd - dlStart) / 1000;
           const dlSpeedBps = dlBits / dlDurationSec;
           dlSpan.textContent = toMbps(dlSpeedBps);
+          // 3) Upload test: stream 1 GiB of random data to /upload_test
+          const uploadTotalBytes = dlBytes; // should be 1 GiB
+          const chunkSize = 10 * 1024 * 1024; // 10 MiB
+          let sentBytes = 0;
+          const uploadStream = new ReadableStream({
+            start(controller) {
+              function pushChunk() {
+                if (sentBytes >= uploadTotalBytes) {
+                  controller.close();
+                  return;
+                }
+                const size = Math.min(chunkSize, uploadTotalBytes - sentBytes);
+                const chunk = new Uint8Array(size);
+                window.crypto.getRandomValues(chunk);
+                controller.enqueue(chunk);
+                sentBytes += size;
+                // immediately queue next
+                pushChunk();
+              }
+              pushChunk();
+            }
+          });
           const ulStart = performance.now();
           await fetch("/upload_test", {
             method: "POST",
             headers: { "Content-Type": "application/octet-stream" },
+            body: uploadStream
           });
           const ulEnd = performance.now();
           const ulDurationSec = (ulEnd - ulStart) / 1000;
+          const ulBits = uploadTotalBytes * 8;
           const ulSpeedBps = ulBits / ulDurationSec;
           ulSpan.textContent = toMbps(ulSpeedBps);
 # ——————————————————————————————
+# Route: /ping_test – empty 200 response for ping
 # ——————————————————————————————
 @app.route("/ping_test")
 def ping_test():
 # ——————————————————————————————
+# Route: /download_test – stream 1 GiB of random data
 # ——————————————————————————————
 @app.route("/download_test")
 def download_test():
+    headers = {
+        "Content-Disposition": f"attachment; filename=\"test_{DOWNLOAD_SIZE_BYTES}.bin\"",
+        "Content-Length": str(DOWNLOAD_SIZE_BYTES),
+        "Cache-Control": "no-store"
+    }
     return Response(
+        generate_random_blob(),
         mimetype="application/octet-stream",
+        headers=headers
     )
 # ——————————————————————————————
+# Route: /upload_test – consume uploaded data in chunks and return JSON
 # ——————————————————————————————
 @app.route("/upload_test", methods=["POST"])
 def upload_test():
+    total = 0
+    # Read the incoming stream in 1 MiB chunks and discard
+    while True:
+        chunk = request.stream.read(1 * 1024 * 1024)
+        if not chunk:
+            break
+        total += len(chunk)
+    # total should be near 1 GiB if upload completed
+    return jsonify({"received_bytes": total})
 # ——————————————————————————————
+# Run the Flask app on port 7860
 # ——————————————————————————————
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860, debug=False)