优化http客户端代码

src/Http/HttpClient.h

@@ -34,6 +34,7 @@
 #include "Rtsp/Rtsp.h"
 #include "Rtsp/Rtsp.h"
 #include "Util/util.h"
 #include "Util/util.h"
 #include "Network/TcpClient.h"
 #include "Network/TcpClient.h"
+#include "HttpRequestSplitter.h"
 
 
 using namespace std;
 using namespace std;
 using namespace ZL::Util;
 using namespace ZL::Util;
@@ -198,7 +199,7 @@ private:
 
 
 
 
 
 
-class HttpClient : public TcpClient
+class HttpClient : public TcpClient , public HttpRequestSplitter
 {
 {
 public:
 public:
     typedef StrCaseMap HttpHeader;
     typedef StrCaseMap HttpHeader;
@@ -211,7 +212,6 @@ public:
         _body.reset();
         _body.reset();
         _method.clear();
         _method.clear();
         _path.clear();
         _path.clear();
-        _recvedResponse.clear();
         _parser.Clear();
         _parser.Clear();
     }
     }
     void setMethod(const string &method){
     void setMethod(const string &method){
@@ -241,23 +241,57 @@ public:
         return _parser.getValues();
         return _parser.getValues();
     }
     }
 protected:
 protected:
+    /**
+     * 收到http回复头
+     * @param status 状态码，譬如:200 OK
+     * @param headers http头
+     */
     virtual void onResponseHeader(const string &status,const HttpHeader &headers){
     virtual void onResponseHeader(const string &status,const HttpHeader &headers){
         DebugL << status;
         DebugL << status;
     };
     };
+
+    /**
+     * 收到http conten数据
+     * @param buf 数据指针
+     * @param size 数据大小
+     * @param recvedSize 已收数据大小(包含本次数据大小),当其等于totalSize时将触发onResponseCompleted回调
+     * @param totalSize 总数据大小
+     */
     virtual void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize){
     virtual void onResponseBody(const char *buf,size_t size,size_t recvedSize,size_t totalSize){
         DebugL << size << " " <<  recvedSize << " " << totalSize;
         DebugL << size << " " <<  recvedSize << " " << totalSize;
     };
     };
+
+    /**
+     * 接收http回复完毕
+     */
     virtual void onResponseCompleted(){
     virtual void onResponseCompleted(){
     	DebugL;
     	DebugL;
     }
     }
+
+    /**
+     * 收到http回复数据回调
+     * @param data 数据指针
+     * @param size 数据大小
+     */
     virtual void onRecvBytes(const char *data,int size);
     virtual void onRecvBytes(const char *data,int size);
+
+    /**
+     * http链接断开回调
+     * @param ex 断开原因
+     */
     virtual void onDisconnect(const SockException &ex){}
     virtual void onDisconnect(const SockException &ex){}
+
+    //HttpRequestSplitter override
+    int64_t onRecvHeader(const char *data,uint64_t len) override ;
+    void onRecvContent(const char *data,uint64_t len) override;
 protected:
 protected:
     virtual void onConnect(const SockException &ex) override;
     virtual void onConnect(const SockException &ex) override;
     virtual void onRecv(const Buffer::Ptr &pBuf) override;
     virtual void onRecv(const Buffer::Ptr &pBuf) override;
     virtual void onErr(const SockException &ex) override;
     virtual void onErr(const SockException &ex) override;
     virtual void onSend() override;
     virtual void onSend() override;
     virtual void onManager() override;
     virtual void onManager() override;
+private:
+    void onResponseCompleted_l();
 protected:
 protected:
     bool _isHttps;
     bool _isHttps;
 private:
 private:
@@ -267,7 +301,6 @@ private:
     string _method;
     string _method;
     string _path;
     string _path;
     //recv
     //recv
-    string _recvedResponse;
     int64_t _recvedBodySize;
     int64_t _recvedBodySize;
     int64_t _totalBodySize;
     int64_t _totalBodySize;
     Parser _parser;
     Parser _parser;

src/Http/HttpRequestSplitter.cpp

@@ -74,3 +74,8 @@ splitPacket:
 void HttpRequestSplitter::setContentLen(int64_t content_len) {
 void HttpRequestSplitter::setContentLen(int64_t content_len) {
     _content_len = content_len;
     _content_len = content_len;
 }
 }
+
+void HttpRequestSplitter::reset() {
+    _content_len = 0;
+    _remain_data.clear();
+}

src/Http/HttpRequestSplitter.h

@@ -26,9 +26,9 @@ protected:
      * @param len 请求头长度
      * @param len 请求头长度
      *
      *
      * @return 请求头后的content长度,
      * @return 请求头后的content长度,
-     *  <0 : 代表后面所有数据都是content
+     *  <0 : 代表后面所有数据都是content，此时后面的content将分段通过onRecvContent函数回调出去
      *  0 : 代表为后面数据还是请求头,
      *  0 : 代表为后面数据还是请求头,
-     *  >0 : 代表后面数据为固定长度content,
+     *  >0 : 代表后面数据为固定长度content,此时将缓存content并等到所有content接收完毕一次性通过onRecvContent函数回调出去
      */
      */
     virtual int64_t onRecvHeader(const char *data,uint64_t len) = 0;
     virtual int64_t onRecvHeader(const char *data,uint64_t len) = 0;
 
 
@@ -44,6 +44,11 @@ protected:
      * 设置content len
      * 设置content len
      */
      */
     void setContentLen(int64_t content_len);
     void setContentLen(int64_t content_len);
+
+    /**
+     * 恢复初始设置
+     */
+     void reset();
 private:
 private:
     string _remain_data;
     string _remain_data;
     int64_t _content_len = 0;
     int64_t _content_len = 0;

src/Http/WebSocketSplitter.cpp

@@ -98,8 +98,8 @@ begin_decode:
         if(playload_slice_len + _playload_offset > _playload_len){
         if(playload_slice_len + _playload_offset > _playload_len){
             playload_slice_len = _playload_len - _playload_offset;
             playload_slice_len = _playload_len - _playload_offset;
         }
         }
-        onPlayloadData(ptr,playload_slice_len);
         _playload_offset += playload_slice_len;
         _playload_offset += playload_slice_len;
+        onPlayloadData(ptr,playload_slice_len);
 
 
         if(_playload_offset == _playload_len){
         if(_playload_offset == _playload_len){
             //这是下一个包
             //这是下一个包

src/Http/WebSocketSplitter.h

@@ -77,7 +77,7 @@ protected:
      * @param packet 数据包包头
      * @param packet 数据包包头
      * @param ptr 负载数据指针
      * @param ptr 负载数据指针
      * @param len 负载数据长度
      * @param len 负载数据长度
-     * @param recved 已接收数据长度，等于packet._playload_len时则接受完毕
+     * @param recved 已接收数据长度(包含本次数据长度)，等于packet._playload_len时则接受完毕
      */
      */
     virtual void onWebSocketDecodePlayload(const WebSocketHeader &packet, const uint8_t *ptr, uint64_t len, uint64_t recved) {};
     virtual void onWebSocketDecodePlayload(const WebSocketHeader &packet, const uint8_t *ptr, uint64_t len, uint64_t recved) {};