From e2e4495f02e6f0cc0452e60e48bddae1d2c261fd Mon Sep 17 00:00:00 2001
From: Thomas <gltron3000@gmail.com>
Date: Fri, 21 Aug 2020 15:53:16 +0200
Subject: [PATCH] Added client socket

---
 client/package-lock.json                      |   7 +-
 client/package.json                           |   4 +-
 client/src/App.vue                            |  19 ++++-
 .../{views/Home.vue => components/Game.vue}   |  43 +++++------
 client/src/main.js                            |   4 +-
 client/src/router/index.js                    |  19 -----
 client/src/store/gameModule.js                |  69 ++++++++++++++++++
 client/src/store/index.js                     |  15 ++++
 client/src/store/socketPlugin.js              |  48 ++++++++++++
 .../gltronic/tronio/TronIoApplication.java    |   2 +-
 .../gltronic/tronio/business/GameManager.java |   5 +-
 .../main/java/gltronic/tronio/model/Game.java |  18 ++++-
 .../gltronic/tronio/web/SocketHandler.java    |   2 +-
 .../gltronic/tronio/TronIoApplication.class   | Bin 952 -> 952 bytes
 .../tronio/business/GameManager.class         | Bin 6842 -> 6949 bytes
 .../classes/gltronic/tronio/model/Game.class  | Bin 1677 -> 2179 bytes
 .../gltronic/tronio/web/SocketHandler.class   | Bin 3149 -> 3152 bytes
 17 files changed, 200 insertions(+), 55 deletions(-)
 rename client/src/{views/Home.vue => components/Game.vue} (92%)
 delete mode 100644 client/src/router/index.js
 create mode 100644 client/src/store/gameModule.js
 create mode 100644 client/src/store/index.js
 create mode 100644 client/src/store/socketPlugin.js

diff --git a/client/package-lock.json b/client/package-lock.json
index c7a9050..6cef027 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "tronio",
+  "name": "tron.io",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -11314,6 +11314,11 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vuex": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
+      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
+    },
     "watchpack": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
diff --git a/client/package.json b/client/package.json
index 818d172..42c6716 100644
--- a/client/package.json
+++ b/client/package.json
@@ -11,13 +11,13 @@
     "core-js": "^3.6.5",
     "register-service-worker": "^1.7.1",
     "vue": "^2.6.11",
-    "vue-router": "^3.2.0"
+    "vue-router": "^3.2.0",
+    "vuex": "^3.5.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.4.0",
     "@vue/cli-plugin-eslint": "~4.4.0",
     "@vue/cli-plugin-pwa": "~4.4.0",
-    "@vue/cli-plugin-router": "~4.4.0",
     "@vue/cli-service": "~4.4.0",
     "@vue/eslint-config-standard": "^5.1.2",
     "babel-eslint": "^10.1.0",
diff --git a/client/src/App.vue b/client/src/App.vue
index b38d086..b8eae0f 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,9 +1,26 @@
 <template>
   <div id="app">
-    <router-view/>
+    <Game v-if="isSocketConnected"/>
+    <div v-else>
+      <h1>Game loadin mate</h1>
+    </div>
   </div>
 </template>
 
+<script>
+import Game from './components/Game'
+export default {
+  name: 'App',
+  components: {
+    Game
+  },
+  computed: {
+    isSocketConnected () {
+      return this.$store.state.game.socketConnected
+    }
+  }
+}
+</script>
 <style>
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;
diff --git a/client/src/views/Home.vue b/client/src/components/Game.vue
similarity index 92%
rename from client/src/views/Home.vue
rename to client/src/components/Game.vue
index 44998bb..cbe50fd 100644
--- a/client/src/views/Home.vue
+++ b/client/src/components/Game.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="home">
+  <div class="game">
     <canvas
       class="game-canvas"
       ref="canvas">
@@ -8,32 +8,16 @@
 </template>
 
 <script>
+import { send } from '@/store/socketPlugin'
 export default {
-  name: 'Home',
+  name: 'Game',
   data () {
     return {
-      player: {
-        x: 100,
-        y: 100,
-        angle: 0,
-        targetAngle: 0,
-        walls: [],
-        lastWall: 0,
-        color: 'red'
-      },
-      players: [],
       mouse: {
         x: 0,
         y: 0
       },
-      settings: {
-        playerSize: 10,
-        playerSpeed: 2,
-        playerTurnSpeed: 10,
-        wallSize: 8,
-        wallUpdate: 5,
-        arenaSize: 1000
-      }
+      renderTimer: null
     }
   },
   computed: {
@@ -42,22 +26,30 @@ export default {
     },
     context () {
       return this.canvas.getContext('2d')
+    },
+    settings () {
+      return this.$store.state.game.settings
+    },
+    player () {
+      return this.$store.state.game.player
+    },
+    players () {
+      return this.$store.state.game.players
+    },
+    isPaused () {
+      return this.$store.state.game.paused
     }
   },
   mounted () {
     this.canvas.width = window.innerWidth
     this.canvas.height = window.innerHeight
     this.canvas.addEventListener('mousemove', this.mouseEvent)
-    // setInterval(this.render, 1000 / 60)
-    setInterval(this.render, 1000 / 60)
-    setInterval(this.movePlayer, 100)
+    this.renderTimer = setInterval(this.render, 1000 / 60)
   },
   methods: {
     render () {
       this.context.clearRect(0, 0, this.canvas.width, this.canvas.height)
       this.renderBorders()
-      this.renderPlayer(this.player)
-      this.renderWalls(this.player.walls, this.player.color)
 
       this.players.forEach(player => {
         this.renderPlayer(player)
@@ -147,6 +139,7 @@ export default {
       var dy = this.mouse.y - this.canvas.height / 2
 
       this.player.targetAngle = Math.atan2(dy, dx)
+      send({ message: this.player, type: 'update' })
     },
     updatePlayer () {
       this.player.lastWall++
diff --git a/client/src/main.js b/client/src/main.js
index 9f15ceb..aa30c8d 100644
--- a/client/src/main.js
+++ b/client/src/main.js
@@ -1,11 +1,11 @@
 import Vue from 'vue'
 import App from './App.vue'
+import store from './store'
 import './registerServiceWorker'
-import router from './router'
 
 Vue.config.productionTip = false
 
 new Vue({
-  router,
+  store,
   render: h => h(App)
 }).$mount('#app')
diff --git a/client/src/router/index.js b/client/src/router/index.js
deleted file mode 100644
index d28a76b..0000000
--- a/client/src/router/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import Home from '../views/Home.vue'
-
-Vue.use(VueRouter)
-
-const routes = [
-  {
-    path: '/',
-    name: 'Home',
-    component: Home
-  }
-]
-
-const router = new VueRouter({
-  routes
-})
-
-export default router
diff --git a/client/src/store/gameModule.js b/client/src/store/gameModule.js
new file mode 100644
index 0000000..364f7df
--- /dev/null
+++ b/client/src/store/gameModule.js
@@ -0,0 +1,69 @@
+const state = {
+  player: {
+    x: 100,
+    y: 100,
+    angle: 0,
+    targetAngle: 0,
+    walls: [],
+    lastWall: 0,
+    color: 'red'
+  },
+  players: {
+
+  },
+  settings: {
+    playerSize: 10,
+    playerSpeed: 2,
+    playerTurnSpeed: 10,
+    wallSize: 8,
+    wallUpdate: 5,
+    arenaSize: 1000
+  },
+  paused: true,
+  socketConnected: false
+}
+
+const getters = {
+}
+
+const actions = {
+  socketConnected ({ commit }) {
+    commit('SET_CONNECTED')
+  },
+  login ({ commit }, player) {
+    commit('SET_PLAYER', player)
+  },
+  settings ({ commit }, settings) {
+    commit('SET_SETTINGS', settings)
+  },
+  update ({ commit }, update) {
+  },
+  dead ({ commit }) {
+  },
+  error ({ commit }, error) {
+    alert('Error: ' + error)
+  }
+}
+
+const mutations = {
+  SET_PLAYER (state, player) {
+    state.player = player
+  },
+  SET_SETTINGS (state, settings) {
+    state.settings = settings
+  },
+  SET_PAUSE (state) {
+    state.paused = !state.paused
+  },
+  SET_CONNECTED (state) {
+    state.socketConnected = !state.socketConnected
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+}
diff --git a/client/src/store/index.js b/client/src/store/index.js
new file mode 100644
index 0000000..e2c7384
--- /dev/null
+++ b/client/src/store/index.js
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import socket from './socketPlugin'
+import game from './gameModule'
+
+Vue.use(Vuex)
+
+export default new Vuex.Store({
+  modules: {
+    game
+  },
+  plugins: [
+    socket()
+  ]
+})
diff --git a/client/src/store/socketPlugin.js b/client/src/store/socketPlugin.js
new file mode 100644
index 0000000..cc36243
--- /dev/null
+++ b/client/src/store/socketPlugin.js
@@ -0,0 +1,48 @@
+const connection = new WebSocket('ws://localhost:8181/socket')
+// const connection = new WebSocket('wss://tronio.gltronic.ovh/socket')
+
+export default function createSocketPlugin () {
+  return store => {
+    connection.onopen = function () {
+      console.log('[WS] connected')
+      store.dispatch('game/socketConnected')
+    }
+
+    connection.onclose = function () {
+      console.log('[WS] closed')
+    }
+
+    connection.onerror = function (error) {
+      console.log('[WS] error ' + error.message)
+      store.dispatch('game/error', 'Connection problem')
+    }
+
+    connection.onmessage = function (message) {
+      console.log('[WS] message', message.data)
+
+      var data = JSON.parse(message.data)
+
+      switch (data.type) {
+        case 'login':
+          store.dispatch('game/login', data.message)
+          break
+        case 'gameSettings':
+          store.dispatch('game/settings', data.message)
+          break
+        case 'gameUpdate':
+          store.dispatch('game/update', data.message)
+          break
+        case 'gamePlayerDead':
+          store.dispatch('game/dead')
+          break
+        default:
+          break
+      }
+    }
+  }
+}
+
+export function send (message) {
+  console.log('[WS] send', message)
+  connection.send(JSON.stringify(message))
+}
diff --git a/server/src/main/java/gltronic/tronio/TronIoApplication.java b/server/src/main/java/gltronic/tronio/TronIoApplication.java
index 96e9594..781e7e4 100644
--- a/server/src/main/java/gltronic/tronio/TronIoApplication.java
+++ b/server/src/main/java/gltronic/tronio/TronIoApplication.java
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication
-@ComponentScan(basePackages = "gltronic.voozik")
+@ComponentScan(basePackages = "gltronic.tronio")
 @PropertySource("classpath:application.properties")
 public class TronIoApplication {
 
diff --git a/server/src/main/java/gltronic/tronio/business/GameManager.java b/server/src/main/java/gltronic/tronio/business/GameManager.java
index 6a89faa..a2d51ae 100644
--- a/server/src/main/java/gltronic/tronio/business/GameManager.java
+++ b/server/src/main/java/gltronic/tronio/business/GameManager.java
@@ -6,12 +6,14 @@ import java.util.Random;
 
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.socket.WebSocketSession;
 
 import gltronic.tronio.model.Game;
 import gltronic.tronio.model.Player;
 import gltronic.tronio.model.Wall;
 
+@Service
 public class GameManager implements IGameManager {
   @Autowired
   Game game;
@@ -29,6 +31,7 @@ public class GameManager implements IGameManager {
     game.getPlayers().put(session.getId(), player);
 
     SocketUtils.forwardMessage(session, "login", new JSONObject(player));
+    SocketUtils.forwardMessage(session, "gameSettings", new JSONObject(game.getSettings()));
   }
 
   @Override
@@ -90,7 +93,7 @@ public class GameManager implements IGameManager {
   private void killPlayer (String id) {
     Player player = game.getPlayers().get(id);
     initPlayer(player);
-    SocketUtils.sendMessage(game.getSessions().get(id), "dead", "yo dead");
+    SocketUtils.sendMessage(game.getSessions().get(id), "gamePlayerDead", "yo dead");
   }
 
   private boolean isCloseToWall (double xa, double ya, double xb, double yb, double xc, double yc, double radius) {
diff --git a/server/src/main/java/gltronic/tronio/model/Game.java b/server/src/main/java/gltronic/tronio/model/Game.java
index 30fedd3..174613a 100644
--- a/server/src/main/java/gltronic/tronio/model/Game.java
+++ b/server/src/main/java/gltronic/tronio/model/Game.java
@@ -1,18 +1,32 @@
 package gltronic.tronio.model;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.stereotype.Component;
 import org.springframework.web.socket.WebSocketSession;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
-@NoArgsConstructor
+@Component
 public class Game {
   private Map<String, Player> players;
   private Map<String, WebSocketSession> sessions;
   private GameSettings settings;
+
+  public Game() {
+    this.players = new HashMap<>();
+    this.sessions = new HashMap<>();
+    this.settings = new GameSettings();
+
+    this.settings.setArenaSize(1000);
+    this.settings.setPlayerSize(10);
+    this.settings.setPlayerSpeed(2);
+    this.settings.setPlayerTurnSpeed(10);
+    this.settings.setWallSize(8);
+    this.settings.setWallUpdate(5);
+  }
 }
\ No newline at end of file
diff --git a/server/src/main/java/gltronic/tronio/web/SocketHandler.java b/server/src/main/java/gltronic/tronio/web/SocketHandler.java
index 1cb7b01..1d2222f 100644
--- a/server/src/main/java/gltronic/tronio/web/SocketHandler.java
+++ b/server/src/main/java/gltronic/tronio/web/SocketHandler.java
@@ -31,7 +31,7 @@ public class SocketHandler extends TextWebSocketHandler {
     String type = (String) jsonObject.get("type");
     switch (type) {
       case "update":
-        gameManager.updatePlayer(session, (Player) jsonObject.get("update"));
+        gameManager.updatePlayer(session, (Player) jsonObject.get("message"));
         break;
       default:
         SocketUtils.sendMessage(session, "error", "unknow command");
diff --git a/server/target/classes/gltronic/tronio/TronIoApplication.class b/server/target/classes/gltronic/tronio/TronIoApplication.class
index beffa8733bcb9086ae1c9ec721b92399306879d0..43c49f2e630d888edb3989c201668788288d1981 100644
GIT binary patch
delta 19
acmdnNzJq;3I}=+;QGQ-#{^njLZAJh|MFz(J

delta 19
acmdnNzJq;3I}=-3etuPE_U2wDZAJh|g$B+5

diff --git a/server/target/classes/gltronic/tronio/business/GameManager.class b/server/target/classes/gltronic/tronio/business/GameManager.class
index 79d9fb3c62aa05ffeec11d03b0d4b5905800cae7..a1ae6b71196aa32b7ed00a2be036f6a4e66acf56 100644
GIT binary patch
delta 3189
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
InFyfl-;@`UtpET3

delta 3100
zcma)833QZK75?6Ae=>QKOeUFZB_V}`ER&E1LSPWWk`$X1N?Mi>DJ?^0nm|HknoI+f
zrh`hTt+tfDR!FsIt5ww2673lR*aoyNt<_@Pw}NY_Rk3PC3!>lqCrrZ8b2K^sKX>lE
z@80))_ulvB$@*h+oG)EE_B?>O;<^#%9J@=v=nwVxZw~hg)T&l%tvY3IceG2q2kTXh
z<I$X3B{pKcfVDFeb;6HL5*-Mt(+=;#+ax;CC6Lk|iZ1Ex><J0j%9|?IYPT&C-3SV#
zbJ^-ZAK#{jHf@#YMVG2IsvUh2{fMfd(dHPC*oN)uq%m9cske=?v_VD-h62G9#8hoc
zW8Dz$F|dabw*&?PH9dje&YBg0XqUtXa4)yFbu$sz%bS`inw%KI2PHm)d)1+oP~H$8
zlQ?KPMZ(*(@#7MY;|W!oS|L88R;GGghmhe!5uTEG8lP9|?Q>I{IE*hC7*XNWvi2`(
zBvNDO3-tz8ZN4+)Sagac@=u35A~C8x9DRY_V0f!z(HYZ3n;&12cn;4Cq>-cLf&OS)
zpr=RE)LgOFzzKCOHP1Dsll$=%i5KuymF+BV`8ttIFTJLIyH%Je4&fz<Z{lSZt2eYg
z+T0sWglKl++c;(56@knNR%i}&hDhyq@T%J5EOmSjKQQopHRAMIe~2Hc7oE*jKauz;
zb|y;K814!8=^gxB;x%1Q8~3_SE6zy#f|Y7Wi>!P@;&&ROjV#c17{8bJgI2hxXzdB?
z2=!@R^r~|bf4c12?u5XfCGNyd4=nhruJ_vl+f>9TQzi1&hQCYv1MiR@hMC~UT3$hH
zhjCHjpO=$p=GH`lfvB0}Us6B_byAkuNK(PRT{-KugHu?9T_R05#+!l7I3`l0NX1Mx
zNgx<xSdk`$)M0gVj_*AZ3ehwq(xu426Ljqe_v`POQh3-Z8(ce5#zYQhLFB5}Tm>^M
zc!Rlcj`+k?67R$NwNxlEtfetARf=M~ql(fa`R=9RaI`<#7l^C~MZ3bmey6AsGYwI#
zUQI8v)`)A=#q={apFo)!v1O^{wyc}hy2UIVZ;r%o@p^_K>fCsJTsL3hZ>G*ap<5(H
zmdK`G19fcG=HA{=Ut>?8pR;X<CV^7*ct)-YyWL`$+T|V)8S1>-m-+(iu(HDf%9pvZ
zdxVk|Zoa1>g>Ntab5Mv}PDTMLF$E3$b`z%ZKqy8gJ&F^n;XxL^F%E8|UC?(fR$(;@
zzJ^*WL=o0funXEjdz(u4RBu>kL0jdsxGIh&-%(5#I0~)O+pw71NH@cmFnB3u@L#9Q
zp$#ZYrYsvzc}4u2u|Xa1_+qzMa031ts;lA%#1Yb;o8#!2$l!sE(JC3$N03#_QEg_a
zH1+?PMQ2U`%b{PG5UnP%REvph6@v*xAi2pLKrPKGzW#O)*Bus&Bdt7!9pjpbZ6tus
zBB<pk!8&sbl952*32rTVg4EMl1>=}jR1(XAarz2Lp9!_ZbC>7tQOur*oB+6<5pQN4
zH((}iF{39cSCgc%2D|WHX3QiF34r5-?&2may1n^!5uI9=ojz@Mo~zTJQIThi!W1*h
z^6aCyFVEHC&oZ_5se$ZynE|9>6N%`+)d-T^+tgTgZuk9oz=YO{y_9tOwc<fac2n9%
z$uOmdD5aW`qLgMz4^whcz7~&A%3$pI_%NkRW~jk_N?FWPf&-MiSfiGBr<7|Tg$C~D
z$6h`U^4Z7dAwG)F!+b1yYSoa}?|F0-A0>j$Y-p)t6dzNkyhX7saPT^l=pkWSk;nV1
zfo0C*(%qUBv?PgaVWI@SmL$HGB)%4=PT*_d1`_yMxQzt97H&r4bD#;Ipp?Ok4frG;
zn8s8d%)^sZW-<LNe2S8nMu|^T$|cmjIfcdl3#xiKryzEy{Rlq0BGHbYi{qJWJUfbb
zHjZ|8bhrF>wcqYb=ltkbkIx#%ao=%_G0e$0zU=dS&GsCu?ba&KH{y746yI7kitonp
zV_!uaKlA0;<2da*Y?7>xmYFfLlu@2Ackm<`;7PF^3pf)?*x}2tlXG+zwqTIMbvHeB
znIzYl&9N;>@;0+ad3(|8m-rRyH<eTKYcgSFyv6tpCHv(ghePSM=wp;!$6CecZ!_C&
zkRx<93HZ&<^aCHkjaTYAlICajKZZIQ|CrPy78GBpo4nv4QY(FNyfu<o(o|XHJBGi+
zCQbk3)3y%Tn1fo>v$^MTZ07N|l^<PLNIsfP77{Z%m}Fsad}cwmCQe%iEEllJPRP6^
z5|Hr<M@kP`q^c?&!+G0AmXP~Ce@_z3h5ZLHm8wg}g{7UJXEm%N!WI`sTa~UjS5A;6
zoctCT6|U|M)>xa8v|Kj1wdu4zh!P-+%&EQs&g-#~w@54MSZP1+ht;f87;TdfMv@34
zNraI}2zj6Q-4=b}si*SuW4PqC$A$NVu*`Sl+X%sHC%}ZlsLXf7MV@};=Nnq$E1yL<
z%O|;Kycrh-!>Iqiou>@5v_$>Z$ZmU@@Y>C^aZ#jJ7I<R~oZm$p&c(b<mT=ok38Im|
z5}UAx1A741nNYPCc<fxhI)}y8Jb-nPhQ&0JqFeM4F<q3fk-fNGl!_T#F@wK9$|xD;
z#p;ChA{^oZVis6MIoDc5MZKt`z+Mrxd}fP!G1rvliFb(wrnFEj7E8oZdg-4SjpADI
HZsh+P%W-@w

diff --git a/server/target/classes/gltronic/tronio/model/Game.class b/server/target/classes/gltronic/tronio/model/Game.class
index a7b7e1ded8307f52c2c6abf2967cceac39be054c..f42f6411b324efe6f223241c692a4a67b12b6e53 100644
GIT binary patch
literal 2179
zcmbVM*>W326g@4;k|mF0TX?~avf?DNLOf8ciHwnvNdm};lQDAf*pfT)B%>MCOp8?b
z34R5t5~T{N_y9hN;@)X%vEvZo2aWFSK7G#Jy8r&?kG}wX0Vjimz)H*0Vc@$>JN^so
zc5t9P`<`s83{nEKPvy_j_N3pkA2yz<rWVL_Jo!R}k-$tX-tB7Fvv*{tERc2FmM?WT
zR03PacQ=e1Q#m?x{Z_ely7+F)U*06X$w)<!8~7x)_inl%Y}rwVsh@<D!1Ew{W<OUA
zI|`c5l(zR(!-*}&koFa{rW2&F`j&XO7>+V1iYdL}`mWv-NEX-X0;wuhEQciKEKK8E
z2JZ>X4eN4WMu$|J9P*gULSWIt1k!B1Zy}3x1}g$rPcOu%a1P6c;DUuISn0~I6>1~E
z>sKsX#Rmdbr1Vy(eCfEqPy<rM?X`NkvKr%J;0+5!22K;uRGE?Kib2GX4=vnc$hje;
zqtpS**cLwGt^8nXuN(RfZ>KAlhbo_1_>6H=gxi;%XEf%AfZG=C^uu7lkDUXlDd3r!
z>#GOdc0+}Gvf<H6z7{m4SC^s7{?TGeAG*}8!hf`j+LUYcb0q9saqal{5TJT;?MxFo
zMKVY8L^}0xIL|VsMy5Zh*GcBxBf~`)w2Feu7f;lH$9Mb0;u(s-G>gX@^`g^n*6fbb
zhrz+F<Qu8uXM^WrShD>w0{H(G<Cu(2zh*az<CKig<(!}!Hq~91Cos#GaGme7!1Cj+
zuidt)yOB%dxaIqSmfAc|rP^shMwGD%G?l}y2JKGZD_@s!g>HY6u0s+DehkRVke9$D
z{pd*;_&M_FuG3zI*64Ae?+ke_>7=0lM(H(XOMfE&(`(GX!otv8B6FEm&%Z*U^b&=6
zT<qbpu~vJyZmhK)ZVuMgjrDO4pBU@&9=`lNj;l=Hb&3R-M+yrR!y;C&glqgLkaZj9
zQAGhexPX0Jgv2Fm5ZW?P;wx;DC-5~Yl#$7GE6&8GRnBCBBo}@oBLNoU67caM$;5!<
zn-P-g8zf8Pk!<5zlHgj7Mo<{<@Lk-a2ADMN$0Rk1JHc_6Zc-b#XvvX0rsF&o4dN&d
z&e62~yEs$Mmsch!tnbO55ai5~^TUW(?M<<zamCDBjf!RIy&s5WW3e4PpeVU4cSbWR
f49CE9=4~1Auns7vh%$kPM3%rV9>oa?JO=&+FnsFY

literal 1677
zcmbVMT~E_c7=F(_*t!+jrcOanQG{(My)<!z#9;JhD9OmU?#8hcx^`*LB>XE)G$vm7
z1N>3O=bW=|rWP*N_I-QK^YxzY*Y6)ciRdNmWGKOC#qmTK_-@Bix4`NKC)~5%*<GHY
z6r;kK{mHgG+jp!F?K9pHj50mXzT{!VXsMyz_J!+N2X?Q{$Y{EbZ;O7&8NHr<yQ@nD
z)fA!YJN3qV@<WAR-veGY;!)%VKFE&#4;O@v74;<a#}EcCg7DnB;B6}kI_F$i$GqKC
zPfZOvWDo*7z_9TbJu-|Y*Q=l@=WwAVVo$MBoz{f~`?I|pSx@a_5(Y6UnUtmlnYQcm
z_x*00hevkXL&Bv-(6POi9lEj}G*jZ#g|O9sn1RMTOblYc;#M5R*H2ffUopv$>NVjo
z>P-;NAO2L>65ydpc`^}uG!c8LGLw3>#pumU^9Hd?nDTV0m%U-Kg##{5gOfvB9xkE2
zfILKvV?2%_;QA>_O`2zz-c}_}cyiyuuIsyEk5RHxZRIFQ+a^`0iZq)+KkV?gt~^JE
z41Gs_%e0QfllXr~QbL|OR2ftW%HoGPj_Mq0j0Nv9=q=JM)OzI-70|WNWw@tnU#a+6
zLEOew0uVOd!PV3Y=q{B}F}gPaa{mg*ay*a+v<j$M1#9s(KcdGlu5GL<kOpier0&}G
zH!6O?Q<BC$Oy#4jR}6eek2<&~BagC^g{-IOq#23=ij4`fXIIIV<C5vAOp+Ot8<QD|
sY?HR2QpWOX($ShENyKm@M?KP?SCBYHXiX>moocg)i*slFT=Bm616}2CDF6Tf

diff --git a/server/target/classes/gltronic/tronio/web/SocketHandler.class b/server/target/classes/gltronic/tronio/web/SocketHandler.class
index 2ea140887bc6964b56eea66a1732392f9866bda8..9dfba346846f07d729d49462d267d09088dfdc46 100644
GIT binary patch
delta 575
zcmYk2No!M47>1vd-t=5^FCuM;sVP`#KuM!1St#hD-G~997}Hd%M!lxDG0ku@HLYW9
zH4aroIRBss;z}HdwnEXZAovU1i~qoddRh@(e8c&8d57~k^d%Jd^mBa!IK-ouffb|I
zBqfk#x6yF&t|ToOP$T{U(;~wu$)wsaqFtw%Qs0f4eP;!Jw_f+^CRxGuxk|C(%@5|h
za@na&2e^PExhROJk4FEFw3jQo%}ldUYS>&Nr&j&XMNEy#LG@MGYPoyTC=23hOvaTZ
z3%lxq-dU&R#7j;kA3wT~bF0mQS21a-$1>dAvKe7sy^skr!xfvWRMj`x7B`h=hC>-{
z*(_1j21~Bfas$-3ZFA@Ks`*sxJkeq711Hy*=;9gHaL<{ZbMH8>vVr8{G%iAa$Py`L
z@DU+Pp38J`fHVbWF*wXIM)l24Q6q;ieldZR2uVq@R}zyP+3GQ{gFlc|G;o`bX+2W9
z1Rhn**{63yziL=|%VI>dB<y)b|9f^%^)%ix6zwqAA<^Mr^bO;~Yb>awl?eVZy2<Mo
zTfBm6Tvt!5zTl02*hQaCXpZmiu&mat<nh1p!nC=owSrpy9{07C%_tIIMp85Wx7*ft
Q9}l+ribg=UHvABN1Ata{yZ`_I

delta 590
zcmYk4-D(q26otQ&%;b!jSg=ZLZ7&KfRN82yh=L;aMl2MH+S;nM+G#SaX_J|l^v~Z~
zZTzV>%6R~96!A)|60M-<t)ln@K7kJ)UZ^_}(TlU!KAXK3YaPy)rcX`r4?kbO1@?0H
zS$x%sX^tvd%>ldBaT(;eX2^WBx}w93nD5r)_LB<RFO|ZQ!>FQRE|>|zg|<vsD0o3O
z&KPGkXA~Xgv(;=K*c+qcc;>17#MK4AT=u4XMasOl+ss#$FqPP_l~<(ACMRtgbZ*;u
z#pY>m-b?4bU@CoRG2<6!b7A06HurT)Y%akr=FOV!aRymTaDmW#)0N#<6v@$%!7=d>
z1b(JQY0KopvY)MGSW0k>P<-coZ{Ckn<a&Y|&mTDt)z-c$z3(`(&ao(ual0E&G@g3J
zX)_-0Tbdw)lBZcFi%*0ONjJ$9QFe;zIdWL+<1hzhW-~3D?O4AULTi*}M$@TDY4+D^
z3KGd5XbQ5pA;N?}R*oVd6wNKtTXHMnN;igOI^Bk3=_T!5Rc5R7RN2$@f`RUJ7EHg}
z)BDF>P0dzyHN{0PiO(AUo}eYzvPN^`<$u(x5sB#x?5MJA-nf1Je>1kQLPa=9Vcq1G
d_^IX5MC1b$t^Yl*$UMUBdc7kX5EIv{@Ef|#de#5{