Merge 4991596daea57d78dbc0320a6ac708f7dc288021 into 2d67e2e0c69e93a2465f7c954675247d7c0e3352

pkg/util/wait/backoff.go

@@ -16,9 +16,10 @@ package wait
 
 import (
 	"math/rand"
-	"sync"
 	"time"
 
+	"github.com/samber/lo"
+
 	"github.com/fatedier/frp/pkg/util/util"
 )
 
@@ -181,18 +182,16 @@ func Until(f func(), period time.Duration, stopCh <-chan struct{}) {
 
 func MergeAndCloseOnAnyStopChannel[T any](upstreams ...<-chan T) <-chan T {
 	out := make(chan T)
-	closeOnce := sync.Once{}
+
 	for _, upstream := range upstreams {
 		ch := upstream
-		go func() {
+		go lo.Try0(func() {
 			select {
 			case <-ch:
-				closeOnce.Do(func() {
+				close(out)
-					close(out)
-				})
 			case <-out:
 			}
-		}()
+		})
 	}
 	return out
 }