From 521b3eef20b3c20e3086cde4010f88218d6f6d56 Mon Sep 17 00:00:00 2001
From: Riley Smith <riley@rileysmith.me>
Date: Sun, 23 Jan 2022 23:37:48 -0800
Subject: [PATCH] ping event

---
 backend/.idea/workspace.xml                  |  7 +------
 backend/internal/ws/handlers.go              | 10 +++++++++-
 backend/internal/ws/hub.go                   |  8 +++++++-
 backend/internal/ws/message.go               |  2 +-
 frontend/package.json                        |  1 +
 frontend/src/interfaces/IMessage.ts          |  4 ++--
 frontend/src/pages/_document.tsx             |  6 +++---
 frontend/src/pages/api/auth/[...nextauth].ts |  2 +-
 frontend/src/pages/player.tsx                | 15 +++++++++++++++
 frontend/src/util/Message.ts                 |  2 +-
 frontend/yarn.lock                           |  5 +++++
 11 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index 4deff21..4fc0f70 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -7,13 +7,8 @@
     <list default="true" id="8a64704d-5500-41a6-aa4c-e275933fc58c" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/internal/ws/handlers.go" beforeDir="false" afterPath="$PROJECT_DIR$/internal/ws/handlers.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/internal/ws/hub.go" beforeDir="false" afterPath="$PROJECT_DIR$/internal/ws/hub.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/internal/ws/message.go" beforeDir="false" afterPath="$PROJECT_DIR$/internal/ws/message.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/internal/ws/structs.go" beforeDir="false" afterPath="$PROJECT_DIR$/internal/ws/structs.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/interfaces/IMessage.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/interfaces/IMessage.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/src/interfaces/IUser.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/src/interfaces/IUser.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/types/environment.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/types/environment.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../frontend/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../frontend/yarn.lock" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/backend/internal/ws/handlers.go b/backend/internal/ws/handlers.go
index 0204fd4..5e79cba 100644
--- a/backend/internal/ws/handlers.go
+++ b/backend/internal/ws/handlers.go
@@ -15,7 +15,7 @@ func handleIdentifyEvent(message *Message) {
 			Data: map[string]interface{}{
 				"admin":    true,
 				"playlist": "",
-				"playHead": 0,
+				"playhead": 0,
 				"user":     d["user"],
 			},
 		},
@@ -33,3 +33,11 @@ func handlePingEvent(message *Message) {
 	}
 	message.send <- m.SerializeMessage().Data
 }
+
+func handleGetPlayhead(message *Message) {
+
+}
+
+func handleSetPlayhead(message *Message) {
+
+}
diff --git a/backend/internal/ws/hub.go b/backend/internal/ws/hub.go
index 4d9a0e7..288c30d 100644
--- a/backend/internal/ws/hub.go
+++ b/backend/internal/ws/hub.go
@@ -24,12 +24,18 @@ func NewHub() *Hub {
 }
 
 func (h *Hub) handleMessage(rm RawMessage) {
-	m := rm.UnSerializeData()
+	m := rm.UnserializeData()
 	switch m.Type {
 	case Identify:
 		handleIdentifyEvent(&m)
 	case Ping:
 		handlePingEvent(&m)
+	case Position:
+		handleGetPlayhead(&m)
+	case SetPosition:
+		handleSetPlayhead(&m)
+	default:
+		return
 	}
 	return
 }
diff --git a/backend/internal/ws/message.go b/backend/internal/ws/message.go
index ee0b741..57e530b 100644
--- a/backend/internal/ws/message.go
+++ b/backend/internal/ws/message.go
@@ -34,7 +34,7 @@ type RawMessage struct {
 	Data   []byte
 }
 
-func (rm RawMessage) UnSerializeData() Message {
+func (rm RawMessage) UnserializeData() Message {
 	var md MessageData
 	if err := json.Unmarshal(rm.Data, &md); err != nil {
 		log.Errorf("error unmarshalling message, %s", err.Error())
diff --git a/frontend/package.json b/frontend/package.json
index 1915ba1..dd5bce2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,6 +11,7 @@
     "@chakra-ui/theme-tools": "1.1.2",
     "@emotion/react": "11.1.5",
     "@emotion/styled": "11.1.5",
+    "consola": "^2.15.3",
     "framer-motion": "^4.0.3",
     "next": "latest",
     "next-auth": "^4.1.2",
diff --git a/frontend/src/interfaces/IMessage.ts b/frontend/src/interfaces/IMessage.ts
index 93c5b48..f363b3b 100644
--- a/frontend/src/interfaces/IMessage.ts
+++ b/frontend/src/interfaces/IMessage.ts
@@ -2,8 +2,8 @@ export enum MessageTypes {
   Ping,
   Pong,
   Identify,
-  Position,
-  SetPosition,
+  GetPlayhead,
+  SetPlayhead,
 }
 
 interface IMessage {
diff --git a/frontend/src/pages/_document.tsx b/frontend/src/pages/_document.tsx
index 2b8b574..542c4d0 100644
--- a/frontend/src/pages/_document.tsx
+++ b/frontend/src/pages/_document.tsx
@@ -1,5 +1,5 @@
-import NextDocument, { Html, Head, Main, NextScript } from 'next/document'
-import { ColorModeScript } from '@chakra-ui/react'
+import NextDocument, { Html, Head, Main, NextScript } from "next/document";
+import { ColorModeScript } from "@chakra-ui/react";
 
 export default class Document extends NextDocument {
   render() {
@@ -13,6 +13,6 @@ export default class Document extends NextDocument {
           <NextScript />
         </body>
       </Html>
-    )
+    );
   }
 }
diff --git a/frontend/src/pages/api/auth/[...nextauth].ts b/frontend/src/pages/api/auth/[...nextauth].ts
index 61b324f..83b6d63 100644
--- a/frontend/src/pages/api/auth/[...nextauth].ts
+++ b/frontend/src/pages/api/auth/[...nextauth].ts
@@ -13,7 +13,7 @@ export default NextAuth({
     secret: process.env.SECRET,
   },
   callbacks: {
-    async session({ session, token, user }) {
+    async session({ session, token }) {
       session.user.id = token.sub;
       return session;
     },
diff --git a/frontend/src/pages/player.tsx b/frontend/src/pages/player.tsx
index e955b56..6e5087d 100644
--- a/frontend/src/pages/player.tsx
+++ b/frontend/src/pages/player.tsx
@@ -1,3 +1,4 @@
+import consola from "consola";
 import { GetServerSideProps, NextPage } from "next";
 import { Session, User } from "next-auth";
 import { getSession, useSession } from "next-auth/react";
@@ -14,7 +15,20 @@ interface PlayerPageProps {
   URI: string;
   user: User;
 }
+
+const pingEvent = (ws: WebSocket) => {
+  let interval = setInterval(() => {
+    if (ws.readyState === ws.CLOSED) {
+      clearInterval(interval);
+      return;
+    }
+    console.log("running ping event");
+    ws.send(MessageUtil.encode(new Message(MessageTypes.Ping)));
+  }, 20000);
+};
+
 const PlayerPage: NextPage<PlayerPageProps> = ({ URI, user }) => {
+  consola.wrapAll();
   useEffect(() => {
     if (typeof window === "undefined") return;
     const ws = new WebSocket(URI);
@@ -30,6 +44,7 @@ const PlayerPage: NextPage<PlayerPageProps> = ({ URI, user }) => {
           })
         )
       );
+      pingEvent(ws);
     };
     ws.onmessage = (event) => {
       console.log(event);
diff --git a/frontend/src/util/Message.ts b/frontend/src/util/Message.ts
index b34d7d9..a27ae43 100644
--- a/frontend/src/util/Message.ts
+++ b/frontend/src/util/Message.ts
@@ -3,7 +3,7 @@ import IMessage, { MessageTypes } from "../interfaces/IMessage";
 export default class Message implements IMessage {
   constructor(
     public type: MessageTypes,
-    public data: Record<string, unknown>
+    public data?: Record<string, unknown>
   ) {}
 
   toJSON(): Record<string, unknown> {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 0452e14..5ede10c 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1344,6 +1344,11 @@ compute-scroll-into-view@1.0.14:
   resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.14.tgz#80e3ebb25d6aa89f42e533956cb4b16a04cfe759"
   integrity sha512-mKDjINe3tc6hGelUMNDzuhorIUZ7kS7BwyY0r2wQd2HOH2tRuJykiC06iSEX8y1TuhNzvz4GcJnK16mM2J1NMQ==
 
+consola@^2.15.3:
+  version "2.15.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
+
 constants-browserify@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"