http.Client with TTL

Author: walterwanderley

http/http.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"io"
 	"net/http"
+	"time"
 
 	"github.com/walterwanderley/sqlite-http-cache/http/internal"
 )
@@ -20,6 +21,7 @@ type Config struct {
 	DB       *sql.DB
 	Tables   []string
 	ReadOnly bool
+	TTL      time.Duration
 }
 
 func (c Config) Client(ctx context.Context) (*http.Client, io.Closer, error) {
@@ -29,9 +31,9 @@ func (c Config) Client(ctx context.Context) (*http.Client, io.Closer, error) {
 		err error
 	)
 	if c.ReadOnly {
-		t, err = newReadOnlyTransport(cc.Transport, c.DB, c.Tables...)
+		t, err = newReadOnlyTransport(cc.Transport, c.DB, c.TTL, c.Tables...)
 	} else {
-		t, err = newReadWriteTransport(cc.Transport, c.DB, c.Tables...)
+		t, err = newReadWriteTransport(cc.Transport, c.DB, c.TTL, c.Tables...)
 	}
 	if err != nil {
 		return nil, nil, err

http/ro_transport.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"time"
 
 	"github.com/walterwanderley/sqlite-http-cache/db"
 )
@@ -18,9 +19,10 @@ type readOnlyTransportQuerier interface {
 type readOnlyTransport struct {
 	base    http.RoundTripper
 	querier readOnlyTransportQuerier
+	ttl     time.Duration
 }
 
-func newReadOnlyTransport(base http.RoundTripper, sqlDB *sql.DB, tableNames ...string) (*readOnlyTransport, error) {
+func newReadOnlyTransport(base http.RoundTripper, sqlDB *sql.DB, ttl time.Duration, tableNames ...string) (*readOnlyTransport, error) {
 	if base == nil {
 		base = http.DefaultTransport.(*http.Transport).Clone()
 	}
@@ -31,6 +33,7 @@ func newReadOnlyTransport(base http.RoundTripper, sqlDB *sql.DB, tableNames ...s
 	return &readOnlyTransport{
 		base:    base,
 		querier: querier,
+		ttl:     ttl,
 	}, nil
 }
 
@@ -41,7 +44,7 @@ func (t *readOnlyTransport) RoundTrip(req *http.Request) (*http.Response, error)
 
 	url := req.URL.String()
 	resp, err := t.querier.FindByURL(req.Context(), url)
-	if err != nil {
+	if err != nil || time.Since(resp.Timestamp) > t.ttl {
 		return t.base.RoundTrip(req)
 	}
 

http/rw_transport.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/walterwanderley/sqlite-http-cache/db"
 )
@@ -17,9 +18,10 @@ type readWriteTransportQuerier interface {
 type readWriteTransport struct {
 	base    http.RoundTripper
 	querier readWriteTransportQuerier
+	ttl     time.Duration
 }
 
-func newReadWriteTransport(base http.RoundTripper, sqlDB *sql.DB, tableNames ...string) (*readWriteTransport, error) {
+func newReadWriteTransport(base http.RoundTripper, sqlDB *sql.DB, ttl time.Duration, tableNames ...string) (*readWriteTransport, error) {
 	if base == nil {
 		base = http.DefaultTransport.(*http.Transport).Clone()
 	}
@@ -30,6 +32,7 @@ func newReadWriteTransport(base http.RoundTripper, sqlDB *sql.DB, tableNames ...
 	return &readWriteTransport{
 		base:    base,
 		querier: querier,
+		ttl:     ttl,
 	}, nil
 }
 
@@ -39,19 +42,23 @@ func (t *readWriteTransport) RoundTrip(req *http.Request) (*http.Response, error
 	}
 
 	url := req.URL.String()
-	resp, err := t.querier.FindByURL(req.Context(), url)
-	if err != nil {
+	respDB, err := t.querier.FindByURL(req.Context(), url)
+	if err != nil || time.Since(respDB.Timestamp) > t.ttl {
 		resp, err := t.base.RoundTrip(req)
 		if err == nil {
-
+			newRespDB, err := db.HttpToResponse(resp)
+			if err == nil {
+				newRespDB.TableName = respDB.TableName
+				t.querier.Write(context.Background(), url, newRespDB)
+			}
 		}
 		return resp, err
 	}
 
 	return &http.Response{
-		StatusCode: resp.Status,
-		Body:       resp.Body,
-		Header:     http.Header(resp.Headers),
+		StatusCode: respDB.Status,
+		Body:       respDB.Body,
+		Header:     http.Header(respDB.Headers),
 	}, nil
 
 }