From 60175f63aac8ba722806bef677990ba53d4d8cfc Mon Sep 17 00:00:00 2001 From: Nikolay Petrov Date: Thu, 12 Feb 2026 19:28:54 -0500 Subject: [PATCH] upgrade dependencies - 2026-02-12 --- README.md | 11 +++++++++-- client.go | 7 +------ flake.lock | 6 +++--- go.mod | 14 +++++++------- go.sum | 24 ++++++++++++------------ nix/package.nix | 2 +- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 5dd53c3..fb503b3 100644 --- a/README.md +++ b/README.md @@ -580,7 +580,6 @@ by adding account management and it is one of the easiest way to start. ## Planlog ### Next - - [ ] rewrite relay to not depend on control connection - [ ] peer identity and support for options in p2p - [ ] raw endpoint protocols - [ ] UPnP/IDG and PCP for hole-punching @@ -599,8 +598,16 @@ by adding account management and it is one of the easiest way to start. ## Changelog +### v0.15.0 + - [ ] do not discard client/peer/endpoint info immediately + +### v0.14.0 + - [x] rewrite relay to not depend on control connection + - [x] complete migration to relay v2 + - [ ] client reconnecting before old connection being removed + ### v0.13.0 - - [x] stateless/direct relay v1 + - [x] stateless/direct relay v2 ### v0.12.0 - [x] reorganize packages diff --git a/client.go b/client.go index 09fa148..0f1ca99 100644 --- a/client.go +++ b/client.go @@ -391,12 +391,7 @@ func (c *Client) runSession(ctx context.Context, sess *session) error { c.connStatus.Store(statusc.Connected) defer c.connStatus.Store(statusc.Reconnecting) - select { - case <-ctx.Done(): - return context.Cause(ctx) - case <-sess.conn.Context().Done(): - return context.Cause(sess.conn.Context()) - } + return quicc.WaitLogRTTStats(ctx, sess.conn, c.logger) } func (c *Client) listenNatlocal(ctx context.Context) error { diff --git a/flake.lock b/flake.lock index 0b270f5..f05b020 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769740369, - "narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6308c3b21396534d8aaeac46179c14c439a89b8a", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { diff --git a/go.mod b/go.mod index 4eb668b..f9b39cb 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,17 @@ module github.com/connet-dev/connet -go 1.24.4 +go 1.25.0 require ( github.com/gorilla/websocket v1.5.3 github.com/jackpal/gateway v1.1.1 - github.com/klev-dev/klevdb v0.10.1 + github.com/klev-dev/klevdb v0.11.0 github.com/pelletier/go-toml/v2 v2.2.4 - github.com/pires/go-proxyproto v0.9.2 + github.com/pires/go-proxyproto v0.11.0 github.com/quic-go/quic-go v0.59.0 github.com/spf13/cobra v1.10.2 github.com/stretchr/testify v1.11.1 - golang.org/x/crypto v0.47.0 + golang.org/x/crypto v0.48.0 golang.org/x/sync v0.19.0 google.golang.org/protobuf v1.36.11 ) @@ -25,8 +25,8 @@ require ( github.com/spf13/pflag v1.0.10 // indirect github.com/stretchr/objx v0.5.3 // indirect go.uber.org/mock v0.6.0 // indirect - golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect - golang.org/x/net v0.49.0 // indirect - golang.org/x/sys v0.40.0 // indirect + golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a // indirect + golang.org/x/net v0.50.0 // indirect + golang.org/x/sys v0.41.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 001c357..56119c1 100644 --- a/go.sum +++ b/go.sum @@ -11,16 +11,16 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jackpal/gateway v1.1.1 h1:UXXXkJGIHFsStms9ZBgGpoaFEJP7oJtFn5vplIT68E8= github.com/jackpal/gateway v1.1.1/go.mod h1:Tl1vZVtUaXx5j6P5HFmv45alhEi4yHHLfT4PRbB7eyw= -github.com/klev-dev/klevdb v0.10.1 h1:52o6fHQwu/XA1b/p3IKvTCTuJ9+3FX2v/b8iyE5FCps= -github.com/klev-dev/klevdb v0.10.1/go.mod h1:r3Y2pB4BNqD4ZOCBH2qe0JqCctvN7HcNCagn36qugAM= +github.com/klev-dev/klevdb v0.11.0 h1:tbLQPxtQjXkw6bBoHp9LWsET7NKu1sjTX90jfa2fAuQ= +github.com/klev-dev/klevdb v0.11.0/go.mod h1:uLGgJaocN1dnqS4RrHOaKIzTrOl1kGux+AVvPPA/DpA= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= -github.com/pires/go-proxyproto v0.9.2 h1:H1UdHn695zUVVmB0lQ354lOWHOy6TZSpzBl3tgN0s1U= -github.com/pires/go-proxyproto v0.9.2/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU= +github.com/pires/go-proxyproto v0.11.0 h1:gUQpS85X/VJMdUsYyEgyn59uLJvGqPhJV5YvG68wXH4= +github.com/pires/go-proxyproto v0.11.0/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU= github.com/plar/go-adaptive-radix-tree/v2 v2.0.4 h1:Viv/uI+PUSY+nXF6uNUYeVjw/6grZG+ngVGGFixjX+U= github.com/plar/go-adaptive-radix-tree/v2 v2.0.4/go.mod h1:8yf9K81YK94H4gKh/K3hCBeC2s4JA/PYgqMkkOadwvk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -42,16 +42,16 @@ github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= -golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= -golang.org/x/exp v0.0.0-20260112195511-716be5621a96 h1:Z/6YuSHTLOHfNFdb8zVZomZr7cqNgTJvA8+Qz75D8gU= -golang.org/x/exp v0.0.0-20260112195511-716be5621a96/go.mod h1:nzimsREAkjBCIEFtHiYkrJyT+2uy9YZJB7H1k68CXZU= -golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= -golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= +golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= +golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= +golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a h1:ovFr6Z0MNmU7nH8VaX5xqw+05ST2uO1exVfZPVqRC5o= +golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA= +golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60= +golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/nix/package.nix b/nix/package.nix index d41d51c..3384faf 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -25,7 +25,7 @@ pkgs.buildGoModule fileset = sourceFiles; }; - vendorHash = "sha256-RVlmeOYAEfwzsjPS3ki1SuXQ8OLGq0R+dGCEPzfQNEs="; + vendorHash = "sha256-Wep//tk4jhura1D6mtLBLw9/OBOsqFySWrGwHXMULrc="; subPackages = [ "cmd/connet" ]; ldflags = [ "-X 'github.com/connet-dev/connet/model.Version=${lib.strings.fileContents ../VERSION}'" ];