all: remove gojay implemens

Author: zchee

.circleci/coverage-targets

@@ -60,10 +60,6 @@ test:  ## Runs package test including race condition.
 	$(call target)
 	@CGO_ENABLED=${CGO_ENABLED} ${GO_TEST} ${GO_TEST_FLAGS} -run=${GO_TEST_FUNC} $(strip ${GO_FLAGS}) ${GO_TEST_PKGS}
 
-.PHONY: test/gojay
-test/gojay: GO_BUILDTAGS+=gojay
-test/gojay: test
-
 .PHONY: bench
 bench:  ## Take a package benchmark.
 	$(call target)
@@ -76,9 +72,6 @@ coverage:  ## Takes packages test coverage.
 	$(call target)
 	@CGO_ENABLED=${CGO_ENABLED} ${GO_TEST} ${GO_TEST_FLAGS} -covermode=atomic -coverpkg=${PKG}/... -coverprofile=coverage.out $(strip ${GO_FLAGS}) ${GO_PKGS}
 
-coverage/gojay: GO_BUILDTAGS+=gojay
-coverage/gojay: coverage
-
 
 ##@ fmt, lint
 

.circleci/lint-buildtags

@@ -4,7 +4,9 @@
 package jsonrpc2
 
 import (
+	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"sync"
 	"sync/atomic"
@@ -75,7 +77,74 @@ func NewConn(s Stream) Conn {
 	return conn
 }
 
-// Notify implemens Conn.
+// Call implements Conn.
+func (c *conn) Call(ctx context.Context, method string, params, result interface{}) (_ ID, err error) {
+	// generate a new request identifier
+	id := ID{number: atomic.AddInt64(&c.seq, 1)}
+	call, err := NewCall(id, method, params)
+	if err != nil {
+		return id, fmt.Errorf("marshaling call parameters: %w", err)
+	}
+
+	ctx, done := event.Start(ctx, method,
+		tag.Method.Of(method),
+		tag.RPCDirection.Of(tag.Outbound),
+		tag.RPCID.Of(fmt.Sprintf("%q", id)),
+	)
+	defer func() {
+		recordStatus(ctx, err)
+		done()
+	}()
+	event.Metric(ctx, tag.Started.Of(1))
+
+	// We have to add ourselves to the pending map before we send, otherwise we
+	// are racing the response. Also add a buffer to rchan, so that if we get a
+	// wire response between the time this call is cancelled and id is deleted
+	// from c.pending, the send to rchan will not block.
+	rchan := make(chan *Response, 1)
+
+	c.pendingMu.Lock()
+	c.pending[id] = rchan
+	c.pendingMu.Unlock()
+
+	defer func() {
+		c.pendingMu.Lock()
+		delete(c.pending, id)
+		c.pendingMu.Unlock()
+	}()
+
+	// now we are ready to send
+	n, err := c.write(ctx, call)
+	event.Metric(ctx, tag.SentBytes.Of(n))
+	if err != nil {
+		// sending failed, we will never get a response, so don't leave it pending
+		return id, err
+	}
+
+	// now wait for the response
+	select {
+	case response := <-rchan:
+		switch {
+		case response.err != nil: // is it an error response?
+			return id, response.err
+
+		case result == nil || len(response.result) == 0:
+			return id, nil
+
+		default:
+			dec := json.NewDecoder(bytes.NewReader(response.result))
+			if err := dec.Decode(result); err != nil {
+				return id, fmt.Errorf("unmarshaling result: %w", err)
+			}
+			return id, nil
+		}
+
+	case <-ctx.Done():
+		return id, ctx.Err()
+	}
+}
+
+// Notify implements Conn.
 func (c *conn) Notify(ctx context.Context, method string, params interface{}) (err error) {
 	notify, err := NewNotification(method, params)
 	if err != nil {
@@ -128,7 +197,7 @@ func (c *conn) write(ctx context.Context, msg Message) (int64, error) {
 	return c.stream.Write(ctx, msg)
 }
 
-// Go implemens Conn.
+// Go implements Conn.
 func (c *conn) Go(ctx context.Context, handler Handler) {
 	go c.run(ctx, handler)
 }
@@ -176,17 +245,17 @@ func (c *conn) run(ctx context.Context, handler Handler) {
 	}
 }
 
-// Close implemens Conn.
+// Close implements Conn.
 func (c *conn) Close() error {
 	return c.stream.Close()
 }
 
-// Done implemens Conn.
+// Done implements Conn.
 func (c *conn) Done() <-chan struct{} {
 	return c.done
 }
 
-// Err implemens Conn.
+// Err implements Conn.
 func (c *conn) Err() error {
 	if err := c.err.Load(); err != nil {
 		return err.(error)

Makefile

@@ -6,6 +6,8 @@ package jsonrpc2
 import (
 	"errors"
 	"fmt"
+
+	json "github.com/goccy/go-json"
 )
 
 // Error represents a JSON-RPC error.
@@ -18,7 +20,7 @@ type Error struct {
 
 	// Data a Primitive or Structured value that contains additional
 	// information about the error. Can be omitted.
-	Data *RawMessage `json:"data,omitempty"`
+	Data *json.RawMessage `json:"data,omitempty"`
 }
 
 // compile time check whether the Error implements error interface.

conn.go

@@ -3,8 +3,6 @@ module go.lsp.dev/jsonrpc2
 go 1.15
 
 require (
-	github.com/francoispqt/gojay v1.2.13
 	github.com/goccy/go-json v0.3.4
-	github.com/google/go-cmp v0.5.4
 	go.lsp.dev/pkg v0.0.0-20210125030640-b6310ac75a91
 )