Compare commits

..

3 Commits

Author SHA1 Message Date
Bel LaPointe
215efcd63f tell users how many in lobby on join/leave 2025-10-15 00:27:08 -06:00
Bel LaPointe
58d8b03c59 wss or ws 2025-10-15 00:20:54 -06:00
Bel LaPointe
9a44380d45 go 2025-10-15 00:13:26 -06:00
3 changed files with 59 additions and 22 deletions

View File

@@ -57,7 +57,7 @@
}
}
ws = new WebSocket("ws://"+window.location.host+"/ws"+window.location.search);
ws = new WebSocket(`${window.location.protocol == "https:" ? "wss" : "ws"}://${window.location.host}/ws${window.location.search}`);
ws.onopen = function(evt) {
print("READY");
}
@@ -69,21 +69,25 @@
console.log("evt.data:", evt.data)
const data = JSON.parse(evt.data);
const utterThis = new SpeechSynthesisUtterance(data.Text);
if (data.Text) {
const utterThis = new SpeechSynthesisUtterance(data.Text);
const idx = data.VoiceIdx || 0;
utterThis.voice = voices[idx];
const idx = data.VoiceIdx || 0;
utterThis.voice = voices[idx];
if (data.Pitch) {
utterThis.pitch = data.Pitch
if (data.Pitch) {
utterThis.pitch = data.Pitch
}
if (data.Rate) {
utterThis.rate = data.Rate
}
window.speechSynthesis.speak(utterThis);
print(data.Text);
} else if (data.QuietText) {
print(data.QuietText);
}
if (data.Rate) {
utterThis.rate = data.Rate
}
window.speechSynthesis.speak(utterThis);
print(data.Text);
}
ws.onerror = function(evt) {
print("ERROR: " + evt.data);

View File

@@ -1,9 +1,10 @@
package server
type message struct {
Text string
Pitch int
Rate float64
VoiceIdx int
room string
Text string
QuietText string
Pitch int
Rate float64
VoiceIdx int
room string
}

View File

@@ -1,6 +1,7 @@
package server
import (
"fmt"
"log"
"net/http"
)
@@ -31,9 +32,6 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
}
defer sess.Close()
log.Println("someone has joined", sess.room)
defer log.Println("someone has left", sess.room)
sess.cb = func(m message) error {
for i := range s.sessions {
if s.sessions[i].id != sess.id && s.sessions[i].room == sess.room {
@@ -46,8 +44,42 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
return nil
}
s.sessions = append(s.sessions, sess)
func() {
s.sessions = append(s.sessions, sess)
n := 0
for i := range s.sessions {
if s.sessions[i].room == sess.room {
n += 1
}
}
for i := range s.sessions {
if s.sessions[i].room == sess.room {
if s.sessions[i].id == sess.id {
s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("you have joined %v people", n-1)}
} else {
s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("there is now %v people", n)}
}
}
}
}()
defer func() {
n := 0
for i := range s.sessions {
if s.sessions[i].room == sess.room {
n += 1
}
}
n -= 1
for i := range s.sessions {
if s.sessions[i].room == sess.room {
if s.sessions[i].id == sess.id {
} else {
s.sessions[i].scatterc <- message{QuietText: fmt.Sprintf("there is now %v people", n)}
}
}
}
for i := range s.sessions {
if s.sessions[i].id == sess.id {
s.sessions = append(s.sessions[:i], s.sessions[i+1:]...)