Merge pull request #1495 from apernet/dev/bbr-fix

fix: logic issues with BBR impl

Author: tobyxdd

.github/workflows/master.yml

@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+    outputs:
+      files: ${{ steps.list-files.outputs.files }}
 
     steps:
       - name: Check out
@@ -45,8 +47,35 @@ jobs:
             sha256sum $file >> build/hashes.txt
           done
 
-      - name: Archive
+      - name: List build files
+        id: list-files
+        run: |
+          files=$(ls -1 build/ | jq -R -s -c 'split("\n") | map(select(length > 0))')
+          echo "files=$files" >> $GITHUB_OUTPUT
+
+      - name: Upload build directory
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-temp-${{ github.sha }}
+          path: build/
+          retention-days: 1
+
+  upload:
+    name: Upload ${{ matrix.file }}
+    needs: build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        file: ${{ fromJson(needs.build.outputs.files) }}
+    steps:
+      - name: Download build
+        uses: actions/download-artifact@v4
+        with:
+          name: build-temp-${{ github.sha }}
+
+      - name: Upload ${{ matrix.file }}
         uses: actions/upload-artifact@v4
         with:
-          name: hysteria-master-${{ github.sha }}
-          path: build
+          name: ${{ matrix.file }}
+          path: ${{ matrix.file }}

core/internal/congestion/bbr/bandwidth_sampler.go

@@ -199,7 +199,7 @@ func (m *maxAckHeightTracker) Update(
 	// Compute how many extra bytes were delivered vs max bandwidth.
 	extraBytesAcked := m.aggregationEpochBytes - expectedBytesAcked
 	newEvent := extraAckedEvent{
-		extraAcked: expectedBytesAcked,
+		extraAcked: extraBytesAcked,
 		bytesAcked: m.aggregationEpochBytes,
 		timeDelta:  aggregationDelta,
 	}

core/internal/congestion/bbr/bbr_sender.go

@@ -23,7 +23,7 @@ import (
 //
 
 const (
-	minBps = 65536 // 64 kbps
+	minBps = 65536 // 64 KB/s
 
 	invalidPacketNumber            = -1
 	initialCongestionWindowPackets = 32
@@ -553,7 +553,7 @@ func (b *bbrSender) bandwidthEstimate() Bandwidth {
 }
 
 func (b *bbrSender) bandwidthForPacer() congestion.ByteCount {
-	bps := congestion.ByteCount(float64(b.bandwidthEstimate()) * b.congestionWindowGain / float64(BytesPerSecond))
+	bps := congestion.ByteCount(float64(b.PacingRate()) / float64(BytesPerSecond))
 	if bps < minBps {
 		// We need to make sure that the bandwidth value for pacer is never zero,
 		// otherwise it will go into an edge case where HasPacingBudget = false