better

contrib/extension/subscription/engine.go

@@ -2,6 +2,7 @@ package subscription
 
 import (
 	"context"
+	"encoding/json"
 	"strings"
 	"sync"
 
@@ -61,14 +62,16 @@ 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
-				var subid SubID
-				err := r.ParamArray(subid)
+				resp := []SubID{}
+				err := json.Unmarshal(r.Params, &resp)
 				if err != nil {
 					w.Send(false, err)
 					return
 				}
-				// close that sub
-				w.Send(e.closeSub(subid))
+				// close subs
+				if len(resp) > 0 {
+					w.Send(e.closeSub(resp[0]))
+				}
 			default:
 				h.ServeRPC(w, r)
 			}

pkg/jsonrpc/reqresp.go

@@ -71,25 +71,6 @@ func NewRequest(ctx context.Context, id *ID, method string, params any) (r *Requ
 	return NewRawRequest(ctx, id, method, raw), nil
 }
 
-func (r *Request) ParamArray(a ...any) error {
-	var params []json.RawMessage
-	err := json.Unmarshal(r.Params, &params)
-	if err != nil {
-		return err
-	}
-	for idx, v := range params {
-		if len(v) > idx {
-			err := json.Unmarshal(v, &a[idx])
-			if err != nil {
-				return err
-			}
-		} else {
-			break
-		}
-	}
-	return nil
-}
-
 func (r *Request) Context() context.Context {
 	return r.ctx
 }