[no ci] release 1.2.4

Reviewed-on: #39

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.2</version>
+    <version>1.2.4</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()
 
@@ -30,16 +37,25 @@ final class DiceResource(@Context val sse: Sse) {
         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")
-            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()))
             }
+        }
         val map = results.map { r ->
             "${r.rolls.size}d${r.sides}@${
                 if (r.sides == 100) r.rolls.map { roll -> Roll(roll.value / 10 * 10) }

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();
+        register();
-        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')
-        }))
         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 = !this.checked;
-            document.getElementById('results-dice').hidden = true
-        } else {
-            document.getElementById('results-dice').hidden = false
-        }
     })
 
     document.getElementById('chatOverlayLink').href = url() + '/chatoverlay'

src/main/resources/templates/index.html

@@ -202,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/>
+                    Join a room by entering your character name and the name of the room
-                    <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>
                 </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)