Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle pl3xmap player update interval

Browse Source
This commit is contained in:
James Lyne 2021-12-10 15:54:30 +00:00
parent 9f4c0e2f51
commit 2ab03f8fde
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/providers/Pl3xmapMapProvider.ts
View File

@ -42,9 +42,16 @@ export default class Pl3xmapMapProvider extends MapProvider {
private playersAbort?: AbortController = undefined; private playersAbort?: AbortController = undefined;
private updatesEnabled = false; private updatesEnabled = false;
private updateTimeout: null | ReturnType<typeof setTimeout> = null;
private updateTimestamp: Date = new Date(); private playerUpdateTimeout: null | ReturnType<typeof setTimeout> = null;
private updateInterval: number = 3000; private playerUpdateTimestamp: Date = new Date();
private playerUpdateInterval = 3000;
private markerUpdateTimeout: null | ReturnType<typeof setTimeout> = null;
private markerUpdateInterval = 3000;
private worldPlayerUpdateIntervals: Map<string, number> = new Map();
private worldMarkerUpdateIntervals: Map<string, number> = new Map();
private worldComponents: Map<string, { private worldComponents: Map<string, {
components: LiveAtlasPartialComponentConfig, components: LiveAtlasPartialComponentConfig,
}> = new Map(); }> = new Map();
@ -86,16 +93,25 @@ export default class Pl3xmapMapProvider extends MapProvider {
private buildWorlds(serverResponse: any, worldResponses: any[]): Array<LiveAtlasWorldDefinition> { private buildWorlds(serverResponse: any, worldResponses: any[]): Array<LiveAtlasWorldDefinition> {
const worlds: Array<LiveAtlasWorldDefinition> = []; const worlds: Array<LiveAtlasWorldDefinition> = [];
this.worldComponents.clear();
this.worldMarkerUpdateIntervals.clear();
this.worldPlayerUpdateIntervals.clear();
(serverResponse.worlds || []).filter((w: any) => w && !!w.name).forEach((world: any, index: number) => { (serverResponse.worlds || []).filter((w: any) => w && !!w.name).forEach((world: any, index: number) => {
const worldResponse = worldResponses[index], const worldResponse = worldResponses[index],
worldConfig: {components: LiveAtlasPartialComponentConfig } = { worldConfig: {components: LiveAtlasPartialComponentConfig } = {
components: {}, components: {},
}; };
this.worldMarkerUpdateIntervals.set(world.name, worldResponse.marker_update_interval || 3000);
if(worldResponse.player_tracker?.enabled) { if(worldResponse.player_tracker?.enabled) {
const health = !!worldResponse.player_tracker?.nameplates?.show_health, const health = !!worldResponse.player_tracker?.nameplates?.show_health,
armor = !!worldResponse.player_tracker?.nameplates?.show_armor, armor = !!worldResponse.player_tracker?.nameplates?.show_armor,
images = !!worldResponse.player_tracker?.nameplates?.show_heads; images = !!worldResponse.player_tracker?.nameplates?.show_heads,
updateInterval = worldResponse.player_tracker.update_interval ? worldResponse.player_tracker.update_interval * 1000 : 3000;
this.worldPlayerUpdateIntervals.set(world.name, updateInterval);
worldConfig.components.playerMarkers = { worldConfig.components.playerMarkers = {
grayHiddenPlayers: true, grayHiddenPlayers: true,
@ -410,6 +426,9 @@ export default class Pl3xmapMapProvider extends MapProvider {
const markerSets = await this.getMarkerSets(world), const markerSets = await this.getMarkerSets(world),
worldConfig = this.worldComponents.get(world.name); worldConfig = this.worldComponents.get(world.name);
this.playerUpdateInterval = this.worldPlayerUpdateIntervals.get(world.name) || 3000;
this.markerUpdateInterval = this.worldMarkerUpdateIntervals.get(world.name) || 3000;
this.store.commit(MutationTypes.SET_MARKER_SETS, markerSets); this.store.commit(MutationTypes.SET_MARKER_SETS, markerSets);
this.store.commit(MutationTypes.SET_COMPONENTS, worldConfig!.components); this.store.commit(MutationTypes.SET_COMPONENTS, worldConfig!.components);
} }
@ -471,37 +490,47 @@ export default class Pl3xmapMapProvider extends MapProvider {
startUpdates() { startUpdates() {
this.updatesEnabled = true; this.updatesEnabled = true;
this.update(); this.updatePlayers();
this.updateMarkers();
} }
private async update() { private async updatePlayers() {
try { try {
if(this.store.state.components.playerMarkers) { if(this.store.state.components.playerMarkers) {
const players = await this.getPlayers(); const players = await this.getPlayers();
this.updateTimestamp = new Date(); this.playerUpdateTimestamp = new Date();
await this.store.dispatch(ActionTypes.SET_PLAYERS, players); await this.store.dispatch(ActionTypes.SET_PLAYERS, players);
} }
} finally { } finally {
if(this.updatesEnabled) { if(this.updatesEnabled) {
if(this.updateTimeout) { if(this.playerUpdateTimeout) {
clearTimeout(this.updateTimeout); clearTimeout(this.playerUpdateTimeout);
} }
this.updateTimeout = setTimeout(() => this.update(), this.updateInterval); this.playerUpdateTimeout = setTimeout(() => this.updatePlayers(), this.playerUpdateInterval);
} }
} }
} }
private async updateMarkers() {
//TODO: Implement once Pl3xmap offers a way to do this without recreating all markers
}
stopUpdates() { stopUpdates() {
this.updatesEnabled = false; this.updatesEnabled = false;
if (this.updateTimeout) { if (this.markerUpdateTimeout) {
clearTimeout(this.updateTimeout); clearTimeout(this.markerUpdateTimeout);
} }
this.updateTimeout = null; if (this.playerUpdateTimeout) {
clearTimeout(this.playerUpdateTimeout);
}
this.markerUpdateTimeout = null;
this.playerUpdateTimeout = null;
} }
getTilesUrl(): string { getTilesUrl(): string {