layed out websockets

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "petname"
+    ]
+}

README.md

@@ -1,2 +1,3 @@
 # hangman
 
+- [ ] clean up https://gitea.elara.ws/Hazel/go-words as actual library

go.mod

@@ -3,7 +3,10 @@ module gitea.elara.ws/Hazel/hangman
 go 1.24.2
 
 require (
+	gitea.elara.ws/Hazel/go-words v0.0.0-20250701093631-6125867cea5a // indirect
+	gitea.elara.ws/Hazel/words v1.0.5 // indirect
 	github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/labstack/echo/v4 v4.13.4 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect

go.sum

@@ -1,5 +1,13 @@
+gitea.elara.ws/Hazel/go-words v0.0.0-20250701093631-6125867cea5a h1:E5BgJBsBKL1MNW1W6HK69XYXvDKtYLfRezl1nh27B5g=
+gitea.elara.ws/Hazel/go-words v0.0.0-20250701093631-6125867cea5a/go.mod h1:8vVkpfa+5Xcte2f7YaH6ao8kVZlbz1ErCVGqNanaNLA=
+gitea.elara.ws/Hazel/words v1.0.4 h1:pc7RZ0gNYMZ/zeYmY7FZrscZZOO4TEQt5d6SsXLe4zc=
+gitea.elara.ws/Hazel/words v1.0.4/go.mod h1:IwQ+eZpY2Kr02RPYpyFDjHNJPPbsf1NOvgc4ZMeg2zg=
+gitea.elara.ws/Hazel/words v1.0.5 h1:FjpQezXDPxgNing/DAMJStLT3TC7/dxvCQj3Cg3AJB4=
+gitea.elara.ws/Hazel/words v1.0.5/go.mod h1:IwQ+eZpY2Kr02RPYpyFDjHNJPPbsf1NOvgc4ZMeg2zg=
 github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0 h1:aYo8nnk3ojoQkP5iErif5Xxv0Mo0Ga/FR5+ffl/7+Nk=
 github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0/go.mod h1:8AuBTZBRSFqEYBPYULd+NN474/zZBLP+6WeT5S9xlAc=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/labstack/echo/v4 v4.13.4 h1:oTZZW+T3s9gAu5L8vmzihV7/lkXGZuITzTQkTEhcXEA=
 github.com/labstack/echo/v4 v4.13.4/go.mod h1:g63b33BZ5vZzcIUF8AtRH40DrTlXnx4UMC8rBdndmjQ=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=

internal/game/session.go

@@ -3,6 +3,8 @@ package game
 import (
 	"crypto/ed25519"
 	"encoding/base64"
+	"errors"
+	"strings"
 
 	petname "github.com/dustinkirkland/golang-petname"
 )
@@ -16,42 +18,110 @@ type Session struct {
 	Name  string
 	Users []User
 
-	Phrase       []string
-	HiddenPhrase []string
+	phrase           []string
+	AskedLetters     []string
+	DiscoveredPhrase []string
+	Mistakes         int
+
+	userIndex   int
+	CurrentUser *User
 }
 
-func NewSession(phrase string) Session {
+func NewSession(phrase string) *Session {
 	sessionName := petname.Generate(3, "-")
+	p := strings.Split(phrase, "")
 
 	s := Session{
-		id:    lastSessionId,
-		Name:  sessionName,
-		Users: []User{},
+		id:               lastSessionId,
+		Name:             sessionName,
+		Users:            make([]User, 0),
+		phrase:           p,
+		AskedLetters:     []string{},
+		DiscoveredPhrase: make([]string, len(p)),
+		Mistakes:         0,
+		userIndex:        0,
+		CurrentUser:      nil,
 	}
 
 	sessionStorage = append(sessionStorage, s)
-	nameToSession[sessionName] = &s
+	nameToSession[sessionName] = &sessionStorage[len(sessionStorage)-1]
 	lastSessionId++
 
-	return s
+	return &sessionStorage[len(sessionStorage)-1]
 }
 
-func GetSession(name string) *Session {
-	return nameToSession[name]
+func GetSession(name string) (*Session, error) {
+	s, ok := nameToSession[name]
+	if !ok {
+		return s, errors.New("can't find session " + name)
+	}
+
+	return s, nil
 }
 
-func (s *Session) AddUser(user User) {
+func (s *Session) AddUser(user User) *User {
 	s.Users = append(s.Users, user)
+
+	// fmt.Printf("#### Adding %v:\t%p\n", s.Users[len(s.Users)-1].Name, &(s.Users[len(s.Users)-1]))
+	// append changes the pointers to the users because it needs to resize that slice
+	s.CurrentUser = &(s.Users[s.userIndex])
+	return &(s.Users[len(s.Users)-1])
 }
 
-func (s Session) VerifySignature(signature string, message []byte) *User {
-	for _, u := range s.Users {
-		sig, _ := base64.StdEncoding.DecodeString(signature)
+func (s *Session) VerifySignature(signature string, message []byte) (*User, error) {
+	sig, err := base64.StdEncoding.DecodeString(signature)
+	if err != nil {
+		return nil, err
+	}
 
-		if ed25519.Verify(u.PublicKey, message, sig) {
-			return &u
+	for i := range s.Users {
+		// fmt.Printf("looking %v:\t%p\n", s.Users[i].Name, &(s.Users[i]))
+
+		if ed25519.Verify(s.Users[i].PublicKey, message, sig) {
+			return &s.Users[i], nil
 		}
 	}
 
-	return nil
+	return nil, errors.New("this user was not fount in the current session")
+}
+
+func (s *Session) GuessLetter(letter string) (*Session, error) {
+	letter = strings.ToLower(letter)
+	if len(letter) != 1 {
+		return s, errors.New("the letter needs to have a length of one")
+	}
+	for _, asked := range s.AskedLetters {
+		if letter == asked {
+			return s, errors.New("the letter " + letter + " was already asked")
+		}
+	}
+
+	s.AskedLetters = append(s.AskedLetters, letter)
+
+	found := false
+	for i, l := range s.phrase {
+		if l == letter {
+			found = true
+			s.DiscoveredPhrase[i] = s.phrase[i]
+		}
+	}
+
+	if !found {
+		s.Mistakes++
+	}
+
+	s.userIndex = (s.userIndex + 1) % len(s.Users)
+	s.CurrentUser = &s.Users[s.userIndex]
+
+	return s, nil
+}
+
+func (s *Session) GetUserByName(name string) (*User, error) {
+	for _, u := range s.Users {
+		if u.Name == name {
+			return &u, nil
+		}
+	}
+
+	return nil, errors.New("nu user with the name " + name + " found in " + s.Name)
 }

internal/game/user.go

@@ -8,12 +8,3 @@ type User struct {
 	Name      string
 	PublicKey ed25519.PublicKey
 }
-
-func NewUser(name string, publicKey ed25519.PublicKey) User {
-	// ed25519
-
-	return User{
-		Name:      name,
-		PublicKey: publicKey,
-	}
-}

internal/rest_handler/create_session.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"gitea.elara.ws/Hazel/hangman/internal/game"
-	"gitea.elara.ws/Hazel/hangman/internal/words"
+	"gitea.elara.ws/Hazel/words"
 	"github.com/labstack/echo/v4"
 )
 
 func CreateSession(c echo.Context) error {
-	s := game.NewSession(words.GetRandomWord())
+	s := game.NewSession(words.Words.GetRandomWord())
 	return c.JSON(http.StatusOK, s)
 }

internal/rest_handler/create_user.go

@@ -9,7 +9,10 @@ import (
 )
 
 func CreateUser(c echo.Context) error {
-	session := game.GetSession(c.Param("session"))
+	session, err := game.GetSession(c.Param("session"))
+	if err != nil {
+		return c.String(http.StatusBadRequest, err.Error())
+	}
 
 	type BodyContent struct {
 		Name      string
@@ -17,14 +20,23 @@ func CreateUser(c echo.Context) error {
 	}
 	var bodyContent BodyContent
 
-	err := c.Bind(&bodyContent)
+	err = c.Bind(&bodyContent)
 	if err != nil {
 		return c.String(http.StatusBadRequest, err.Error())
 	}
 
-	pub, _ := base64.StdEncoding.DecodeString(bodyContent.PublicKey)
-	user := game.NewUser(bodyContent.Name, pub)
-	session.AddUser(user)
+	pub, err := base64.StdEncoding.DecodeString(bodyContent.PublicKey)
+	if err != nil {
+		return c.String(http.StatusBadRequest, err.Error())
+	}
 
-	return c.JSON(http.StatusOK, user)
+	user := session.AddUser(game.User{
+		Name: bodyContent.Name,
+		PublicKey: pub,
+	})
+
+	return c.JSON(http.StatusOK, ResponseData{
+		Session: session,
+		User: user,
+	})
 }

internal/rest_handler/guess_letter.go

@@ -0,0 +1,39 @@
+package rest_handler
+
+import (
+	"net/http"
+
+	"github.com/labstack/echo/v4"
+)
+
+func GuessLetter(c echo.Context) error {
+	session, user, err := GetData(c)
+
+	if err != nil {
+		return c.String(http.StatusBadRequest, err.Error())
+	}
+
+	if session.CurrentUser != user {
+		return c.String(http.StatusBadRequest, "It's not the turn of user "+user.Name+". It's the turn of "+session.CurrentUser.Name+".")
+	}
+
+	type BodyContent struct {
+		Guess string
+	}
+	var bodyContent BodyContent
+
+	err = c.Bind(&bodyContent)
+	if err != nil {
+		return c.String(http.StatusBadRequest, err.Error())
+	}
+
+	_, err = session.GuessLetter(bodyContent.Guess)
+	if err != nil {
+		return c.String(http.StatusBadRequest, err.Error())
+	}
+
+	return c.JSON(http.StatusOK, ResponseData{
+		User: user,
+		Session: session,
+	})
+}

internal/rest_handler/helper.go

@@ -0,0 +1,35 @@
+package rest_handler
+
+import (
+	"bytes"
+	"io"
+
+	"gitea.elara.ws/Hazel/hangman/internal/game"
+	"github.com/labstack/echo/v4"
+)
+
+type ResponseData struct{
+	Session *game.Session
+	User *game.User
+}
+
+func GetData(c echo.Context) (*game.Session, *game.User, error) {
+	session, err := game.GetSession(c.Param("session"))
+	if err != nil {
+		return session, nil, err
+	}
+
+	sig := c.Request().Header.Get("signature")
+	body, _ := io.ReadAll(c.Request().Body)
+
+	user, err := session.VerifySignature(sig, body)
+	if err != nil {
+		return session, user, err
+	}
+
+	c.Request().Body = io.NopCloser(bytes.NewBuffer(body))
+
+	// fmt.Printf("user %v:\t%p\n", user.Name, user)
+
+	return session, user, nil
+}

internal/rest_handler/test_auth.go

@@ -1,8 +1,6 @@
 package rest_handler
 
 import (
-	"fmt"
-	"io"
 	"net/http"
 
 	"gitea.elara.ws/Hazel/hangman/internal/game"
@@ -10,30 +8,17 @@ import (
 )
 
 func TestAuth(c echo.Context) error {
-	session := game.GetSession(c.Param("session"))
-
 	type TestResults struct {
-		SignatureValid bool
-		User           *string
+		Session *game.Session
+		User    *game.User
+		Error   error
 	}
 
-	sig := c.Request().Header.Get("signature")
-	body, _ := io.ReadAll(c.Request().Body)
-	fmt.Println(sig)
+	session, user, err := GetData(c)
 
-	u := session.VerifySignature(sig, body)
-	var resp TestResults
-	if u == nil {
-		resp = TestResults{
-			SignatureValid: false,
-			User:           nil,
-		}
-	} else {
-		resp = TestResults{
-			SignatureValid: true,
-			User:           &u.Name,
-		}
-	}
-
-	return c.JSON(http.StatusOK, resp)
+	return c.JSON(http.StatusOK, TestResults{
+		Session: session,
+		User:    user,
+		Error:   err,
+	})
 }

internal/words/get_words.go

@@ -1,10 +0,0 @@
-package words
-
-import (
-	"math/rand/v2"
-)
-
-func GetRandomWord() string {
-	// https://stackoverflow.com/a/22876612/16804841
-	return Words[rand.IntN(len(Words))]
-}

main.go

@@ -1,49 +1,25 @@
 package main
 
 import (
-	"errors"
 	"fmt"
-	"io"
-	"text/template"
 
 	"gitea.elara.ws/Hazel/hangman/internal/rest_handler"
 	"gitea.elara.ws/Hazel/hangman/internal/view_handler"
-	"gitea.elara.ws/Hazel/hangman/internal/words"
+	"gitea.elara.ws/Hazel/hangman/internal/websocket_handler"
 	"github.com/labstack/echo/v4"
 )
 
-type TemplateRegistry struct {
-	templates map[string]*template.Template
-}
-
-// Implement e.Renderer interface
-func (t *TemplateRegistry) Render(w io.Writer, name string, data interface{}, c echo.Context) error {
-	tmpl, ok := t.templates[name]
-	if !ok {
-		err := errors.New("Template not found -> " + name)
-		return err
-	}
-	return tmpl.ExecuteTemplate(w, "base.html", data)
-}
-
 func main() {
-	fmt.Println(words.GetRandomWord())
-	return
-
 	fmt.Println("wanna play hangman? Well ya cant since it isn't implemented yet..")
 
 	e := echo.New()
 
-	templates := make(map[string]*template.Template)
-	templates["create_session"] = template.Must(template.ParseFiles("templates/create_session.html", "templates/base.html"))
-	templates["create_user"] = template.Must(template.ParseFiles("templates/create_user.html", "templates/base.html"))
-	e.Renderer = &TemplateRegistry{
-		templates: templates,
-	}
-
 	e.POST("/api/session", rest_handler.CreateSession)
 	e.POST("/api/:session/user", rest_handler.CreateUser)
 	e.POST("/api/:session/test-auth", rest_handler.TestAuth)
+	e.POST("/api/:session/guess", rest_handler.GuessLetter)
+
+	e.GET("/ws/:session/:user", websocket_handler.UserWS)
 
 	e.GET("/", view_handler.CreateSession)
 	e.GET("/:name", view_handler.CreateUser)

python_frontend/frontend.py

@@ -28,14 +28,20 @@ class User:
 
     def __repr__(self) -> str:
         return f"User({self.name})"
-    
+
 
     def test_auth(self):
         r = self.signed_request("/test-auth", {
             "foo": "bar"
         })
         print(r.content)
-    
+
+    def guess(self, letter: str):
+        r = self.signed_request("/guess", {
+            "Guess": letter
+        })
+        print(r.content)
+
     def signed_request(self, endpoint: str, body: dict) -> requests.Response:
         payload = json.dumps(body).encode("utf-8")
 
@@ -51,51 +57,64 @@ class User:
         )
 
 
-class Session:
+class Game:
     def __init__(self) -> None:
-        data = requests.post(BASE_URL + "/session").json()
-        self.name = data["Name"]
-        self.users: List[User] = []
+        self.session_name = input("session: ").strip().lower()
+
+        if self.session_name == "":
+            data = requests.post(BASE_URL + "/session").json()
+            self.session_name = data["Name"]
+
+        print(f"playing with session {self.session_name}")
+
+        self.user_name = input("name: ").strip()
+
+        self.signing_key = SigningKey.generate()
+        r = requests.post(BASE_URL + f"/{self.session_name}/user", json={
+            "Name": self.user_name,
+            "PublicKey": base64.b64encode(self.signing_key.verify_key.__bytes__()).decode("ascii")
+        })
+
+        self.last_turn = r.json()
 
     def __repr__(self) -> str:
-        return f"Session({self.name})"
+        return f"Game({self.session_name}, {self.user_name})"
 
-    def add_user(self, name: str) -> User:
-        u = User(session=self, name=name)
-        self.users.append(u)
-        return u
+    def print_turn(self, data: dict):
+        print()
+        print(" ".join(c if c != '' else '_' for c in data["Session"]["DiscoveredPhrase"]))
+        print(f"guessed: {','.join(data['Session']['AskedLetters'])}")
+
+    def guess(self):
+        self.print_turn(self.last_turn)
+        self.send_guess(input(f"{self.user_name}: ").strip())
+
+    def send_guess(self, letter: str):
+        data = self.signed_request("/guess", {
+            "Guess": letter
+        }).json()
+
+        self.last_turn = data
+
+    def signed_request(self, endpoint: str, body: dict) -> requests.Response:
+        payload = json.dumps(body).encode("utf-8")
+
+        signature = self.signing_key.sign(payload)
+
+        return requests.post(
+            url=BASE_URL+f"/{self.session_name}"+endpoint,
+            data=payload,
+            headers={
+                "Content-Type": "application/json",
+                "signature": base64.b64encode(signature.signature).decode("ascii")
+            }
+        )
 
 
-def build_word_dict():
-    lines = [
-        """package words
 
-var Words []string = []string{"""
-    ]
-
-    with open("/usr/share/dict/words", "r") as f:
-        for l in f.readlines():
-            l = l.strip()
-            if not l.isalpha():
-                continue
-            lines.append(f'\t"{l}",')
-    
-    lines.append("}")
-
-    with open("internal/words/dictionary.go", "w") as f:
-        f.write("\n".join(lines))
-
-    exit()
-    
 
 if __name__ == "__main__":
+    g = Game()
 
-    build_word_dict()
-
-    s = Session()
-    print(s)
-    s.add_user(name="Hazel")
-    u = s.add_user(name="OtherHazel")
-    print(u)
-
-    u.test_auth()
+    while True:
+        g.guess()

python_frontend/test.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+
+from typing import List
+import requests
+from nacl.signing import SigningKey, VerifyKey
+import base64
+
+import json
+
+
+BASE_URL = "http://localhost:1323/api"
+
+
+class User:
+    def __init__(self, session: Session, name: str) -> None:
+        self.session = session
+        self.name = name
+
+        self.signing_key = SigningKey.generate()
+
+        r = requests.post(BASE_URL + f"/{self.session.name}/user", json={
+            "Name": name,
+            "PublicKey": base64.b64encode(self.signing_key.verify_key.__bytes__()).decode("ascii")
+        })
+
+        data = r.json()
+        print(json.dumps(data, indent=4))
+
+    def __repr__(self) -> str:
+        return f"User({self.name})"
+    
+
+    def test_auth(self):
+        r = self.signed_request("/test-auth", {
+            "foo": "bar"
+        })
+        print(r.content)
+
+    def guess(self, letter: str):
+        r = self.signed_request("/guess", {
+            "Guess": letter
+        })
+        print(r.content)
+    
+    def signed_request(self, endpoint: str, body: dict) -> requests.Response:
+        payload = json.dumps(body).encode("utf-8")
+
+        signature = self.signing_key.sign(payload)
+
+        return requests.post(
+            url=BASE_URL+f"/{self.session.name}"+endpoint,
+            data=payload,
+            headers={
+                "Content-Type": "application/json",
+                "signature": base64.b64encode(signature.signature).decode("ascii")
+            }
+        )
+
+
+class Session:
+    def __init__(self) -> None:
+        data = requests.post(BASE_URL + "/session").json()
+        self.name = data["Name"]
+        self.users: List[User] = []
+
+    def __repr__(self) -> str:
+        return f"Session({self.name})"
+
+    def add_user(self, name: str) -> User:
+        u = User(session=self, name=name)
+        self.users.append(u)
+        return u
+
+
+def build_word_dict():
+    lines = [
+        """package words
+
+var Words []string = []string{"""
+    ]
+
+    with open("/usr/share/dict/words", "r") as f:
+        for l in f.readlines():
+            l = l.strip()
+            if not l.isalpha():
+                continue
+            lines.append(f'\t"{l}",')
+    
+    lines.append("}")
+
+    with open("internal/words/dictionary.go", "w") as f:
+        f.write("\n".join(lines))
+
+    exit()
+    
+
+if __name__ == "__main__":
+    s = Session()
+    print(s)
+    a = s.add_user(name="Hazel_1")
+    b = s.add_user(name="Hazel_2")
+    c = s.add_user(name="Hazel_3")
+    
+    a.guess("a")
+    b.guess("e")
+    c.guess("i")
+    a.guess("o")
+    b.guess("u")