Improve layer information extraction

[denizetkar]

Description

• SquadServer regularly invokes updateLayerInformation to update the current and next layer variables, namely this.currentLayer and this.nextLayer.
• This is fetched from Layers class, getLayerByName method, which filters the pulled layers this.layers by the name field.
• The layers are fetched from https://raw.githubusercontent.com/Squad-Wiki/squad-wiki-pipeline-map-data/master/completed_output/_Current%20Version/finished.json
  • I'm actually a bit concerned that this "current version" is outdated with respect to the latest Squad version 8.0.
• However, the layer name for filtering is fetched from SquadRcon class, getCurrentMap method which uses the RCON command ShowCurrentMap. This command returns an answer like Current level is Jensen's Range, layer is JensensRange_USA-RGF, factions USA RGF. The problem here is 2-fold:
  • The regex used to extract the level and the layer names is broken: ^Current level is (.*), layer is (.*) Because the 2nd regex group actually matches a string like JensensRange_USA-RGF, factions USA RGF
  • Even if we correctly extract the "layer name", it actually corresponds to the layerid field in the pulled layers

What this PR does

Solves those 2 problems by:

• Updating the regexes to extract the level and the layer ids from the RCON commands ShowCurrentMap and ShowNextMap as: ^Current level is ([^,]*), layer is ([^,]*)
• Changing the matching logic to use the layerid field instead of name

[Ulibos]

This seems to be an accidental edit but other than that looks good to me. Going to test it soon.

[werewolfboy13]

Changes are required.

[Ulibos]

I have submitted a PR that addresses duplicate Victim field that you reported: #364

[denizetkar]

Hi @Ulibos,

Any updates on testing the PR?

[Ulibos]

We are using a plugin that queries data from layers infrequently so I can't vouch for a full comprehensive test but so far I haven't seen a single failure on this part of the code.

[denizetkar]

Should we merge it then?

[Ulibos]

I'm all for merge but I'm not the one calling the shots.

[werewolfboy13]

There is another merge about to happen soon that will require rewrites again. Merges are on hold until then.

[werewolfboy13]

Force pushing. Mobile UI is preventing conversation resolution.