sloppin it up

.goreleaser.yaml

@@ -17,22 +17,7 @@ builds:
       - goos: windows
         goarch: "386"
     ldflags:
-      - -s -w -X github.com/abs3ntdev/gspot/src/components/cli.Version={{.Version}}
-
-  - id: gspot-daemon
-    main: ./cmd/gspot-daemon
-    binary: gspot-daemon
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - linux
-      - windows
-      - darwin
-    ignore:
-      - goos: windows
-        goarch: "386"
-    ldflags:
-      - -s -w -X github.com/abs3ntdev/gspot/src/components/cli.Version={{.Version}}
+      - -s -w -X github.com/abs3ntdev/gspot/src/cli.Version={{.Version}}
 
 archives:
   - formats: [ 'tar.gz' ]

Makefile

@@ -1,13 +1,15 @@
-build: 
-	go build -ldflags="-X 'github.com/abs3ntdev/gspot/src/components/cli.Version=$(shell git show -s --date=short --pretty='format:%h (%ad)' HEAD)'" -o dist/ ./cmd/gspot
-	go build -o dist/ ./cmd/gspot-daemon
+generate:
+	buf generate
 
-rundaemon: build
-	./dist/gspot-daemon
+build:
+	go build -ldflags="-X 'github.com/abs3ntdev/gspot/src/cli.Version=$(shell git show -s --date=short --pretty='format:%h (%ad)' HEAD)'" -o dist/ ./cmd/gspot
 
 run: build
 	./dist/gspot
 
+daemon: build
+	./dist/gspot daemon run
+
 tidy:
 	go mod tidy
 
@@ -16,12 +18,10 @@ clean:
 
 uninstall:
 	rm -f /usr/bin/gspot
-	rm -f /usr/bin/gspot-daemon
 	rm -f /usr/share/zsh/site-functions/_gspot
 	rm -f /usr/share/bash-completion/completions/gspot
 
 install:
 	cp ./dist/gspot /usr/bin
-	cp ./dist/gspot-daemon /usr/bin
 	cp ./completions/_gspot /usr/share/zsh/site-functions/_gspot
-	cp ./completions/gspot /usr/share/bash-completion/completionsgspotg
+	cp ./completions/gspot /usr/share/bash-completion/completions/gspot

buf.gen.yaml

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

buf.yaml

@@ -0,0 +1,9 @@
+version: v2
+modules:
+  - path: proto
+lint:
+  use:
+    - STANDARD
+breaking:
+  use:
+    - FILE

cmd/gspot/main.go

@@ -1,70 +1,7 @@
 package main
 
-import (
-	"context"
-	"errors"
-	"fmt"
-	"log/slog"
-
-	"go.uber.org/fx"
-	"go.uber.org/fx/fxevent"
-
-	"github.com/abs3ntdev/gspot/src/components/cache"
-	"github.com/abs3ntdev/gspot/src/components/cli"
-	"github.com/abs3ntdev/gspot/src/components/commands"
-	"github.com/abs3ntdev/gspot/src/components/logger"
-	"github.com/abs3ntdev/gspot/src/services"
-)
+import "github.com/abs3ntdev/gspot/src/cli"
 
 func main() {
-	var s fx.Shutdowner
-	app := fx.New(
-		fx.WithLogger(func(logger *slog.Logger) fxevent.Logger {
-			l := &fxevent.SlogLogger{Logger: logger}
-			l.UseLogLevel(slog.LevelDebug)
-			return l
-		}),
-		fx.Populate(&s),
-		services.Config,
-		fx.Provide(
-			Context,
-			cache.NewCache,
-			commands.NewCommander,
-			logger.NewLogger,
-		),
-		fx.Invoke(
-			cli.Run,
-		),
-	)
-	app.Run()
-}
-
-type AsyncInit func(func(ctx context.Context) error)
-
-var ErrContextShutdown = errors.New("shutdown")
-
-func Context(
-	lc fx.Lifecycle,
-	s fx.Shutdowner,
-	log *slog.Logger,
-) (context.Context, AsyncInit) {
-	if log == nil {
-		log = slog.Default()
-	}
-	ctx, cn := context.WithCancelCause(context.Background())
-	lc.Append(fx.Hook{
-		OnStop: func(ctx context.Context) error {
-			cn(fmt.Errorf("%w: %w", context.Canceled, ErrContextShutdown))
-			return nil
-		},
-	})
-	return ctx, func(fn func(ctx context.Context) error) {
-		go func() {
-			err := fn(ctx)
-			if err != nil {
-				log.Error("Failed to run async hook", "err", err)
-				s.Shutdown()
-			}
-		}()
-	}
+	cli.Run()
 }