fix: httpclient JsonEncode/JsonDecode

lenye · Dec 3, 2023 · 6612082 · 6612082
1 parent 9630587
commit 6612082
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@
 * Linux
 * macOS
 * FreeBSD
+* OpenBSD
 
 ## 文档
 

diff --git a/docs/install.md b/docs/install.md
@@ -6,6 +6,7 @@
 * Linux
 * macOS
 * FreeBSD
+* OpenBSD
 
 #### 使用二进制发行版
 

diff --git a/internal/im/dingtalk/client/client.go b/internal/im/dingtalk/client/client.go
@@ -15,8 +15,6 @@
 package client
 
 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
 	"net/http"
 
@@ -33,15 +31,12 @@ func CheckHttpResponseStatusCode(method, url string, statusCode int) error {
 
 // PostJSON http post json
 func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
-	buf := new(bytes.Buffer)
-	enc := json.NewEncoder(buf)
-	enc.SetEscapeHTML(false)
-	err := enc.Encode(reqBody)
+	body, err := httpclient.JsonEncode(reqBody)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, bytes.NewReader(buf.Bytes()))
+	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, body)
 	if err != nil {
 		return nil, fmt.Errorf("%w; %s %s, %v", httpclient.ErrRequest, http.MethodPost, url, err)
 	}
@@ -51,5 +46,5 @@ func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
 		return nil, err
 	}
 
-	return resp.Header, httpclient.DecodeResponse(resp.Body, respBody)
+	return resp.Header, httpclient.JsonDecode(resp.Body, respBody)
 }
diff --git a/internal/im/feishu/client/client.go b/internal/im/feishu/client/client.go
@@ -15,8 +15,6 @@
 package client
 
 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
 	"net/http"
 
@@ -25,22 +23,19 @@ import (
 
 // PostJSON http post json
 func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
-	buf := new(bytes.Buffer)
-	enc := json.NewEncoder(buf)
-	enc.SetEscapeHTML(false)
-	err := enc.Encode(reqBody)
+	body, err := httpclient.JsonEncode(reqBody)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, bytes.NewReader(buf.Bytes()))
+	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, body)
 	if err != nil {
 		return nil, fmt.Errorf("%w; %s %s, %v", httpclient.ErrRequest, http.MethodPost, url, err)
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode/100 != 2 {
-		return resp.Header, httpclient.DecodeResponse(resp.Body, respBody)
+		return resp.Header, httpclient.JsonDecode(resp.Body, respBody)
 	}
 
 	return resp.Header, nil

diff --git a/internal/im/weixin/client/client.go b/internal/im/weixin/client/client.go
@@ -15,8 +15,6 @@
 package client
 
 import (
-	"bytes"
-	"encoding/json"
 	"fmt"
 	"net/http"
 
@@ -42,20 +40,17 @@ func GetJSON(url string, respBody any) (http.Header, error) {
 		return nil, err
 	}
 
-	return resp.Header, httpclient.DecodeResponse(resp.Body, respBody)
+	return resp.Header, httpclient.JsonDecode(resp.Body, respBody)
 }
 
 // PostJSON http post json
 func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
-	buf := new(bytes.Buffer)
-	enc := json.NewEncoder(buf)
-	enc.SetEscapeHTML(false)
-	err := enc.Encode(reqBody)
+	body, err := httpclient.JsonEncode(reqBody)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, bytes.NewReader(buf.Bytes()))
+	resp, err := httpclient.Post(url, httpclient.HdrValApplicationJson, body)
 	if err != nil {
 		return nil, fmt.Errorf("%w; %s %s, %v", httpclient.ErrRequest, http.MethodPost, url, err)
 	}
@@ -65,7 +60,7 @@ func PostJSON(url string, reqBody, respBody any) (http.Header, error) {
 		return nil, err
 	}
 
-	return resp.Header, httpclient.DecodeResponse(resp.Body, respBody)
+	return resp.Header, httpclient.JsonDecode(resp.Body, respBody)
 }
 
 func PostFileJSON(url, fieldName, fileName string, respBody any) (http.Header, error) {
@@ -79,5 +74,5 @@ func PostFileJSON(url, fieldName, fileName string, respBody any) (http.Header, e
 		return nil, err
 	}
 
-	return resp.Header, httpclient.DecodeResponse(resp.Body, respBody)
+	return resp.Header, httpclient.JsonDecode(resp.Body, respBody)
 }
diff --git a/pkg/httpclient/client.go b/pkg/httpclient/client.go
@@ -16,7 +16,6 @@ package httpclient
 
 import (
 	"bytes"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -173,15 +172,3 @@ func PostFile(url, formName, fileName string) (*http.Response, error) {
 	form := NewMultipartForm().AddFile(formName, fileName)
 	return PostMultipartForm(url, form)
 }
-
-func decodeJson(body io.Reader, v any) error {
-	return json.NewDecoder(body).Decode(v)
-}
-
-// DecodeResponse 解码响应
-func DecodeResponse(body io.Reader, v any) error {
-	if v == nil {
-		return nil
-	}
-	return decodeJson(body, v)
-}
diff --git a/pkg/httpclient/json.go b/pkg/httpclient/json.go
@@ -0,0 +1,42 @@
+// Copyright 2022-2023 The pmsg Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package httpclient
+
+import (
+	"bytes"
+	"encoding/json"
+	"io"
+)
+
+func JsonDecode(body io.Reader, v any) error {
+	if v == nil {
+		return nil
+	}
+	return json.NewDecoder(body).Decode(v)
+}
+
+func JsonEncode(v any) (io.Reader, error) {
+	if v == nil {
+		return nil, nil
+	}
+	buf := new(bytes.Buffer)
+	enc := json.NewEncoder(buf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(v)
+	if err != nil {
+		return nil, err
+	}
+	return buf, nil
+}