.github/renovate.json

@@ -1,11 +1,13 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "commitMessagePrefix": "[dependencies]",
-  "branchName": "main",
   "extends": [
     "config:base",
     ":disableRateLimiting"
   ],
+  "baseBranches": [
+    "dev"
+  ],
   "packageRules": [
     {
       "matchManagers": [
@@ -15,9 +17,9 @@
     },
     {
       "matchManagers": [
-        "gomod"
+        "dockerfile"
       ],
-      "groupName": "gomod"
+      "groupName": "Dockerfile"
     }
   ]
 }

.github/workflows/lint.yml

@@ -1,15 +1,17 @@
-name: Lint
+name: lint
 
 on:
   push:
     branches:
+      - main
       - dev
     paths-ignore:
       - '**.md'
       - '.github/**'
       - '!.github/workflows/lint.yml'
   pull_request:
     branches:
+      - main
       - dev
 
 jobs:
@@ -22,16 +24,16 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
       - name: Cache go module
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/go/pkg/mod
           key: go-${{ hashFiles('**/go.sum') }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest

.github/workflows/debug.yml → .github/workflows/test.yml

@@ -1,134 +1,111 @@
-name: Debug build
+name: test
 
 on:
   push:
     branches:
+      - main
       - dev
     paths-ignore:
       - '**.md'
       - '.github/**'
       - '!.github/workflows/debug.yml'
   pull_request:
     branches:
+      - main
       - dev
 
 jobs:
   build:
-    name: Linux Debug build
+    name: Linux
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
-      - name: Add cache to Go proxy
-        run: |
-          version=`git rev-parse HEAD`
-          mkdir build
-          pushd build
-          go mod init build
-          go get -v github.com/sagernet/sing@$version
-          popd
-        continue-on-error: true
-      - name: Build
-        run: |
-          make test
-  build_go118:
-    name: Linux Debug build (Go 1.18)
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Setup Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ~1.18
-        continue-on-error: true
+          go-version: ^1.23
       - name: Build
         run: |
           make test
-  build_go119:
-    name: Linux Debug build (Go 1.19)
+  build_go120:
+    name: Linux (Go 1.20)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ~1.19
+          go-version: ~1.20
         continue-on-error: true
       - name: Build
         run: |
           make test
-  build_go120:
-    name: Linux Debug build (Go 1.20)
+  build_go121:
+    name: Linux (Go 1.21)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ~1.20
+          go-version: ~1.21
         continue-on-error: true
       - name: Build
         run: |
           make test
-  build_go121:
-    name: Linux Debug build (Go 1.21)
+  build_go122:
+    name: Linux (Go 1.22)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ~1.21
+          go-version: ~1.22
         continue-on-error: true
       - name: Build
         run: |
           make test
-  build__windows:
-    name: Windows Debug build
+  build_windows:
+    name: Windows
     runs-on: windows-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
         continue-on-error: true
       - name: Build
         run: |
           make test
   build_darwin:
-    name: macOS Debug build
+    name: macOS
     runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
         continue-on-error: true
       - name: Build
         run: |

.golangci.yml

@@ -5,6 +5,8 @@ linters:
     - govet
     - gci
     - staticcheck
+    - paralleltest
+    - ineffassign
 
 linters-settings:
   gci:
@@ -14,4 +16,9 @@ linters-settings:
       - prefix(github.com/sagernet/)
       - default
   staticcheck:
-    go: '1.20'
+    checks:
+      - all
+      - -SA1003
+
+run:
+  go: "1.23"

Makefile

@@ -8,14 +8,14 @@ fmt_install:
 	go install -v github.com/daixiang0/gci@latest
 
 lint:
-	GOOS=linux golangci-lint run ./...
-	GOOS=android golangci-lint run ./...
-	GOOS=windows golangci-lint run ./...
-	GOOS=darwin golangci-lint run ./...
-	GOOS=freebsd golangci-lint run ./...
+	GOOS=linux golangci-lint run
+	GOOS=android golangci-lint run
+	GOOS=windows golangci-lint run
+	GOOS=darwin golangci-lint run
+	GOOS=freebsd golangci-lint run
 
 lint_install:
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
 test:
-	go test $(shell go list ./... | grep -v /internal/)
+	go test ./...

README.md

@@ -1,3 +1,6 @@
 # sing
 
+![test](https://github.com/sagernet/sing/actions/workflows/test.yml/badge.svg)
+![lint](https://github.com/sagernet/sing/actions/workflows/lint.yml/badge.svg)
+
 Do you hear the people sing?

common/atomic/typed.go

@@ -10,26 +10,37 @@ type TypedValue[T any] struct {
 	value atomic.Value
 }
 
+// typedValue is a struct with determined type to resolve atomic.Value usages with interface types
+// https://github.com/golang/go/issues/22550
+//
+// The intention to have an atomic value store for errors. However, running this code panics:
+// panic: sync/atomic: store of inconsistently typed value into Value
+// This is because atomic.Value requires that the underlying concrete type be the same (which is a reasonable expectation for its implementation).
+// When going through the atomic.Value.Store method call, the fact that both these are of the error interface is lost.
+type typedValue[T any] struct {
+	value T
+}
+
 func (t *TypedValue[T]) Load() T {
 	value := t.value.Load()
 	if value == nil {
 		return common.DefaultValue[T]()
 	}
-	return value.(T)
+	return value.(typedValue[T]).value
 }
 
 func (t *TypedValue[T]) Store(value T) {
-	t.value.Store(value)
+	t.value.Store(typedValue[T]{value})
 }
 
 func (t *TypedValue[T]) Swap(new T) T {
-	old := t.value.Swap(new)
+	old := t.value.Swap(typedValue[T]{new})
 	if old == nil {
 		return common.DefaultValue[T]()
 	}
-	return old.(T)
+	return old.(typedValue[T]).value
 }
 
 func (t *TypedValue[T]) CompareAndSwap(old, new T) bool {
-	return t.value.CompareAndSwap(old, new)
+	return t.value.CompareAndSwap(typedValue[T]{old}, typedValue[T]{new})
 }

common/baderror/baderror.go

@@ -2,11 +2,10 @@ package baderror
 
 import (
 	"context"
+	"errors"
 	"io"
 	"net"
 	"strings"
-
-	E "github.com/sagernet/sing/common/exceptions"
 )
 
 func Contains(err error, msgList ...string) bool {
@@ -22,8 +21,7 @@ func WrapH2(err error) error {
 	if err == nil {
 		return nil
 	}
-	err = E.Unwrap(err)
-	if err == io.ErrUnexpectedEOF {
+	if errors.Is(err, io.ErrUnexpectedEOF) {
 		return io.EOF
 	}
 	if Contains(err, "client disconnected", "body closed by handler", "response body closed", "; CANCEL") {

common/binary/README.md

@@ -0,0 +1,3 @@
+# binary
+
+mod from go 1.22.3