prepare to v0.0.4

Author: walterwanderley

.gitignore

@@ -4,6 +4,8 @@
 *.db
 *.db-shm
 *.db-wal
+httpcache.so
+httpcache.h
 
 # Added by goreleaser init:
 dist/

.goreleaser.yaml

@@ -10,6 +10,8 @@ builds:
   - id: httpcache
     binary: httpcache
     buildmode: "c-shared"
+    flags:
+      - -tags=zig
     ldflags:
     - -s -w -X github.com/walterwanderley/sqlite-http-cache/extension.version={{.Version}} -X github.com/walterwanderley/sqlite-http-cache/extension.commit={{.Commit}} -X github.com/walterwanderley/sqlite-http-cache/extension.date={{.Date}}
     goos:
@@ -18,10 +20,13 @@ builds:
       - amd64
     env:
       - CGO_ENABLED=1
+      - CC=zig cc -target x86_64-linux-gnu
 
   - id: httpcache_windows
     binary: httpcache
     buildmode: "c-shared"
+    flags:
+      - -tags=zig
     ldflags:
     - -s -w -X github.com/walterwanderley/sqlite-http-cache/extension.version={{.Version}} -X github.com/walterwanderley/sqlite-http-cache/extension.commit={{.Commit}} -X github.com/walterwanderley/sqlite-http-cache/extension.date={{.Date}}
     goos:
@@ -32,19 +37,38 @@ builds:
       - CGO_ENABLED=1
       - CC=zig cc -target x86_64-windows
 
+  - id: httpcache_darwin
+    binary: httpcache
+    buildmode: "c-shared"
+    ldflags:
+    - -s -w -X github.com/walterwanderley/sqlite-http-cache/extension.version={{.Version}} -X github.com/walterwanderley/sqlite-http-cache/extension.commit={{.Commit}} -X github.com/walterwanderley/sqlite-http-cache/extension.date={{.Date}}
+    goos:
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+
   - id: sqlite-http-proxy
     main: ./cmd/sqlite-http-proxy
     binary: sqlite-http-proxy
+    flags:
+      - -tags=zig
     goos:
       - linux
     goarch:
       - amd64
     env:
       - CGO_ENABLED=1
+      - CC=zig cc -target x86_64-linux-musl
 
   - id: sqlite-http-proxy_windows
     main: ./cmd/sqlite-http-proxy
     binary: sqlite-http-proxy
+    flags:
+      - -tags=zig
     goos:
       - windows
     goarch:
@@ -53,15 +77,55 @@ builds:
       - CGO_ENABLED=1
       - CC=zig cc -target x86_64-windows
 
+  - id: sqlite-http-proxy_darwin
+    main: ./cmd/sqlite-http-proxy
+    binary: sqlite-http-proxy
+    goos:
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+
   - id: sqlite-http-refresh
     main: ./cmd/sqlite-http-refresh
     binary: sqlite-http-refresh
+    flags:
+      - -tags=zig
     goos:
       - linux
     goarch:
       - amd64
     env:
       - CGO_ENABLED=1  
+      - CC=zig cc -target x86_64-linux-musl
+
+  - id: sqlite-http-refresh_windows
+    main: ./cmd/sqlite-http-refresh
+    binary: sqlite-http-refresh
+    flags:
+      - -tags=zig
+    goos:
+      - windows
+    goarch:
+      - amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=zig cc -target x86_64-windows
+
+  - id: sqlite-http-refresh_darwin
+    main: ./cmd/sqlite-http-refresh
+    binary: sqlite-http-refresh
+    goos:
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    env:
+      - CGO_ENABLED=1  
+      - CC=o64-clang
 
   - id: libsql-http-proxy
     main: ./cmd/libsql-http-proxy
@@ -76,10 +140,10 @@ builds:
 archives:
   - id: httpcache
     formats: [tar.gz]
-    ids: [httpcache, httpcache_windows]
+    ids: [httpcache, httpcache_windows, httpcache_darwin]
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
-      httpcache_
+      httpcache_v
       {{- .Version }}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
@@ -95,7 +159,7 @@ archives:
 
   - id: sqlite-http-proxy
     formats: [tar.gz]
-    ids: [sqlite-http-proxy, sqlite-http-proxy_windows]
+    ids: [sqlite-http-proxy, sqlite-http-proxy_windows, sqlite-http-proxy_darwin]
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
       {{- .Binary }}_
@@ -114,7 +178,7 @@ archives:
 
   - id: sqlite-http-refresh
     formats: [tar.gz]
-    ids: [sqlite-http-refresh]
+    ids: [sqlite-http-refresh, sqlite-http-refresh_windows, sqlite-http-refresh_darwin]
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
       {{- .Binary }}_

Dockerfile-builder

@@ -0,0 +1,23 @@
+FROM crazymax/osxcross:15.5-debian as osxcross
+
+FROM golang:1.25-trixie
+
+RUN apt update
+RUN apt install -y dpkg curl tar xz-utils zip gettext clang lld libc-dev
+
+RUN curl https://ziglang.org/download/0.14.1/zig-x86_64-linux-0.14.1.tar.xz | tar x -J -C /opt
+RUN ln -s /opt/zig* /opt/zig
+
+ENV PATH="$PATH:/opt/zig"
+
+RUN curl -o goreleaser_amd64.tar.gz -L https://github.com/goreleaser/goreleaser/releases/download/v2.11.2/goreleaser_Linux_x86_64.tar.gz
+RUN tar xvf goreleaser_amd64.tar.gz -C /usr/bin
+
+COPY --from=osxcross /osxcross /osxcross
+
+ENV PATH="/osxcross/bin:$PATH"
+ENV LD_LIBRARY_PATH="/osxcross/lib:$LD_LIBRARY_PATH"
+
+WORKDIR /app
+
+COPY . /app

LICENSE

@@ -0,0 +1,12 @@
+
+.PRONY: builder
+builder:
+	docker build -f Dockerfile-builder -t builder .
+
+.PHONY: snapshot
+snapshot: builder
+	docker run -e GITHUB_TOKEN=${GITHUB_TOKEN} builder goreleaser release --clean --snapshot --skip publish
+
+.PHONY: release
+release: builder
+	docker run -e GITHUB_TOKEN=${GITHUB_TOKEN} builder goreleaser release --clean

Makefile

@@ -9,6 +9,8 @@ Download **httpcache** extension from the [releases page](https://github.com/wal
 
 ### Compiling from source
 
+- [Go 1.24+](https://go.dev) is required.
+
 ```sh
 go build -ldflags="-s -w" -buildmode=c-shared -o httpcache.so
 ```
@@ -21,9 +23,6 @@ sqlite3
 # Load the extension
 .load ./httpcache
 
-# Check extension info
-SELECT cache_info();
-
 # Insert URL into the temp.http_request virtual table to trigger the HTTP Request 
 INSERT INTO temp.http_request VALUES('https://swapi.tech/api/films/1');
 
@@ -34,28 +33,68 @@ INSERT INTO temp.http_request VALUES('https://swapi.tech/api/films/1');
 SELECT JSON_EXTRACT(body, '$.result.properties.title') AS title,
   JSON_EXTRACT(body, '$.result.properties.release_date') AS release_date 
   FROM http_response;
+┌──────────────┬──────────────┐
+│    title     │ release_date │
+├──────────────┼──────────────┤
+│ 'A New Hope' │ '1977-05-25' │
+└──────────────┴──────────────┘
 
 # Use cache_age, cache_lifetime or cache_expired function to check cache validity based on RFC9111
 SELECT url, cache_age(header, request_time, response_time) AS age, 
 cache_lifetime(header, response_time) AS lifetime, 
 cache_expired(header, request_time, response_time, false) AS expired, 
 cache_expired_ttl(header, request_time, response_time, false, 3600) AS expiredTTLFallback 
 FROM http_response; 
+┌──────────────────────────────────┬─────┬──────────┬─────────┬────────────────────┐
+│               url                │ age │ lifetime │ expired │ expiredTTLFallback │
+├──────────────────────────────────┼─────┼──────────┼─────────┼────────────────────┤
+│ 'https://swapi.tech/api/films/1' │ 37  │ 0        │ 1       │ 0                  │
+└──────────────────────────────────┴─────┴──────────┴─────────┴────────────────────┘
 ```
 
 All HTTP responses are stored in tables using the following schema:
 
 ```sql
-CREATE TABLE IF NOT EXISTS http_response(
-		url TEXT PRIMARY KEY,
-		status INTEGER,
-		body BLOB,
-		header JSONB,
-		request_time DATETIME,
-		response_time DATETIME
+TABLE http_response(
+	url TEXT PRIMARY KEY,
+	status INTEGER,
+	body BLOB,
+	header JSONB,
+	request_time DATETIME,
+	response_time DATETIME
 )
 ```
 
+If you want to customize the persisted data, just create an another table and create triggers for "http_response".
+
+```sql
+CREATE TABLE movies(
+  ID INTEGER PRIMARY KEY AUTOINCREMENT,
+  title TEXT,
+  release_date DATETIME
+);
+
+CREATE TRIGGER insert_http_response
+AFTER INSERT ON http_response
+BEGIN
+  INSERT INTO movies(title, release_date)
+  VALUES(
+    JSON_EXTRACT(NEW.body, '$.result.properties.title'),
+    JSON_EXTRACT(NEW.body, '$.result.properties.release_date')
+  );
+END;
+
+INSERT INTO temp.http_request VALUES('https://swapi.tech/api/films/2');
+
+SELECT * FROM movies;
+┌────┬───────────────────────────┬──────────────┐
+│ ID │           title           │ release_date │
+├────┼───────────────────────────┼──────────────┤
+│ 1  │ 'The Empire Strikes Back' │ '1980-05-17' │
+└────┴───────────────────────────┴──────────────┘
+
+```
+
 ## Configuring
 
 You can configure the behaviour by passing parameters to a VIRTUAL TABLE.
@@ -143,7 +182,7 @@ WHERE unixepoch() - unixepoch(response_time) > :ttl ;
 
 ## SQLite Proxy Cache
 
-The sqlite-http-proxy is an HTTP proxy cache that can store data in multiple sqlite databases and query concurrently to get the faster response. The cache imlements the RFC9111 (except the vary header).
+The sqlite-http-proxy is an HTTP proxy cache that can store data in multiple sqlite databases and query concurrently to get the faster response. The cache implements [RFC9111](https://www.rfc-editor.org/rfc/rfc9111.html) (except for the Vary header).
 
 1. Installation:
 
@@ -166,6 +205,33 @@ time curl -x http://127.0.0.1:9090 http://swapi.tech/api/films/1
 time curl -x http://127.0.0.1:9090 http://swapi.tech/api/films/1
 ```
 
+### Proxing HTTPS Requests
+
+To proxy https requests you need to pass CA Certificate and CA Certificate key to the sqlite-http-proxy.
+
+```sh
+sqlite-http-proxy --ca-cert=/path/to/ca.crt --ca-cert-key=/path/to/ca.key proxyN.db
+```
+
+Use the command line flag --help for more info.
+
 ```sh
 sqlite-http-proxy --help
+```
+
+## Go HTTP Client
+
+This repository has an http.Transport implementation to use sqlite as cache of HTTP requests from golang.
+
+```go
+package main
+
+import httpcache "github.com/walterwanderley/sqlite-http-cache/http"
+
+func main() {
+
+}
+
+
+
 ```

README.md

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/elazarl/goproxy"
+	"github.com/elazarl/goproxy/ext/auth"
 	"github.com/peterbourgon/ff/v4"
 	"github.com/peterbourgon/ff/v4/ffhelp"
 	"github.com/tursodatabase/go-libsql"
@@ -31,6 +32,7 @@ func main() {
 	dbSyncInterval := fs.DurationLong("db-sync-interval", 30*time.Second, "Database sync interval")
 	dbAuthToken := fs.StringLong("db-token", "", "Database authorization token")
 	dbEncryptionKey := fs.StringLong("db-key", "", "Database encryption key")
+	dbCleanupInterval := fs.DurationLong("db-cleanup-interval", 0, "Database cleanup interval. Data is deleted using --ttl as reference")
 	verbose := fs.Bool('v', "verbose", "Enable verbose mode")
 	allowHTTP2 := fs.BoolLong("h2", "Allow HTTP2")
 	statusCodes := fs.StringListLong("status-code", fmt.Sprintf("List of cacheable status code. Defaults to the heuristically cacheable codes: %v", config.DefaultStatusCodes()))
@@ -41,6 +43,8 @@ func main() {
 	readOnly := fs.BoolLong("ro", "Read Only mode. Do not store new HTTP responses")
 	rfc9111 := fs.BoolLong("rfc9111", "Use RFC9111 spec")
 	shared := fs.BoolLong("shared", "Enable shared cache mode")
+	authUser := fs.StringLong("auth-user", "", "Username for proxy basic authentication")
+	authPass := fs.StringLong("auth-pass", "", "Password for proxy basic authentication")
 	_ = fs.String('c', "config", "", "config file (optional)")
 
 	if err := ff.Parse(fs, os.Args[1:],
@@ -141,12 +145,12 @@ func main() {
 
 	}
 	if len(dbs) == 1 {
-		repository, err = db.NewRepository(dbs[0], tableList...)
+		repository, err = db.NewRepository(dbs[0], time.Duration(*ttl)*time.Second, *dbCleanupInterval, tableList...)
 		if err != nil {
 			log.Fatalf("new repository: %v", err)
 		}
 	} else {
-		repository, err = db.NewMultiDatabaseRepository(dbs)
+		repository, err = db.NewMultiDatabaseRepositoryWithTTL(time.Duration(*ttl)*time.Second, *dbCleanupInterval, dbs)
 		if err != nil {
 			log.Fatalf("new multi database repository: %v", err)
 		}
@@ -157,6 +161,12 @@ func main() {
 	proxy.Verbose = *verbose
 	proxy.AllowHTTP2 = *allowHTTP2
 
+	if *authUser != "" {
+		auth.ProxyBasic(proxy, "Auth", func(user, passwd string) bool {
+			return user == *authUser && *authPass == passwd
+		})
+	}
+
 	if *caCert != "" && *caCertKey != "" {
 		proxy.Logger.Printf("INFO: Starting HTTP/HTTPS Proxy...")
 		cert, err := parseCA([]byte(*caCert), []byte(*caCertKey))