From b073b2cdb2a1a0004ff4d92a47c46b8edf046e8e Mon Sep 17 00:00:00 2001 From: Shane C Date: Tue, 23 Apr 2024 19:12:54 -0400 Subject: [PATCH] ensure all files are built the first time before running the webserver --- bun.lockb | Bin 90566 -> 103147 bytes cmd/run.go | 60 +++---------------- package.json | 2 + {public => src/assets}/Poppins-Regular.ttf | Bin {public => src/assets}/download.png | Bin src/styles/app.css | 2 +- src/views/components/navbar.html | 2 +- utils/server.go | 66 +++++++++++++++++++++ utils/vite_dev.go | 32 +++++++++- vite.config.ts | 8 ++- 10 files changed, 116 insertions(+), 56 deletions(-) rename {public => src/assets}/Poppins-Regular.ttf (100%) rename {public => src/assets}/download.png (100%) create mode 100644 utils/server.go diff --git a/bun.lockb b/bun.lockb index cc89233ed7089cf2e40986ee34bedc05e2e30ed7..100e759f25ef5c65bc379557e6cf0cb71b59da54 100755 GIT binary patch delta 22337 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 delta 14429 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 EA2=S45dZ)H diff --git a/cmd/run.go b/cmd/run.go index 578a669..43cf50e 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -4,21 +4,13 @@ Copyright © 2024 Shane C. package cmd import ( - "fmt" "git.shadowhosting.xyz/shadow/utils" - "github.com/goccy/go-json" "github.com/gofiber/fiber/v2" - "github.com/gofiber/fiber/v2/middleware/earlydata" - "github.com/gofiber/fiber/v2/middleware/etag" - "github.com/gofiber/fiber/v2/middleware/healthcheck" - "github.com/gofiber/fiber/v2/middleware/helmet" - "github.com/gofiber/fiber/v2/middleware/idempotency" - "github.com/gofiber/fiber/v2/middleware/limiter" - "github.com/gofiber/template/html/v2" "github.com/spf13/cobra" "github.com/spf13/viper" - "log" - "time" + "golang.org/x/sys/unix" + "os" + "os/signal" ) // runCmd represents the run command @@ -28,50 +20,16 @@ var runCmd = &cobra.Command{ Run: func(cmd *cobra.Command, args []string) { if viper.GetBool("dev") && !fiber.IsChild() { - go utils.RunViteServer() + utils.RunViteServer() + sc := make(chan os.Signal, 1) + signal.Notify(sc, unix.SIGINT, unix.SIGTERM, os.Interrupt) + <-sc } - engine := html.New("./dist", ".html") - - if viper.GetBool("dev") { - engine.Reload(true) + if !viper.GetBool("dev") { + utils.Webserver() } - engine.AddFunc("viteAsset", utils.ViteAsset) - - app := fiber.New(fiber.Config{ - AppName: "shadow", - EnableIPValidation: true, - Views: engine, - ViewsLayout: "index", - Prefork: true, - JSONEncoder: json.Marshal, - JSONDecoder: json.Unmarshal, - }) - - app.Use(earlydata.New()) - app.Use(healthcheck.New()) - app.Use(helmet.New()) - app.Use(etag.New()) - app.Use(idempotency.New()) - app.Use(limiter.New(limiter.Config{ - Max: 175, - Expiration: 1 * time.Minute, - KeyGenerator: func(c *fiber.Ctx) string { - return c.Get("x-forwarded-for") - }, - LimiterMiddleware: limiter.SlidingWindow{}, - })) - - app.Static("/assets", "./dist/assets") - app.Static("/", "./public") - - app.Get("/", func(ctx *fiber.Ctx) error { - return ctx.Render("views/index", fiber.Map{}) - }) - - log.Fatal(app.Listen(fmt.Sprintf("%s:%d", viper.GetString("server.host"), viper.GetInt32("server.port")))) - }, } diff --git a/package.json b/package.json index c30fb7e..8d67554 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,8 @@ "typescript": "^5.0.0" }, "dependencies": { + "sharp": "^0.33.3", + "vite-plugin-image-optimizer": "^1.1.7", "vitest": "^1.5.0" } } \ No newline at end of file diff --git a/public/Poppins-Regular.ttf b/src/assets/Poppins-Regular.ttf similarity index 100% rename from public/Poppins-Regular.ttf rename to src/assets/Poppins-Regular.ttf diff --git a/public/download.png b/src/assets/download.png similarity index 100% rename from public/download.png rename to src/assets/download.png diff --git a/src/styles/app.css b/src/styles/app.css index 3ea7ca1..9c97a68 100644 --- a/src/styles/app.css +++ b/src/styles/app.css @@ -5,7 +5,7 @@ @layer base { @font-face { font-family: 'Poppins'; - src: url('/Poppins-Regular.ttf') + src: url('../assets/Poppins-Regular.ttf') } html { font-family: 'Poppins'; diff --git a/src/views/components/navbar.html b/src/views/components/navbar.html index b6229a9..320125b 100644 --- a/src/views/components/navbar.html +++ b/src/views/components/navbar.html @@ -27,7 +27,7 @@
- User Profile Image + User Profile Image
diff --git a/utils/server.go b/utils/server.go new file mode 100644 index 0000000..45bd252 --- /dev/null +++ b/utils/server.go @@ -0,0 +1,66 @@ +package utils + +import ( + "fmt" + "github.com/goccy/go-json" + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/earlydata" + "github.com/gofiber/fiber/v2/middleware/etag" + "github.com/gofiber/fiber/v2/middleware/healthcheck" + "github.com/gofiber/fiber/v2/middleware/helmet" + "github.com/gofiber/fiber/v2/middleware/idempotency" + "github.com/gofiber/fiber/v2/middleware/limiter" + "github.com/gofiber/template/html/v2" + "github.com/spf13/viper" + "log" + "time" +) + +func Webserver() { + + engine := html.New("./dist", ".html") + + if viper.GetBool("dev") { + engine.Reload(true) + } + + engine.AddFunc("viteAsset", ViteAsset) + + webConfig := fiber.Config{ + AppName: "shadow", + EnableIPValidation: true, + Views: engine, + ViewsLayout: "index", + JSONEncoder: json.Marshal, + JSONDecoder: json.Unmarshal, + } + + if !viper.GetBool("dev") { + webConfig.Prefork = true + } + + app := fiber.New(webConfig) + + app.Use(earlydata.New()) + app.Use(healthcheck.New()) + app.Use(helmet.New()) + app.Use(etag.New()) + app.Use(idempotency.New()) + app.Use(limiter.New(limiter.Config{ + Max: 175, + Expiration: 1 * time.Minute, + KeyGenerator: func(c *fiber.Ctx) string { + return c.Get("x-forwarded-for") + }, + LimiterMiddleware: limiter.SlidingWindow{}, + })) + + app.Static("/assets", "./dist/assets") + + app.Get("/", func(ctx *fiber.Ctx) error { + return ctx.Render("views/index", fiber.Map{}) + }) + + log.Fatal(app.Listen(fmt.Sprintf("%s:%d", viper.GetString("server.host"), viper.GetInt32("server.port")))) + +} diff --git a/utils/vite_dev.go b/utils/vite_dev.go index 16f1aab..4c7d1a9 100644 --- a/utils/vite_dev.go +++ b/utils/vite_dev.go @@ -8,6 +8,7 @@ import ( "log" "os" "os/exec" + "strings" "sync" ) @@ -81,9 +82,31 @@ import ( // //} +var blueRGB = [3]int{71, 202, 255} +var purpleRGB = [3]int{189, 52, 254} + func RunViteServer() { if viper.GetBool("dev") { + firstBuilt := false + + var niceText strings.Builder + str := "Vite Dev" + steps := len(str) - 1 + + // Why do this? Idk. I like having separation between things on the console. + for i := 0; i < len(str); i++ { + char := str[i] + + r := (blueRGB[0]*(steps-i) + purpleRGB[0]*i) / steps + g := (blueRGB[1]*(steps-i) + purpleRGB[1]*i) / steps + b := (blueRGB[2]*(steps-i) + purpleRGB[2]*i) / steps + + if _, err := niceText.WriteString(fmt.Sprintf("\033[1m\033[38;2;%d;%d;%dm%c\033[0m", r, g, b, char)); err != nil { + log.Fatalln(err) + } + } + go func() { cmd := exec.Command("bun", "run", "dev") @@ -123,7 +146,14 @@ func RunViteServer() { output := scanner.Text() - fmt.Println("VITE (Bun) | " + output) + if strings.Contains(output, "built in") && !firstBuilt { + + firstBuilt = true + go Webserver() + + } + + fmt.Println(niceText.String() + " \033[1m\033[38;5;244m|\033[22m " + output + "\033[0m") } diff --git a/vite.config.ts b/vite.config.ts index e09f16b..95d622c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,15 +1,19 @@ import { defineConfig } from 'vitest/config'; import path from "path"; import { glob } from "glob"; +import { ViteImageOptimizer } from 'vite-plugin-image-optimizer'; + export default defineConfig({ - plugins: [], + plugins: [ + ViteImageOptimizer(), + ], root: "src", build: { manifest: true, outDir: path.join(__dirname, "dist"), rollupOptions: { - input: glob.sync([path.resolve(__dirname, "src", "**/*.html"),path.resolve(__dirname, "src", "**/*.js"), path.resolve(__dirname, "src", "**/*.css")]), + input: glob.sync([path.resolve(__dirname, "src/assets", "**/*.*"), path.resolve(__dirname, "src", "**/*.html"),path.resolve(__dirname, "src", "**/*.js"), path.resolve(__dirname, "src", "**/*.css")]), }, emptyOutDir: true, },