Replaces ws attribute with extension (#24)

Co-authored-by: Benjamin Bengfort <benjamin@bengfort.com>
rotationalio · Dec 22, 2023 · ac036ab · ac036ab
1 parent c9a933f
commit ac036ab
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 22 deletions.
diff --git a/pkg/rtnl/rtnl.go b/pkg/rtnl/rtnl.go
@@ -249,7 +249,7 @@ func (s *Server) Routes(router *gin.Engine) (err error) {
 		// Heartbeat route (no authentication required)
 		v1.GET("/status", s.Status)
 		v1.POST("/shorten", s.Authenticate, s.ShortenURL)
-		v1.GET("/updates", s.Authenticate, s.Updates)
+		v1.GET("/updates", s.Updates) // TODO: add back authentication
 		v1.GET("/links", s.Authenticate, s.ShortURLList)
 		v1.POST("/links", s.Authenticate, s.ShortenURL)
 		v1.GET("/links/:id", s.Authenticate, s.ShortURLInfo)

diff --git a/pkg/rtnl/static/js/link-detail-chart.js b/pkg/rtnl/static/js/link-detail-chart.js
@@ -1,14 +1,27 @@
-document.body.addEventListener('htmx:wsBeforeMessage', function(e) {
-  data = JSON.parse(e.detail.message);
+function createWebSocket(url) {
+  var sock = new WebSocket(url);
+  sock.binaryType = "blob";
+  sock.onerror = function(e) {
+    console.log(e);
+  }
+
+  console.log(sock)
+  return sock;
+}
+
+(function() {
+  // The chart labels are the data keys (hours) and the chart data is the values (number of clicks).
+  let data = {};
+
+  // Create the chart
   const ctx = document.getElementById('link-detail-chart');
-
-  new Chart(ctx, {
+  const chart = new Chart(ctx, {
     type: 'line',
     data: {
-      labels: data.Time,
+      labels: [],
       datasets: [{
         label: 'URL Activity',
-        data: data.Views,
+        data: [],
         borderWidth: 1
       }]
     },
@@ -20,5 +33,30 @@ document.body.addEventListener('htmx:wsBeforeMessage', function(e) {
         }
       }
     }
-});
-});
+  });
+
+  // Create a websocket connection
+  // TODO: get the link for the detail page.
+  const ws = createWebSocket("ws://localhost:8765/v1/updates");
+  ws.onmessage = function(message) {
+    const click = JSON.parse(message.data);
+    if (data[click.time]) {
+      data[click.time] += click.views;
+    } else {
+      data[click.time] = click.views;
+    }
+
+    let labels = [];
+    let values = [];
+    for (const key in data) {
+      labels.push(key);
+      values.push(data[key]);
+    }
+
+    chart.labels = labels;
+    chart.data.datasets[0].data = data;
+    chart.update();
+  };
+
+})();
+
diff --git a/pkg/rtnl/static/styles/output.css b/pkg/rtnl/static/styles/output.css
@@ -565,10 +565,6 @@ video {
   margin-bottom: 0.5rem;
 }
 
-.mb-20 {
-  margin-bottom: 5rem;
-}
-
 .mb-6 {
   margin-bottom: 1.5rem;
 }
@@ -585,18 +581,14 @@ video {
   margin-top: 3rem;
 }
 
-.mt-20 {
-  margin-top: 5rem;
+.mt-16 {
+  margin-top: 4rem;
 }
 
 .mt-4 {
   margin-top: 1rem;
 }
 
-.mt-16 {
-  margin-top: 4rem;
-}
-
 .block {
   display: block;
 }

diff --git a/pkg/rtnl/templates/info.html b/pkg/rtnl/templates/info.html
@@ -5,7 +5,7 @@
   <i alt="Loading..." class="fa-solid fa-spinner fa-spin htmx-indicator"></i>
 </section>
 
-<div hx-ws="v1/links/{{ .ID }}/updates" hx-target="link-detail-chart" hx-trigger="every 30s" class="mb-10">
+<div class="mb-10">
   <canvas id="link-detail-chart"></canvas>
 </div>
 

diff --git a/pkg/rtnl/templates/layout/base.html b/pkg/rtnl/templates/layout/base.html
@@ -10,7 +10,7 @@
 
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css" integrity="sha512-SzlrxWUlpfuzQ+pcUCosxcglQRNAq/DZjVsC0lE40xsADsfeQoEypE+enwcOiGjk/bSuGGKHEyjSoQ1zVisanQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
   <link rel="stylesheet" href="/static/styles/output.css" />
- 
+
 </head>
 <body>
     {{ template "header" .}}
@@ -22,7 +22,8 @@
 
   {{ template "footer" .}}
 
-  <script src="https://unpkg.com/htmx.org@1.9.8" integrity="sha384-rgjA7mptc2ETQqXoYC3/zJvkU7K/aP44Y+z7xQuJiVnB/422P/Ak+F/AqFR7E4Wr" crossorigin="anonymous"></script>
+  <script src="https://unpkg.com/htmx.org@1.9.10" integrity="sha384-D1Kt99CQMDuVetoL1lrYwg5t+9QdHe7NLX/SoJYkXDFfX37iInKRy5xLSi8nO7UC" crossorigin="anonymous"></script>
+  <script src="https://unpkg.com/htmx.org@1.9.10/dist/ext/ws.js"></script>
   <script src="/static/js/htmx.js"></script>
   {{ block "appcode" . }}{{ end }}
 </body>

diff --git a/pkg/rtnl/web.go b/pkg/rtnl/web.go
@@ -61,8 +61,17 @@ func (s *Server) Updates(c *gin.Context) {
 	}
 	defer sub.Close()
 
+	// TODO: write some initial data to the websocket to display the graph.
+	if err = conn.WriteJSON(api.Clicked(c)); err != nil {
+		log.Error().Err(err).Msg("could not send message to establish connection")
+		c.JSON(http.StatusInternalServerError, api.ErrorResponse(err))
+		return
+	}
+
 	// In the meantime, just write data back to the server
 	for event := range sub.C {
+		log.Debug().Msg("waiting for updates")
+
 		// Only publish click events to the updates stream
 		if event.Type.Name != "Click" {
 			continue