Merge pull request #10 from moul/dev/moul/wip

Makefile

@@ -12,18 +12,19 @@ PRE_BUMPDEPS_STEPS += gen.suma
 
 include rules.mk
 
+COMPILEDAEMON_OPTIONS ?= -exclude-dir=.git -color=true -build=go\ install -build-dir=./cmd/sgtm
 
 .PHONY: run
-run: install
-	sgtm --dev-mode --enable-server --enable-discord run
+run: _devserver generate
+	CompileDaemon $(COMPILEDAEMON_OPTIONS) -command="sgtm --dev-mode --enable-server --enable-discord run"
 
 .PHONY: run-discord
-run-discord: install
-	sgtm --dev-mode --enable-discord run
+run-discord: _devserver generate
+	CompileDaemon $(COMPILEDAEMON_OPTIONS) -command="sgtm --dev-mode --enable-discord run"
 
 .PHONY: run-server
-run-server: install
-	sgtm --dev-mode --enable-server run
+run-server: _devserver generate
+	CompileDaemon $(COMPILEDAEMON_OPTIONS) -command="sgtm --dev-mode --enable-server run"
 
 .PHONY: packr
 packr:
@@ -87,3 +88,7 @@ clean: generate.clean
 
 .PHONY: regenerate
 regenerate: gen.clean generate
+
+.PHONY: _devserver
+_devserver:
+	go install github.com/githubnemo/CompileDaemon

api/sgtm.proto

@@ -107,3 +107,10 @@ message Post {
     Comment = 2;
   }
 }
+
+/// Internal
+
+message Session {
+  string DiscordAccessToken = 1;
+  string DiscordID = 2;
+}

cmd/sgtm/main.go

@@ -52,6 +52,9 @@ func app(args []string) error {
 	rootFlags.DurationVar(&svcOpts.ServerRequestTimeout, "server-request-timeout", svcOpts.ServerRequestTimeout, "server request timeout")
 	rootFlags.DurationVar(&svcOpts.ServerShutdownTimeout, "server-shutdown-timeout", svcOpts.ServerShutdownTimeout, "server shutdown timeout")
 	rootFlags.BoolVar(&svcOpts.ServerWithPprof, "server-with-pprof", svcOpts.ServerWithPprof, "enable pprof on HTTP server")
+	rootFlags.StringVar(&svcOpts.DiscordClientID, "discord-client-id", svcOpts.DiscordClientID, "discord client ID (oauth)")
+	rootFlags.StringVar(&svcOpts.DiscordClientSecret, "discord-client-secret", svcOpts.DiscordClientSecret, "discord client secret (oauth)")
+	rootFlags.StringVar(&svcOpts.JWTSigningKey, "jwt-signing-key", svcOpts.JWTSigningKey, "HMAC secret to sign JWT tokens")
 
 	root := &ffcli.Command{
 		FlagSet: rootFlags,
@@ -74,6 +77,7 @@ func app(args []string) error {
 func runCmd(ctx context.Context, _ []string) error {
 	// init
 	rand.Seed(srand.Secure())
+	svcOpts.Context = ctx
 
 	// bearer
 	// FIXME: TODO
@@ -111,6 +115,7 @@ func runCmd(ctx context.Context, _ []string) error {
 		if err != nil {
 			return err
 		}
+		svcOpts.Snowflake = sfn
 		err = sgtm.DBInit(db, sfn)
 		if err != nil {
 			return err
@@ -120,8 +125,11 @@ func runCmd(ctx context.Context, _ []string) error {
 	// init service
 	var svc sgtm.Service
 	{
-		//svcOpts.Context = ctx
-		svc = sgtm.New(db, svcOpts)
+		var err error
+		svc, err = sgtm.New(db, svcOpts)
+		if err != nil {
+			return err
+		}
 		defer svc.Close()
 	}
 

config.txt.example

@@ -1,8 +1,11 @@
 ## Discord
 #enable-discord true
-#discord-token REPLACE_ME
-#discord-admin-channel REPLACE_ME
+discord-token REPLACE_ME
+discord-admin-channel REPLACE_ME
+discord-client-id REPLACE_ME
+discord-client-secret REPLACE_ME
 
 ## Server
-enable-server true
+#enable-server true
 server-bind 0.0.0.0:7676
+jwt-signing-key REPLACE_ME

internal/tools/tools.go

@@ -4,6 +4,7 @@ package tools
 
 import (
 	_ "github.com/alta/protopatch/patch"
+	_ "github.com/githubnemo/CompileDaemon"
 	_ "github.com/golang/protobuf/protoc-gen-go"
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway"
 	_ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger"