fix http.Transport

Author: walterwanderley

README.md

@@ -226,12 +226,62 @@ This repository has an http.Transport implementation to use sqlite as cache of H
 ```go
 package main
 
-import httpcache "github.com/walterwanderley/sqlite-http-cache/http"
+import (
+	"context"
+	"database/sql"
+	"log/slog"
+	"time"
+
+	_ "github.com/mattn/go-sqlite3"
+	dbcache "github.com/walterwanderley/sqlite-http-cache/db"
+	httpcache "github.com/walterwanderley/sqlite-http-cache/http"
+)
 
 func main() {
 
+	db, err := sql.Open("sqlite3", "file:example.db")
+	if err != nil {
+		panic(err)
+	}
+	defer db.Close()
+
+	tablesNames := []string{"example"}
+
+	err = dbcache.CreateResponseTables(db, tablesNames...)
+	if err != nil {
+		panic(err)
+	}
+
+	config := httpcache.Config{
+		DB:              db,
+		Tables:          tablesNames,
+		ReadOnly:        false,
+		TTL:             30 * time.Second,
+		RFC9111:         false,
+		CleanupInterval: 0,
+	}
+
+	client, err := config.Client(context.Background())
+	if err != nil {
+		panic(err)
+	}
+
+	start := time.Now()
+	resp, err := client.Get("http://swapi.tech/api/films/1")
+	if err != nil {
+		panic(err)
+	}
+	defer resp.Body.Close()
+
+	slog.Info("first request", "duration", time.Since(start))
+
+	start = time.Now()
+	resp, err = client.Get("http://swapi.tech/api/films/1")
+	if err != nil {
+		panic(err)
+	}
+	defer resp.Body.Close()
+
+	slog.Info("second request", "duration", time.Since(start))
 }
-
-
-
 ```

http/http.go

@@ -28,17 +28,22 @@ type Config struct {
 	CleanupInterval time.Duration
 }
 
-func (c Config) Client(ctx context.Context) (*http.Client, io.Closer, error) {
+func (c Config) Client(ctx context.Context) (*http.Client, error) {
 	cc := internal.ContextClient(ctx)
 	t, err := newTransport(cc.Transport, c)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
+	go func() {
+		<-ctx.Done()
+		t.Close()
+	}()
+
 	return &http.Client{
 		Transport:     t,
 		CheckRedirect: cc.CheckRedirect,
 		Jar:           cc.Jar,
 		Timeout:       cc.Timeout,
-	}, t, nil
+	}, nil
 }

http/rw_rfc9111_transport.go

@@ -54,39 +54,55 @@ func (t *readWriteRFC9111Transport) RoundTrip(req *http.Request) (*http.Response
 		return t.base.RoundTrip(req)
 	}
 
+	var (
+		requestTime  time.Time
+		responseTime time.Time
+		resp         *http.Response
+		err          error
+	)
 	url := req.URL.String()
 	respDB, err := t.querier.FindByURL(req.Context(), url)
 	if err != nil {
-		requestTime := time.Now()
-		resp, err := t.base.RoundTrip(req)
+		requestTime = time.Now()
+		resp, err = t.base.RoundTrip(req)
 		if err != nil {
 			return nil, err
 		}
-		responseTime := time.Now()
+		responseTime = time.Now()
+	}
 
-		respCC := ParseCacheControl(http.Header(resp.Header), &requestTime, &responseTime, t.sharedCache, ttlSeconds)
-		if slices.Contains(t.cacheableStatus, resp.StatusCode) && respCC.Cacheable() && respDB != nil {
-			newRespDB, err := db.HttpToResponse(resp)
-			if err == nil {
-				newRespDB.TableName = respDB.TableName
-				t.querier.Write(context.Background(), url, newRespDB)
-			}
+	if respDB != nil {
+		respCC := ParseCacheControl(http.Header(respDB.Header), &respDB.RequestTime, &respDB.ResponseTime, t.sharedCache, ttlSeconds)
+		if !respCC.Expired() {
+			return &http.Response{
+				StatusCode: respDB.Status,
+				Body:       respDB.Body,
+				Header:     http.Header(respDB.Header),
+			}, nil
 		}
-
-		return resp, err
 	}
 
-	respCC := ParseCacheControl(http.Header(respDB.Header), &respDB.RequestTime, &respDB.ResponseTime, t.sharedCache, ttlSeconds)
-	if respCC.Expired() {
-		return t.base.RoundTrip(req)
+	if resp == nil {
+		requestTime = time.Now()
+		resp, err = t.base.RoundTrip(req)
+		if err != nil {
+			return nil, err
+		}
+		responseTime = time.Now()
 	}
+	respCC := ParseCacheControl(http.Header(resp.Header), &requestTime, &responseTime, t.sharedCache, ttlSeconds)
+	if slices.Contains(t.cacheableStatus, resp.StatusCode) && respCC.Cacheable() {
+		newRespDB, err := db.HttpToResponse(resp)
+		if err == nil {
+			if respDB != nil {
+				newRespDB.TableName = respDB.TableName
+			}
+			t.querier.Write(context.Background(), url, newRespDB)
+		}
 
-	return &http.Response{
-		StatusCode: respDB.Status,
-		Body:       respDB.Body,
-		Header:     http.Header(respDB.Header),
-	}, nil
+	}
 
+	return resp, err
 }
 
 func (t *readWriteRFC9111Transport) Close() error {

http/rw_transport.go

@@ -44,27 +44,42 @@ func (t *readWriteTransport) RoundTrip(req *http.Request) (*http.Response, error
 		return t.base.RoundTrip(req)
 	}
 
+	var (
+		resp *http.Response
+		err  error
+	)
 	url := req.URL.String()
 	respDB, err := t.querier.FindByURL(req.Context(), url)
-	if err != nil || (t.ttl > 0 && time.Since(respDB.ResponseTime) > t.ttl) ||
-		(len(t.cacheableStatus) > 0 && !slices.Contains(t.cacheableStatus, respDB.Status)) {
-		resp, err := t.base.RoundTrip(req)
-		if err == nil && respDB != nil {
-			newRespDB, err := db.HttpToResponse(resp)
-			if err == nil {
-				newRespDB.TableName = respDB.TableName
-				t.querier.Write(context.Background(), url, newRespDB)
-			}
+	if err != nil {
+		resp, err = t.base.RoundTrip(req)
+		if err != nil {
+			return nil, err
 		}
-		return resp, err
 	}
 
-	return &http.Response{
-		StatusCode: respDB.Status,
-		Body:       respDB.Body,
-		Header:     http.Header(respDB.Header),
-	}, nil
+	if respDB != nil && !((t.ttl > 0 && time.Since(respDB.ResponseTime) > t.ttl) ||
+		(len(t.cacheableStatus) > 0 && !slices.Contains(t.cacheableStatus, respDB.Status))) {
+		return &http.Response{
+			StatusCode: respDB.Status,
+			Body:       respDB.Body,
+			Header:     http.Header(respDB.Header),
+		}, nil
+	}
+	if resp == nil {
+		resp, err = t.base.RoundTrip(req)
+		if err != nil {
+			return nil, err
+		}
+	}
+	newRespDB, err := db.HttpToResponse(resp)
+	if err == nil {
+		if respDB != nil {
+			newRespDB.TableName = respDB.TableName
+		}
+		t.querier.Write(context.Background(), url, newRespDB)
+	}
 
+	return resp, err
 }
 
 func (t *readWriteTransport) Close() error {