diff --git a/f8/jsonhttprequest.cc b/f8/jsonhttprequest.cc new file mode 100644 index 0000000..1296a50 --- /dev/null +++ b/f8/jsonhttprequest.cc @@ -0,0 +1,31 @@ +#include + +#include +#include + +#include +#include + +namespace f8 +{ + JsonHttpRequest::JsonHttpRequest() + { + resp_xobj = a8::MutableXObject::NewObject(); + } + + JsonHttpRequest::~JsonHttpRequest() + { + delete resp_xobj; + if (context && free_context) { + free_context(context); + } + } + + std::string JsonHttpRequest::Response() + { + std::string response; + resp_xobj->ToJsonStr(response); + return a8::HttpResponse(response); + } + +} diff --git a/f8/jsonhttprequest.h b/f8/jsonhttprequest.h new file mode 100644 index 0000000..3e4c017 --- /dev/null +++ b/f8/jsonhttprequest.h @@ -0,0 +1,31 @@ +#pragma once + +namespace a8 +{ + class MutableXObject; +} + +namespace f8 +{ + + struct JsonHttpRequest + { + bool pending = false; + unsigned long saddr = 0; + int socket_handle = 0; + time_t create_time = 0; + time_t handle_time = 0; + std::string query_str; + a8::XObject request; + a8::MutableXObject* resp_xobj = nullptr; + + int async_pending_count = 0; + void* context = nullptr; + void (*free_context)(void*) = nullptr; + + JsonHttpRequest(); + ~JsonHttpRequest(); + std::string Response(); + }; + +} diff --git a/f8/types.cc b/f8/types.cc index e32f537..0b77c10 100644 --- a/f8/types.cc +++ b/f8/types.cc @@ -7,24 +7,5 @@ namespace f8 { - JsonHttpRequest::JsonHttpRequest() - { - resp_xobj = a8::MutableXObject::NewObject(); - } - - JsonHttpRequest::~JsonHttpRequest() - { - delete resp_xobj; - if (context && free_context) { - free_context(context); - } - } - - std::string JsonHttpRequest::Response() - { - std::string response; - resp_xobj->ToJsonStr(response); - return a8::HttpResponse(response); - } } diff --git a/f8/types.h b/f8/types.h index f601286..68eafdb 100644 --- a/f8/types.h +++ b/f8/types.h @@ -1,31 +1,10 @@ #pragma once -namespace a8 -{ - class MutableXObject; -} - namespace f8 { - struct JsonHttpRequest - { - bool pending = false; - unsigned long saddr = 0; - int socket_handle = 0; - time_t create_time = 0; - time_t handle_time = 0; - std::string query_str; - a8::XObject request; - a8::MutableXObject* resp_xobj = nullptr; - int async_pending_count = 0; - void* context = nullptr; - void (*free_context)(void*) = nullptr; - - JsonHttpRequest(); - ~JsonHttpRequest(); - std::string Response(); - }; + struct MsgHdr; + struct JsonHttpRequest; enum SysInnerMesssage_e { @@ -35,6 +14,4 @@ namespace f8 IM_SysEnd = 99, }; - struct MsgHdr; - }