Merge pull request #509 from essentialkaos/develop

Version 3.6.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+### [13.6.1](https://kaos.sh/ek/13.6.1)
+
+- `[req]` Guess the value of the `Content-Type` header based on the request body type
+
 ### [13.6.0](https://kaos.sh/ek/13.6.0)
 
 - `[setup]` Added package to install/uninstall application as a service

README.md

@@ -71,6 +71,7 @@ Currently we support Linux and macOS (_except some packages_). All packages have
 - [`rand`](https://kaos.sh/g/ek.v13/rand) — Package for generating random data
 - [`req`](https://kaos.sh/g/ek.v13/req) — Package simplify working with an HTTP requests
 - [`secstr`](https://kaos.sh/g/ek.v13/secstr) — Package provides methods and structs for working with protected (_secure_) strings
+- [`setup`](https://kaos.sh/g/ek.v13/setup) — provides methods to install/unistall application as a service on the system
 - [`signal`](https://kaos.sh/g/ek.v13/signal) — Package provides methods for handling POSIX signals
 - [`sliceutil`](https://kaos.sh/g/ek.v13/sliceutil) — Package provides methods for working with slices
 - [`sortutil`](https://kaos.sh/g/ek.v13/sortutil) — Package provides methods for sorting slices

req/req.go

@@ -590,12 +590,16 @@ func (e *Engine) doRequest(r Request, method string) (*Response, error) {
 		r.URL += "?" + r.Query.Encode()
 	}
 
-	bodyReader, err := getBodyReader(r.Body)
+	bodyReader, contentType, err := getBodyReader(r.Body)
 
 	if err != nil {
 		return nil, RequestError{ERROR_BODY_ENCODE, err.Error()}
 	}
 
+	if r.ContentType == "" {
+		r.ContentType = contentType
+	}
+
 	req, err := createRequest(e, r, bodyReader)
 
 	if err != nil {
@@ -736,25 +740,25 @@ func createFormFile(w *multipart.Writer, fieldName, file string) (io.Writer, err
 	return w.CreateFormFile(fieldName, filepath.Base(file))
 }
 
-func getBodyReader(body any) (io.Reader, error) {
+func getBodyReader(body any) (io.Reader, string, error) {
 	switch u := body.(type) {
 	case nil:
-		return nil, nil
+		return nil, "", nil
 	case string:
-		return strings.NewReader(u), nil
+		return strings.NewReader(u), CONTENT_TYPE_PLAIN, nil
 	case io.Reader:
-		return u, nil
+		return u, CONTENT_TYPE_OCTET_STREAM, nil
 	case []byte:
-		return bytes.NewReader(u), nil
-	default:
-		jsonBody, err := json.MarshalIndent(body, "", "  ")
+		return bytes.NewReader(u), CONTENT_TYPE_OCTET_STREAM, nil
+	}
 
-		if err == nil {
-			return bytes.NewReader(jsonBody), nil
-		}
+	jsonBody, err := json.MarshalIndent(body, "", "  ")
 
-		return nil, err
+	if err == nil {
+		return bytes.NewReader(jsonBody), CONTENT_TYPE_JSON, nil
 	}
+
+	return nil, "", err
 }
 
 func isURL(url string) bool {

version.go

@@ -8,4 +8,4 @@ package ek
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "13.6.0"
+const VERSION = "13.6.1"