added listener close()

README.md

@@ -1,5 +1,6 @@
 # dsrpc, Data RPC
 
+
 DSRPC is easy and simple RPC framework over TCP socket.
 
 ### Purpose

client.go

@@ -5,332 +5,344 @@
 package dsrpc
 
 import (
+	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"net"
 	"sync"
 
-    encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )
 
-
-func Put(address string, method string, reader io.Reader, size int64, param, result any, auth *Auth) error {
+func Put(ctx context.Context, address string, method string, reader io.Reader, binSize int64, param, result any, auth *Auth) error {
 	var err error
 
 	addr, err := net.ResolveTCPAddr("tcp", address)
 	if err != nil {
 		err = fmt.Errorf("unable to resolve adddress: %s", err)
-        return Err(err)
+		return err
 	}
 	conn, err := net.DialTCP("tcp", nil, addr)
 	if err != nil {
-        return Err(err)
+		return err
 	}
 	defer conn.Close()
 
-    //err = conn.SetKeepAlive(true)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive: %s", err)
-    //    return Err(err)
-    //}
-
-    //err = conn.SetKeepAlivePeriod(10 * time.Second)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive period: %s", err)
-    //    return Err(err)
-    //}
-
-    return ConnPut(conn, method, reader, size, param, result, auth)
+	return ConnPut(ctx, conn, method, reader, binSize, param, result, auth)
 }
 
-
-func ConnPut(conn net.Conn, method string, reader io.Reader, size int64, param, result any, auth *Auth) error {
+func PutTLS(ctx context.Context, tlsConfig *tls.Config, address string, method string, reader io.Reader, binSize int64, param, result any, auth *Auth) error {
 	var err error
-    context := CreateContext(conn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
 
-    context.binReader = reader
-    context.binWriter = conn
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
 
-    context.reqHeader.binSize = size
-
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
+	return ConnPut(ctx, conn, method, reader, binSize, param, result, auth)
 }
 
-    err = context.CreateRequest()
-    if err != nil {
-        return Err(err)
+func ConnPut(ctx context.Context, conn net.Conn, method string, reader io.Reader, binSize int64, param, result any, auth *Auth) error {
+	var err error
+	content := CreateContent(conn)
+
+	content.reqBlock.Method = method
+	if param != nil {
+		content.reqBlock.Params = param
 	}
-    err = context.WriteRequest()
+	if auth != nil {
+		content.reqBlock.Auth = auth
+	}
+	if result != nil {
+		content.resBlock.Result = result
+	}
+
+	content.binReader = reader
+	content.binWriter = conn
+
+	content.reqHeader.binSize = binSize
+
+	err = content.createRequest()
 	if err != nil {
-        return Err(err)
+		return err
+	}
+	err = content.writeRequest()
+	if err != nil {
+		return err
 	}
 
 	var wg sync.WaitGroup
 	errChan := make(chan error, 1)
 
 	wg.Add(1)
-    go context.ReadResponseAsync(&wg, errChan)
+	go content.readResponseAsync(&wg, errChan)
 
 	wg.Add(1)
-    go context.UploadBinAsync(&wg)
+	go content.uploadBinAsync(ctx, &wg)
 
 	wg.Wait()
 	err = <-errChan
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    err = context.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    return Err(err)
+	return err
 }
 
-func Get(address string, method string, writer io.Writer, param, result any, auth *Auth) error {
+func Get(ctx context.Context, address string, method string, writer io.Writer, param, result any, auth *Auth) error {
 	var err error
 
 	addr, err := net.ResolveTCPAddr("tcp", address)
 	if err != nil {
 		err = fmt.Errorf("unable to resolve adddress: %s", err)
-        return Err(err)
+		return err
 	}
 	conn, err := net.DialTCP("tcp", nil, addr)
 	if err != nil {
-        return Err(err)
+		return err
 	}
 	defer conn.Close()
 
-    //err = conn.SetKeepAlive(true)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive: %s", err)
-    //    return Err(err)
-    //}
-
-    //err = conn.SetKeepAlivePeriod(10 * time.Second)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive period: %s", err)
-    //    return Err(err)
-    //}
-
-    return ConnGet(conn, method, writer, param, result, auth)
+	return ConnGet(ctx, conn, method, writer, param, result, auth)
 }
 
-func ConnGet(conn net.Conn, method string, writer io.Writer, param, result any, auth *Auth) error {
+func GetTLS(ctx context.Context, tlsConfig *tls.Config, address string, method string, writer io.Writer, param, result any, auth *Auth) error {
 	var err error
 
-    context := CreateContext(conn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
 
-    context.binReader = conn
-    context.binWriter = writer
-
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
-    }
-    err = context.CreateRequest()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.WriteRequest()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.ReadResponse()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.DownloadBin()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.BindResponse()
-    if err != nil {
-        return Err(err)
-    }
-    return Err(err)
+	return ConnGet(ctx, conn, method, writer, param, result, auth)
 }
 
-func Exec(address, method string, param any, result any, auth *Auth) error {
+func ConnGet(ctx context.Context, conn net.Conn, method string, writer io.Writer, param, result any, auth *Auth) error {
+	var err error
+
+	content := CreateContent(conn)
+	content.reqBlock.Method = method
+	if param != nil {
+		content.reqBlock.Params = param
+	}
+	if auth != nil {
+		content.reqBlock.Auth = auth
+	}
+	if result != nil {
+		content.resBlock.Result = result
+	}
+
+	content.binReader = conn
+	content.binWriter = writer
+
+	err = content.createRequest()
+	if err != nil {
+		return err
+	}
+	err = content.writeRequest()
+	if err != nil {
+		return err
+	}
+	err = content.readResponse()
+	if err != nil {
+		return err
+	}
+	err = content.downloadBin(ctx)
+	if err != nil {
+		return err
+	}
+	err = content.bindResponse()
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func Exec(ctx context.Context, address, method string, param any, result any, auth *Auth) error {
 	var err error
 
 	addr, err := net.ResolveTCPAddr("tcp", address)
 	if err != nil {
 		err = fmt.Errorf("unable to resolve adddress: %s", err)
-        return Err(err)
+		return err
 	}
 	conn, err := net.DialTCP("tcp", nil, addr)
 	if err != nil {
-        return Err(err)
+		return err
 	}
 	defer conn.Close()
 
-    //err = conn.SetKeepAlive(true)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive: %s", err)
-    //    return Err(err)
-    //}
-    //err = conn.SetKeepAlivePeriod(10 * time.Second)
-    //if err != nil {
-    //    err = fmt.Errorf("unable to set keepalive period: %s", err)
-    //    return Err(err)
-    //}
-
-    err = ConnExec(conn, method, param, result, auth)
+	err = ConnExec(ctx, conn, method, param, result, auth)
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    return Err(err)
+	return err
 }
 
-
-func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) error {
+func ExecTLS(ctx context.Context, tlsConfig *tls.Config, address, method string, param any, result any, auth *Auth) error {
 	var err error
 
-    context := CreateContext(conn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
 
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
+	err = ConnExec(ctx, conn, method, param, result, auth)
+	if err != nil {
+		return err
+	}
+	return err
 }
 
-    err = context.CreateRequest()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.WriteRequest()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.ReadResponse()
-    if err != nil {
-        return Err(err)
-    }
-    err = context.BindResponse()
-    if err != nil {
-        return Err(err)
-    }
-    return Err(err)
-}
-
-
-func (context *Context) CreateRequest() error {
+func ConnExec(ctx context.Context, conn net.Conn, method string, param any, result any, auth *Auth) error {
 	var err error
 
-    context.reqPacket.rcpPayload, err = context.reqRPC.Pack()
-    if err != nil {
-        return Err(err)
-    }
-    rpcSize := int64(len(context.reqPacket.rcpPayload))
-    context.reqHeader.rpcSize = rpcSize
+	content := CreateContent(conn)
+	content.reqBlock.Method = method
 
-    context.reqPacket.header, err = context.reqHeader.Pack()
-    if err != nil {
-        return Err(err)
+	if param != nil {
+		content.reqBlock.Params = param
 	}
-    return Err(err)
+	if result != nil {
+		content.resBlock.Result = result
+	}
+	if auth != nil {
+		content.reqBlock.Auth = auth
 	}
 
-func (context *Context) WriteRequest() error {
-    var err error
-    _, err = context.sockWriter.Write(context.reqPacket.header)
+	err = content.createRequest()
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    _, err = context.sockWriter.Write(context.reqPacket.rcpPayload)
+	err = content.writeRequest()
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    return Err(err)
+	err = content.readResponse()
+	if err != nil {
+		return err
+	}
+	err = content.bindResponse()
+	if err != nil {
+		return err
+	}
+	return err
 }
 
-func (context *Context) UploadBin() error {
-    var err error
-    _, err = CopyBytes(context.binReader, context.binWriter, context.reqHeader.binSize)
-    return Err(err)
-}
-
-func (context *Context) ReadResponse() error {
+func (content *Content) createRequest() error {
 	var err error
 
-    context.resPacket.header, err = ReadBytes(context.sockReader, headerSize)
+	content.reqPacket.rcpPayload, err = content.reqBlock.Pack()
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    context.resHeader, err = UnpackHeader(context.resPacket.header)
+	rpcSize := int64(len(content.reqPacket.rcpPayload))
+	content.reqHeader.rpcSize = rpcSize
+
+	content.reqPacket.header, err = content.reqHeader.Pack()
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    rpcSize := context.resHeader.rpcSize
-    context.resPacket.rcpPayload, err = ReadBytes(context.sockReader, rpcSize)
-    if err != nil {
-        return Err(err)
-    }
-    return Err(err)
+	return err
 }
 
-func (context *Context) UploadBinAsync(wg *sync.WaitGroup) {
+func (content *Content) writeRequest() error {
+	var err error
+	_, err = content.sockWriter.Write(content.reqPacket.header)
+	if err != nil {
+		return err
+	}
+	_, err = content.sockWriter.Write(content.reqPacket.rcpPayload)
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func (content *Content) uploadBin(ctx context.Context) error {
+	var err error
+	_, err = CopyBytes(ctx, content.binReader, content.binWriter, content.reqHeader.binSize)
+	return err
+}
+
+func (content *Content) readResponse() error {
+	var err error
+
+	content.resPacket.header, err = ReadBytes(content.sockReader, headerSize)
+	if err != nil {
+		return err
+	}
+	content.resHeader, err = UnpackHeader(content.resPacket.header)
+	if err != nil {
+		return err
+	}
+	rpcSize := content.resHeader.rpcSize
+	content.resPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func (content *Content) uploadBinAsync(ctx context.Context, wg *sync.WaitGroup) {
 	exitFunc := func() {
 		wg.Done()
 	}
 	defer exitFunc()
-    _, _ = CopyBytes(context.binReader, context.binWriter, context.reqHeader.binSize)
+	_, _ = CopyBytes(ctx, content.binReader, content.binWriter, content.reqHeader.binSize)
 	return
 }
 
-func (context *Context) ReadResponseAsync(wg *sync.WaitGroup, errChan chan error) {
+func (content *Content) readResponseAsync(wg *sync.WaitGroup, errChan chan error) {
 	var err error
 	exitFunc := func() {
 		errChan <- err
 		wg.Done()
 	}
 	defer exitFunc()
-    context.resPacket.header, err = ReadBytes(context.sockReader, headerSize)
+	content.resPacket.header, err = ReadBytes(content.sockReader, headerSize)
 	if err != nil {
-        err = Err(err)
+		err = err
 		return
 	}
-    context.resHeader, err = UnpackHeader(context.resPacket.header)
+	content.resHeader, err = UnpackHeader(content.resPacket.header)
 	if err != nil {
-        err = Err(err)
+		err = err
 		return
 	}
-    rpcSize := context.resHeader.rpcSize
-    context.resPacket.rcpPayload, err = ReadBytes(context.sockReader, rpcSize)
+	rpcSize := content.resHeader.rpcSize
+	content.resPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
 	if err != nil {
-        err = Err(err)
+		err = err
 		return
 	}
 	return
 }
 
-func (context *Context) DownloadBin() error {
+func (content *Content) downloadBin(ctx context.Context) error {
 	var err error
-    _, err = CopyBytes(context.binReader, context.binWriter, context.resHeader.binSize)
-    return Err(err)
+	_, err = CopyBytes(ctx, content.binReader, content.binWriter, content.resHeader.binSize)
+	return err
 }
 
-func (context *Context) BindResponse() error {
+func (content *Content) bindResponse() error {
 	var err error
 
-    err = encoder.Unmarshal(context.resPacket.rcpPayload, context.resRPC)
+	err = encoder.Unmarshal(content.resPacket.rcpPayload, content.resBlock)
 	if err != nil {
-        return Err(err)
+		return err
 	}
-    if len(context.resRPC.Error) > 0 {
-        err = errors.New(context.resRPC.Error)
-        return Err(err)
+	if len(content.resBlock.Error) > 0 {
+		err = errors.New(content.resBlock.Error)
+		return err
 	}
-    return Err(err)
+	return err
 }

compat.go

@@ -1,7 +0,0 @@
-/*
- * Copyright 2022 Oleg Borodin  <borodin@unix7.org>
- */
-
-package dsrpc
-
-type any = interface{}

content.go

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2022 Oleg Borodin  <borodin@unix7.org>
+ */
+
+package dsrpc
+
+import (
+	"io"
+	"net"
+	"time"
+)
+
+type Content struct {
+	start      time.Time
+	remoteHost string
+
+	sockReader io.Reader
+	sockWriter io.Writer
+
+	reqPacket *Packet
+	reqHeader *Header
+	reqBlock  *Request
+
+	resPacket *Packet
+	resHeader *Header
+	resBlock  *Response
+
+	binReader io.Reader
+	binWriter io.Writer
+}
+
+func CreateContent(conn net.Conn) *Content {
+	context := &Content{
+		start:      time.Now(),
+		sockReader: conn,
+		sockWriter: conn,
+
+		reqPacket: NewEmptyPacket(),
+		reqHeader: NewEmptyHeader(),
+		reqBlock:  NewEmptyRequest(),
+
+		resPacket: NewEmptyPacket(),
+		resHeader: NewEmptyHeader(),
+		resBlock:  NewEmptyResponse(),
+	}
+	return context
+}
+
+func (context *Content) Request() *Request {
+	return context.reqBlock
+}
+
+func (context *Content) RemoteHost() string {
+	return context.remoteHost
+}
+
+func (context *Content) Start() time.Time {
+	return context.start
+}
+
+func (context *Content) Method() string {
+	var method string
+	if context.reqBlock != nil {
+		method = context.reqBlock.Method
+	}
+	return method
+}
+
+func (context *Content) ReqRpcSize() int64 {
+	var size int64
+	if context.reqHeader != nil {
+		size = context.reqHeader.rpcSize
+	}
+	return size
+}
+
+func (context *Content) ReqBinSize() int64 {
+	var size int64
+	if context.reqHeader != nil {
+		size = context.reqHeader.binSize
+	}
+	return size
+}
+
+func (context *Content) ResBinSize() int64 {
+	var size int64
+	if context.resHeader != nil {
+		size = context.resHeader.binSize
+	}
+	return size
+}
+
+func (context *Content) ResRpcSize() int64 {
+	var size int64
+	if context.resHeader != nil {
+		size = context.resHeader.rpcSize
+	}
+	return size
+}
+
+func (context *Content) ReqSize() int64 {
+	var size int64
+	if context.reqHeader != nil {
+		size += context.reqHeader.binSize
+		size += context.reqHeader.rpcSize
+	}
+	return size
+}
+
+func (context *Content) ResSize() int64 {
+	var size int64
+	if context.resHeader != nil {
+		size += context.resHeader.binSize
+		size += context.resHeader.rpcSize
+	}
+	return size
+}
+
+func (context *Content) SetAuthIdent(ident []byte) {
+	context.reqBlock.Auth.Ident = ident
+}
+
+func (context *Content) SetAuthSalt(salt []byte) {
+	context.reqBlock.Auth.Salt = salt
+}
+
+func (context *Content) SetAuthHash(hash []byte) {
+	context.reqBlock.Auth.Hash = hash
+}
+
+func (context *Content) AuthIdent() []byte {
+	return context.reqBlock.Auth.Ident
+}
+
+func (context *Content) AuthSalt() []byte {
+	return context.reqBlock.Auth.Salt
+}
+
+func (context *Content) AuthHash() []byte {
+	return context.reqBlock.Auth.Hash
+}
+
+func (context *Content) Auth() *Auth {
+	return context.reqBlock.Auth
+}

context.go

@@ -1,156 +0,0 @@
-/*
- * Copyright 2022 Oleg Borodin  <borodin@unix7.org>
- */
-
-package dsrpc
-
-import (
-    "io"
-    "net"
-    "time"
-)
-
-type Context struct {
-    start       time.Time
-    remoteHost  string
-    sockReader  io.Reader
-    sockWriter  io.Writer
-
-    reqHeader   *Header
-    reqRPC      *Request
-    reqPacket   *Packet
-
-    resPacket   *Packet
-    resHeader   *Header
-    resRPC      *Response
-
-    binReader   io.Reader
-    binWriter   io.Writer
-}
-
-
-func NewContext() *Context {
-    context := &Context{}
-    context.start = time.Now()
-    return context
-}
-
-func CreateContext(conn net.Conn) *Context {
-    context := &Context{}
-    context.start = time.Now()
-    context.sockReader = conn
-    context.sockWriter = conn
-
-    context.reqPacket = NewPacket()
-    context.resPacket = NewPacket()
-
-    context.reqHeader = NewHeader()
-    context.reqRPC   = NewRequest()
-
-    context.resHeader = NewHeader()
-    context.resRPC = NewResponse()
-    context.resRPC = NewResponse()
-
-    return context
-}
-
-func (context *Context) Request() *Request  {
-    return context.reqRPC
-}
-
-func (context *Context) RemoteHost() string {
-    return context.remoteHost
-}
-
-func (context *Context) Start() time.Time {
-    return context.start
-}
-
-func (context *Context) Method() string {
-    var method string
-    if context.reqRPC != nil {
-        method = context.reqRPC.Method
-    }
-    return method
-}
-
-func (context *Context) ReqRpcSize() int64 {
-    var size int64
-    if context.reqHeader != nil {
-        size = context.reqHeader.rpcSize
-    }
-    return size
-}
-
-
-func (context *Context) ReqBinSize() int64 {
-    var size int64
-    if context.reqHeader != nil {
-        size = context.reqHeader.binSize
-    }
-    return size
-}
-
-func (context *Context) ResBinSize() int64 {
-    var size int64
-    if context.resHeader != nil {
-        size = context.resHeader.binSize
-    }
-    return size
-}
-
-func (context *Context) ResRpcSize() int64 {
-    var size int64
-    if context.resHeader != nil {
-        size = context.resHeader.rpcSize
-    }
-    return size
-}
-
-func (context *Context) ReqSize() int64 {
-    var size int64
-    if context.reqHeader != nil {
-        size += context.reqHeader.binSize
-        size += context.reqHeader.rpcSize
-    }
-    return size
-}
-
-func (context *Context) ResSize() int64 {
-    var size int64
-    if context.resHeader != nil {
-        size += context.resHeader.binSize
-        size += context.resHeader.rpcSize
-    }
-    return size
-}
-
-
-
-func (context *Context) SetAuthIdent(ident []byte)  {
-    context.reqRPC.Auth.Ident = ident
-}
-
-func (context *Context) SetAuthSalt(salt []byte)  {
-    context.reqRPC.Auth.Salt = salt
-}
-
-func (context *Context) SetAuthHash(hash []byte)  {
-    context.reqRPC.Auth.Hash = hash
-}
-
-func (context *Context) AuthIdent() []byte {
-    return context.reqRPC.Auth.Ident
-}
-
-func (context *Context) AuthSalt() []byte {
-    return context.reqRPC.Auth.Salt
-}
-
-func (context *Context) AuthHash() []byte {
-    return context.reqRPC.Auth.Hash
-}
-
-func (context *Context) Auth() *Auth {
-    return context.reqRPC.Auth
-}

empty.go

@@ -1,13 +0,0 @@
-/*
- *
- * Copyright 2022 Oleg Borodin  <borodin@unix7.org>
- *
- */
-
-package dsrpc
-
-type Empty struct {}
-
-func NewEmpty() *Empty {
-    return &Empty{}
-}

error.go

@@ -1,43 +0,0 @@
-/*
- * Copyright 2022 Oleg Borodin  <borodin@unix7.org>
- */
-
-package dsrpc
-
-import (
-    "fmt"
-    "runtime"
-    "io"
-)
-
-var develMode bool = false
-var debugMode bool = false
-
-
-func SetDevelMode(mode bool) {
-    develMode = mode
-}
-func SetDebugMode(mode bool) {
-    debugMode = mode
-}
-
-func Err(err error) error {
-    switch err {
-        case io.EOF:
-            return err
-    }
-    if err != nil {
-        switch {
-            case develMode == true:
-                pc, filename, line, _ := runtime.Caller(1)
-                funcName := runtime.FuncForPC(pc).Name()
-                err = fmt.Errorf(" %s:%d:%s:%s", filename, line, funcName, err.Error())
-            case debugMode == true:
-                pc, _, line, _ := runtime.Caller(1)
-                funcName := runtime.FuncForPC(pc).Name()
-                err = fmt.Errorf(" %s:%d:%s ", funcName, line, err.Error())
-            default:
-        }
-    }
-    return err
-}

example/api/hello.go

@@ -12,14 +12,7 @@ type HelloParams struct {
     Message string      `msgpack:"message" json:"message"`
 }
 
-func NewHelloParams() *HelloParams {
-    return &HelloParams{}
-}
-
 type HelloResult struct {
     Message string      `msgpack:"message" json:"message"`
 }
 
-func NewHelloResult() *HelloResult {
-    return &HelloResult{}
-}

example/cli/netcli.go

@@ -7,8 +7,12 @@
 package main
 
 import (
+	"context"
 	"fmt"
+	"time"
+
 	"github.com/kindsoldier/dsrpc"
+
 	"netsrv/api"
 )
 
@@ -23,12 +27,16 @@ func main() {
 func exec() error {
 	var err error
 
-    params := api.NewHelloParams()
-    params.Message = "hello, server!"
+	params := api.HelloParams{
+		Message: "hello, server!",
+	}
 
-    result := api.NewHelloResult()
+	result := api.HelloResult{}
 
-    err = dsrpc.Exec("127.0.0.1:8081", api.HelloMethod, params, result, nil)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = dsrpc.Exec(ctx, "127.0.0.1:8081", api.HelloMethod, &params, &result, nil)
 	if err != nil {
 		return err
 	}

example/go.mod

@@ -1,7 +1,5 @@
 module netsrv
 
-go 1.17
+go 1.19
 
-require github.com/kindsoldier/dsrpc v0.0.1
-
-replace github.com/kindsoldier/dsrpc => ../
+require github.com/kindsoldier/dsrpc v1.2.1

example/go.sum

@@ -1,10 +1,6 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/kindsoldier/dsrpc v1.2.1 h1:sw1a3MAD83Do1Fu+Dh+AHArrwVMgZ/KTLUWWTkQ6vj8=
+github.com/kindsoldier/dsrpc v1.2.1/go.mod h1:zYb5yYfE/18BYK+iCUNcpkZ4uArwUNNhwYkUK8xDHQk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

example/srv/netsrv.go

@@ -8,8 +8,9 @@ package main
 
 import (
     "log"
-    "github.com/kindsoldier/dsrpc"
     "netsrv/api"
+
+    "github.com/kindsoldier/dsrpc"
 )
 
 func main() {
@@ -46,20 +47,19 @@ func NewController() *Controller {
     return &Controller{}
 }
 
-func (cont *Controller) HelloHandler(context *dsrpc.Context) error {
+func (cont *Controller) HelloHandler(content *dsrpc.Content) error {
     var err error
-    params := api.NewHelloParams()
-    err = context.BindParams(params)
+    params := api.HelloParams{}
+    err = content.BindParams(&params)
     if err != nil {
         return err
     }
-
     log.Println("hello message:", params.Message)
 
-    result := api.NewHelloResult()
-    result.Message = "hello!"
-
-    err = context.SendResult(result, 0)
+    result := api.HelloResult{
+        Message: "hello, client!",
+    }
+    err = content.SendResult(&result, 0)
     if err != nil {
         return err
     }

exec_test.go

@@ -6,6 +6,7 @@ package dsrpc
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"io"
@@ -16,27 +17,47 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+const HelloMethod string = "hello"
+
+type HelloParams struct {
+	Message string `json:"message" msgpack:"message"`
+}
+
+type HelloResult struct {
+	Message string `json:"message" msgpack:"message"`
+}
+
+const SaveMethod string = "save"
+
+type SaveParams HelloParams
+type SaveResult HelloResult
+
+const LoadMethod string = "load"
+
+type LoadParams HelloParams
+type LoadResult HelloResult
+
 func TestLocalExec(t *testing.T) {
 	var err error
-    params := NewHelloParams()
+	params := HelloParams{}
 	params.Message = "hello server!"
-    result := NewHelloResult()
+	result := HelloResult{}
 
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
-    err = LocalExec(HelloMethod, params, result, auth, helloHandler)
+	err = LocalExec(HelloMethod, &params, &result, auth, helloHandler)
 	require.NoError(t, err)
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
-}
 
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
+}
 
 func TestLocalSave(t *testing.T) {
 	var err error
 
-    params := NewSaveParams()
+	params := SaveParams{}
 	params.Message = "save data!"
-    result := NewHelloResult()
+	result := SaveResult{}
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
 	var binSize int64 = 16
@@ -46,34 +67,38 @@ func TestLocalSave(t *testing.T) {
 
 	reader := bytes.NewReader(binBytes)
 
-    err = LocalPut(SaveMethod, reader, binSize, params, result, auth, saveHandler)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = LocalPut(ctx, SaveMethod, reader, binSize, &params, &result, auth, saveHandler)
 	require.NoError(t, err)
 
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
 }
 
-
 func TestLocalLoad(t *testing.T) {
 	var err error
 
-    params := NewLoadParams()
+	params := LoadParams{}
 	params.Message = "load data!"
-    result := NewHelloResult()
+	result := LoadResult{}
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
 	binBytes := make([]byte, 0)
 	writer := bytes.NewBuffer(binBytes)
 
-    err = LocalGet(LoadMethod, writer, params, result, auth, loadHandler)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = LocalGet(ctx, LoadMethod, writer, &params, &result, auth, loadHandler)
 	require.NoError(t, err)
 
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
 	logDebug("bin size:", len(writer.Bytes()))
 }
 
-
 func TestNetExec(t *testing.T) {
 	go testServ(false)
 	time.Sleep(10 * time.Millisecond)
@@ -106,16 +131,16 @@ func BenchmarkNetPut(b *testing.B) {
 			clientSave()
 		}
 	}
-    b.SetParallelism(10)
+	b.SetParallelism(2000)
 	b.RunParallel(pBench)
 }
 
 func clientHello() error {
 	var err error
 
-    params := NewHelloParams()
+	params := HelloParams{}
 	params.Message = "hello server!"
-    result := NewHelloResult()
+	result := HelloResult{}
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
 	var binSize int64 = 16
@@ -123,23 +148,25 @@ func clientHello() error {
 	binBytes := make([]byte, binSize)
 	rand.Read(binBytes)
 
-    err = Exec("127.0.0.1:8081", HelloMethod, params, result, auth)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = Exec(ctx, "127.0.0.1:8081", HelloMethod, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
 	}
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
 	return err
 }
 
-
 func clientSave() error {
 	var err error
 
-    params := NewSaveParams()
+	params := SaveParams{}
 	params.Message = "save data!"
-    result := NewHelloResult()
+	result := SaveResult{}
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
 	var binSize int64 = 16
@@ -149,41 +176,44 @@ func clientSave() error {
 
 	reader := bytes.NewReader(binBytes)
 
-    err = Put("127.0.0.1:8081", SaveMethod, reader, binSize, params, result, auth)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = Put(ctx, "127.0.0.1:8081", SaveMethod, reader, binSize, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
 	}
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
 	return err
 }
 
-
 func clientLoad() error {
 	var err error
 
-    params := NewLoadParams()
+	params := LoadParams{}
 	params.Message = "load data!"
-    result := NewHelloResult()
+	result := LoadResult{}
 	auth := CreateAuth([]byte("qwert"), []byte("12345"))
 
-
 	binBytes := make([]byte, 0)
 	writer := bytes.NewBuffer(binBytes)
 
-    err = Get("127.0.0.1:8081", LoadMethod, writer, params, result, auth)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = Get(ctx, "127.0.0.1:8081", LoadMethod, writer, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
 	}
-    resultJSON, _ := json.Marshal(result)
-    logDebug("method result:", string(resultJSON))
+	resultJson, _ := json.Marshal(result)
+	logDebug("method result:", string(resultJson))
 	logDebug("bin size:", len(writer.Bytes()))
 	return err
 }
 
-
 var testServRun bool = false
 
 func testServ(quiet bool) error {
@@ -216,58 +246,61 @@ func testServ(quiet bool) error {
 	return err
 }
 
-func auth(context *Context) error {
+func auth(content *Content) error {
 	var err error
-    reqIdent := context.AuthIdent()
-    reqSalt := context.AuthSalt()
-    reqHash := context.AuthHash()
+	reqIdent := content.AuthIdent()
+	reqSalt := content.AuthSalt()
+	reqHash := content.AuthHash()
 
 	ident := reqIdent
 	pass := []byte("12345")
 
-    auth := context.Auth()
-    logDebug("auth ", string(auth.JSON()))
+	auth := content.Auth()
+	logDebug("auth ", string(auth.Json()))
 
 	ok := CheckHash(ident, pass, reqSalt, reqHash)
 	logDebug("auth ok:", ok)
 	if !ok {
 		err = errors.New("auth ident or pass missmatch")
-        context.SendError(err)
+		content.SendError(err)
 		return err
 	}
 	return err
 }
 
-func helloHandler(context *Context) error {
+func helloHandler(content *Content) error {
 	var err error
-    params := NewHelloParams()
+	params := HelloParams{}
 
-    err = context.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}
 
-    err = context.ReadBin(io.Discard)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = content.ReadBin(ctx, io.Discard)
 	if err != nil {
-        context.SendError(err)
+		content.SendError(err)
 		return err
 	}
 
-    result := NewHelloResult()
+	result := HelloResult{}
 	result.Message = "hello, client!"
 
-    err = context.SendResult(result, 0)
+	err = content.SendResult(result, 0)
 	if err != nil {
 		return err
 	}
 	return err
 }
 
-func saveHandler(context *Context) error {
+func saveHandler(content *Content) error {
 	var err error
-    params := NewSaveParams()
+	params := SaveParams{}
 
-    err = context.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}
@@ -275,34 +308,40 @@ func saveHandler(context *Context) error {
 	bufferBytes := make([]byte, 0, 1024)
 	binWriter := bytes.NewBuffer(bufferBytes)
 
-    err = context.ReadBin(binWriter)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = content.ReadBin(ctx, binWriter)
 	if err != nil {
-        context.SendError(err)
+		content.SendError(err)
 		return err
 	}
 
-    result := NewSaveResult()
+	result := SaveResult{}
 	result.Message = "saved successfully!"
 
-    err = context.SendResult(result, 0)
+	err = content.SendResult(result, 0)
 	if err != nil {
 		return err
 	}
 	return err
 }
 
-func loadHandler(context *Context) error {
+func loadHandler(content *Content) error {
 	var err error
-    params := NewSaveParams()
+	params := SaveParams{}
 
-    err = context.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}
 
-    err = context.ReadBin(io.Discard)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = content.ReadBin(ctx, io.Discard)
 	if err != nil {
-        context.SendError(err)
+		content.SendError(err)
 		return err
 	}
 
@@ -313,62 +352,19 @@ func loadHandler(context *Context) error {
 
 	binReader := bytes.NewReader(binBytes)
 
-    result := NewSaveResult()
+	result := SaveResult{}
 	result.Message = "load successfully!"
 
-    err = context.SendResult(result, binSize)
+	err = content.SendResult(result, binSize)
 	if err != nil {
 		return err
 	}
-    binWriter := context.BinWriter()
-    _, err = CopyBytes(binReader, binWriter, binSize)
+
+	binWriter := content.BinWriter()
+	_, err = CopyBytes(ctx, binReader, binWriter, binSize)
 	if err != nil {
 		return err
 	}
 
 	return err
 }
-
-
-const HelloMethod string = "hello"
-
-type HelloParams struct {
-    Message string      `json:"message" msgpack:"message"`
-}
-
-func NewHelloParams() *HelloParams {
-    return &HelloParams{}
-}
-
-type HelloResult struct {
-    Message string      `json:"message" msgpack:"message"`
-}
-
-func NewHelloResult() *HelloResult {
-    return &HelloResult{}
-}
-
-
-const SaveMethod string = "save"
-type SaveParams HelloParams
-type SaveResult HelloResult
-
-func NewSaveParams() *SaveParams {
-    return &SaveParams{}
-}
-func NewSaveResult() *SaveResult {
-    return &SaveResult{}
-}
-
-
-
-const LoadMethod string = "load"
-type LoadParams HelloParams
-type LoadResult HelloResult
-
-func NewLoadParams() *LoadParams {
-    return &LoadParams{}
-}
-func NewLoadResult() *LoadResult {
-    return &LoadResult{}
-}

faddr.go

@@ -10,9 +10,10 @@ type FAddr struct {
 }
 
 func NewFAddr() *FAddr {
-    var addr FAddr
-    addr.network  = "tcp"
-    addr.address = "127.0.0.1:5000"
+	addr := FAddr{
+		network: "tcp",
+		address: "127.0.0.1:5000",
+	}
 	return &addr
 }
 

faddr_test.go

@@ -9,6 +9,7 @@ package dsrpc
 import (
 	"net"
 	"testing"
+
 	"github.com/stretchr/testify/require"
 )
 

go.mod

@@ -1,15 +1,11 @@
 module github.com/kindsoldier/dsrpc
 
-go 1.17
+go 1.19
 
-require (
-	github.com/stretchr/testify v1.8.0
-	github.com/vmihailenco/msgpack/v5 v5.3.5
-)
+require github.com/stretchr/testify v1.8.2
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -5,14 +5,11 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
-github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
-github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

header.go

@@ -7,16 +7,18 @@
 package dsrpc
 
 import (
-    "errors"
+	"bytes"
 	"encoding/binary"
 	"encoding/json"
-    "bytes"
+	"errors"
 )
 
-const headerSize    int64   = 16 * 2
-const sizeOfInt64   int     = 8
-const magicCodeA    int64   = 0xEE00ABBA
-const magicCodeB    int64   = 0xEE44ABBA
+const (
+	headerSize  int64 = 16 * 2
+	sizeOfInt64 int   = 8
+	magicCodeA  int64 = 0xEE00ABBA
+	magicCodeB  int64 = 0xEE44ABBA
+)
 
 type Header struct {
 	magicCodeA int64 `json:"magicCodeA"`
@@ -25,74 +27,75 @@ type Header struct {
 	magicCodeB int64 `json:"magicCodeB"`
 }
 
-
-func NewHeader() *Header {
+func NewEmptyHeader() *Header {
 	return &Header{
 		magicCodeA: magicCodeA,
 		magicCodeB: magicCodeB,
 	}
 }
 
-func (hdr *Header) JSON() []byte {
+func (hdr *Header) ToJson() []byte {
 	jBytes, _ := json.Marshal(hdr)
 	return jBytes
 }
 
-
 func (hdr *Header) Pack() ([]byte, error) {
 	var err error
 	headerBytes := make([]byte, 0, headerSize)
 	headerBuffer := bytes.NewBuffer(headerBytes)
 
-    magicCodeABytes := encoderI64(hdr.magicCodeA)
+	magicCodeABytes := EncoderI64(hdr.magicCodeA)
 	headerBuffer.Write(magicCodeABytes)
 
-    rpcSizeBytes := encoderI64(hdr.rpcSize)
+	rpcSizeBytes := EncoderI64(hdr.rpcSize)
 	headerBuffer.Write(rpcSizeBytes)
 
-    binSizeBytes := encoderI64(hdr.binSize)
+	binSizeBytes := EncoderI64(hdr.binSize)
 	headerBuffer.Write(binSizeBytes)
 
-    magicCodeBBytes := encoderI64(hdr.magicCodeB)
+	magicCodeBBytes := EncoderI64(hdr.magicCodeB)
 	headerBuffer.Write(magicCodeBBytes)
 
-    return headerBuffer.Bytes(), Err(err)
+	return headerBuffer.Bytes(), err
 }
 
 func UnpackHeader(headerBytes []byte) (*Header, error) {
 	var err error
-    header := NewHeader()
+
 	headerReader := bytes.NewReader(headerBytes)
 
 	magicCodeABytes := make([]byte, sizeOfInt64)
 	headerReader.Read(magicCodeABytes)
-    header.magicCodeA = decoderI64(magicCodeABytes)
 
 	rpcSizeBytes := make([]byte, sizeOfInt64)
 	headerReader.Read(rpcSizeBytes)
-    header.rpcSize = decoderI64(rpcSizeBytes)
 
 	binSizeBytes := make([]byte, sizeOfInt64)
 	headerReader.Read(binSizeBytes)
-    header.binSize = decoderI64(binSizeBytes)
 
 	magicCodeBBytes := make([]byte, sizeOfInt64)
 	headerReader.Read(magicCodeBBytes)
-    header.magicCodeB = decoderI64(magicCodeBBytes)
+
+	header := &Header{
+		magicCodeA: DecoderI64(magicCodeABytes),
+		rpcSize:    DecoderI64(rpcSizeBytes),
+		binSize:    DecoderI64(binSizeBytes),
+		magicCodeB: DecoderI64(magicCodeBBytes),
+	}
 
 	if header.magicCodeA != magicCodeA || header.magicCodeB != magicCodeB {
-        err = errors.New("wrong protocol magic code")
-        return header, Err(err)
+		err = errors.New("Wrong protocol magic code")
+		return header, err
 	}
-    return header, Err(err)
+	return header, err
 }
 
-func encoderI64(i int64) []byte {
+func EncoderI64(i int64) []byte {
 	buffer := make([]byte, sizeOfInt64)
 	binary.BigEndian.PutUint64(buffer, uint64(i))
 	return buffer
 }
 
-func decoderI64(b []byte) int64 {
+func DecoderI64(b []byte) int64 {
 	return int64(binary.BigEndian.Uint64(b))
 }

midware.go

@@ -8,22 +8,22 @@ import (
 	"time"
 )
 
-func LogRequest(context *Context) error {
+func LogRequest(content *Content) error {
 	var err error
-    logDebug("request:", string(context.reqRPC.JSON()))
-    return Err(err)
+	logDebug("request:", string(content.reqBlock.ToJson()))
+	return err
 }
 
-func LogResponse(context *Context) error {
+func LogResponse(content *Content) error {
 	var err error
-    logDebug("response:", string(context.resRPC.JSON()))
-    return Err(err)
+	logDebug("response:", string(content.resBlock.ToJson()))
+	return err
 }
 
-func LogAccess(context *Context) error {
+func LogAccess(content *Content) error {
 	var err error
-    execTime := time.Now().Sub(context.start)
-    login := string(context.AuthIdent())
-    logAccess(context.remoteHost, login, context.reqRPC.Method, execTime)
-    return Err(err)
+	execTime := time.Now().Sub(content.start)
+	login := string(content.AuthIdent())
+	logAccess(content.remoteHost, login, content.reqBlock.Method, execTime)
+	return err
 }

packet.go

@@ -4,20 +4,15 @@
 
 package dsrpc
 
-import (
-    "encoding/json"
-)
-
 type Packet struct {
 	header     []byte
 	rcpPayload []byte
 }
 
-func NewPacket() *Packet {
-    return &Packet{}
+func NewEmptyPacket() *Packet {
+	packet := &Packet{
+		header:     make([]byte, 0),
+		rcpPayload: make([]byte, 0),
 	}
-
-func (pkt *Packet) JSON() []byte {
-    jBytes, _ := json.Marshal(pkt)
-    return jBytes
+	return packet
 }

request.go

@@ -8,27 +8,35 @@ package dsrpc
 
 import (
 	"encoding/json"
-    encoder "github.com/vmihailenco/msgpack/v5"
+
+	encoder "encoding/json"
 )
 
+type EmptyParams struct{}
+
+func NewEmptyParams() *EmptyParams {
+	return &EmptyParams{}
+}
+
 type Request struct {
 	Method string `json:"method"            msgpack:"method"`
 	Params any    `json:"params,omitempty"  msgpack:"params"`
 	Auth   *Auth  `json:"auth,omitempty"    msgpack:"auth"`
 }
 
-func NewRequest() *Request {
+func NewEmptyRequest() *Request {
 	req := &Request{}
 	req.Auth = &Auth{}
+	req.Params = NewEmptyParams()
 	return req
 }
 
 func (req *Request) Pack() ([]byte, error) {
 	rBytes, err := encoder.Marshal(req)
-    return rBytes, Err(err)
+	return rBytes, err
 }
 
-func (req *Request) JSON() []byte {
+func (req *Request) ToJson() []byte {
 	jBytes, _ := json.Marshal(req)
 	return jBytes
 }

response.go

@@ -6,25 +6,33 @@ package dsrpc
 
 import (
 	"encoding/json"
-    encoder "github.com/vmihailenco/msgpack/v5"
+
+	encoder "encoding/json"
 )
 
+type EmptyResult struct{}
+
+func NewEmptyResult() *EmptyResult {
+	return &EmptyResult{}
+}
 
 type Response struct {
 	Error  string `json:"error"   msgpack:"error"`
 	Result any    `json:"result"  msgpack:"result"`
 }
 
-func NewResponse() *Response {
-    return &Response{}
+func NewEmptyResponse() *Response {
+	return &Response{
+		Result: NewEmptyResult(),
+	}
 }
 
-func (resp *Response) JSON() []byte {
+func (resp *Response) ToJson() []byte {
 	jBytes, _ := json.Marshal(resp)
 	return jBytes
 }
 
 func (resp *Response) Pack() ([]byte, error) {
 	rBytes, err := encoder.Marshal(resp)
-    return rBytes, Err(err)
+	return rBytes, err
 }

server.go

@@ -6,6 +6,7 @@ package dsrpc
 
 import (
         "context"
+        "crypto/tls"
         "errors"
         "fmt"
         "io"
@@ -13,10 +14,10 @@ import (
         "sync"
         "time"
 
-    encoder "github.com/vmihailenco/msgpack/v5"
+        encoder "encoding/json"
 )
 
-type HandlerFunc =  func(*Context) error
+type HandlerFunc = func(*Content) error
 
 type Service struct {
         handlers    map[string]HandlerFunc
@@ -28,6 +29,8 @@ type Service struct {
         keepalive   bool
         kaTime      time.Duration
         kaMtx       sync.Mutex
+        listener    net.Listener
+        tcpListener *net.TCPListener
 }
 
 func NewService() *Service {
@@ -52,7 +55,7 @@ func (svc *Service) PostMiddleware(mw HandlerFunc) {
         svc.postMw = append(svc.postMw, mw)
 }
 
-func (svc *Service) Handler(method string, handler HandlerFunc) {
+func (svc *Service) Handle(method string, handler HandlerFunc) {
         svc.handlers[method] = handler
 }
 
@@ -77,14 +80,14 @@ func (svc *Service) Listen(address string) error {
                 err = fmt.Errorf("unable to resolve adddress: %s", err)
                 return err
         }
-    listener, err := net.ListenTCP("tcp", addr)
+        svc.tcpListener, err = net.ListenTCP("tcp", addr)
         if err != nil {
                 err = fmt.Errorf("unable to start listener: %s", err)
                 return err
         }
 
         for {
-        conn, err := listener.AcceptTCP()
+                conn, err := svc.tcpListener.AcceptTCP()
                 if err != nil {
                         logError("conn accept err:", err)
                 }
@@ -94,14 +97,41 @@ func (svc *Service) Listen(address string) error {
                 default:
                 }
                 svc.wg.Add(1)
+                go svc.handleTCPConn(conn, svc.wg)
+        }
+        return err
+}
+
+func (svc *Service) ListenTLS(address string, tlsConfig *tls.Config) error {
+        var err error
+        logInfo("server listen:", address)
+
+        svc.listener, err = tls.Listen("tcp", address, tlsConfig)
+        if err != nil {
+                err = fmt.Errorf("unable to start listener: %s", err)
+                return err
+        }
+
+        for {
+                conn, err := svc.listener.Accept()
+                if err != nil {
+                        logError("conn accept err:", err)
+                }
+                select {
+                case <-svc.ctx.Done():
+                        logMessage("accept loop done")
+                        return err
+                default:
+                }
+                svc.wg.Add(1)
                 go svc.handleConn(conn, svc.wg)
         }
         return err
 }
 
-func notFound(context *Context) error {
+func notFound(content *Content) error {
         execErr := errors.New("method not found")
-    err := context.SendError(execErr)
+        err := content.SendError(execErr)
         return err
 }
 
@@ -109,6 +139,12 @@ func (svc *Service) Stop() error {
         var err error
         // Disable new connection
         logInfo("cancel rpc accept loop")
+        if svc.listener != nil {
+                svc.listener.Close()
+        }
+        if svc.tcpListener != nil {
+                svc.tcpListener.Close()
+        }
         svc.cancel()
         // Wait handlers
         logInfo("wait rpc handlers")
@@ -116,9 +152,8 @@ func (svc *Service) Stop() error {
         return err
 }
 
-func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
+func (svc *Service) handleTCPConn(conn *net.TCPConn, wg *sync.WaitGroup) {
         var err error
-
         if svc.keepalive {
                 err = conn.SetKeepAlive(true)
                 if err != nil {
@@ -133,14 +168,20 @@ func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
                         }
                 }
         }
-    context := CreateContext(conn)
+        svc.handleConn(conn, wg)
+}
+
+func (svc *Service) handleConn(conn net.Conn, wg *sync.WaitGroup) {
+        var err error
+
+        content := CreateContent(conn)
 
         remoteAddr := conn.RemoteAddr().String()
         remoteHost, _, _ := net.SplitHostPort(remoteAddr)
-    context.remoteHost = remoteHost
+        content.remoteHost = remoteHost
 
-    context.binReader = conn
-    context.binWriter = io.Discard
+        content.binReader = conn
+        content.binWriter = io.Discard
 
         exitFunc := func() {
                 conn.Close()
@@ -159,151 +200,149 @@ func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
         }
         defer recovFunc()
 
-    err = context.ReadRequest()
+        err = content.ReadRequest()
         if err != nil {
-        err = Err(err)
+                err = err
                 return
         }
 
-    err = context.BindMethod()
+        err = content.BindMethod()
         if err != nil {
-        err = Err(err)
+                err = err
                 return
         }
         for _, mw := range svc.preMw {
-        err = mw(context)
+                err = mw(content)
                 if err != nil {
-            err = Err(err)
+                        err = err
                         return
                 }
         }
-    err = svc.Route(context)
+        err = svc.Route(content)
         if err != nil {
-        err = Err(err)
+                err = err
                 return
         }
         for _, mw := range svc.postMw {
-        err = mw(context)
+                err = mw(content)
                 if err != nil {
-            err = Err(err)
+                        err = err
                         return
                 }
         }
         return
 }
 
-func (svc *Service) Route(context *Context) error {
-    handler, ok := svc.handlers[context.reqRPC.Method]
+func (svc *Service) Route(content *Content) error {
+        handler, ok := svc.handlers[content.reqBlock.Method]
         if ok {
-        return Err(handler(context))
+                return handler(content)
         }
-    return Err(notFound(context))
+        return notFound(content)
 }
 
-func (context *Context) ReadRequest() error {
+func (content *Content) ReadRequest() error {
         var err error
 
-    context.reqPacket.header, err = ReadBytes(context.sockReader, headerSize)
+        content.reqPacket.header, err = ReadBytes(content.sockReader, headerSize)
         if err != nil {
-        return Err(err)
+                return err
         }
-    context.reqHeader, err = UnpackHeader(context.reqPacket.header)
+        content.reqHeader, err = UnpackHeader(content.reqPacket.header)
         if err != nil {
-        return Err(err)
+                return err
         }
 
-    rpcSize := context.reqHeader.rpcSize
-    context.reqPacket.rcpPayload, err = ReadBytes(context.sockReader, rpcSize)
+        rpcSize := content.reqHeader.rpcSize
+        content.reqPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
         if err != nil {
-        return Err(err)
+                return err
         }
-    return Err(err)
+        return err
 }
 
-func (context *Context) BinWriter() io.Writer {
-    return context.sockWriter
+func (content *Content) BinWriter() io.Writer {
+        return content.sockWriter
 }
 
-func (context *Context) BinReader() io.Reader {
-    return context.sockReader
+func (content *Content) BinReader() io.Reader {
+        return content.sockReader
 }
 
-func (context *Context) BinSize() int64 {
-    return context.reqHeader.binSize
+func (content *Content) BinSize() int64 {
+        return content.reqHeader.binSize
 }
 
-func (context *Context) ReadBin(writer io.Writer) error {
+func (content *Content) ReadBin(ctx context.Context, writer io.Writer) error {
         var err error
-    _, err = CopyBytes(context.sockReader, writer, context.reqHeader.binSize)
-    return Err(err)
+        _, err = CopyBytes(ctx, content.sockReader, writer, content.reqHeader.binSize)
+        return err
 }
 
-
-func (context *Context) BindMethod() error {
+func (content *Content) BindMethod() error {
         var err error
-    err = encoder.Unmarshal(context.reqPacket.rcpPayload, context.reqRPC)
-    return Err(err)
+        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
+        return err
 }
 
-func (context *Context) BindParams(params any) error {
+func (content *Content) BindParams(params any) error {
         var err error
-    context.reqRPC.Params = params
-    err = encoder.Unmarshal(context.reqPacket.rcpPayload, context.reqRPC)
+        content.reqBlock.Params = params
+        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
         if err != nil {
-        return Err(err)
+                return err
         }
-    return Err(err)
+        return err
 }
 
-func (context *Context) SendResult(result any, binSize int64) error {
+func (content *Content) SendResult(result any, binSize int64) error {
         var err error
-    context.resRPC.Result = result
+        content.resBlock.Result = result
 
-    context.resPacket.rcpPayload, err = context.resRPC.Pack()
+        content.resPacket.rcpPayload, err = content.resBlock.Pack()
         if err != nil {
-        return Err(err)
+                return err
         }
-    context.resHeader.rpcSize = int64(len(context.resPacket.rcpPayload))
-    context.resHeader.binSize = binSize
+        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+        content.resHeader.binSize = binSize
 
-    context.resPacket.header, err = context.resHeader.Pack()
+        content.resPacket.header, err = content.resHeader.Pack()
         if err != nil {
-        return Err(err)
+                return err
         }
-    _, err = context.sockWriter.Write(context.resPacket.header)
+        _, err = content.sockWriter.Write(content.resPacket.header)
         if err != nil {
-        return Err(err)
+                return err
         }
-    _, err = context.sockWriter.Write(context.resPacket.rcpPayload)
+        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
         if err != nil {
-        return Err(err)
+                return err
         }
-    return Err(err)
+        return err
 }
 
-
-func (context *Context) SendError(execErr error) error {
+func (content *Content) SendError(execErr error) error {
         var err error
 
-    context.resRPC.Error = execErr.Error()
-    context.resRPC.Result = NewEmpty()
+        content.resBlock.Error = execErr.Error()
+        content.resBlock.Result = NewEmptyResult()
 
-    context.resPacket.rcpPayload, err = context.resRPC.Pack()
+        content.resPacket.rcpPayload, err = content.resBlock.Pack()
         if err != nil {
-        return Err(err)
+                return err
         }
-    context.resHeader.rpcSize = int64(len(context.resPacket.rcpPayload))
-    context.resPacket.header, err = context.resHeader.Pack()
+        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+        content.resPacket.header, err = content.resHeader.Pack()
         if err != nil {
-        return Err(err)
+                return err
         }
-    _, err = context.sockWriter.Write(context.resPacket.header)
+        _, err = content.sockWriter.Write(content.resPacket.header)
         if err != nil {
-        return Err(err)
+                return err
         }
-    _, err = context.sockWriter.Write(context.resPacket.rcpPayload)
+        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
         if err != nil {
-        return Err(err)
+                return err
         }
-    return Err(err)
+        return err
 }

tools.go

@@ -5,18 +5,19 @@
 package dsrpc
 
 import (
+	"context"
 	"errors"
-    "io"
 	"fmt"
+	"io"
 )
 
 func ReadBytes(reader io.Reader, size int64) ([]byte, error) {
 	buffer := make([]byte, size)
 	read, err := io.ReadFull(reader, buffer)
-    return buffer[0:read], Err(err)
+	return buffer[0:read], err
 }
 
-func CopyBytes(reader io.Reader, writer io.Writer, dataSize int64) (int64, error) {
+func CopyBytes(ctx context.Context, reader io.Reader, writer io.Writer, dataSize int64) (int64, error) {
 	var err error
 	var bSize int64 = 1024 * 16
 	var total int64 = 0
@@ -24,6 +25,12 @@ func CopyBytes(reader io.Reader, writer io.Writer, dataSize int64) (int64, error
 	buffer := make([]byte, bSize)
 
 	for {
+		select {
+		case <-ctx.Done():
+			return total, errors.New("break by context")
+		default:
+		}
+
 		if reader == nil {
 			return total, errors.New("reader is nil")
 		}
@@ -39,19 +46,19 @@ func CopyBytes(reader io.Reader, writer io.Writer, dataSize int64) (int64, error
 		received, err := reader.Read(buffer[0:bSize])
 		if err != nil {
 			err = fmt.Errorf("read error: %v", err)
-            return total, Err(err)
+			return total, err
 		}
 		recorded, err := writer.Write(buffer[0:received])
 		if err != nil {
 			err = fmt.Errorf("write error: %v", err)
-            return total, Err(err)
+			return total, err
 		}
 		if recorded != received {
 			err = errors.New("size mismatch")
-            return total, Err(err)
+			return total, err
 		}
 		total += int64(recorded)
 		remains -= int64(recorded)
 	}
-    return total, Err(err)
+	return total, err
 }

validate.go

@@ -4,31 +4,35 @@
 
 package dsrpc
 
-
 import (
+	"context"
 	"io"
 	"net"
 )
 
-func LocalExec(method string, param any, result any, auth *Auth, handler HandlerFunc) error {
+func LocalExec(method string, param, result any, auth *Auth, handler HandlerFunc) error {
 	var err error
 
 	cliConn, srvConn := NewFConn()
 
-    context := CreateContext(cliConn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
+	content := CreateContent(cliConn)
+	content.reqBlock.Method = method
 
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
+	if param != nil {
+		content.reqBlock.Params = param
 	}
-    err = context.CreateRequest()
+	if auth != nil {
+		content.reqBlock.Auth = auth
+	}
+	if result != nil {
+		content.resBlock.Result = result
+	}
+
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-    err = context.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
@@ -36,11 +40,11 @@ func LocalExec(method string, param any, result any, auth *Auth, handler Handler
 	if err != nil {
 		return err
 	}
-    err = context.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-    err = context.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
@@ -48,35 +52,39 @@ func LocalExec(method string, param any, result any, auth *Auth, handler Handler
 	return err
 }
 
-func LocalPut(method string, reader io.Reader, size int64, param, result any, auth *Auth, handler HandlerFunc) error {
+func LocalPut(ctx context.Context, method string, reader io.Reader, size int64, param, result any, auth *Auth, handler HandlerFunc) error {
 
 	var err error
 
 	cliConn, srvConn := NewFConn()
 
-    context := CreateContext(cliConn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
+	content := CreateContent(cliConn)
+	content.reqBlock.Method = method
 
-    context.binReader = reader
-    context.binWriter = cliConn
-
-    context.reqHeader.binSize = size
-
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
+	if param != nil {
+		content.reqBlock.Params = param
 	}
-    err = context.CreateRequest()
+	if auth != nil {
+		content.reqBlock.Auth = auth
+	}
+	if result != nil {
+		content.resBlock.Result = result
+	}
+
+	content.binReader = reader
+	content.binWriter = cliConn
+
+	content.reqHeader.binSize = size
+
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-    err = context.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
-    err = context.UploadBin()
+	err = content.uploadBin(ctx)
 	if err != nil {
 		return err
 	}
@@ -84,40 +92,43 @@ func LocalPut(method string, reader io.Reader, size int64, param, result any, au
 	if err != nil {
 		return err
 	}
-    err = context.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-    err = context.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
 	return err
 }
 
-
-func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, handler HandlerFunc) error {
+func LocalGet(ctx context.Context, method string, writer io.Writer, param, result any, auth *Auth, handler HandlerFunc) error {
 	var err error
 
 	cliConn, srvConn := NewFConn()
 
-    context := CreateContext(cliConn)
-    context.reqRPC.Method = method
-    context.reqRPC.Params = param
-    context.reqRPC.Auth = auth
-    context.resRPC.Result = result
+	content := CreateContent(cliConn)
+	content.reqBlock.Method = method
 
-    context.binReader = cliConn
-    context.binWriter = writer
-
-    if context.reqRPC.Params == nil {
-        context.reqRPC.Params = NewEmpty()
+	if param != nil {
+		content.reqBlock.Params = param
 	}
-    err = context.CreateRequest()
+	if auth != nil {
+		content.reqBlock.Auth = auth
+	}
+	if result != nil {
+		content.resBlock.Result = result
+	}
+
+	content.binReader = cliConn
+	content.binWriter = writer
+
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-    err = context.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
@@ -126,15 +137,15 @@ func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, ha
 	if err != nil {
 		return err
 	}
-    err = context.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-    err = context.DownloadBin()
+	err = content.downloadBin(ctx)
 	if err != nil {
 		return err
 	}
-    err = context.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
@@ -143,22 +154,22 @@ func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, ha
 
 func LocalService(conn net.Conn, handler HandlerFunc) error {
 	var err error
-    context := CreateContext(conn)
+	content := CreateContent(conn)
 
 	remoteAddr := conn.RemoteAddr().String()
 	remoteHost, _, _ := net.SplitHostPort(remoteAddr)
-    context.remoteHost = remoteHost
+	content.remoteHost = remoteHost
 
-    context.binReader = conn
-    context.binWriter = io.Discard
+	content.binReader = conn
+	content.binWriter = io.Discard
 
-    err = context.ReadRequest()
+	err = content.ReadRequest()
 	if err != nil {
 		return err
 	}
-    err = context.BindMethod()
+	err = content.BindMethod()
 	if err != nil {
 		return err
 	}
-    return handler(context)
+	return handler(content)
 }

xauth.go

@@ -5,11 +5,11 @@
 package dsrpc
 
 import (
-    "encoding/json"
 	"bytes"
+	"crypto/sha256"
+	"encoding/json"
 	"math/rand"
 	"time"
-    "crypto/sha256"
 )
 
 func init() {
@@ -26,7 +26,7 @@ func NewAuth() *Auth {
 	return &Auth{}
 }
 
-func (this *Auth) JSON() []byte {
+func (this *Auth) Json() []byte {
 	jBytes, _ := json.Marshal(this)
 	return jBytes
 }