latest batch of fixes

client.go

@@ -506,12 +506,10 @@ func (c *Client) dispatch(codec ServerCodec) {
 
 	// Spawn the initial read loop.
 	go c.read(codec)
-
 	for {
 		select {
 		case <-c.close:
 			return
-
 		// Read path:
 		case op := <-c.readOp:
 			if op.batch {

service.go

@@ -19,6 +19,7 @@ package jrpc
 import (
 	"context"
 	"reflect"
+	"runtime"
 	"unicode"
 )
 
@@ -94,17 +95,17 @@ func (e *callback) ServeRPC(w ResponseWriter, r *Request) {
 	}
 	fullargs = append(fullargs, args...)
 	//Catch panic while running the callback.
-	//defer func() {
-	//	if err := recover(); err != nil {
-	//		const size = 64 << 10
-	//		buf := make([]byte, size)
-	//		buf = buf[:runtime.Stack(buf, false)]
+	defer func() {
+		if err := recover(); err != nil {
+			const size = 64 << 10
+			buf := make([]byte, size)
+			buf = buf[:runtime.Stack(buf, false)]
 			//log.Error().Str("method", r.msg.Method).Interface("err", err).Hex("buf", buf).Msg("crashed")
-	//		//		errRes := errors.New("method handler crashed: " + fmt.Sprint(err))
-	//		w.Send(nil, nil)
-	//		return
-	//	}
-	//}()
+			//		errRes := errors.New("method handler crashed: " + fmt.Sprint(err))
+			w.Send(nil, nil)
+			return
+		}
+	}()
 	// Run the callback.
 	results := e.fn.Call(fullargs)
 	if e.errPos >= 0 && !results[e.errPos].IsNil() {