Replace GraphQL server with Connect RPC

.golangci.yml

@@ -24,7 +24,7 @@ linters:
     - maligned
     - nilnil
     - nlreturn
-    - scopelint 
+    - scopelint
     - testpackage
     - varnamelen
     - wrapcheck
@@ -35,19 +35,19 @@ linters-settings:
   godot:
     capital: true
   ireturn:
-    allow: "error,empty,anon,stdlib,.*(or|er)$,github.com/99designs/gqlgen/graphql.Marshaler,github.com/dstotijn/hetty/pkg/api.QueryResolver,github.com/dstotijn/hetty/pkg/filter.Expression"
-    
+    allow: "error,empty,anon,stdlib,.*(or|er)$,github.com/dstotijn/hetty/pkg/filter.Expression"
+
 issues:
   exclude-rules:
     - linters:
-      - gosec
+        - gosec
       # Ignore SHA1 usage.
       text: "G(401|505):"
     - linters:
-      - wsl
+        - wsl
       # Ignore cuddled defer statements.
       text: "only one cuddle assignment allowed before defer statement"
     - linters:
-      - nlreturn
+        - nlreturn
       # Ignore `break` without leading blank line.
-      text: "break with no blank line before"
+      text: "break with no blank line before"

README.md

@@ -96,7 +96,7 @@ $ hetty --help
 Usage:
     hetty [flags] [subcommand] [flags]
 
-Runs an HTTP server with (MITM) proxy, GraphQL service, and a web based admin interface.
+Runs an HTTP server with (MITM) proxy and a web based admin interface.
 
 Options:
     --cert         Path to root CA certificate. Creates file if it doesn't exist. (Default: "~/.hetty/hetty_cert.pem")

buf.gen.yaml

@@ -0,0 +1,10 @@
+version: v2
+plugins:
+  - local: protoc-gen-go
+    out: pkg
+    opt: paths=source_relative
+  - local: protoc-gen-connect-go
+    out: pkg
+    opt:
+      - paths=source_relative
+      - package_suffix # Generate `*.connect.go` files next to `*.pb.go` files.

buf.yaml

@@ -0,0 +1,12 @@
+version: v2
+modules:
+  - path: proto
+lint:
+  use:
+    - STANDARD
+  except:
+    - PACKAGE_DIRECTORY_MATCH
+    - PACKAGE_VERSION_SUFFIX
+breaking:
+  use:
+    - PACKAGE

cmd/hetty/hetty.go

@@ -22,7 +22,6 @@ import (
 	"go.etcd.io/bbolt"
 	"go.uber.org/zap"
 
-	"github.com/dstotijn/hetty/pkg/api"
 	"github.com/dstotijn/hetty/pkg/chrome"
 	"github.com/dstotijn/hetty/pkg/db/bolt"
 	"github.com/dstotijn/hetty/pkg/proj"
@@ -45,7 +44,7 @@ var hettyUsage = `
 Usage:
     hetty [flags] [subcommand] [flags]
 
-Runs an HTTP server with (MITM) proxy, GraphQL service, and a web based admin interface.
+Runs an HTTP server with (MITM) proxy and a web based admin interface.
 
 Options:
     --cert         Path to root CA certificate. Creates file if it doesn't exist. (Default: "~/.hetty/hetty_cert.pem")
@@ -229,14 +228,11 @@ func (cmd *HettyCommand) Exec(ctx context.Context, _ []string) error {
 			req.Method != http.MethodConnect && !strings.HasPrefix(req.RequestURI, "http://")
 	}).Subrouter().StrictSlash(true)
 
-	// GraphQL server.
-	gqlEndpoint := "/api/graphql/"
-	adminRouter.Path(gqlEndpoint).Handler(api.HTTPHandler(&api.Resolver{
-		ProjectService:    projService,
-		RequestLogService: reqLogService,
-		InterceptService:  interceptService,
-		SenderService:     senderService,
-	}, gqlEndpoint))
+	// Connect RPC server.
+	projPath, projHandler := proj.NewProjectServiceHandler(projService)
+	adminRouter.PathPrefix(projPath).Handler(projHandler)
+	reqlogPath, reqlogHandler := reqlog.NewHttpRequestLogServiceHandler(reqLogService)
+	adminRouter.PathPrefix(reqlogPath).Handler(reqlogHandler)
 
 	// Admin interface.
 	adminRouter.PathPrefix("").Handler(adminHandler)

go.mod

@@ -5,44 +5,30 @@ go 1.23
 toolchain go1.23.4
 
 require (
-	github.com/99designs/gqlgen v0.14.0
+	connectrpc.com/connect v1.18.1
 	github.com/chromedp/chromedp v0.7.8
-	github.com/google/go-cmp v0.5.6
+	github.com/google/go-cmp v0.5.9
 	github.com/gorilla/mux v1.7.4
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/oklog/ulid v1.3.1
+	github.com/oklog/ulid/v2 v2.1.0
 	github.com/peterbourgon/ff/v3 v3.1.2
 	github.com/smallstep/truststore v0.11.0
-	github.com/vektah/gqlparser/v2 v2.2.0
 	go.etcd.io/bbolt v1.4.0-beta.0
 	go.uber.org/zap v1.21.0
+	google.golang.org/protobuf v1.36.3
 )
 
 require (
-	github.com/agnivade/levenshtein v1.1.0 // indirect
 	github.com/chromedp/cdproto v0.0.0-20220217222649-d8c14a5c6edf // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.1.0 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/hashicorp/golang-lru v0.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/moq v0.2.5 // indirect
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/urfave/cli/v2 v2.1.1 // indirect
-	github.com/vektah/dataloaden v0.2.1-0.20190515034641-a19b9a6e7c9e // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/tools v0.1.5 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
 	howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
 )