Feat/grpc

.github/workflows/release.yml

@@ -19,6 +19,16 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: stable
+      - name: install buf
+        run: go install github.com/bufbuild/buf/cmd/buf@latest
+      - name: install protoc-gen-go
+        run: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
+      - name: install protoc-gen-connect-go
+        run: go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest
+      - name: install grpcurl
+        run: go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest
+      - name: generate proto
+        run: make build/proto
       - name: run goreleaser
         uses: goreleaser/goreleaser-action@v6
         with:

Makefile

@@ -0,0 +1,9 @@
+build/proto:
+	buf generate
+build/server:
+	go build ./server
+build/cli:
+	go build ./cli
+
+test/server:
+	go test -v ./server/tests/.../

README.md

@@ -19,8 +19,8 @@
 
 ### Server
 
-- Chi Router
 - Docker Sdk
+- [ConnectRPC](https://connectrpc.com)
 
 ## Configuration
 

buf.gen.yaml

@@ -0,0 +1,9 @@
+version: v2
+plugins:
+  - local: protoc-gen-go
+    opt: paths=source_relative
+    out: .
+  - local: protoc-gen-connect-go
+    out: .
+    opt: paths=source_relative
+

buf.yaml

@@ -0,0 +1,9 @@
+# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml
+version: v2
+lint:
+  use:
+    - STANDARD
+breaking:
+  use:
+    - FILE
+

cli/handlers/docker/create.go

@@ -1,15 +1,15 @@
 package docker
 
 import (
-	"bytes"
-	"encoding/json"
+	"context"
 	"fmt"
-	"io"
-	"net/http"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/charmbracelet/huh/spinner"
 	"github.com/matfire/pockets/cli/config"
+	"github.com/matfire/pockets/cli/rpc"
+	sharedv1 "github.com/matfire/pockets/shared/v1"
 )
 
 type CreateRequestBody struct {
@@ -27,25 +27,25 @@ type ImageCheckResponse struct {
 
 func Create(config *config.App, name string, version string) {
 	imageExists := false
-	checkImage := func() {
-		res, err := http.Get(fmt.Sprintf("%s/v1/image/check/%s", config.Endpoint, version))
-		var data ImageCheckResponse
+	client := rpc.GetRPCCLient(config)
+	checkImage := func() bool {
+		res, err := client.CheckImage(context.Background(), connect.NewRequest(&sharedv1.CheckImageRequest{
+			Version: version,
+		}))
 		if err != nil {
 			panic(err)
 		}
-		b, err := io.ReadAll(res.Body)
-		json.Unmarshal(b, &data)
-		defer res.Body.Close()
-		imageExists = data.Exists
+		imageExists = res.Msg.Exists
+		return res.Msg.Exists
 	}
 
 	createImage := func() {
-		body := ImageCreateRequestBody{Version: version}
-		b, err := json.Marshal(body)
+		_, err := client.CreateImage(context.Background(), connect.NewRequest(&sharedv1.CreateImageRequest{
+			Version: version,
+		}))
 		if err != nil {
-			panic("could not marshal image create request body")
+			panic(err)
 		}
-		_, err = http.Post(fmt.Sprintf("%s/v1/image/new", config.Endpoint), "application/json", bytes.NewBuffer(b))
 	}
 
 	//TODO customize retries & interval
@@ -55,15 +55,9 @@ func Create(config *config.App, name string, version string) {
 			if iterations > 5 {
 				panic("image is taking too long")
 			}
-			res, err := http.Get(fmt.Sprintf("%s/v1/image/check/%s", config.Endpoint, version))
-			if err != nil {
-				break
-			}
-			var data ImageCheckResponse
-			b, err := io.ReadAll(res.Body)
-			json.Unmarshal(b, &data)
-			defer res.Body.Close()
-			if data.Exists {
+
+			exists := checkImage()
+			if exists {
 				break
 			}
 			iterations++
@@ -72,18 +66,18 @@ func Create(config *config.App, name string, version string) {
 	}
 
 	createContainer := func() {
-		body := CreateRequestBody{Name: name, Version: version}
-		b, err := json.Marshal(body)
-		if err != nil {
-			fmt.Printf("could not marshal body in create request \n")
-		}
-		_, err = http.Post(fmt.Sprintf("%s/v1/create", config.Endpoint), "application/json", bytes.NewBuffer(b))
+		_, err := client.CreateContainer(context.Background(), connect.NewRequest(&sharedv1.CreateContainerRequest{
+			Name:    name,
+			Version: version,
+		}))
 		if err != nil {
 			fmt.Printf("create request failed with error %v", err)
 			return
 		}
 	}
-	if err := spinner.New().Title("Checking for image existence...").Action(checkImage).Run(); err != nil {
+	if err := spinner.New().Title("Checking for image existence...").Action(func() {
+		checkImage()
+	}).Run(); err != nil {
 		fmt.Println(err)
 	}
 	if imageExists {

cli/handlers/docker/delete.go

@@ -1,28 +1,22 @@
 package docker
 
 import (
+	"context"
 	"fmt"
-	"net/http"
 
+	"connectrpc.com/connect"
 	"github.com/charmbracelet/huh/spinner"
 	"github.com/matfire/pockets/cli/config"
+	"github.com/matfire/pockets/cli/rpc"
+	sharedv1 "github.com/matfire/pockets/shared/v1"
 )
 
 func Delete(config *config.App, name string) {
 	var err error
+	client := rpc.GetRPCCLient(config)
 	stopContainer := func() {
-		request, requestError := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/v1/delete/%s", config.Endpoint, name), nil)
-		if requestError != nil {
-			fmt.Printf("create request failed with error %v", requestError)
-			return
-		}
-		client := &http.Client{}
-		_, requestError = client.Do(request)
-		if requestError != nil {
-			fmt.Printf("create request failed with error %v", requestError)
-			return
-		}
-		err = requestError
+		_, errr := client.DeleteContainer(context.Background(), connect.NewRequest(&sharedv1.DeleteContainerRequest{Id: name}))
+		err = errr
 	}
 	if spinnerErr := spinner.New().Title("Deleting Container...").Action(stopContainer).Run(); spinnerErr != nil {
 		fmt.Println(spinnerErr)

cli/handlers/docker/list.go

@@ -1,14 +1,15 @@
 package docker
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"io"
-	"net/http"
 
+	"connectrpc.com/connect"
 	"github.com/charmbracelet/huh/spinner"
 	"github.com/charmbracelet/lipgloss/table"
 	"github.com/matfire/pockets/cli/config"
+	"github.com/matfire/pockets/cli/rpc"
+	sharedv1 "github.com/matfire/pockets/shared/v1"
 )
 
 type Container struct {
@@ -21,17 +22,14 @@ type ListResponse struct {
 
 func List(config *config.App) {
 	fmt.Print("listing containers")
-
-	var data ListResponse
+	client := rpc.GetRPCCLient(config)
+	var data *sharedv1.GetContainersResponse
 	getContainers := func() {
-		res, err := http.Get(fmt.Sprintf("%s/v1/status", config.Endpoint))
+		res, err := client.GetContainers(context.Background(), connect.NewRequest(&sharedv1.GetContainersRequest{}))
 		if err != nil {
-			panic("could not get data")
+			panic(err)
 		}
-		b, err := io.ReadAll(res.Body)
-		defer res.Body.Close()
-		json.Unmarshal(b, &data)
-
+		data = res.Msg
 	}
 	if err := spinner.New().Title("Fetching containers...").Action(getContainers).Run(); err != nil {
 		fmt.Println(err)