🚀 feat: remove websocket proxy and update routing to serve static fil…

…es, add robots.txt and PWA icons
recally-io · Dec 28, 2024 · 5866cb3 · 5866cb3
1 parent 95bffb6
commit 5866cb3
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 137 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/golang-migrate/migrate/v4 v4.17.1
 	github.com/google/uuid v1.6.0
-	github.com/gorilla/websocket v1.5.3
 	github.com/invopop/jsonschema v0.12.0
 	github.com/jackc/pgx/v5 v5.6.0
 	github.com/joho/godotenv v1.5.1

diff --git a/go.sum b/go.sum
@@ -330,8 +330,6 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth
 github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
-github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=

diff --git a/internal/port/httpserver/route_proxy_to_vite.go b/internal/port/httpserver/route_proxy_to_vite.go
diff --git a/internal/port/httpserver/router.go b/internal/port/httpserver/router.go
@@ -2,7 +2,6 @@ package httpserver
 
 import (
 	"net/http"
-	"vibrain/internal/pkg/config"
 	"vibrain/internal/pkg/logger"
 	"vibrain/web"
 
@@ -49,12 +48,15 @@ func (s *Service) registerRouters() {
 	e.GET("/swagger/*", echoSwagger.WrapHandler)
 
 	// web pages
-	if config.Settings.DebugUI {
-		// proxy to vite server localhost:5173
-		logger.Default.Debug("Using vite server as frontend")
-		e.GET("/*", reactReverseProxy)
-	} else {
-		logger.Default.Debug("Using static files as frontend")
-		e.GET("/*", echo.WrapHandler(http.FileServer(web.StaticHttpFS)))
-	}
+	logger.Default.Debug("Using static files as frontend")
+	e.GET("/manifest.webmanifest", func(c echo.Context) error {
+		file, err := web.StaticHttpFS.Open("manifest.webmanifest")
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		c.Response().Header().Set("Content-Type", "application/manifest+json")
+		return c.Stream(http.StatusOK, "application/manifest+json", file)
+	})
+	e.GET("/*", echo.WrapHandler(http.FileServer(web.StaticHttpFS)))
 }
diff --git a/web/public/robots.txt b/web/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Allow: /
diff --git a/web/vite.config.ts b/web/vite.config.ts
@@ -28,6 +28,18 @@ export default defineConfig({
 						sizes: "512x512",
 						type: "image/png",
 					},
+					{
+						src: 'pwa-512x512.png',
+						sizes: '512x512',
+						type: 'image/png',
+						purpose: 'any'
+					},
+					{
+						src: 'maskable-icon-512x512.png',
+						sizes: '512x512',
+						type: 'image/png',
+						purpose: 'maskable'
+					}
 				],
 			},
 		}),