Updated graphql package

Author: Aristat

README.md

@@ -2,7 +2,6 @@
 
 # Golang Example Application
 
-
 # Table of Contents
 
 - [Overview](#overview)
@@ -30,13 +29,13 @@ Commands list:
 3. Health check service - this service is needed to show how convenient to understand on which of the services an error occurred in jaeger
 4. Oauth client - this service is needed to show a simple example of http client and server, for example oauth2 server
 5. Migrate - commands for migration
-6. Jwt - commands for generate jwt token
+6. JWT - commands for generate JWT token
 
 # Package list
 
 Packages which use in this example project
 
-1. [sql-migrate](https://github.com/rubenv/sql-migrate) - sql migrations
+1. [sql-migrate](https://github.com/rubenv/sql-migrate) - SQL migrations
 2. [wire](https://github.com/google/wire) - dependency Injection
 3. [viper](https://github.com/spf13/viper) - environment configuration
 4. [cobra](https://github.com/spf13/cobra) - create commands
@@ -264,12 +263,6 @@ mutation createUser {
 }
 ```
 
-# Deprecated version
-
-[Deprecated version](https://github.com/Aristat/golang-example-app/tree/gin-example)
-
-Usage only `gin` package and oauth2 client/server mechanic
-
 # Testing
 ```
 export APP_WD=go_path to project_path/resources or project_path/artifacts - needed for load templates

app/common/graphql.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/vektah/gqlparser/v2/gqlerror"
+
 	"github.com/99designs/gqlgen/graphql"
-	"github.com/vektah/gqlparser/gqlerror"
 )
 
-func SendGraphqlError(w http.ResponseWriter, code int, errors ...*gqlerror.Error) {
+func SendGraphqlError(w http.ResponseWriter, code int, errors gqlerror.List) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(code)
 	b, err := json.Marshal(&graphql.Response{Errors: errors})
@@ -20,5 +21,5 @@ func SendGraphqlError(w http.ResponseWriter, code int, errors ...*gqlerror.Error
 }
 
 func SendGraphqlErrorf(w http.ResponseWriter, code int, format string, args ...interface{}) {
-	SendGraphqlError(w, code, &gqlerror.Error{Message: fmt.Sprintf(format, args...)})
+	SendGraphqlError(w, code, gqlerror.List{{Message: fmt.Sprintf(format, args...)}})
 }

app/graphql/graphql.go

@@ -7,12 +7,17 @@ import (
 	"strings"
 	"time"
 
+	"github.com/99designs/gqlgen/graphql/handler"
+
+	"github.com/99designs/gqlgen/graphql/handler/extension"
+	"github.com/99designs/gqlgen/graphql/handler/lru"
+	"github.com/99designs/gqlgen/graphql/handler/transport"
+
 	gqlgen "github.com/99designs/gqlgen/graphql"
-	"github.com/99designs/gqlgen/handler"
 	"github.com/aristat/golang-example-app/app/logger"
 	"github.com/aristat/golang-example-app/generated/graphql"
 	"github.com/go-chi/chi"
-	"github.com/vektah/gqlparser/gqlerror"
+	"github.com/vektah/gqlparser/v2/gqlerror"
 )
 
 const (
@@ -36,46 +41,55 @@ func (g *GraphQL) Use(router *chi.Mux) {
 
 // Routers
 func (g *GraphQL) Routers(router chi.Router) {
-	options := []handler.Option{
-		handler.IntrospectionEnabled(g.cfg.Introspection),
-		handler.RecoverFunc(func(ctx context.Context, err interface{}) error {
-			g.log.Alert("unhandled panic, err: %v", logger.Args(err))
-			return nil
-		}),
-		handler.ErrorPresenter(func(ctx context.Context, e error) *gqlerror.Error {
-			if e != nil {
-				g.log.Alert("recover on middleware, err: %v", logger.Args(e))
-				goto done
-			}
-			e = errInternalServer
-		done:
-			return gqlgen.DefaultErrorPresenter(ctx, e)
-		}),
+	srv := handler.New(graphql.NewExecutableSchema(*g.resolver))
+
+	srv.AddTransport(transport.Websocket{
+		KeepAlivePingInterval: 10 * time.Second,
+	})
+	srv.AddTransport(transport.Options{})
+	srv.AddTransport(transport.GET{})
+	srv.AddTransport(transport.POST{})
+	srv.AddTransport(transport.MultipartForm{})
+
+	srv.SetQueryCache(lru.New(1000))
+
+	if g.cfg.Introspection {
+		srv.Use(extension.Introspection{})
 	}
+	srv.Use(extension.AutomaticPersistedQuery{
+		Cache: lru.New(100),
+	})
+
+	srv.SetRecoverFunc(func(ctx context.Context, err interface{}) error {
+		g.log.Alert("unhandled panic, err: %v", logger.Args(err))
+		return nil
+	})
+	srv.SetErrorPresenter(func(ctx context.Context, e error) *gqlerror.Error {
+		if e != nil {
+			g.log.Alert("recover on middleware, err: %v", logger.Args(e))
+			goto done
+		}
+		e = errInternalServer
+	done:
+		return gqlgen.DefaultErrorPresenter(ctx, e)
+	})
 
 	if g.cfg.Debug {
-		router.Handle("/", handler.Playground(g.cfg.Name, "/query"))
-		options = append(options, handler.RequestMiddleware(func(ctx context.Context, next func(ctx context.Context) []byte) []byte {
+		srv.AroundResponses(func(ctx context.Context, next gqlgen.ResponseHandler) *gqlgen.Response {
 			startTime := time.Now()
-			rc := gqlgen.GetRequestContext(ctx)
+			rc := gqlgen.GetOperationContext(ctx)
 			resp := next(ctx)
-			e := strings.ReplaceAll(rc.Errors.Error(), "\n", " ")
 			g.log.Debug("\nVARS:\n%+v\nQUERY:\n%v\nRESPONSE:\n%v\nERROR:\n%v\n",
-				logger.Args(rc.Variables, strings.TrimRight(rc.RawQuery, "\n"), string(resp), e),
+				logger.Args(rc.Variables, strings.TrimRight(rc.RawQuery, "\n"), string(resp.Data), resp.Errors),
 				logger.WithFields(logger.Fields{
 					"time": time.Since(startTime).String(),
 				}),
 			)
 			return resp
-		}))
+		})
 	}
 
-	router.Handle("/query",
-		handler.GraphQL(
-			graphql.NewExecutableSchema(*g.resolver),
-			options...,
-		),
-	)
+	router.Handle("/query", srv)
 }
 
 // Config

app/logger/middleware.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/davecgh/go-spew/spew"
 	"google.golang.org/grpc"
 )
 
@@ -24,7 +23,7 @@ func UnaryClientInterceptor(log Logger, enable bool) grpc.UnaryClientInterceptor
 			e = strings.ReplaceAll(err.Error(), "\n", "")
 		}
 
-		log.Debug("\nQUERY UnaryClient:\n\nData: %v\n\nERROR:\n%v\n\n", Args(spew.Sdump(req), e), WithFields(Fields{
+		log.Debug("\nQUERY UnaryClient:\n\nData: %v\n\nERROR:\n%v\n\n", Args(req, e), WithFields(Fields{
 			"time": time.Since(startTime).String(),
 		}))
 
@@ -69,7 +68,7 @@ func UnaryServerInterceptor(log Logger, enable bool) grpc.UnaryServerInterceptor
 			e = strings.ReplaceAll(err.Error(), "\n", "")
 		}
 
-		log.Debug("\nQUERY UnaryServer:\n\nFullMethod: %v\nData: %v\nRESPONSE:\n\nData: %v\nERROR:\n%v\n", Args(info.FullMethod, spew.Sdump(req), spew.Sdump(res), e), WithFields(Fields{
+		log.Debug("\nQUERY UnaryServer:\n\nFullMethod: %v\nData: %v\nRESPONSE:\n\nData: %v\nERROR:\n%v\n", Args(info.FullMethod, req, res, e), WithFields(Fields{
 			"time": time.Since(startTime).String(),
 		}))
 

docker-compose-start.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+docker-compose rm
+GOOS=linux GOARCH=amd64 make build
+REMOVE_CONTAINERS=on DOCKER_IMAGE=golang-example-app TAG=development make docker-image
+docker-compose up