Clean dir && add traffic stat

Author: coyove

client.go

@@ -82,7 +82,7 @@ func NewClient(localaddr string, config *ClientConfig) error {
 				return
 			}
 
-			Bridge(downconn, upconn, nil)
+			Bridge(upconn, downconn, nil, config.Stat)
 		}(conn)
 	}
 }

cmd/goflyway/main.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/coyove/common/sched"
 	"github.com/coyove/goflyway"
@@ -128,6 +129,27 @@ func main() {
 	if localAddr != "" && remoteAddr != "" {
 		cconfig.Bind = remoteAddr
 		cconfig.Upstream = addr
+		cconfig.Stat = &goflyway.Traffic{}
+
+		go func() {
+			p := func(v int64) string {
+				if v > 1024*1024*1024*10 {
+					return fmt.Sprintf("%.3fG", float64(v)/1024/1024/1024)
+				}
+				return fmt.Sprintf("%.3fM", float64(v)/1024/1024)
+			}
+
+			var lastSent, lastRecv int64
+
+			for range time.Tick(time.Second * 5) {
+				s, r := *cconfig.Stat.Sent(), *cconfig.Stat.Recv()
+				ss := strconv.FormatFloat(float64(s-lastSent)/1024/1024/5, 'f', 3, 64)
+				rs := strconv.FormatFloat(float64(r-lastRecv)/1024/1024/5, 'f', 3, 64)
+				lastSent, lastRecv = s, r
+
+				v.Vprint("client send: ", p(s), " (", ss, "M/s), recv: ", p(r), " (", rs, "M/s)")
+			}
+		}()
 
 		fmt.Println("goflyway client binds", remoteAddr, "at", addr, "to", localAddr, with)
 

pkg/fd/fd.go fd/fd.go

@@ -3,20 +3,21 @@ package goflyway
 import (
 	"io"
 	"net"
+	"sync/atomic"
 
 	. "github.com/coyove/goflyway/v"
 )
 
-func Bridge(target, source net.Conn, timeout *TokenBucket) {
+func Bridge(target, source net.Conn, timeout *TokenBucket, stat *Traffic) {
 	go func() {
-		if _, err := ioCopy(target, source, timeout); err != nil {
+		if err := ioCopy(target, source, timeout, stat.Sent()); err != nil {
 			Vprint("Bridge: ", err)
 		}
 		target.Close()
 		source.Close()
 	}()
 
-	if _, err := ioCopy(source, target, timeout); err != nil {
+	if err := ioCopy(source, target, timeout, stat.Recv()); err != nil {
 		Vprint("Bridge: ", err)
 	}
 
@@ -25,7 +26,7 @@ func Bridge(target, source net.Conn, timeout *TokenBucket) {
 	source.Close()
 }
 
-func ioCopy(dst io.WriteCloser, src io.ReadCloser, bk *TokenBucket) (written int64, err error) {
+func ioCopy(dst io.WriteCloser, src io.ReadCloser, bk *TokenBucket, bytes *int64) (err error) {
 	buf := make([]byte, 32*1024)
 
 	for {
@@ -37,8 +38,9 @@ func ioCopy(dst io.WriteCloser, src io.ReadCloser, bk *TokenBucket) (written int
 			}
 
 			nw, ew := dst.Write(buf[0:nr])
-			if nw > 0 {
-				written += int64(nw)
+
+			if nw > 0 && bytes != nil {
+				atomic.AddInt64(bytes, int64(nw))
 			}
 
 			if ew != nil {
@@ -52,8 +54,6 @@ func ioCopy(dst io.WriteCloser, src io.ReadCloser, bk *TokenBucket) (written int
 				err = io.ErrShortWrite
 				break
 			}
-
-			// retries = 0
 		}
 
 		if er != nil {
@@ -64,5 +64,5 @@ func ioCopy(dst io.WriteCloser, src io.ReadCloser, bk *TokenBucket) (written int
 		}
 	}
 
-	return written, err
+	return err
 }