Add middleware

Author: remicaumette

exemple/go.mod

@@ -2,7 +2,6 @@ package xfoundation
 
 import (
 	"context"
-	"fmt"
 	"go.uber.org/zap"
 	"os"
 	"os/signal"
@@ -17,21 +16,12 @@ type (
 
 	App struct {
 		Container
-		Env        string
+		Env        AppEnv
 		Logger     *zap.Logger
-		Providers  []Provider
+		Providers  []any
 		startHooks []func(ctx context.Context) error
 		stopHooks  []func(ctx context.Context) error
 	}
-
-	Container struct {
-		values map[reflect.Type]reflect.Value
-	}
-)
-
-const (
-	AppEnvProduction  = "production"
-	AppEnvDevelopment = "development"
 )
 
 func (app *App) Run() {
@@ -41,7 +31,7 @@ func (app *App) Run() {
 	}
 
 	if app.Logger == nil {
-		if app.Env == AppEnvProduction {
+		if app.Env.Production() {
 			app.Logger = panicOnError(zap.NewProduction())
 		} else {
 			app.Logger = panicOnError(zap.NewDevelopment())
@@ -51,8 +41,11 @@ func (app *App) Run() {
 
 	for _, provider := range app.Providers {
 		log := app.Logger.With(zap.Any("provider", reflect.TypeOf(provider)))
-		if err := provider.Register(app); err != nil {
-			log.Fatal("failed to register provider", zap.Error(err))
+		app.Provide(provider)
+		if p, ok := provider.(Provider); ok {
+			if err := p.Register(app); err != nil {
+				log.Fatal("failed to register provider", zap.Error(err))
+			}
 		}
 		log.Info("provider registered")
 	}
@@ -83,37 +76,6 @@ func (app *App) OnStop(hook func(ctx context.Context) error) {
 	app.stopHooks = append(app.stopHooks, hook)
 }
 
-func (c *Container) Provide(v any) {
-	c.values[reflect.TypeOf(v)] = reflect.ValueOf(v)
-}
-
-func (c *Container) Invoke(f any) ([]reflect.Value, error) {
-	fType := reflect.TypeOf(f)
-	if fType.Kind() != reflect.Func {
-		return nil, fmt.Errorf("app.Invoke: invalid func type %v", fType)
-	}
-	var dependencies []reflect.Value
-	for i := 0; i < fType.NumIn(); i++ {
-		depType := fType.In(i)
-		value, ok := c.values[depType]
-		if !ok {
-			return nil, fmt.Errorf("app.Invoke: cannot find dependency %v", depType)
-		}
-		dependencies = append(dependencies, value)
-	}
-
-	returnValues := reflect.ValueOf(f).Call(dependencies)
-	if returnValuesLen := len(returnValues); returnValuesLen > 0 {
-		if err, ok := returnValues[returnValuesLen-1].Interface().(error); ok {
-			if err != nil {
-				return nil, err
-			}
-			returnValues = returnValues[:returnValuesLen-1]
-		}
-	}
-	return returnValues, nil
-}
-
 func panicOnError[T any](value T, err error) T {
 	if err != nil {
 		panic(err)

exemple/go.sum

@@ -0,0 +1,41 @@
+package xfoundation
+
+import (
+	"fmt"
+	"reflect"
+)
+
+type Container struct {
+	values map[reflect.Type]reflect.Value
+}
+
+func (c *Container) Provide(v any) {
+	c.values[reflect.TypeOf(v)] = reflect.ValueOf(v)
+}
+
+func (c *Container) Invoke(f any) ([]reflect.Value, error) {
+	fType := reflect.TypeOf(f)
+	if fType.Kind() != reflect.Func {
+		return nil, fmt.Errorf("app.Invoke: invalid func type %v", fType)
+	}
+	var dependencies []reflect.Value
+	for i := 0; i < fType.NumIn(); i++ {
+		depType := fType.In(i)
+		value, ok := c.values[depType]
+		if !ok {
+			return nil, fmt.Errorf("app.Invoke: cannot find dependency %v", depType)
+		}
+		dependencies = append(dependencies, value)
+	}
+
+	returnValues := reflect.ValueOf(f).Call(dependencies)
+	if returnValuesLen := len(returnValues); returnValuesLen > 0 {
+		if err, ok := returnValues[returnValuesLen-1].Interface().(error); ok {
+			if err != nil {
+				return nil, err
+			}
+			returnValues = returnValues[:returnValuesLen-1]
+		}
+	}
+	return returnValues, nil
+}

exemple/internal/app/app.go

@@ -0,0 +1,12 @@
+package xfoundation
+
+type AppEnv string
+
+const (
+	AppEnvProduction  AppEnv = "production"
+	AppEnvDevelopment AppEnv = "development"
+)
+
+func (e AppEnv) Production() bool {
+	return e == "production"
+}

exemple/internal/app/handler/handle_home.go

@@ -3,7 +3,10 @@ module github.com/caumette-co/x/xfoundation
 go 1.21.0
 
 require (
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	go.uber.org/dig v1.17.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.25.0 // indirect
+	gorm.io/gorm v1.25.4 // indirect
 )

exemple/main.go

@@ -1,6 +1,12 @@
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI=
 go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
 go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
+gorm.io/gorm v1.25.4 h1:iyNd8fNAe8W9dvtlgeRI5zSVZPsq3OpcTu37cYcpCmw=
+gorm.io/gorm v1.25.4/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=