Merge pull request #18 from masl/change-http-client

Change http client

Author: masl

.github/workflows/build.yml

@@ -2,25 +2,25 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
-    paths-ignore: '**.md'
+    branches: [main]
+    paths-ignore: ["**.md"]
   pull_request:
-    branches: [ main ]
-    paths-ignore: '**.md'
+    branches: [main]
+    paths-ignore: ["**.md"]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: '1.20.3'
 
-    - name: Build
-      run: go build -v ./...
+      - name: Build
+        run: go build -v ./...
 
-    - name: Test
-      run: go test -v ./...
+      - name: Test
+        run: go test -v ./...

client.go

@@ -3,9 +3,8 @@ package frankfurtergo
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"time"
-
-	"github.com/valyala/fasthttp"
 )
 
 type ClientOptions struct {
@@ -14,7 +13,7 @@ type ClientOptions struct {
 
 type Client struct {
 	options    *ClientOptions
-	httpClient *fasthttp.Client
+	httpClient *http.Client
 }
 
 func New(options ...ClientOptions) *Client {
@@ -29,10 +28,8 @@ func New(options ...ClientOptions) *Client {
 	}
 
 	return &Client{
-		options: &opt,
-		httpClient: &fasthttp.Client{
-			Name: "frankfurtergo",
-		},
+		options:    &opt,
+		httpClient: &http.Client{},
 	}
 }
 

client_test.go

@@ -2,13 +2,19 @@ package frankfurtergo
 
 import (
 	"testing"
+	"time"
 )
 
-func TestClient(*testing.T) {
+func TestClient(t *testing.T) {
 	s := New(ClientOptions{
 		Host: "api.frankfurter.app",
 	})
 
 	s.FetchCurrencies()
 	s.FetchLatest()
+	t.Log(s.FetchLatest())
+	t.Log(s.FetchSeries(time.Now().AddDate(0, 0, -3), time.Now(), RequestOptions{
+		From: "USD",
+		To:   []string{"EUR", "PLN"},
+	}))
 }

go.mod

@@ -1,5 +1,3 @@
 module github.com/masl/frankfurtergo
 
-go 1.16
-
-require github.com/valyala/fasthttp v1.37.0
+go 1.20

go.sum

@@ -1,22 +0,0 @@
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
-github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.37.0 h1:7WHCyI7EAkQMVmrfBhWTCOaeROb1aCBiTopx63LkMbE=
-github.com/valyala/fasthttp v1.37.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
-github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

request.go

@@ -3,11 +3,11 @@ package frankfurtergo
 import (
 	"errors"
 	"fmt"
+	"io"
+	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
-
-	"github.com/valyala/fasthttp"
 )
 
 type RequestOptions struct {
@@ -34,13 +34,15 @@ func (c *Client) jsonRequest(path string, options ...RequestOptions) (body []byt
 		uri.RawQuery = queryValues.Encode()
 	}
 
-	status, body, err := c.httpClient.Get(nil, uri.String())
+	resp, err := c.httpClient.Get(uri.String())
 	if err != nil {
 		return
 	}
+	defer resp.Body.Close()
+	body, err = io.ReadAll(resp.Body)
 
-	if status != fasthttp.StatusOK {
-		return nil, errors.New(strconv.Itoa(status))
+	if resp.StatusCode != http.StatusOK {
+		return nil, errors.New(strconv.Itoa(resp.StatusCode))
 	}
 
 	return