diff --git a/README.md b/README.md
index 4523fe24e..9cf98d8b8 100755
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ SRS is licenced under [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE),
## Usage
-Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v4_EN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v4_CN_Home#getting-started) )**:
+Build SRS from source or **docker([CN](https://github.com/ossrs/srs/wiki/v4_CN_Home#docker) / [EN](https://github.com/ossrs/srs/wiki/v4_EN_Home#docker))**, please read **Wiki: Gettting Started([CN](https://github.com/ossrs/srs/wiki/v4_CN_Home#getting-started) / [EN](https://github.com/ossrs/srs/wiki/v4_EN_Home#getting-started))**:
```
git clone -b develop https://gitee.com/ossrs/srs.git &&
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
index 86bbfe755..c9a2b90e5 100644
--- a/trunk/doc/CHANGELOG.md
+++ b/trunk/doc/CHANGELOG.md
@@ -23,6 +23,8 @@ The changelog for SRS.
## SRS 4.0 Changelog
+* v4.0, 2021-09-23, Merge [#2578](https://github.com/ossrs/srs/pull/2578) Support http callback on_play/stop. 4.0.163
+* v4.0, 2021-09-23, Merge [#2618](https://github.com/ossrs/srs/pull/2618) to fix FUA bug.
* v4.0, 2021-09-05, RTC: Merge [#2581](https://github.com/ossrs/srs/pull/2581), Fix listen ipv6 and port. 4.0.161
* v4.0, 2021-09-04, For [#2282](https://github.com/ossrs/srs/pull/2282), [#2181](https://github.com/ossrs/srs/issues/2181), Move DVR async worker from SrsDvrPlan to global.
* v4.0, 2021-09-04, For [#2282](https://github.com/ossrs/srs/pull/2282), [#2181](https://github.com/ossrs/srs/issues/2181), Remove reload for dvr_apply. 4.0.160
diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp
index c36f0ca0f..44c8c7102 100644
--- a/trunk/src/app/srs_app_http_api.cpp
+++ b/trunk/src/app/srs_app_http_api.cpp
@@ -840,8 +840,13 @@ srs_error_t SrsGoApiClients::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessa
return srs_api_response_code(w, r, ERROR_RTMP_CLIENT_NOT_FOUND);
}
- client->conn->expire();
- srs_warn("kickoff client id=%s ok", client_id.c_str());
+ if (client->conn) {
+ client->conn->expire();
+ srs_warn("kickoff client id=%s ok", client_id.c_str());
+ } else {
+ srs_error("kickoff client id=%s error", client_id.c_str());
+ return srs_api_response_code(w, r, SRS_CONSTS_HTTP_BadRequest);
+ }
} else {
return srs_go_http_error(w, SRS_CONSTS_HTTP_MethodNotAllowed);
}
diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp
index 89fe6136f..dd8b4e969 100644
--- a/trunk/src/app/srs_app_http_static.cpp
+++ b/trunk/src/app/srs_app_http_static.cpp
@@ -33,15 +33,27 @@ using namespace std;
#include
#include
#include
+#include
+#include
+#include
+
+#define SRS_CONTEXT_IN_HLS "hls_ctx"
SrsVodStream::SrsVodStream(string root_dir) : SrsHttpFileServer(root_dir)
{
+ _srs_hybrid->timer5s()->subscribe(this);
}
SrsVodStream::~SrsVodStream()
{
+ _srs_hybrid->timer5s()->unsubscribe(this);
+ std::map::iterator it;
+ for (it = map_ctx_info_.begin(); it != map_ctx_info_.end(); ++it) {
+ srs_freep(it->second.req);
+ }
+ map_ctx_info_.clear();
}
-
+
srs_error_t SrsVodStream::serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, string fullpath, int offset)
{
srs_error_t err = srs_success;
@@ -171,6 +183,173 @@ srs_error_t SrsVodStream::serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMe
}
return err;
+}
+
+srs_error_t SrsVodStream::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ srs_error_t err = srs_success;
+
+ SrsHttpMessage* hr = dynamic_cast(r);
+ srs_assert(hr);
+
+ SrsRequest* req = hr->to_request(hr->host())->as_http();
+ SrsAutoFree(SrsRequest, req);
+
+ string ctx = hr->query_get(SRS_CONTEXT_IN_HLS);
+ if (!ctx.empty() && ctx_is_exist(ctx)) {
+ alive(ctx, NULL);
+ return SrsHttpFileServer::serve_m3u8_ctx(w, r, fullpath);
+ }
+
+ if ((err = http_hooks_on_play(req)) != srs_success) {
+ return srs_error_wrap(err, "HLS: http_hooks_on_play");
+ }
+
+ if (ctx.empty()) {
+ // make sure unique
+ do {
+ ctx = srs_random_str(8); // the same as cid
+ } while (ctx_is_exist(ctx));
+ }
+
+ std::stringstream ss;
+ ss << "#EXTM3U" << SRS_CONSTS_LF;
+ ss << "#EXT-X-STREAM-INF:BANDWIDTH=1,AVERAGE-BANDWIDTH=1" << SRS_CONSTS_LF;
+ ss << hr->path() << "?" << SRS_CONTEXT_IN_HLS << "=" << ctx;
+ if (!hr->query().empty() && hr->query_get(SRS_CONTEXT_IN_HLS).empty())
+ {
+ ss << "&" << hr->query();
+ }
+
+ std::string res = ss.str();
+ int length = res.length();
+
+ w->header()->set_content_length(length);
+ w->header()->set_content_type("application/vnd.apple.mpegurl");
+ w->write_header(SRS_CONSTS_HTTP_OK);
+
+ if ((err = w->write((char*)res.c_str(), length)) != srs_success) {
+ return srs_error_wrap(err, "write bytes=%d", length);
+ }
+
+ if ((err = w->final_request()) != srs_success) {
+ return srs_error_wrap(err, "final request");
+ }
+
+ alive(ctx, req->copy());
+
+ // update the statistic when source disconveried.
+ SrsStatistic* stat = SrsStatistic::instance();
+ if ((err = stat->on_client(ctx, req, NULL, SrsRtmpConnPlay)) != srs_success) {
+ return srs_error_wrap(err, "stat on client");
+ }
+
+ return err;
+}
+
+bool SrsVodStream::ctx_is_exist(std::string ctx)
+{
+ return (map_ctx_info_.find(ctx) != map_ctx_info_.end());
+}
+
+void SrsVodStream::alive(std::string ctx, SrsRequest* req)
+{
+ std::map::iterator it;
+ if ((it = map_ctx_info_.find(ctx)) != map_ctx_info_.end()) {
+ it->second.request_time = srs_get_system_time();
+ } else {
+ SrsM3u8CtxInfo info;
+ info.req = req;
+ info.request_time = srs_get_system_time();
+ map_ctx_info_.insert(make_pair(ctx, info));
+ }
+}
+
+srs_error_t SrsVodStream::http_hooks_on_play(SrsRequest* req)
+{
+ srs_error_t err = srs_success;
+
+ if (!_srs_config->get_vhost_http_hooks_enabled(req->vhost)) {
+ return err;
+ }
+
+ // the http hooks will cause context switch,
+ // so we must copy all hooks for the on_connect may freed.
+ // @see https://github.com/ossrs/srs/issues/475
+ vector hooks;
+
+ if (true) {
+ SrsConfDirective* conf = _srs_config->get_vhost_on_play(req->vhost);
+
+ if (!conf) {
+ return err;
+ }
+
+ hooks = conf->args;
+ }
+
+ for (int i = 0; i < (int)hooks.size(); i++) {
+ std::string url = hooks.at(i);
+ if ((err = SrsHttpHooks::on_play(url, req)) != srs_success) {
+ return srs_error_wrap(err, "http on_play %s", url.c_str());
+ }
+ }
+
+ return err;
+}
+
+void SrsVodStream::http_hooks_on_stop(SrsRequest* req)
+{
+ if (!_srs_config->get_vhost_http_hooks_enabled(req->vhost)) {
+ return;
+ }
+
+ // the http hooks will cause context switch,
+ // so we must copy all hooks for the on_connect may freed.
+ // @see https://github.com/ossrs/srs/issues/475
+ vector hooks;
+
+ if (true) {
+ SrsConfDirective* conf = _srs_config->get_vhost_on_stop(req->vhost);
+
+ if (!conf) {
+ srs_info("ignore the empty http callback: on_stop");
+ return;
+ }
+
+ hooks = conf->args;
+ }
+
+ for (int i = 0; i < (int)hooks.size(); i++) {
+ std::string url = hooks.at(i);
+ SrsHttpHooks::on_stop(url, req);
+ }
+
+ return;
+}
+
+srs_error_t SrsVodStream::on_timer(srs_utime_t interval)
+{
+ srs_error_t err = srs_success;
+
+ std::map::iterator it;
+ for (it = map_ctx_info_.begin(); it != map_ctx_info_.end(); ++it) {
+ string ctx = it->first;
+ SrsRequest* req = it->second.req;
+ srs_utime_t hls_window = _srs_config->get_hls_window(req->vhost);
+ if (it->second.request_time + (2 * hls_window) < srs_get_system_time()) {
+ http_hooks_on_stop(req);
+ srs_freep(req);
+
+ SrsStatistic* stat = SrsStatistic::instance();
+ stat->on_disconnect(ctx);
+ map_ctx_info_.erase(it);
+
+ break;
+ }
+ }
+
+ return err;
}
SrsHttpStaticServer::SrsHttpStaticServer(SrsServer* svr)
diff --git a/trunk/src/app/srs_app_http_static.hpp b/trunk/src/app/srs_app_http_static.hpp
index 5215ef235..8af98cdaa 100644
--- a/trunk/src/app/srs_app_http_static.hpp
+++ b/trunk/src/app/srs_app_http_static.hpp
@@ -11,18 +11,36 @@
#include
+struct SrsM3u8CtxInfo
+{
+ srs_utime_t request_time;
+ SrsRequest* req;
+};
+
// The flv vod stream supports flv?start=offset-bytes.
// For example, http://server/file.flv?start=10240
// server will write flv header and sequence header,
// then seek(10240) and response flv tag data.
-class SrsVodStream : public SrsHttpFileServer
+class SrsVodStream : public SrsHttpFileServer, public ISrsFastTimer
{
+private:
+ // The period of validity of the ctx
+ std::map map_ctx_info_;
public:
SrsVodStream(std::string root_dir);
virtual ~SrsVodStream();
protected:
virtual srs_error_t serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int offset);
virtual srs_error_t serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int start, int end);
+ virtual srs_error_t serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
+private:
+ virtual bool ctx_is_exist(std::string ctx);
+ virtual void alive(std::string ctx, SrsRequest* req);
+ virtual srs_error_t http_hooks_on_play(SrsRequest* req);
+ virtual void http_hooks_on_stop(SrsRequest* req);
+// interface ISrsFastTimer
+private:
+ srs_error_t on_timer(srs_utime_t interval);
};
// The http static server instance,
diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp
index 7a835718e..4ac4d53d2 100644
--- a/trunk/src/app/srs_app_rtc_source.cpp
+++ b/trunk/src/app/srs_app_rtc_source.cpp
@@ -1192,7 +1192,7 @@ srs_error_t SrsRtcFromRtmpBridger::package_fu_a(SrsSharedPtrMessage* msg, SrsSam
uint8_t header = sample->bytes[0];
uint8_t nal_type = header & kNalTypeMask;
- int num_of_packet = 1 + (sample->size - 1) / fu_payload_size;
+ int num_of_packet = 1 + (nb_left - 1) / fu_payload_size;
for (int i = 0; i < num_of_packet; ++i) {
int packet_size = srs_min(nb_left, fu_payload_size);
diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
index 4d03ac2d9..1a53e37b8 100644
--- a/trunk/src/core/srs_core_version4.hpp
+++ b/trunk/src/core/srs_core_version4.hpp
@@ -9,6 +9,6 @@
#define VERSION_MAJOR 4
#define VERSION_MINOR 0
-#define VERSION_REVISION 162
+#define VERSION_REVISION 163
#endif
diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp
index 210e014d6..a9af10c08 100644
--- a/trunk/src/protocol/srs_http_stack.cpp
+++ b/trunk/src/protocol/srs_http_stack.cpp
@@ -364,7 +364,7 @@ srs_error_t SrsHttpFileServer::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMes
string upath = r->path();
string fullpath = srs_http_fs_fullpath(dir, entry->pattern, upath);
-
+
// stat current dir, if exists, return error.
if (!_srs_path_exists(fullpath)) {
srs_warn("http miss file=%s, pattern=%s, upath=%s",
@@ -380,6 +380,8 @@ srs_error_t SrsHttpFileServer::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMes
return serve_flv_file(w, r, fullpath);
} else if (srs_string_ends_with(fullpath, ".mp4")) {
return serve_mp4_file(w, r, fullpath);
+ } else if (srs_string_ends_with(upath, ".m3u8")) {
+ return serve_m3u8_file(w, r, fullpath);
}
// serve common static file.
@@ -522,6 +524,11 @@ srs_error_t SrsHttpFileServer::serve_mp4_file(ISrsHttpResponseWriter* w, ISrsHtt
}
return serve_mp4_stream(w, r, fullpath, start, end);
+}
+
+srs_error_t SrsHttpFileServer::serve_m3u8_file(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ return serve_m3u8_ctx(w, r, fullpath);
}
srs_error_t SrsHttpFileServer::serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, string fullpath, int offset)
@@ -536,6 +543,13 @@ srs_error_t SrsHttpFileServer::serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsH
// @remark For common http file server, we don't support stream request, please use SrsVodStream instead.
// TODO: FIXME: Support range in header https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Range_requests
return serve_file(w, r, fullpath);
+}
+
+srs_error_t SrsHttpFileServer::serve_m3u8_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessage * r, std::string fullpath)
+{
+ // @remark For common http file server, we don't support stream request, please use SrsVodStream instead.
+ // TODO: FIXME: Support range in header https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Range_requests
+ return serve_file(w, r, fullpath);
}
srs_error_t SrsHttpFileServer::copy(ISrsHttpResponseWriter* w, SrsFileReader* fs, ISrsHttpMessage* r, int size)
diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp
index e128e2252..c67681219 100644
--- a/trunk/src/protocol/srs_http_stack.hpp
+++ b/trunk/src/protocol/srs_http_stack.hpp
@@ -285,6 +285,7 @@ private:
virtual srs_error_t serve_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
virtual srs_error_t serve_flv_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
virtual srs_error_t serve_mp4_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
+ virtual srs_error_t serve_m3u8_file(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
protected:
// When access flv file with x.flv?start=xxx
virtual srs_error_t serve_flv_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int offset);
@@ -293,6 +294,16 @@ protected:
// @param end the end offset in bytes. -1 to end of file.
// @remark response data in [start, end].
virtual srs_error_t serve_mp4_stream(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath, int start, int end);
+ // For HLS protocol.
+ // When the request url, like as "http://127.0.0.1:8080/live/livestream.m3u8",
+ // returns the response like as "http://127.0.0.1:8080/live/livestream.m3u8?hls_ctx=12345678" .
+ // SRS use "hls_ctx" to keep track of subsequent requests that is short-connection.
+ // Remark 1:
+ // Fill the parameter "hls_ctx" by yourself in the first request is allowed, SRS will use it.
+ // And MUST make sure it is unique.
+ // Remark 2:
+ // If use two same "hls_ctx" in different requests, SRS cannot detect so that they will be treated as one.
+ virtual srs_error_t serve_m3u8_ctx(ISrsHttpResponseWriter* w, ISrsHttpMessage* r, std::string fullpath);
protected:
// Copy the fs to response writer in size bytes.
virtual srs_error_t copy(ISrsHttpResponseWriter* w, SrsFileReader* fs, ISrsHttpMessage* r, int size);
diff --git a/trunk/src/utest/srs_utest_http.cpp b/trunk/src/utest/srs_utest_http.cpp
index de0aa0a37..5b6d70b34 100644
--- a/trunk/src/utest/srs_utest_http.cpp
+++ b/trunk/src/utest/srs_utest_http.cpp
@@ -143,6 +143,11 @@ string mock_http_response2(int status, string content)
return ss.str();
}
+bool is_string_contain(string substr, string str)
+{
+ return (string::npos != str.find(substr));
+}
+
class MockFileReaderFactory : public ISrsFileReaderFactory
{
public:
@@ -1183,6 +1188,42 @@ VOID TEST(ProtocolHTTPTest, VodStreamHandlers)
HELPER_ASSERT_SUCCESS(h.serve_http(&w, &r));
__MOCK_HTTP_EXPECT_STREQ(200, "Hello, world!", w);
}
+
+ // should return "hls_ctx"
+ if (true) {
+ SrsHttpMuxEntry e;
+ e.pattern = "/";
+
+ SrsVodStream h("/tmp");
+ h.set_fs_factory(new MockFileReaderFactory("Hello, world!"));
+ h.set_path_check(_mock_srs_path_always_exists);
+ h.entry = &e;
+
+ MockResponseWriter w;
+ SrsHttpMessage r(NULL, NULL);
+ HELPER_ASSERT_SUCCESS(r.set_url("/index.m3u8", false));
+
+ HELPER_ASSERT_SUCCESS(h.serve_http(&w, &r));
+ __MOCK_HTTP_EXPECT_STRCT(200, "index.m3u8?hls_ctx=", w);
+ }
+
+ // should return "hls_ctx"
+ if (true) {
+ SrsHttpMuxEntry e;
+ e.pattern = "/";
+
+ SrsVodStream h("/tmp");
+ h.set_fs_factory(new MockFileReaderFactory("Hello, world!"));
+ h.set_path_check(_mock_srs_path_always_exists);
+ h.entry = &e;
+
+ MockResponseWriter w;
+ SrsHttpMessage r(NULL, NULL);
+ HELPER_ASSERT_SUCCESS(r.set_url("/index.m3u8?hls_ctx=123456", false));
+
+ HELPER_ASSERT_SUCCESS(h.serve_http(&w, &r));
+ __MOCK_HTTP_EXPECT_STRCT(200, "index.m3u8?hls_ctx=123456", w);
+ }
}
VOID TEST(ProtocolHTTPTest, BasicHandlers)
diff --git a/trunk/src/utest/srs_utest_http.hpp b/trunk/src/utest/srs_utest_http.hpp
index 945fad189..e8172b1c0 100644
--- a/trunk/src/utest/srs_utest_http.hpp
+++ b/trunk/src/utest/srs_utest_http.hpp
@@ -39,6 +39,7 @@ public:
string mock_http_response(int status, string content);
string mock_http_response2(int status, string content);
+bool is_string_contain(string substr, string str);
#define __MOCK_HTTP_EXPECT_STREQ(status, text, w) \
EXPECT_STREQ(mock_http_response(status, text).c_str(), HELPER_BUFFER2STR(&w.io.out_buffer).c_str())
@@ -46,5 +47,8 @@ string mock_http_response2(int status, string content);
#define __MOCK_HTTP_EXPECT_STREQ2(status, text, w) \
EXPECT_STREQ(mock_http_response2(status, text).c_str(), HELPER_BUFFER2STR(&w.io.out_buffer).c_str())
+#define __MOCK_HTTP_EXPECT_STRCT(status, text, w) \
+ EXPECT_PRED2(is_string_contain, text, HELPER_BUFFER2STR(&w.io.out_buffer).c_str())
+
#endif