review suggestions

bchuecos · web-flow · commit a03e9d3c9574 · 2022-03-11T22:53:01.000Z
diff --git a/pkg/liveshare/ports.go b/pkg/liveshare/ports.go
@@ -124,9 +124,5 @@ func (s *Session) GetSharedServers(ctx context.Context) ([]*Port, error) {
 // UpdateSharedServerPrivacy controls port permissions and visibility scopes for who can access its URLs
 // in the browser.
 func (s *Session) UpdateSharedServerPrivacy(ctx context.Context, port int, visibility string) error {
-	if err := s.rpc.do(ctx, "serverSharing.updateSharedServerPrivacy", []interface{}{port, visibility}, nil); err != nil {
-		return err
-	}
-
-	return nil
+	return s.rpc.do(ctx, "serverSharing.updateSharedServerPrivacy", []interface{}{port, visibility}, nil)
 }
diff --git a/pkg/liveshare/rpc.go b/pkg/liveshare/rpc.go
@@ -44,38 +44,39 @@ func (r *rpcClient) do(ctx context.Context, method string, args, result interfac
 
 type handlerFn func(conn *jsonrpc2.Conn, req *jsonrpc2.Request)
 
+type handlerSt struct {
+	fn handlerFn
+}
+
 type requestHandler struct {
-	handlersMu sync.RWMutex
-	handlers   map[string][]handlerFn
+	handlersMu sync.Mutex
+	handlers   map[string][]*handlerSt
 }
 
 func newRequestHandler() *requestHandler {
-	return &requestHandler{handlers: make(map[string][]handlerFn)}
+	return &requestHandler{handlers: make(map[string][]*handlerSt)}
 }
 
-func (r *requestHandler) register(requestType string, handler handlerFn) func() {
+func (r *requestHandler) register(requestType string, fn handlerFn) func() {
 	r.handlersMu.Lock()
 	defer r.handlersMu.Unlock()
 
-	if _, ok := r.handlers[requestType]; !ok {
-		r.handlers[requestType] = []handlerFn{}
-	}
-
-	r.handlers[requestType] = append(r.handlers[requestType], handler)
+	h := &handlerSt{fn: fn}
+	r.handlers[requestType] = append(r.handlers[requestType], h)
 
 	return func() {
-		r.deregister(requestType, handler)
+		r.deregister(requestType, h)
 	}
 }
 
-func (r *requestHandler) deregister(requestType string, handler handlerFn) {
+func (r *requestHandler) deregister(requestType string, handler *handlerSt) {
 	r.handlersMu.Lock()
 	defer r.handlersMu.Unlock()
 
 	if handlers, ok := r.handlers[requestType]; ok {
-		newHandlers := []handlerFn{}
+		newHandlers := []*handlerSt{}
 		for _, h := range handlers {
-			if &h != &handler {
+			if h != handler {
 				newHandlers = append(newHandlers, h)
 			}
 		}
@@ -87,15 +88,15 @@ func (r *requestHandler) deregister(requestType string, handler handlerFn) {
 	}
 }
 
-func (r *requestHandler) handlerFn(requestType string) []handlerFn {
-	r.handlersMu.RLock()
-	defer r.handlersMu.RUnlock()
+func (r *requestHandler) getHandlers(requestType string) []*handlerSt {
+	r.handlersMu.Lock()
+	defer r.handlersMu.Unlock()
 
 	return r.handlers[requestType]
 }
 
 func (r *requestHandler) Handle(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) {
-	for _, handler := range r.handlerFn(req.Method) {
-		go handler(conn, req)
+	for _, handler := range r.getHandlers(req.Method) {
+		go handler.fn(conn, req)
 	}
 }
