✨ Transformers

pkg/hypertext/init.go

@@ -33,8 +33,8 @@ func InitServer() *fiber.App {
 	return app
 }
 
-func RunServer(app *fiber.App) {
-	for _, port := range viper.GetStringSlice("hypertext.ports") {
+func RunServer(app *fiber.App, ports []string, securedPorts []string, pem string, key string) {
+	for _, port := range ports {
 		port := port
 		go func() {
 			if err := app.Listen(port); err != nil {
@@ -43,10 +43,8 @@ func RunServer(app *fiber.App) {
 		}()
 	}
 
-	for _, port := range viper.GetStringSlice("hypertext.secured_ports") {
+	for _, port := range securedPorts {
 		port := port
-		pem := viper.GetString("hypertext.certificate.pem")
-		key := viper.GetString("hypertext.certificate.key")
 		go func() {
 			if err := app.ListenTLS(port, pem, key); err != nil {
 				log.Panic().Err(err).Msg("An error occurred when listening hypertext tls ports.")

pkg/hypertext/proxies.go

@@ -2,33 +2,23 @@ package hypertext
 
 import (
 	"code.smartsheep.studio/goatworks/roadsign/pkg/configurator"
-	"fmt"
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/proxy"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"github.com/spf13/viper"
 	"github.com/valyala/fasthttp"
-	"math/rand"
 	"regexp"
-	"strings"
 	"time"
 )
 
 func UseProxies(app *fiber.App) {
-	app.All("/", func(ctx *fiber.Ctx) error {
+	app.All("/*", func(ctx *fiber.Ctx) error {
 		host := ctx.Hostname()
 		path := ctx.Path()
 		queries := ctx.Queries()
 		headers := ctx.GetReqHeaders()
 
-		log.Debug().
-			Any("host", host).
-			Any("path", path).
-			Any("queries", queries).
-			Any("headers", headers).
-			Msg("A new request received")
-
 		// Filtering sites
 		for _, site := range configurator.C.Sites {
 			// Matching rules
@@ -96,45 +86,30 @@ func UseProxies(app *fiber.App) {
 	})
 }
 
-func doLoadBalance(site configurator.SiteConfig) *configurator.UpstreamConfig {
-	idx := rand.Intn(len(site.Upstreams))
-
-	switch site.Upstreams[idx].GetType() {
-	case configurator.UpstreamTypeHypertext:
-		return &site.Upstreams[idx]
-	case configurator.UpstreamTypeFile:
-		// TODO Make this into hypertext configuration
-		return &site.Upstreams[idx]
-	default:
-		// Give him the null value when this configuration is invalid.
-		// Then we can print a log in the console to warm him.
-		return nil
-	}
-}
-
-func makeRequestUri(ctx *fiber.Ctx, upstream configurator.UpstreamConfig) string {
-	var queries []string
-	for k, v := range ctx.Queries() {
-		queries = append(queries, fmt.Sprintf("%s=%s", k, v))
-	}
-
-	hash := string(ctx.Request().URI().Hash())
-
-	return upstream.URI +
-		lo.Ternary(len(queries) > 0, "?"+strings.Join(queries, "&"), "") +
-		lo.Ternary(len(hash) > 0, "#"+hash, "")
-}
-
 func makeResponse(ctx *fiber.Ctx, site configurator.SiteConfig) error {
-	upstream := doLoadBalance(site)
+	// Load balance
+	upstream := configurator.C.LoadBalance(site)
 	if upstream == nil {
 		log.Warn().Str("id", site.ID).Msg("There is no available upstream for this request.")
 		return fiber.ErrBadGateway
 	}
 
+	// Modify request
+	for _, transformer := range site.Transformers {
+		transformer.TransformRequest(ctx)
+	}
+
+	// Perform forward
 	timeout := time.Duration(viper.GetInt64("performance.network_timeout")) * time.Millisecond
-	return proxy.Do(ctx, makeRequestUri(ctx, *upstream), &fasthttp.Client{
+	err := proxy.Do(ctx, upstream.MakeURI(ctx), &fasthttp.Client{
 		ReadTimeout:  timeout,
 		WriteTimeout: timeout,
 	})
+
+	// Modify response
+	for _, transformer := range site.Transformers {
+		transformer.TransformResponse(ctx)
+	}
+
+	return err
 }