Merge pull request #7 from zlmediakit/master

update

ZLToolKit @ 91246bb0

-Subproject commit 0b406073125080ab8edd13ee7c14e573e54baa35
+Subproject commit 91246bb01475c7336040a4b7ec35d0584887f365

README.md

@@ -42,7 +42,7 @@
   - HTTP server,suppor directory meun、RESTful http api.
   - HTTP client,downloader,uploader,and http api requester.
   - Cookie supported.
-  - WebSocket Server.
+  - WebSocket Server and Client.
   - File access authentication.
   
 - Others
@@ -95,7 +95,7 @@
 | RTSP[S] Play Server |  Y   |
 | RTSP[S] Push Server |  Y   |
 |        RTMP         |  Y   |
-|  HTTP[S]/WebSocket  |  Y   |
+| HTTP[S]/WebSocket[S] |  Y   |
 
 - Client supported:
 
@@ -106,6 +106,7 @@
 | RTMP Player |  Y   |
 | RTMP Pusher |  Y   |
 |   HTTP[S]   |  Y   |
+| WebSocket[S] |  Y   |
 
 
 

README_CN.md

@@ -51,7 +51,7 @@
   - 完整HTTP API服务器，可以作为web后台开发框架。
   - 支持跨域访问。
   - 支持http客户端、服务器cookie
-  - 支持WebSocket服务器
+  - 支持WebSocket服务器和客户端
   - 支持http文件访问鉴权
 
 - 其他
@@ -110,7 +110,7 @@
   | RTSP[S] Play Server |  Y   |
   | RTSP[S] Push Server |  Y   |
   |        RTMP         |  Y   |
-  |  HTTP[S]/WebSocket  |  Y   |
+  |  HTTP[S]/WebSocket[S]  |  Y   |
 
 - 支持的客户端类型
 
@@ -121,6 +121,7 @@
   | RTMP Player |  Y   |
   | RTMP Pusher |  Y   |
   |   HTTP[S]   |  Y   |
+  | WebSocket[S] |  Y  |
 
 ## 后续任务
 - 完善支持H265

server/main.cpp

@@ -270,13 +270,13 @@ int main(int argc,char *argv[]) {
         shellSrv->start<ShellSession>(shellPort);
         rtspSrv->start<RtspSession>(rtspPort);//默认554
         rtmpSrv->start<RtmpSession>(rtmpPort);//默认1935
-        //http服务器,支持websocket
-        httpSrv->start<EchoWebSocketSession>(httpPort);//默认80
+        //http服务器
+        httpSrv->start<HttpSession>(httpPort);//默认80
 
         //如果支持ssl，还可以开启https服务器
         TcpServer::Ptr httpsSrv(new TcpServer());
         //https服务器,支持websocket
-        httpsSrv->start<SSLEchoWebSocketSession>(httpsPort);//默认443
+        httpsSrv->start<HttpsSession>(httpsPort);//默认443
 
         //支持ssl加密的rtsp服务器，可用于诸如亚马逊echo show这样的设备访问
         TcpServer::Ptr rtspSSLSrv(new TcpServer());

src/Http/HttpSession.cpp

@@ -195,15 +195,14 @@ void HttpSession::onManager() {
 	}
 }
 
-
-inline bool HttpSession::checkWebSocket(){
+bool HttpSession::checkWebSocket(){
 	auto Sec_WebSocket_Key = _parser["Sec-WebSocket-Key"];
 	if(Sec_WebSocket_Key.empty()){
 		return false;
 	}
 	auto Sec_WebSocket_Accept = encodeBase64(SHA1::encode_bin(Sec_WebSocket_Key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"));
 
-	KeyValue headerOut;
+	KeyValue headerOut = makeHttpHeader();
 	headerOut["Upgrade"] = "websocket";
 	headerOut["Connection"] = "Upgrade";
 	headerOut["Sec-WebSocket-Accept"] = Sec_WebSocket_Accept;
@@ -223,12 +222,17 @@ inline bool HttpSession::checkWebSocket(){
     }
 
     //如果checkLiveFlvStream返回false,则代表不是websocket-flv，而是普通的websocket连接
+    if(!onWebSocketConnect(_parser)){
+        sendResponse("501 Not Implemented",headerOut,"");
+        shutdown(SockException(Err_shutdown,"WebSocket server not implemented"));
+        return true;
+    }
     sendResponse("101 Switching Protocols",headerOut,"");
 	return true;
 }
 //http-flv 链接格式:http://vhost-url:port/app/streamid.flv?key1=value1&key2=value2
 //如果url(除去?以及后面的参数)后缀是.flv,那么表明该url是一个http-flv直播。
-inline bool HttpSession::checkLiveFlvStream(const function<void()> &cb){
+bool HttpSession::checkLiveFlvStream(const function<void()> &cb){
 	auto pos = strrchr(_parser.Url().data(),'.');
 	if(!pos){
 		//未找到".flv"后缀
@@ -316,9 +320,9 @@ inline bool HttpSession::checkLiveFlvStream(const function<void()> &cb){
     return true;
 }
 
-inline bool makeMeun(const string &httpPath,const string &strFullPath, string &strRet) ;
+bool makeMeun(const string &httpPath,const string &strFullPath, string &strRet) ;
 
-inline static string findIndexFile(const string &dir){
+static string findIndexFile(const string &dir){
     DIR *pDir;
     dirent *pDirent;
     if ((pDir = opendir(dir.data())) == NULL) {
@@ -336,7 +340,7 @@ inline static string findIndexFile(const string &dir){
     return "";
 }
 
-inline string HttpSession::getClientUid(){
+string HttpSession::getClientUid(){
     //如果http客户端不支持cookie，那么我们可以通过url参数来追踪用户
     //如果url参数也没有，那么只能通过ip+端口号来追踪用户
     //追踪用户的目的是为了减少http短链接情况的重复鉴权验证，通过缓存记录鉴权结果，提高性能
@@ -349,13 +353,13 @@ inline string HttpSession::getClientUid(){
 
 
 //字符串是否以xx结尾
-static inline bool end_of(const string &str, const string &substr){
+static bool end_of(const string &str, const string &substr){
     auto pos = str.rfind(substr);
     return pos != string::npos && pos == str.size() - substr.size();
 };
 
 //拦截hls的播放请求
-static inline bool checkHls(BroadcastHttpAccessArgs){
+static bool checkHls(BroadcastHttpAccessArgs){
     if(!end_of(args._streamid,("/hls.m3u8"))) {
         //不是hls
         return false;
@@ -371,7 +375,7 @@ static inline bool checkHls(BroadcastHttpAccessArgs){
     return NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastMediaPlayed,args_copy,mediaAuthInvoker,sender);
 }
 
-inline void HttpSession::canAccessPath(const string &path_in,bool is_dir,const function<void(const string &errMsg,const HttpServerCookie::Ptr &cookie)> &callback_in){
+void HttpSession::canAccessPath(const string &path_in,bool is_dir,const function<void(const string &errMsg,const HttpServerCookie::Ptr &cookie)> &callback_in){
     auto path = path_in;
     replace(const_cast<string &>(path),"//","/");
 
@@ -472,13 +476,12 @@ inline void HttpSession::canAccessPath(const string &path_in,bool is_dir,const f
 
 }
 
-inline void HttpSession::Handle_Req_GET(int64_t &content_len) {
+void HttpSession::Handle_Req_GET(int64_t &content_len) {
 	//先看看是否为WebSocket请求
 	if(checkWebSocket()){
 		content_len = -1;
-		auto parserCopy = _parser;
-		_contentCallBack = [this,parserCopy](const char *data,uint64_t len){
-			onRecvWebSocketData(parserCopy,data,len);
+		_contentCallBack = [this](const char *data,uint64_t len){
+            WebSocketSplitter::decode((uint8_t *)data,len);
 			//_contentCallBack是可持续的，后面还要处理后续数据
 			return true;
 		};
@@ -666,7 +669,7 @@ inline void HttpSession::Handle_Req_GET(int64_t &content_len) {
     });
 }
 
-inline bool makeMeun(const string &httpPath,const string &strFullPath, string &strRet) {
+bool makeMeun(const string &httpPath,const string &strFullPath, string &strRet) {
 	string strPathPrefix(strFullPath);
 	string last_dir_name;
 	if(strPathPrefix.back() == '/'){
@@ -764,7 +767,8 @@ inline bool makeMeun(const string &httpPath,const string &strFullPath, string &s
 	ss.str().swap(strRet);
 	return true;
 }
-inline void HttpSession::sendResponse(const char* pcStatus, const KeyValue& header, const string& strContent) {
+
+void HttpSession::sendResponse(const char* pcStatus, const KeyValue& header, const string& strContent) {
 	_StrPrinter printer;
 	printer << "HTTP/1.1 " << pcStatus << "\r\n";
 	for (auto &pr : header) {
@@ -775,7 +779,8 @@ inline void HttpSession::sendResponse(const char* pcStatus, const KeyValue& head
 	send(strSend);
 	_ticker.resetTime();
 }
-inline HttpSession::KeyValue HttpSession::makeHttpHeader(bool bClose, int64_t iContentSize,const char* pcContentType) {
+
+HttpSession::KeyValue HttpSession::makeHttpHeader(bool bClose, int64_t iContentSize,const char* pcContentType) {
 	KeyValue headerOut;
     GET_CONFIG(string,charSet,Http::kCharSet);
     GET_CONFIG(uint32_t,keepAliveSec,Http::kKeepAliveSecond);
@@ -814,14 +819,14 @@ string HttpSession::urlDecode(const string &str){
     return ret;
 }
 
-inline void HttpSession::urlDecode(Parser &parser){
+void HttpSession::urlDecode(Parser &parser){
 	parser.setUrl(urlDecode(parser.Url()));
 	for(auto &pr : _parser.getUrlArgs()){
 		const_cast<string &>(pr.second) = urlDecode(pr.second);
 	}
 }
 
-inline bool HttpSession::emitHttpEvent(bool doInvoke){
+bool HttpSession::emitHttpEvent(bool doInvoke){
 	///////////////////是否断开本链接///////////////////////
     GET_CONFIG(uint32_t,reqCnt,Http::kMaxReqCount);
 
@@ -857,7 +862,8 @@ inline bool HttpSession::emitHttpEvent(bool doInvoke){
 	}
 	return consumed;
 }
-inline void HttpSession::Handle_Req_POST(int64_t &content_len) {
+
+void HttpSession::Handle_Req_POST(int64_t &content_len) {
 	GET_CONFIG(uint64_t,maxReqSize,Http::kMaxReqSize);
     GET_CONFIG(int,maxReqCnt,Http::kMaxReqCount);
 
@@ -944,7 +950,8 @@ void HttpSession::responseDelay(bool bClose,
     }
 	sendResponse(codeOut.data(), headerOut, contentOut);
 }
-inline void HttpSession::sendNotFound(bool bClose) {
+
+void HttpSession::sendNotFound(bool bClose) {
     GET_CONFIG(string,notFound,Http::kNotFound);
     sendResponse("404 Not Found", makeHttpHeader(bClose, notFound.size()), notFound);
 }

src/Http/HttpSession.h

@@ -72,8 +72,8 @@ protected:
 	void onWrite(const Buffer::Ptr &data) override ;
 	void onDetach() override;
 	std::shared_ptr<FlvMuxer> getSharedPtr() override;
-	//HttpRequestSplitter override
 
+	//HttpRequestSplitter override
 	int64_t onRecvHeader(const char *data,uint64_t len) override;
 	void onRecvContent(const char *data,uint64_t len) override;
 
@@ -94,29 +94,32 @@ protected:
         shutdown(SockException(Err_shutdown,"http post content is too huge,default closed"));
 	}
 
-    void onWebSocketDecodeHeader(const WebSocketHeader &packet) override{
-        shutdown(SockException(Err_shutdown,"websocket connection default closed"));
-    };
-
-	void onRecvWebSocketData(const Parser &header,const char *data,uint64_t len){
-        WebSocketSplitter::decode((uint8_t *)data,len);
+	/**
+     * websocket客户端连接上事件
+     * @param header http头
+     * @return true代表允许websocket连接，否则拒绝
+     */
+    virtual bool onWebSocketConnect(const Parser &header){
+        WarnL << "http server do not support websocket default";
+        return false;
     }
 
+	//WebSocketSplitter override
 	/**
      * 发送数据进行websocket协议打包后回调
-    * @param buffer
+     * @param buffer websocket协议数据
      */
 	void onWebSocketEncodeData(const Buffer::Ptr &buffer) override;
 private:
-	inline void Handle_Req_GET(int64_t &content_len);
-	inline void Handle_Req_POST(int64_t &content_len);
-	inline bool checkLiveFlvStream(const function<void()> &cb = nullptr);
-	inline bool checkWebSocket();
-	inline bool emitHttpEvent(bool doInvoke);
-	inline void urlDecode(Parser &parser);
-	inline void sendNotFound(bool bClose);
-	inline void sendResponse(const char *pcStatus,const KeyValue &header,const string &strContent);
-	inline KeyValue makeHttpHeader(bool bClose=false,int64_t iContentSize=-1,const char *pcContentType="text/html");
+	void Handle_Req_GET(int64_t &content_len);
+	void Handle_Req_POST(int64_t &content_len);
+	bool checkLiveFlvStream(const function<void()> &cb = nullptr);
+	bool checkWebSocket();
+	bool emitHttpEvent(bool doInvoke);
+	void urlDecode(Parser &parser);
+	void sendNotFound(bool bClose);
+	void sendResponse(const char *pcStatus,const KeyValue &header,const string &strContent);
+	KeyValue makeHttpHeader(bool bClose=false,int64_t iContentSize=-1,const char *pcContentType="text/html");
     void responseDelay(bool bClose,
                        const string &codeOut,
                        const KeyValue &headerOut,
@@ -134,14 +137,14 @@ private:
      * @param is_dir path是否为目录
      * @param callback 有权限或无权限的回调
      */
-    inline void canAccessPath(const string &path,bool is_dir,const function<void(const string &errMsg,const HttpServerCookie::Ptr &cookie)> &callback);
+	void canAccessPath(const string &path,bool is_dir,const function<void(const string &errMsg,const HttpServerCookie::Ptr &cookie)> &callback);
 
     /**
      * 获取用户唯一识别id
      * 有url参数返回参数，无参数返回ip+端口号
      * @return
      */
-    inline string getClientUid();
+	string getClientUid();
 
 	//设置socket标志
 	void setSocketFlags();

src/Http/WebSocketClient.cpp

-#include "WebSocketClient.h"
-
-
-
-int mediakit::WebSocketClient::send(const string& buf)
-{
-    if (_sock)
-    {
-        if (_WSClientStatus == WORKING)
-        {
-            _session->send(buf);
-            return 0;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-}
-
-void mediakit::WebSocketClient::clear()
-{
-    _method.clear();
-    _path.clear();
-    _parser.Clear();
-    _recvedBodySize = 0;
-    _totalBodySize = 0;
-    _aliveTicker.resetTime();
-    _chunkedSplitter.reset();
-    HttpRequestSplitter::reset();
-}
-
-const std::string & mediakit::WebSocketClient::responseStatus() const
-{
-    return _parser.Url();
-}
-
-const mediakit::WebSocketClient::HttpHeader & mediakit::WebSocketClient::responseHeader() const
-{
-    return _parser.getValues();
-}
-
-const mediakit::Parser& mediakit::WebSocketClient::response() const
-{
-    return _parser;
-}
-
-const std::string & mediakit::WebSocketClient::getUrl() const
-{
-    return _url;
-}
-
-int64_t mediakit::WebSocketClient::onResponseHeader(const string &status, const HttpHeader &headers)
-{
-    DebugL << status;
-    //无Content-Length字段时默认后面全是content
-    return -1;
-}
-
-void mediakit::WebSocketClient::onResponseBody(const char *buf, int64_t size, int64_t recvedSize, int64_t totalSize)
-{
-    DebugL << size << " " << recvedSize << " " << totalSize;
-}
-
-void mediakit::WebSocketClient::onResponseCompleted()
-{
-    DebugL;
-}
-
-int64_t mediakit::WebSocketClient::onRecvHeader(const char *data, uint64_t len)
-{
-    _parser.Parse(data);
-    if (_parser.Url() == "101")
-    {
-        switch (_WSClientStatus)
-        {
-        case HANDSHAKING:
-        {
-            StrCaseMap& valueMap = _parser.getValues();
-            auto key = valueMap.find("Sec-WebSocket-Accept");
-            if (key != valueMap.end() && key->second.length() > 0) {
-                onConnect(SockException());
-            }
-            break;
-        }
-        }
-        return -1;
-    }
-    else
-    {
-        shutdown(SockException(Err_shutdown, _parser.Url().c_str()));
-        return 0;
-    }
-    return -1;
-}
-
-void mediakit::WebSocketClient::onRecvContent(const char *data, uint64_t len)
-{
-    if (_chunkedSplitter) {
-        _chunkedSplitter->input(data, len);
-        return;
-    }
-    auto recvedBodySize = _recvedBodySize + len;
-    if (_totalBodySize < 0) {
-        //不限长度的content,最大支持INT64_MAX个字节
-        onResponseBody(data, len, recvedBodySize, INT64_MAX);
-        _recvedBodySize = recvedBodySize;
-        return;
-    }
-
-    //固定长度的content
-    if (recvedBodySize < _totalBodySize) {
-        //content还未接收完毕
-        onResponseBody(data, len, recvedBodySize, _totalBodySize);
-        _recvedBodySize = recvedBodySize;
-        return;
-    }
-
-    //content接收完毕
-    onResponseBody(data, _totalBodySize - _recvedBodySize, _totalBodySize, _totalBodySize);
-    bool biggerThanExpected = recvedBodySize > _totalBodySize;
-    onResponseCompleted_l();
-    if (biggerThanExpected) {
-        //声明的content数据比真实的小，那么我们只截取前面部分的并断开链接
-        shutdown(SockException(Err_shutdown, "http response content size bigger than expected"));
-    }
-}
-
-void mediakit::WebSocketClient::onConnect(const SockException &ex)
-{
-    _aliveTicker.resetTime();
-    if (ex) {
-        onDisconnect(ex);
-        return;
-    }
-
-    //先假设http客户端只会接收一点点数据（只接受http头，节省内存）
-    _sock->setReadBuffer(std::make_shared<BufferRaw>(1 * 1024));
-
-    _totalBodySize = 0;
-    _recvedBodySize = 0;
-    HttpRequestSplitter::reset();
-    _chunkedSplitter.reset();
-
-    if (_WSClientStatus == WSCONNECT)
-    {
-        //Websocket握手
-        string random = get_random(16);
-        auto Sec_WebSocket_Key = encodeBase64(SHA1::encode_bin(random));
-        _key = Sec_WebSocket_Key;
-        string p = generate_websocket_client_handshake(_ip.c_str(), _port, _url.c_str(), _key.c_str());
-        TcpClient::send(p);
-        _WSClientStatus = HANDSHAKING;
-    }
-    else if (_WSClientStatus == HANDSHAKING)
-    {
-        _WSClientStatus = WORKING;
-    }
-
-    onFlush();
-}
-
-void mediakit::WebSocketClient::onRecv(const Buffer::Ptr &pBuf)
-{
-    _aliveTicker.resetTime();
-    if (_WSClientStatus == HANDSHAKING || _WSClientStatus == WSCONNECT)
-        HttpRequestSplitter::input(pBuf->data(), pBuf->size());
-    else if (_WSClientStatus == WORKING)
-    {
-        WebSocketSplitter::decode((uint8_t *)pBuf->data(), pBuf->size());
-    }
-}
-
-void mediakit::WebSocketClient::onErr(const SockException &ex)
-{
-    _session->onError(ex);
-    onDisconnect(ex);
-}
-
-void mediakit::WebSocketClient::onManager()
-{
-    if (_WSClientStatus != WORKING)
-    {
-        if (_fTimeOutSec > 0 && _aliveTicker.elapsedTime() > _fTimeOutSec * 1000) {
-            //超时
-            shutdown(SockException(Err_timeout, "ws server respone timeout"));
-        }
-    }
-    else
-        _session->onManager();
-}
-
-std::string mediakit::WebSocketClient::generate_websocket_client_handshake(const char* ip, uint16_t port, const char * path, const char * key)
-{
-    /**
-* @brief  业务数据被分片的单片最大大小， 等于 65535 - 14 - 1
-*/
-#define DATA_FRAME_MAX_LEN  65520
-#define HANDSHAKE_SIZE      1024
-    char buf[HANDSHAKE_SIZE] = { 0 };
-
-    snprintf(buf, HANDSHAKE_SIZE,
-        "GET %s HTTP/1.1\r\n"
-        "Host: %s:%d\r\n"
-        "Upgrade: websocket\r\n"
-        "Connection: Upgrade\r\n"
-        "Sec-WebSocket-Key: %s\r\n"
-        "Sec-WebSocket-Version: 13\r\n"
-        "\r\n",
-        path, ip, port, key);
-    string temBuf(buf);
-    return temBuf;
-}
-
-std::string mediakit::WebSocketClient::get_random(size_t n)
-{
-    random_device rd;
-    _StrPrinter printer;
-    for (int i = 0; i < n; i++)
-    {
-        unsigned int rnd = rd();
-        printer << rnd % 9;
-    }
-
-    return string(printer);
-}
-
-void mediakit::WebSocketClient::onWebSocketDecodeHeader(const WebSocketHeader &packet)
-{
-    //新包，原来的包残余数据清空掉
-    _remian_data.clear();
-
-    if (_firstPacket) {
-        //这是个WebSocket会话而不是普通的Http会话
-        _firstPacket = false;
-        //此处截取数据并进行websocket协议打包
-    }
-}
-
-void mediakit::WebSocketClient::onWebSocketDecodePlayload(const WebSocketHeader &packet, const uint8_t *ptr, uint64_t len, uint64_t recved)
-{
-    _remian_data.append((char *)ptr, len);
-}
-
-void mediakit::WebSocketClient::onWebSocketDecodeComplete(const WebSocketHeader &header_in)
-{
-    WebSocketHeader& header = const_cast<WebSocketHeader&>(header_in);
-    auto  flag = header._mask_flag;
-    header._mask_flag = false;
-
-    switch (header._opcode) {
-    case WebSocketHeader::CLOSE: {
-        shutdown(SockException(Err_timeout, "session timeouted"));
-    }
-                                 break;
-    case WebSocketHeader::PING: {
-        const_cast<WebSocketHeader&>(header)._opcode = WebSocketHeader::PONG;
-        WebSocketSplitter::encode(header, (uint8_t *)_remian_data.data(), _remian_data.size());
-    }
-                                break;
-    case WebSocketHeader::CONTINUATION: {
-
-    }
-                                        break;
-    case WebSocketHeader::TEXT:
-    case WebSocketHeader::BINARY: {
-        BufferString::Ptr buffer = std::make_shared<BufferString>(_remian_data);
-        _session->onRecv(buffer);
-    }
-                                  break;
-    default:
-        break;
-    }
-    _remian_data.clear();
-    header._mask_flag = flag;
-}
-
-void mediakit::WebSocketClient::onWebSocketEncodeData(const uint8_t *ptr, uint64_t len)
-{
-    TcpClient::send(string((char*)ptr, len));
-}
-
-void mediakit::WebSocketClient::onResponseCompleted_l()
-{
-    _totalBodySize = 0;
-    _recvedBodySize = 0;
-    onResponseCompleted();
-}

src/Http/WebSocketSession.h

@@ -34,7 +34,7 @@
 * 用户只要实现WebSock协议下的具体业务协议，譬如基于WebSocket协议的Rtmp协议等
 * @tparam SessionType 业务协议的TcpSession类
 */
-template <class SessionType,class HttpSessionType = HttpSession>
+template <class SessionType,class HttpSessionType = HttpSession,WebSocketHeader::Type DataType = WebSocketHeader::TEXT>
 class WebSocketSession : public HttpSessionType {
 public:
     WebSocketSession(const Socket::Ptr &pSock) : HttpSessionType(pSock){}
@@ -62,40 +62,43 @@ public:
     }
 protected:
     /**
-     * 开始收到一个webSocket数据包
-     * @param packet
+     * websocket客户端连接上事件
+     * @param header http头
+     * @return true代表允许websocket连接，否则拒绝
      */
-    void onWebSocketDecodeHeader(const WebSocketHeader &packet) override{
-        //新包，原来的包残余数据清空掉
-        _remian_data.clear();
-
-        if(_firstPacket){
-            //这是个WebSocket会话而不是普通的Http会话
-            _firstPacket = false;
+    bool onWebSocketConnect(const Parser &header) override{
+        //创建websocket session类
         _session = std::make_shared<SessionImp>(HttpSessionType::getIdentifier(),HttpSessionType::_sock);
-
         auto strongServer = _weakServer.lock();
         if(strongServer){
+            _session->attachServer(*strongServer);
+        }
 
         //此处截取数据并进行websocket协议打包
         weak_ptr<WebSocketSession> weakSelf = dynamic_pointer_cast<WebSocketSession>(HttpSessionType::shared_from_this());
-                _session->setOnBeforeSendCB([weakSelf](const Buffer::Ptr &buf) {
+        _session->setOnBeforeSendCB([weakSelf](const Buffer::Ptr &buf){
             auto strongSelf = weakSelf.lock();
-                    if (strongSelf) {
+            if(strongSelf){
                 WebSocketHeader header;
                 header._fin = true;
                 header._reserved = 0;
-                        header._opcode = WebSocketHeader::TEXT;
+                header._opcode = DataType;
                 header._mask_flag = false;
-                        strongSelf->WebSocketSplitter::encode(header, (uint8_t *)buf->data(), buf->size());
+                strongSelf->WebSocketSplitter::encode(header,buf);
             }
             return buf->size();
         });
 
-                _session->attachServer(*strongServer);
-            }
-
+        //允许websocket客户端
+        return true;
     }
+    /**
+     * 开始收到一个webSocket数据包
+     * @param packet
+     */
+    void onWebSocketDecodeHeader(const WebSocketHeader &packet) override{
+        //新包，原来的包残余数据清空掉
+        _remian_data.clear();
     }
 
     /**
@@ -124,7 +127,7 @@ protected:
             }
                 break;
             case WebSocketHeader::PING:{
-                const_cast<WebSocketHeader&>(header)._opcode = WebSocketHeader::PONG;
+                header._opcode = WebSocketHeader::PONG;
                 HttpSessionType::encode(header,std::make_shared<BufferString>(_remian_data));
             }
                 break;
@@ -191,42 +194,10 @@ private:
         string _identifier;
     };
 private:
-    bool _firstPacket = true;
     string _remian_data;
     weak_ptr<TcpServer> _weakServer;
     std::shared_ptr<SessionImp> _session;
 };
 
-/**
-* 回显会话
-*/
-class EchoSession : public TcpSession {
-public:
-    EchoSession(const Socket::Ptr &pSock) : TcpSession(pSock){
-        DebugL;
-    }
-    virtual ~EchoSession(){
-        DebugL;
-    }
-
-    void attachServer(const TcpServer &server) override{
-        DebugL << getIdentifier() << " " << TcpSession::getIdentifier();
-    }
-    void onRecv(const Buffer::Ptr &buffer) override {
-        send(buffer);
-    }
-    void onError(const SockException &err) override{
-        WarnL << err.what();
-    }
-    //每隔一段时间触发，用来做超时管理
-    void onManager() override{
-        DebugL;
-    }
-};
-
-
-typedef WebSocketSession<EchoSession,HttpSession> EchoWebSocketSession;
-typedef WebSocketSession<EchoSession,HttpsSession> SSLEchoWebSocketSession;
-
 
 #endif //ZLMEDIAKIT_WEBSOCKETSESSION_H

tests/README.md

+此目录下的所有.cpp文件将被编译成可执行程序(不包含此目录下的子目录).
+子目录DeviceHK为海康IPC的适配程序,需要先下载海康的SDK才能编译,
+由于操作麻烦,所以仅把源码放在这仅供参考.
+
+- test_benchmark.cpp
+    rtsp/rtmp性能测试客户端
+    
+- test_httpApi.cpp
+  http api 测试服务器
+ 
+- test_httpClient.cpp
+   http 测试客户端
+
+- test_player.cpp
+   rtsp/rtmp带视频渲染的客户端
+
+- test_pusher.cpp
+   先拉流再推流的测试客户端
+ 
+- test_pusherMp4.cpp
+   解复用mp4文件再推流的测试客户端
+ 
+- test_server.cpp
+   rtsp/rtmp/http等服务器
+ 
+- test_wsClient.cpp
+   websocket测试客户端
+ 
+- test_wsServer.cpp
+   websocket回显测试服务器
+ 
+

tests/README.txt

-此目录下的所有.cpp文件将被编译成可执行程序(不包含此目录下的子目录).
-子目录DeviceHK为海康IPC的适配程序,需要先下载海康的SDK才能编译,
-由于操作麻烦,所以仅把源码放在这仅供参考.

tests/test_httpApi.cpp

@@ -124,11 +124,11 @@ int main(int argc,char *argv[]){
 
 	//开启http服务器
 	TcpServer::Ptr httpSrv(new TcpServer());
-	httpSrv->start<EchoWebSocketSession>(mINI::Instance()[Http::kPort]);//默认80
+	httpSrv->start<HttpSession>(mINI::Instance()[Http::kPort]);//默认80
 
     //如果支持ssl，还可以开启https服务器
 	TcpServer::Ptr httpsSrv(new TcpServer());
-	httpsSrv->start<SSLEchoWebSocketSession>(mINI::Instance()[Http::kSSLPort]);//默认443
+	httpsSrv->start<HttpsSession>(mINI::Instance()[Http::kSSLPort]);//默认443
 
 	InfoL << "你可以在浏览器输入:http://127.0.0.1/api/my_api?key0=val0&key1=参数1" << endl;
 

tests/test_server.cpp

@@ -300,13 +300,13 @@ int main(int argc,char *argv[]) {
     shellSrv->start<ShellSession>(shellPort);
     rtspSrv->start<RtspSession>(rtspPort);//默认554
     rtmpSrv->start<RtmpSession>(rtmpPort);//默认1935
-    //http服务器,支持websocket
-    httpSrv->start<EchoWebSocketSession>(httpPort);//默认80
+    //http服务器
+    httpSrv->start<HttpSession>(httpPort);//默认80
 
     //如果支持ssl，还可以开启https服务器
     TcpServer::Ptr httpsSrv(new TcpServer());
-    //https服务器,支持websocket
-    httpsSrv->start<SSLEchoWebSocketSession>(httpsPort);//默认443
+    //https服务器
+    httpsSrv->start<HttpsSession>(httpsPort);//默认443
 
     //支持ssl加密的rtsp服务器，可用于诸如亚马逊echo show这样的设备访问
     TcpServer::Ptr rtspSSLSrv(new TcpServer());
@@ -332,12 +332,12 @@ int main(int argc,char *argv[]) {
         }
         if(httpPort != mINI::Instance()[Http::kPort].as<uint16_t>()){
             httpPort = mINI::Instance()[Http::kPort];
-            httpSrv->start<EchoWebSocketSession>(httpPort);
+            httpSrv->start<HttpSession>(httpPort);
             InfoL << "重启http服务器" << httpPort;
         }
         if(httpsPort != mINI::Instance()[Http::kSSLPort].as<uint16_t>()){
             httpsPort = mINI::Instance()[Http::kSSLPort];
-            httpsSrv->start<SSLEchoWebSocketSession>(httpsPort);
+            httpsSrv->start<HttpsSession>(httpsPort);
             InfoL << "重启https服务器" << httpsPort;
         }
 

tests/test_wsClient.cpp

+/*
+ * MIT License
+ *
+ * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>
+ *
+ * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <signal.h>
+#include <string>
+#include <iostream>
+#include "Util/MD5.h"
+#include "Util/logger.h"
+#include "Http/WebSocketClient.h"
+using namespace std;
+using namespace toolkit;
+using namespace mediakit;
+
+class EchoTcpClient : public TcpClient {
+public:
+    EchoTcpClient(const EventPoller::Ptr &poller = nullptr){
+        InfoL;
+    }
+    ~EchoTcpClient() override {
+        InfoL;
+    }
+protected:
+    void onRecv(const Buffer::Ptr &pBuf) override {
+        DebugL << pBuf->toString();
+    }
+    //被动断开连接回调
+    void onErr(const SockException &ex) override {
+        WarnL << ex.what();
+    }
+    //tcp连接成功后每2秒触发一次该事件
+    void onManager() override {
+        send("echo test!");
+        DebugL << "send echo test";
+    }
+    //连接服务器结果回调
+    void onConnect(const SockException &ex) override{
+        DebugL << ex.what();
+    }
+
+    //数据全部发送完毕后回调
+    void onFlush() override{
+        DebugL;
+    }
+};
+
+int main(int argc, char *argv[]) {
+    //设置退出信号处理函数
+    static semaphore sem;
+    signal(SIGINT, [](int) { sem.post(); });// 设置退出信号
+
+    //设置日志
+    Logger::Instance().add(std::make_shared<ConsoleChannel>());
+    Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>());
+
+    WebSocketClient<EchoTcpClient>::Ptr client = std::make_shared<WebSocketClient<EchoTcpClient> >();
+    client->startConnect("121.40.165.18",8800);
+
+    sem.wait();
+    return 0;
+}
+

tests/test_wsServer.cpp

+/*
+ * MIT License
+ *
+ * Copyright (c) 2016-2019 xiongziliang <771730766@qq.com>
+ *
+ * This file is part of ZLMediaKit(https://github.com/xiongziliang/ZLMediaKit).
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <signal.h>
+#include <string>
+#include <iostream>
+#include "Util/MD5.h"
+#include "Util/logger.h"
+#include "Http/WebSocketSession.h"
+using namespace std;
+using namespace toolkit;
+using namespace mediakit;
+
+/**
+* 回显会话
+*/
+class EchoSession : public TcpSession {
+public:
+    EchoSession(const Socket::Ptr &pSock) : TcpSession(pSock){
+        DebugL;
+    }
+    virtual ~EchoSession(){
+        DebugL;
+    }
+
+    void attachServer(const TcpServer &server) override{
+        DebugL << getIdentifier() << " " << TcpSession::getIdentifier();
+    }
+    void onRecv(const Buffer::Ptr &buffer) override {
+        //回显数据
+        send(buffer);
+    }
+    void onError(const SockException &err) override{
+        WarnL << err.what();
+    }
+    //每隔一段时间触发，用来做超时管理
+    void onManager() override{
+        DebugL;
+    }
+};
+
+int main(int argc, char *argv[]) {
+    //设置日志
+    Logger::Instance().add(std::make_shared<ConsoleChannel>());
+    Logger::Instance().setWriter(std::make_shared<AsyncLogWriter>());
+
+    SSL_Initor::Instance().loadCertificate((exeDir() + "ssl.p12").data());
+
+    TcpServer::Ptr httpSrv(new TcpServer());
+    //http服务器,支持websocket
+    httpSrv->start<WebSocketSession<EchoSession,HttpSession>>(80);//默认80
+
+    TcpServer::Ptr httpsSrv(new TcpServer());
+    //https服务器,支持websocket
+    httpsSrv->start<WebSocketSession<EchoSession,HttpsSession>>(443);//默认443
+
+    DebugL << "请打开网页:http://www.websocket-test.com/,连接 ws://127.0.0.1/测试";
+
+    //设置退出信号处理函数
+    static semaphore sem;
+    signal(SIGINT, [](int) { sem.post(); });// 设置退出信号
+    sem.wait();
+    return 0;
+}
+