Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-23 17:47:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renamed SessionManager to HTTPSessionManager.

Browse Source
This commit is contained in:
Relintai 2022-06-27 13:56:34 +02:00
parent c530aa2c41
commit 90c0a9937b
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/web/http/http_session_manager.cpp
View File

@ -15,9 +15,9 @@
#include "web_server_cookie.h" #include "web_server_cookie.h"
void SessionManager::add_session(Ref<HTTPSession> &session) { void HTTPSessionManager::add_session(Ref<HTTPSession> &session) {
if (!session.is_valid()) { if (!session.is_valid()) {
printf("SessionManager::add_session: ERROR, session is null!\n"); printf("HTTPSessionManager::add_session: ERROR, session is null!\n");
return; return;
} }
@ -29,9 +29,9 @@ void SessionManager::add_session(Ref<HTTPSession> &session) {
_mutex.unlock(); _mutex.unlock();
} }
void SessionManager::remove_session(Ref<HTTPSession> &session) { void HTTPSessionManager::remove_session(Ref<HTTPSession> &session) {
if (!session.is_valid()) { if (!session.is_valid()) {
printf("SessionManager::remove_session: ERROR, session is null!\n"); printf("HTTPSessionManager::remove_session: ERROR, session is null!\n");
return; return;
} }
@ -51,7 +51,7 @@ void SessionManager::remove_session(Ref<HTTPSession> &session) {
_mutex.unlock(); _mutex.unlock();
} }
void SessionManager::delete_session(const String &session_id) { void HTTPSessionManager::delete_session(const String &session_id) {
_mutex.lock(); _mutex.lock();
Ref<HTTPSession> s = _sessions[session_id]; Ref<HTTPSession> s = _sessions[session_id];
@ -88,7 +88,7 @@ void SessionManager::delete_session(const String &session_id) {
#endif #endif
} }
void SessionManager::save_session(Ref<HTTPSession> &session) { void HTTPSessionManager::save_session(Ref<HTTPSession> &session) {
#if DATABASES_ENABLED #if DATABASES_ENABLED
Ref<QueryBuilder> b = DatabaseManager::get_singleton()->ddb->get_query_builder(); Ref<QueryBuilder> b = DatabaseManager::get_singleton()->ddb->get_query_builder();
@ -121,11 +121,11 @@ void SessionManager::save_session(Ref<HTTPSession> &session) {
#endif #endif
} }
Ref<HTTPSession> SessionManager::get_session(const String &session_id) { Ref<HTTPSession> HTTPSessionManager::get_session(const String &session_id) {
return _sessions[session_id]; return _sessions[session_id];
} }
Ref<HTTPSession> SessionManager::create_session() { Ref<HTTPSession> HTTPSessionManager::create_session() {
Ref<HTTPSession> session = new HTTPSession(); Ref<HTTPSession> session = new HTTPSession();
while (true) { while (true) {
@ -150,7 +150,7 @@ Ref<HTTPSession> SessionManager::create_session() {
return session; return session;
} }
void SessionManager::load_sessions() { void HTTPSessionManager::load_sessions() {
clear(); clear();
#if DATABASES_ENABLED #if DATABASES_ENABLED
@ -195,7 +195,7 @@ void SessionManager::load_sessions() {
} }
if (!s.is_valid()) { if (!s.is_valid()) {
printf("Error: SessionManager::load_sessions(): %d sid doesn't exists!\n", session_db_id); printf("Error: HTTPSessionManager::load_sessions(): %d sid doesn't exists!\n", session_db_id);
continue; continue;
} }
@ -208,7 +208,7 @@ void SessionManager::load_sessions() {
#endif #endif
} }
void SessionManager::clear() { void HTTPSessionManager::clear() {
_mutex.lock(); _mutex.lock();
_sessions.clear(); _sessions.clear();
@ -217,7 +217,7 @@ void SessionManager::clear() {
_mutex.unlock(); _mutex.unlock();
} }
String SessionManager::generate_session_id(const String &base) { String HTTPSessionManager::generate_session_id(const String &base) {
// todo make something simpler / better // todo make something simpler / better
String sid = base; String sid = base;
@ -227,12 +227,12 @@ String SessionManager::generate_session_id(const String &base) {
return sid.sha256_text().substr(0, 20); return sid.sha256_text().substr(0, 20);
} }
void SessionManager::migrate() { void HTTPSessionManager::migrate() {
drop_table(); drop_table();
create_table(); create_table();
} }
void SessionManager::create_table() { void HTTPSessionManager::create_table() {
#if DATABASES_ENABLED #if DATABASES_ENABLED
Ref<TableBuilder> tb = DatabaseManager::get_singleton()->ddb->get_table_builder(); Ref<TableBuilder> tb = DatabaseManager::get_singleton()->ddb->get_table_builder();
@ -257,7 +257,7 @@ void SessionManager::create_table() {
tb->run_query(); tb->run_query();
#endif #endif
} }
void SessionManager::drop_table() { void HTTPSessionManager::drop_table() {
#if DATABASES_ENABLED #if DATABASES_ENABLED
Ref<TableBuilder> tb = DatabaseManager::get_singleton()->ddb->get_table_builder(); Ref<TableBuilder> tb = DatabaseManager::get_singleton()->ddb->get_table_builder();
@ -266,16 +266,16 @@ void SessionManager::drop_table() {
#endif #endif
} }
SessionManager::SessionManager() { HTTPSessionManager::HTTPSessionManager() {
_table_name = "sessions"; _table_name = "sessions";
_data_table_name = "session_data"; _data_table_name = "session_data";
} }
SessionManager::~SessionManager() { HTTPSessionManager::~HTTPSessionManager() {
clear(); clear();
} }
void SessionManager::_bind_methods() { void HTTPSessionManager::_bind_methods() {
} }
bool SessionSetupWebServerMiddleware::_on_before_handle_request_main(Ref<WebServerRequest> request) { bool SessionSetupWebServerMiddleware::_on_before_handle_request_main(Ref<WebServerRequest> request) {
@ -284,7 +284,7 @@ bool SessionSetupWebServerMiddleware::_on_before_handle_request_main(Ref<WebServ
if (sid == "") { if (sid == "") {
// You could create a session here if you want to always assign sessions to visitors. // You could create a session here if you want to always assign sessions to visitors.
// Example code: // Example code:
// HTTPSession *session = SessionManager::get_singleton()->create_session(); // HTTPSession *session = HTTPSessionManager::get_singleton()->create_session();
// request->session = session; // request->session = session;
// request->add_cookie(::Cookie("session_id", session->session_id)); // request->add_cookie(::Cookie("session_id", session->session_id));
@ -297,12 +297,12 @@ bool SessionSetupWebServerMiddleware::_on_before_handle_request_main(Ref<WebServ
//WebServer (Impl) -> maybe webroot node should not be auto discovered, it should have a nodepath for safety //WebServer (Impl) -> maybe webroot node should not be auto discovered, it should have a nodepath for safety
// I - WebRoot // I - WebRoot
// I - WebNodes ... (site) // I - WebNodes ... (site)
// I - SessionManager (finds parent websercver, registers itself in enter tree) // I - HTTPSessionManager (finds parent websercver, registers itself in enter tree)
// I - Other helper nodes, maybe a DatabaseManager (convert to node) etc These will not be accessible // I - Other helper nodes, maybe a DatabaseManager (convert to node) etc These will not be accessible
//request->server->get_session_manager()->get_session(sid); //request->server->get_session_manager()->get_session(sid);
//request->session = SessionManager::get_singleton()->get_session(sid); //request->session = HTTPSessionManager::get_singleton()->get_session(sid);
return false; return false;
} }

8
modules/web/http/http_session_manager.h
View File

@ -14,8 +14,8 @@
class HTTPSession; class HTTPSession;
class WebServerRequest; class WebServerRequest;
class SessionManager : public Node { class HTTPSessionManager : public Node {
GDCLASS(SessionManager, Node); GDCLASS(HTTPSessionManager, Node);
public: public:
void add_session(Ref<HTTPSession> &session); void add_session(Ref<HTTPSession> &session);
@ -35,8 +35,8 @@ public:
virtual void create_table(); virtual void create_table();
virtual void drop_table(); virtual void drop_table();
SessionManager(); HTTPSessionManager();
~SessionManager(); ~HTTPSessionManager();
HashMap<String, Ref<HTTPSession>> _sessions; HashMap<String, Ref<HTTPSession>> _sessions;
Vector<Ref<HTTPSession>> _sessions_vec; Vector<Ref<HTTPSession>> _sessions_vec;