Sync upstream: keepalive config, TCP BBR, TCP_USER_TIMEOUT, TCP_NOTSENT_LOWAT, sockopts refactor

.codecov.yml

@@ -1,4 +1,4 @@
 ---
 
 fixes:
-  - "github.com/9seconds/mtg/v2/::"
+  - "github.com/dolonet/mtg-multi/::"

.github/workflows/ci.yaml

@@ -118,97 +118,3 @@ jobs:
 
       - name: Run linter
         run: mise tasks run lint
-
-  artifacts:
-    name: Build release artifacts
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-
-      - uses: jdx/mise-action@v3
-        name: Install mise
-
-      - name: Cache Go modules
-        uses: actions/cache@v5
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-gomod-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-gomod-
-
-      - name: Cache cross-compilation build
-        uses: actions/cache@v5
-        with:
-          path: ~/.cache/go-build
-          key: ${{ runner.os }}-goreleaser-${{ hashFiles('go.sum') }}-${{ hashFiles('**/*.go') }}
-          restore-keys: |
-            ${{ runner.os }}-goreleaser-${{ hashFiles('go.sum') }}-
-            ${{ runner.os }}-goreleaser-
-
-      - name: Run release
-        run: mise tasks run release
-
-  docker:
-    name: Docker
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-
-      - name: Get Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            nineseconds/mtg
-            ghcr.io/${{ github.repository }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=raw,value=master,enable=${{ github.ref == 'refs/heads/master' }}
-            type=raw,value=stable,enable=${{ github.ref == 'refs/heads/stable' }}
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Setup BuildX
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          pull: true
-          context: .
-          platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v7,linux/arm/v6
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - v*
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.26"
+
+      - uses: goreleaser/goreleaser-action@v6
+        with:
+          version: latest
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sync-upstream.yml

@@ -0,0 +1,56 @@
+name: Sync with upstream
+
+on:
+  schedule:
+    - cron: "0 8 1 * *"
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Add upstream remote
+        run: git remote add upstream https://github.com/9seconds/mtg.git
+
+      - name: Fetch upstream
+        run: git fetch upstream
+
+      - name: Check for new commits
+        id: check
+        run: |
+          COUNT=$(git rev-list --count HEAD..upstream/master)
+          echo "count=$COUNT" >> "$GITHUB_OUTPUT"
+          echo "Upstream is $COUNT commits ahead"
+
+      - name: Merge upstream
+        if: steps.check.outputs.count != '0'
+        id: merge
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git merge upstream/master --no-edit
+        continue-on-error: true
+
+      - name: Push if merge succeeded
+        if: steps.check.outputs.count != '0' && steps.merge.outcome == 'success'
+        run: git push origin master
+
+      - name: Create issue on conflict
+        if: steps.merge.outcome == 'failure'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: 'Upstream sync failed — merge conflict',
+              body: 'Automatic merge from `9seconds/mtg:master` failed due to conflicts.\n\nResolve manually:\n```\ngit fetch upstream\ngit merge upstream/master\n# fix conflicts\ngit push origin master\n```',
+              labels: ['sync']
+            });

.gitignore

@@ -8,3 +8,5 @@
 mtg
 coverage.txt
 dist/
+mtg-multi
+mtg-multi-*

.golangci.toml

@@ -19,3 +19,12 @@ tests = true
 #     "thelper",
 #     "varnamelen",
 # ]
+
+# Benchmark and tool code: unchecked Close/Write/Fprintf is fine.
+[[linters.exclusions.rules]]
+path = 'benchmarks/'
+linters = ['errcheck', 'ineffassign']
+
+[[linters.exclusions.rules]]
+path = '_bench_test\.go$'
+linters = ['errcheck', 'ineffassign']

.goreleaser.yml

@@ -2,7 +2,7 @@
 
 version: 2
 
-project_name: mtg
+project_name: mtg-multi
 
 before:
   hooks:
@@ -11,86 +11,13 @@ before:
 
 builds:
   - id: default
-    binary: '{{ .ProjectName }}'
-    goos:
-      - darwin
-      - freebsd
-      - linux
-      - netbsd
-      - openbsd
-      - windows
-    goarch:
-      - 386
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - 6
-      - 7
-    env:
-      - CGO_ENABLED=0
-    flags:
-      - -trimpath
-      - -mod=readonly
-    ldflags: -s -w -X main.version={{ .Version }}
-    ignore:
-      - goos: darwin
-        goarch: 386
-      - goos: darwin
-        goarch: arm
-      - goos: freebsd
-        goarch: arm64
-      - goos: netbsd
-        goarch: arm64
-      - goos: openbsd
-        goarch: arm64
-      - goos: windows
-        goarch: 386
-      - goos: windows
-        goarch: arm
-  - id: mips
-    binary: '{{ .ProjectName }}'
+    binary: mtg-multi
     goos:
       - linux
-    goarch:
-      - mips
-      - mipsle
-    gomips:
-      - softfloat
-    env:
-      - CGO_ENABLED=0
-    flags:
-      - -trimpath
-      - -mod=readonly
-    ldflags: -s -w -X main.version={{ .Version }}
-  - id: arm64-v9
-    binary: '{{ .ProjectName }}'
-    goos:
       - darwin
-      - linux
-    goarch:
-      - arm64
-    goarm64:
-      - v9.0
-    env:
-      - CGO_ENABLED=0
-    flags:
-      - -trimpath
-      - -mod=readonly
-    ldflags: -s -w -X main.version={{ .Version }}
-  - id: amd64-v3
-    binary: '{{ .ProjectName }}'
-    goos:
-      - darwin
-      - freebsd
-      - linux
-      - netbsd
-      - openbsd
-      - windows
     goarch:
       - amd64
-    goamd64:
-      - v3
+      - arm64
     env:
       - CGO_ENABLED=0
     flags:
@@ -102,49 +29,17 @@ archives:
   - id: default
     ids:
       - default
-      - mips
-    name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}'
     formats:
       - tar.gz
     wrap_in_directory: true
-    format_overrides:
-      - goos: windows
-        formats:
-          - zip
     files:
       - LICENSE
       - README.md
-      - SECURITY.md
-      - BEST_PRACTICES.md
-      - example.config.toml
-  - id: optimized
-    ids:
-      - arm64-v9
-      - amd64-v3
-    name_template: '{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm64 }}-{{ .Arm64 }}{{ end }}{{ if .Amd64 }}-{{ .Amd64 }}{{ end }}'
-    formats:
-      - tar.gz
-    wrap_in_directory: true
-    format_overrides:
-      - goos: windows
-        formats:
-          - zip
-    files:
-      - LICENSE
-      - README.md
-      - SECURITY.md
-      - BEST_PRACTICES.md
       - example.config.toml
 
-gomod:
-  proxy: true
-
 snapshot:
   version_template: '{{ .Version }}'
 
 checksum:
   name_template: '{{ .ProjectName }}-{{ .Version }}-checksums.txt'
-
-source:
-  enabled: true
-  name_template: '{{ .ProjectName }}-sources'