Add api server muxer

Signed-off-by: gearnode <bryan@frimin.fr>
This commit is contained in:
gearnode
2025-01-23 16:25:18 +01:00
parent baa038fa52
commit 7ab7fd2d04
6 changed files with 171 additions and 5 deletions

98
pkg/api/api.go Normal file
View File

@@ -0,0 +1,98 @@
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package api
import (
"errors"
"net/http"
console_v1 "github.com/getprobo/probo/pkg/api/console/v1"
"github.com/getprobo/probo/pkg/probo"
"github.com/go-chi/chi/v5"
"github.com/go-chi/cors"
"go.gearno.de/kit/httpserver"
)
type (
Config struct {
AllowedOrigins []string
Probo *probo.Service
}
Server struct {
cfg Config
}
)
var (
ErrMissingProboService = errors.New("server configuration requires a valid probo.Service instance")
)
func methodNotAllowed(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
httpserver.RenderJSON(
w,
http.StatusMethodNotAllowed,
map[string]string{
"error": "method not allowed",
},
)
}
func notFound(w http.ResponseWriter, r *http.Request) {
defer r.Body.Close()
httpserver.RenderJSON(
w,
http.StatusNotFound,
map[string]string{
"error": "not found",
},
)
}
func NewServer(cfg Config) (*Server, error) {
if cfg.Probo == nil {
return nil, ErrMissingProboService
}
return &Server{
cfg: cfg,
}, nil
}
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
corsOpts := cors.Options{
AllowedOrigins: s.cfg.AllowedOrigins,
AllowedMethods: []string{"GET", "POST", "PUT", "DELETE", "HEAD"},
AllowedHeaders: []string{"content-type", "traceparent"},
ExposedHeaders: []string{"x-Request-id"},
AllowCredentials: true,
MaxAge: 600, // 10 minutes (chrome >= 76 maximum value c.f. https://source.chromium.org/chromium/chromium/src/+/main:services/network/public/cpp/cors/preflight_result.cc;drc=52002151773d8cd9ffc5f557cd7cc880fddcae3e;l=36)
OptionsPassthrough: false,
Debug: false,
}
router := chi.NewRouter()
router.MethodNotAllowed(methodNotAllowed)
router.NotFound(notFound)
router.Use(cors.Handler(corsOpts))
router.Mount("/console/v1", console_v1.NewMux())
router.ServeHTTP(w, r)
}

View File

@@ -16,10 +16,46 @@
package console_v1
import "github.com/getprobo/probo/pkg/probo"
import (
"net/http"
"github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/handler/extension"
"github.com/99designs/gqlgen/graphql/handler/transport"
"github.com/99designs/gqlgen/graphql/playground"
"github.com/getprobo/probo/pkg/api/console/v1/schema"
"github.com/getprobo/probo/pkg/probo"
"github.com/go-chi/chi/v5"
)
type (
Resolver struct {
svc *probo.Service
}
)
func NewMux() *chi.Mux {
r := chi.NewMux()
r.Get("/", playground.Handler("GraphQL", "/console/v1/query"))
r.Post("/query", graphql())
return r
}
func graphql() http.HandlerFunc {
es := schema.NewExecutableSchema(
schema.Config{
Resolvers: &Resolver{},
},
)
srv := handler.New(es)
srv.AddTransport(transport.Options{})
srv.AddTransport(transport.GET{})
srv.AddTransport(transport.POST{})
srv.AddTransport(transport.MultipartForm{})
srv.Use(extension.Introspection{})
return func(w http.ResponseWriter, r *http.Request) {
srv.ServeHTTP(w, r)
}
}

View File

@@ -15,7 +15,12 @@
package probod
type (
corsConfig struct {
AllowedOrigins []string `json:"allowed-origins"`
}
apiConfig struct {
Addr string `json:"addr"`
Addr string `json:"addr"`
Cors corsConfig `json:"cors"`
}
)

View File

@@ -23,6 +23,8 @@ import (
"sync"
"time"
"github.com/getprobo/probo/pkg/api"
"github.com/getprobo/probo/pkg/probo"
"github.com/prometheus/client_golang/prometheus"
"go.gearno.de/kit/httpserver"
"go.gearno.de/kit/log"
@@ -52,6 +54,9 @@ func New() *Implm {
cfg: config{
Api: apiConfig{
Addr: "localhost:8080",
Cors: corsConfig{
AllowedOrigins: []string{"http://localhost:3000"},
},
},
Pg: pgConfig{
Addr: "localhost:5432",
@@ -78,7 +83,7 @@ func (impl *Implm) Run(
ctx, cancel := context.WithCancelCause(parentCtx)
defer cancel(context.Canceled)
_, err := pg.NewClient(
pgClient, err := pg.NewClient(
impl.cfg.Pg.Options(
pg.WithLogger(l),
pg.WithRegisterer(r),
@@ -89,12 +94,24 @@ func (impl *Implm) Run(
return fmt.Errorf("cannot create pg client: %w", err)
}
probo := probo.NewService(ctx, pgClient)
apiServer, err := api.NewServer(
api.Config{
Probo: probo,
AllowedOrigins: impl.cfg.Api.Cors.AllowedOrigins,
},
)
if err != nil {
return fmt.Errorf("cannot create api server: %w", err)
}
apiServerCtx, stopApiServer := context.WithCancel(context.Background())
defer stopApiServer()
wg.Add(1)
go func() {
defer wg.Done()
if err := impl.runApiServer(apiServerCtx, l, r, tp, nil); err != nil {
if err := impl.runApiServer(apiServerCtx, l, r, tp, apiServer); err != nil {
cancel(fmt.Errorf("api server crashed: %w", err))
}
}()