adds dice to queue

Reviewed-on: #41

.github/workflows/ci.yaml

@@ -66,11 +66,11 @@ jobs:
 
       - name: Deploy unstable
         if: github.ref_name != 'main'
-        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.unstable.yml up -d'  "
+        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.unstable.yml pull && docker compose -f compose.unstable.yml up -d'  "
 
       - name: Deploy
         if: github.ref_name == 'main'
-        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.yml up -d'  "
+        run: "ssh -i ./.key dice-tower@${{secrets.SSH_HOST}} 'docker compose -f compose.yml pull && docker compose -f compose.yml up -d'  "
 
       - name: Deploy local
         if: github.ref_name == 'main'

README.md

@@ -16,6 +16,7 @@
 <p align="center">
   <img src=".github/media/preview.gif" />
 </p>
+
 ---
 
 ## Key Features
@@ -27,6 +28,7 @@
 * Watch roll results (also available as Browser Source in OBS)
 
 ---
+
 ## Start Container
 
 You can start dice-tower with docker compose
@@ -40,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.0-SNAPSHOT</version>
+    <version>1.2.7-SNAPSHOT</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

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

@@ -23,11 +23,12 @@ class ChatOverlayResource {
         @QueryParam("subsAllowed") subsAllowed: Boolean = false,
         @QueryParam("cmd") cmd: String? = "roll",
         @QueryParam("theme") theme: String? = "default",
-        @QueryParam("themeColor") themeColor: String? = "default",
+        @QueryParam("faceColor") faceColor: String? = "#ff0202",
+        @QueryParam("numberColor") numberColor: String? = "#ffffff",
         @QueryParam("clearAfter") clearAfter: Long? = -1,
         @QueryParam("timeout") timeout: Long? = -1
     ): TemplateInstance {
-        return Templates.chatoverlay(channel, scale ?: 7, maxDice ?: 20, modsAllowed, vipAllowed, subsAllowed, cmd ?: "roll", theme ?: "default", themeColor ?: "ff0202", clearAfter ?: 10, timeout ?: 60)
+        return Templates.chatoverlay(channel, scale ?: 7, maxDice ?: 20, modsAllowed, vipAllowed, subsAllowed, cmd ?: "roll", theme ?: "default", faceColor ?: "#ff0202", numberColor ?: "#ffffff", clearAfter ?: 10, timeout ?: 60)
     }
 
     @GET

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,15 +68,15 @@ 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.themeColor, null))
-        }
         Thread.sleep(1000)
-        results(data.room!!, Result(data.name, data.user!!, data.themeColor, results.toTypedArray()))
+        results(data.room!!, Result(data.name, data.user!!, data.faceColor, results.toTypedArray()))
     }
 
     @POST
@@ -110,7 +130,7 @@ final class DiceResource(@Context val sse: Sse) {
     }
 
     @RegisterForReflection
-    data class Result(val name: String, val user: String, val themeColor: String, val results: Array<Results>?) {
+    data class Result(val name: String, val user: String, val faceColor: String, val results: Array<Results>?) {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -119,7 +139,7 @@ final class DiceResource(@Context val sse: Sse) {
 
             if (name != other.name) return false
             if (user != other.user) return false
-            if (themeColor != other.themeColor) return false
+            if (faceColor != other.faceColor) return false
             if (results != null) {
                 if (other.results == null) return false
                 if (!results.contentEquals(other.results)) return false
@@ -131,7 +151,7 @@ final class DiceResource(@Context val sse: Sse) {
         override fun hashCode(): Int {
             var result = name.hashCode()
             result = 31 * result + user.hashCode()
-            result = 31 * result + themeColor.hashCode()
+            result = 31 * result + faceColor.hashCode()
             result = 31 * result + (results?.contentHashCode() ?: 0)
             return result
         }

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

@@ -1,11 +1,14 @@
 package de.arindy.dicetower
 
+import io.quarkus.runtime.annotations.RegisterForReflection
+
+@RegisterForReflection
 data class RollPayload(
     val name: String,
     var command: String,
-    var predetermined: Boolean? = false,
-    val themeColor: String = "white",
-    val themeForegroundColor: String = "white",
+    val results: Array<DiceResource.Results>?,
+    val faceColor: String = "white",
+    val numberColor: String = "white",
     val theme: String = "default",
     var room: String?,
     var user: String?,

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
@@ -27,7 +27,8 @@ object Templates {
         subsAllowed: Boolean,
         cmd: String?,
         theme: String?,
-        themeColor: String?,
+        faceColor: String?,
+        numberColor: String?,
         clearAfter: Long?,
         timeout: Long?
     ): 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';
@@ -48,11 +59,11 @@ function start(event = undefined) {
         if (localStorage.getItem(document.getElementById('name').value + "-theme")) {
             document.getElementById('theme').value = localStorage.getItem(document.getElementById('name').value + "-theme")
         }
-        if (localStorage.getItem(document.getElementById('name').value + "-themeColor")) {
-            document.getElementById('themeColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeColor"));
+        if (localStorage.getItem(document.getElementById('name').value + "-faceColor")) {
+            document.getElementById('faceColor').setColor(localStorage.getItem(document.getElementById('name').value + "-faceColor"));
         }
-        if (localStorage.getItem(document.getElementById('name').value + "-themeForegroundColor")) {
-            document.getElementById('themeForegroundColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeForegroundColor"));
+        if (localStorage.getItem(document.getElementById('name').value + "-numberColor")) {
+            document.getElementById('numberColor').setColor(localStorage.getItem(document.getElementById('name').value + "-numberColor"));
         }
 
         if (!localStorage.getItem(document.getElementById('name').value + '-started')) {
@@ -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,14 +132,15 @@ 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')
         httpRequest.send(JSON.stringify({
             name: document.getElementById('name').value,
             command: document.getElementById('command').value,
-            themeColor: document.getElementById('themeColor').value,
-            themeForegroundColor: document.getElementById('themeForegroundColor').value,
+            faceColor: document.getElementById('faceColor').value,
+            numberColor: document.getElementById('numberColor').value,
             theme: document.getElementById('theme').value
         }))
     }
@@ -140,8 +148,8 @@ function roll(event) {
 
 function saveDice() {
     localStorage.setItem(document.getElementById('name').value + "-theme", document.getElementById('theme').value)
-    localStorage.setItem(document.getElementById('name').value + "-themeColor", document.getElementById('themeColor').value)
-    localStorage.setItem(document.getElementById('name').value + "-themeForegroundColor", document.getElementById('themeForegroundColor').value)
+    localStorage.setItem(document.getElementById('name').value + "-faceColor", document.getElementById('faceColor').value)
+    localStorage.setItem(document.getElementById('name').value + "-numberColor", document.getElementById('numberColor').value)
 }
 
 function configurePopover() {
@@ -190,6 +198,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.querySelector('meta[property="twitter:url"]').setAttribute("content", url());
     document.querySelector('meta[property="og:image"]').setAttribute("content", url() + '/rich.png');
     document.querySelector('meta[name="twitter:image"]').setAttribute("content", url() + '/rich.png');
+    document.querySelector('meta[property="twitter:domain"]').setAttribute("content", window.location.hostname);
 
     if (localStorage.getItem('last-name') && localStorage.getItem('last-room')) {
         document.getElementById('name').value = localStorage.getItem('last-name');
@@ -206,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'
@@ -218,6 +223,3 @@ document.addEventListener("DOMContentLoaded", async () => {
     configurePopover();
 })
 
-if (!localStorage.getItem("userId")) {
-    localStorage.setItem("userId", self.crypto.randomUUID());
-}

src/main/resources/META-INF/resources/dice-preview.js

@@ -115,8 +115,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         diceBox.clearDice();
         await diceBox.updateConfig({
             theme_customColorset: {
-                background: document.getElementById('themeColor').value,
-                foreground: document.getElementById('themeForegroundColor').value,
+                background: document.getElementById('faceColor').value,
+                foreground: document.getElementById('numberColor').value,
                 texture: document.getElementById('theme').value
             }
         });

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/chatoverlay.html

@@ -12,15 +12,20 @@
 <div popover id="results" class="tooltip">
 </div>
 <script type="module">
-    import DiceBox from "/vendor/dice-box/dice-box.es.js";
-
+    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
     const diceBox = new DiceBox("#dice-box", {
-        assetPath: "/vendor/assets/",
-        theme: '{theme}',
-        themeColor: '{themeColor}',
-        scale: {scale}
+        assetPath: "/vendor/dice-box/",
+        light_intensity: 2,
+        gravity_multiplier: 600,
+        baseScale: {scale} * 10,
+        strength: Math.floor(Math.random() * 4),
+        theme_customColorset: {
+            texture: '{theme}',
+            background: '{faceColor}',
+            foreground: '{numberColor}'
+        }
     });
-    diceBox.init()
+    diceBox.initialize();
     ComfyJS.Init('{channel}');
 
     //maxDice
@@ -33,16 +38,16 @@
             toggleWait(true);
 
             diceBox.onRollComplete = (rollResult) => {
-                rollResult.forEach(result => {
+                rollResult.sets.forEach(result => {
                     let values = []
                     result.rolls.forEach(roll => {
                         values.push(roll.value);
                     })
-                    document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
+                    document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + '] = <strong>' + result.total + '</strong> '
                 })
                 document.getElementById('results').showPopover()
                 setTimeout(() => {
-                    diceBox.clear();
+                    diceBox.clearDice();
                     document.getElementById('results').hidePopover()
                 }, {clearAfter} * 1000)
             }

src/main/resources/templates/chatoverlayconfig.html

@@ -23,18 +23,16 @@
     <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; text-align: center; margin-bottom: auto;">
         <label for="theme">Theme </label>
-        <select name="theme" id="theme" style="margin: 25px">
-            <option value="default">Default</option>
-            <option value="blueGreenMetal">Blue-Green Metal</option>
-            <option value="diceOfRolling">Dice of Rolling</option>
-            <option value="gemstone">Gemstone</option>
-            <option value="gemstoneMarble">Marble Gemstone</option>
-            <option value="rock">Rock</option>
-            <option value="rust">Rust</option>
-            <option value="smooth">Smooth</option>
-            <option value="wooden">Wooden</option>
-        </select>
-        <color-picker id="themeColor"></color-picker>
+        <select name="theme" id="theme" style="margin: 0 25px"></select>
+
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline">
+            <div style="flex-grow: 1; padding: 0 10px">
+                <color-picker id="faceColor" name="Face" value="black"></color-picker>
+            </div>
+            <div style="flex-grow: 1; padding: 10px 0">
+                <color-picker id="numberColor" name="Numbers" value="white"></color-picker>
+            </div>
+        </div>
         <div>
             <label for="channel">Channel </label>
             <input type="text" id="channel" style="width: 400px; margin-top: 20px" value="arindy"/>
@@ -57,7 +55,7 @@
         </div>
         <div>
             <label for="scale">Dice-Scale </label>
-            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="9"/>
+            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="15"/>
             <label for="maxDice">Max number of dice </label>
             <input type="number" id="maxDice" style="width: 50px; margin-top: 20px" value="20"/>
         </div>
@@ -67,7 +65,10 @@
             <label for="timeout">Command-timeout (in seconds)</label>
             <input type="number" id="timeout" style="width: 50px; margin-top: 20px" value="60"/>
         </div>
-        <div id="dice-box" style="height: 400px"></div>
+
+        <div id="dice-box" style="width: 850px; height: 400px">
+            <div id="app"></div>
+        </div>
         <button style="margin: 10px" id="preview">Preview <i class="fa-solid fa-magnifying-glass"></i></button>
         <button style="margin: 10px" id="generate">Generate overlay-link <i class="fa-solid fa-link"></i></button>
         <div>
@@ -104,30 +105,139 @@
     }
 </script>
 <script type="module">
-    import DiceBox from "/vendor/dice-box/dice-box.es.js";
+    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
+    let diceBox
+
+    const Themes = {
+        cloudy: {
+            name: "Clouds (Transparent)"
+        },
+        cloudy_2: {
+            name: "Clouds"
+        },
+        fire: {
+            name: "Fire"
+        },
+        marble: {
+            name: "Marble"
+        },
+        water: {
+            name: "Water"
+        },
+        ice: {
+            name: "Ice"
+        },
+        paper: {
+            name: "Paper"
+        },
+        speckles: {
+            name: "Speckles"
+        },
+        glitter: {
+            name: "Glitter"
+        },
+        glitter_2: {
+            name: "Glitter (Transparent)"
+        },
+        stars: {
+            name: "Stars"
+        },
+        stainedglass: {
+            name: "Stained Glass"
+        },
+        wood: {
+            name: "Wood"
+        },
+        metal: {
+            name: "Stainless Steel"
+        },
+        skulls: {
+            name: "Skulls"
+        },
+        leopard: {
+            name: "Leopard"
+        },
+        tiger: {
+            name: "Tiger"
+        },
+        cheetah: {
+            name: "Cheetah"
+        },
+        dragon: {
+            name: "Dragon"
+        },
+        lizard: {
+            name: "Lizard"
+        },
+        bird: {
+            name: "Bird"
+        },
+        astral: {
+            name: "Astral Sea"
+        },
+        bronze01: {
+            name: "Bronze 1"
+        },
+        bronze02: {
+            name: "Bronze 2"
+        },
+        bronze03: {
+            name: "Bronze 3"
+        },
+        bronze03a: {
+            name: "Bronze 3a"
+        },
+        bronze03b: {
+            name: "Bronze 3b"
+        },
+        bronze04: {
+            name: "Bronze 4"
+        },
+        none: {
+            name: "none"
+        }
+    }
 
     function url() {
         return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
     }
 
     document.addEventListener("DOMContentLoaded", async () => {
+        const themeSelector = document.getElementById('theme');
+        for (const theme in Themes) {
+            let option = document.createElement('option');
+            option.value = theme;
+            option.innerText = Themes[theme].name;
+            themeSelector.appendChild(option);
+        }
+        themeSelector.value = 'cloudy';
         document.getElementById('preview').onclick = async () => {
-            document.getElementById('dice-box').replaceChildren(...[])
-            const diceBox = new DiceBox("#dice-box", {
-                assetPath: "/vendor/assets/",
-                theme: document.getElementById('theme').value,
-                themeColor: document.getElementById('themeColor').value,
-                scale: +document.getElementById('scale').value
+            document.getElementById('app').replaceChildren(...[])
+            diceBox = new DiceBox("#app", {
+                assetPath: "/vendor/dice-box/",
+                light_intensity: 2,
+                gravity_multiplier: 600,
+                baseScale: 120,
+                strength: Math.floor(Math.random() * 4),
             });
-            await diceBox.init()
-            diceBox.roll(['1d2', '1d4', '1d6', '1d8', '1d10', '1d12', '1d20', '1d100']);
+            await diceBox.initialize();
+            diceBox.clearDice();
+            await diceBox.updateConfig({
+                theme_customColorset: {
+                    background: document.getElementById('faceColor').value,
+                    foreground: document.getElementById('numberColor').value,
+                    texture: document.getElementById('theme').value
+                }
+            });
+            await diceBox.roll('1d2 & 1d4 & 1d6 & 1d8 & 1d10 & 1d12 & 1d20 & 1d100');
         }
         document.getElementById('generate').onclick = async () => {
             document.getElementById('link').value = url() +
                     "/chatoverlay/" + document.getElementById('channel').value +
                     "?cmd=" + document.getElementById('cmd').value +
                     "&theme=" + document.getElementById('theme').value +
-                    "&themeColor=" + encodeURIComponent(document.getElementById('themeColor').value) +
+                    "&faceColor=" + encodeURIComponent(document.getElementById('faceColor').value) +
+                    "&numberColor=" + encodeURIComponent(document.getElementById('numberColor').value) +
                     "&scale=" + document.getElementById('scale').value +
                     "&maxDice=" + document.getElementById('maxDice').value +
                     "&clearAfter=" + document.getElementById('clearAfter').value +

src/main/resources/templates/index.html

@@ -3,25 +3,8 @@
 <head>
     <meta charset="UTF-8">
     <title>Dice-Tower</title>
-
-    <meta property="og:title" content="Dice-Tower">
-    <meta name="twitter:title" content="Dice-Tower">
-
-    <meta property="og:type" content="website">
-    <meta name="twitter:card" content="summary_large_image">
-
-    <meta property="og:url" content="https://dice-tower.com">
-    <meta property="twitter:url" content="https://dice-tower.com">
-
-    <meta property="twitter:domain" content="dice-tower.com">
-
-    <meta property="og:image" content="https://dice-tower.com/rich.png">
-    <meta name="twitter:image" content="https://dice-tower.com/rich.png">
-
-    <meta name="description" content="
-        Easy to use online dice rolling with customizable overlays.
-">
-
+    <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">
@@ -30,12 +13,43 @@
     <script src="/vendor/color-picker.js"></script>
     <script type="module" src="/dice-preview.js"></script>
     <script type="text/javascript" src="/app.js"></script>
+
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="Dice-Tower">
+    <meta name="twitter:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta name="description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta name="twitter:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:url" content="{http:request.absoluteURI}">
+    <meta property="og:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta property="og:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:title" content="Dice-Tower">
+    <meta property="og:site_name" content="Dice-Tower">
+    <meta property="og:type" content="website">
+    <meta property="twitter:url" content="{http:request.absoluteURI}">
+    <meta property="twitter:domain" content="{http:request.authority}">
 </head>
 <body class="w3-theme-l1">
+<script>
+    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">
     <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
     </h1>
+
     <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; text-align: center; margin-bottom: auto;">
         <h2 id="nameH" popovertarget="room-hint" data-trigger="hover" style="margin: 0" hidden>Name</h2>
@@ -75,6 +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('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>
@@ -135,10 +150,10 @@
         </div>
         <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline">
             <div style="flex-grow: 1; padding: 0 10px">
-                <color-picker id="themeColor" name="Face"></color-picker>
+                <color-picker id="faceColor" name="Face" value="#8d8981"></color-picker>
             </div>
             <div style="flex-grow: 1; padding: 10px 0">
-                <color-picker id="themeForegroundColor" name="Numbers"></color-picker>
+                <color-picker id="numberColor" name="Numbers" value="black"></color-picker>
             </div>
         </div>
         <div id="dice-box">
@@ -187,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.themeColor,
-                foreground: data.themeForegroundColor
+                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 = ''
@@ -34,7 +34,7 @@
                     resultText += '<br/><strong>&ensp; D' + result.sides + '</strong>: [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
                 })
             }
-            node.innerHTML = '<strong style="text-shadow: 2px 2px 10px ' + data.themeColor + ';">' + data.name + ':</strong> ' + resultText
+            node.innerHTML = '<strong style="text-shadow: 2px 2px 10px ' + data.faceColor + ';">' + data.name + ':</strong> ' + resultText
             name.appendChild(node)
             document.getElementById('results').insertBefore(name, document.getElementById('results').firstChild);
         }