fix: update the server layer extraction (#363)

Co-authored-by: Marek <[email protected]>

squad-server/index.js

@@ -505,8 +505,8 @@ export default class SquadServer extends EventEmitter {
       const nextMap = await this.rcon.getNextMap();
       const nextMapToBeVoted = nextMap.layer === 'To be voted';
 
-      const currentLayer = await Layers.getLayerByName(currentMap.layer);
-      const nextLayer = nextMapToBeVoted ? null : await Layers.getLayerByName(nextMap.layer);
+      const currentLayer = await Layers.getLayerById(currentMap.layer);
+      const nextLayer = nextMapToBeVoted ? null : await Layers.getLayerById(nextMap.layer);
 
       if (this.layerHistory.length === 0) {
         this.layerHistory.unshift({ layer: currentLayer, time: Date.now() });

squad-server/layers/layers.js

@@ -45,8 +45,8 @@ class Layers {
     return null;
   }
 
-  getLayerByName(name) {
-    return this.getLayerByCondition((layer) => layer.name === name);
+  getLayerById(layerId) {
+    return this.getLayerByCondition((layer) => layer.layerid === layerId);
   }
 
   getLayerByClassname(classname) {

squad-server/rcon.js

@@ -131,13 +131,13 @@ export default class SquadRcon extends Rcon {
 
   async getCurrentMap() {
     const response = await this.execute('ShowCurrentMap');
-    const match = response.match(/^Current level is (.*), layer is (.*)/);
+    const match = response.match(/^Current level is ([^,]*), layer is ([^,]*)/);
     return { level: match[1], layer: match[2] };
   }
 
   async getNextMap() {
     const response = await this.execute('ShowNextMap');
-    const match = response.match(/^Next level is (.*), layer is (.*)/);
+    const match = response.match(/^Next level is ([^,]*), layer is ([^,]*)/);
     return {
       level: match ? (match[1] !== '' ? match[1] : null) : null,
       layer: match ? (match[2] !== 'To be voted' ? match[2] : null) : null