Compare commits

...

11 Commits

Author SHA1 Message Date
Bel LaPointe
001fef8bbc ?room s 2025-10-15 00:12:19 -06:00
Bel LaPointe
a9004c38af remove quote file 2025-10-14 23:59:46 -06:00
bel
b34c980ea5 fade old text 2025-10-14 23:46:48 -06:00
bel
78fd4fd28b not sure what is left but ship 2025-10-14 23:37:15 -06:00
bel
b89d8e3d3f no log 2025-10-14 23:30:04 -06:00
bel
c4a21861cd listen 2025-10-14 23:28:44 -06:00
bel
d5c3a52215 sender can choose voice and pitch and rate 2025-10-14 23:21:24 -06:00
bel
bc1f7779d7 less ew to look at 2025-10-14 22:49:40 -06:00
bel
49880c837d love 2025-10-14 22:13:55 -06:00
bel
4dd5a40dfe ew 2025-10-14 22:09:16 -06:00
bel
13b583a77e a chat room 2025-10-14 22:04:30 -06:00
6 changed files with 233 additions and 87 deletions

2
go.mod
View File

@@ -6,3 +6,5 @@ require (
github.com/gorilla/websocket v1.5.3 github.com/gorilla/websocket v1.5.3
golang.org/x/time v0.14.0 golang.org/x/time v0.14.0
) )
require github.com/google/uuid v1.6.0 // indirect

2
go.sum
View File

@@ -1,3 +1,5 @@
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= 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/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=

View File

@@ -2,76 +2,157 @@
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">
<script> <script>
window.addEventListener("load", function(evt) { window.addEventListener("load", function(evt) {
var output = document.getElementById("output"); var output = document.getElementById("output");
var input = document.getElementById("input"); var input = document.getElementById("input");
var ws; var ws;
var print = function(message) { var print = function(message) {
var d = document.createElement("div"); var before = output.innerHTML.split("<br>");
d.textContent = message; before.unshift(`<span>${new Date().toLocaleTimeString()} | ${message}</span>`);
output.appendChild(d); if (before.length > 20) {
output.scroll(0, output.scrollHeight); before = before.slice(0, 20);
}
var after = before.join("<br>");
output.innerHTML = after;
output.scroll(0, 0);
}; };
document.getElementById("open").onclick = function(evt) { const synth = window.speechSynthesis;
if (ws) { const voices = synth.getVoices().sort(function (a, b) {
return false; const aname = a.name.toUpperCase();
const bname = b.name.toUpperCase();
if (aname < bname) {
return -1;
} else if (aname == bname) {
return 0;
} else {
return +1;
} }
ws = new WebSocket("ws://"+window.location.host+"/ws"); });
var voices_idx = 0;
{
var ele = document.getElementById("voices");
for(var i in voices) {
var voice = voices[i];
const opt = document.createElement("input");
opt.type = "radio";
opt.name = "voice";
opt.id = `voices-${i}-${voice.name}`
opt.value = i;
const label = document.createElement("label");
label.for = opt.id;
label.textContent = voice.name;
ele.appendChild(opt);
ele.appendChild(label);
ele.appendChild(document.createElement("br"));
}
}
ws = new WebSocket("ws://"+window.location.host+"/ws"+window.location.search);
ws.onopen = function(evt) { ws.onopen = function(evt) {
print("OPEN"); print("READY");
} }
ws.onclose = function(evt) { ws.onclose = function(evt) {
print("CLOSE"); print("CLOSE");
ws = null; ws = null;
} }
ws.onmessage = function(evt) { ws.onmessage = function(evt) {
print("RESPONSE: " + evt.data); console.log("evt.data:", evt.data)
const data = JSON.parse(evt.data);
const utterThis = new SpeechSynthesisUtterance(data.Text);
const idx = data.VoiceIdx || 0;
utterThis.voice = voices[idx];
if (data.Pitch) {
utterThis.pitch = data.Pitch
}
if (data.Rate) {
utterThis.rate = data.Rate
}
window.speechSynthesis.speak(utterThis);
print(data.Text);
} }
ws.onerror = function(evt) { ws.onerror = function(evt) {
print("ERROR: " + evt.data); print("ERROR: " + evt.data);
} }
return false;
};
document.getElementById("send").onclick = function(evt) { document.getElementById("send").onclick = function(evt) {
if (!ws) { if (!ws || !input.value) {
return false; return false;
} }
print("SEND: " + input.value);
ws.send(input.value);
return false;
};
document.getElementById("close").onclick = function(evt) { var voiceIdx = "0";
if (!ws) { var voiceEles = document.getElementsByName("voice");
return false; for (var i = 0; i < voiceEles.length; i++)
if (voiceEles[i].checked)
voiceIdx = voiceEles[i].value;
const data = JSON.stringify({
"Text": input.value,
"Pitch": Number.parseInt(document.getElementById("pitch").value, 10),
"Rate": Number.parseFloat(document.getElementById("rate").value, 10),
"VoiceIdx": Number.parseInt(voiceIdx, 10),
});
ws.send(data);
print("SENT: " + input.value);
input.value = "";
if (document.getElementById("listen").checked) {
ws.onmessage({data: data});
} }
ws.close();
return false; return false;
}; };
}); });
</script> </script>
<style>
#output > span {
opacity: 0.33;
}
#output > span:nth-child(1) {
opacity: 1;
}
#output > span:nth-child(2)
, #output > span:nth-child(3)
{
opacity: 0.66;
}
</style>
</head> </head>
<body> <body>
<table> <div style="width: 80%; height: 80%; margin: auto; display: flex; flex-direction: row;">
<tr><td valign="top" width="50%"> <div style="display: flex; flex-direction: column;">
<p>Click "Open" to create a connection to the server, <form style="flex-grow: 1;">
"Send" to send a message to the server and "Close" to close the connection. <p><input id="input" type="textarea" value="" autofocus style="width: 80%">
You can change the message and send multiple times.
<p> <p>
<form>
<button id="open">Open</button>
<button id="close">Close</button>
<p><input id="input" type="text" value="Hello world!">
<button id="send">Send</button> <button id="send">Send</button>
</form> </form>
</td><td valign="top" width="50%"> <div>
<div id="output" style="max-height: 70vh;overflow-y: scroll;"></div> <form id="voices"></form>
</td></tr></table>
<input id="pitch" type="number" value="0"/>
<label for="pitch">pitch</label></br>
<input id="rate" type="number" value="0"/>
<label for="rate">rate</label></br>
<input id="listen" type="checkbox" />
<label for="listen">listen</label></br>
</div>
</div>
<div id="output" style="flex-grow: 1; overflow-y: scroll;"></div>
</div>
</body> </body>
</html> </html>

9
src/server/message.go Normal file
View File

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

View File

@@ -5,13 +5,15 @@ import (
"net/http" "net/http"
) )
type Server struct{} type Server struct {
sessions []*session
func NewServer() Server {
return Server{}
} }
func (s Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { func NewServer() *Server {
return &Server{}
}
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path { switch r.URL.Path {
case "/ws": case "/ws":
if err := s.WS(w, r); err != nil { if err := s.WS(w, r); err != nil {
@@ -22,12 +24,37 @@ func (s Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
} }
func (s Server) WS(w http.ResponseWriter, r *http.Request) error { func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
sess, err := newSession(w, r) sess, err := newSession(w, r, nil)
if err != nil { if err != nil {
return err return err
} }
defer sess.Close() 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 {
select {
case s.sessions[i].scatterc <- m:
case <-s.sessions[i].ctx.Done():
}
}
}
return nil
}
s.sessions = append(s.sessions, sess)
defer func() {
for i := range s.sessions {
if s.sessions[i].id == sess.id {
s.sessions = append(s.sessions[:i], s.sessions[i+1:]...)
return
}
}
}()
return sess.Run() return sess.Run()
} }

View File

@@ -2,10 +2,12 @@ package server
import ( import (
"context" "context"
"encoding/json"
"log" "log"
"net/http" "net/http"
"sync" "sync"
"github.com/google/uuid"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"golang.org/x/time/rate" "golang.org/x/time/rate"
) )
@@ -15,17 +17,25 @@ type session struct {
can context.CancelFunc can context.CancelFunc
ws *websocket.Conn ws *websocket.Conn
wg sync.WaitGroup wg sync.WaitGroup
cb func(message) error
id string
scatterc chan (message)
room string
} }
var upgrader = websocket.Upgrader{} var upgrader = websocket.Upgrader{}
func newSession(w http.ResponseWriter, r *http.Request) (*session, error) { func newSession(w http.ResponseWriter, r *http.Request, cb func(message) error) (*session, error) {
c, err := upgrader.Upgrade(w, r, nil) c, err := upgrader.Upgrade(w, r, nil)
ctx, can := context.WithCancel(r.Context()) ctx, can := context.WithCancel(r.Context())
return &session{ return &session{
ctx: ctx, ctx: ctx,
can: can, can: can,
ws: c, ws: c,
cb: cb,
id: uuid.New().String(),
scatterc: make(chan message, 20),
room: r.URL.Query().Get("room"),
}, err }, err
} }
@@ -50,18 +60,33 @@ func (s *session) Run() error {
func (s *session) gather() { func (s *session) gather() {
s.while(func() error { s.while(func() error {
mt, message, err := s.ws.ReadMessage() mt, msg, err := s.ws.ReadMessage()
if err != nil { if err != nil {
return err return err
} }
log.Println(" read:", mt, message) // TODO if mt != 1 {
return nil return nil
}
var m message
if err := json.Unmarshal(msg, &m); err != nil {
return err
}
m.room = s.room
return s.cb(m)
}) })
} }
func (s *session) scatter() { func (s *session) scatter() {
s.while(func() error { s.while(func() error {
return s.ws.WriteMessage(1, []byte("message")) // TODO select {
case m := <-s.scatterc:
b, _ := json.Marshal(m)
return s.ws.WriteMessage(1, b)
case <-s.ctx.Done():
return s.ctx.Err()
}
}) })
} }