reduce dep

contrib/openrpc/util/common.go

@@ -4,8 +4,6 @@ import (
 	"regexp"
 	"strings"
 	"unicode"
-
-	"github.com/davecgh/go-spew/spew"
 )
 
 func SanitizeBackticks(s string) string {
@@ -21,10 +19,6 @@ func Slice(val []interface{}, index int) interface{} {
 	return val[index]
 }
 
-func Inpect(val interface{}) string {
-	return spew.Sdump(val)
-}
-
 func CamelCase(name string) string {
 	var in []string
 	if strings.Contains(name, " ") {

go.mod

@@ -8,8 +8,6 @@ require (
 	gfx.cafe/util/go/frand v0.0.0-20230721185457-c559e86c829c
 	gfx.cafe/util/go/generic v0.0.0-20230721185457-c559e86c829c
 	github.com/alecthomas/kong v0.8.0
-	github.com/davecgh/go-spew v1.1.1
-	github.com/deckarep/golang-set v1.8.0
 	github.com/go-faster/jx v1.1.0
 	github.com/goccy/go-json v0.10.2
 	github.com/iancoleman/strcase v0.3.0
@@ -20,6 +18,7 @@ require (
 
 require (
 	github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/kr/pretty v0.3.1 // indirect

go.sum

@@ -17,8 +17,6 @@ github.com/alecthomas/repr v0.1.0/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygv
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
-github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/go-faster/errors v0.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=
 github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY=
 github.com/go-faster/jx v1.1.0 h1:ZsW3wD+snOdmTDy9eIVgQdjUpXRRV4rqW8NS3t+20bg=

pkg/server/server.go

@@ -7,10 +7,10 @@ import (
 	"sync/atomic"
 
 	"gfx.cafe/open/jrpc/pkg/codec"
+	"gfx.cafe/open/jrpc/pkg/util/mapset"
 
 	"gfx.cafe/util/go/bufpool"
 
-	mapset "github.com/deckarep/golang-set"
 	"github.com/go-faster/jx"
 	"github.com/goccy/go-json"
 )
@@ -19,7 +19,7 @@ import (
 type Server struct {
 	services codec.Handler
 	run      int32
-	codecs   mapset.Set
+	codecs   *mapset.Set[codec.ReaderWriter]
 	Tracing  Tracing
 }
 
@@ -30,7 +30,7 @@ type Tracing struct {
 // NewServer creates a new server instance with no registered handlers.
 func NewServer(r codec.Handler) *Server {
 	server := &Server{
-		codecs: mapset.NewSet(),
+		codecs: mapset.NewSet[codec.ReaderWriter](),
 		run:    1,
 	}
 	server.services = r
@@ -175,8 +175,8 @@ func (s *Server) ServeCodec(pctx context.Context, remote codec.ReaderWriter) {
 // subscriptions.
 func (s *Server) Stop() {
 	if atomic.CompareAndSwapInt32(&s.run, 1, 0) {
-		s.codecs.Each(func(c any) bool {
-			c.(codec.ReaderWriter).Close()
+		s.codecs.Each(func(c codec.ReaderWriter) bool {
+			c.Close()
 			return true
 		})
 	}

pkg/util/mapset/mapset.go

+package mapset
+
+import "sync"
+
+type Set[T comparable] struct {
+	m  map[T]struct{}
+	mu sync.RWMutex
+}
+
+func NewSet[T comparable]() *Set[T] {
+	return &Set[T]{
+		m: make(map[T]struct{}),
+	}
+}
+
+func (s *Set[T]) Add(x T) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.m[x] = struct{}{}
+}
+
+func (s *Set[T]) Remove(x T) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	delete(s.m, x)
+}
+
+func (s *Set[T]) Each(fn func(x T) bool) {
+	for k := range s.m {
+		if !fn(k) {
+			return
+		}
+	}
+}