go fmt

client.go

@@ -6,13 +6,14 @@ package dsrpc
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
 	"net"
 	"sync"
 
-	encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )
 
 func Put(ctx context.Context, address string, method string, reader io.Reader, binSize int64, param, result any, auth *Auth) error {
@@ -32,6 +33,18 @@ func Put(ctx context.Context, address string, method string, reader io.Reader, b
 	return ConnPut(ctx, conn, method, reader, binSize, param, result, auth)
 }
 
+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)
@@ -99,6 +112,18 @@ func Get(ctx context.Context, address string, method string, writer io.Writer, p
 	return ConnGet(ctx, conn, method, writer, param, result, auth)
 }
 
+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
 
@@ -161,6 +186,22 @@ func Exec(ctx context.Context, address, method string, param any, result any, au
 	return err
 }
 
+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
 

example/cli/netcli.go

@@ -7,33 +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.HelloParams{
-        Message: "hello, server!",
-    }
+	params := api.HelloParams{
+		Message: "hello, server!",
+	}
 
-    result := api.HelloResult{}
+	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
 }

example/go.mod

@@ -2,9 +2,4 @@ module netsrv
 
 go 1.19
 
-require github.com/kindsoldier/dsrpc v1.1.4
-
-require (
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-)
+require github.com/kindsoldier/dsrpc v1.2.1

example/go.sum

@@ -1,18 +1,6 @@
-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.1.2 h1:bFTIGpRSMq5OK1a3dHQxLPMxf6R+Ik15slkqNN0QrNE=
-github.com/kindsoldier/dsrpc v1.1.2/go.mod h1:KG8x2ZPid/hPJdhkUHtt1mDulWPVhj9fh/1XL3Z2xT8=
-github.com/kindsoldier/dsrpc v1.1.4 h1:F6e1K5C7C92jKGOrH4lF/XraLe5E2glsQTeVP9avYBE=
-github.com/kindsoldier/dsrpc v1.1.4/go.mod h1:KG8x2ZPid/hPJdhkUHtt1mDulWPVhj9fh/1XL3Z2xT8=
+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.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-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=
-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=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

go.mod

@@ -2,14 +2,10 @@ module github.com/kindsoldier/dsrpc
 
 go 1.19
 
-require (
-	github.com/stretchr/testify v1.8.2
-	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

@@ -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.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/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=
 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=

request.go

@@ -9,7 +9,7 @@ package dsrpc
 import (
 	"encoding/json"
 
-	encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )
 
 type EmptyParams struct{}

response.go

@@ -7,7 +7,7 @@ package dsrpc
 import (
 	"encoding/json"
 
-	encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )
 
 type EmptyResult struct{}

server.go

@@ -6,6 +6,7 @@ package dsrpc
 
 import (
 	"context"
+	"crypto/tls"
 	"errors"
 	"fmt"
 	"io"
@@ -13,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	encoder "github.com/vmihailenco/msgpack/v5"
+	encoder "encoding/json"
 )
 
 type HandlerFunc = func(*Content) error
@@ -52,7 +53,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
 }
 
@@ -94,6 +95,32 @@ 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)
+
+	listener, err := tls.Listen("tcp", address, tlsConfig)
+	if err != nil {
+		err = fmt.Errorf("unable to start listener: %s", err)
+		return err
+	}
+
+	for {
+		conn, err := listener.Accept()
+		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
@@ -116,9 +143,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,6 +159,12 @@ func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
 			}
 		}
 	}
+	svc.handleConn(conn, wg)
+}
+
+func (svc *Service) handleConn(conn net.Conn, wg *sync.WaitGroup) {
+	var err error
+
 	content := CreateContent(conn)
 
 	remoteAddr := conn.RemoteAddr().String()