Using caddy

Caddyfile

@@ -0,0 +1,7 @@
+{
+	auto_https off
+}
+
+api.aicj.io {
+	reverse_proxy :8081
+}

Dockerfile

@@ -1,14 +1,17 @@
 ARG GO_VERSION=1
 FROM golang:${GO_VERSION}-alpine as builder
 
-WORKDIR /usr/src/app
-COPY go.mod go.sum ./
+WORKDIR /usr/src/backend
+COPY /backend/go.mod /backend/go.sum ./
 RUN go mod download && go mod verify
-COPY . .
-RUN go build -v -o /app cmd/api/main.go
+COPY /backend/ .
+RUN go build -v -o /backend cmd/api/main.go
 
-FROM alpine:3
+RUN backend
 
-COPY --from=builder /app /usr/local/bin/
+FROM caddy:2-alpine
 
-CMD [ "app" ]
+COPY Caddyfile /etc/caddy/Caddyfile
+
+RUN caddy run
+# COPY --from=builder /backend /usr/share/caddy/

fly.toml

@@ -6,12 +6,8 @@
 app = 'f3s-api'
 primary_region = 'nrt'
 
-[build]
-  [build.args]
-    GO_VERSION = '1.23'
-
 [env]
-  PORT = '8080'
+  PORT = '8081'
 
 [http_service]
   internal_port = 8080

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/sqids/sqids-go v0.4.1
 	github.com/tursodatabase/libsql-client-go v0.0.0-20240902231107-85af5b9d094d
-	golang.org/x/time v0.6.0
 )
 
 require (
@@ -30,4 +29,5 @@ require (
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
 )

internal/server/routes.go

@@ -13,7 +13,6 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/sqids/sqids-go"
-	"golang.org/x/time/rate"
 )
 
 func Sqids() (*sqids.Sqids, error) {
@@ -36,8 +35,6 @@ type (
 )
 
 func (s *Server) RegisterRoutes() http.Handler {
-	hosts := map[string]*Host{}
-
 	api := echo.New()
 	api.IPExtractor = func(r *http.Request) string {
 		return r.Header.Get("Fly-Client-IP")
@@ -64,15 +61,16 @@ func (s *Server) RegisterRoutes() http.Handler {
 	api.Use(middleware.CORSWithConfig(middleware.CORSConfig{
 		AllowMethods: []string{http.MethodGet, http.MethodPatch, http.MethodPost},
 	}))
-	api.Use(middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(rate.Limit(20))))
+	// api.Use(middleware.RateLimiter(middleware.NewRateLimiterMemoryStore(rate.Limit(20))))
+	// limiterStore := middleware.NewRateLimiterMemoryStore(rate.Limit(10))
 
 	api.GET("/ip", s.PingHandler)
 
-	api.GET("/visitor", s.VisitorHandler)
+	api.GET("/visitor", s.VisitorHandler) // middleware.RateLimiter(limiterStore)
 
 	api.POST("/node", s.NodeIpHandler)
 
-	api.POST("/vote", s.VoteHandler)
+	api.POST("/vote", s.VoteHandler) // middleware.RateLimiter(limiterStore)
 
 	protected := api.Group("/protected", middleware.KeyAuth(func(key string, c echo.Context) (bool, error) {
 		node, ok, err := s.DB.Password(key)
@@ -109,24 +107,7 @@ func (s *Server) RegisterRoutes() http.Handler {
 
 	protected.PATCH("/status", s.NodeStatusHandler)
 
-	hosts["api.aicj.io"] = &Host{api}
-
-	e := echo.New()
-	e.Any("/*", func(c echo.Context) (err error) {
-		req := c.Request()
-		res := c.Response()
-		host := hosts[req.Host]
-
-		if host == nil {
-			err = echo.ErrNotFound
-		} else {
-			host.Echo.ServeHTTP(res, req)
-		}
-
-		return
-	})
-
-	return e
+	return api
 }
 
 func (s *Server) PingHandler(c echo.Context) error {