ziggi/dsrpc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go fmt

Browse Source
This commit is contained in:
Oleg Borodin
2023-02-11 07:52:40 +02:00
parent 5366bd7ff7
commit 59d850da3c
18 changed files with 1183 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@@ -14,7 +14,6 @@ import (
encoder "github.com/vmihailenco/msgpack/v5"
)
func Put(address string, method string, reader io.Reader, size int64, param, result any, auth *Auth) 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)
}
func ConnPut(conn net.Conn, method string, reader io.Reader, size int64, param, result any, auth *Auth) error {
var err error
context := CreateContext(conn)
@@ -81,7 +79,7 @@ func ConnPut(conn net.Conn, method string, reader io.Reader, size int64, param,
go context.UploadBinAsync(&wg)
wg.Wait()
err = <- errChan
err = <-errChan
if err != nil {
return Err(err)
}
@@ -191,7 +189,6 @@ func Exec(address, method string, param any, result any, auth *Auth) error {
return Err(err)
}
func ConnExec(conn net.Conn, method string, param any, result any, auth *Auth) 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)
}
func (context *Context) CreateRequest() error {
var err error

4
context.go
View File

@@ -28,7 +28,6 @@ type Context struct {
binWriter io.Writer
}
func NewContext() *Context {
context := &Context{}
context.start = time.Now()
@@ -82,7 +81,6 @@ func (context *Context) ReqRpcSize() int64 {
return size
}
func (context *Context) ReqBinSize() int64 {
var size int64
if context.reqHeader != nil {
@@ -125,8 +123,6 @@ func (context *Context) ResSize() int64 {
return size
}
func (context *Context) SetAuthIdent(ident []byte) {
context.reqRPC.Auth.Ident = ident
}

2
empty.go
View File

@@ -6,7 +6,7 @@
package dsrpc
type Empty struct {}
type Empty struct{}
func NewEmpty() *Empty {
return &Empty{}

3
error.go
View File

@@ -6,14 +6,13 @@ package dsrpc
import (
"fmt"
"runtime"
"io"
"runtime"
)
var develMode bool = false
var debugMode bool = false
func SetDevelMode(mode bool) {
develMode = mode
}

13
exec_test.go
View File

@@ -30,7 +30,6 @@ func TestLocalExec(t *testing.T) {
logDebug("method result:", string(resultJSON))
}
func TestLocalSave(t *testing.T) {
var err error
@@ -53,7 +52,6 @@ func TestLocalSave(t *testing.T) {
logDebug("method result:", string(resultJSON))
}
func TestLocalLoad(t *testing.T) {
var err error
@@ -73,7 +71,6 @@ func TestLocalLoad(t *testing.T) {
logDebug("bin size:", len(writer.Bytes()))
}
func TestNetExec(t *testing.T) {
go testServ(false)
time.Sleep(10 * time.Millisecond)
@@ -133,7 +130,6 @@ func clientHello() error {
return err
}
func clientSave() error {
var err error
@@ -159,7 +155,6 @@ func clientSave() error {
return err
}
func clientLoad() error {
var err error
@@ -168,7 +163,6 @@ func clientLoad() error {
result := NewHelloResult()
auth := CreateAuth([]byte("qwert"), []byte("12345"))
binBytes := make([]byte, 0)
writer := bytes.NewBuffer(binBytes)
@@ -183,7 +177,6 @@ func clientLoad() error {
return err
}
var testServRun bool = false
func testServ(quiet bool) error {
@@ -329,7 +322,6 @@ func loadHandler(context *Context) error {
return err
}
const HelloMethod string = "hello"
type HelloParams struct {
@@ -348,8 +340,8 @@ func NewHelloResult() *HelloResult {
return &HelloResult{}
}
const SaveMethod string = "save"
type SaveParams HelloParams
type SaveResult HelloResult
@@ -360,9 +352,8 @@ func NewSaveResult() *SaveResult {
return &SaveResult{}
}
const LoadMethod string = "load"
type LoadParams HelloParams
type LoadResult HelloResult

2
faddr_test.go
View File

@@ -7,9 +7,9 @@
package dsrpc
import (
"github.com/stretchr/testify/require"
"net"
"testing"
"github.com/stretchr/testify/require"
)
func TestFConn0(t *testing.T) {

2
fconn.go
View File

@@ -18,7 +18,7 @@ type FConn struct {
writer io.Writer
}
func NewFConn() (*FConn, *FConn){
func NewFConn() (*FConn, *FConn) {
c2sBuffer := bytes.NewBuffer(make([]byte, 0))
s2cBuffer := bytes.NewBuffer(make([]byte, 0))

6
header.go
View File

@@ -7,10 +7,10 @@
package dsrpc
import (
"errors"
"bytes"
"encoding/binary"
"encoding/json"
"bytes"
"errors"
)
const headerSize int64 = 16 * 2
@@ -25,7 +25,6 @@ type Header struct {
magicCodeB int64 `json:"magicCodeB"`
}
func NewHeader() *Header {
return &Header{
magicCodeA: magicCodeA,
@@ -38,7 +37,6 @@ func (hdr *Header) JSON() []byte {
return jBytes
}
func (hdr *Header) Pack() ([]byte, error) {
var err error
headerBytes := make([]byte, 0, headerSize)

1
response.go
View File

@@ -9,7 +9,6 @@ import (
encoder "github.com/vmihailenco/msgpack/v5"
)
type Response struct {
Error string `json:"error" msgpack:"error"`
Result any `json:"result" msgpack:"result"`

4
server.go
View File

@@ -151,7 +151,7 @@ func (svc *Service) handleConn(conn *net.TCPConn, wg *sync.WaitGroup) {
}
defer exitFunc()
recovFunc := func () {
recovFunc := func() {
panicMsg := recover()
if panicMsg != nil {
logError("handler panic message:", panicMsg)
@@ -238,7 +238,6 @@ func (context *Context) ReadBin(writer io.Writer) error {
return Err(err)
}
func (context *Context) BindMethod() error {
var err error
err = encoder.Unmarshal(context.reqPacket.rcpPayload, context.reqRPC)
@@ -281,7 +280,6 @@ func (context *Context) SendResult(result any, binSize int64) error {
return Err(err)
}
func (context *Context) SendError(execErr error) error {
var err error

2
tools.go
View File

@@ -6,8 +6,8 @@ package dsrpc
import (
"errors"
"io"
"fmt"
"io"
)
func ReadBytes(reader io.Reader, size int64) ([]byte, error) {

2
validate.go
View File

@@ -4,7 +4,6 @@
package dsrpc
import (
"io"
"net"
@@ -95,7 +94,6 @@ func LocalPut(method string, reader io.Reader, size int64, param, result any, au
return err
}
func LocalGet(method string, writer io.Writer, param, result any, auth *Auth, handler HandlerFunc) error {
var err error

6
xauth.go
View File

@@ -5,11 +5,11 @@
package dsrpc
import (
"encoding/json"
"bytes"
"crypto/sha256"
"encoding/json"
"math/rand"
"time"
"crypto/sha256"
)
func init() {
@@ -49,7 +49,7 @@ func CreateSalt() []byte {
}
func CreateHash(ident, pass, salt []byte) []byte {
vec := make([]byte, 0, len(ident) + len(salt) + len(pass))
vec := make([]byte, 0, len(ident)+len(salt)+len(pass))
vec = append(vec, ident...)
vec = append(vec, salt...)
vec = append(vec, pass...)