Sync with main repository

.github/dependabot.yml

@@ -1,7 +1,6 @@
 version: 2
 updates:
-  -
-    package-ecosystem: github-actions
+  - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: weekly

.github/linters/.markdown-lint.yml

@@ -18,19 +18,19 @@
 ###############
 # Rules by id #
 ###############
-MD004: false                  # Unordered list style
+MD004: false # Unordered list style
 MD007:
-  indent: 2                   # Unordered list indentation
+  indent: 2 # Unordered list indentation
 MD010:
   ignore_code_languages: [caddyfile]
 MD013: false
 MD026:
-  punctuation: ".,;:!。，；:"  # List of not allowed
-MD029: false                  # Ordered list item prefix
-MD033: false                  # Allow inline HTML
-MD036: false                  # Emphasis used instead of a heading
+  punctuation: ".,;:!。，；:" # List of not allowed
+MD029: false # Ordered list item prefix
+MD033: false # Allow inline HTML
+MD036: false # Emphasis used instead of a heading
 
 #################
 # Rules by tags #
 #################
-blank_lines: false  # Error on blank lines
+blank_lines: false # Error on blank lines

.github/pull_request_template.md

@@ -22,4 +22,4 @@ Examples:
     docs: Add docs for X
 
     spec: Z disambiguation
--->
+-->

.github/workflows/cd-chart.yml

@@ -3,7 +3,7 @@ name: Release Chart
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 jobs:
   release:

.github/workflows/cd.yml

@@ -14,6 +14,11 @@ on:
 
 permissions:
   contents: write
+  id-token: write
+  attestations: write
+
+env:
+  GOTOOLCHAIN: local
 
 jobs:
   release:
@@ -27,7 +32,8 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: "1.24"
+          check-latest: true
           cache-dependency-path: |
             go.sum
             caddy/go.sum
@@ -57,11 +63,17 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
-          args: release --clean --timeout 60m ${{ !startsWith(github.ref, 'refs/tags/v') && '--snapshot --skip=sign' || '' }}
+          args: ${{ startsWith(github.ref, 'refs/tags/v') && 'release' || 'build --single-target --snapshot' }} --clean --timeout 60m
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GPG_FINGERPRINT: ${{ startsWith(github.ref, 'refs/tags/v') && steps.import_gpg.outputs.fingerprint || '' }}
 
+      - name: Attest
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: actions/attest-build-provenance@v2
+        with:
+          subject-path: "${{ github.workspace }}/dist/**/mercure"
+
       - name: Display version
         run: dist/caddy_linux_amd64_v1/mercure version
 

.github/workflows/ci-chart.yml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Set up chart-testing
         uses: helm/chart-testing-action@v2

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - v*.*.*
 
 env:
-  GO111MODULE: 'on'
+  GOTOOLCHAIN: local
 
 jobs:
   golangci:
@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: "1.24"
           cache-dependency-path: |
             go.sum
             caddy/go.sum
@@ -37,13 +37,10 @@ jobs:
   test:
     strategy:
       matrix:
-        go: [ '1.21', '1.22' ]
+        go: ["1.23", "1.24"]
       fail-fast: false
     name: Test
     runs-on: ubuntu-latest
-    env:
-      # Temporary workaround for https://github.com/golang/go/issues/65653
-      GOEXPERIMENT: nocoverageredesign
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -65,7 +62,7 @@ jobs:
       - name: Test Caddy module
         working-directory: caddy/
         run: |
-          go test -timeout 1m -race -covermode atomic -coverprofile=profile.cov -coverpkg=github.com/dunglas/mercure ./...
+          go test -timeout 1m -race -covermode atomic -tags=nobadger,nomysql,nopgx -coverprofile=profile.cov -coverpkg=github.com/dunglas/mercure ./...
           sed '1d' profile.cov >> ../profile.cov
 
       - name: Upload coverage results
@@ -76,12 +73,12 @@ jobs:
 
       - name: Start Mercure
         working-directory: caddy/mercure/
-        run: sudo MERCURE_PUBLISHER_JWT_KEY='!ChangeThisMercureHubJWTSecretKey!' MERCURE_SUBSCRIBER_JWT_KEY='!ChangeThisMercureHubJWTSecretKey!' go run main.go start --config ../../dev.Caddyfile
+        run: sudo MERCURE_PUBLISHER_JWT_KEY='!ChangeThisMercureHubJWTSecretKey!' MERCURE_SUBSCRIBER_JWT_KEY='!ChangeThisMercureHubJWTSecretKey!' go run -tags=nobadger,nomysql,nopgx main.go start --config ../../dev.Caddyfile
 
       - uses: actions/setup-node@v4
         with:
-          node-version: '16'
-          cache: 'npm'
+          node-version: "latest"
+          cache: "npm"
           cache-dependency-path: conformance-tests/package-lock.json
 
       - name: Install Playwrigth dependencies

.github/workflows/lint.yml

@@ -10,6 +10,11 @@ on:
     tags:
       - v*.*.*
 
+permissions:
+  contents: read
+  packages: read
+  statuses: write
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -18,14 +23,18 @@ jobs:
         with:
           fetch-depth: 0
       - name: Lint Code Base
-        uses: super-linter/super-linter/slim@v5
+        uses: super-linter/super-linter/slim@v6
         env:
+          DEFAULT_BRANCH: main
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_ALL_CODEBASE: true
+          VALIDATE_CHECKOV: false
           VALIDATE_GITLEAKS: false
           VALIDATE_GO: false
+          VALIDATE_GO_MODULES: false
+          VALIDATE_GO_RELEASER: false
           VALIDATE_PHP_PHPCS: false
           VALIDATE_KUBERNETES_KUBECONFORM: false
-          VALIDATE_KUBERNETES_KUBEVAL: false
+          VALIDATE_JAVASCRIPT_STANDARD: false
           VALIDATE_TYPESCRIPT_STANDARD: false
-          DEFAULT_BRANCH: main
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_PYTHON_PYLINT: false

.golangci.yml

@@ -9,7 +9,6 @@ linters:
     - errcheck
     - lll
     - wsl
-    - gomnd
     - testpackage
     - exhaustruct
     - paralleltest
@@ -23,22 +22,13 @@ linters:
     - depguard
     - mnd
 
+    # Go 1.22+
+    - intrange
+
     # weird issues
     - nolintlint
     - canonicalheader
 
-    # deprecated
-    - interfacer
-    - maligned
-    - scopelint
-    - golint
-    - exhaustivestruct
-    - varcheck
-    - ifshort
-    - deadcode
-    - nosnakecase
-    - structcheck
-
 issues:
   exclude-rules:
     - path: _test\.go

.goreleaser.yml

@@ -1,29 +1,27 @@
+version: 2
 before:
   hooks:
     - go mod tidy
 checksum:
   name_template: "checksums.txt"
 snapshot:
-  name_template: "{{ incpatch .Version }}-next"
+  version_template: "{{ incpatch .Version }}-next"
 changelog:
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
-      - "^ci:"
-      - "^build:"
-      - "^chore:"
-      - "^Merge"
+  use: github-native
 release:
   prerelease: auto
+  draft: true
 env:
   - CGO_ENABLED=0
 builds:
   - id: caddy
     dir: caddy/mercure
     ldflags:
       - -X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks {{ .Version }} Caddy'
+    tags:
+      - nobadger
+      - nomysql
+      - nopgx
     goos:
       - linux
       - darwin
@@ -73,7 +71,7 @@ archives:
       - dev.Caddyfile
     format_overrides:
       - goos: windows
-        format: zip
+        formats: [ zip ]
   - id: legacy
     builds:
       - legacy
@@ -90,7 +88,7 @@ archives:
       - README.md
     format_overrides:
       - goos: windows
-        format: zip
+        formats: [ zip ]
 dockers:
   - ids:
       - caddy
@@ -147,6 +145,22 @@ docker_manifests:
     image_templates:
       - dunglas/mercure:latest-amd64
       - dunglas/mercure:latest-arm64v8
+nfpms:
+  - id: linux_packages
+    package_name: mercure
+    file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}.{{ .Format }}"
+    builds:
+      - caddy
+    formats:
+      - apk
+      - deb
+      - rpm
+    maintainer: "Kévin Dunglas <[email protected]>"
+    description: "An open, easy, fast, reliable and battery-efficient solution for real-time communications."
+    license: "AGPL-3.0-or-later"
+    vendor: "Dunglas Services SAS"
+    homepage: "https://mercure.rocks"
+    bindir: /usr/bin 
 signs:
   - artifacts: checksum
     args:

.prettierignore

@@ -0,0 +1,9 @@
+# The spec is in the IETF flavor of Markdown
+spec/mercure.md
+
+# Ignore Kubernetes templates
+**/charts/**/*.yaml
+**/chart/**/*.yaml
+charts/mercure/README.md
+
+*cache

.vscode/launch.json

@@ -1,21 +1,21 @@
 {
-   "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch the hub",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "${workspaceFolder}/caddy/mercure",
-            "env": {
-                "MERCURE_PUBLISHER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
-                "MERCURE_SUBSCRIBER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
-                "MERCURE_EXTRA_DIRECTIVES": "anonymous\nwrite_timeout 10s",
-                "GLOBAL_OPTIONS": "debug",
-                "SERVER_NAME": "localhost, host.docker.internal",
-                "CADDY_SERVER_EXTRA_DIRECTIVES": "tls internal"
-            },
-            "args": ["run", "--config", "../../dev.Caddyfile"]
-        }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Launch the hub",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/caddy/mercure",
+      "env": {
+        "MERCURE_PUBLISHER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
+        "MERCURE_SUBSCRIBER_JWT_KEY": "!ChangeThisMercureHubJWTSecretKey!",
+        "MERCURE_EXTRA_DIRECTIVES": "anonymous\nwrite_timeout 10s",
+        "GLOBAL_OPTIONS": "debug",
+        "SERVER_NAME": "localhost, host.docker.internal",
+        "CADDY_SERVER_EXTRA_DIRECTIVES": "tls internal"
+      },
+      "args": ["run", "--config", "../../dev.Caddyfile"]
+    }
+  ]
 }