Embed static files (html, js, css)

Author: gagliardetto

.gitignore

@@ -1 +1,2 @@
-generated
+generated
+/specs/*

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/mozillazg/request v0.8.0 // indirect
+	github.com/rakyll/statik v0.1.7
 	golang.org/x/mod v0.3.0
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
 	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd // indirect

go.sum

@@ -150,6 +150,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
+github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

main.go

@@ -1,10 +1,12 @@
 package main
 
+//go:generate statik -src=./public -include="*.html,*.css,*.js"
 import (
 	"errors"
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"mime"
 	"net/http"
 	"net/url"
 	"os"
@@ -17,6 +19,7 @@ import (
 	"github.com/gagliardetto/codebox/scanner"
 	"github.com/gagliardetto/codemill/handlers/tainttracking"
 	"github.com/gagliardetto/codemill/handlers/untrustedflowsource"
+	_ "github.com/gagliardetto/codemill/statik"
 	"github.com/gagliardetto/codemill/x"
 	cqljen "github.com/gagliardetto/cqlgen/jen"
 	"github.com/gagliardetto/feparser"
@@ -27,6 +30,7 @@ import (
 	"github.com/gagliardetto/request"
 	. "github.com/gagliardetto/utilz"
 	"github.com/gin-gonic/gin"
+	"github.com/rakyll/statik/fs"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/tools/go/packages"
 )
@@ -44,8 +48,50 @@ var (
 
 func main() {
 	r := gin.Default()
-	r.StaticFile("", "./index.html")
-	r.Static("/static", "./static")
+
+	statikFS, err := fs.New()
+	if err != nil {
+		Fataln(err)
+	}
+
+	r.GET("/", func(c *gin.Context) {
+		r, err := statikFS.Open("/index.html")
+		if err != nil {
+			Q(err)
+			Abort404(c, err.Error())
+			return
+		}
+		defer r.Close()
+		contents, err := ioutil.ReadAll(r)
+		if err != nil {
+			Q(err)
+			Abort404(c, err.Error())
+			return
+		}
+		c.Data(200, "text/html; charset=UTF-8", contents)
+	})
+	r.GET("/static/:filename", func(c *gin.Context) {
+		name := c.Param("filename")
+		if name == "" {
+			c.AbortWithStatus(400)
+			return
+		}
+		r, err := statikFS.Open("/static/" + name)
+		if err != nil {
+			c.AbortWithError(400, err)
+			Q(err)
+			return
+		}
+		defer r.Close()
+		contents, err := ioutil.ReadAll(r)
+		if err != nil {
+			c.AbortWithError(400, err)
+			Q(err)
+			return
+		}
+		m := mime.TypeByExtension(filepath.Ext(name))
+		c.Data(200, Sf("%s; charset=UTF-8", m), contents)
+	})
 	httpClient := new(http.Client)
 
 	var specFilepath string