This commit is contained in:
2023-02-11 07:52:40 +02:00
parent 5366bd7ff7
commit 59d850da3c
18 changed files with 1183 additions and 1208 deletions
-4
View File
@@ -14,7 +14,6 @@ import (
encoder "github.com/vmihailenco/msgpack/v5" encoder "github.com/vmihailenco/msgpack/v5"
) )
func Put(address string, method string, reader io.Reader, size int64, param, result any, auth *Auth) error { func Put(address string, method string, reader io.Reader, size int64, param, result any, auth *Auth) error {
var err error var err error
@@ -44,7 +43,6 @@ func Put(address string, method string, reader io.Reader, size int64, param, res
return ConnPut(conn, method, reader, size, param, result, auth) return ConnPut(conn, method, reader, size, param, result, auth)
} }
func ConnPut(conn net.Conn, method string, reader io.Reader, size int64, param, result any, auth *Auth) error { func ConnPut(conn net.Conn, method string, reader io.Reader, size int64, param, result any, auth *Auth) error {
var err error var err error
context := CreateContext(conn) context := CreateContext(conn)
@@ -191,7 +189,6 @@ func Exec(address, method string, param any, result any, auth *Auth) error {
return Err(err) return Err(err)
} }
func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) error { func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) error {
var err error var err error
@@ -224,7 +221,6 @@ func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) e
return Err(err) return Err(err)
} }
func (context *Context) CreateRequest() error { func (context *Context) CreateRequest() error {
var err error var err error
-4
View File
@@ -28,7 +28,6 @@ type Context struct {
binWriter io.Writer binWriter io.Writer
} }
func NewContext() *Context { func NewContext() *Context {
context := &Context{} context := &Context{}
context.start = time.Now() context.start = time.Now()
@@ -82,7 +81,6 @@ func (context *Context) ReqRpcSize() int64 {
return size return size
} }
func (context *Context) ReqBinSize() int64 { func (context *Context) ReqBinSize() int64 {
var size int64 var size int64
if context.reqHeader != nil { if context.reqHeader != nil {
@@ -125,8 +123,6 @@ func (context *Context) ResSize() int64 {
return size return size
} }
func (context *Context) SetAuthIdent(ident []byte) { func (context *Context) SetAuthIdent(ident []byte) {
context.reqRPC.Auth.Ident = ident context.reqRPC.Auth.Ident = ident
} }
+1 -2
View File
@@ -6,14 +6,13 @@ package dsrpc
import ( import (
"fmt" "fmt"
"runtime"
"io" "io"
"runtime"
) )
var develMode bool = false var develMode bool = false
var debugMode bool = false var debugMode bool = false
func SetDevelMode(mode bool) { func SetDevelMode(mode bool) {
develMode = mode develMode = mode
} }
+2 -11
View File
@@ -30,7 +30,6 @@ func TestLocalExec(t *testing.T) {
logDebug("method result:", string(resultJSON)) logDebug("method result:", string(resultJSON))
} }
func TestLocalSave(t *testing.T) { func TestLocalSave(t *testing.T) {
var err error var err error
@@ -53,7 +52,6 @@ func TestLocalSave(t *testing.T) {
logDebug("method result:", string(resultJSON)) logDebug("method result:", string(resultJSON))
} }
func TestLocalLoad(t *testing.T) { func TestLocalLoad(t *testing.T) {
var err error var err error
@@ -73,7 +71,6 @@ func TestLocalLoad(t *testing.T) {
logDebug("bin size:", len(writer.Bytes())) logDebug("bin size:", len(writer.Bytes()))
} }
func TestNetExec(t *testing.T) { func TestNetExec(t *testing.T) {
go testServ(false) go testServ(false)
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)
@@ -133,7 +130,6 @@ func clientHello() error {
return err return err
} }
func clientSave() error { func clientSave() error {
var err error var err error
@@ -159,7 +155,6 @@ func clientSave() error {
return err return err
} }
func clientLoad() error { func clientLoad() error {
var err error var err error
@@ -168,7 +163,6 @@ func clientLoad() error {
result := NewHelloResult() result := NewHelloResult()
auth := CreateAuth([]byte("qwert"), []byte("12345")) auth := CreateAuth([]byte("qwert"), []byte("12345"))
binBytes := make([]byte, 0) binBytes := make([]byte, 0)
writer := bytes.NewBuffer(binBytes) writer := bytes.NewBuffer(binBytes)
@@ -183,7 +177,6 @@ func clientLoad() error {
return err return err
} }
var testServRun bool = false var testServRun bool = false
func testServ(quiet bool) error { func testServ(quiet bool) error {
@@ -329,7 +322,6 @@ func loadHandler(context *Context) error {
return err return err
} }
const HelloMethod string = "hello" const HelloMethod string = "hello"
type HelloParams struct { type HelloParams struct {
@@ -348,8 +340,8 @@ func NewHelloResult() *HelloResult {
return &HelloResult{} return &HelloResult{}
} }
const SaveMethod string = "save" const SaveMethod string = "save"
type SaveParams HelloParams type SaveParams HelloParams
type SaveResult HelloResult type SaveResult HelloResult
@@ -360,9 +352,8 @@ func NewSaveResult() *SaveResult {
return &SaveResult{} return &SaveResult{}
} }
const LoadMethod string = "load" const LoadMethod string = "load"
type LoadParams HelloParams type LoadParams HelloParams
type LoadResult HelloResult type LoadResult HelloResult
+1 -1
View File
@@ -7,9 +7,9 @@
package dsrpc package dsrpc
import ( import (
"github.com/stretchr/testify/require"
"net" "net"
"testing" "testing"
"github.com/stretchr/testify/require"
) )
func TestFConn0(t *testing.T) { func TestFConn0(t *testing.T) {
+2 -4
View File
@@ -7,10 +7,10 @@
package dsrpc package dsrpc
import ( import (
"errors" "bytes"
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"bytes" "errors"
) )
const headerSize int64 = 16 * 2 const headerSize int64 = 16 * 2
@@ -25,7 +25,6 @@ type Header struct {
magicCodeB int64 `json:"magicCodeB"` magicCodeB int64 `json:"magicCodeB"`
} }
func NewHeader() *Header { func NewHeader() *Header {
return &Header{ return &Header{
magicCodeA: magicCodeA, magicCodeA: magicCodeA,
@@ -38,7 +37,6 @@ func (hdr *Header) JSON() []byte {
return jBytes return jBytes
} }
func (hdr *Header) Pack() ([]byte, error) { func (hdr *Header) Pack() ([]byte, error) {
var err error var err error
headerBytes := make([]byte, 0, headerSize) headerBytes := make([]byte, 0, headerSize)
-1
View File
@@ -9,7 +9,6 @@ import (
encoder "github.com/vmihailenco/msgpack/v5" encoder "github.com/vmihailenco/msgpack/v5"
) )
type Response struct { type Response struct {
Error string `json:"error" msgpack:"error"` Error string `json:"error" msgpack:"error"`
Result any `json:"result" msgpack:"result"` Result any `json:"result" msgpack:"result"`
-2
View File
@@ -238,7 +238,6 @@ func (context *Context) ReadBin(writer io.Writer) error {
return Err(err) return Err(err)
} }
func (context *Context) BindMethod() error { func (context *Context) BindMethod() error {
var err error var err error
err = encoder.Unmarshal(context.reqPacket.rcpPayload, context.reqRPC) err = encoder.Unmarshal(context.reqPacket.rcpPayload, context.reqRPC)
@@ -281,7 +280,6 @@ func (context *Context) SendResult(result any, binSize int64) error {
return Err(err) return Err(err)
} }
func (context *Context) SendError(execErr error) error { func (context *Context) SendError(execErr error) error {
var err error var err error
+1 -1
View File
@@ -6,8 +6,8 @@ package dsrpc
import ( import (
"errors" "errors"
"io"
"fmt" "fmt"
"io"
) )
func ReadBytes(reader io.Reader, size int64) ([]byte, error) { func ReadBytes(reader io.Reader, size int64) ([]byte, error) {
-2
View File
@@ -4,7 +4,6 @@
package dsrpc package dsrpc
import ( import (
"io" "io"
"net" "net"
@@ -95,7 +94,6 @@ func LocalPut(method string, reader io.Reader, size int64, param, result any, au
return err return err
} }
func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, handler HandlerFunc) error { func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, handler HandlerFunc) error {
var err error var err error
+2 -2
View File
@@ -5,11 +5,11 @@
package dsrpc package dsrpc
import ( import (
"encoding/json"
"bytes" "bytes"
"crypto/sha256"
"encoding/json"
"math/rand" "math/rand"
"time" "time"
"crypto/sha256"
) )
func init() { func init() {