f875361bc7
* remove unused #getServer methods, inline #roundToPoint * replace #safeName regex with incremental ids * remove legacy #setInterval based #updateMojangServices handling * add Tooltip class, move faviconSize to css instead of js * move server id assignment to ServerRegistry * move printPort logic to formatMinecraftServerAddress, add MINECRAFT_DEFAULT_PORTS * simplify ping tracking * rework perc-bar tooltip to not use mousemove event * begin moving graphing logic to GraphDisplayManager * begin merge graph point tracking into graphDisplayManager * centralizing graphing logic into GraphDisplayManager * properly reset GraphDisplayManager when handling disconnects * move individual server graph data into ServerGraph class * constantly run sortServers loop to simplify logic * inline #updateMojangServices method * resize performance improvements * remove legacy bootTime refresh behavior, require manual user refresh * move class defs to core.js * remove unused #isGraphDataVisible arg * remove #toggleControlsDrawer * dont call #updatePercentageBar in #updateServerStatus calls * centralize caption handling * inline #msToTime * remove hackish seconds handling for timestamps * reduce #forEach calls with filter/map * safely fallback to errorMessage if errno/description does not match * Add /images/missing_favicon.png path instead of putting base64 in js * remove debug * cleanup mojang status handling * move historyPlot instance into GraphDisplayManager * cleanup checkbox html generation * cleanup #updateServerStatus * fix up tooltip styling * move jquery code out of core.js * fix add server race condition when initially pinging servers * send error.placeholder=true for pending pings so the frontend can discard later * filter placeholder pings sent by the backend * del assets/images/logo_2014.png * move graph code into graph.js * merge pingTracker into ServerRegistry+ServerGraph * remove todos * simplify getVisibleGraphData * fix potential sortServers race condition when adding * use #show instead of #fadeIn(0) * remove publicConfig.json, send over socket * update docs/CHANGELOG.md * getOrAssign -> getOrCreateId * dont delete graph controls when disconnected * early work cleaning up HTML+CSS structures * cleanup server css elements * cleanup graph control css elements * move base CSS color values into @media(prefers-color-scheme: light) * move CSS magic colors to vars * reduce duplicated CSS color rules * inline body text color CSS * WIP replacing jQuery calls with vanilla JS * WIP replacing jQuery calls with vanilla JS * replace getElementsByClass with querySelectorAll * typeMarker -> serverTypeHTML * use jQuery slim for remaining flot.js dependency * merge setAllGraphVisibility into GraphDisplayManager * break apart element update and redraw logic * add eslint + parcel bundler * auto lint assets/js when building * statically serve favicons/ for faviconOverrides outside of dist/ * only send favicons when changed * move faviconOverride behavior into entry in servers.json * add warning to backend server files * remove .server-favicon-missing class * add Minetrack 5 migration guide * add npm run build step to install.sh * adjust package.json version to 5.0.0 * remove js references from index.html * move logic and behavior out of site.js * cleanup ServerRegistry methods * prevent multiple history graph redraws * add comments * cleanup #addServer usage, move to App * move graph control bindings into GraphDisplayManager * site.js -> main.js, core.js -> servers.js * move Tooltip/Caption into util.js * spacing tweak * format index.html * ensure the frontend does not handling updateHistoryGraph events * prevent versions/record updates if the same value * avoid empty percbar updates, ensure versions are sorted * only include main.js ref in index.html * serve minified copy of font awesome directly * bundle icons.css into main.css, remove Open Sans 400 * add new SVG logo * update docs/CHANGELOG.md * new design, server version grouping * remove start.sh call from install.sh * move graph controls into header with new button * move #handleSettingsToggle back to graph * fix legacy code behavior of currentVersionIndex applying globally * fix header text color in light mode * fix mojang status text color in light mode * fix toggle settings and checkbox colors * tweak button hover color * tweak button hover color * add new status-overlay to avoid complicated DOM management during loading * fix initial graph rendering bug * add comments * update default graph tick sizes * prevent #tooltip from overflowing page * remove localhost spec * prevent minor connection errors from reshuffling layout * update CHANGELOG.md * add message/button for manually loading historical graph on mobile devices * send isGraphVisible to frontend to prevent alert if logToDatabase: false * send timestamp data with record * update docs/CHANGELOG.md * remove clock icon * remove 24h peak timestamp * Only check favicon if present * safely handle undefined/empty knownVersions in #formatMinecraftVersions * merge config.versions and minecraft.json into minecraft_versions.json, simplify index matching behavior * remove localhost url in socket.io config * stub methods/linkage for FocusManager * add #isObjectEqual hack, add event proxying to FocusManager * wip extended stats box * remove server-type badging * tweak mojang unstable color * serve socket.io-client using parcel * fix incorrect mojang status colors * remove legacy capitalization design * redesign focus boxes * update docs/CHANGELOG.md * remove localhost ref * color clock icon * use background-color for hover effect, remove unused var * improve stats focus box icons * change mojang sessions icon to globe * Add favorites system * remove focus boxes * update docs/CHANGELOG.md * remove focus icons from font * simplify graph related event binding * Add Sort By button * store current sortOption in localStorage * update docs/CHANGELOG.md * move magic 0 sortOption to SORT_OPTION_INDEX_DEFAULT * remove localhost ref * merge #settings-toggle, #sort-by and .mojang-status CSS * remove .focus-box CSS * use sortedServerIds for _lastSortedServers * tweak --color-blue * new missing_favicon design to match logo * edit footer CSS/text, remove github icon * replace player count diff counter with GROWTH sort option * italize non-default sort options * add Only Favorites button to auto sync favorites to the visible graph data * add icons to graph control buttons * update docs/CHANGELOG.md * use * to denote non-default sort option instead * remove localhost url in socket.io config * add value highlighting to make sort by easier to read * remove last remaining uppercase text * remove serverTypesVisible from config.json * simplify header CSS, fix spacing with logToDatabase=false * fix inverted text color on highlighted values * remove localhost url in socket.io config * break header into rows on mobile devices Co-authored-by: Hugo Manrique <contact@hugmanrique.me>
371 lines
12 KiB
JavaScript
371 lines
12 KiB
JavaScript
import { formatNumber, formatTimestamp, isMobileBrowser } from './util'
|
|
|
|
import { FAVORITE_SERVERS_STORAGE_KEY } from './favorites'
|
|
|
|
export const HISTORY_GRAPH_OPTIONS = {
|
|
series: {
|
|
shadowSize: 0
|
|
},
|
|
xaxis: {
|
|
font: {
|
|
color: '#E3E3E3'
|
|
},
|
|
show: false
|
|
},
|
|
yaxis: {
|
|
show: true,
|
|
tickSize: 5000,
|
|
tickLength: 10,
|
|
tickFormatter: formatNumber,
|
|
font: {
|
|
color: '#E3E3E3'
|
|
},
|
|
labelWidth: -5,
|
|
min: 0
|
|
},
|
|
grid: {
|
|
hoverable: true,
|
|
color: '#696969'
|
|
},
|
|
legend: {
|
|
show: false
|
|
}
|
|
}
|
|
|
|
const HIDDEN_SERVERS_STORAGE_KEY = 'minetrack_hidden_servers'
|
|
const SHOW_FAVORITES_STORAGE_KEY = 'minetrack_show_favorites'
|
|
|
|
export class GraphDisplayManager {
|
|
// Only emit graph data request if not on mobile due to graph data size
|
|
isVisible = !isMobileBrowser()
|
|
|
|
constructor (app) {
|
|
this._app = app
|
|
this._graphData = []
|
|
this._hasLoadedSettings = false
|
|
this._initEventListenersOnce = false
|
|
this._showOnlyFavorites = false
|
|
}
|
|
|
|
addGraphPoint (serverId, timestamp, playerCount) {
|
|
if (!this._hasLoadedSettings) {
|
|
// _hasLoadedSettings is controlled by #setGraphData
|
|
// It will only be true once the context has been loaded and initial payload received
|
|
// #addGraphPoint should not be called prior to that since it means the data is racing
|
|
// and the application has received updates prior to the initial state
|
|
return
|
|
}
|
|
|
|
// Trim any outdated entries by filtering the array into a new array
|
|
const startTimestamp = new Date().getTime()
|
|
const newGraphData = this._graphData[serverId].filter(point => startTimestamp - point[0] <= this._app.publicConfig.graphDuration)
|
|
|
|
// Push the new data from the method call request
|
|
newGraphData.push([timestamp, playerCount])
|
|
|
|
this._graphData[serverId] = newGraphData
|
|
}
|
|
|
|
loadLocalStorage () {
|
|
if (typeof localStorage !== 'undefined') {
|
|
const showOnlyFavorites = localStorage.getItem(SHOW_FAVORITES_STORAGE_KEY)
|
|
if (showOnlyFavorites) {
|
|
this._showOnlyFavorites = true
|
|
}
|
|
|
|
// If only favorites mode is active, use the stored favorite servers data instead
|
|
let serverNames
|
|
if (this._showOnlyFavorites) {
|
|
serverNames = localStorage.getItem(FAVORITE_SERVERS_STORAGE_KEY)
|
|
} else {
|
|
serverNames = localStorage.getItem(HIDDEN_SERVERS_STORAGE_KEY)
|
|
}
|
|
|
|
if (serverNames) {
|
|
serverNames = JSON.parse(serverNames)
|
|
|
|
// Iterate over all active serverRegistrations
|
|
// This merges saved state with current state to prevent desyncs
|
|
for (const serverRegistration of this._app.serverRegistry.getServerRegistrations()) {
|
|
// isVisible will be true if showOnlyFavorites && contained in FAVORITE_SERVERS_STORAGE_KEY
|
|
// OR, if it is NOT contains within HIDDEN_SERVERS_STORAGE_KEY
|
|
// Checks between FAVORITE/HIDDEN keys are mutually exclusive
|
|
if (this._showOnlyFavorites) {
|
|
serverRegistration.isVisible = serverNames.indexOf(serverRegistration.data.name) >= 0
|
|
} else {
|
|
serverRegistration.isVisible = serverNames.indexOf(serverRegistration.data.name) < 0
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
updateLocalStorage () {
|
|
if (typeof localStorage !== 'undefined') {
|
|
// Mutate the serverIds array into server names for storage use
|
|
const serverNames = this._app.serverRegistry.getServerRegistrations()
|
|
.filter(serverRegistration => !serverRegistration.isVisible)
|
|
.map(serverRegistration => serverRegistration.data.name)
|
|
|
|
// Only store if the array contains data, otherwise clear the item
|
|
// If showOnlyFavorites is true, do NOT store serverNames since the state will be auto managed instead
|
|
if (serverNames.length > 0 && !this._showOnlyFavorites) {
|
|
localStorage.setItem(HIDDEN_SERVERS_STORAGE_KEY, JSON.stringify(serverNames))
|
|
} else {
|
|
localStorage.removeItem(HIDDEN_SERVERS_STORAGE_KEY)
|
|
}
|
|
|
|
// Only store SHOW_FAVORITES_STORAGE_KEY if true
|
|
if (this._showOnlyFavorites) {
|
|
localStorage.setItem(SHOW_FAVORITES_STORAGE_KEY, true)
|
|
} else {
|
|
localStorage.removeItem(SHOW_FAVORITES_STORAGE_KEY)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Converts the backend data into the schema used by flot.js
|
|
getVisibleGraphData () {
|
|
return Object.keys(this._graphData)
|
|
.map(Number)
|
|
.map(serverId => this._app.serverRegistry.getServerRegistration(serverId))
|
|
.filter(serverRegistration => serverRegistration !== undefined && serverRegistration.isVisible)
|
|
.map(serverRegistration => {
|
|
return {
|
|
data: this._graphData[serverRegistration.serverId],
|
|
yaxis: 1,
|
|
label: serverRegistration.data.name,
|
|
color: serverRegistration.data.color
|
|
}
|
|
})
|
|
}
|
|
|
|
buildPlotInstance (graphData) {
|
|
// Lazy load settings from localStorage, if any and if enabled
|
|
if (!this._hasLoadedSettings) {
|
|
this._hasLoadedSettings = true
|
|
|
|
this.loadLocalStorage()
|
|
}
|
|
|
|
// Remap the incoming data from being string (serverName) keyed into serverId keys
|
|
for (const serverName of Object.keys(graphData)) {
|
|
const serverRegistration = this._app.serverRegistry.getServerRegistration(serverName)
|
|
this._graphData[serverRegistration.serverId] = graphData[serverName]
|
|
}
|
|
|
|
// Explicitly define a height so flot.js can rescale the Y axis
|
|
document.getElementById('big-graph').style.height = '400px'
|
|
|
|
this._plotInstance = $.plot('#big-graph', this.getVisibleGraphData(), HISTORY_GRAPH_OPTIONS)
|
|
|
|
// Show the settings-toggle element
|
|
document.getElementById('settings-toggle').style.display = 'inline-block'
|
|
}
|
|
|
|
// requestRedraw allows usages to request a redraw that may be performed, or cancelled, sometime later
|
|
// This allows multiple rapid, but individual updates, to clump into a single redraw instead
|
|
requestRedraw () {
|
|
if (this._redrawRequestTimeout) {
|
|
clearTimeout(this._redrawRequestTimeout)
|
|
}
|
|
|
|
// Schedule new delayed redraw call
|
|
// This can be cancelled by #requestRedraw, #redraw and #reset
|
|
this._redrawRequestTimeout = setTimeout(this.redraw, 1000)
|
|
}
|
|
|
|
redraw = () => {
|
|
// Use drawing as a hint to update settings
|
|
// This may cause unnessecary localStorage updates, but its a rare and harmless outcome
|
|
this.updateLocalStorage()
|
|
|
|
// Fire calls to the provided graph instance
|
|
// This allows flot.js to manage redrawing and creates a helper method to reduce code duplication
|
|
this._plotInstance.setData(this.getVisibleGraphData())
|
|
this._plotInstance.setupGrid()
|
|
this._plotInstance.draw()
|
|
|
|
// undefine value so #clearTimeout is not called
|
|
// This is safe even if #redraw is manually called since it removes the pending work
|
|
if (this._redrawRequestTimeout) {
|
|
clearTimeout(this._redrawRequestTimeout)
|
|
}
|
|
|
|
this._redrawRequestTimeout = undefined
|
|
}
|
|
|
|
requestResize () {
|
|
// Only resize when _plotInstance is defined
|
|
// Set a timeout to resize after resize events have not been fired for some duration of time
|
|
// This prevents burning CPU time for multiple, rapid resize events
|
|
if (this._plotInstance) {
|
|
if (this._resizeRequestTimeout) {
|
|
clearTimeout(this._resizeRequestTimeout)
|
|
}
|
|
|
|
// Schedule new delayed resize call
|
|
// This can be cancelled by #requestResize, #resize and #reset
|
|
this._resizeRequestTimeout = setTimeout(this.resize, 200)
|
|
}
|
|
}
|
|
|
|
resize = () => {
|
|
if (this._plotInstance) {
|
|
this._plotInstance.resize()
|
|
this._plotInstance.setupGrid()
|
|
this._plotInstance.draw()
|
|
}
|
|
|
|
// undefine value so #clearTimeout is not called
|
|
// This is safe even if #resize is manually called since it removes the pending work
|
|
if (this._resizeRequestTimeout) {
|
|
clearTimeout(this._resizeRequestTimeout)
|
|
}
|
|
|
|
this._resizeRequestTimeout = undefined
|
|
}
|
|
|
|
// Called by flot.js when they hover over a data point.
|
|
handlePlotHover = (event, pos, item) => {
|
|
if (!item) {
|
|
this._app.tooltip.hide()
|
|
} else {
|
|
let text = formatNumber(item.datapoint[1]) + ' Players<br>' + formatTimestamp(item.datapoint[0])
|
|
// Prefix text with the series label when possible
|
|
if (item.series && item.series.label) {
|
|
text = '<strong>' + item.series.label + '</strong><br>' + text
|
|
}
|
|
|
|
this._app.tooltip.set(item.pageX, item.pageY, 10, 10, text)
|
|
}
|
|
}
|
|
|
|
initEventListeners () {
|
|
if (!this._initEventListenersOnce) {
|
|
this._initEventListenersOnce = true
|
|
|
|
// These listeners should only be init once since they attach to persistent elements
|
|
document.getElementById('settings-toggle').addEventListener('click', this.handleSettingsToggle, false)
|
|
|
|
document.querySelectorAll('.graph-controls-show').forEach((element) => {
|
|
element.addEventListener('click', this.handleShowButtonClick, false)
|
|
})
|
|
}
|
|
|
|
$('#big-graph').bind('plothover', this.handlePlotHover)
|
|
|
|
// These listeners should be bound each #initEventListeners call since they are for newly created elements
|
|
document.querySelectorAll('.graph-control').forEach((element) => {
|
|
element.addEventListener('click', this.handleServerButtonClick, false)
|
|
})
|
|
}
|
|
|
|
handleServerButtonClick = (event) => {
|
|
const serverId = parseInt(event.target.getAttribute('minetrack-server-id'))
|
|
const serverRegistration = this._app.serverRegistry.getServerRegistration(serverId)
|
|
|
|
if (serverRegistration.isVisible !== event.target.checked) {
|
|
serverRegistration.isVisible = event.target.checked
|
|
|
|
// Any manual changes automatically disables "Only Favorites" mode
|
|
// Otherwise the auto management might overwrite their manual changes
|
|
this._showOnlyFavorites = false
|
|
|
|
this.redraw()
|
|
}
|
|
}
|
|
|
|
handleShowButtonClick = (event) => {
|
|
const showType = event.target.getAttribute('minetrack-show-type')
|
|
|
|
// If set to "Only Favorites", set internal state so that
|
|
// visible graphData is automatically updating when a ServerRegistration's #isVisible changes
|
|
// This is also saved and loaded by #loadLocalStorage & #updateLocalStorage
|
|
this._showOnlyFavorites = showType === 'favorites'
|
|
|
|
let redraw = false
|
|
|
|
this._app.serverRegistry.getServerRegistrations().forEach(function (serverRegistration) {
|
|
let isVisible
|
|
if (showType === 'all') {
|
|
isVisible = true
|
|
} else if (showType === 'none') {
|
|
isVisible = false
|
|
} else if (showType === 'favorites') {
|
|
isVisible = serverRegistration.isFavorite
|
|
}
|
|
|
|
if (serverRegistration.isVisible !== isVisible) {
|
|
serverRegistration.isVisible = isVisible
|
|
redraw = true
|
|
}
|
|
})
|
|
|
|
if (redraw) {
|
|
this.redraw()
|
|
this.updateCheckboxes()
|
|
}
|
|
}
|
|
|
|
handleSettingsToggle = () => {
|
|
const element = document.getElementById('big-graph-controls-drawer')
|
|
|
|
if (element.style.display !== 'block') {
|
|
element.style.display = 'block'
|
|
} else {
|
|
element.style.display = 'none'
|
|
}
|
|
}
|
|
|
|
handleServerIsFavoriteUpdate = (serverRegistration) => {
|
|
// When in "Only Favorites" mode, visibility is dependent on favorite status
|
|
// Redraw and update elements as needed
|
|
if (this._showOnlyFavorites && serverRegistration.isVisible !== serverRegistration.isFavorite) {
|
|
serverRegistration.isVisible = serverRegistration.isFavorite
|
|
|
|
this.redraw()
|
|
this.updateCheckboxes()
|
|
}
|
|
}
|
|
|
|
updateCheckboxes () {
|
|
document.querySelectorAll('.graph-control').forEach((checkbox) => {
|
|
const serverId = parseInt(checkbox.getAttribute('minetrack-server-id'))
|
|
const serverRegistration = this._app.serverRegistry.getServerRegistration(serverId)
|
|
|
|
checkbox.checked = serverRegistration.isVisible
|
|
})
|
|
}
|
|
|
|
reset () {
|
|
this._graphData = []
|
|
this._plotInstance = undefined
|
|
this._hasLoadedSettings = false
|
|
|
|
// Fire #clearTimeout if the timeout is currently defined
|
|
if (this._resizeRequestTimeout) {
|
|
clearTimeout(this._resizeRequestTimeout)
|
|
|
|
this._resizeRequestTimeout = undefined
|
|
}
|
|
|
|
if (this._redrawRequestTimeout) {
|
|
clearTimeout(this._redrawRequestTimeout)
|
|
|
|
this._redrawRequestTimeout = undefined
|
|
}
|
|
|
|
// Reset modified DOM structures
|
|
document.getElementById('big-graph-checkboxes').innerHTML = ''
|
|
document.getElementById('big-graph-controls').style.display = 'none'
|
|
|
|
document.getElementById('settings-toggle').style.display = 'none'
|
|
|
|
const graphElement = document.getElementById('big-graph')
|
|
|
|
graphElement.innerHTML = ''
|
|
graphElement.removeAttribute('style')
|
|
}
|
|
}
|