enhancement(hy2): support human-readable bandwidth configuration

component/outbound/dialer_group_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/daeuniverse/dae/component/outbound/dialer"
 	"github.com/daeuniverse/dae/pkg/logger"
 	"github.com/daeuniverse/outbound/pkg/fastrand"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -26,7 +27,11 @@ var TestNetworkType = &dialer.NetworkType{
 	IsDns:     false,
 }
 
-var log = logger.NewLogger("trace", false, nil)
+var log = logrus.New()
+
+func init() {
+	logger.SetLogger(log, "trace", false, nil)
+}
 
 func newDirectDialer(option *dialer.GlobalOption, fullcone bool) *dialer.Dialer {
 	_d, p := dialer.NewDirectDialer(option, true)

config/config.go

@@ -43,9 +43,8 @@ type Global struct {
 	UtlsImitate            string        `mapstructure:"utls_imitate" default:"chrome_auto"`
 	PprofPort              uint16        `mapstructure:"pprof_port" default:"0"`
 	Mptcp                  bool          `mapstructure:"mptcp" default:"false"`
-	// TODO: support input in human-readable format (e.g., 100Mbps, 1Gbps)
-	BandwidthMaxTx uint64 `mapstructure:"bandwidth_max_tx" default:"0"`
-	BandwidthMaxRx uint64 `mapstructure:"bandwidth_max_rx" default:"0"`
+	BandwidthMaxTx         string        `mapstructure:"bandwidth_max_tx" default:"0"`
+	BandwidthMaxRx         string        `mapstructure:"bandwidth_max_rx" default:"0"`
 }
 
 type Utls struct {

example.dae

@@ -102,10 +102,10 @@ global {
     # effects when the node supports MPTCP. It can use for load balance and failover to multiple interfaces and IPs.
     mptcp: false
 
-    # The maximum bandwidth for accessing the Internet. It is useful for some specific protocols (e.g., Hysteria2), 
-    # which will perform better with bandwith information provided. The unit is **byte** per second.
-    bandwidth_max_tx: 26214400 # 200Mbps == 25MB/s == 26214400 B/s uplink
-    bandwidth_max_rx: 131072000 # 1Gbps == 125MB/s == 131072000 B/s downlink
+    # which will perform better with bandwith information provided. The unit can be b, kb, mb, gb, tb or bytes per second.
+    # supported formats: https://v2.hysteria.network/docs/advanced/Full-Client-Config/#bandwidth
+    bandwidth_max_tx: '200 mbps' # uplink, or '200 m' or '200 mb' or '200 mbps' or 25000000(which is 200/8*1000*1000)
+    bandwidth_max_rx: '1 gbps' # downlink, or '1 g' or '1 gb' or '1 gbps' or 125000000(which is 1000/8*1000*1000)
 }
 
 # Subscriptions defined here will be resolved as nodes and merged as a part of the global node pool.

go.mod

@@ -102,3 +102,5 @@ require (
 
 //replace github.com/cilium/ebpf => /home/mzz/goProjects/ebpf
 //replace github.com/daeuniverse/dae-config-dist/go/dae_config => /home/mzz/antlrProjects/dae-config/build/go/dae_config
+
+replace github.com/daeuniverse/outbound => github.com/douglarek/dae-outbound v0.0.0-20240929095753-588a396635e4

go.sum

@@ -23,8 +23,6 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/daeuniverse/dae-config-dist/go/dae_config v0.0.0-20230604120805-1c27619b592d h1:hnC39MjR7xt5kZjrKlef7DXKFDkiX8MIcDXYC/6Jf9Q=
 github.com/daeuniverse/dae-config-dist/go/dae_config v0.0.0-20230604120805-1c27619b592d/go.mod h1:VGWGgv7pCP5WGyHGUyb9+nq/gW0yBm+i/GfCNATOJ1M=
-github.com/daeuniverse/outbound v0.0.0-20240928042419-b1e258193113 h1:m2GVle7Mdllco1bUshzvFz4RXI+2Nif1mTGaJsE91+w=
-github.com/daeuniverse/outbound v0.0.0-20240928042419-b1e258193113/go.mod h1:aR0y8VzpD7RJ5ZGD5ooe0MC6wfTzkIEYaGyxztJqG94=
 github.com/daeuniverse/quic-go v0.0.0-20240413031024-943f218e0810 h1:YtEYouFaNrg9sV9vf3UabvKShKn6sD0QaCdOxCwaF3g=
 github.com/daeuniverse/quic-go v0.0.0-20240413031024-943f218e0810/go.mod h1:61o2uZUGLrlv1i+oO2rx9sVX0vbf8cHzdSHt7h6lMnM=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -41,6 +39,8 @@ github.com/dgryski/go-rc2 v0.0.0-20150621095337-8a9021637152 h1:ED31mPIxDJnrLt9W
 github.com/dgryski/go-rc2 v0.0.0-20150621095337-8a9021637152/go.mod h1:I9fhc/EvSg88cDxmfQ47v35Ssz9rlFunL/KY0A1JAYI=
 github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
 github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/douglarek/dae-outbound v0.0.0-20240929094253-c88a676aefbe h1:0XhYaUqhgboYBgkCxlXXwzU7fNflpj19Lxf/2JO3gvM=
+github.com/douglarek/dae-outbound v0.0.0-20240929094253-c88a676aefbe/go.mod h1:aR0y8VzpD7RJ5ZGD5ooe0MC6wfTzkIEYaGyxztJqG94=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
 github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=