cmd/hi: fixes and qol (#2649)

hscontrol/dns/extrarecords.go

@@ -1,13 +1,14 @@
 package dns
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
 	"os"
 	"sync"
 
-	"github.com/cenkalti/backoff/v4"
+	"github.com/cenkalti/backoff/v5"
 	"github.com/fsnotify/fsnotify"
 	"github.com/rs/zerolog/log"
 	"tailscale.com/tailcfg"
@@ -95,13 +96,13 @@ func (e *ExtraRecordsMan) Run() {
 				// If a file is removed or renamed, fsnotify will loose track of it
 				// and not watch it. We will therefore attempt to re-add it with a backoff.
 			case fsnotify.Remove, fsnotify.Rename:
-				err := backoff.Retry(func() error {
+				_, err := backoff.Retry(context.Background(), func() (struct{}, error) {
 					if _, err := os.Stat(e.path); err != nil {
-						return err
+						return struct{}{}, err
 					}
 
-					return nil
-				}, backoff.NewExponentialBackOff())
+					return struct{}{}, nil
+				}, backoff.WithBackOff(backoff.NewExponentialBackOff()))
 
 				if err != nil {
 					log.Error().Caller().Err(err).Msgf("extra records filewatcher retrying to find file after delete")

hscontrol/grpcv1.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/puzpuzpuz/xsync/v3"
+	"github.com/puzpuzpuz/xsync/v4"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"google.golang.org/grpc/codes"

hscontrol/notifier/notifier.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/juanfont/headscale/hscontrol/types"
-	"github.com/puzpuzpuz/xsync/v3"
+	"github.com/puzpuzpuz/xsync/v4"
 	"github.com/rs/zerolog/log"
 	"github.com/sasha-s/go-deadlock"
 	"tailscale.com/envknob"