Compare commits

..

3 Commits

Author SHA1 Message Date
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 149 additions and 91 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

@@ -1,77 +1,78 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<script> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
window.addEventListener("load", function(evt) { <meta name="viewport" content="width=device-width" />
<script>
window.addEventListener("load", function(evt) {
var output = document.getElementById("output");
var input = document.getElementById("input");
var ws;
var output = document.getElementById("output"); var print = function(message) {
var input = document.getElementById("input"); var d = document.createElement("div");
var ws; d.textContent = message;
output.appendChild(d);
output.scroll(0, output.scrollHeight);
};
var print = function(message) { ws = new WebSocket("ws://"+window.location.host+"/ws");
var d = document.createElement("div"); ws.onopen = function(evt) {
d.textContent = message; print("OPEN");
output.appendChild(d); }
output.scroll(0, output.scrollHeight); ws.onclose = function(evt) {
}; print("CLOSE");
ws = null;
}
ws.onmessage = function(evt) {
const synth = window.speechSynthesis;
const voices = synth.getVoices().sort(function (a, b) {
const aname = a.name.toUpperCase();
const bname = b.name.toUpperCase();
document.getElementById("open").onclick = function(evt) { if (aname < bname) {
if (ws) { return -1;
return false; } else if (aname == bname) {
} return 0;
ws = new WebSocket("ws://"+window.location.host+"/ws"); } else {
ws.onopen = function(evt) { return +1;
print("OPEN"); }
} });
ws.onclose = function(evt) { const idx = false ? 0 : voices.length-1;
print("CLOSE");
ws = null;
}
ws.onmessage = function(evt) {
print("RESPONSE: " + evt.data);
}
ws.onerror = function(evt) {
print("ERROR: " + evt.data);
}
return false;
};
document.getElementById("send").onclick = function(evt) { const utterThis = new SpeechSynthesisUtterance(evt.data);
if (!ws) { utterThis.voice = voices[idx];
return false; //utterThis.pitch = 10;
} //utterThis.rate = 10;
print("SEND: " + input.value); window.speechSynthesis.speak(utterThis);
ws.send(input.value); print("RESPONSE: " + evt.data);
return false; }
}; ws.onerror = function(evt) {
print("ERROR: " + evt.data);
}
document.getElementById("close").onclick = function(evt) { document.getElementById("send").onclick = function(evt) {
if (!ws) { if (!ws || !input.value) {
return false; return false;
} }
ws.close(); ws.send(JSON.stringify({
return false; "text": input.value
}; }));
print("SENT: " + input.value);
}); input.value = "";
</script> return false;
</head> };
<body> });
<table> </script>
<tr><td valign="top" width="50%"> </head>
<p>Click "Open" to create a connection to the server, <body>
"Send" to send a message to the server and "Close" to close the connection. <div style="width: 80%; height: 80%; margin: auto; display: flex; flex-direction: row;">
You can change the message and send multiple times. <form style="flex-grow: 1;">
<p> <p><input id="input" type="text" value="" autofocus>
<form> <button id="send">Send</button>
<button id="open">Open</button> </form>
<button id="close">Close</button> <div id="output" style="flex-grow: 1; overflow-y: scroll;"></div>
<p><input id="input" type="text" value="Hello world!"> </div>
<button id="send">Send</button> </body>
</form>
</td><td valign="top" width="50%">
<div id="output" style="max-height: 70vh;overflow-y: scroll;"></div>
</td></tr></table>
</body>
</html> </html>

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

@@ -0,0 +1,5 @@
package server
type message struct {
Text 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,35 @@ 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()
sess.cb = func(m message) error {
log.Printf("cbing to all other sessions %+v", m)
for i := range s.sessions {
if s.sessions[i].id != sess.id {
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,30 +2,38 @@ 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"
) )
type session struct { type session struct {
ctx context.Context ctx context.Context
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)
} }
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),
}, err }, err
} }
@@ -50,18 +58,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
}
log.Printf("gathered %+v", m)
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:
log.Printf("scattering %+v", m)
return s.ws.WriteMessage(1, []byte(m.Text))
case <-s.ctx.Done():
return s.ctx.Err()
}
}) })
} }