mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

zone and api work a bit better now

Browse source
This commit is contained in:
NotAdam 2018-10-26 22:14:12 +11:00
parent ccb29c88de
commit ddfbeb724f
5 changed files with 419 additions and 408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -36,11 +36,11 @@ add_subdirectory( "src/common" )
add_subdirectory( "src/servers" ) add_subdirectory( "src/servers" )
#add_subdirectory( "src/dbm" ) #add_subdirectory( "src/dbm" )
add_subdirectory( "src/tools/exd_common_gen" ) #add_subdirectory( "src/tools/exd_common_gen" )
add_subdirectory( "src/tools/exd_struct_gen" ) #add_subdirectory( "src/tools/exd_struct_gen" )
add_subdirectory( "src/tools/exd_struct_test" ) #add_subdirectory( "src/tools/exd_struct_test" )
add_subdirectory( "src/tools/quest_parser" ) #add_subdirectory( "src/tools/quest_parser" )
add_subdirectory( "src/tools/discovery_parser" ) #add_subdirectory( "src/tools/discovery_parser" )
add_subdirectory( "src/tools/mob_parse" ) #add_subdirectory( "src/tools/mob_parse" )
#add_subdirectory("src/tools/pcb_reader") #add_subdirectory("src/tools/pcb_reader")
#add_subdirectory("src/tools/event_object_parser") #add_subdirectory("src/tools/event_object_parser")

7
src/servers/sapphire_api/main.cpp
View file

@ -487,7 +487,12 @@ void checkSession( shared_ptr< HttpServer::Response > response, shared_ptr< Http
} }
else else
{ {
std::string json_string = "{\"result\":\"" + std::to_string( result ) + "\"}"; std::string json_string = nlohmann::json( {
{ "result", result },
{ "result2", "penis" },
{ "result3", "wtf" }
} ).dump()
;
*response << buildHttpResponse( 200, json_string, JSON ); *response << buildHttpResponse( 200, json_string, JSON );
} }
} }

19
src/servers/sapphire_lobby/RestConnector.cpp
View file

@ -57,7 +57,7 @@ Core::LobbySessionPtr Core::Network::RestConnector::getSession( char* sId )
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -99,7 +99,7 @@ bool Core::Network::RestConnector::checkNameTaken( std::string name )
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -133,7 +133,7 @@ uint32_t Core::Network::RestConnector::getNextCharId()
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -172,7 +172,7 @@ uint64_t Core::Network::RestConnector::getNextContentId()
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -213,7 +213,7 @@ CharList Core::Network::RestConnector::getCharList( char* sId )
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -230,10 +230,11 @@ CharList Core::Network::RestConnector::getCharList( char* sId )
{ {
g_log.debug( child["contentId"] ); g_log.debug( child["contentId"] );
//std::string, uint32_t, uint64_t, std::string //std::string, uint32_t, uint64_t, std::string
list.push_back( std::make_tuple( child["name"].get< std::string >() ), list.push_back( { child["name"].get< std::string >(),
child["charId"].get< uint32_t >(), child["charId"].get< uint32_t >(),
child["contentId"].get< uint64_t >(), child["contentId"].get< uint64_t >(),
child["infoJson"].get< std::string >() ); child["infoJson"].get< std::string >()
} );
} }
return list; return list;
@ -266,7 +267,7 @@ bool Core::Network::RestConnector::deleteCharacter( char* sId, std::string name
auto json = nlohmann::json(); auto json = nlohmann::json();
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {
@ -303,7 +304,7 @@ int Core::Network::RestConnector::createCharacter( char* sId, std::string name,
try try
{ {
json.parse( content ); json = json.parse( content );
} }
catch( std::exception& e ) catch( std::exception& e )
{ {

19
src/servers/sapphire_lobby/client_http.hpp
View file

@ -4,12 +4,15 @@
#include <asio.hpp> #include <asio.hpp>
#include <Util/Util.h> #include <Util/Util.h>
#include <unordered_map> #include <unordered_map>
#include <map> #include <map>
#include <random> #include <random>
#include <mutex> #include <mutex>
#include <type_traits> #include <type_traits>
#include <functional>
#ifndef CASE_INSENSITIVE_EQUALS_AND_HASH
#define CASE_INSENSITIVE_EQUALS_AND_HASH
class case_insensitive_equals { class case_insensitive_equals {
public: public:
@ -19,13 +22,15 @@ public:
}; };
class case_insensitive_hash { class case_insensitive_hash {
public: public:
size_t operator()( const std::string &key ) const { size_t operator()( const std::string &key ) const
{
std::size_t seed=0; std::size_t seed=0;
for( auto &c : key ) for( auto &c : key )
Core::Util::hashCombine< char >( seed, std::tolower( c ) ); Core::Util::hashCombine< char >( seed, std::tolower( c ) );
return seed; return seed;
} }
}; };
#endif
namespace SimpleWeb { namespace SimpleWeb {
template <class socket_type> template <class socket_type>
@ -204,11 +209,11 @@ namespace SimpleWeb {
virtual void connect()=0; virtual void connect()=0;
std::shared_ptr< asio::deadline_timer > get_timeout_timer() { std::shared_ptr< asio::basic_waitable_timer< std::chrono::steady_clock > > get_timeout_timer() {
if(config.timeout==0) if(config.timeout==0)
return nullptr; return nullptr;
auto timer = std::make_shared< asio::deadline_timer >( io_service ); auto timer=std::make_shared< asio::basic_waitable_timer< std::chrono::steady_clock > >(io_service);
timer->expires_from_now( std::chrono::seconds( config.timeout ) ); timer->expires_from_now( std::chrono::seconds( config.timeout ) );
timer->async_wait([this](const std::error_code& ec) { timer->async_wait([this](const std::error_code& ec) {
if(!ec) { if(!ec) {
@ -265,7 +270,7 @@ namespace SimpleWeb {
if(content_length>num_additional_bytes) { if(content_length>num_additional_bytes) {
auto timer=get_timeout_timer(); auto timer=get_timeout_timer();
asio::async_read(*socket, response->content_buffer, asio::async_read(*socket, response->content_buffer,
asio::transfer_exactly( static_cast< size_t >( content_length - num_additional_bytes ) ), asio::transfer_exactly(content_length-num_additional_bytes),
[this, timer](const std::error_code& ec, size_t /*bytes_transferred*/) { [this, timer](const std::error_code& ec, size_t /*bytes_transferred*/) {
if(timer) if(timer)
timer->cancel(); timer->cancel();
@ -306,7 +311,7 @@ namespace SimpleWeb {
line.pop_back(); line.pop_back();
std::streamsize length=stol(line, 0, 16); std::streamsize length=stol(line, 0, 16);
auto num_additional_bytes = response->content_buffer.size() - bytes_transferred; auto num_additional_bytes=static_cast<std::streamsize>(response->content_buffer.size()-bytes_transferred);
auto post_process=[this, &response, &streambuf, length] { auto post_process=[this, &response, &streambuf, length] {
std::ostream stream(&streambuf); std::ostream stream(&streambuf);
@ -331,7 +336,7 @@ namespace SimpleWeb {
if((2+length)>num_additional_bytes) { if((2+length)>num_additional_bytes) {
auto timer=get_timeout_timer(); auto timer=get_timeout_timer();
asio::async_read(*socket, response->content_buffer, asio::async_read(*socket, response->content_buffer,
asio::transfer_exactly( static_cast< size_t >( 2 + length - num_additional_bytes ) ), asio::transfer_exactly(2+length-num_additional_bytes),
[this, post_process, timer](const std::error_code& ec, size_t /*bytes_transferred*/) { [this, post_process, timer](const std::error_code& ec, size_t /*bytes_transferred*/) {
if(timer) if(timer)
timer->cancel(); timer->cancel();