From a924409bd1c57fb96e67a1c6cea0b7331d11cb73 Mon Sep 17 00:00:00 2001 From: proller Date: Fri, 18 Oct 2013 01:32:49 +0400 Subject: [PATCH] Masterserver update --- src/server.cpp | 7 +-- src/server.h | 2 +- src/serverlist.cpp | 19 +++--- src/serverlist.h | 4 +- util/master/index.html | 1 + util/master/list.js | 131 ++++++++++++++++++++++++++--------------- util/master/master.cgi | 21 ++++++- util/master/style.css | 6 +- 8 files changed, 126 insertions(+), 65 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index c144be1ba..8350b7013 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -673,7 +673,6 @@ Server::Server( m_objectdata_timer = 0.0; m_emergethread_trigger_timer = 0.0; m_savemap_timer = 0.0; - m_clients_number = 0; m_env_mutex.Init(); m_con_mutex.Init(); @@ -1244,7 +1243,7 @@ void Server::AsyncRunStep() counter = 0.0; JMutexAutoLock lock2(m_con_mutex); - m_clients_number = 0; + m_clients_names.clear(); if(m_clients.size() != 0) infostream<<"Players:"<::iterator @@ -1258,7 +1257,7 @@ void Server::AsyncRunStep() continue; infostream<<"* "<getName()<<"\t"; client->PrintInfo(infostream); - ++m_clients_number; + m_clients_names.push_back(player->getName()); } } } @@ -1270,7 +1269,7 @@ void Server::AsyncRunStep() float &counter = m_masterserver_timer; if(!isSingleplayer() && (!counter || counter >= 300.0) && g_settings->getBool("server_announce") == true) { - ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_number, m_uptime.get(), m_gamespec.id, m_mods); + ServerList::sendAnnounce(!counter ? "start" : "update", m_clients_names, m_uptime.get(), m_env->getGameTime(), m_gamespec.id, m_mods); counter = 0.01; } counter += dtime; diff --git a/src/server.h b/src/server.h index bc7829f74..b52ae02dc 100644 --- a/src/server.h +++ b/src/server.h @@ -685,7 +685,7 @@ private: JMutex m_con_mutex; // Connected clients (behind the con mutex) std::map m_clients; - u16 m_clients_number; //for announcing masterserver + std::vector m_clients_names; //for announcing masterserver // Ban checking BanManager *m_banmanager; diff --git a/src/serverlist.cpp b/src/serverlist.cpp index 908f048cb..fb5bc9c87 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -194,11 +194,11 @@ static size_t ServerAnnounceCallback(void *contents, size_t size, size_t nmemb, //((std::string*)userp)->append((char*)contents, size * nmemb); return size * nmemb; } -void sendAnnounce(std::string action, u16 clients, double uptime, std::string gameid, std::vector m_mods) { +void sendAnnounce(std::string action, const std::vector & clients_names, double uptime, u32 game_time, std::string gameid, std::vector mods) { Json::Value server; if (action.size()) server["action"] = action; - server["port"] = g_settings->get("port"); + server["port"] = g_settings->get("port"); server["address"] = g_settings->get("server_address"); if (action != "delete") { server["name"] = g_settings->get("server_name"); @@ -209,10 +209,15 @@ void sendAnnounce(std::string action, u16 clients, double uptime, std::string ga server["damage"] = g_settings->get("enable_damage"); server["password"] = g_settings->getBool("disallow_empty_password"); server["pvp"] = g_settings->getBool("enable_pvp"); - server["clients"] = clients; + server["clients"] = (int)clients_names.size(); server["clients_max"] = g_settings->get("max_users"); - if (uptime >=1) server["uptime"] = (int)uptime; - if (gameid!="") server["gameid"] = gameid; + server["clients_list"] = Json::Value(Json::arrayValue); + for(u32 i = 0; i < clients_names.size(); ++i) { + server["clients_list"].append(clients_names[i]); + } + if (uptime >= 1) server["uptime"] = (int)uptime; + if (gameid != "") server["gameid"] = gameid; + if (game_time >= 1) server["game_time"] = game_time; } if(server["action"] == "start") { @@ -220,8 +225,8 @@ void sendAnnounce(std::string action, u16 clients, double uptime, std::string ga server["rollback"] = g_settings->getBool("enable_rollback_recording"); server["liquid_finite"] = g_settings->getBool("liquid_finite"); server["mapgen"] = g_settings->get("mg_name"); - server["mods"] = Json::Value(Json::arrayValue); - for(std::vector::iterator m = m_mods.begin(); m != m_mods.end(); m++) { + server["mods"] = Json::Value(Json::arrayValue); + for(std::vector::iterator m = mods.begin(); m != mods.end(); m++) { server["mods"].append(m->name); } actionstream << "announcing to " << g_settings->get("serverlist_url") << std::endl; diff --git a/src/serverlist.h b/src/serverlist.h index 365e86beb..77eb29b14 100644 --- a/src/serverlist.h +++ b/src/serverlist.h @@ -40,7 +40,9 @@ namespace ServerList std::vector deSerializeJson(std::string liststring); std::string serializeJson(std::vector); #if USE_CURL - void sendAnnounce(std::string action = "", u16 clients = 0, double uptime = 0, std::string gameid = "", std::vector m_mods = std::vector()); + void sendAnnounce(std::string action = "", const std::vector & clients_names = std::vector(), + double uptime = 0, u32 game_time = 0,std::string gameid = "", + std::vector mods = std::vector()); #endif } //ServerList namespace diff --git a/util/master/index.html b/util/master/index.html index 328dd8934..ad908fca8 100644 --- a/util/master/index.html +++ b/util/master/index.html @@ -8,4 +8,5 @@
+ diff --git a/util/master/list.js b/util/master/list.js index a17458fb4..b5974619a 100644 --- a/util/master/list.js +++ b/util/master/list.js @@ -1,7 +1,13 @@ var master_root, output_to; +var master; +if (!master) master = { + root: master_root, + output: output_to +}; function e(s) { if (typeof s === "undefined") s = ''; + if (typeof s === "number") return s; return s.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); //mc" } @@ -41,55 +47,88 @@ function human_time(t, abs) { function success(r) { if (!r || !r.list) return; - var h = ''; - for (var i = 0; i < r.list.length; ++i) { - var s = r.list[i]; - if (!s) continue; - if (/:/.test(s.address)) s.address = '[' + s.address + ']'; - h += ''; - h += ''; - h += ''; - var mods = 0; - if (s.mods && jQuery.isArray(s.mods)) { - mods = s.mods.length; - } - h += ''; - - h += ''; - h += ''; - h += ''; - if (!s.start || s.start < 0) s.start = 0; - h += ''; - h += ''; + var h = ''; + if (!master.no_total && r.total) + h += '
Now players: ' + r.total.clients + ' servers: ' + r.total.servers + '
'; + if (!master.no_total_max && r.total_max) + h += '
Max players: ' + r.total_max.clients + ' servers: ' + r.total_max.servers + '
'; + h += '
ip[:port]clients/maxversion gameid mapgennamedescriptionflagsuptimeping
' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + '' + e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + e(s.clients_top) : '') + '' + e(s.version) + ' ' + e(s.gameid) + ' ' + e(s.mapgen); - if (mods) { - h += '
Mods ('+mods+'):
'; - for (m in s.mods) { - h += s.mods[m] + '
'; - } - h += '
'; - } - - h += '		'; - if (s.url) h += ''; - h += e(s.name || s.url); - if (s.url) h += ''; - h += '' + e(s.description) + '' + - (s.password ? 'Pwd ' : '') + - (s.creative ? 'Cre ' : '') + - (s.damage ? 'Dmg ' : '') + - (s.pvp ? 'Pvp ' : '') + - (s.dedicated ? 'Ded ' : '') + - (s.rollback ? 'Rol ' : '') + - (s.liquid_finite ? 'Liq ' : '') + - '' + (s.uptime ? human_time(s.uptime, 1) : s.start ? human_time(s.start) : '') + '' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + '
'; + if (r.list.length) { + h += ''; + if (!master.no_address) h += ''; + if (!master.no_clients) h += ''; + if (!master.no_version) h += ''; + if (!master.no_name) h += ''; + if (!master.no_description) h += ''; + if (!master.no_flags) h += ''; + if (!master.no_uptime) h += ''; + if (!master.no_ping) h += ''; h += ''; } - h += '
ip[:port]players/maxversion gameid mapgennamedescriptionflagsuptime ageping
' - jQuery(output_to || '#servers_table').html(h); + var count = 0; + for (var i = 0; i < r.list.length; ++i) { + if (++count > master.limit && master.limit) break; + var s = r.list[i]; + if (!s) continue; + if (master.clients_min && s.clients < master.clients_min) continue; + if (/:/.test(s.address)) s.address = '[' + s.address + ']'; + h += ''; + if (!master.no_address) h += '' + e(s.address) + (s.port != 30000 ? (':' + e(s.port)) : '') + ''; + if (!master.no_clients) { + h += ''; + if (!master.no_clients_list && s.clients && s.clients_list) { + h += '
Players (' + e(s.clients) + '):
'; + for (var ii in s.clients_list) + h += e(s.clients_list[ii]) + '
'; + h += '
'; + } + h += e(s.clients) + (s.clients_max ? '/' + e(s.clients_max) : '') + (s.clients_top ? ', ' + e(s.clients_top) : '') + ''; + } + var mods = 0; + if (s.mods && jQuery.isArray(s.mods)) + mods = s.mods.length; + if (!master.no_version) { + h += '' + e(s.version) + ' ' + e(s.gameid) + ' ' + e(s.mapgen); + if (!master.no_mods && mods) { + h += '
Mods (' + mods + '):
'; + for (var ii in s.mods) + h += e(s.mods[ii]) + '
'; + h += '
'; + } + h += ''; + } + if (!master.no_name) { + h += ''; + if (s.url) h += ''; + h += e(s.name || s.url); + if (s.url) h += ''; + h += ''; + } + if (!master.no_description) h += '' + e(s.description) + ''; + if (!master.no_flags) { + h += '' + + (s.password ? 'Pwd ' : '') + + (s.creative ? 'Cre ' : '') + + (s.damage ? 'Dmg ' : '') + + (s.pvp ? 'Pvp ' : '') + + (s.dedicated ? 'Ded ' : '') + + (s.rollback ? 'Rol ' : '') + + (s.liquid_finite ? 'Liq ' : '') + + ''; + } + if (!s.start || s.start < 0) s.start = 0; + if (!master.no_uptime) h += '' + (s.uptime ? human_time(s.uptime, 1) : s.start ? human_time(s.start) : '') + (s.game_time ? ' ' + human_time(s.game_time, 1) : '') + ''; + if (!master.no_ping) h += '' + (s.ping ? parseFloat(s.ping).toFixed(3) * 1000 : '') + ''; + h += ''; + } + h += ''; + if (master.clients_min || master.limit) + h += 'more...'; + jQuery(master.output || '#servers_table').html(h); } -function get() { - jQuery.getJSON((master_root || '') + 'list', success); - setTimeout(get, 60000); +function get(refresh) { + jQuery.getJSON((master.root || '') + 'list', success); + if (!refresh && !master.no_refresh) setTimeout(get, 60000); } get(); diff --git a/util/master/master.cgi b/util/master/master.cgi index bf627a989..a916827fe 100755 --- a/util/master/master.cgi +++ b/util/master/master.cgi @@ -3,7 +3,7 @@ =info install: cpan JSON JSON::XS - touch list_full list + touch list_full list log.log chmod a+rw list_full list log.log freebsd: @@ -48,6 +48,7 @@ use strict; no strict qw(refs); use warnings "NONFATAL" => "all"; no warnings qw(uninitialized); +no if $] >= 5.017011, warnings => 'experimental::smartmatch'; use utf8; use Socket; BEGIN { @@ -72,7 +73,7 @@ our %config = ( list_full => $root_path . 'list_full', list_pub => $root_path . 'list', log => $root_path . 'log.log', - time_purge => 86400 * 30, + time_purge => 86400 * 1, time_alive => 650, source_check => 1, ping_timeout => 3, @@ -190,11 +191,13 @@ sub request (;$) { $param->{$_} = $j->{$_} for keys %$j; delete $param->{json}; } + #printlog 'recv', Dumper $param; if (%$param) { s/^false$// for values %$param; $param->{ip} = $r->{REMOTE_ADDR}; $param->{ip} =~ s/^::ffff://; for (@{$config{blacklist}}) { + #printlog("blacklist", $param->{ip} ~~ $_) if $config{debug}; return if $param->{ip} ~~ $_; } $param->{address} ||= $param->{ip}; @@ -223,6 +226,7 @@ sub request (;$) { $param->{ping} = $duration if $pingret; printlog " PING t=$config{ping_timeout}, $param->{address}:$param->{port} = ( $pingret, $duration, $ip )" if $config{debug}; } + return if !$param->{ping}; } my $list = read_json($config{list_full}) || {}; printlog "readed[$config{list_full}] list size=", scalar @{$list->{list}}; @@ -232,6 +236,7 @@ sub request (;$) { $param->{time} ||= int time; $param->{start} = $param->{action} ~~ 'start' ? $param->{time} : $old->{start} || $param->{time}; delete $param->{start} if $param->{off}; + $param->{clients} ||= scalar @{$param->{clients_list}} if ref $param->{clients_list} eq 'ARRAY'; $param->{first} ||= $old->{first} || $old->{time} || $param->{time}; $param->{clients_top} = $old->{clients_top} if $old->{clients_top} > $param->{clients}; $param->{clients_top} ||= $param->{clients} || 0; @@ -239,9 +244,12 @@ sub request (;$) { for (qw(dedicated rollback liquid_finite mapgen mods)) { $param->{$_} ||= $old->{$_} if $old->{$_} and !($param->{action} ~~ 'start'); } + $param->{pop_n} = $old->{pop_n} + 1; + $param->{pop_c} = $old->{pop_c} + $param->{clients}; + $param->{pop_v} = $param->{pop_c} / $param->{pop_n}; delete $param->{action}; $listk->{$param->{key}} = $param; - #printlog Dumper $param; + #printlog 'write', Dumper $param if $config{debug}; $list->{list} = [grep { $_->{time} > time - $config{time_purge} } values %$listk]; file_rewrite($config{list_full}, JSON->new->encode($list)); printlog "writed[$config{list_full}] list size=", scalar @{$list->{list}} if $config{debug}; @@ -250,6 +258,13 @@ sub request (;$) { grep { $_->{time} > time - $config{time_alive} and !$_->{off} and (!$config{ping} or !$config{pingable} or $_->{ping}) } @{$list->{list}} ]; + $list->{total} = {clients => 0, servers => 0}; + for (@{$list->{list}}) { + $list->{total}{clients} += $_->{clients}; + ++$list->{total}{servers}; + } + $list->{total_max}{clients} = $list->{total}{clients} if $list->{total_max}{clients} < $list->{total}{clients}; + $list->{total_max}{servers} = $list->{total}{servers} if $list->{total_max}{servers} < $list->{total}{servers}; file_rewrite($config{list_pub}, JSON->new->encode($list)); printlog "writed[$config{list_pub}] list size=", scalar @{$list->{list}} if $config{debug}; } diff --git a/util/master/style.css b/util/master/style.css index c92c56f6e..cff041216 100644 --- a/util/master/style.css +++ b/util/master/style.css @@ -13,7 +13,7 @@ div#table table { width: 100%; } -.mts_mods { +.mts_mods, .mts_clients_list { visibility: hidden; border:gray solid 1px; position:absolute; @@ -22,11 +22,11 @@ div#table table { padding:.5em; } -.mts_version:hover .mts_mods { +.mts_version:hover .mts_mods, .mts_clients:hover .mts_clients_list { visibility: visible; } -.mts_version.mts_ismods { +.mts_version.mts_is_mods, .mts_clients.mts_is_clients { text-decoration:underline; text-decoration-style:dashed; }