Embedded web-static assets

Author: James / creativenucleus

api-json.go

@@ -7,7 +7,17 @@ import (
 
 func apiOutErr(w http.ResponseWriter, err error, statusCode int) {
 	w.Header().Set("Content-Type", "application/json")
-	http.Error(w, err.Error(), statusCode)
+	w.WriteHeader(statusCode)
+
+	type errJson struct {
+		Error string `json:"error"`
+	}
+
+	out := errJson{
+		Error: err.Error(),
+	}
+
+	json.NewEncoder(w).Encode(out)
 }
 
 func apiOutResponse(w http.ResponseWriter, data interface{}, statusCode int) {

client-panel.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io/fs"
 	"log"
 	"net/http"
 	"strconv"
@@ -40,12 +41,11 @@ func startClientPanel(port int) error {
 		ReadHeaderTimeout: 3 * time.Second,
 	}
 
-	fs := http.FileServer(http.Dir("./web-static"))
-	http.Handle("/static/", http.StripPrefix("/static/", fs))
-
-	http.HandleFunc("/favicon.ico", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, "/web-static/favicon/favicon.ico")
-	})
+	subFs, err := fs.Sub(embed.WebStaticAssets, "web-static")
+	if err != nil {
+		return err
+	}
+	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.FS(subFs))))
 
 	fmt.Printf("In a web browser, go to http://localhost:%d/%s\n", port, session)
 

embed/embed.go

@@ -1,6 +1,7 @@
 package embed
 
 import (
+	"embed"
 	_ "embed"
 )
 
@@ -13,6 +14,9 @@ var ServerIndexHtml []byte
 //go:embed web/client/index.html
 var ClientIndexHtml []byte
 
+//go:embed web-static
+var WebStaticAssets embed.FS
+
 //go:embed tic-code/jukebox.lua
 var LuaJukebox []byte
 

web-static/javascript/bytejammer.js embed/web-static/javascript/bytejammer.jsweb-static/javascript/bytejammer.js renamed to embed/web-static/javascript/bytejammer.js

@@ -65,20 +65,38 @@ class BjmrAjax {
     }
 
     makeReq = async(method, endpoint, data) => {
-        // Making our request
-        const response = await fetch(`/${this.sessionKey}/api/${endpoint}.json`, {
-            method: method,
-    //                    mode: "cors", // no-cors, *cors, same-origin
-            cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
-    //                    credentials: "same-origin", // include, *same-origin, omit
-            headers: {
-                "Content-Type": "application/json",
-            },
-    //                    redirect: "follow", // manual, *follow, error
-    //                    referrerPolicy: "no-referrer", // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
-            body: JSON.stringify(data), // body data type must match "Content-Type" header
-        });
-        return await response.json();
+        const out = {
+            ok: false,
+            code: null,
+            data: null,
+        }
+
+        try {
+            const response = await fetch(`/${this.sessionKey}/api/${endpoint}.json`, {
+                method: method,
+                // mode: "cors", // no-cors, *cors, same-origin
+                cache: "no-cache", // *default, no-cache, reload, force-cache, only-if-cached
+            // credentials: "same-origin", // include, *same-origin, omit
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            // redirect: "follow", // manual, *follow, error
+            // referrerPolicy: "no-referrer", // no-referrer, *no-referrer-when-downgrade, origin, origin-when-cross-origin, same-origin, strict-origin, strict-origin-when-cross-origin, unsafe-url
+                body: JSON.stringify(data), // body data type must match "Content-Type" header
+            });
+
+            out.code = response.status;
+            out.data = await response.json();
+        } catch (error) {
+            console.error("There has been a problem with your fetch operation:", error);
+        }
+
+        out.ok = (out.code >= 200 && out.code <= 299)
+        if (!out.ok) {
+            addToLog(`ERROR ${out.code}: ${out.data?.error}`);
+        }
+
+        return out;
     }
 }