adds dice to queue

Reviewed-on: #41

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arindy</groupId>
     <artifactId>dice-tower</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.7-SNAPSHOT</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

src/main/kotlin/de/arindy/dicetower/DiceResource.kt

@@ -35,27 +35,31 @@ final class DiceResource(@Context val sse: Sse) {
     fun parseCommand(@PathParam("id") id: String, data: RollPayload) {
         data.room = id.split(":")[0]
         data.user = id.split(":")[1]
-
         val results = ArrayList<Results>()
-        var numberOfDice = 0
-        data.command.split(" ", "&", "and").filter { it.isNotEmpty() }.map { it.trim() }.toTypedArray<String>().forEach { command ->
-            val dice = command.split("d")
-            var amount = dice[0].toInt()
-            val limit = diceLimit.orElse(LIMIT)
-            if (limit < numberOfDice + amount) {
-                amount = limit - numberOfDice
-            }
-            numberOfDice += amount
-            if (amount > 0) {
-                val result = IntArray(amount)
-                val sides = dice[1].split("+", "-")
-                val modifier = if (dice[1].contains("+")) sides[1].toInt() else if (dice[1].contains("+")) -1 * sides[1].toInt() else 0
-                repeat(amount) { index ->
-                    result[index] = (Math.random() * sides[0].toInt() + 1).toInt()
+        if (data.results == null) {
+            var numberOfDice = 0
+            data.command.split(" ", "&", "and").filter { it.isNotEmpty() }.map { it.trim() }.toTypedArray<String>().forEach { command ->
+                val dice = command.split("d")
+                var amount = dice[0].toInt()
+                val limit = diceLimit.orElse(LIMIT)
+                if (limit < numberOfDice + amount) {
+                    amount = limit - numberOfDice
+                }
+                numberOfDice += amount
+                if (amount > 0) {
+                    val result = IntArray(amount)
+                    val sides = dice[1].split("+", "-")
+                    val modifier = if (dice[1].contains("+")) sides[1].toInt() else if (dice[1].contains("+")) -1 * sides[1].toInt() else 0
+                    repeat(amount) { index ->
+                        result[index] = (Math.random() * sides[0].toInt() + 1).toInt()
+                    }
+                    results.add(Results(sides[0].toInt(), modifier, result.sum() + modifier, result.map { Roll(it) }.toTypedArray()))
                 }
-                results.add(Results(sides[0].toInt(), modifier, result.sum() + modifier, result.map { Roll(it) }.toTypedArray()))
             }
+        } else {
+            results.addAll(data.results)
         }
+
         val map = results.map { r ->
             "${r.rolls.size}d${r.sides}@${
                 if (r.sides == 100) r.rolls.map { roll -> Roll(roll.value / 10 * 10) }
@@ -64,13 +68,13 @@ final class DiceResource(@Context val sse: Sse) {
         }.toTypedArray()
 
         data.roll = map + results.filter { it.sides == 100 }.map { r -> "${r.rolls.size}d10@${r.rolls.map { roll -> Roll(roll.value % 10) }.joinToString(",")}"}.toTypedArray()
+        if (data.roll.all { it.trim().isNotEmpty() }) {
+            results(data.room!!, Result(data.name, data.user!!, data.faceColor, null))
+        }
         sseBroadcasters[id]?.broadcast(
             eventBuilder.id((UUID.randomUUID()).toString())
                 .mediaType(MediaType.APPLICATION_JSON_TYPE).data(data).build()
         )
-        if (data.roll.all { it.trim().isNotEmpty() }) {
-            results(data.room!!, Result(data.name, data.user!!, data.faceColor, null))
-        }
         Thread.sleep(1000)
         results(data.room!!, Result(data.name, data.user!!, data.faceColor, results.toTypedArray()))
     }

src/main/kotlin/de/arindy/dicetower/OverlayResource.kt

@@ -20,7 +20,7 @@ class OverlayResource {
     @GET
     @Path("/results")
     @Produces(MediaType.TEXT_HTML)
-    fun results(@PathParam("diceid") room: String, @QueryParam("name") name: String?, @QueryParam("user") user: String?): TemplateInstance {
-        return Templates.results(room, name ?: "all", user ?: "all")
+    fun results(@PathParam("diceid") room: String, @QueryParam("name") name: String?): TemplateInstance {
+        return Templates.results(room, name ?: "all")
     }
 }

src/main/kotlin/de/arindy/dicetower/RollPayload.kt

@@ -6,7 +6,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection
 data class RollPayload(
     val name: String,
     var command: String,
-    var predetermined: Boolean? = false,
+    val results: Array<DiceResource.Results>?,
     val faceColor: String = "white",
     val numberColor: String = "white",
     val theme: String = "default",

src/main/kotlin/de/arindy/dicetower/Templates.kt

@@ -9,7 +9,7 @@ object Templates {
     external fun overlay(diceid: String, scale: Int?, clearAfter: Long?): TemplateInstance
 
     @JvmStatic
-    external fun results(room: String, name: String?, user: String?): TemplateInstance
+    external fun results(room: String, name: String?): TemplateInstance
 
     @JvmStatic
     external fun index(version: String): TemplateInstance

src/main/resources/templates/overlay.html

@@ -9,13 +9,14 @@
 <body>
 <div id="dice-box"></div>
 <script type="module">
+    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
+
     function url() {
         return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
     }
 
-    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
-
     const evtSource = new EventSource(url() + "/dice/{diceid??}/stream");
+
     const diceBox = new DiceBox("#dice-box", {
         assetPath: "/vendor/dice-box/",
         light_intensity: 2,
@@ -23,26 +24,67 @@
         baseScale: {scale} * 10,
         strength: Math.floor(Math.random() * 4),
     });
+
     diceBox.initialize();
-    let timeout = 0;
-    evtSource.addEventListener("message", function (event) {
-        clearInterval(timeout);
-        let data = JSON.parse(event.data);
-        diceBox.onRollComplete = () => {
-            if ({clearAfter} > 0) {
-                timeout = setTimeout(() => diceBox.clearDice(), {clearAfter} * 1000)
+
+    let rollQueue = [];
+    let rolling = false;
+    let clearTimeoutId = null;
+    let lastRollTime = Date.now();
+
+    function scheduleClear() {
+        if (clearTimeoutId) clearTimeout(clearTimeoutId);
+
+        clearTimeoutId = setTimeout(() => {
+            const now = Date.now();
+            if (now - lastRollTime >= ({clearAfter} * 1000)) {
+                diceBox.clearDice();
+                rolling = false;
+                processQueue();
+            } else {
+                scheduleClear(); // try again later
             }
+        }, {clearAfter} * 1000);
+    }
+
+    async function processQueue() {
+        if (rolling || rollQueue.length === 0) return;
+
+        rolling = true;
+
+        const data = rollQueue.shift();
+        const rollString = data.roll
+                .filter(it => it.split('@')[0].split('d')[1] !== "2")
+                .join('&');
+
+        if (!rollString) {
+            rolling = false;
+            return;
         }
-        diceBox.updateConfig({
+
+        lastRollTime = Date.now();
+
+        await diceBox.updateConfig({
             theme_customColorset: {
                 texture: data.theme,
                 background: data.faceColor,
                 foreground: data.numberColor
             }
-        }).then(() => {
-            diceBox.roll(data.roll.filter(it => it.split('@')[0].split('d')[1] !== "2").join('&'));
-        })
-    })
+        });
+
+        await diceBox.add(rollString);
+        scheduleClear();
+
+        rolling = false;
+        void processQueue();
+    }
+
+    evtSource.addEventListener("message", function (event) {
+        const data = JSON.parse(event.data);
+        rollQueue.push(data);
+        processQueue();
+    });
+
 </script>
 </body>
 </html>

src/main/resources/templates/results.html

@@ -17,9 +17,9 @@
     const evtSource = new EventSource(url() + '/dice/{room}/results');
     evtSource.addEventListener('message', function (event) {
         let data = JSON.parse(event.data);
-        if ("{name}" === "all" && "{user}" === "all" || "{name}" === data.name && "{user}" === data.user || "{name}" === "all" && "{user}" === data.user || "{name}" === data.name && "{user}" === "all") {
-            let name = document.getElementById(data.user + '-' + data.name) ?? document.createElement('div');
-            name.id = data.user + '-' + data.name;
+        if ("{name}" === "all" || "{name}" === data.name) {
+            let name = document.getElementById(data.name) ?? document.createElement('div');
+            name.id = data.name;
             name.replaceChildren(...[]);
             let node = document.createElement('p');
             let resultText = ''