refactor move assets into separate subdir

assets/assets.go

@@ -0,0 +1,18 @@
+package assets
+
+import (
+	"embed"
+
+	"github.com/benbjohnson/hashfs"
+)
+
+//go:embed static
+var StaticFS embed.FS
+
+var StaticHashFS = hashfs.NewFS(StaticFS)
+
+//go:embed template
+var TemplateFS embed.FS
+
+//go:embed manuf
+var ManufTxt []byte

natbwmon.go → main.go

@@ -16,14 +16,12 @@ import (
 
 	"github.com/go-pa/flagutil"
 	"github.com/peterbourgon/ff/v3"
+	"github.com/some-programs/natbwmon/assets"
 	"github.com/some-programs/natbwmon/internal/log"
 	"github.com/some-programs/natbwmon/internal/mon"
 	"github.com/tomruk/oui"
 )
 
-//go:embed manuf
-var manufTxt []byte
-
 // Flags contains the top level program configuration.
 type Flags struct {
 	chain                    string
@@ -120,7 +118,7 @@ func main() {
 		log.Fatal().Err(err).Msg("")
 	}
 
-	ouiDB, err := oui.NewDB(manufTxt)
+	ouiDB, err := oui.NewDB(assets.ManufTxt)
 	if err != nil {
 		log.Fatal().Err(err).Msg("")
 	}

server.go

@@ -14,6 +14,7 @@ import (
 	"github.com/benbjohnson/hashfs"
 	"github.com/justinas/alice"
 	"github.com/rs/zerolog/hlog"
+	"github.com/some-programs/natbwmon/assets"
 	"github.com/some-programs/natbwmon/internal/clientstats"
 	"github.com/some-programs/natbwmon/internal/log"
 	"github.com/some-programs/natbwmon/internal/mon"
@@ -68,17 +69,22 @@ func (s *Server) Routes() *http.ServeMux {
 	if s.nmapEnabled {
 		mux.Handle("/v0/nmap/", c.Then(s.NmapV0()))
 	}
-	mux.Handle("/static/", c.Then(hashfs.FileServer(StaticHashFS)))
+	mux.Handle("/static/", c.Then(hashfs.FileServer(assets.StaticHashFS)))
 
 	return mux
 }
 
+// clientsTemplateData .
+type clientsTemplateData struct {
+	Title string
+}
+
 func (s *Server) Clients() AppHandler {
 	tmpl, err := template.New("base.html").Funcs(
 		template.FuncMap{
-			"static": StaticHashFS.HashName,
+			"static": assets.StaticHashFS.HashName,
 		},
-	).ParseFS(TemplateFS, "template/base.html", "template/clients.html")
+	).ParseFS(assets.TemplateFS, "template/base.html", "template/clients.html")
 	if err != nil {
 		log.Fatal().Err(err).Msg("parse templates")
 	}
@@ -94,11 +100,21 @@ func (s *Server) Clients() AppHandler {
 	}
 }
 
+// conntrackTemplateData .
+type conntrackTemplateData struct {
+	Title       string
+	FS          mon.FlowSlice
+	IPFilter    string
+	OrderFilter string
+	NMAP        bool
+	IP          string
+}
+
 // Conntrack displays a page with the
 func (s *Server) Conntrack() AppHandler {
 	templ, err := template.New("base.html").Funcs(
 		template.FuncMap{
-			"static": StaticHashFS.HashName,
+			"static": assets.StaticHashFS.HashName,
 			"ipclass": func(ip net.IP) string {
 				if ip.IsLoopback() || ip.IsMulticast() || ip.IsLinkLocalUnicast() || ip.IsLinkLocalMulticast() {
 					return "blue"
@@ -112,7 +128,7 @@ func (s *Server) Conntrack() AppHandler {
 				return clientstats.FmtBytes(float64(n), "")
 			},
 		},
-	).ParseFS(TemplateFS, "template/base.html", "template/conntrack.html")
+	).ParseFS(assets.TemplateFS, "template/base.html", "template/conntrack.html")
 	if err != nil {
 		log.Fatal().Err(err).Msg("")
 	}

tsconfig.json

@@ -14,7 +14,7 @@
     // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "./static/" /* Redirect output structure to the directory. */,
+    "outDir": "./assets/static/" /* Redirect output structure to the directory. */,
     "rootDir": "./ts/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
     // "composite": true,                     /* Enable project compilation */
     // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */

update-oui.sh

@@ -2,4 +2,4 @@
 
 set -e
 
-exec curl -o manuf https://gitlab.com/wireshark/wireshark/-/raw/master/manuf
+exec curl -o assets/manuf https://gitlab.com/wireshark/wireshark/-/raw/master/manuf