adds dice to queue

Reviewed-on: #41

README.md

@@ -42,6 +42,8 @@ services:
     restart: always
     ports:
       - "8080:8080"
+    environment:
+      DICE_LIMIT: 30    # OPTIONAL: amount of dice allowed to roll (default: 30)
 ```
 Run the container with:
 ```bash

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arindy</groupId>
     <artifactId>dice-tower</artifactId>
-    <version>1.2.1</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

@@ -14,12 +14,19 @@ import jakarta.ws.rs.sse.OutboundSseEvent
 import jakarta.ws.rs.sse.Sse
 import jakarta.ws.rs.sse.SseBroadcaster
 import jakarta.ws.rs.sse.SseEventSink
+import org.eclipse.microprofile.config.inject.ConfigProperty
+import java.util.Optional
 import java.util.UUID
 
+private const val LIMIT = 30
+
 @Path("/dice/{id}")
 @ApplicationScoped
 final class DiceResource(@Context val sse: Sse) {
 
+    @ConfigProperty(name = "dice.limit")
+    private lateinit var diceLimit: Optional<Int>
+
     private var eventBuilder: OutboundSseEvent.Builder = sse.newEventBuilder()
     private var sseBroadcasters: MutableMap<String, SseBroadcaster> = HashMap()
 
@@ -28,18 +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>()
+        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")
-            val result = IntArray(dice[0].toInt())
+                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(dice[0].toInt()) { index ->
+                    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()))
                 }
+            }
+        } 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) }
@@ -48,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/META-INF/resources/app.js

@@ -14,6 +14,17 @@ function url() {
     return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
 }
 
+function register() {
+    let httpRequest = new XMLHttpRequest();
+    httpRequest.open('POST', url() + '/dice/' + document.getElementById('room').value + '/register')
+    httpRequest.setRequestHeader('Content-Type', 'application/json')
+    httpRequest.send(JSON.stringify({
+        name: document.getElementById('name').value,
+        overlay: document.getElementById('overlayId').value,
+        id: document.getElementById('room').value + ':' + localStorage.getItem('userId')
+    }))
+}
+
 function start(event = undefined) {
     if ((!event || event.keyCode === 13) && document.getElementById('name').value.length > 0 && document.getElementById('room').value.length > 0) {
         document.getElementById('overlayId').value = url() + '/overlay/' + document.getElementById('room').value + ':' + localStorage.getItem('userId') + '?scale=10&clearAfter=30';
@@ -61,14 +72,7 @@ function start(event = undefined) {
 
         localStorage.setItem(document.getElementById('name').value + '-started', "true")
 
-        let httpRequest = new XMLHttpRequest();
-        httpRequest.open('POST', url() + '/dice/' + document.getElementById('room').value + '/register')
-        httpRequest.setRequestHeader('Content-Type', 'application/json')
-        httpRequest.send(JSON.stringify({
-            name: document.getElementById('name').value,
-            overlay: document.getElementById('overlayId').value,
-            id: document.getElementById('room').value + ':' + localStorage.getItem('userId')
-        }))
+        register();
         if (document.getElementById('gm').checked) {
             document.getElementById('resultSwitch').checked = true;
             document.getElementById('resultFrame').src = document.getElementById('resultsId').value;
@@ -98,6 +102,7 @@ function start(event = undefined) {
                     newOverlay.appendChild(newInput);
                     overlays.appendChild(newOverlay);
 
+                    if (!document.getElementById(data.id + '-diceFrame')) {
                         let dice = document.createElement('iframe');
                         dice.id = data.id + '-diceFrame'
                         dice.style.width = "50%";
@@ -110,6 +115,8 @@ function start(event = undefined) {
                         dice.style.left = "50%";
                         dice.src = data.overlay;
                         document.getElementById('results-dice').appendChild(dice)
+
+                    }
                 }
 
                 configurePopover();
@@ -125,6 +132,7 @@ function rollEasy(dice) {
 
 function roll(event) {
     if ((!event || event.keyCode === 13) && document.getElementById('command').value?.length > 0) {
+        register()
         let httpRequest = new XMLHttpRequest();
         httpRequest.open('POST', url() + '/dice/' + document.getElementById('room').value + ':' + localStorage.getItem(`userId`))
         httpRequest.setRequestHeader('Content-Type', 'application/json')
@@ -207,11 +215,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     })
 
     document.getElementById('resultDiceSwitch').addEventListener('change', function () {
-        if (!this.checked) {
-            document.getElementById('results-dice').hidden = true
-        } else {
-            document.getElementById('results-dice').hidden = false
-        }
+        document.getElementById('results-dice').hidden = !this.checked;
     })
 
     document.getElementById('chatOverlayLink').href = url() + '/chatoverlay'

src/main/resources/META-INF/resources/manifest.json

@@ -0,0 +1,18 @@
+{
+  "name": "Dice-Tower",
+  "icons": [
+    {
+      "src": "192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": "/",
+  "display_override": ["window-controls-overlay", "minimal-ui"],
+  "display": "standalone"
+}

src/main/resources/META-INF/resources/style.css

@@ -32,6 +32,22 @@ button:active {
     background: #222222;
 }
 
+#install {
+    padding: 10px;
+    border: #666666 3px solid;
+    border-radius: 10px;
+    background: #666666;
+    color: #fff
+}
+
+#install:hover {
+    background: #444444;
+}
+
+#install:active {
+    background: #222222;
+}
+
 input {
     margin: 10px;
 }

src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <title>Dice-Tower</title>
     <meta name="version" content="{version}">
-
+    <link rel="manifest" href="manifest.json" />
     <link rel="stylesheet" href="/vendor/w3css/4/w3.css">
     <link rel="stylesheet" href="/vendor/font-awesome/css/fontawesome.css">
     <link rel="stylesheet" href="/vendor/font-awesome/css/all.css">
@@ -33,6 +33,17 @@
     if (!localStorage.getItem("userId")) {
         localStorage.setItem("userId", self.crypto.randomUUID());
     }
+    addEventListener("beforeinstallprompt", (event) => {
+        event.preventDefault()
+        let install = document.createElement('button');
+        install.id = 'install'
+        install.style.position = 'absolute'
+        install.style.top = '25px'
+        install.style.right = '25px'
+        install.innerHTML = 'Install Dice-Tower'
+        install.onclick = () => event.prompt()
+        document.body.appendChild(install)
+    });
 </script>
 <div class="w3-container w3-content"
      style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
@@ -78,7 +89,7 @@
             <button style="border: transparent; border-radius: 100%; font-size: large; font-weight: bold; height: 50px; width: 50px"
                     onclick="addDice()">+
             </button>
-            <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d2')">D2</button>
+            <!--<button style="font-size: large; font-weight: bold;" onclick="rollEasy('d2')">D2</button><-->
             <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d4')">D4</button>
             <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d6')">D6</button>
             <button style="font-size: large; font-weight: bold;" onclick="rollEasy('d8')">D8</button>
@@ -191,11 +202,8 @@
             <h2 style="text-align: center">How-To</h2>
             <ul>
                 <li>
-                    Join a room by entering your character name and the name of the room.<br/>
-                    <strong>If you are a GM, make sure to join the room first or let all other players rejoin to get all
-                        Overlay-URLs.</strong>
+                    Join a room by entering your character name and the name of the room
                 </li>
-
                 <li>Open your Dice-Overlay either in a new Tab or as a browser source in OBS</li>
                 <ul>
                     <li>You can configure your Overlay with query parameters (for more information hover over the link)

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);
     }
-        diceBox.updateConfig({
+
+    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;
+        }
+
+        lastRollTime = Date.now();
+
+        await diceBox.updateConfig({
             theme_customColorset: {
                 texture: data.theme,
                 background: data.faceColor,
                 foreground: data.numberColor
             }
-        }).then(() => {
-            diceBox.roll(data.roll.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 = ''