feat: New Mojang Statuses
This commit is contained in:
GeekCornerGH
parent
779a9a54ec
commit
b62910a7c4
@ -15,44 +15,46 @@ const minecraftAgent = {
|
||||
version: 1
|
||||
}
|
||||
const authpath = 'https://authserver.mojang.com'
|
||||
// Service name comes from https://github.com/GeekcornerGH/helios-status-page/tree/master/api
|
||||
const statuses = [
|
||||
{
|
||||
service: 'sessionserver.mojang.com',
|
||||
service: 'mojang-multiplayer-session-service',
|
||||
status: 'grey',
|
||||
name: 'Multiplayer Session Service',
|
||||
essential: true
|
||||
},
|
||||
{
|
||||
service: 'authserver.mojang.com',
|
||||
service: 'mojang-authserver',
|
||||
status: 'grey',
|
||||
name: 'Authentication Service',
|
||||
essential: true
|
||||
},
|
||||
{
|
||||
service: 'textures.minecraft.net',
|
||||
service: 'minecraft-skins',
|
||||
status: 'grey',
|
||||
name: 'Minecraft Skins',
|
||||
essential: false
|
||||
},
|
||||
{
|
||||
service: 'api.mojang.com',
|
||||
service: 'mojang-s-public-api',
|
||||
status: 'grey',
|
||||
name: 'Public API',
|
||||
essential: false
|
||||
},
|
||||
{
|
||||
service: 'minecraft.net',
|
||||
service: 'minecraft-net-website',
|
||||
status: 'grey',
|
||||
name: 'Minecraft.net',
|
||||
essential: false
|
||||
},
|
||||
{
|
||||
service: 'account.mojang.com',
|
||||
service: 'mojang-accounts-website',
|
||||
status: 'grey',
|
||||
name: 'Mojang Accounts Website',
|
||||
essential: false
|
||||
}
|
||||
]
|
||||
const requestURL = function (serviceURL) { return `https://raw.githubusercontent.com/GeekCornerGH/helios-status-page/master/api/${serviceURL.service}/uptime.json`}
|
||||
|
||||
// Functions
|
||||
|
||||
@ -86,37 +88,32 @@ exports.statusToHex = function(status){
|
||||
*
|
||||
* @see http://wiki.vg/Mojang_API#API_Status
|
||||
*/
|
||||
exports.status = function(){
|
||||
return new Promise((resolve, reject) => {
|
||||
request.get('https://status.mojang.com/check',
|
||||
exports.status = async function () {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
let data = []
|
||||
for(let i=0; i<statuses.length; i++){
|
||||
request.get(requestURL(statuses[i]),
|
||||
{
|
||||
json: true,
|
||||
timeout: 2500
|
||||
timeout: 10000
|
||||
},
|
||||
function (error, response, body) {
|
||||
|
||||
if (error || response.statusCode !== 200) {
|
||||
logger.warn('Unable to retrieve Mojang status.')
|
||||
logger.debug('Error while retrieving Mojang statuses:', error)
|
||||
data.push(statuses[i])
|
||||
//reject(error || response.statusCode)
|
||||
for(let i=0; i<statuses.length; i++){
|
||||
statuses[i].status = 'grey'
|
||||
}
|
||||
resolve(statuses)
|
||||
} else {
|
||||
for(let i=0; i<body.length; i++){
|
||||
const key = Object.keys(body[i])[0]
|
||||
inner:
|
||||
for(let j=0; j<statuses.length; j++){
|
||||
if(statuses[j].service === key) {
|
||||
statuses[j].status = body[i][key]
|
||||
break inner
|
||||
}
|
||||
}
|
||||
}
|
||||
if (response.body.color == "brightgreen") statuses[i].status = "green"
|
||||
else statuses[i].status = "red"
|
||||
data.push(statuses[i])
|
||||
resolve(statuses)
|
||||
}
|
||||
})
|
||||
}
|
||||
return data
|
||||
})
|
||||
}
|
||||
|
||||
@ -133,7 +130,6 @@ exports.status = function(){
|
||||
*/
|
||||
exports.authenticate = function (username, password, clientToken, requestUser = true, agent = minecraftAgent) {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
const body = {
|
||||
agent,
|
||||
username,
|
||||
@ -161,6 +157,7 @@ exports.authenticate = function(username, password, clientToken, requestUser = t
|
||||
}
|
||||
}
|
||||
})
|
||||
setTimeout(resolve, 15000)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -173,11 +173,6 @@ const refreshMojangStatuses = async function(){
|
||||
for(let i=0; i<statuses.length; i++){
|
||||
const service = statuses[i]
|
||||
|
||||
// Mojang API is broken for sessionserver. https://bugs.mojang.com/browse/WEB-2303
|
||||
if(service.service === 'sessionserver.mojang.com') {
|
||||
service.status = 'green'
|
||||
}
|
||||
|
||||
if(service.essential){
|
||||
tooltipEssentialHTML += `<div class="mojangStatusContainer">
|
||||
<span class="mojangStatusIcon" style="color: ${Mojang.statusToHex(service.status)};">•</span>
|
||||
@ -221,6 +216,7 @@ const refreshMojangStatuses = async function(){
|
||||
document.getElementById('mojang_status_icon').style.color = Mojang.statusToHex(status)
|
||||
}
|
||||
|
||||
|
||||
const refreshServerStatus = async function(fade = false){
|
||||
loggerLanding.log('Refreshing Server Status')
|
||||
const serv = DistroManager.getDistribution().getServer(ConfigManager.getSelectedServer())
|
||||
@ -260,6 +256,9 @@ refreshMojangStatuses()
|
||||
let mojangStatusListener = setInterval(() => refreshMojangStatuses(true), 300000)
|
||||
let serverStatusListener = setInterval(() => refreshServerStatus(true), 300000)
|
||||
|
||||
|
||||
setTimeout(() => refreshMojangStatuses(true), 1000) //workaround to make sure statuses are correctly shown, else its a kinda broken
|
||||
|
||||
/**
|
||||
* Shows an error overlay, toggles off the launch area.
|
||||
*
|
||||
|
||||
@ -55,45 +55,45 @@ function getCurrentView(){
|
||||
return currentView
|
||||
}
|
||||
|
||||
function showMainUI(data){
|
||||
|
||||
async function showMainUI(data){
|
||||
await require("./assets/js/mojang").status
|
||||
if(!isDev){
|
||||
loggerAutoUpdater.log('Initializing..')
|
||||
ipcRenderer.send('autoUpdateAction', 'initAutoUpdater', ConfigManager.getAllowPrerelease())
|
||||
await loggerAutoUpdater.log('Initializing..')
|
||||
await ipcRenderer.send('autoUpdateAction', 'initAutoUpdater', ConfigManager.getAllowPrerelease())
|
||||
}
|
||||
|
||||
prepareSettings(true)
|
||||
updateSelectedServer(data.getServer(ConfigManager.getSelectedServer()))
|
||||
refreshServerStatus()
|
||||
setTimeout(() => {
|
||||
await prepareSettings(true)
|
||||
await updateSelectedServer(data.getServer(ConfigManager.getSelectedServer()))
|
||||
await refreshServerStatus()
|
||||
setTimeout(async () => {
|
||||
document.getElementById('frameBar').style.backgroundColor = 'rgba(0, 0, 0, 0.5)'
|
||||
document.body.style.backgroundImage = `url('assets/images/backgrounds/${document.body.getAttribute('bkid')}.jpg')`
|
||||
$('#main').show()
|
||||
await $('#main').show()
|
||||
|
||||
const isLoggedIn = Object.keys(ConfigManager.getAuthAccounts()).length > 0
|
||||
|
||||
// If this is enabled in a development environment we'll get ratelimited.
|
||||
// The relaunch frequency is usually far too high.
|
||||
if(!isDev && isLoggedIn){
|
||||
validateSelectedAccount()
|
||||
await validateSelectedAccount()
|
||||
}
|
||||
|
||||
if(ConfigManager.isFirstLaunch()){
|
||||
currentView = VIEWS.welcome
|
||||
$(VIEWS.welcome).fadeIn(1000)
|
||||
await $(VIEWS.welcome).fadeIn(1000)
|
||||
} else {
|
||||
if(isLoggedIn){
|
||||
currentView = VIEWS.landing
|
||||
$(VIEWS.landing).fadeIn(1000)
|
||||
await $(VIEWS.landing).fadeIn(1000)
|
||||
} else {
|
||||
currentView = VIEWS.login
|
||||
$(VIEWS.login).fadeIn(1000)
|
||||
await $(VIEWS.login).fadeIn(1000)
|
||||
}
|
||||
}
|
||||
|
||||
setTimeout(() => {
|
||||
$('#loadingContainer').fadeOut(500, () => {
|
||||
$('#loadSpinnerImage').removeClass('rotating')
|
||||
setTimeout(async () => {
|
||||
await $('#loadingContainer').fadeOut(500, async () => {
|
||||
await $('#loadSpinnerImage').removeClass('rotating')
|
||||
})
|
||||
}, 250)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user