Dependency updates and small adjustments to account for deprecations

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   go-version-latest:
     docker:
-    - image: cimg/go:1.23-node
+    - image: cimg/go:1.24-node
     resource_class: large
     steps:
     - checkout

.github/workflows/golangci-lint.yml

@@ -5,6 +5,8 @@ on:
     - master
     - dev
   pull_request:
+  workflow_dispatch:
+
 permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
@@ -17,14 +19,14 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.23'
+        go-version: '1.24.1'
         cache: false
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v4
       with:
         # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-        version: v1.61
-
+        version: 'latest'
+        args: --out-format=colored-line-number  # Update the output format
         # Optional: golangci-lint command line arguments.
         # args: --issues-exit-code=0
 

.github/workflows/goreleaser.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
+          go-version: '1.24.1'
 
       - name: Make All
         run: |
@@ -24,7 +24,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v5
         with:
-          version: latest
+          version: '~> v2'
           args: release --clean --release-notes=./Release.md
         env:
           GITHUB_TOKEN: ${{ secrets.GPR_TOKEN }}

Release.md

@@ -1,7 +1,58 @@
 ### Features
 
-* Support metadatas and annotations in frpc proxy commands.
+- Go version update to 1.24.1
+- Security updates
 
 ### Fixes
 
-* Properly release resources in service.Close() to prevent resource leaks when used as a library.
+- GoReleaser workflow update to specify version range instead of latest
+- GoLangCI workflow update to output format
+- cmd/frps/root.go & cmd/frpc/root.go updates use .toml instead of .ini
+- Removal of SetStreamMode(true) from pkg/util/net/kcp.go as it is default behavior and the function is being deprecated
+
+### Dependency Updates
+
+- `vite` from 5.0.12 to 5.4.12
+- `braces` from 3.0.2 to 3.0.3
+- `esbuild` from 0.19.12 to 0.21.5
+- `nanoid` from 3.3.7 to 3.3.8
+- `rollup` from 4.9.6 to 4.34.9
+- github.com/cespare/xxhash/v2 from 2.2.0 to 2.3.0
+- github.com/coreos/go-oidc/v3 from 3.10.0 to 3.12.0
+- github.com/cpuguy83/go-md2man/v2 from 2.0.3 to 2.0.6
+- github.com/davecgh/go-spew from 1.1.1 to 1.1.2-0.20180830191138-d8f796af33cc
+- github.com/go-jose/go-jose/v4 from 4.0.1 to 4.0.5
+- github.com/gorilla/websocket from 1.5.0 to 1.5.3
+- github.com/onsi/ginkgo/v2 from 2.22.0 to 2.23.0
+- github.com/onsi/gomega from 1.34.2 to 1.36.2
+- github.com/pelletier/go-toml/v2 from 2.2.0 to 2.2.3
+- github.com/pires/go-proxyproto from 0.7.0 to 0.8.0
+- github.com/prometheus/client_golang from 1.19.1 to 1.21.1
+- github.com/prometheus/client_model from 0.5.0 to 0.6.1
+- github.com/prometheus/common from 0.48.0 to 0.62.0
+- github.com/prometheus/procfs from 0.12.0 to 0.15.1
+- github.com/pmezard/go-difflib from 1.0.0 to 1.0.1-0.20181226105442-5d4384ee4fb2
+- github.com/quic-go/quic-go from 0.48.2 to 0.50.0
+- github.com/rodaine/table from 1.2.0 to 1.3.0
+- github.com/samber/lo from 1.47.0 to 1.49.1
+- github.com/spf13/pflag from 1.0.5 to 1.0.6
+- github.com/spf13/cobra from 1.8.0 to 1.9.1
+- github.com/stretchr/testify from 1.9.0 to 1.10.0
+- github.com/tidwall/gjson from 1.17.1 to 1.18.0
+- github.com/xtaci/kcp-go/v5 from 5.6.13 to 5.6.18
+- golang.org/x/crypto from 0.30.0 to 0.36.0
+- golang.org/x/mod from 0.22.0 to 0.23.0
+- golang.org/x/net from 0.32.0 to 0.37.0
+- golang.org/x/oauth2 from 0.16.0 to 0.28.0
+- golang.org/x/sync from 0.10.0 to 0.12.0
+- golang.org/x/sys from 0.29.0 to 0.31.0
+- golang.org/x/text from 0.21.0 to 0.23.0
+- golang.org/x/term from 0.28.0 to 0.30.0
+- golang.org/x/time from 0.5.0 to 0.11.0
+- golang.org/x/tools from 0.28.0 to 0.30.0
+- google.golang.org/protobuf from 1.35.1 to 1.36.1
+- k8s.io/client-go from 0.28.8 to 0.32.2
+- k8s.io/apimachinery from 0.28.8 to 0.32.2
+- k8s.io/utils from 0.0.0-20230406110748-d93618cff8a2 to 0.0.0-20241104100929-3ea5e8cea738
+- sigs.k8s.io/json from 0.0.0-20221116044647-bc3834ca7abd to 0.0.0-20241010143419-9aa6b5e7a4b3
+- sigs.k8s.io/yaml from 1.3.0 to 1.4.0

cmd/frpc/sub/root.go

@@ -43,7 +43,7 @@ var (
 )
 
 func init() {
-	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.ini", "config file of frpc")
+	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frpc.toml", "config file of frpc")
 	rootCmd.PersistentFlags().StringVarP(&cfgDir, "config_dir", "", "", "config directory, run one frpc service for each file in config directory")
 	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frpc")
 	rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", true, "strict config parsing mode, unknown fields will cause an errors")

cmd/frps/root.go

@@ -38,7 +38,7 @@ var (
 )
 
 func init() {
-	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file of frps")
+	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "./frps.toml", "config file of frps")
 	rootCmd.PersistentFlags().BoolVarP(&showVersion, "version", "v", false, "version of frps")
 	rootCmd.PersistentFlags().BoolVarP(&strictConfigMode, "strict_config", "", true, "strict config parsing mode, unknown fields will cause errors")
 

dockerfiles/Dockerfile-for-frpc

@@ -1,11 +1,11 @@
-FROM golang:1.23 AS building
+FROM golang:1.24 AS building
 
 COPY . /building
 WORKDIR /building
 
 RUN make frpc
 
-FROM alpine:3
+FROM alpine:latest
 
 RUN apk add --no-cache tzdata
 

dockerfiles/Dockerfile-for-frps

@@ -1,11 +1,11 @@
-FROM golang:1.23 AS building
+FROM golang:1.24 AS building
 
 COPY . /building
 WORKDIR /building
 
 RUN make frps
 
-FROM alpine:3
+FROM alpine:latest
 
 RUN apk add --no-cache tzdata
 

go.mod

@@ -1,82 +1,79 @@
 module github.com/fatedier/frp
 
-go 1.23.0
-
+go 1.24.1
 require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
-	github.com/coreos/go-oidc/v3 v3.10.0
+	github.com/coreos/go-oidc/v3 v3.12.0
 	github.com/fatedier/golib v0.5.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
-	github.com/gorilla/websocket v1.5.0
+	github.com/gorilla/websocket v1.5.3
 	github.com/hashicorp/yamux v0.1.1
-	github.com/onsi/ginkgo/v2 v2.22.0
-	github.com/onsi/gomega v1.34.2
-	github.com/pelletier/go-toml/v2 v2.2.0
+	github.com/onsi/ginkgo/v2 v2.23.0
+	github.com/onsi/gomega v1.36.2
+	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/pion/stun/v2 v2.0.0
-	github.com/pires/go-proxyproto v0.7.0
-	github.com/prometheus/client_golang v1.19.1
-	github.com/quic-go/quic-go v0.48.2
-	github.com/rodaine/table v1.2.0
-	github.com/samber/lo v1.47.0
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.9.0
-	github.com/tidwall/gjson v1.17.1
-	github.com/xtaci/kcp-go/v5 v5.6.13
-	golang.org/x/crypto v0.30.0
-	golang.org/x/net v0.32.0
-	golang.org/x/oauth2 v0.16.0
-	golang.org/x/sync v0.10.0
-	golang.org/x/time v0.5.0
+	github.com/pires/go-proxyproto v0.8.0
+	github.com/prometheus/client_golang v1.21.1
+	github.com/quic-go/quic-go v0.50.0
+	github.com/rodaine/table v1.3.0
+	github.com/samber/lo v1.49.1
+	github.com/spf13/cobra v1.9.1
+	github.com/spf13/pflag v1.0.6
+	github.com/stretchr/testify v1.10.0
+	github.com/tidwall/gjson v1.18.0
+	github.com/xtaci/kcp-go/v5 v5.6.18
+	golang.org/x/crypto v0.36.0
+	golang.org/x/net v0.37.0
+	golang.org/x/oauth2 v0.28.0
+	golang.org/x/sync v0.12.0
+	golang.org/x/time v0.11.0
 	gopkg.in/ini.v1 v1.67.0
-	k8s.io/apimachinery v0.28.8
-	k8s.io/client-go v0.28.8
+	k8s.io/apimachinery v0.32.2
+	k8s.io/client-go v0.32.2
 )
 
 require (
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/go-jose/go-jose/v4 v4.0.5 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20241206021119-61a79c692802 // indirect
+	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/klauspost/reedsolomon v1.12.0 // indirect
-	github.com/kr/text v0.2.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pion/dtls/v2 v2.2.7 // indirect
 	github.com/pion/logging v0.2.2 // indirect
 	github.com/pion/transport/v2 v2.2.1 // indirect
 	github.com/pion/transport/v3 v3.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.48.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/templexxx/cpu v0.1.1 // indirect
 	github.com/templexxx/xorsimd v0.4.3 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tjfoc/gmsm v1.4.1 // indirect
 	go.uber.org/mock v0.5.0 // indirect
 	golang.org/x/exp v0.0.0-20241204233417-43b7b7cde48d // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/tools v0.28.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.30.0 // indirect
+	google.golang.org/protobuf v1.36.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
+	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 // TODO(fatedier): Temporary use the modified version, update to the official version after merging into the official repository.