fix test

contrib/codecs/http/client.go

@@ -12,9 +12,10 @@ import (
 	"sync"
 	"sync/atomic"
 
+	"golang.org/x/net/http2"
+
 	"gfx.cafe/open/jrpc/pkg/jjson"
 	"gfx.cafe/open/jrpc/pkg/jsonrpc"
-	"golang.org/x/net/http2"
 )
 
 var (

contrib/extension/subscription/client.go

@@ -172,8 +172,10 @@ func (c *clientSub) Unsubscribe() error {
 	c.engine.mu.Unlock()
 
 	// TODO: dont use context background here...
-	var result string
-	err := c.conn.Do(context.Background(), &result, c.namespace+serviceMethodSeparator+unsubscribeMethodSuffix, nil)
+	var result bool
+	err := c.conn.Do(context.Background(), &result, c.namespace+serviceMethodSeparator+unsubscribeMethodSuffix, []string{
+		c.id,
+	})
 	if err != nil {
 		return err
 	}

contrib/extension/subscription/client_test.go

@@ -2,7 +2,6 @@ package subscription
 
 import (
 	"context"
-	"net/http"
 	"net/http/httptest"
 	_ "net/http/pprof"
 	"strings"
@@ -102,12 +101,6 @@ func TestUnsubscribeNoRead(t *testing.T) {
 }
 
 func TestWrapClient(t *testing.T) {
-	go func() {
-		if err := http.ListenAndServe(":6060", nil); err != nil {
-			panic(err)
-		}
-	}()
-
 	engine := NewEngine()
 	r := jmux.NewRouter()
 	r.Use(engine.Middleware())

contrib/extension/subscription/engine.go

@@ -62,7 +62,7 @@ func (e *Engine) Middleware() func(jsonrpc.Handler) jsonrpc.Handler {
 				h.ServeRPC(w, r)
 			case strings.HasSuffix(r.Method, serviceMethodSeparator+unsubscribeMethodSuffix):
 				// read the subscription id to close
-				resp := []SubID{}
+				var resp []SubID
 				err := json.Unmarshal(r.Params, &resp)
 				if err != nil {
 					w.Send(false, err)

pkg/jsonrpc/reqresp.go

@@ -3,6 +3,8 @@ package jsonrpc
 import (
 	"context"
 	"encoding/json"
+
+	"github.com/go-faster/jx"
 )
 
 // http.ResponseWriter interface, but for jrpc
@@ -39,10 +41,13 @@ func NewRawRequest(ctx context.Context, id *ID, method string, params json.RawMe
 
 // NewRequest makes a new request
 func NewRequest(ctx context.Context, id *ID, method string, params any) (r *Request, err error) {
-	raw, err := json.Marshal(params)
+	var raw json.RawMessage
+	if params != nil {
+		raw, err = json.Marshal(params)
 		if err != nil {
 			return nil, err
 		}
+	}
 	return NewRawRequest(ctx, id, method, raw), nil
 }
 
@@ -64,3 +69,24 @@ func (r *Request) WithContext(ctx context.Context) *Request {
 	r2.Peer = r.Peer
 	return r2
 }
+
+func (r Request) MarshalJSON() ([]byte, error) {
+	enc := jx.GetEncoder()
+	enc.Obj(func(e *jx.Encoder) {
+		e.FieldStart("jsonrpc")
+		e.Str(VersionString)
+		if r.ID != nil {
+			e.FieldStart("id")
+			e.Raw(*r.ID)
+		}
+		if r.Method != "" {
+			e.FieldStart("method")
+			e.Str(r.Method)
+		}
+		if r.Params != nil {
+			e.FieldStart("params")
+			e.Raw(r.Params)
+		}
+	})
+	return enc.Bytes(), nil
+}

pkg/server/server.go

@@ -6,9 +6,10 @@ import (
 	"errors"
 	"sync"
 
+	"github.com/mailgun/multibuf"
+
 	"gfx.cafe/open/jrpc/pkg/jjson"
 	"gfx.cafe/open/jrpc/pkg/jsonrpc"
-	"github.com/mailgun/multibuf"
 )
 
 // Server is an RPC server.