Add basic logging, css, other changes

handle_bin_inspect.go

@@ -19,6 +19,7 @@ func (s *server) handleBinInspect() http.HandlerFunc {
 
 			s.renderTemplate(w, "inspect", &bin)
 			return
+
 		default:
 			http.NotFound(w, r)
 			return

handle_bin_new.go

@@ -7,6 +7,7 @@ import (
 
 func (s *server) handleBinNew() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		fmt.Println("handleBinNew")
 		switch r.Method {
 		case "POST":
 			bin, _ := s.db.NewBin()

handle_rekwest.go

@@ -7,6 +7,7 @@ import (
 
 func (s *server) handleRequest() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
+		fmt.Println("handleRequest")
 		binID := r.URL.Path[len("/r/"):]
 		fmt.Println("Request made: ", binID)
 

main.go

@@ -7,8 +7,6 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-
-	socketio "github.com/googollee/go-socket.io"
 )
 
 func main() {
@@ -35,32 +33,25 @@ func run(args []string) error {
 	srv.db.Connect()
 	defer srv.db.Disconnect()
 
-	go srv.sockets.Serve()
-	defer srv.sockets.Close()
-
 	fmt.Printf("Rekwest Bin listening on :%d\n", *port)
 	return http.ListenAndServe(addr, srv)
 }
 
 type server struct {
-	mux     *http.ServeMux
-	tmpl    map[string]*template.Template
-	db      *Database
-	sockets *socketio.Server
+	mux  *http.ServeMux
+	tmpl map[string]*template.Template
+	db   *Database
 }
 
 func newServer() (*server, error) {
 	srv := &server{
 		mux: http.NewServeMux(),
 		tmpl: map[string]*template.Template{
 			"inspect": template.Must(template.ParseFiles("templates/inspect.html", "templates/rekwest.html")),
-			"rekwest": template.Must(template.ParseFiles("templates/rekwest.html")),
 		},
-		sockets: socketio.NewServer(nil),
-		db:      NewDatabase("rekwest-bin", "bins"),
+		db: NewDatabase("rekwest-bin", "bins"),
 	}
 
-	srv.socketRoutes()
 	srv.routes()
 	return srv, nil
 }
@@ -69,9 +60,17 @@ func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	s.mux.ServeHTTP(w, r)
 }
 
-func (s *server) handleIndex() http.HandlerFunc {
+func (s *server) handleRoot() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, filepath.Join("public", "index.html"))
+		filename := ""
+
+		if r.URL.Path == "/" {
+			filename = "index.html"
+		} else {
+			filename = r.URL.Path
+		}
+
+		http.ServeFile(w, r, filepath.Join("public", filename))
 	}
 }
 

middleware.go

@@ -1,6 +1,10 @@
 package main
 
-import "net/http"
+import (
+	"fmt"
+	"net/http"
+	"time"
+)
 
 func (s *server) fixIPAddress(h http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -26,3 +30,18 @@ func (s *server) fixIPAddress(h http.HandlerFunc) http.HandlerFunc {
 		h(w, r)
 	}
 }
+
+func (s *server) withLogging(h http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		start := time.Now()
+
+		uri := r.RequestURI
+		method := r.Method
+		h.ServeHTTP(w, r) // serve the original request
+
+		duration := time.Since(start)
+
+		// log request details
+		fmt.Println(uri, method, duration)
+	}
+}

public/css/style.css

@@ -0,0 +1,20 @@
+html {
+  padding: 3em 1em;
+  margin: auto;
+  line-height: 1.75;
+  font-size: 1.25em;
+}
+
+h1,h2,h3,h4,h5,h6 {
+  margin: 3em 0 1em;
+}
+
+p,ul,ol {
+  margin-bottom: 2em;
+  color: #1d1d1d;
+  font-family: sans-serif;
+}
+
+dt, dd {
+  display: inline;
+}

routes.go

@@ -1,9 +1,8 @@
 package main
 
 func (s *server) routes() {
-	s.mux.Handle("/socket.io/", s.sockets)
-	s.mux.HandleFunc("/", s.handleIndex())
-	s.mux.HandleFunc("/new/", s.handleBinNew())
-	s.mux.HandleFunc("/r/", s.fixIPAddress(s.handleRequest()))
-	s.mux.HandleFunc("/inspect/", s.handleBinInspect())
+	s.mux.HandleFunc("/", s.withLogging(s.handleRoot()))
+	s.mux.HandleFunc("/new/", s.withLogging(s.handleBinNew()))
+	s.mux.HandleFunc("/r/", s.withLogging(s.fixIPAddress(s.handleRequest())))
+	s.mux.HandleFunc("/inspect/", s.withLogging(s.handleBinInspect()))
 }

templates/inspect.html

@@ -4,14 +4,8 @@
     <title>Rekwests: {{.BinId}}</title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <script src="https://cdn.socket.io/4.4.1/socket.io.min.js" integrity="sha384-fKnu0iswBIqkjxrhQCTZ7qlLHOFEgNkRmK2vaO/LbTZSXdJfAu6ewRBdwHPhBo/H" crossorigin="anonymous"></script>
-    <script>
-      const socket = io();
-      socket.on("connect", () => {
-        socket.send("hello");
-      });
-    </script>
-    <link href="css/style.css" rel="stylesheet">
+    <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
+    <link href="/css/style.css" rel="stylesheet">
   </head>
   <body>
     <h1>Requests to {{.BinId}}</h1>

templates/rekwest.html

@@ -1,10 +1,11 @@
 {{define "request"}}
 <div class="request">
   <div class="request-line">
-    <div>
-      Method: {{.Method}}
-      Host: {{.Host}}
-      Path: {{.Path}}
+    <dl>
+      <dt>Method:</dt> <dd>{{.Method}}</dd>
+      <dt>Host:</dt> <dd>{{.Host}}</dd>
+      <dt>Path:</dt> <dd>{{.Path}}</dd>
+    </dl>
     </div>
     <div>
       <strong>Query Params:</strong>