1
0
Fork 0
mirror of https://github.com/sourcegraph/jsonrpc2.git synced 2026-06-16 04:04:56 +02:00

Add PlainObjectCodec (#45)

This commit is contained in:
Sam Herrmann 2021-04-26 03:13:34 -04:00 committed by GitHub
parent 08fd77d0de
commit 99f63e011f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 4 deletions

View file

@ -1,20 +1,26 @@
package jsonrpc2
package jsonrpc2_test
import (
"bufio"
"bytes"
"context"
"encoding/json"
"net"
"reflect"
"strings"
"testing"
"github.com/sourcegraph/jsonrpc2"
)
func TestVarintObjectCodec(t *testing.T) {
want := 789
var buf bytes.Buffer
if err := (VarintObjectCodec{}).WriteObject(&buf, want); err != nil {
if err := (jsonrpc2.VarintObjectCodec{}).WriteObject(&buf, want); err != nil {
t.Fatal(err)
}
var v int
if err := (VarintObjectCodec{}).ReadObject(bufio.NewReader(&buf), &v); err != nil {
if err := (jsonrpc2.VarintObjectCodec{}).ReadObject(bufio.NewReader(&buf), &v); err != nil {
t.Fatal(err)
}
if want := want; v != want {
@ -25,10 +31,53 @@ func TestVarintObjectCodec(t *testing.T) {
func TestVSCodeObjectCodec_ReadObject(t *testing.T) {
s := "Content-Type: foo\r\nContent-Length: 123\r\n\r\n789"
var v int
if err := (VSCodeObjectCodec{}).ReadObject(bufio.NewReader(strings.NewReader(s)), &v); err != nil {
if err := (jsonrpc2.VSCodeObjectCodec{}).ReadObject(bufio.NewReader(strings.NewReader(s)), &v); err != nil {
t.Fatal(err)
}
if want := 789; v != want {
t.Errorf("got %v, want %v", v, want)
}
}
func TestPlainObjectCodec(t *testing.T) {
type Message struct {
One string
Two uint
Three bool
}
cA, cB := net.Pipe()
connA := jsonrpc2.NewConn(
context.Background(),
jsonrpc2.NewBufferedStream(cA, jsonrpc2.PlainObjectCodec{}),
noopHandler{},
)
defer connA.Close()
// echoHandler unmarshals the request's params object and echos the object
// back as the response's result.
var echoHandler handlerFunc = func(ctx context.Context, conn *jsonrpc2.Conn, req *jsonrpc2.Request) {
msg := &Message{}
if err := json.Unmarshal(*req.Params, msg); err != nil {
conn.ReplyWithError(ctx, req.ID, &jsonrpc2.Error{Code: jsonrpc2.CodeInvalidRequest, Message: err.Error()})
return
}
conn.Reply(ctx, req.ID, msg)
}
connB := jsonrpc2.NewConn(
context.Background(),
jsonrpc2.NewBufferedStream(cB, jsonrpc2.PlainObjectCodec{}),
echoHandler,
)
defer connB.Close()
req := &Message{One: "hello world", Two: 123, Three: true}
res := &Message{}
if err := connA.Call(context.Background(), "f", req, res); err != nil {
t.Fatal(err)
}
if got, want := res, req; !reflect.DeepEqual(got, want) {
t.Fatalf("got %v, want %v", res, req)
}
}

View file

@ -162,3 +162,16 @@ func (VSCodeObjectCodec) ReadObject(stream *bufio.Reader, v interface{}) error {
}
return json.NewDecoder(io.LimitReader(stream, int64(contentLength))).Decode(v)
}
// PlainObjectCodec reads/writes plain JSON-RPC 2.0 objects without a header.
type PlainObjectCodec struct{}
// WriteObject implements ObjectCodec.
func (PlainObjectCodec) WriteObject(stream io.Writer, v interface{}) error {
return json.NewEncoder(stream).Encode(v)
}
// ReadObject implements ObjectCodec.
func (PlainObjectCodec) ReadObject(stream *bufio.Reader, v interface{}) error {
return json.NewDecoder(stream).Decode(v)
}