diff --git a/README.md b/README.md index e7d60ff..772c94b 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,25 @@ Make sure you place it in a folder of its own. It will create a subfolder to hol Default (no arguments) mode will launch into jukebox mode, playing random Bytejams from LCDZ. It can be provided with a JSON file playlist (from remote and local) or .zip file. +The JSON file format looks like: +```JSON +{ + "title": "TIC-80 selected works", + "description": "(with FFT)", // (optional) + "items": [ + { + "location": "https://livecode.demozoo.org/shader_file_sources/2023_05_15_byte_jam_monday_night_bytes/nusan.lua", + "author": "Nusan", // (optional) + "description": "FieldFX Byte Jam - 15/05/2023", // (optional) + "playtime": 30 // (optional) + } + ] +} +``` + +A JSON file can be included in a zip file with the name 'index.json' + + Applications: - To project onto a wall at parties to preach the good TIC and Bytejam words. @@ -142,6 +161,10 @@ For the previous work ByteJammer builds on, testing, good-will, and support: Aldroid, Gasman, Lex Bailey, Mantratronic, NesBox, NuSan, PS, Raccoon Violet, Superogue, Totetmatt. +Additional development: + +zeno4ever. + Thanks to those whose work features on the [walkthrough video](https://youtube.com/watch?v=erhyvrGxwZY): Alia, Aldroid, Dave84, Gasman, Lex Bailey, Gigabates, Mantratronic, NuSan, PS, Superogue, Suule, Synesthesia, TôBach. diff --git a/client-jukebox.go b/client-jukebox.go index 0d5c103..66b80db 100644 --- a/client-jukebox.go +++ b/client-jukebox.go @@ -1,10 +1,15 @@ package main -import "log" +import ( + "log" + "time" -func startClientJukebox(host string, port int, playlist *Playlist) error { - ch := make(chan Msg) - j, err := NewJukebox(playlist, &ch) + "github.com/creativenucleus/bytejammer/comms" +) + +func startClientJukebox(host string, port int, playtime time.Duration, playlist *Playlist) error { + ch := make(chan comms.Msg) + j, err := NewJukebox(playlist, playtime, &ch) if err != nil { return err } @@ -17,18 +22,16 @@ func startClientJukebox(host string, port int, playlist *Playlist) error { go func() { for { - select { - case msg, ok := <-ch: - if ok { - switch msg.Type { - case "tic-state": - // #TODO: line endings for data? UTF-8? - msg := Msg{Type: "tic-state", TicState: msg.TicState} - err = ws.sendData(msg) - if err != nil { - // #TODO: soften! - log.Fatal(err) - } + msg, ok := <-ch + if ok { + switch msg.Type { + case "tic-state": + // #TODO: line endings for data? UTF-8? + msg := comms.Msg{Type: "tic-state", TicState: msg.TicState} + err = ws.sendData(msg) + if err != nil { + // #TODO: soften! + log.Fatal(err) } } } @@ -36,6 +39,9 @@ func startClientJukebox(host string, port int, playlist *Playlist) error { }() j.start() + for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) } } diff --git a/client-panel.go b/client-panel.go index 33d694f..d4185c7 100644 --- a/client-panel.go +++ b/client-panel.go @@ -14,6 +14,7 @@ import ( "github.com/gorilla/websocket" "github.com/tyler-sommer/stick" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/embed" ) @@ -27,9 +28,10 @@ const ( type ClientPanel struct { // #TODO: lock down to receiver only - chSendServerStatus chan ClientServerStatus + chSendClientStatus chan comms.DataClientStatus wsClient *websocket.Conn wsMutex sync.Mutex + chLog chan string } func startClientPanel(port int) error { @@ -50,13 +52,23 @@ func startClientPanel(port int) error { fmt.Printf("In a web browser, go to http://localhost:%d/%s\n", port, session) cp := ClientPanel{ - chSendServerStatus: make(chan ClientServerStatus), + chSendClientStatus: make(chan comms.DataClientStatus), + chLog: make(chan string), } + + go func() { + for { + logMsg := <-cp.chLog + cp.sendLog(logMsg) + } + }() + http.HandleFunc(fmt.Sprintf("/%s", session), cp.webClientIndex) http.HandleFunc(fmt.Sprintf("/%s/api/identity.json", session), cp.webClientApiIdentityJSON) http.HandleFunc(fmt.Sprintf("/%s/api/join-server.json", session), cp.webClientApiJoinServerJSON) http.HandleFunc(fmt.Sprintf("/%s/ws-client", session), cp.wsWebClient()) - if err := webServer.ListenAndServe(); err != nil { + err = webServer.ListenAndServe() + if err != nil { return err } @@ -105,14 +117,16 @@ func (cp *ClientPanel) webClientApiIdentityJSON(w http.ResponseWriter, r *http.R apiOutResponse(w, nil, http.StatusCreated) default: - apiOutErr(w, errors.New("Method not allowed"), http.StatusMethodNotAllowed) + apiOutErr(w, fmt.Errorf("method not allowed"), http.StatusMethodNotAllowed) } } func (cp *ClientPanel) webClientApiJoinServerJSON(w http.ResponseWriter, r *http.Request) { switch r.Method { case "POST": - cp.chSendServerStatus <- ClientServerStatus{isConnected: false} + cp.chLog <- "Request: Join Server" + + cp.chSendClientStatus <- comms.DataClientStatus{IsConnected: false} // #TODO: Cleaner way to do this? type reqType struct { @@ -141,7 +155,7 @@ func (cp *ClientPanel) webClientApiJoinServerJSON(w http.ResponseWriter, r *http return } - err = startClientServerConn(req.Host, port, identity, cp.chSendServerStatus) + err = startClientServerConn(req.Host, port, identity, cp.chSendClientStatus) if err != nil { apiOutErr(w, err, http.StatusInternalServerError) return @@ -149,32 +163,37 @@ func (cp *ClientPanel) webClientApiJoinServerJSON(w http.ResponseWriter, r *http apiOutResponse(w, nil, http.StatusCreated) default: - apiOutErr(w, errors.New("Method not allowed"), http.StatusMethodNotAllowed) + apiOutErr(w, errors.New("method not allowed"), http.StatusMethodNotAllowed) } } func (cp *ClientPanel) wsWebClient() func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { var err error - cp.wsClient, err = wsUpgrader.Upgrade(w, r, nil) + + comms.WsUpgrade(w, r, func(conn *websocket.Conn) error { + cp.wsClient = conn + defer func() { cp.wsClient = nil }() + + go cp.wsRead() + go cp.wsWrite() + + // #TODO: handle exit + for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) + } + }) if err != nil { log.Print("upgrade:", err) return } - defer cp.wsClient.Close() - - go cp.wsRead() - go cp.wsWrite() - - // #TODO: handle exit - for { - } } } func (cp *ClientPanel) wsRead() { for { - var msg Msg + var msg comms.Msg err := cp.wsClient.ReadJSON(&msg) if err != nil { log.Println("read:", err) @@ -196,23 +215,25 @@ func (cp *ClientPanel) wsWrite() { }() */ for { - select { - // case <-done: - // return - // case <-statusTicker.C: - // fmt.Println("TICKER!") - - case status := <-cp.chSendServerStatus: - msg := Msg{Type: "server-status", ServerStatus: status} - err := cp.sendData(&msg) - if err != nil { - // #TODO: relax - log.Fatal(err) - } + status := <-cp.chSendClientStatus + msg := comms.Msg{Type: "client-status", ClientStatus: status} + err := cp.sendData(&msg) + if err != nil { + // #TODO: relax + log.Fatal(err) } } } +func (cp *ClientPanel) sendLog(message string) { + msg := comms.Msg{Type: "log", Log: comms.DataLog{Msg: message}} + + err := cp.sendData(&msg) + if err != nil { + log.Println("read:", err) + } +} + func (cp *ClientPanel) sendData(data interface{}) error { cp.wsMutex.Lock() defer cp.wsMutex.Unlock() diff --git a/client-ws.go b/client-ws.go index c0f3d17..97a069f 100644 --- a/client-ws.go +++ b/client-ws.go @@ -8,6 +8,7 @@ import ( "path/filepath" "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/config" "github.com/creativenucleus/bytejammer/machines" "github.com/creativenucleus/bytejammer/util" @@ -15,18 +16,14 @@ import ( type ClientWS struct { ws *WebSocketLink - chMsg chan Msg + chMsg chan comms.Msg basepath string } -type ClientServerStatus struct { - isConnected bool -} - -func startClientServerConn(host string, port int, identity *Identity, chServerStatus chan ClientServerStatus) error { - chServerStatus <- ClientServerStatus{isConnected: false} +func startClientServerConn(host string, port int, identity *Identity, chServerStatus chan comms.DataClientStatus) error { + chServerStatus <- comms.DataClientStatus{IsConnected: false} cws := ClientWS{ - chMsg: make(chan Msg), + chMsg: make(chan comms.Msg), } cws.basepath = filepath.Clean(fmt.Sprintf("%sclient-data/%s", config.WORK_DIR, util.GetSlugFromTime(time.Now()))) @@ -51,7 +48,7 @@ func startClientServerConn(host string, port int, identity *Identity, chServerSt break } defer cws.ws.Close() - chServerStatus <- ClientServerStatus{isConnected: true} + chServerStatus <- comms.DataClientStatus{IsConnected: true} m, err := machines.LaunchMachine("TIC-80", true, true, false) if err != nil { @@ -65,6 +62,8 @@ func startClientServerConn(host string, port int, identity *Identity, chServerSt // Lock #TODO: use a channel to escape for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) } } @@ -79,7 +78,7 @@ func clientOpenConnection(host string, port int) (*WebSocketLink, error) { func (cws *ClientWS) clientWsReader(tic *machines.Tic, identity *Identity) error { for { - var msg Msg + var msg comms.Msg err := cws.ws.conn.ReadJSON(&msg) if err != nil { log.Fatal(err) @@ -96,7 +95,7 @@ func (cws *ClientWS) clientWsReader(tic *machines.Tic, identity *Identity) error cws.handleChallengeRequest(msg.ChallengeRequest.Challenge, identity) case "tic-state": - tic.WriteImportCode(msg.TicState) + tic.WriteImportCode(msg.TicState.State, true) } } } @@ -107,13 +106,14 @@ func (cws *ClientWS) handleChallengeRequest(challenge string, identity *Identity return err } - fmt.Printf("%x", data) signed, err := identity.Crypto.Sign(data) if err != nil { return err } - cws.chMsg <- Msg{Type: "challenge-response", ChallengeResponse: DataChallengeResponse{Challenge: fmt.Sprintf("%x", signed)}} + cws.chMsg <- comms.Msg{Type: "challenge-response", ChallengeResponse: comms.DataChallengeResponse{ + Challenge: fmt.Sprintf("%x", signed), + }} return nil } @@ -126,9 +126,9 @@ func (cws *ClientWS) clientWsWriter(tic *machines.Tic, identity *Identity) { log.Fatal(err) } - msg := Msg{ + msg := comms.Msg{ Type: "identity", - Identity: DataIdentity{ + Identity: comms.DataIdentity{ Uuid: identity.Uuid.String(), DisplayName: identity.DisplayName, PublicKey: publicKeyRaw, @@ -174,7 +174,9 @@ func (cws *ClientWS) clientWsWriter(tic *machines.Tic, identity *Identity) { } // #TODO: line endings for data? UTF-8? - msg := Msg{Type: "tic-state", TicState: *ticState} + msg := comms.Msg{Type: "tic-state", TicState: comms.DataTicState{ + State: *ticState, + }} err = cws.ws.sendData(msg) if err != nil { log.Fatal(err) diff --git a/msg.go b/comms/msg.go similarity index 59% rename from msg.go rename to comms/msg.go index 3f00616..bc886cf 100644 --- a/msg.go +++ b/comms/msg.go @@ -1,16 +1,15 @@ -package main +package comms -import "github.com/creativenucleus/bytejammer/machines" +import ( + "github.com/creativenucleus/bytejammer/machines" +) type DataLog struct { Msg string } -type MsgTicState struct { - Code []byte - IsRunning bool - CursorX int - CursorY int +type DataClientStatus struct { + IsConnected bool } type DataIdentity struct { @@ -19,6 +18,10 @@ type DataIdentity struct { PublicKey []byte `json:"publicKey"` } +type DataTicState struct { + State machines.TicState +} + type DataCloseMachine struct { Uuid string `json:"uuid"` } @@ -41,35 +44,34 @@ type DataChallengeResponse struct { Challenge string `json:"challenge"` } -type MsgServerStatus struct { - Type string `json:"type"` - Data struct { - Clients []struct { - Uuid string - DisplayName string - ShortUuid string - Status string - MachineUuid string - LastPingTime string - } - Machines []struct { - Uuid string - MachineName string - ProcessID int - Platform string - Status string - ClientUuid string - JammerDisplayName string - LastSnapshotTime string - } - } `json:"data"` +type DataSessionStatus struct { + Port int + Clients []struct { + Uuid string + DisplayName string + ShortUuid string + Status string + MachineUuid string + LastPingTime string + } + Machines []struct { + Uuid string + MachineName string + ProcessID int + Platform string + Status string + ClientUuid string + JammerDisplayName string + LastSnapshotTime string + } } type Msg struct { Type string `json:"type"` Identity DataIdentity `json:"identity,omitempty"` - TicState machines.TicState `json:"tic-state,omitempty"` - ServerStatus ClientServerStatus `json:"server-status,omitempty"` + TicState DataTicState `json:"tic-state,omitempty"` + ClientStatus DataClientStatus `json:"client-status,omitempty"` + SessionStatus DataSessionStatus `json:"session-status,omitempty"` Log DataLog `json:"log,omitempty"` ConnectMachineClient DataConnectMachineClient `json:"connect-machine-client,omitempty"` DisconnectMachineClient DataDisconnectMachineClient `json:"disconnect-machine-client,omitempty"` diff --git a/comms/websocket.go b/comms/websocket.go new file mode 100644 index 0000000..af70b87 --- /dev/null +++ b/comms/websocket.go @@ -0,0 +1,32 @@ +package comms + +import ( + "fmt" + "net/http" + + "github.com/gorilla/websocket" +) + +var ( + WS_UPGRADER = websocket.Upgrader{ + ReadBufferSize: 1024, + WriteBufferSize: 1024, + } +) + +type FnWsConn func(*websocket.Conn) error + +func WsUpgrade(w http.ResponseWriter, r *http.Request, fn FnWsConn) error { + conn, err := WS_UPGRADER.Upgrade(w, r, nil) + if err != nil { + return fmt.Errorf("client couldn't upgrade: %w", err) + } + defer conn.Close() + + err = fn(conn) + if err != nil { + return fmt.Errorf("client connection raised an error: %w", err) + } + + return nil +} diff --git a/embed/tic-code/jukebox.lua b/embed/tic-code/jukebox.lua index b21949f..42b7f28 100644 --- a/embed/tic-code/jukebox.lua +++ b/embed/tic-code/jukebox.lua @@ -46,6 +46,7 @@ function TIC() "LCDZ: Totetmatt, PSEnough", "Additional help: Mantratronic, Violet Procyon", "NuSan, and the Field-FX community", + "Additional dev: zeno4ever", } for t=1,#texts do diff --git a/embed/web/client/index.html b/embed/web/client/index.html index 50f4b41..b3c55ec 100644 --- a/embed/web/client/index.html +++ b/embed/web/client/index.html @@ -17,7 +17,7 @@ const ws = new BjmrWebSocket('{{session_key}}') const ajax = new BjmrAjax('{{session_key}}') - let IDENTITIES = {}; + let IDENTITIES = null; const refreshViewIdentities = () => { const elSelect = document.getElementById("identity-id"); @@ -40,10 +40,27 @@ if (res.ok) { IDENTITIES = res.data; refreshViewIdentities(); + refreshVisibility(); + } + } + + const refreshVisibility = () => { + if (IDENTITIES===null) { + // Not yet initialised + document.getElementById("section-create-identity").style.display = "none"; + document.getElementById("section-join-server").style.display = "none"; + } else if (Object.keys(IDENTITIES).length == 0) { + // Currently, only one identity is supported for clients + document.getElementById("section-create-identity").style.display = "block"; + document.getElementById("section-join-server").style.display = "none"; + } else { + document.getElementById("section-create-identity").style.display = "none"; + document.getElementById("section-join-server").style.display = "block"; } } window.onload = () => { + refreshVisibility(); fetchIdentites(); document.getElementById("create-identity").addEventListener("submit", (e) => { @@ -108,12 +125,12 @@ const msg = JSON.parse(evt.data); console.log(msg) switch(msg.type) { - case "server-status": + case "client-status": // handleMsgServerStatus(msg.data) break; case "log": - handleMsgLog(msg.data); + handleMsgLog(msg.log); break; default: @@ -128,7 +145,7 @@

ByteJammer icon ByteJammer

-
+

Create an Identity

@@ -152,7 +169,7 @@

Create an Identity

-
+

Join a Server

@@ -211,14 +228,14 @@

Join a Server

+
-
-
-

Log

-
-
-
-
+
+
+

Log

+
+
+
diff --git a/embed/web/server/operator.html b/embed/web/server/operator.html index a5d59dc..b616edf 100644 --- a/embed/web/server/operator.html +++ b/embed/web/server/operator.html @@ -17,9 +17,20 @@ const ws = new BjmrWebSocket('{{session_key}}') const ajax = new BjmrAjax('{{session_key}}') + let SERVER = null; let CLIENTS = {}; let MACHINES = {}; + const refreshVisibility = () => { + if (!SERVER) { + document.getElementById("section-create-server").style.display = "block"; + document.getElementById("section-server-info").style.display = "none"; + } else { + document.getElementById("section-create-server").style.display = "none"; + document.getElementById("section-server-info").style.display = "block"; + } + } + const onClickConnectMachine = (machineUuid, clientUuid) => { if (!ws.isOpen()) { return false; @@ -69,7 +80,13 @@ }; const handleMsgServerStatus = (data) => { - let html = ''; + SERVER = true; // (echo settings) + refreshVisibility(); + + let html = `

Port: ${data.Port}

`; + document.getElementById("server-details").innerHTML = html; + + html = ''; if(!data.Clients || data.Clients.length == 0) { html = "
No clients connected
"; } else { @@ -159,6 +176,7 @@ } window.onload = () => { + refreshVisibility(); const conn = ws.open("ws://" + document.location.host + "/{{session_key}}/ws-operator"); if(!conn) { setWsLocalStatusText('error', "Your browser does not support WebSockets"); @@ -189,8 +207,9 @@ conn.onmessage = (evt) => { const msg = JSON.parse(evt.data); switch(msg.type) { - case "server-status": - handleMsgServerStatus(msg.data); + case "session-status": + console.log(msg) + handleMsgServerStatus(msg['session-status']); break; case "log": @@ -256,7 +275,7 @@

ByteJammer icon ByteJammer

-
+

Server

@@ -293,33 +312,44 @@

Server

-
-
-

Jammers

-
-
-
+
+
+
+

Server

+
+
+
+
-
-
-
-

Machines

-
-
-
+
+
+

Jammers

+
+
+
+
-
-
- - + +
+
+

Machines

+
+
+
+
+
+
+ + +
+
-
diff --git a/go.mod b/go.mod index f8422cb..ad659e5 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( github.com/google/uuid v1.3.1 github.com/gorilla/websocket v1.5.0 github.com/gosimple/slug v1.13.1 + github.com/stretchr/testify v1.8.4 github.com/tyler-sommer/stick v1.0.6 github.com/urfave/cli/v2 v2.25.7 golang.org/x/net v0.17.0 @@ -18,8 +19,6 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/stretchr/objx v0.5.0 // indirect - github.com/stretchr/testify v1.8.4 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 5e19ef1..436d2d2 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= @@ -18,13 +17,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tyler-sommer/stick v1.0.6 h1:LLdJ8oGotXCsAuVx2BRZZT6s3bYXHe0ImQ+azF4HtJg= @@ -35,7 +27,7 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/host-panel.go b/host-panel.go index 443de68..be98d8f 100644 --- a/host-panel.go +++ b/host-panel.go @@ -11,7 +11,9 @@ import ( "sync" "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/embed" + "github.com/creativenucleus/bytejammer/server" "github.com/google/uuid" "github.com/gorilla/websocket" "github.com/tyler-sommer/stick" @@ -26,7 +28,7 @@ const statusSendPeriod = 5 * time.Second type HostPanel struct { wsOperator *websocket.Conn wsMutex sync.Mutex - session *JamSession + session *server.Session chLog chan string statusTicker *time.Ticker } @@ -83,29 +85,30 @@ func (hp *HostPanel) webOperator(w http.ResponseWriter, r *http.Request) { func (hp *HostPanel) wsWebOperator() func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { var err error - hp.wsOperator, err = wsUpgrader.Upgrade(w, r, nil) - if err != nil { - log.Print("upgrade:", err) - return - } - defer func() { - hp.wsOperator.Close() - hp.wsOperator = nil - }() + comms.WsUpgrade(w, r, func(conn *websocket.Conn) error { + hp.wsOperator = conn + defer func() { hp.wsOperator = nil }() - go hp.wsOperatorRead() - go hp.wsOperatorWrite() + go hp.wsOperatorRead() + go hp.wsOperatorWrite() - // #TODO: handle exit - for { + // #TODO: handle exit + for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) + } + }) + if err != nil { + log.Print("upgrade:", err) + return } } } func (hp *HostPanel) wsOperatorRead() { for { - var msg Msg + var msg comms.Msg err := hp.wsOperator.ReadJSON(&msg) if err != nil { log.Println("read:", err) @@ -143,6 +146,7 @@ func (hp *HostPanel) wsOperatorWrite() { case <-hp.statusTicker.C: hp.sendServerStatus(false) + // Is this in the right place?... case logMsg := <-hp.chLog: hp.sendLog(logMsg) } @@ -173,22 +177,22 @@ func (hp *HostPanel) webApiServer(w http.ResponseWriter, r *http.Request) { // #TODO: This is not great - return some detail if hp.session != nil { - apiOutErr(w, errors.New("Server already running"), http.StatusBadRequest) + apiOutErr(w, errors.New("server already running"), http.StatusBadRequest) return } - hp.session, err = startJamSession(port, req.SessionName, hp.chLog) + hp.session, err = server.CreateSession(port, req.SessionName, hp.chLog) if err != nil { - hp.chLog <- fmt.Sprintf("Server failed to launch: %s", err) + hp.chLog <- fmt.Sprintf("server failed to launch: %s", err) apiOutErr(w, err, http.StatusInternalServerError) return } - hp.sendLog(fmt.Sprintf("Server launched")) + hp.sendLog("server launched") hp.sendServerStatus(true) default: - apiOutErr(w, errors.New("Method not allowed"), http.StatusMethodNotAllowed) + apiOutErr(w, errors.New("method not allowed"), http.StatusMethodNotAllowed) } } @@ -211,7 +215,7 @@ func (hp *HostPanel) webApiMachine(w http.ResponseWriter, r *http.Request) { switch req.Mode { case "unassigned": - _, err := hp.session.startMachine() + _, err := hp.session.StartMachine() if err != nil { apiOutErr(w, fmt.Errorf("TIC-80 Launch (unassigned): %w", err), http.StatusBadRequest) return @@ -226,7 +230,7 @@ func (hp *HostPanel) webApiMachine(w http.ResponseWriter, r *http.Request) { return } - _, err = hp.session.startMachineForConn(connUuid) + _, err = hp.session.StartMachineForConn(connUuid) if err != nil { apiOutErr(w, fmt.Errorf("TIC-80 Launch (jammer): %w", err), http.StatusBadRequest) return @@ -241,7 +245,7 @@ func (hp *HostPanel) webApiMachine(w http.ResponseWriter, r *http.Request) { return } - err = startLocalJukebox(playlist) + err = startLocalJukebox(playlist, time.Duration(JUKEBOX_PLAYTIME_SECS)*time.Second) if err != nil { apiOutErr(w, err, http.StatusInternalServerError) return @@ -250,14 +254,14 @@ func (hp *HostPanel) webApiMachine(w http.ResponseWriter, r *http.Request) { hp.sendLog("TIC-80 Launched for (playlist)") default: - apiOutErr(w, errors.New("Unexpected mode (should be jammer or jukebox)"), http.StatusBadRequest) + apiOutErr(w, errors.New("unexpected mode (should be jammer or jukebox)"), http.StatusBadRequest) } hp.sendServerStatus(true) apiOutResponse(w, nil, http.StatusCreated) default: - apiOutErr(w, errors.New("Method not allowed"), http.StatusMethodNotAllowed) + apiOutErr(w, errors.New("method not allowed"), http.StatusMethodNotAllowed) } } func (hp *HostPanel) handleStopServer() { @@ -266,7 +270,7 @@ func (hp *HostPanel) handleStopServer() { return } - hp.session.stop() + hp.session.Stop() hp.sendServerStatus(true) } @@ -276,37 +280,37 @@ func (hp *HostPanel) handleIdentifyMachines() { return } - hp.session.identifyMachines() + hp.session.IdentifyMachines() hp.sendServerStatus(true) } -func (hp *HostPanel) handleConnectMachineClient(data DataConnectMachineClient) { +func (hp *HostPanel) handleConnectMachineClient(data comms.DataConnectMachineClient) { if hp.session == nil { hp.chLog <- "Requested connect, but no server is running" return } - hp.session.connectMachineClient(data) + hp.session.ConnectMachineClient(data) hp.sendServerStatus(true) } -func (hp *HostPanel) handleDisconnectMachineClient(data DataDisconnectMachineClient) { +func (hp *HostPanel) handleDisconnectMachineClient(data comms.DataDisconnectMachineClient) { if hp.session == nil { hp.chLog <- "Requested disconnect, but no server is running" return } - hp.session.disconnectMachineClient(data) + hp.session.DisconnectMachineClient(data) hp.sendServerStatus(true) } -func (hp *HostPanel) handleCloseMachine(data DataCloseMachine) { +func (hp *HostPanel) handleCloseMachine(data comms.DataCloseMachine) { if hp.session == nil { hp.chLog <- "Requested close machine, but no server is running" return } - hp.session.closeMachine(data) + hp.session.CloseMachine(data) hp.sendServerStatus(true) } @@ -321,15 +325,19 @@ func (hp *HostPanel) sendServerStatus(resetTicker bool) { hp.statusTicker.Reset(statusSendPeriod) } - status := hp.session.getStatus() - err := hp.sendData(&status) + msg := comms.Msg{ + Type: "session-status", + SessionStatus: hp.session.GetStatus(), + } + + err := hp.sendData(&msg) if err != nil { log.Println("read:", err) } } func (hp *HostPanel) sendLog(message string) { - msg := Msg{Type: "log", Log: DataLog{Msg: message}} + msg := comms.Msg{Type: "log", Log: comms.DataLog{Msg: message}} fmt.Printf("-> HOST PANEL: %s\n", message) err := hp.sendData(&msg) diff --git a/identity.go b/identity.go index 9610ad7..22bb7ef 100644 --- a/identity.go +++ b/identity.go @@ -81,11 +81,11 @@ func getIdentity(uuid string) (*Identity, error) { } if len(filematches) == 0 { - return nil, fmt.Errorf("No identity file found - ensure you've run this program with make-identity first") + return nil, fmt.Errorf("no identity file found - ensure you've run this program with make-identity first") } if len(filematches) > 1 { - return nil, fmt.Errorf("Multiple identity files found - please specify") + return nil, fmt.Errorf("multiple identity files found - please specify") } identityFilePath = filematches[0] diff --git a/jam-session-config.go b/jam-session-config.go deleted file mode 100644 index 1cd235d..0000000 --- a/jam-session-config.go +++ /dev/null @@ -1,16 +0,0 @@ -package main - -type JamSessionConfig struct { - Port int - Name string - Slug string -} - -// JamSessionConfig should be enough to save to disk and restart a JamSession if it crashes -func getJamSessionConfig(js JamSession) JamSessionConfig { - return JamSessionConfig{ - Port: js.port, - Name: js.name, - Slug: js.slug, - } -} diff --git a/jam-session-manager.go b/jam-session-manager.go deleted file mode 100644 index 1f28b9b..0000000 --- a/jam-session-manager.go +++ /dev/null @@ -1,113 +0,0 @@ -package main - -import ( - "errors" - - "github.com/creativenucleus/bytejammer/machines" - "github.com/google/uuid" -) - -type JamSessionManager struct { - machines map[uuid.UUID]*machines.Machine - conns map[uuid.UUID]*JamSessionConn - machineConnMap map[*machines.Machine]*JamSessionConn - - // #TODO: make this work... - // Is this the right level?? - // broadcaster *NusanLauncher -} - -func makeJamSessionManager() *JamSessionManager { - return &JamSessionManager{ - machines: make(map[uuid.UUID]*machines.Machine), - conns: make(map[uuid.UUID]*JamSessionConn), - machineConnMap: make(map[*machines.Machine]*JamSessionConn), - } -} - -// #TODO: Mutexes - -func (m *JamSessionManager) registerMachine(machine *machines.Machine) { - m.machines[machine.Uuid] = machine -} - -func (m *JamSessionManager) unregisterMachine(machine *machines.Machine) { - delete(m.machines, machine.Uuid) -} - -func (m *JamSessionManager) getMachine(uuid uuid.UUID) *machines.Machine { - machine, ok := m.machines[uuid] - if !ok { - return nil - } - return machine -} - -func (m *JamSessionManager) registerConn(conn *JamSessionConn) { - m.conns[conn.connUuid] = conn -} - -func (m *JamSessionManager) unregisterConn(conn *JamSessionConn) { - delete(m.conns, conn.connUuid) -} - -func (m *JamSessionManager) getConn(connUuid uuid.UUID) *JamSessionConn { - conn, ok := m.conns[connUuid] - if !ok { - return nil - } - return conn -} - -// You must register a machine and conn before linking them -func (m *JamSessionManager) linkMachineToConn(machineUuid uuid.UUID, connUuid uuid.UUID) error { - machine := m.getMachine(machineUuid) - if machine == nil { - return errors.New("machine not found") - } - - conn := m.getConn(connUuid) - if conn == nil { - return errors.New("conn not found") - } - - m.machineConnMap[machine] = conn - return nil -} - -// You must unlink a machine and conn before destroying either -func (m *JamSessionManager) unlinkMachineFromConn(machineUuid uuid.UUID, connUuid uuid.UUID) error { - machine := m.getMachine(machineUuid) - if machine == nil { - return errors.New("machine not found") - } - - conn := m.getConn(connUuid) - if conn == nil { - return errors.New("conn not found") - } - - if m.machineConnMap[machine] != conn { - return errors.New("machine does not link to expected conn") - } - - delete(m.machineConnMap, machine) - return nil -} - -func (m *JamSessionManager) getConnForMachine(machine *machines.Machine) *JamSessionConn { - conn, ok := m.machineConnMap[machine] - if !ok { - return nil - } - return conn -} - -func (m *JamSessionManager) getMachineForConn(conn *JamSessionConn) *machines.Machine { - for machine, c := range m.machineConnMap { - if c == conn { - return machine - } - } - return nil -} diff --git a/jam-session.go b/jam-session.go deleted file mode 100644 index 83adac9..0000000 --- a/jam-session.go +++ /dev/null @@ -1,342 +0,0 @@ -package main - -import ( - "encoding/json" - "errors" - "fmt" - "net/http" - "os" - "time" - - "github.com/creativenucleus/bytejammer/config" - "github.com/creativenucleus/bytejammer/machines" - "github.com/creativenucleus/bytejammer/util" - "github.com/google/uuid" -) - -type JamSession struct { - port int - // Our friendly name... - name string - // The slug we can use to saved this config to disk... - slug string - startTime time.Time - - // The connections, machines, and the connections between them - manager *JamSessionManager - - chLog chan string -} - -func startJamSession(port int, name string, chLog chan string) (*JamSession, error) { - nameSlug := util.GetSlug(name) - if nameSlug == "" { - return nil, errors.New("Invalid session name - unable to make slug") - } - - now := time.Now() - js := JamSession{ - port: port, - name: name, - slug: fmt.Sprintf("%s_%s", util.GetSlugFromTime(now), nameSlug), - startTime: now, - manager: makeJamSessionManager(), - chLog: chLog, - } - - basePath := js.getBasePath() - chLog <- fmt.Sprintf("Creating directory: %s", basePath) - err := util.EnsurePathExists(basePath, os.ModePerm) - if err != nil { - return nil, err - } - - config := getJamSessionConfig(js) - configData, err := json.Marshal(config) - if err != nil { - return nil, err - } - - err = os.WriteFile(fmt.Sprintf("%s/config.json", basePath), configData, 0644) - if err != nil { - return nil, err - } - - err = js.start() - if err != nil { - return nil, err - } - - return &js, nil -} - -func (js *JamSession) start() error { - js.chLog <- fmt.Sprintf("Starting server on port %d", js.port) - - webServer := &http.Server{ - Addr: fmt.Sprintf(":%d", js.port), - ReadHeaderTimeout: 3 * time.Second, - } - - http.HandleFunc("/ws-bytejam", js.wsBytejam()) - - // #TODO: catch an error! - go webServer.ListenAndServe() - - return nil -} - -func (js *JamSession) wsBytejam() func(http.ResponseWriter, *http.Request) { - return func(w http.ResponseWriter, r *http.Request) { - js.chLog <- fmt.Sprintf("Client connected") - - conn, err := wsUpgrader.Upgrade(w, r, nil) - if err != nil { - js.chLog <- fmt.Sprintf("Client connected but couldn't upgrade: %s", err) - return - } - defer conn.Close() - - /* - var m *machines.Machine - if s.broadcaster != nil { - tic, err = machines.NewNusanServerTic(slug, broadcaster) - if err != nil { - log.Print("ERR new TIC:", err) - return - } - - log.Print("not implemented") - return - } else { - m, err = machines.LaunchMachine("TIC-80", true, false, true) - if err != nil { - log.Print("ERR new TIC:", err) - return - } - - s.chLog <- "TIC-80 Launched" - } - defer m.Shutdown() - */ - - jsConn := NewJamSessionConnection(conn) - js.manager.registerConn(jsConn) - - go jsConn.runServerWsConnRead(js) - go jsConn.runServerWsConnWrite(js) - - // #TODO: send the server status - // hp.sendServerStatus(true) - - // #TODO: handle exit - for { - select { - case <-jsConn.signalKick: - // #TODO: Close down read and write channels - fmt.Println("KICKED") - return - } - } - } -} - -func (js *JamSession) stop() error { - fmt.Println("JamSession->stop not yet implemented") - return nil -} - -func (js *JamSession) getBasePath() string { - return fmt.Sprintf("%sserver-data/%s", config.WORK_DIR, js.slug) -} - -func (js *JamSession) getStatus() MsgServerStatus { - msg := MsgServerStatus{ - Type: "server-status", - } - - for _, jc := range js.manager.conns { - status := "waiting" - machineUuid := "" - machine := js.manager.getMachineForConn(jc) - if machine != nil { - status = fmt.Sprintf("Connected: %s", machine.MachineName) - machineUuid = machine.Uuid.String() - } - - msg.Data.Clients = append(msg.Data.Clients, struct { - Uuid string - DisplayName string - ShortUuid string - Status string - MachineUuid string - LastPingTime string - }{ - Uuid: jc.connUuid.String(), - DisplayName: jc.identity.displayName, - ShortUuid: jc.getIdentityShortUuid(), - Status: status, - MachineUuid: machineUuid, - LastPingTime: time.Now().Format(time.RFC3339), - }) - } - - for _, m := range js.manager.machines { - name := "(unassigned)" - clientUuid := "" - client := js.manager.getConnForMachine(m) - if client != nil { - name = client.identity.displayName - clientUuid = client.connUuid.String() - } - - msg.Data.Machines = append(msg.Data.Machines, struct { - Uuid string - MachineName string - ProcessID int - Platform string - Status string - ClientUuid string - JammerDisplayName string - LastSnapshotTime string - }{ - Uuid: m.Uuid.String(), - MachineName: m.MachineName, - ProcessID: m.Tic.GetProcessID(), - Platform: m.Platform, - Status: "running", - ClientUuid: clientUuid, - JammerDisplayName: name, - LastSnapshotTime: time.Now().Format(time.RFC3339), - }) - } - - return msg -} - -func (js *JamSession) startMachine() (*machines.Machine, error) { - m, err := machines.LaunchMachine("TIC-80", true, true, false) - if err != nil { - return nil, err - } - - js.manager.registerMachine(m) - - js.chLog <- fmt.Sprintf("TIC-80 Launched: %s", m.MachineName) - return m, err -} - -func (js *JamSession) startMachineForConn(connUuid uuid.UUID) (*machines.Machine, error) { - conn := js.manager.getConn(connUuid) - if conn == nil { - return nil, errors.New("Unable to find conn") - } - - m, err := machines.LaunchMachine("TIC-80", true, true, false) - if err != nil { - return nil, err - } - - js.manager.registerMachine(m) - js.manager.linkMachineToConn(m.Uuid, conn.connUuid) - - // TODO: May have identity? - js.chLog <- fmt.Sprintf("TIC-80 Launched: %s for %s", m.MachineName, conn.connUuid) - return m, err -} - -func (js *JamSession) identifyMachines() { - count := 0 - for _, c := range js.manager.conns { - m := js.manager.getMachineForConn(c) - if m != nil { - err := c.sendMachineNameCode(m.MachineName) - if err != nil { - js.chLog <- fmt.Sprintln("ERR write:", err) - } - - count++ - } - } - js.chLog <- fmt.Sprintf("Identification sent to %d machines for 30 seconds", count) -} - -func (js *JamSession) closeMachine(data DataCloseMachine) { - // #TODO: unlink and unregister! - - fmt.Printf("CLOSE: %s\n", data.Uuid) - err := machines.ShutdownMachine(data.Uuid) - if err != nil { - js.chLog <- fmt.Sprintf("ERR shutdown: %s", err) - return - } - - js.chLog <- fmt.Sprintf("Machine %s closed", data.Uuid) -} - -func (js *JamSession) connectMachineClient(data DataConnectMachineClient) { - fmt.Printf("connect: %s to %s\n", data.ClientUuid, data.MachineUuid) - - machineUuid, err := uuid.Parse(data.MachineUuid) - if err != nil { - js.chLog <- fmt.Sprintf("ERR connect: %s", err) - return - } - - connUuid, err := uuid.Parse(data.ClientUuid) - if err != nil { - js.chLog <- fmt.Sprintf("ERR connect: %s", err) - return - } - - machine := machines.GetMachine(machineUuid) - if machine == nil { - js.chLog <- fmt.Sprintf("ERR connect: Could not find Machine ID") - return - } - - conn := js.manager.getConn(connUuid) - if conn == nil { - js.chLog <- fmt.Sprintf("ERR connect: Could not find Jammer ID") - return - } - - js.manager.linkMachineToConn(machineUuid, connUuid) - - js.chLog <- fmt.Sprintf("Connected %s to %s", data.ClientUuid, data.MachineUuid) -} - -func (js *JamSession) disconnectMachineClient(data DataDisconnectMachineClient) { - fmt.Printf("Disconnect: %s to %s\n", data.ClientUuid, data.MachineUuid) - - machineUuid, err := uuid.Parse(data.MachineUuid) - if err != nil { - js.chLog <- fmt.Sprintf("ERR connect: %s", err) - return - } - - connUuid, err := uuid.Parse(data.ClientUuid) - if err != nil { - js.chLog <- fmt.Sprintf("ERR connect: %s", err) - return - } - - conn := js.manager.getConn(connUuid) - if conn == nil { - js.chLog <- fmt.Sprintf("ERR connect: Could not find Jammer ID") - return - } - - machine := js.manager.getMachineForConn(conn) - if machine == nil { - js.chLog <- fmt.Sprintf("ERR connect: Jammer does not have a machine") - } - - if machine.Uuid != machineUuid { - js.chLog <- fmt.Sprintf("ERR connect: Jammer's machine ID does not match the requested one") - } - - js.manager.unlinkMachineFromConn(machineUuid, connUuid) - - js.chLog <- fmt.Sprintf("Disconnected %s from %s", data.ClientUuid, data.MachineUuid) -} diff --git a/jukebox.go b/jukebox.go index 0a516eb..26e1354 100644 --- a/jukebox.go +++ b/jukebox.go @@ -5,6 +5,7 @@ import ( "log" "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/embed" "github.com/creativenucleus/bytejammer/machines" ) @@ -15,14 +16,16 @@ const ( type Jukebox struct { playlist *Playlist - comms *chan Msg + playtime time.Duration + comms *chan comms.Msg } -func NewJukebox(playlist *Playlist, comms *chan Msg) (*Jukebox, error) { - log.Printf("-> Launching Jukebox for playlist") +func NewJukebox(playlist *Playlist, playtime time.Duration, comms *chan comms.Msg) (*Jukebox, error) { + log.Printf("-> Launching Jukebox for playlist, with default playtime of %s", playtime) j := Jukebox{ comms: comms, + playtime: playtime, playlist: playlist, } @@ -38,41 +41,51 @@ func (j *Jukebox) start() { }) tsFirst.SetCode(code) - (*j.comms) <- Msg{Type: "tic-state", TicState: tsFirst} + (*j.comms) <- comms.Msg{Type: "tic-state", TicState: comms.DataTicState{ + State: tsFirst, + }} rotateTicker := time.NewTicker(rotatePeriod) defer rotateTicker.Stop() for { - select { - case <-rotateTicker.C: - playlistItem, err := j.playlist.getNext() - if err != nil { - log.Println("ERR get code:", err) - break - } + <-rotateTicker.C + playlistItem, err := j.playlist.getNext() + if err != nil { + log.Println("ERR get code:", err) + break + } - fmt.Printf("Playing (TIC):\nLocation: %s\n", playlistItem.location) - if playlistItem.author != "" { - fmt.Printf("Author: %s\n", playlistItem.author) - } + fmt.Printf("Playing (TIC):\nLocation: %s\n", playlistItem.location) + if playlistItem.author != "" { + fmt.Printf("Author: %s\n", playlistItem.author) + } - if playlistItem.description != "" { - fmt.Printf("Description: %s\n", playlistItem.description) - } + if playlistItem.description != "" { + fmt.Printf("Description: %s\n", playlistItem.description) + } - code := playlistItem.code + playtime := time.Duration(j.playtime) + if playlistItem.playtime > 0 { + // Prefer the value from the playlist item in the JSON file if it is set... + playtime = time.Duration(playlistItem.playtime) * time.Second + } - /* - -- Removes vbank 1, so nerfed for now! - if playlistItem.author != "" { - code = machines.CodeAddAuthorShim(code, playlistItem.author) - } - */ + rotateTicker.Reset(playtime) - ts := machines.MakeTicStateRunning(code) - (*j.comms) <- Msg{Type: "tic-state", TicState: ts} - } + code := playlistItem.code + + /* + -- Removes vbank 1, so nerfed for now! + if playlistItem.author != "" { + code = machines.CodeAddAuthorShim(code, playlistItem.author) + } + */ + + ts := machines.MakeTicStateRunning(code) + (*j.comms) <- comms.Msg{Type: "tic-state", TicState: comms.DataTicState{ + State: ts, + }} } }() } diff --git a/local-jukebox.go b/local-jukebox.go index 7434f3a..293a16a 100644 --- a/local-jukebox.go +++ b/local-jukebox.go @@ -3,16 +3,18 @@ package main import ( "fmt" "log" + "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/machines" ) -func startLocalJukebox(playlist *Playlist) error { +func startLocalJukebox(playlist *Playlist, playtime time.Duration) error { fmt.Printf("Starting local jukebox containing %d items\n", len(playlist.items)) - ch := make(chan Msg) + ch := make(chan comms.Msg) - j, err := NewJukebox(playlist, &ch) + j, err := NewJukebox(playlist, playtime, &ch) if err != nil { return err } @@ -26,16 +28,14 @@ func startLocalJukebox(playlist *Playlist) error { go func() { for { - select { - case msg, ok := <-ch: - if ok { - switch msg.Type { - case "tic-state": - err = m.Tic.WriteImportCode(msg.TicState) - if err != nil { - // #TODO: soften! - log.Fatal(err) - } + msg, ok := <-ch + if ok { + switch msg.Type { + case "tic-state": + err = m.Tic.WriteImportCode(msg.TicState.State, true) + if err != nil { + // #TODO: soften! + log.Fatal(err) } } } @@ -44,5 +44,7 @@ func startLocalJukebox(playlist *Playlist) error { j.start() for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) } } diff --git a/machines/machines.go b/machines/machines.go index 35de74f..7ea8efa 100644 --- a/machines/machines.go +++ b/machines/machines.go @@ -5,15 +5,19 @@ import ( "fmt" "math/rand" - "github.com/creativenucleus/bytejammer/server" "github.com/google/uuid" ) +const ( + PlatformTIC80 = "TIC-80" +) + type Machine struct { MachineName string Platform string Tic *Tic Uuid uuid.UUID + ChClosedErr chan error // May be nil } var MACHINES []*Machine @@ -33,14 +37,15 @@ func LaunchMachine(platform string, hasImport bool, hasExport bool, isServer boo m := Machine{ Platform: platform, Uuid: uuid.New(), - MachineName: server.GetFunName(len(MACHINES)), + MachineName: GetFunName(len(MACHINES)), + ChClosedErr: make(chan error), } var err error switch m.Platform { - case "TIC-80": + case PlatformTIC80: slug := fmt.Sprint(rand.Intn(100000000)) - m.Tic, err = newTic(slug, hasImport, hasExport, isServer) + m.Tic, err = newTic(slug, hasImport, hasExport, isServer, m.ChClosedErr) if err != nil { return nil, err } @@ -50,6 +55,7 @@ func LaunchMachine(platform string, hasImport bool, hasExport bool, isServer boo } MACHINES = append(MACHINES, &m) + fmt.Printf("%v\n", m) return &m, nil } diff --git a/server/names.go b/machines/names.go similarity index 91% rename from server/names.go rename to machines/names.go index ec7d639..000a73d 100644 --- a/server/names.go +++ b/machines/names.go @@ -1,4 +1,4 @@ -package server +package machines import ( "math/rand" @@ -16,7 +16,6 @@ func GetFunName(index int) string { "Citrus Lump", "Dusk Pustules", "Heroine's Tear", - "Pocked Airhead", "Crimson Banquet", "Delectable Bouquet", "Lesser Mock Bottom", diff --git a/machines/tic.go b/machines/tic.go index 5202e30..c3a2064 100644 --- a/machines/tic.go +++ b/machines/tic.go @@ -1,6 +1,7 @@ package machines import ( + "errors" "fmt" "log" "os" @@ -17,10 +18,17 @@ import ( type Tic struct { cmd *exec.Cmd ticFilename string - // Add latestImport - for server to read + + latestImport TicState // #TODO: propagate this to the server panel importFullpath string + // Add latestExport - for server to read exportFullpath string + + // This receives nil for normal shutdown (i.e. by TIC exit, user clicking the close button etc) + chClosedErr chan error + + codeOverride bool } func (t *Tic) GetExportFullpath() string { @@ -37,14 +45,12 @@ func (t *Tic) GetProcessID() int { } */ -func newTic(slug string, hasImportFile bool, hasExportFile bool, isServer bool /*, broadcaster *NusanLauncher*/) (*Tic, error) { +func newTic(slug string, hasImportFile bool, hasExportFile bool, isServer bool, chClosedErr chan error /*, broadcaster *NusanLauncher*/) (*Tic, error) { tic := Tic{} args := []string{ "--skip", } - fmt.Println(slug) - exchangefileBasePath := fmt.Sprintf("%s_temp", config.WORK_DIR) err := util.EnsurePathExists(exchangefileBasePath, os.ModePerm) if err != nil { @@ -107,9 +113,11 @@ func newTic(slug string, hasImportFile bool, hasExportFile bool, isServer bool / // use goroutine waiting, manage process // this is important, otherwise the process becomes in S mode + // This may be error or nil go func() { err = tic.cmd.Wait() fmt.Printf("TIC (%d) finished with error: %v", tic.cmd.Process.Pid, err) + chClosedErr <- err // #TODO: cleanup }() /* @@ -150,11 +158,53 @@ func (t *Tic) shutdown() { } } -func (t Tic) WriteImportCode(ts TicState) error { +// This pushes the supplied code to this TIC and prevents regular import for the specified duration +// 1) Grabs the current TIC state to holding +// 2) Writes the override to the import file +func (t *Tic) SetCodeOverride(tsOverride TicState, d time.Duration) error { + // We ought to handle when someone sets multiple concurrent overrides - for the moment, just block! + if t.codeOverride { + return errors.New("we already have a code override - request ignored") + } + + err := t.WriteImportCode(tsOverride, false) + if err != nil { + fmt.Println(err) + return err + } + + t.codeOverride = true + + // Remove the override struct when the timer expires + timer := time.NewTimer(d) + go func() error { // (NB error ignored) + <-timer.C + err := t.WriteImportCode(t.latestImport, true) + if err != nil { + return err + } + + t.codeOverride = false + return nil + }() + + return nil +} + +// If we have overide code, then put the supplied update in a placeholder, ready for when the override completes +func (t *Tic) WriteImportCode(ts TicState, saveAsLatest bool) error { if t.importFullpath == "" { log.Fatal("Tried to import code - but file is not set up") } + if saveAsLatest { + t.latestImport = ts + } + + if t.codeOverride { + return nil + } + data, err := ts.MakeDataToImport() if err != nil { return err diff --git a/machines/tic_state.go b/machines/tic_state.go index cadc616..d0e7760 100644 --- a/machines/tic_state.go +++ b/machines/tic_state.go @@ -37,7 +37,7 @@ func MakeTicStateFromExportData(data []byte) (*TicState, error) { r := regexp.MustCompile(`(?s)^-- pos: (\d+),(\d+)\n(.*)$`) matches := r.FindStringSubmatch(string(data)) - ts.IsRunning = matches[1] == "0" && matches[1] == "0" + ts.IsRunning = matches[1] == "0" && matches[2] == "0" if !ts.IsRunning { var err error ts.CursorX, err = strconv.Atoi(matches[1]) diff --git a/main.go b/main.go index 170a6e8..d743ae5 100644 --- a/main.go +++ b/main.go @@ -5,6 +5,7 @@ import ( "log" "os" "path/filepath" + "time" "github.com/urfave/cli/v2" @@ -13,7 +14,8 @@ import ( ) const ( - RELEASE_TITLE = "Appealing Apricot" + RELEASE_TITLE = "Appealing Apricot" + JUKEBOX_PLAYTIME_SECS = 10 ) func main() { @@ -57,15 +59,24 @@ func main() { Name: "playlist", Usage: "Playlist file (empty for LCDZ playlist)", }, + &cli.UintFlag{ + Name: "playtime", + Usage: "Playtime for each item (in seconds)", + Value: JUKEBOX_PLAYTIME_SECS, + }, }, Action: func(cCtx *cli.Context) error { + defaultPlaytime := cCtx.Uint("playtime") + if defaultPlaytime == 0 { + defaultPlaytime = JUKEBOX_PLAYTIME_SECS + } + playlistFilename := cCtx.String("playlist") playlist, err := readPlaylist(playlistFilename) if err != nil { log.Fatal(err) } - - err = startLocalJukebox(playlist) + err = startLocalJukebox(playlist, time.Duration(defaultPlaytime)*time.Second) if err != nil { log.Fatal(err) } @@ -106,7 +117,6 @@ func main() { if err != nil { log.Fatal(err) } - return nil }, }, { @@ -146,8 +156,18 @@ func main() { Name: "playlist", Usage: "Playlist file (empty for LCDZ playlist)", }, + &cli.UintFlag{ + Name: "playtime", + Usage: "Playtime for each item (in seconds)", + Value: JUKEBOX_PLAYTIME_SECS, + }, }, Action: func(cCtx *cli.Context) error { + defaultPlaytime := cCtx.Uint("playtime") + if defaultPlaytime == 0 { + defaultPlaytime = JUKEBOX_PLAYTIME_SECS + } + host := cCtx.String("host") port := cCtx.Int("port") playlistFilename := cCtx.String("playlist") @@ -156,7 +176,7 @@ func main() { log.Fatal(err) } - err = startClientJukebox(host, port, playlist) + err = startClientJukebox(host, port, time.Duration(defaultPlaytime)*time.Second, playlist) if err != nil { log.Fatal(err) } diff --git a/nusan.go b/nusan.go index cb6ede3..e4e5d28 100644 --- a/nusan.go +++ b/nusan.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/gorilla/websocket" ) @@ -43,26 +44,32 @@ func NusanLauncherConnect(port int) (*NusanLauncher, error) { func wsNusan(nl NusanLauncher) func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { var err error - nl.wsConn, err = wsUpgrader.Upgrade(w, r, nil) + + comms.WsUpgrade(w, r, func(conn *websocket.Conn) error { + nl.wsConn = conn + defer func() { nl.wsConn = nil }() + + go nl.nusanWsOperatorRead() + go nl.nusanWsOperatorWrite() + + // #TODO: handle exit + for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) + } + }) if err != nil { log.Print("ERR upgrade:", err) return } - // #TODO: Not great! - defer nl.wsConn.Close() - - go nl.nusanWsOperatorRead() - go nl.nusanWsOperatorWrite() - - // #TODO: handle exit - for { - } } } // #TODO: Is this used? func (nl *NusanLauncher) nusanWsOperatorRead() { for { + // Removes 100% CPU warning - but this should really be restructured + time.Sleep(10 * time.Second) /* var msg interface{} err := nl.conn.ReadJSON(&msg) @@ -85,16 +92,14 @@ type NusanLauncherMsg struct { func (nl *NusanLauncher) nusanWsOperatorWrite() { for { - select { - case msg := <-(*nl.ch): - fmt.Printf("-> NUSAN TOSEND: %v\n", msg) - nlMsg := NusanLauncherMsg{} - nlMsg.Data.RoomName = "bytejammer" - nlMsg.Data.NickName = msg - err := nl.sendData(&nlMsg) - if err != nil { - log.Fatal(err) - } + msg := <-(*nl.ch) + fmt.Printf("-> NUSAN TOSEND: %v\n", msg) + nlMsg := NusanLauncherMsg{} + nlMsg.Data.RoomName = "bytejammer" + nlMsg.Data.NickName = msg + err := nl.sendData(&nlMsg) + if err != nil { + log.Fatal(err) } } } diff --git a/playlist.go b/playlist.go index f9e3a75..c5e70dd 100644 --- a/playlist.go +++ b/playlist.go @@ -17,6 +17,7 @@ type PlaylistItem struct { location string author string description string + playtime uint32 code []byte } @@ -64,7 +65,7 @@ func (p *Playlist) getNext() (*PlaylistItem, error) { defer respLua.Body.Close() if respLua.StatusCode != http.StatusOK { - return nil, errors.New(fmt.Sprintf("ERR write: Status Code = %d", respLua.StatusCode)) + return nil, fmt.Errorf("write: Status Code = %d", respLua.StatusCode) } data, err := io.ReadAll(respLua.Body) diff --git a/playlist/scenes.json b/playlist/scenes.json index c8aa757..e3a767a 100644 --- a/playlist/scenes.json +++ b/playlist/scenes.json @@ -31,7 +31,7 @@ },{ "location": "https://livecode.demozoo.org/shader_file_sources/2023_09_18_byte_jam_monday_night_bytes/suule.lua" },{ - "location": "https://livecode.demozoo.org/shader_file_sources/2023_08_28_byte_jam_monday_night_bytes/2023_08_28_jtruk.lua" + "location": "https://livecode.demozoo.org/shader_file_sources/2023_08_28_byte_jam_monday_night_bytes/2023_08_28_jtruk.lua" },{ "location": "https://livecode.demozoo.org/shader_file_sources/2022_12_05_byte_jam_fieldfx_casual/tobach.lua" }] diff --git a/playlist_json.go b/playlist_json.go index a782ac9..3ccc8b8 100644 --- a/playlist_json.go +++ b/playlist_json.go @@ -9,6 +9,7 @@ type PlaylistJSON struct { Location string `json:"location"` Author string `json:"author"` Description string `json:"description"` + PlayTime uint32 `json:"playtime"` } `json:"items"` } @@ -27,6 +28,7 @@ func NewPlaylistFromJSON(bytesIn []byte) (*Playlist, error) { location: item.Location, author: item.Author, description: item.Description, + playtime: item.PlayTime, }) } diff --git a/playlist_zip.go b/playlist_zip.go index 331018a..a6a4c2b 100644 --- a/playlist_zip.go +++ b/playlist_zip.go @@ -3,7 +3,6 @@ package main import ( "archive/zip" "bytes" - "errors" "fmt" "io" "log" @@ -61,7 +60,7 @@ func NewPlaylistFromZip(zipFilename string) (*Playlist, error) { for key, item := range playlist.items { codeData, ok := files[item.location] if !ok { - return nil, errors.New(fmt.Sprintf("File not found (%s)", item.location)) + return nil, fmt.Errorf("file not found (%s)", item.location) } playlist.items[key].code = codeData diff --git a/server/session-config.go b/server/session-config.go new file mode 100644 index 0000000..1d52b32 --- /dev/null +++ b/server/session-config.go @@ -0,0 +1,43 @@ +package server + +import "github.com/google/uuid" + +type ConfigMachine struct { + Name string `json:"name"` + Uuid uuid.UUID `json:"uuid"` + JammerIdentity *uuid.UUID `json:"jammer_identity,omitempty"` +} + +type SessionConfig struct { + Port int `json:"port"` + Name string `json:"name"` + Slug string `json:"slug"` + Machines []ConfigMachine `json:"machines"` +} + +// JamSessionConfig should be enough to save to disk and restart a JamSession if it crashes +func getSessionConfig(s Session) SessionConfig { + sc := SessionConfig{ + Port: s.port, + Name: s.name, + Slug: s.slug, + } + + for _, machine := range s.switchboard.machines { + var jammerIdentity *uuid.UUID + machineConn, ok := s.switchboard.machineConnMap[machine] + if ok { + if machineConn.identity != nil { + jammerIdentity = &machineConn.identity.uuid + } + } + + sc.Machines = append(sc.Machines, ConfigMachine{ + Name: machine.MachineName, + Uuid: machine.Uuid, + JammerIdentity: jammerIdentity, + }) + } + + return sc +} diff --git a/jam-session-conn.go b/server/session-conn.go similarity index 75% rename from jam-session-conn.go rename to server/session-conn.go index 9d0e81a..429558a 100644 --- a/jam-session-conn.go +++ b/server/session-conn.go @@ -1,4 +1,4 @@ -package main +package server import ( "encoding/hex" @@ -7,8 +7,8 @@ import ( "sync" "time" + "github.com/creativenucleus/bytejammer/comms" "github.com/creativenucleus/bytejammer/crypto" - "github.com/creativenucleus/bytejammer/embed" "github.com/creativenucleus/bytejammer/machines" "github.com/creativenucleus/bytejammer/util" "github.com/google/uuid" @@ -17,18 +17,18 @@ import ( // JamSessionConn is a connection to the JamServer. // It may not not yet be validated, or have an identity. -type JamSessionConn struct { +type SessionConn struct { conn *websocket.Conn connUuid uuid.UUID wsMutex sync.Mutex - identity *JamSessionConnIdentity + identity *SessionConnIdentity lastTicState *machines.TicState serverBasePath string publicKey []byte // This should be a public key type, and we should manage the challenge status signalKick chan bool } -type JamSessionConnIdentity struct { +type SessionConnIdentity struct { uuid uuid.UUID displayName string publicKey []byte @@ -36,8 +36,8 @@ type JamSessionConnIdentity struct { challenge []byte } -func NewJamSessionConnection(conn *websocket.Conn) *JamSessionConn { - client := JamSessionConn{ +func NewJamSessionConnection(conn *websocket.Conn) *SessionConn { + client := SessionConn{ conn: conn, connUuid: uuid.New(), signalKick: make(chan bool), @@ -46,7 +46,7 @@ func NewJamSessionConnection(conn *websocket.Conn) *JamSessionConn { } // #TODO: make better -func (jc *JamSessionConn) getIdentityShortUuid() string { +func (jc *SessionConn) getIdentityShortUuid() string { if jc.identity == nil { return "(unknown)" } @@ -54,9 +54,9 @@ func (jc *JamSessionConn) getIdentityShortUuid() string { return jc.identity.uuid.String()[0:8] } -func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { +func (jc *SessionConn) runServerWsConnRead(js *Session) { for { - var msg Msg + var msg comms.Msg err := jc.conn.ReadJSON(&msg) if err != nil { js.chLog <- fmt.Sprintln("read:", err) @@ -72,7 +72,7 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { } // #TODO: NB This identity has not yet been challenged - jc.identity = &JamSessionConnIdentity{ + jc.identity = &SessionConnIdentity{ uuid: identityUuid, displayName: msg.Identity.DisplayName, publicKey: msg.Identity.PublicKey, @@ -85,15 +85,17 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { // #TODO: Refactor this placeholder! // Kick an existing connection off if it has the same identity - for _, c := range js.manager.conns { + for _, c := range js.switchboard.conns { if c != jc && c.identity != nil && c.identity.uuid.String() == jc.identity.uuid.String() { c.signalKick <- true - js.manager.unregisterConn(c) + js.switchboard.unregisterConn(c) } } // Send the challenge - msg := Msg{Type: "challenge-request", ChallengeRequest: DataChallengeRequest{Challenge: fmt.Sprintf("%x", jc.identity.challenge)}} + msg := comms.Msg{Type: "challenge-request", ChallengeRequest: comms.DataChallengeRequest{ + Challenge: fmt.Sprintf("%x", jc.identity.challenge), + }} err = jc.sendData(msg) if err != nil { js.chLog <- fmt.Sprintln("write:", err) @@ -130,7 +132,7 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { js.chLog <- fmt.Sprintln("IS VALID!") case "tic-state": - ts := msg.TicState + ts := msg.TicState.State if jc.lastTicState != nil && ts.IsEqual(*jc.lastTicState) { // We already sent this state @@ -144,7 +146,7 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { os.WriteFile(path, []byte(ts.GetCode()), 0644) } - machine := js.manager.getMachineForConn(jc) + machine := js.switchboard.getMachineForConn(jc) if machine != nil && machine.Tic != nil { // Output to Tic // Don't shim for now... @@ -154,7 +156,7 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { } */ - err = machine.Tic.WriteImportCode(ts) + err = machine.Tic.WriteImportCode(ts, true) if err != nil { js.chLog <- fmt.Sprintln("read:", err) break @@ -169,14 +171,15 @@ func (jc *JamSessionConn) runServerWsConnRead(js *JamSession) { } } -func (jc *JamSessionConn) runServerWsConnWrite(js *JamSession) { +func (jc *SessionConn) runServerWsConnWrite(js *Session) { for { select {} } } -// TODO: Handle error -func (js *JamSessionConn) sendMachineNameCode(machineName string) error { +// #TODO: Adapt this to send code to remote machines +/* +func (js *SessionConn) sendMachineNameCode(machineName string) error { ts := machines.MakeTicStateRunning(embed.LuaClient) code := machines.CodeReplace(ts.GetCode(), map[string]string{ "CLIENT_ID": machineName, @@ -184,12 +187,15 @@ func (js *JamSessionConn) sendMachineNameCode(machineName string) error { }) ts.SetCode(code) - msg := Msg{Type: "tic-state", TicState: ts} + msg := comms.Msg{Type: "tic-state", TicState: comms.DataTicState{ + State: ts, + }} err := js.sendData(msg) return err } +*/ -func (jc *JamSessionConn) sendData(data interface{}) error { +func (jc *SessionConn) sendData(data interface{}) error { jc.wsMutex.Lock() defer jc.wsMutex.Unlock() return jc.conn.WriteJSON(data) diff --git a/server/session.go b/server/session.go new file mode 100644 index 0000000..cfb24e7 --- /dev/null +++ b/server/session.go @@ -0,0 +1,403 @@ +package server + +import ( + "encoding/json" + "errors" + "fmt" + "net/http" + "os" + "time" + + "github.com/creativenucleus/bytejammer/comms" + "github.com/creativenucleus/bytejammer/config" + "github.com/creativenucleus/bytejammer/embed" + "github.com/creativenucleus/bytejammer/machines" + "github.com/creativenucleus/bytejammer/util" + "github.com/google/uuid" + "github.com/gorilla/websocket" +) + +type Session struct { + port int + // Our friendly name... + name string + // The slug we can use to saved this config to disk... + slug string + startTime time.Time + + // The connections, machines, and the connections between them + switchboard *Switchboard + + chLog chan string +} + +func CreateSession(port int, name string, chLog chan string) (*Session, error) { + nameSlug := util.GetSlug(name) + if nameSlug == "" { + return nil, errors.New("invalid session name - unable to make slug") + } + + now := time.Now() + + js := Session{ + port: port, + name: name, + slug: fmt.Sprintf("%s_%s", util.GetSlugFromTime(now), nameSlug), + startTime: now, + switchboard: makeSwitchboard(), + chLog: chLog, + } + + basePath := js.getBasePath() + chLog <- fmt.Sprintf("Creating directory: %s", basePath) + err := util.EnsurePathExists(basePath, os.ModePerm) + if err != nil { + return nil, err + } + + err = js.writeConfig() + if err != nil { + return nil, err + } + + err = js.start() + if err != nil { + return nil, err + } + + // Periodic saving... + // #TODO: (There must be a better pattern!) + go func() { + for { + time.Sleep(10 * time.Second) + err := js.writeConfig() + if err != nil { + chLog <- fmt.Sprintf("ERR save config: %s", err) + } + } + }() + + return &js, nil +} + +func (js *Session) writeConfig() error { + config := getSessionConfig(*js) + configData, err := json.Marshal(config) + if err != nil { + return err + } + + filepath := fmt.Sprintf("%s/config.json", js.getBasePath()) + err = os.WriteFile(filepath, configData, 0644) + if err != nil { + return err + } + + return nil +} + +func (js *Session) start() error { + js.chLog <- fmt.Sprintf("Starting server on port %d", js.port) + + webServer := &http.Server{ + Addr: fmt.Sprintf(":%d", js.port), + ReadHeaderTimeout: 3 * time.Second, + } + + http.HandleFunc("/ws-bytejam", js.wsBytejam()) + + // #TODO: catch an error! + go webServer.ListenAndServe() + + return nil +} + +func (js *Session) wsBytejam() func(http.ResponseWriter, *http.Request) { + return func(w http.ResponseWriter, r *http.Request) { + js.chLog <- "Client connected" + + err := comms.WsUpgrade(w, r, func(conn *websocket.Conn) error { + /* + var m *machines.Machine + if s.broadcaster != nil { + tic, err = machines.NewNusanServerTic(slug, broadcaster) + if err != nil { + log.Print("ERR new TIC:", err) + return + } + + log.Print("not implemented") + return + } else { + m, err = machines.LaunchMachine("TIC-80", true, false, true) + if err != nil { + log.Print("ERR new TIC:", err) + return + } + + s.chLog <- "TIC-80 Launched" + } + defer m.Shutdown() + */ + + jsConn := NewJamSessionConnection(conn) + js.switchboard.registerConn(jsConn) + + go jsConn.runServerWsConnRead(js) + go jsConn.runServerWsConnWrite(js) + + // #TODO: send the server status + // hp.sendServerStatus(true) + + // #TODO: handle exit + for { + <-jsConn.signalKick + // #TODO: Close down read and write channels + fmt.Println("KICKED") + return nil + } + }) + if err != nil { + js.chLog <- fmt.Sprintf("ws-upgrade: %s", err) + return + } + } +} + +func (js *Session) Stop() error { + fmt.Println("JamSession->stop not yet implemented") + return nil +} + +func (js *Session) getBasePath() string { + return fmt.Sprintf("%sserver-data/%s", config.WORK_DIR, js.slug) +} + +func (js *Session) GetStatus() comms.DataSessionStatus { + ss := comms.DataSessionStatus{ + Port: js.port, + } + + for _, jc := range js.switchboard.conns { + status := "waiting" + machineUuid := "" + machine := js.switchboard.getMachineForConn(jc) + if machine != nil { + status = fmt.Sprintf("Connected: %s", machine.MachineName) + machineUuid = machine.Uuid.String() + } + + ss.Clients = append(ss.Clients, struct { + Uuid string + DisplayName string + ShortUuid string + Status string + MachineUuid string + LastPingTime string + }{ + Uuid: jc.connUuid.String(), + DisplayName: jc.identity.displayName, + ShortUuid: jc.getIdentityShortUuid(), + Status: status, + MachineUuid: machineUuid, + LastPingTime: time.Now().Format(time.RFC3339), + }) + } + + for _, m := range js.switchboard.machines { + name := "(unassigned)" + clientUuid := "" + client := js.switchboard.getConnForMachine(m) + if client != nil { + name = client.identity.displayName + clientUuid = client.connUuid.String() + } + + ss.Machines = append(ss.Machines, struct { + Uuid string + MachineName string + ProcessID int + Platform string + Status string + ClientUuid string + JammerDisplayName string + LastSnapshotTime string + }{ + Uuid: m.Uuid.String(), + MachineName: m.MachineName, + ProcessID: m.Tic.GetProcessID(), + Platform: m.Platform, + Status: "running", + ClientUuid: clientUuid, + JammerDisplayName: name, + LastSnapshotTime: time.Now().Format(time.RFC3339), + }) + } + + return ss +} + +func (js *Session) StartMachine() (*machines.Machine, error) { + m, err := machines.LaunchMachine("TIC-80", true, true, false) + if err != nil { + return nil, err + } + + js.switchboard.registerMachine(m) + + js.chLog <- fmt.Sprintf("TIC-80 Launched: %s", m.MachineName) + return m, err +} + +func (js *Session) StartMachineForConn(connUuid uuid.UUID) (*machines.Machine, error) { + conn := js.switchboard.getConn(connUuid) + if conn == nil { + return nil, errors.New("unable to find conn") + } + + m, err := machines.LaunchMachine("TIC-80", true, true, false) + if err != nil { + return nil, err + } + + js.switchboard.registerMachine(m) + js.switchboard.linkMachineToConn(m.Uuid, conn.connUuid) + + // TODO: May have identity? + js.chLog <- fmt.Sprintf("TIC-80 Launched: %s for %s", m.MachineName, conn.connUuid) + return m, err +} + +func (js *Session) IdentifyMachines() { + count := 0 + for _, c := range js.switchboard.conns { + m := js.switchboard.getMachineForConn(c) + if m != nil { + fmt.Printf("Machine platform: %s\n", m.Platform) + if m.Platform == machines.PlatformTIC80 { + jammerDisplayName := "-" + conn := js.switchboard.getConnForMachine(m) + if conn != nil { + jammerDisplayName = conn.identity.displayName + } + + ts := machines.MakeTicStateRunning(embed.LuaClient) + code := machines.CodeReplace(ts.GetCode(), map[string]string{ + "CLIENT_ID": m.MachineName, + "DISPLAY_NAME": jammerDisplayName, + }) + ts.SetCode(code) + + err := m.Tic.SetCodeOverride(ts, 10*time.Second) + if err != nil { + js.chLog <- fmt.Sprintln("ERR write:", err) + } + } + count++ + } + } + js.chLog <- fmt.Sprintf("Identification sent to %d machines for 10 seconds", count) +} + +func (js *Session) CloseMachine(data comms.DataCloseMachine) { + // #TODO: This is quite verbose. Maybe the switchboard interface should be simpler? + fmt.Printf("Closeing Machine: %s\n", data.Uuid) + + machineUuid, err := uuid.Parse(data.Uuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR close machine: %s", err) + return + } + + machine := js.switchboard.getMachine(machineUuid) + if machine == nil { + js.chLog <- "ERR close machine: could not get machine" + return + } + + conn := js.switchboard.getConnForMachine(machine) + if conn != nil { + err = js.switchboard.unlinkMachineFromConn(machineUuid, conn.connUuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR close machine: %s", err) + return + } + } + + js.switchboard.unregisterMachine(machine) + + err = machines.ShutdownMachine(machineUuid.String()) + if err != nil { + js.chLog <- fmt.Sprintf("ERR close machine: %s", err) + return + } + + js.chLog <- fmt.Sprintf("Machine %s closed", data.Uuid) +} + +func (js *Session) ConnectMachineClient(data comms.DataConnectMachineClient) { + fmt.Printf("connect: %s to %s\n", data.ClientUuid, data.MachineUuid) + + machineUuid, err := uuid.Parse(data.MachineUuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR connect: %s", err) + return + } + + connUuid, err := uuid.Parse(data.ClientUuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR connect: %s", err) + return + } + + machine := machines.GetMachine(machineUuid) + if machine == nil { + js.chLog <- "ERR connect: Could not find Machine ID" + return + } + + conn := js.switchboard.getConn(connUuid) + if conn == nil { + js.chLog <- "ERR connect: Could not find Jammer ID" + return + } + + js.switchboard.linkMachineToConn(machineUuid, connUuid) + + js.chLog <- fmt.Sprintf("Connected %s to %s", data.ClientUuid, data.MachineUuid) +} + +func (js *Session) DisconnectMachineClient(data comms.DataDisconnectMachineClient) { + fmt.Printf("Disconnect: %s to %s\n", data.ClientUuid, data.MachineUuid) + + machineUuid, err := uuid.Parse(data.MachineUuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR connect: %s", err) + return + } + + connUuid, err := uuid.Parse(data.ClientUuid) + if err != nil { + js.chLog <- fmt.Sprintf("ERR connect: %s", err) + return + } + + conn := js.switchboard.getConn(connUuid) + if conn == nil { + js.chLog <- "ERR connect: Could not find Jammer ID" + return + } + + machine := js.switchboard.getMachineForConn(conn) + if machine == nil { + js.chLog <- "ERR connect: Jammer does not have a machine" + } + + if machine.Uuid != machineUuid { + js.chLog <- "ERR connect: Jammer's machine ID does not match the requested one" + } + + js.switchboard.unlinkMachineFromConn(machineUuid, connUuid) + + js.chLog <- fmt.Sprintf("Disconnected %s from %s", data.ClientUuid, data.MachineUuid) +} diff --git a/server/switchboard.go b/server/switchboard.go new file mode 100644 index 0000000..ce7845b --- /dev/null +++ b/server/switchboard.go @@ -0,0 +1,123 @@ +package server + +import ( + "errors" + + "github.com/creativenucleus/bytejammer/machines" + "github.com/google/uuid" +) + +type Switchboard struct { + machines map[uuid.UUID]*machines.Machine + conns map[uuid.UUID]*SessionConn + machineConnMap map[*machines.Machine]*SessionConn + + // #TODO: make this work... + // Is this the right level?? + // broadcaster *NusanLauncher +} + +func makeSwitchboard() *Switchboard { + return &Switchboard{ + machines: make(map[uuid.UUID]*machines.Machine), + conns: make(map[uuid.UUID]*SessionConn), + machineConnMap: make(map[*machines.Machine]*SessionConn), + } +} + +// #TODO: Mutexes + +func (s *Switchboard) registerMachine(m *machines.Machine) { + s.machines[m.Uuid] = m + + go func() { + <-m.ChClosedErr + s.unregisterMachine(m) + }() +} + +func (s *Switchboard) unregisterMachine(m *machines.Machine) { + conn := s.getConnForMachine(m) + if conn != nil { + s.unlinkMachineFromConn(m.Uuid, conn.connUuid) // #TODO: error ignored (log instead?) + } + + delete(s.machines, m.Uuid) +} + +func (s *Switchboard) getMachine(uuid uuid.UUID) *machines.Machine { + machine, ok := s.machines[uuid] + if !ok { + return nil + } + return machine +} + +func (s *Switchboard) registerConn(conn *SessionConn) { + s.conns[conn.connUuid] = conn +} + +func (s *Switchboard) unregisterConn(conn *SessionConn) { + delete(s.conns, conn.connUuid) +} + +func (sm *Switchboard) getConn(connUuid uuid.UUID) *SessionConn { + conn, ok := sm.conns[connUuid] + if !ok { + return nil + } + return conn +} + +// You must register a machine and conn before linking them +func (s *Switchboard) linkMachineToConn(machineUuid uuid.UUID, connUuid uuid.UUID) error { + machine := s.getMachine(machineUuid) + if machine == nil { + return errors.New("machine not found") + } + + conn := s.getConn(connUuid) + if conn == nil { + return errors.New("conn not found") + } + + s.machineConnMap[machine] = conn + return nil +} + +// You must unlink a machine and conn before destroying either +func (s *Switchboard) unlinkMachineFromConn(machineUuid uuid.UUID, connUuid uuid.UUID) error { + machine := s.getMachine(machineUuid) + if machine == nil { + return errors.New("machine not found") + } + + conn := s.getConn(connUuid) + if conn == nil { + return errors.New("conn not found") + } + + if s.machineConnMap[machine] != conn { + return errors.New("machine does not link to expected conn") + } + + delete(s.machineConnMap, machine) + return nil +} + +func (s *Switchboard) getConnForMachine(machine *machines.Machine) *SessionConn { + conn, ok := s.machineConnMap[machine] + if !ok { + return nil + } + return conn +} + +func (s *Switchboard) getMachineForConn(conn *SessionConn) *machines.Machine { + for machine, c := range s.machineConnMap { + if c == conn { + return machine + } + } + return nil +} diff --git a/websocket-client.go b/websocket-client.go index 3873c0b..df54ebe 100644 --- a/websocket-client.go +++ b/websocket-client.go @@ -10,13 +10,6 @@ import ( "github.com/gorilla/websocket" ) -var ( - wsUpgrader = websocket.Upgrader{ - ReadBufferSize: 1024, - WriteBufferSize: 1024, - } -) - // #TODO /* const (