Move test template HTML into static directory

blep-ai · Sep 10, 2018 · bcc89d0 · bcc89d0
1 parent 48c4611
commit bcc89d0
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,3 @@ build/
 certs/
 deploy/
 debug
-test.html
diff --git a/k2ws/app.go b/k2ws/app.go
@@ -11,7 +11,6 @@ func main() {
 	configFile := flag.String("config", "config.yaml", "Config file location")
 	flag.Parse()
 
-	readTemplate()
 	list := ReadK2WS(*configFile)
 	for i := range list {
 		go func(k2ws *K2WS) {

diff --git a/k2ws/k2ws.go b/k2ws/k2ws.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"html/template"
 	"log"
 	"net/http"
 	"net/url"
@@ -30,6 +31,12 @@ type K2WSKafka struct {
 	MessageType             string
 }
 
+type templateInfo struct {
+	TestPath, WSURL string
+}
+
+var localStatic = false
+var testTemplate *template.Template
 var rexStatic = regexp.MustCompile(`(.*)(/static/.+(\.[a-z0-9]+))$`)
 var mimeTypes = map[string]string{
 	".js":   "application/javascript",
@@ -79,7 +86,7 @@ func (k2ws *K2WS) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			testUIPath = "/"
 		}
 		if _, exists := k2ws.TestUIs[testUIPath]; exists {
-			if payload, err := FSByte(false, submatch[2]); err == nil {
+			if payload, err := FSByte(localStatic, submatch[2]); err == nil {
 				var mime = "application/octet-stream"
 				if m, ok := mimeTypes[submatch[3]]; ok {
 					mime = m
@@ -91,11 +98,16 @@ func (k2ws *K2WS) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	} else if wsPath, exists := k2ws.TestUIs[r.URL.Path]; exists {
-		// readTemplate()
-		if k2ws.TLSCertFile != "" {
-			homeTemplate.Execute(w, templateInfo{strings.TrimRight(r.URL.Path, "/"), "wss://" + r.Host + *wsPath})
-		} else {
-			homeTemplate.Execute(w, templateInfo{strings.TrimRight(r.URL.Path, "/"), "ws://" + r.Host + *wsPath})
+		html, err := FSString(localStatic, "/static/test.html")
+		if err == nil {
+			wsURL := "ws://" + r.Host + *wsPath
+			if k2ws.TLSCertFile != "" {
+				wsURL = "wss://" + r.Host + *wsPath
+			}
+			if testTemplate == nil || localStatic {
+				testTemplate = template.Must(template.New("").Parse(html))
+			}
+			testTemplate.Execute(w, templateInfo{strings.TrimRight(r.URL.Path, "/"), wsURL})
 		}
 		return
 	} else if kcfg, exists := k2ws.WebSockets[r.URL.Path]; exists {

diff --git a/k2ws/static.go b/k2ws/static.go
diff --git a/k2ws/html-template.go → k2ws/static/test.html b/k2ws/html-template.go → k2ws/static/test.html
@@ -1,17 +1,3 @@
-package main
-
-import (
-	"html/template"
-)
-
-type templateInfo struct {
-	TestPath, WSURL string
-}
-
-var homeTemplate *template.Template
-
-func readTemplate() {
-	homeTemplate = template.Must(template.New("").Parse(`
 <!DOCTYPE html>
 <html style="height:100%">
 
@@ -354,10 +340,3 @@
 </body>
 
 </html>
-`))
-	// html, err := ioutil.ReadFile("../test.html")
-	// if err != nil {
-	// 	log.Printf("Error while reading config.yaml file: \n%v ", err)
-	// }
-	// homeTemplate = template.Must(template.New("").Parse(string(html)))
-}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,3 @@ build/ @@
     certs/
     deploy/
     debug
-    test.html