fixed mistakes

added listener close()
go fmt
2023-05-18 12:56:37 +02:00 · 2023-05-18 12:53:37 +02:00 · 2023-05-18 11:12:35 +02:00 · 2023-05-18 11:12:16 +02:00 · 2023-05-17 22:35:35 +02:00 · 2023-05-17 13:06:13 +02:00
18 changed files with 666 additions and 438 deletions
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ func server() error {
    serv := dsrpc.NewService()

    cont := NewController()
-    serv.Handler(api.HelloMethod, cont.HelloHandler)
+    serv.Handle(api.HelloMethod, cont.HelloHandler)

    serv.PreMiddleware(dsrpc.LogRequest)
    serv.PostMiddleware(dsrpc.LogResponse)
@@ -220,9 +220,9 @@ func sampleServ(quiet bool) error {
    serv.PreMiddleware(authMiddleware)
    serv.PreMiddleware(dsrpc.LogRequest)

-    serv.Handler(HelloMethod, helloHandler)
-    serv.Handler(SaveMethod, saveHandler)
-    serv.Handler(LoadMethod, loadHandler)
+    serv.Handle(HelloMethod, helloHandler)
+    serv.Handle(SaveMethod, saveHandler)
+    serv.Handle(LoadMethod, loadHandler)

    serv.PostMiddleware(dsrpc.LogResponse)
    serv.PostMiddleware(dsrpc.LogAccess)
--- a/client.go
+++ b/client.go
@@ -5,16 +5,18 @@
 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, binSize 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)
@@ -28,10 +30,22 @@ func Put(address string, method string, reader io.Reader, binSize int64, param,
 	}
 	defer conn.Close()

-	return ConnPut(conn, method, reader, binSize, param, result, auth)
+	return ConnPut(ctx, conn, method, reader, binSize, param, result, auth)
 }

-func ConnPut(conn net.Conn, method string, reader io.Reader, binSize 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
+
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+
+	return ConnPut(ctx, conn, method, reader, binSize, param, result, auth)
+}
+
+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)

@@ -51,11 +65,11 @@ func ConnPut(conn net.Conn, method string, reader io.Reader, binSize int64, para

 	content.reqHeader.binSize = binSize

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
@@ -64,24 +78,24 @@ func ConnPut(conn net.Conn, method string, reader io.Reader, binSize int64, para
 	errChan := make(chan error, 1)

 	wg.Add(1)
-	go content.ReadResponseAsync(&wg, errChan)
+	go content.readResponseAsync(&wg, errChan)

 	wg.Add(1)
-	go content.UploadBinAsync(&wg)
+	go content.uploadBinAsync(ctx, &wg)

 	wg.Wait()
 	err = <-errChan
 	if err != nil {
 		return err
 	}
-	err = content.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return 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)
@@ -95,10 +109,22 @@ func Get(address string, method string, writer io.Writer, param, result any, aut
 	}
 	defer conn.Close()

-	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
+
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+
+	return ConnGet(ctx, conn, method, writer, param, result, auth)
+}
+
+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)
@@ -116,30 +142,30 @@ func ConnGet(conn net.Conn, method string, writer io.Writer, param, result any,
 	content.binReader = conn
 	content.binWriter = writer

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
-	err = content.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-	err = content.DownloadBin()
+	err = content.downloadBin(ctx)
 	if err != nil {
 		return err
 	}
-	err = content.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
 	return err
 }

-func Exec(address, method string, param any, result any, auth *Auth) error {
+func Exec(ctx context.Context, address, method string, param any, result any, auth *Auth) error {
 	var err error

 	addr, err := net.ResolveTCPAddr("tcp", address)
@@ -153,14 +179,30 @@ func Exec(address, method string, param any, result any, auth *Auth) error {
 	}
 	defer conn.Close()

-	err = ConnExec(conn, method, param, result, auth)
+	err = ConnExec(ctx, conn, method, param, result, auth)
 	if err != nil {
 		return 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
+
+	conn, err := tls.Dial("tcp", address, tlsConfig)
+	if err != nil {
+		return err
+	}
+	defer conn.Close()
+
+	err = ConnExec(ctx, conn, method, param, result, auth)
+	if err != nil {
+		return err
+	}
+	return err
+}
+
+func ConnExec(ctx context.Context, conn net.Conn, method string, param any, result any, auth *Auth) error {
 	var err error

 	content := CreateContent(conn)
@@ -176,26 +218,26 @@ func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) e
 		content.reqBlock.Auth = auth
 	}

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
-	err = content.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-	err = content.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
 	return err
 }

-func (content *Content) CreateRequest() error {
+func (content *Content) createRequest() error {
 	var err error

 	content.reqPacket.rcpPayload, err = content.reqBlock.Pack()
@@ -212,7 +254,7 @@ func (content *Content) CreateRequest() error {
 	return err
 }

-func (content *Content) WriteRequest() error {
+func (content *Content) writeRequest() error {
 	var err error
 	_, err = content.sockWriter.Write(content.reqPacket.header)
 	if err != nil {
@@ -225,13 +267,13 @@ func (content *Content) WriteRequest() error {
 	return err
 }

-func (content *Content) UploadBin() error {
+func (content *Content) uploadBin(ctx context.Context) error {
 	var err error
-	_, err = CopyBytes(content.binReader, content.binWriter, content.reqHeader.binSize)
+	_, err = CopyBytes(ctx, content.binReader, content.binWriter, content.reqHeader.binSize)
 	return err
 }

-func (content *Content) ReadResponse() error {
+func (content *Content) readResponse() error {
 	var err error

 	content.resPacket.header, err = ReadBytes(content.sockReader, headerSize)
@@ -250,16 +292,16 @@ func (content *Content) ReadResponse() error {
 	return err
 }

-func (content *Content) UploadBinAsync(wg *sync.WaitGroup) {
+func (content *Content) uploadBinAsync(ctx context.Context, wg *sync.WaitGroup) {
 	exitFunc := func() {
 		wg.Done()
 	}
 	defer exitFunc()
-	_, _ = CopyBytes(content.binReader, content.binWriter, content.reqHeader.binSize)
+	_, _ = CopyBytes(ctx, content.binReader, content.binWriter, content.reqHeader.binSize)
 	return
 }

-func (content *Content) ReadResponseAsync(wg *sync.WaitGroup, errChan chan error) {
+func (content *Content) readResponseAsync(wg *sync.WaitGroup, errChan chan error) {
 	var err error
 	exitFunc := func() {
 		errChan <- err
@@ -285,13 +327,13 @@ func (content *Content) ReadResponseAsync(wg *sync.WaitGroup, errChan chan error
 	return
 }

-func (content *Content) DownloadBin() error {
+func (content *Content) downloadBin(ctx context.Context) error {
 	var err error
-	_, err = CopyBytes(content.binReader, content.binWriter, content.resHeader.binSize)
+	_, err = CopyBytes(ctx, content.binReader, content.binWriter, content.resHeader.binSize)
 	return err
 }

-func (content *Content) BindResponse() error {
+func (content *Content) bindResponse() error {
 	var err error

 	err = encoder.Unmarshal(content.resPacket.rcpPayload, content.resBlock)
--- a/content.go
+++ b/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
+}
--- a/example/api/hello.go
+++ b/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{}
-}
--- a/example/cli/netcli.go
+++ b/example/cli/netcli.go
@@ -7,32 +7,40 @@
 package main

 import (
-    "fmt"
-    "github.com/kindsoldier/dsrpc"
-    "netsrv/api"
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/kindsoldier/dsrpc"
+
+	"netsrv/api"
 )

 func main() {

-    err := exec()
-    if err != nil {
-        fmt.Println("exec err:", err)
-    }
+	err := exec()
+	if err != nil {
+		fmt.Println("exec err:", err)
+	}
 }

 func exec() error {
-    var err 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)
-    if err != nil {
-        return err
-    }
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()

-    fmt.Println("result:", result.Message)
-    return err
+	err = dsrpc.Exec(ctx, "127.0.0.1:8081", api.HelloMethod, &params, &result, nil)
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("result:", result.Message)
+	return err
 }
--- a/example/go.mod
+++ b/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
--- a/example/go.sum
+++ b/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=
--- a/example/srv/netsrv.go
+++ b/example/srv/netsrv.go
@@ -8,8 +8,9 @@ package main

 import (
    "log"
-    "github.com/kindsoldier/dsrpc"
    "netsrv/api"
+
+    "github.com/kindsoldier/dsrpc"
 )

 func main() {
@@ -25,7 +26,7 @@ func server() error {
    serv := dsrpc.NewService()

    cont := NewController()
-    serv.Handler(api.HelloMethod, cont.HelloHandler)
+    serv.Handle(api.HelloMethod, cont.HelloHandler)

    serv.PreMiddleware(dsrpc.LogRequest)
    serv.PostMiddleware(dsrpc.LogResponse)
@@ -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
    }
--- a/exec_test.go
+++ b/exec_test.go
@@ -6,6 +6,7 @@ package dsrpc

 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"errors"
 	"io"
@@ -16,26 +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
@@ -45,29 +67,35 @@ 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()))
 }

@@ -103,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
@@ -120,22 +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
@@ -145,34 +176,40 @@ 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
 }
@@ -192,9 +229,9 @@ func testServ(quiet bool) error {
 		SetMessageWriter(io.Discard)
 	}
 	serv := NewService()
-	serv.Handler(HelloMethod, helloHandler)
-	serv.Handler(SaveMethod, saveHandler)
-	serv.Handler(LoadMethod, loadHandler)
+	serv.Handle(HelloMethod, helloHandler)
+	serv.Handle(SaveMethod, saveHandler)
+	serv.Handle(LoadMethod, loadHandler)

 	serv.PreMiddleware(LogRequest)
 	serv.PreMiddleware(auth)
@@ -219,7 +256,7 @@ func auth(content *Content) error {
 	pass := []byte("12345")

 	auth := content.Auth()
-	logDebug("auth ", string(auth.JSON()))
+	logDebug("auth ", string(auth.Json()))

 	ok := CheckHash(ident, pass, reqSalt, reqHash)
 	logDebug("auth ok:", ok)
@@ -233,20 +270,23 @@ func auth(content *Content) error {

 func helloHandler(content *Content) error {
 	var err error
-	params := NewHelloParams()
+	params := HelloParams{}

-	err = content.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}

-	err = content.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 {
 		content.SendError(err)
 		return err
 	}

-	result := NewHelloResult()
+	result := HelloResult{}
 	result.Message = "hello, client!"

 	err = content.SendResult(result, 0)
@@ -258,9 +298,9 @@ func helloHandler(content *Content) error {

 func saveHandler(content *Content) error {
 	var err error
-	params := NewSaveParams()
+	params := SaveParams{}

-	err = content.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}
@@ -268,13 +308,16 @@ func saveHandler(content *Content) error {
 	bufferBytes := make([]byte, 0, 1024)
 	binWriter := bytes.NewBuffer(bufferBytes)

-	err = content.ReadBin(binWriter)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	defer cancel()
+
+	err = content.ReadBin(ctx, binWriter)
 	if err != nil {
 		content.SendError(err)
 		return err
 	}

-	result := NewSaveResult()
+	result := SaveResult{}
 	result.Message = "saved successfully!"

 	err = content.SendResult(result, 0)
@@ -286,14 +329,17 @@ func saveHandler(content *Content) error {

 func loadHandler(content *Content) error {
 	var err error
-	params := NewSaveParams()
+	params := SaveParams{}

-	err = content.BindParams(params)
+	err = content.BindParams(&params)
 	if err != nil {
 		return err
 	}

-	err = content.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 {
 		content.SendError(err)
 		return err
@@ -306,60 +352,19 @@ func loadHandler(content *Content) error {

 	binReader := bytes.NewReader(binBytes)

-	result := NewSaveResult()
+	result := SaveResult{}
 	result.Message = "load successfully!"

 	err = content.SendResult(result, binSize)
 	if err != nil {
 		return err
 	}
+
 	binWriter := content.BinWriter()
-	_, err = CopyBytes(binReader, binWriter, binSize)
+	_, 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{}
-}
--- a/go.mod
+++ b/go.mod
@@ -2,14 +2,10 @@ module github.com/kindsoldier/dsrpc

 go 1.19

-require (
-	github.com/stretchr/testify v1.8.1
-	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
 )
--- a/go.sum
+++ b/go.sum
@@ -6,15 +6,10 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 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/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-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=
--- a/header.go
+++ b/header.go
@@ -44,16 +44,16 @@ func (hdr *Header) Pack() ([]byte, 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
@@ -77,10 +77,10 @@ func UnpackHeader(headerBytes []byte) (*Header, error) {
 	headerReader.Read(magicCodeBBytes)

 	header := &Header{
-		magicCodeA: decoderI64(magicCodeABytes),
-		rpcSize:    decoderI64(rpcSizeBytes),
-		binSize:    decoderI64(binSizeBytes),
-		magicCodeB: decoderI64(magicCodeBBytes),
+		magicCodeA: DecoderI64(magicCodeABytes),
+		rpcSize:    DecoderI64(rpcSizeBytes),
+		binSize:    DecoderI64(binSizeBytes),
+		magicCodeB: DecoderI64(magicCodeBBytes),
 	}

 	if header.magicCodeA != magicCodeA || header.magicCodeB != magicCodeB {
@@ -90,12 +90,12 @@ func UnpackHeader(headerBytes []byte) (*Header, error) {
 	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))
 }
--- a/request.go
+++ b/request.go
@@ -8,7 +8,8 @@ package dsrpc

 import (
 	"encoding/json"
-	encoder "github.com/vmihailenco/msgpack/v5"
+
+	encoder "encoding/json"
 )

 type EmptyParams struct{}
--- a/response.go
+++ b/response.go
@@ -7,7 +7,7 @@ package dsrpc
 import (
 	"encoding/json"

-	encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )

 type EmptyResult struct{}
--- a/server.go
+++ b/server.go
@@ -5,303 +5,344 @@
 package dsrpc

 import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"sync"
-	"time"
+        "context"
+        "crypto/tls"
+        "errors"
+        "fmt"
+        "io"
+        "net"
+        "sync"
+        "time"

-	encoder "github.com/vmihailenco/msgpack/v5"
+        encoder "encoding/json"
 )

 type HandlerFunc = func(*Content) error

 type Service struct {
-	handlers  map[string]HandlerFunc
-	ctx       context.Context
-	cancel    context.CancelFunc
-	wg        *sync.WaitGroup
-	preMw     []HandlerFunc
-	postMw    []HandlerFunc
-	keepalive bool
-	kaTime    time.Duration
-	kaMtx     sync.Mutex
+        handlers    map[string]HandlerFunc
+        ctx         context.Context
+        cancel      context.CancelFunc
+        wg          *sync.WaitGroup
+        preMw       []HandlerFunc
+        postMw      []HandlerFunc
+        keepalive   bool
+        kaTime      time.Duration
+        kaMtx       sync.Mutex
+        listener    net.Listener
+        tcpListener *net.TCPListener
 }

 func NewService() *Service {
-	rdrpc := &Service{}
-	rdrpc.handlers = make(map[string]HandlerFunc)
-	ctx, cancel := context.WithCancel(context.Background())
-	rdrpc.ctx = ctx
-	rdrpc.cancel = cancel
-	var wg sync.WaitGroup
-	rdrpc.wg = &wg
-	rdrpc.preMw = make([]HandlerFunc, 0)
-	rdrpc.postMw = make([]HandlerFunc, 0)
+        rdrpc := &Service{}
+        rdrpc.handlers = make(map[string]HandlerFunc)
+        ctx, cancel := context.WithCancel(context.Background())
+        rdrpc.ctx = ctx
+        rdrpc.cancel = cancel
+        var wg sync.WaitGroup
+        rdrpc.wg = &wg
+        rdrpc.preMw = make([]HandlerFunc, 0)
+        rdrpc.postMw = make([]HandlerFunc, 0)

-	return rdrpc
+        return rdrpc
 }

 func (svc *Service) PreMiddleware(mw HandlerFunc) {
-	svc.preMw = append(svc.preMw, mw)
+        svc.preMw = append(svc.preMw, mw)
 }

 func (svc *Service) PostMiddleware(mw HandlerFunc) {
-	svc.postMw = append(svc.postMw, mw)
+        svc.postMw = append(svc.postMw, mw)
 }

-func (svc *Service) Handler(method string, handler HandlerFunc) {
-	svc.handlers[method] = handler
+func (svc *Service) Handle(method string, handler HandlerFunc) {
+        svc.handlers[method] = handler
 }

 func (svc *Service) SetKeepAlive(flag bool) {
-	svc.kaMtx.Lock()
-	defer svc.kaMtx.Unlock()
-	svc.keepalive = true
+        svc.kaMtx.Lock()
+        defer svc.kaMtx.Unlock()
+        svc.keepalive = true
 }

 func (svc *Service) SetKeepAlivePeriod(interval time.Duration) {
-	svc.kaMtx.Lock()
-	defer svc.kaMtx.Unlock()
-	svc.kaTime = interval
+        svc.kaMtx.Lock()
+        defer svc.kaMtx.Unlock()
+        svc.kaTime = interval
 }

 func (svc *Service) Listen(address string) error {
-	var err error
-	logInfo("server listen:", address)
+        var err error
+        logInfo("server listen:", address)

-	addr, err := net.ResolveTCPAddr("tcp", address)
-	if err != nil {
-		err = fmt.Errorf("unable to resolve adddress: %s", err)
-		return err
-	}
-	listener, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		err = fmt.Errorf("unable to start listener: %s", err)
-		return err
-	}
+        addr, err := net.ResolveTCPAddr("tcp", address)
+        if err != nil {
+                err = fmt.Errorf("unable to resolve adddress: %s", err)
+                return err
+        }
+        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()
-		if err != nil {
-			logError("conn accept err:", err)
-		}
-		select {
-		case <-svc.ctx.Done():
-			return err
-		default:
-		}
-		svc.wg.Add(1)
-		go svc.handleConn(conn, svc.wg)
-	}
-	return err
+        for {
+                conn, err := svc.tcpListener.AcceptTCP()
+                if err != nil {
+                        logError("conn accept err:", err)
+                }
+                select {
+                case <-svc.ctx.Done():
+                        return err
+                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():
+                        logInfo("accept loop done")
+                        return err
+                default:
+                }
+                svc.wg.Add(1)
+                go svc.handleConn(conn, svc.wg)
+        }
+        return err
 }

 func notFound(content *Content) error {
-	execErr := errors.New("method not found")
-	err := content.SendError(execErr)
-	return err
+        execErr := errors.New("method not found")
+        err := content.SendError(execErr)
+        return err
 }

 func (svc *Service) Stop() error {
-	var err error
-	// Disable new connection
-	logInfo("cancel rpc accept loop")
-	svc.cancel()
-	// Wait handlers
-	logInfo("wait rpc handlers")
-	svc.wg.Wait()
-	return err
+        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")
+        svc.wg.Wait()
+        return err
 }

-func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
-	var err error
+func (svc *Service) handleTCPConn(conn *net.TCPConn, wg *sync.WaitGroup) {
+        var err error
+        if svc.keepalive {
+                err = conn.SetKeepAlive(true)
+                if err != nil {
+                        err = fmt.Errorf("unable to set keepalive: %s", err)
+                        return
+                }
+                if svc.kaTime > 0 {
+                        err = conn.SetKeepAlivePeriod(svc.kaTime)
+                        if err != nil {
+                                err = fmt.Errorf("unable to set keepalive period: %s", err)
+                                return
+                        }
+                }
+        }
+        svc.handleConn(conn, wg)
+}

-	if svc.keepalive {
-		err = conn.SetKeepAlive(true)
-		if err != nil {
-			err = fmt.Errorf("unable to set keepalive: %s", err)
-			return
-		}
-		if svc.kaTime > 0 {
-			err = conn.SetKeepAlivePeriod(svc.kaTime)
-			if err != nil {
-				err = fmt.Errorf("unable to set keepalive period: %s", err)
-				return
-			}
-		}
-	}
-	content := CreateContent(conn)
+func (svc *Service) handleConn(conn net.Conn, wg *sync.WaitGroup) {
+        var err error

-	remoteAddr := conn.RemoteAddr().String()
-	remoteHost, _, _ := net.SplitHostPort(remoteAddr)
-	content.remoteHost = remoteHost
+        content := CreateContent(conn)

-	content.binReader = conn
-	content.binWriter = io.Discard
+        remoteAddr := conn.RemoteAddr().String()
+        remoteHost, _, _ := net.SplitHostPort(remoteAddr)
+        content.remoteHost = remoteHost

-	exitFunc := func() {
-		conn.Close()
-		wg.Done()
-		if err != nil {
-			logError("conn handler err:", err)
-		}
-	}
-	defer exitFunc()
+        content.binReader = conn
+        content.binWriter = io.Discard

-	recovFunc := func() {
-		panicMsg := recover()
-		if panicMsg != nil {
-			logError("handler panic message:", panicMsg)
-		}
-	}
-	defer recovFunc()
+        exitFunc := func() {
+                conn.Close()
+                wg.Done()
+                if err != nil {
+                        logError("conn handler err:", err)
+                }
+        }
+        defer exitFunc()

-	err = content.ReadRequest()
-	if err != nil {
-		err = err
-		return
-	}
+        recovFunc := func() {
+                panicMsg := recover()
+                if panicMsg != nil {
+                        logError("handler panic message:", panicMsg)
+                }
+        }
+        defer recovFunc()

-	err = content.BindMethod()
-	if err != nil {
-		err = err
-		return
-	}
-	for _, mw := range svc.preMw {
-		err = mw(content)
-		if err != nil {
-			err = err
-			return
-		}
-	}
-	err = svc.Route(content)
-	if err != nil {
-		err = err
-		return
-	}
-	for _, mw := range svc.postMw {
-		err = mw(content)
-		if err != nil {
-			err = err
-			return
-		}
-	}
-	return
+        err = content.ReadRequest()
+        if err != nil {
+                err = err
+                return
+        }
+
+        err = content.BindMethod()
+        if err != nil {
+                err = err
+                return
+        }
+        for _, mw := range svc.preMw {
+                err = mw(content)
+                if err != nil {
+                        err = err
+                        return
+                }
+        }
+        err = svc.Route(content)
+        if err != nil {
+                err = err
+                return
+        }
+        for _, mw := range svc.postMw {
+                err = mw(content)
+                if err != nil {
+                        err = err
+                        return
+                }
+        }
+        return
 }

 func (svc *Service) Route(content *Content) error {
-	handler, ok := svc.handlers[content.reqBlock.Method]
-	if ok {
-		return handler(content)
-	}
-	return notFound(content)
+        handler, ok := svc.handlers[content.reqBlock.Method]
+        if ok {
+                return handler(content)
+        }
+        return notFound(content)
 }

 func (content *Content) ReadRequest() error {
-	var err error
+        var err error

-	content.reqPacket.header, err = ReadBytes(content.sockReader, headerSize)
-	if err != nil {
-		return err
-	}
-	content.reqHeader, err = UnpackHeader(content.reqPacket.header)
-	if err != nil {
-		return err
-	}
+        content.reqPacket.header, err = ReadBytes(content.sockReader, headerSize)
+        if err != nil {
+                return err
+        }
+        content.reqHeader, err = UnpackHeader(content.reqPacket.header)
+        if err != nil {
+                return err
+        }

-	rpcSize := content.reqHeader.rpcSize
-	content.reqPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
-	if err != nil {
-		return err
-	}
-	return err
+        rpcSize := content.reqHeader.rpcSize
+        content.reqPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
+        if err != nil {
+                return err
+        }
+        return err
 }

 func (content *Content) BinWriter() io.Writer {
-	return content.sockWriter
+        return content.sockWriter
 }

 func (content *Content) BinReader() io.Reader {
-	return content.sockReader
+        return content.sockReader
 }

 func (content *Content) BinSize() int64 {
-	return content.reqHeader.binSize
+        return content.reqHeader.binSize
 }

-func (content *Content) ReadBin(writer io.Writer) error {
-	var err error
-	_, err = CopyBytes(content.sockReader, writer, content.reqHeader.binSize)
-	return err
+func (content *Content) ReadBin(ctx context.Context, writer io.Writer) error {
+        var err error
+        _, err = CopyBytes(ctx, content.sockReader, writer, content.reqHeader.binSize)
+        return err
 }

 func (content *Content) BindMethod() error {
-	var err error
-	err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
-	return err
+        var err error
+        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
+        return err
 }

 func (content *Content) BindParams(params any) error {
-	var err error
-	content.reqBlock.Params = params
-	err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
-	if err != nil {
-		return err
-	}
-	return err
+        var err error
+        content.reqBlock.Params = params
+        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
+        if err != nil {
+                return err
+        }
+        return err
 }

 func (content *Content) SendResult(result any, binSize int64) error {
-	var err error
-	content.resBlock.Result = result
+        var err error
+        content.resBlock.Result = result

-	content.resPacket.rcpPayload, err = content.resBlock.Pack()
-	if err != nil {
-		return err
-	}
-	content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
-	content.resHeader.binSize = binSize
+        content.resPacket.rcpPayload, err = content.resBlock.Pack()
+        if err != nil {
+                return err
+        }
+        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+        content.resHeader.binSize = binSize

-	content.resPacket.header, err = content.resHeader.Pack()
-	if err != nil {
-		return err
-	}
-	_, err = content.sockWriter.Write(content.resPacket.header)
-	if err != nil {
-		return err
-	}
-	_, err = content.sockWriter.Write(content.resPacket.rcpPayload)
-	if err != nil {
-		return err
-	}
-	return err
+        content.resPacket.header, err = content.resHeader.Pack()
+        if err != nil {
+                return err
+        }
+        _, err = content.sockWriter.Write(content.resPacket.header)
+        if err != nil {
+                return err
+        }
+        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
+        if err != nil {
+                return err
+        }
+        return err
 }

 func (content *Content) SendError(execErr error) error {
-	var err error
+        var err error

-	content.resBlock.Error = execErr.Error()
-	content.resBlock.Result = NewEmptyResult()
+        content.resBlock.Error = execErr.Error()
+        content.resBlock.Result = NewEmptyResult()

-	content.resPacket.rcpPayload, err = content.resBlock.Pack()
-	if err != nil {
-		return err
-	}
-	content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
-	content.resPacket.header, err = content.resHeader.Pack()
-	if err != nil {
-		return err
-	}
-	_, err = content.sockWriter.Write(content.resPacket.header)
-	if err != nil {
-		return err
-	}
-	_, err = content.sockWriter.Write(content.resPacket.rcpPayload)
-	if err != nil {
-		return err
-	}
-	return err
+        content.resPacket.rcpPayload, err = content.resBlock.Pack()
+        if err != nil {
+                return err
+        }
+        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+        content.resPacket.header, err = content.resHeader.Pack()
+        if err != nil {
+                return err
+        }
+        _, err = content.sockWriter.Write(content.resPacket.header)
+        if err != nil {
+                return err
+        }
+        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
+        if err != nil {
+                return err
+        }
+        return err
 }
--- a/tools.go
+++ b/tools.go
@@ -5,6 +5,7 @@
 package dsrpc

 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -16,7 +17,7 @@ func ReadBytes(reader io.Reader, size int64) ([]byte, error) {
 	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")
 		}
--- a/validate.go
+++ b/validate.go
@@ -5,6 +5,7 @@
 package dsrpc

 import (
+	"context"
 	"io"
 	"net"
 )
@@ -27,11 +28,11 @@ func LocalExec(method string, param, result any, auth *Auth, handler HandlerFunc
 		content.resBlock.Result = result
 	}

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
@@ -39,11 +40,11 @@ func LocalExec(method string, param, result any, auth *Auth, handler HandlerFunc
 	if err != nil {
 		return err
 	}
-	err = content.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-	err = content.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
@@ -51,7 +52,7 @@ func LocalExec(method string, param, result any, auth *Auth, handler HandlerFunc
 	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

@@ -75,15 +76,15 @@ func LocalPut(method string, reader io.Reader, size int64, param, result any, au

 	content.reqHeader.binSize = size

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
-	err = content.UploadBin()
+	err = content.uploadBin(ctx)
 	if err != nil {
 		return err
 	}
@@ -91,18 +92,18 @@ func LocalPut(method string, reader io.Reader, size int64, param, result any, au
 	if err != nil {
 		return err
 	}
-	err = content.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-	err = content.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()
@@ -123,11 +124,11 @@ func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, ha
 	content.binReader = cliConn
 	content.binWriter = writer

-	err = content.CreateRequest()
+	err = content.createRequest()
 	if err != nil {
 		return err
 	}
-	err = content.WriteRequest()
+	err = content.writeRequest()
 	if err != nil {
 		return err
 	}
@@ -136,15 +137,15 @@ func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, ha
 	if err != nil {
 		return err
 	}
-	err = content.ReadResponse()
+	err = content.readResponse()
 	if err != nil {
 		return err
 	}
-	err = content.DownloadBin()
+	err = content.downloadBin(ctx)
 	if err != nil {
 		return err
 	}
-	err = content.BindResponse()
+	err = content.bindResponse()
 	if err != nil {
 		return err
 	}
--- a/xauth.go
+++ b/xauth.go
@@ -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
 }
Author	SHA1	Message	Date
Oleg Borodin	bc578cf25c	fixed mistakes	2023-05-18 12:56:37 +02:00
Oleg Borodin	cb6d26a7cc	added listener close()	2023-05-18 12:53:37 +02:00
Oleg Borodin	f814bb7d24	go fmt	2023-05-18 11:12:35 +02:00
Oleg Borodin	aed740c933	added TLS transport	2023-05-18 11:12:16 +02:00
Oleg Borodin	4716c25cf6	rename Handler to Handle	2023-05-17 22:35:35 +02:00
Oleg Borodin	9bc3aef167	updated samples	2023-05-17 13:06:13 +02:00
Oleg Borodin	0e5321d51a	encoder changed to json	2023-05-17 13:03:52 +02:00
Oleg Borodin	6f9835f399	context added	2023-05-17 12:59:01 +02:00
Oleg Borodin	ef8db1d198	context added	2023-05-17 12:52:41 +02:00
Oleg Borodin	c20faaecb3	Little refactoring	2023-04-01 01:03:38 +02:00
Oleg Borodin	b5b293329e	Little refactoring	2023-04-01 00:33:59 +02:00