NeonXP
/
jsonrpc2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better errors

This commit is contained in:
Alexander Kiryukhin 2022-05-22 03:27:50 +03:00
parent 262768e3a2
commit c74596c6a6
No known key found for this signature in database
GPG Key ID: 6DF7A2910D0699E9
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/errors.go
View File

@ -50,7 +50,7 @@ func (e Error) Error() string {
return fmt.Sprintf("jsonrpc2 error: code: %d message: %s", e.Code, e.Message)
}
func NewError(code int) Error {
func ErrorFromCode(code int) Error {
if _, ok := errorMap[code]; ok {
return Error{
Code: code,
@ -59,3 +59,13 @@ func NewError(code int) Error {
}
return Error{Code: code}
}
func NewError(message string, code int) Error {
if code == 0 {
code = ErrUser
}
return Error{
Code: code,
Message: message,
}
}

4
rpc/server.go
View File

@ -114,7 +114,7 @@ func (r *RpcServer) callMethod(ctx context.Context, req *rpcRequest) *rpcRespons
if !ok {
return &rpcResponse{
Jsonrpc: version,
Error: NewError(ErrCodeMethodNotFound),
Error: ErrorFromCode(ErrCodeMethodNotFound),
Id: req.Id,
}
}
@ -137,7 +137,7 @@ func (r *RpcServer) callMethod(ctx context.Context, req *rpcRequest) *rpcRespons
func WriteError(code int, enc *json.Encoder) {
enc.Encode(rpcResponse{
Jsonrpc: version,
Error: NewError(code),
Error: ErrorFromCode(code),
})
}

2
rpc/wrapper.go
View File

@ -28,7 +28,7 @@ func H[RQ any, RS any](handler func(context.Context, *RQ) (RS, error)) Handler {
return func(ctx context.Context, in json.RawMessage) (json.RawMessage, error) {
req := new(RQ)
if err := json.Unmarshal(in, req); err != nil {
return nil, NewError(ErrCodeParseError)
return nil, ErrorFromCode(ErrCodeParseError)
}
resp, err := handler(ctx, req)
if err != nil {