支持Http multipart/form-data 文件上传

优化http客户端超时逻辑
去除rtmp/rtsp代理时间戳覆盖逻辑

src/Http/HttpClient.h

@@ -27,6 +27,7 @@
 #ifndef Http_HttpClient_h
 #define Http_HttpClient_h
 
+#include <stdio.h>
 #include <string.h>
 #include <functional>
 #include <memory>
@@ -41,8 +42,7 @@ using namespace ZL::Network;
 namespace ZL {
 namespace Http {
 
-class HttpArgs : public StrCaseMap
-{
+class HttpArgs : public StrCaseMap {
 public:
     HttpArgs(){}
     virtual ~HttpArgs(){}
@@ -60,7 +60,144 @@ public:
         return ret;
     }
 };
-    
+
+class HttpBody{
+public:
+    typedef std::shared_ptr<HttpBody> Ptr;
+    HttpBody(){}
+    virtual ~HttpBody(){}
+    //剩余数据大小
+    virtual uint64_t remainSize() = 0;
+    virtual Buffer::Ptr readData() = 0;
+};
+
+class HttpBodyString : public HttpBody{
+public:
+    typedef std::shared_ptr<HttpBodyString> Ptr;
+    HttpBodyString(const string &str){
+        _str = str;
+    }
+    virtual ~HttpBodyString(){}
+
+    uint64_t remainSize() override {
+        return _str.size();
+    }
+    Buffer::Ptr readData() override {
+        auto ret = std::make_shared<BufferString>(_str);
+        _str.clear();
+        return ret;
+    }
+private:
+    mutable string _str;
+};
+
+
+class HttpMultiFormBody : public HttpBody {
+public:
+    typedef std::shared_ptr<HttpMultiFormBody> Ptr;
+    HttpMultiFormBody(const StrCaseMap &args,const string &filePath,const string &boundary,uint32_t sliceSize = 4 * 1024){
+        _fp = fopen(filePath.data(),"rb");
+        if(!_fp){
+            throw std::invalid_argument(StrPrinter << "打开文件失败：" << filePath << " " << get_uv_errmsg());
+        }
+        auto fileName = filePath;
+        auto pos = filePath.rfind('/');
+        if(pos != string::npos){
+            fileName = filePath.substr(pos + 1);
+        }
+        _bodyPrefix = multiFormBodyPrefix(args,boundary,fileName);
+        _bodySuffix = multiFormBodySuffix(boundary);
+        _totalSize =  _bodyPrefix.size() + _bodySuffix.size() + fileSize(_fp);
+        _sliceSize = sliceSize;
+    }
+    virtual ~HttpMultiFormBody(){
+        fclose(_fp);
+    }
+
+    uint64_t remainSize() override {
+        return _totalSize - _offset;
+    }
+
+    Buffer::Ptr readData() override{
+        if(_bodyPrefix.size()){
+            auto ret = std::make_shared<BufferString>(_bodyPrefix);
+            _offset += _bodyPrefix.size();
+            _bodyPrefix.clear();
+            return ret;
+        }
+
+        if(0 == feof(_fp)){
+            auto ret = std::make_shared<BufferRaw>(_sliceSize);
+            //读文件
+            int size;
+            do{
+                size = fread(ret->data(),1,_sliceSize,_fp);
+            }while(-1 == size && UV_EINTR == get_uv_error(false));
+
+            if(size == -1){
+                _offset = _totalSize;
+                WarnL << "fread failed:" << get_uv_errmsg();
+                return nullptr;
+            }
+            _offset += size;
+            ret->setSize(size);
+            return ret;
+        }
+
+        if(_bodySuffix.size()){
+            auto ret = std::make_shared<BufferString>(_bodySuffix);
+            _offset = _totalSize;
+            _bodySuffix.clear();
+            return ret;
+        }
+
+        return nullptr;
+    }
+
+public:
+    static string multiFormBodyPrefix(const StrCaseMap &args,const string &boundary,const string &fileName){
+        string MPboundary = string("--") + boundary;
+        _StrPrinter body;
+        for(auto &pr : args){
+            body << MPboundary << "\r\n";
+            body << "Content-Disposition: form-data; name=\"" << pr.first << "\"\r\n\r\n";
+            body << pr.second << "\r\n";
+        }
+        body << MPboundary << "\r\n";
+        body << "Content-Disposition: form-data; name=\"" << "file" << "\";filename=\"" << fileName << "\"\r\n";
+        body << "Content-Type: application/octet-stream\r\n\r\n" ;
+        return body;
+    }
+    static string multiFormBodySuffix(const string &boundary){
+        string MPboundary = string("--") + boundary;
+        string endMPboundary = MPboundary + "--";
+        _StrPrinter body;
+        body << "\r\n" << endMPboundary;
+        return body;
+    }
+
+    static uint64_t fileSize(FILE *fp) {
+        auto current = ftell(fp);
+        fseek(fp,0L,SEEK_END); /* 定位到文件末尾 */
+        auto end  = ftell(fp); /* 得到文件大小 */
+        fseek(fp,current,SEEK_SET);
+        return end - current;
+    }
+
+    static string multiFormContentType(const string &boundary){
+        return StrPrinter << "multipart/form-data; boundary=" << boundary;
+    }
+private:
+    FILE *_fp;
+    string _bodyPrefix;
+    string _bodySuffix;
+    uint64_t _offset = 0;
+    uint64_t _totalSize;
+    uint32_t _sliceSize;
+};
+
+
+
 class HttpClient : public TcpClient
 {
 public:
@@ -71,7 +208,7 @@ public:
     virtual void sendRequest(const string &url,float fTimeOutSec);
     void clear(){
         _header.clear();
-        _body.clear();
+        _body.reset();
         _method.clear();
         _path.clear();
         _recvedResponse.clear();
@@ -83,10 +220,18 @@ public:
     void setHeader(const HttpHeader &header){
         _header = header;
     }
-    void addHeader(const string &key,const string &val){
-        _header.emplace(key,val);
+    HttpClient & addHeader(const string &key,const string &val,bool force = false){
+        if(!force){
+            _header.emplace(key,val);
+        }else{
+            _header[key] = val;
+        }
+        return *this;
     }
     void setBody(const string &body){
+        _body.reset(new HttpBodyString(body));
+    }
+    void setBody(const HttpBody::Ptr &body){
         _body = body;
     }
     const string &responseStatus(){
@@ -96,8 +241,6 @@ public:
         return _parser.getValues();
     }
 protected:
-    bool _isHttps;
-    
     virtual void onResponseHeader(const string &status,const HttpHeader &headers){
         DebugL << status;
     };
@@ -109,24 +252,28 @@ protected:
     }
     virtual void onRecvBytes(const char *data,int size);
     virtual void onDisconnect(const SockException &ex){}
-private:
+protected:
     virtual void onConnect(const SockException &ex) override;
     virtual void onRecv(const Buffer::Ptr &pBuf) override;
     virtual void onErr(const SockException &ex) override;
-    
+    virtual void onSend() override;
+    virtual void onManager() override;
+protected:
+    bool _isHttps;
+private:
     //send
     HttpHeader _header;
-    string _body;
+    HttpBody::Ptr _body;
     string _method;
     string _path;
-    
     //recv
     string _recvedResponse;
-    size_t _recvedBodySize;
-    size_t _totalBodySize;
+    int64_t _recvedBodySize;
+    int64_t _totalBodySize;
     Parser _parser;
-    
     string _lastHost;
+    Ticker _aliveTicker;
+    float _fTimeOutSec = 0;
 };