diff --git a/config/config.go b/config/config.go index 98f1212..1e2a9c3 100644 --- a/config/config.go +++ b/config/config.go @@ -585,7 +585,8 @@ func BuildConfig(opt ConfigOptions, input option.Options) (*option.Options, erro URL: opt.ConnectionTestUrl, Interval: option.Duration(opt.URLTestInterval.Duration()), // IdleTimeout: option.Duration(opt.URLTestIdleTimeout.Duration()), - IdleTimeout: option.Duration(opt.URLTestInterval.Duration().Nanoseconds() * 10), + Tolerance: 1, + IdleTimeout: option.Duration(opt.URLTestInterval.Duration().Nanoseconds() * 3), }, } defaultSelect := urlTest.Tag diff --git a/go.mod b/go.mod index 9c4890e..0f755d5 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ toolchain go1.22.3 require ( github.com/bepass-org/warp-plus v0.0.0-00010101000000-000000000000 github.com/golang/protobuf v1.5.4 - github.com/hiddify/ray2sing v0.0.0-20240730213853-fc0aab6bc5e7 github.com/kardianos/service v1.2.2 github.com/sagernet/gomobile v0.1.3 github.com/sagernet/sing v0.4.1 @@ -21,10 +20,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) +require github.com/akavel/rsrc v0.10.2 // indirect + require ( berty.tech/go-libtor v1.0.385 // indirect github.com/ajg/form v1.5.1 // indirect - github.com/akavel/rsrc v0.10.2 // indirect github.com/andybalholm/brotli v1.1.0 // indirect github.com/caddyserver/certmagic v0.20.0 // indirect github.com/cloudflare/circl v1.3.9 // indirect @@ -46,6 +46,7 @@ require ( github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect github.com/gorilla/websocket v1.5.3 // indirect github.com/hashicorp/yamux v0.1.1 // indirect + github.com/hiddify/ray2sing v0.0.0-20240731223404-61bacedf951c github.com/imkira/go-observer/v2 v2.0.0-20230629064422-8e0b61f11f1b // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/insomniacslk/dhcp v0.0.0-20231206064809-8c70d406f6d2 // indirect @@ -119,10 +120,12 @@ require ( lukechampine.com/blake3 v1.3.0 // indirect ) -replace github.com/sagernet/sing-box => github.com/hiddify/hiddify-sing-box v1.8.9-0.20240730122343-cc4e2cf4fb24 +replace github.com/sagernet/sing-box => github.com/hiddify/hiddify-sing-box v1.8.9-0.20240801230117-c40949d16d8e replace github.com/xtls/xray-core => github.com/hiddify/xray-core v0.0.0-20240729110224-c3df022f042a replace github.com/sagernet/wireguard-go => github.com/hiddify/wireguard-go v0.0.0-20240727191222-383c1da14ff1 replace github.com/bepass-org/warp-plus => github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d + +replace github.com/hiddify/ray2sing => github.com/hiddify/ray2sing v0.0.0-20240731223404-61bacedf951c diff --git a/go.sum b/go.sum index 0ac2b6f..0561ab9 100644 --- a/go.sum +++ b/go.sum @@ -102,10 +102,10 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= -github.com/hiddify/hiddify-sing-box v1.8.9-0.20240730122343-cc4e2cf4fb24 h1:Aj6uvJaLWJT1UokMkB3g/juhZ60luFyxQYCdtRQFf78= -github.com/hiddify/hiddify-sing-box v1.8.9-0.20240730122343-cc4e2cf4fb24/go.mod h1:2wBDpGJbCEPXFy8jHkFbD2TAwxxUjKoMLXF2HTzhHfU= -github.com/hiddify/ray2sing v0.0.0-20240730213853-fc0aab6bc5e7 h1:mAycehE3goXtr9urdJiAqR6Y4rkk0VTuAdNZ9u+0mjs= -github.com/hiddify/ray2sing v0.0.0-20240730213853-fc0aab6bc5e7/go.mod h1:Qp3mFdKsJZ5TwBYLREgWp8n2O6dgmNt3aAoX+xpvnsM= +github.com/hiddify/hiddify-sing-box v1.8.9-0.20240801230117-c40949d16d8e h1:BtqYoMeZ9JFgHS2l0xk/Lx4iAanw0qYP2bm6GP4kvgE= +github.com/hiddify/hiddify-sing-box v1.8.9-0.20240801230117-c40949d16d8e/go.mod h1:2wBDpGJbCEPXFy8jHkFbD2TAwxxUjKoMLXF2HTzhHfU= +github.com/hiddify/ray2sing v0.0.0-20240731223404-61bacedf951c h1:n6j8QDdqf6tV5zWIPe4Xb011bMS7uvyKeIJ0Fi+jOd8= +github.com/hiddify/ray2sing v0.0.0-20240731223404-61bacedf951c/go.mod h1:Qp3mFdKsJZ5TwBYLREgWp8n2O6dgmNt3aAoX+xpvnsM= github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d h1:vRGKh9ou+/vQGfVYa8MczhbIVjHxlP52OWwrDWO77RA= github.com/hiddify/warp-plus v0.0.0-20240717223357-4f3122e0d11d/go.mod h1:uSRUbr1CcvFrEV69FTvuJFwpzEmwO8N4knb6+Zq3Ys4= github.com/hiddify/wireguard-go v0.0.0-20240727191222-383c1da14ff1 h1:xdbHlZtzs+jijAxy85qal835GglwmjohA/srHT8gm9s=