Skip to content

Z
ZLMediaKit
Commit c0a41700 by ziyue
Options

优化http api相关代码,方便自由添加不同类型的api

parent dc3701e6
正在显示 包含 56 行增加 和 46 行删除
server/WebApi.cpp
...@@ -9,10 +9,8 @@ ...@@ -9,10 +9,8 @@
*/ */
#include <sys/stat.h> #include <sys/stat.h>
#include <math.h>
#include <signal.h> #include <signal.h>
#include <functional> #include <functional>
#include <sstream>
#include <unordered_map> #include <unordered_map>
#include "jsoncpp/json.h" #include "jsoncpp/json.h"
#include "Util/util.h" #include "Util/util.h"
...@@ -30,7 +28,6 @@ ...@@ -30,7 +28,6 @@
#include "Player/PlayerProxy.h" #include "Player/PlayerProxy.h"
#include "Util/MD5.h" #include "Util/MD5.h"
#include "WebApi.h" #include "WebApi.h"
#include "WebHook.h"
#include "Thread/WorkThreadPool.h" #include "Thread/WorkThreadPool.h"
#include "Rtp/RtpSelector.h" #include "Rtp/RtpSelector.h"
#include "FFmpegSource.h" #include "FFmpegSource.h"
...@@ -98,25 +95,58 @@ public: ...@@ -98,25 +95,58 @@ public:
#define API_ARGS1 SockInfo &sender,HttpSession::KeyValue &headerIn, HttpSession::KeyValue &headerOut, ApiArgsType &allArgs, Json::Value &val #define API_ARGS1 SockInfo &sender,HttpSession::KeyValue &headerIn, HttpSession::KeyValue &headerOut, ApiArgsType &allArgs, Json::Value &val
#define API_ARGS2 API_ARGS1, const HttpSession::HttpResponseInvoker &invoker #define API_ARGS2 API_ARGS1, const HttpSession::HttpResponseInvoker &invoker
#define API_ARGS_VALUE1 sender,headerIn,headerOut,allArgs,val #define API_ARGS_VALUE1 sender,headerIn,headerOut,allArgs,val
#define API_ARGS_VALUE2 API_ARGS_VALUE1, invoker
typedef map<string, variant, StrCaseCompare> ApiArgsType; typedef map<string, variant, StrCaseCompare> ApiArgsType;
typedef function<void(const Parser &parser, const HttpSession::HttpResponseInvoker &invoker, SockInfo &sender)> HttpApi;
//http api列表 //http api列表
static map<string, std::function<void(API_ARGS2)> > s_map_api; static map<string, HttpApi> s_map_api;
template<typename FUNC> static void responseApi(const Json::Value &res, const HttpSession::HttpResponseInvoker &invoker){
static void api_regist1(const string &api_path, FUNC &&func) { GET_CONFIG(string, charSet, Http::kCharSet);
s_map_api.emplace(api_path, [func](API_ARGS2) { HttpSession::KeyValue headerOut;
func(API_ARGS_VALUE1); headerOut["Content-Type"] = string("application/json; charset=") + charSet;
invoker("200 OK", headerOut, res.toStyledString());
};
static void responseApi(int code, const string &msg, const HttpSession::HttpResponseInvoker &invoker){
Json::Value res;
res["code"] = code;
res["msg"] = msg;
responseApi(res, invoker);
}
static ApiArgsType getAllArgs(const Parser &parser);
static HttpApi toApi(const function<void(API_ARGS2)> &cb) {
return [cb](const Parser &parser, const HttpSession::HttpResponseInvoker &invoker, SockInfo &sender) {
GET_CONFIG(string, charSet, Http::kCharSet);
HttpSession::KeyValue headerOut;
headerOut["Content-Type"] = string("application/json; charset=") + charSet;
Json::Value val;
val["code"] = API::Success;
auto args = getAllArgs(parser);
cb(sender, parser.getHeader(), headerOut, args, val, invoker);
};
}
static HttpApi toApi(const function<void(API_ARGS1)> &cb) {
return toApi([cb](API_ARGS2) {
cb(API_ARGS_VALUE1);
invoker("200 OK", headerOut, val.toStyledString()); invoker("200 OK", headerOut, val.toStyledString());
}); });
} }
template<typename FUNC> template<typename FUNC>
static void api_regist2(const string &api_path, FUNC &&func) { static void api_regist(const string &api_path, FUNC &&func) {
s_map_api.emplace(api_path, std::forward<FUNC>(func)); s_map_api.emplace(api_path, toApi(std::move(func)));
} }
#define api_regist1 api_regist
#define api_regist2 api_regist
//获取HTTP请求中url参数、content参数 //获取HTTP请求中url参数、content参数
static ApiArgsType getAllArgs(const Parser &parser) { static ApiArgsType getAllArgs(const Parser &parser) {
ApiArgsType allArgs; ApiArgsType allArgs;
...@@ -157,22 +187,11 @@ static inline void addHttpListener(){ ...@@ -157,22 +187,11 @@ static inline void addHttpListener(){
} }
//该api已被消费 //该api已被消费
consumed = true; consumed = true;
//执行API
Json::Value val;
val["code"] = API::Success;
HttpSession::KeyValue headerOut;
auto allArgs = getAllArgs(parser);
HttpSession::KeyValue &headerIn = parser.getHeader();
GET_CONFIG(string,charSet,Http::kCharSet);
headerOut["Content-Type"] = StrPrinter << "application/json; charset=" << charSet;
if(api_debug){ if(api_debug){
auto newInvoker = [invoker,parser,allArgs](const string &codeOut, auto newInvoker = [invoker, parser](const string &codeOut,
const HttpSession::KeyValue &headerOut, const HttpSession::KeyValue &headerOut,
const HttpBody::Ptr &body){ const HttpBody::Ptr &body) {
stringstream ss;
for(auto &pr : allArgs ){
ss << pr.first << " : " << pr.second << "\r\n";
}
//body默认为空 //body默认为空
int64_t size = 0; int64_t size = 0;
...@@ -181,45 +200,36 @@ static inline void addHttpListener(){ ...@@ -181,45 +200,36 @@ static inline void addHttpListener(){
size = body->remainSize(); size = body->remainSize();
} }
if(size && size < 4 * 1024){ if (size && size < 4 * 1024) {
string contentOut = body->readData(size)->toString(); string contentOut = body->readData(size)->toString();
DebugL << "\r\n# request:\r\n" << parser.Method() << " " << parser.FullUrl() << "\r\n" DebugL << "\r\n# request:\r\n" << parser.Method() << " " << parser.FullUrl() << "\r\n"
<< "# content:\r\n" << parser.Content() << "\r\n" << "# content:\r\n" << parser.Content() << "\r\n"
<< "# args:\r\n" << ss.str()
<< "# response:\r\n" << "# response:\r\n"
<< contentOut << "\r\n"; << contentOut << "\r\n";
invoker(codeOut,headerOut,contentOut); invoker(codeOut, headerOut, contentOut);
} else{ } else {
DebugL << "\r\n# request:\r\n" << parser.Method() << " " << parser.FullUrl() << "\r\n" DebugL << "\r\n# request:\r\n" << parser.Method() << " " << parser.FullUrl() << "\r\n"
<< "# content:\r\n" << parser.Content() << "\r\n" << "# content:\r\n" << parser.Content() << "\r\n"
<< "# args:\r\n" << ss.str()
<< "# response size:" << "# response size:"
<< size <<"\r\n"; << size << "\r\n";
invoker(codeOut,headerOut,body); invoker(codeOut, headerOut, body);
} }
}; };
((HttpSession::HttpResponseInvoker &)invoker) = newInvoker; ((HttpSession::HttpResponseInvoker &) invoker) = newInvoker;
} }
try { try {
it->second(sender,headerIn, headerOut, allArgs, val, invoker); it->second(parser, invoker, sender);
} catch(ApiRetException &ex){ } catch (ApiRetException &ex) {
val["code"] = ex.code(); responseApi(ex.code(), ex.what(), invoker);
val["msg"] = ex.what();
invoker("200 OK", headerOut, val.toStyledString());
} }
#ifdef ENABLE_MYSQL #ifdef ENABLE_MYSQL
catch(SqlException &ex){ catch(SqlException &ex){
val["code"] = API::SqlFailed; responseApi(API::SqlFailed, StrPrinter << "操作数据库失败:" << ex.what() << ":" << ex.getSql(), invoker);
val["msg"] = StrPrinter << "操作数据库失败:" << ex.what() << ":" << ex.getSql();
WarnL << ex.what() << ":" << ex.getSql();
invoker("200 OK", headerOut, val.toStyledString());
} }
#endif// ENABLE_MYSQL #endif// ENABLE_MYSQL
catch (std::exception &ex) { catch (std::exception &ex) {
val["code"] = API::Exception; responseApi(API::Exception, ex.what(), invoker);
val["msg"] = ex.what();
invoker("200 OK", headerOut, val.toStyledString());
} }
}); });
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论