`,
+ "two": `
`,
+ "three": `
`,
+
+ ":one:": ``,
+ ":two:": ``,
+ ":three:": ``,
+
+ "[one]": ``,
+ "[two]": ``,
+ "[three]": ``,
+
+ ":one: two [three]": ` `,
+
+ "nope one what": `nope what`,
+ "nope :two: what": `nope what`,
+ "nope [three] what": `nope what`,
+}
+
+func TestMain(m *testing.M) {
+ Emotes = map[string]string{
+ "one": "one.png",
+ "two": "two.png",
+ "three": "three.gif",
+ }
+ os.Exit(m.Run())
+}
+
+func TestEmotes_ParseEmotes(t *testing.T) {
+ for input, expected := range data_good {
+ got := ParseEmotes(input)
+ if got != expected {
+ t.Errorf("%s failed to parse into %q. Received: %q", input, expected, got)
+ }
+ }
+}
diff --git a/main.go b/main.go
index 40c7dd4..0dee74b 100644
--- a/main.go
+++ b/main.go
@@ -1,11 +1,13 @@
package main
import (
+ "context"
"flag"
"fmt"
"net/http"
"os"
"os/signal"
+ "time"
"github.com/gorilla/sessions"
"github.com/nareix/joy4/format"
@@ -14,9 +16,10 @@ import (
)
var (
- addr string
- sKey string
- stats = newStreamStats()
+ addr string
+ sKey string
+ stats = newStreamStats()
+ chatServer *http.Server
)
func setupSettings() error {
@@ -51,9 +54,6 @@ func main() {
os.Exit(1)
}
- exit := make(chan bool)
- go handleInterrupt(exit)
-
// Load emotes before starting server.
var err error
if chat, err = newChatRoom(); err != nil {
@@ -77,54 +77,88 @@ func main() {
common.LogInfoln("RoomAccess: ", settings.RoomAccess)
common.LogInfoln("RoomAccessPin: ", settings.RoomAccessPin)
- go startServer()
- go startRmtpServer()
-
- <-exit
-}
-
-func startRmtpServer() {
server := &rtmp.Server{
HandlePlay: handlePlay,
HandlePublish: handlePublish,
}
- err := server.ListenAndServe()
- if err != nil {
- // If the server cannot start, don't pretend we can continue.
- panic("Error trying to start rtmp server: " + err.Error())
+
+ // Define this here so we can set some timeouts and things.
+ chatServer := &http.Server{
+ Addr: addr,
+ ReadTimeout: 10 * time.Second,
+ WriteTimeout: 10 * time.Second,
+ MaxHeaderBytes: 1 << 20,
}
-}
-
-func startServer() {
- // Chat websocket
- http.HandleFunc("/ws", wsHandler)
- http.HandleFunc("/static/js/", wsStaticFiles)
- http.HandleFunc("/static/css/", wsStaticFiles)
- http.HandleFunc("/static/img/", wsImages)
- http.HandleFunc("/static/main.wasm", wsWasmFile)
- http.HandleFunc("/emotes/", wsEmotes)
- http.HandleFunc("/favicon.ico", wsStaticFiles)
- http.HandleFunc("/chat", handleIndexTemplate)
- http.HandleFunc("/video", handleIndexTemplate)
- http.HandleFunc("/help", handleHelpTemplate)
- http.HandleFunc("/pin", handlePin)
-
- http.HandleFunc("/", handleDefault)
-
- err := http.ListenAndServe(addr, nil)
- if err != nil {
- // If the server cannot start, don't pretend we can continue.
- panic("Error trying to start chat/http server: " + err.Error())
- }
-}
-
-func handleInterrupt(exit chan bool) {
- ch := make(chan os.Signal)
- signal.Notify(ch, os.Interrupt)
- <-ch
- common.LogInfoln("Closing server")
- if settings.StreamStats {
- stats.Print()
- }
- exit <- true
+
+ chatServer.RegisterOnShutdown(func() { chat.Shutdown() })
+ // rtmp.Server does not implement .RegisterOnShutdown()
+ //server.RegisterOnShutdown(func() { common.LogDebugln("server shutdown callback called.") })
+
+ // These have been moved back to annon functitons so I could use
+ // `server`, `chatServer`, and `exit` in them without needing to
+ // pass them as parameters.
+
+ // Signal handler
+ exit := make(chan bool)
+ go func() {
+ ch := make(chan os.Signal)
+ signal.Notify(ch, os.Interrupt)
+ <-ch
+ common.LogInfoln("Closing server")
+ if settings.StreamStats {
+ stats.Print()
+ }
+
+ if err := chatServer.Shutdown(context.Background()); err != nil {
+ common.LogErrorf("Error shutting down chat server: %v", err)
+ }
+
+ common.LogInfoln("Shutdown() sent. Sending exit.")
+ exit <- true
+ }()
+
+ // Chat and HTTP server
+ go func() {
+ // Use a ServeMux here instead of the default, global,
+ // http handler. It's a good idea when we're starting more
+ // than one server.
+ mux := http.NewServeMux()
+ mux.HandleFunc("/ws", wsHandler)
+ mux.HandleFunc("/static/js/", wsStaticFiles)
+ mux.HandleFunc("/static/css/", wsStaticFiles)
+ mux.HandleFunc("/static/img/", wsImages)
+ mux.HandleFunc("/static/main.wasm", wsWasmFile)
+ mux.HandleFunc("/emotes/", wsEmotes)
+ mux.HandleFunc("/favicon.ico", wsStaticFiles)
+ mux.HandleFunc("/chat", handleIndexTemplate)
+ mux.HandleFunc("/video", handleIndexTemplate)
+ mux.HandleFunc("/help", handleHelpTemplate)
+ mux.HandleFunc("/pin", handlePin)
+
+ mux.HandleFunc("/", handleDefault)
+
+ chatServer.Handler = mux
+ err := chatServer.ListenAndServe()
+ // http.ErrServerClosed is returned when server.Shuddown()
+ // is called.
+ if err != http.ErrServerClosed {
+ // If the server cannot start, don't pretend we can continue.
+ panic("Error trying to start chat/http server: " + err.Error())
+ }
+ common.LogDebugln("ChatServer closed.")
+ }()
+
+ // RTMP server
+ go func() {
+ err := server.ListenAndServe()
+ // http.ErrServerClosed is returned when server.Shuddown()
+ // is called.
+ if err != http.ErrServerClosed {
+ // If the server cannot start, don't pretend we can continue.
+ panic("Error trying to start rtmp server: " + err.Error())
+ }
+ common.LogDebugln("RTMP server closed.")
+ }()
+
+ <-exit
}
diff --git a/static/css/site.css b/static/css/site.css
index 8b254b0..413937a 100644
--- a/static/css/site.css
+++ b/static/css/site.css
@@ -42,6 +42,23 @@ span.svmsg {
color: #ea6260;
}
+input[type=text] {
+ background: transparent;
+ border: var(--var-border);
+ border-radius: var(--var-border-radius);
+ color: var(--var-message-color);
+ padding: 5px;
+ font-weight: bold;
+}
+
+#colorInputDiv {
+ font-size: 14px;
+}
+
+#colorInput {
+ border: 2px solid var(--var-message-color);
+}
+
.root {
max-width: var(--var-max-width);
max-height: var(--var-max-height);
@@ -223,15 +240,6 @@ span.svmsg {
margin: 5px auto;
}
-#name {
- background: transparent;
- border: var(--var-border);
- border-radius: var(--var-border-radius);
- color: var(--var-message-color);
- padding: 5px;
- font-weight: bold;
-}
-
#chat {
display: grid;
grid-template-rows: 1.5em 2em 1fr 6em 2.5em 1em;
@@ -295,6 +303,12 @@ span.svmsg {
color: #b1b1b1;
}
+#colorName {
+ font-weight: bold;
+ background: var(--var-background-color);
+ padding: -10px;
+}
+
#colorSubmit:disabled {
display: none;
}
diff --git a/static/js/chat.js b/static/js/chat.js
index 6c5a0eb..abe0587 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -158,6 +158,10 @@ function help() {
}
function showColors(show) {
+ if (show === undefined) {
+ show = $("#hiddencolor").css("display") === "none";
+ }
+
$("#hiddencolor").css("display", show ? "block" : "");
}
@@ -188,11 +192,22 @@ function updateColor() {
function changeColor() {
if (isValidColor(colorAsHex())) {
- sendMessage("/color " + colorAsHex());
- showColors(false);
+ sendColor(colorAsHex());
}
}
+function colorSelectChange() {
+ let val = $("#colorSelect").val()
+ if (val !== "") {
+ sendColor(val);
+ }
+}
+
+function sendColor(color) {
+ sendMessage("/color " + color);
+ showColors(false);
+}
+
function setTimestamp(v) {
showTimestamp(v)
document.cookie = "timestamp=" + v
@@ -268,37 +283,3 @@ window.addEventListener("load", () => {
// Make sure name is focused on start
$("#name").focus();
});
-
-function pleaseremovethis() {
- colors = ["aliceblue", "antiquewhite", "aqua", "aquamarine", "azure",
- "beige", "bisque", "black", "blanchedalmond", "blue",
- "blueviolet", "brown", "burlywood", "cadetblue", "chartreuse",
- "chocolate", "coral", "cornflowerblue", "cornsilk", "crimson",
- "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray",
- "darkgrey", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
- "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
- "darkslateblue", "darkslategray", "darkslategrey", "darkturquoise", "darkviolet",
- "deeppink", "deepskyblue", "dimgray", "dimgrey", "dodgerblue",
- "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro",
- "ghostwhite", "gold", "goldenrod", "gray", "grey",
- "green", "greenyellow", "honeydew", "hotpink", "indianred",
- "indigo", "ivory", "khaki", "lavender", "lavenderblush",
- "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan",
- "lightgoldenrodyellow", "lightgray", "lightgrey", "lightgreen", "lightpink",
- "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightslategrey",
- "lightsteelblue", "lightyellow", "lime", "limegreen", "linen",
- "magenta", "maroon", "mediumaquamarine", "mediumblue", "mediumorchid",
- "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
- "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
- "navajowhite", "navy", "oldlace", "olive", "olivedrab",
- "orange", "orangered", "orchid", "palegoldenrod", "palegreen",
- "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru",
- "pink", "plum", "powderblue", "purple", "rebeccapurple",
- "red", "rosybrown", "royalblue", "saddlebrown", "salmon",
- "sandybrown", "seagreen", "seashell", "sienna", "silver",
- "skyblue", "slateblue", "slategray", "slategrey", "snow",
- "springgreen", "steelblue", "tan", "teal", "thistle",
- "tomato", "turquoise", "violet", "wheat", "white",
- "whitesmoke", "yellow", "yellowgreen",]
-
-}
diff --git a/static/main.html b/static/main.html
index 3607ce8..7704486 100644
--- a/static/main.html
+++ b/static/main.html
@@ -50,7 +50,7 @@