|
|
@@ -1,4 +1,4 @@
|
|
|
-package utils
|
|
|
+package jsonrpc2
|
|
|
|
|
|
import "encoding/json"
|
|
|
|
|
|
@@ -41,7 +41,7 @@ func ParseRequest(jsonStr string) (*RpcRequest, error) {
|
|
|
}
|
|
|
|
|
|
// 构建响应数据
|
|
|
-func BuildResponseResult(id int, result any) (*RpcResponse, error) {
|
|
|
+func BuildResult(id int, result any) (*RpcResponse, error) {
|
|
|
b, err := json.Marshal(result)
|
|
|
if err != nil {
|
|
|
return nil, err
|
|
|
@@ -54,7 +54,7 @@ func BuildResponseResult(id int, result any) (*RpcResponse, error) {
|
|
|
}
|
|
|
|
|
|
// 构建错误响应
|
|
|
-func BuildResponseError(id int, code RpcErrorCode, message string) *RpcResponse {
|
|
|
+func BuildError(id int, code RpcErrorCode, message string) *RpcResponse {
|
|
|
return &RpcResponse{
|
|
|
JSONRPC: "2.0",
|
|
|
Error: &RpcError{
|
|
|
@@ -66,33 +66,28 @@ func BuildResponseError(id int, code RpcErrorCode, message string) *RpcResponse
|
|
|
}
|
|
|
|
|
|
// 构建解析错误
|
|
|
-func ResponseParseError(id int) *RpcResponse {
|
|
|
- return BuildResponseError(id, ErrParse, "Parse error")
|
|
|
+func BuildParseError(id int) *RpcResponse {
|
|
|
+ return BuildError(id, ErrParse, "Parse error")
|
|
|
}
|
|
|
|
|
|
// 构建无效请求
|
|
|
-func ResponseInvalidRequest(id int) *RpcResponse {
|
|
|
- return BuildResponseError(id, ErrInvalidRequest, "Invalid Request")
|
|
|
+func BuildInvalidRequest(id int) *RpcResponse {
|
|
|
+ return BuildError(id, ErrInvalidRequest, "Invalid Request")
|
|
|
}
|
|
|
|
|
|
// 构建无效方法
|
|
|
-func ResponseMethodNotFound(id int) *RpcResponse {
|
|
|
- return BuildResponseError(id, ErrMethodNotFound, "Method not found")
|
|
|
+func BuildMethodNotFound(id int) *RpcResponse {
|
|
|
+ return BuildError(id, ErrMethodNotFound, "Method not found")
|
|
|
}
|
|
|
|
|
|
// 构建无效参数
|
|
|
-func ResponseInvalidParams(id int) *RpcResponse {
|
|
|
- return BuildResponseError(id, ErrInvalidParams, "Invalid params")
|
|
|
+func BuildInvalidParams(id int) *RpcResponse {
|
|
|
+ return BuildError(id, ErrInvalidParams, "Invalid params")
|
|
|
}
|
|
|
|
|
|
// 构建内部错误
|
|
|
-func ResponseInternalError(id int) *RpcResponse {
|
|
|
- return BuildResponseError(id, ErrInternal, "Internal error")
|
|
|
-}
|
|
|
-
|
|
|
-// 构建用户错误
|
|
|
-func ResponseCustomError(id int, code RpcErrorCode, message string) *RpcResponse {
|
|
|
- return BuildResponseError(id, code, message)
|
|
|
+func BuildInternalError(id int) *RpcResponse {
|
|
|
+ return BuildError(id, ErrInternal, "Internal error")
|
|
|
}
|
|
|
|
|
|
// 应答转字符串
|