Skip to content

Commit 6a108fa

Browse files
winlinvipwinlinvip
committed
Fix #2837: Callback: Support stream_url and stream_id. v5.0.55
1 parent 9c6774b commit 6a108fa

14 files changed

+184
-80
lines changed

‎trunk/conf/full.conf

+12-6
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,8 @@ vhost hooks.callback.srs.com {
11991199
# "action": "on_publish",
12001200
# "client_id": "9308h583",
12011201
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
1202-
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
1202+
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty",
1203+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12031204
# }
12041205
# if valid, the hook must return HTTP code 200(Status OK) and response
12051206
# an int value specifies the error code(0 corresponding to success):
@@ -1215,7 +1216,8 @@ vhost hooks.callback.srs.com {
12151216
# "action": "on_unpublish",
12161217
# "client_id": "9308h583",
12171218
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
1218-
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
1219+
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty",
1220+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12191221
# }
12201222
# if valid, the hook must return HTTP code 200(Status OK) and response
12211223
# an int value specifies the error code(0 corresponding to success):
@@ -1232,7 +1234,8 @@ vhost hooks.callback.srs.com {
12321234
# "client_id": "9308h583",
12331235
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
12341236
# "stream": "livestream", "param":"?token=xxx&salt=yyy",
1235-
# "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty"
1237+
# "pageUrl": "http://www.test.com/live.html", "server_id": "vid-werty",
1238+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12361239
# }
12371240
# if valid, the hook must return HTTP code 200(Status OK) and response
12381241
# an int value specifies the error code(0 corresponding to success):
@@ -1248,7 +1251,8 @@ vhost hooks.callback.srs.com {
12481251
# "action": "on_stop",
12491252
# "client_id": "9308h583",
12501253
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
1251-
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty"
1254+
# "stream": "livestream", "param":"?token=xxx&salt=yyy", "server_id": "vid-werty",
1255+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12521256
# }
12531257
# if valid, the hook must return HTTP code 200(Status OK) and response
12541258
# an int value specifies the error code(0 corresponding to success):
@@ -1266,7 +1270,8 @@ vhost hooks.callback.srs.com {
12661270
# "ip": "192.168.1.10", "vhost": "video.test.com", "app": "live",
12671271
# "stream": "livestream", "param":"?token=xxx&salt=yyy",
12681272
# "cwd": "/usr/local/srs",
1269-
# "file": "./objs/nginx/html/live/livestream.1420254068776.flv", "server_id": "vid-werty"
1273+
# "file": "./objs/nginx/html/live/livestream.1420254068776.flv", "server_id": "vid-werty",
1274+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12701275
# }
12711276
# if valid, the hook must return HTTP code 200(Status OK) and response
12721277
# an int value specifies the error code(0 corresponding to success):
@@ -1285,7 +1290,8 @@ vhost hooks.callback.srs.com {
12851290
# "url": "live/livestream/2015-04-23/01/476584165.ts",
12861291
# "m3u8": "./objs/nginx/html/live/livestream/live.m3u8",
12871292
# "m3u8_url": "live/livestream/live.m3u8",
1288-
# "seq_no": 100, "server_id": "vid-werty"
1293+
# "seq_no": 100, "server_id": "vid-werty",
1294+
# "stream_url": "video.test.com/live/livestream", "stream_id": "vid-124q9y3"
12891295
# }
12901296
# if valid, the hook must return HTTP code 200(Status OK) and response
12911297
# an int value specifies the error code(0 corresponding to success):

‎trunk/doc/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77

88
## SRS 5.0 Changelog
99

10+
* v5.0, 2022-08-30, Fix [#2837](https://github.com/ossrs/srs/issues/2837): Callback: Support stream_url and stream_id. v5.0.55
1011
* v5.0, 2022-08-30, STAT: Refine tcUrl for SRT/RTC. v5.0.54
1112
* v5.0, 2022-08-30, Refactor: Extract SrsNetworkKbps from SrsKbps. v5.0.53
1213
* v5.0, 2022-08-30, Remove bandwidth check because falsh is disabled. v5.0.52

‎trunk/src/app/srs_app_http_conn.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ SrsHttpxConn::SrsHttpxConn(bool https, ISrsResourceManager* cm, srs_netfd_t fd,
292292

293293
manager = cm;
294294
skt = new SrsTcpConnection(fd);
295+
enable_stat_ = false;
295296

296297
if (https) {
297298
ssl = new SrsSslConnection(skt);
@@ -313,6 +314,11 @@ SrsHttpxConn::~SrsHttpxConn()
313314
srs_freep(skt);
314315
}
315316

317+
void SrsHttpxConn::set_enable_stat(bool v)
318+
{
319+
enable_stat_ = v;
320+
}
321+
316322
srs_error_t SrsHttpxConn::pop_message(ISrsHttpMessage** preq)
317323
{
318324
srs_error_t err = srs_success;
@@ -399,9 +405,8 @@ srs_error_t SrsHttpxConn::on_message_done(ISrsHttpMessage* r, SrsHttpResponseWri
399405
srs_error_t SrsHttpxConn::on_conn_done(srs_error_t r0)
400406
{
401407
// Only stat the HTTP streaming clients, ignore all API clients.
402-
bool exists = false;
403-
SrsStatistic::instance()->on_disconnect(get_id().c_str(), &exists);
404-
if (exists) {
408+
if (enable_stat_) {
409+
SrsStatistic::instance()->on_disconnect(get_id().c_str());
405410
SrsStatistic::instance()->kbps_add_delta(get_id().c_str(), conn->delta());
406411
}
407412

‎trunk/src/app/srs_app_http_conn.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,14 @@ class SrsHttpxConn : public ISrsConnection, public ISrsStartable, public ISrsHtt
131131
SrsTcpConnection* skt;
132132
SrsSslConnection* ssl;
133133
SrsHttpConn* conn;
134+
// We should never enable the stat, unless HTTP stream connection requires.
135+
bool enable_stat_;
134136
public:
135137
SrsHttpxConn(bool https, ISrsResourceManager* cm, srs_netfd_t fd, ISrsHttpServeMux* m, std::string cip, int port);
136138
virtual ~SrsHttpxConn();
137139
public:
140+
// Require statistic about HTTP connection, for HTTP streaming clients only.
141+
void set_enable_stat(bool v);
138142
// Directly read a HTTP request message.
139143
// It's exported for HTTP stream, such as HTTP FLV, only need to write to client when
140144
// serving it, but we need to start a thread to read message to detect whether FD is closed.

‎trunk/src/app/srs_app_http_hooks.cpp

+42-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ srs_error_t SrsHttpHooks::on_publish(string url, SrsRequest* req)
127127

128128
SrsJsonObject* obj = SrsJsonAny::object();
129129
SrsAutoFree(SrsJsonObject, obj);
130-
130+
131131
obj->set("server_id", SrsJsonAny::str(stat->server_id().c_str()));
132132
obj->set("action", SrsJsonAny::str("on_publish"));
133133
obj->set("client_id", SrsJsonAny::str(cid.c_str()));
@@ -137,6 +137,12 @@ srs_error_t SrsHttpHooks::on_publish(string url, SrsRequest* req)
137137
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
138138
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
139139
obj->set("param", SrsJsonAny::str(req->param.c_str()));
140+
141+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
142+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
143+
if (stream) {
144+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
145+
}
140146

141147
std::string data = obj->dumps();
142148
std::string res;
@@ -171,8 +177,15 @@ void SrsHttpHooks::on_unpublish(string url, SrsRequest* req)
171177
obj->set("ip", SrsJsonAny::str(req->ip.c_str()));
172178
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
173179
obj->set("app", SrsJsonAny::str(req->app.c_str()));
180+
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
174181
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
175182
obj->set("param", SrsJsonAny::str(req->param.c_str()));
183+
184+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
185+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
186+
if (stream) {
187+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
188+
}
176189

177190
std::string data = obj->dumps();
178191
std::string res;
@@ -211,8 +224,15 @@ srs_error_t SrsHttpHooks::on_play(string url, SrsRequest* req)
211224
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
212225
obj->set("app", SrsJsonAny::str(req->app.c_str()));
213226
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
227+
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
214228
obj->set("param", SrsJsonAny::str(req->param.c_str()));
215229
obj->set("pageUrl", SrsJsonAny::str(req->pageUrl.c_str()));
230+
231+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
232+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
233+
if (stream) {
234+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
235+
}
216236

217237
std::string data = obj->dumps();
218238
std::string res;
@@ -247,8 +267,15 @@ void SrsHttpHooks::on_stop(string url, SrsRequest* req)
247267
obj->set("ip", SrsJsonAny::str(req->ip.c_str()));
248268
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
249269
obj->set("app", SrsJsonAny::str(req->app.c_str()));
270+
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
250271
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
251272
obj->set("param", SrsJsonAny::str(req->param.c_str()));
273+
274+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
275+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
276+
if (stream) {
277+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
278+
}
252279

253280
std::string data = obj->dumps();
254281
std::string res;
@@ -287,10 +314,17 @@ srs_error_t SrsHttpHooks::on_dvr(SrsContextId c, string url, SrsRequest* req, st
287314
obj->set("ip", SrsJsonAny::str(req->ip.c_str()));
288315
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
289316
obj->set("app", SrsJsonAny::str(req->app.c_str()));
317+
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
290318
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
291319
obj->set("param", SrsJsonAny::str(req->param.c_str()));
292320
obj->set("cwd", SrsJsonAny::str(cwd.c_str()));
293321
obj->set("file", SrsJsonAny::str(file.c_str()));
322+
323+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
324+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
325+
if (stream) {
326+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
327+
}
294328

295329
std::string data = obj->dumps();
296330
std::string res;
@@ -332,6 +366,7 @@ srs_error_t SrsHttpHooks::on_hls(SrsContextId c, string url, SrsRequest* req, st
332366
obj->set("ip", SrsJsonAny::str(req->ip.c_str()));
333367
obj->set("vhost", SrsJsonAny::str(req->vhost.c_str()));
334368
obj->set("app", SrsJsonAny::str(req->app.c_str()));
369+
obj->set("tcUrl", SrsJsonAny::str(req->tcUrl.c_str()));
335370
obj->set("stream", SrsJsonAny::str(req->stream.c_str()));
336371
obj->set("param", SrsJsonAny::str(req->param.c_str()));
337372
obj->set("duration", SrsJsonAny::number(srsu2ms(duration)/1000.0));
@@ -341,6 +376,12 @@ srs_error_t SrsHttpHooks::on_hls(SrsContextId c, string url, SrsRequest* req, st
341376
obj->set("m3u8", SrsJsonAny::str(m3u8.c_str()));
342377
obj->set("m3u8_url", SrsJsonAny::str(m3u8_url.c_str()));
343378
obj->set("seq_no", SrsJsonAny::integer(sn));
379+
380+
obj->set("stream_url", SrsJsonAny::str(req->get_stream_url().c_str()));
381+
SrsStatisticStream* stream = stat->find_stream_by_url(req->get_stream_url());
382+
if (stream) {
383+
obj->set("stream_id", SrsJsonAny::str(stream->id.c_str()));
384+
}
344385

345386
std::string data = obj->dumps();
346387
std::string res;

‎trunk/src/app/srs_app_http_static.cpp

+14-6
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@ srs_error_t SrsHlsStream::serve_new_session(ISrsHttpResponseWriter* w, ISrsHttpM
128128
SrsContextRestore(_srs_context->get_id());
129129
_srs_context->set_id(SrsContextId().set_value(ctx));
130130

131+
// We must do stat the client before hooks, because hooks depends on it.
132+
SrsStatistic* stat = SrsStatistic::instance();
133+
if ((err = stat->on_client(ctx, req, NULL, SrsHlsPlay)) != srs_success) {
134+
return srs_error_wrap(err, "stat on client");
135+
}
136+
137+
// We must do hook after stat, because depends on it.
131138
if ((err = http_hooks_on_play(req)) != srs_success) {
132139
return srs_error_wrap(err, "HLS: http_hooks_on_play");
133140
}
@@ -155,12 +162,6 @@ srs_error_t SrsHlsStream::serve_new_session(ISrsHttpResponseWriter* w, ISrsHttpM
155162
return srs_error_wrap(err, "final request");
156163
}
157164

158-
// update the statistic when source disconveried.
159-
SrsStatistic* stat = SrsStatistic::instance();
160-
if ((err = stat->on_client(ctx, req, NULL, SrsHlsPlay)) != srs_success) {
161-
return srs_error_wrap(err, "stat on client");
162-
}
163-
164165
return err;
165166
}
166167

@@ -497,6 +498,13 @@ srs_error_t SrsVodStream::serve_ts_ctx(ISrsHttpResponseWriter * w, ISrsHttpMessa
497498

498499
// SrsServer also stat all HTTP connections including this one, but it should be ignored because the id is not
499500
// matched to any exists client. And we will do stat for the HLS streaming by session in hls_ctx.
501+
SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
502+
SrsHttpConn* hc = dynamic_cast<SrsHttpConn*>(hr->connection());
503+
SrsHttpxConn* hxc = dynamic_cast<SrsHttpxConn*>(hc->handler());
504+
505+
// Note that we never enable the stat for the HTTP connection, because we always stat the pseudo HLS streaming
506+
// session identified by hls_ctx, which served by an SrsHlsStream object.
507+
hxc->set_enable_stat(false);
500508

501509
// Serve by default HLS handler.
502510
err = SrsHttpFileServer::serve_ts_ctx(w, r, fullpath);

‎trunk/src/app/srs_app_http_stream.cpp

+25-16
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,28 @@ srs_error_t SrsLiveStream::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage
524524
{
525525
srs_error_t err = srs_success;
526526

527+
SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
528+
SrsHttpConn* hc = dynamic_cast<SrsHttpConn*>(hr->connection());
529+
SrsHttpxConn* hxc = dynamic_cast<SrsHttpxConn*>(hc->handler());
530+
531+
// Note that we should enable stat for HTTP streaming client, because each HTTP streaming connection is a real
532+
// session that should have statistics for itself.
533+
hxc->set_enable_stat(true);
534+
527535
// Correct the app and stream by path, which is created from template.
528536
// @remark Be careful that the stream has extension now, might cause identify fail.
529537
req->stream = srs_path_basename(r->path());
530-
538+
539+
// update client ip
540+
req->ip = hc->remote_ip();
541+
542+
// We must do stat the client before hooks, because hooks depends on it.
543+
SrsStatistic* stat = SrsStatistic::instance();
544+
if ((err = stat->on_client(_srs_context->get_id().c_str(), req, hc, SrsFlvPlay)) != srs_success) {
545+
return srs_error_wrap(err, "stat on client");
546+
}
547+
548+
// We must do hook after stat, because depends on it.
531549
if ((err = http_hooks_on_play(r)) != srs_success) {
532550
return srs_error_wrap(err, "http hook");
533551
}
@@ -591,15 +609,6 @@ srs_error_t SrsLiveStream::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMess
591609
SrsHttpMessage* hr = dynamic_cast<SrsHttpMessage*>(r);
592610
SrsHttpConn* hc = dynamic_cast<SrsHttpConn*>(hr->connection());
593611

594-
// update client ip
595-
req->ip = hc->remote_ip();
596-
597-
// update the statistic when source disconveried.
598-
SrsStatistic* stat = SrsStatistic::instance();
599-
if ((err = stat->on_client(_srs_context->get_id().c_str(), req, hc, SrsFlvPlay)) != srs_success) {
600-
return srs_error_wrap(err, "stat on client");
601-
}
602-
603612
// the memory writer.
604613
SrsBufferWriter writer(w);
605614
if ((err = enc->initialize(&writer, cache)) != srs_success) {
@@ -616,25 +625,25 @@ srs_error_t SrsLiveStream::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMess
616625
// Try to use fast flv encoder, remember that it maybe NULL.
617626
SrsFlvStreamEncoder* ffe = dynamic_cast<SrsFlvStreamEncoder*>(enc);
618627

619-
// Note that the handler of hc now is rohc.
620-
SrsHttpxConn* rohc = dynamic_cast<SrsHttpxConn*>(hc->handler());
621-
srs_assert(rohc);
628+
// Note that the handler of hc now is hxc.
629+
SrsHttpxConn* hxc = dynamic_cast<SrsHttpxConn*>(hc->handler());
630+
srs_assert(hxc);
622631

623632
// Set the socket options for transport.
624633
bool tcp_nodelay = _srs_config->get_tcp_nodelay(req->vhost);
625634
if (tcp_nodelay) {
626-
if ((err = rohc->set_tcp_nodelay(tcp_nodelay)) != srs_success) {
635+
if ((err = hxc->set_tcp_nodelay(tcp_nodelay)) != srs_success) {
627636
return srs_error_wrap(err, "set tcp nodelay");
628637
}
629638
}
630639

631640
srs_utime_t mw_sleep = _srs_config->get_mw_sleep(req->vhost);
632-
if ((err = rohc->set_socket_buffer(mw_sleep)) != srs_success) {
641+
if ((err = hxc->set_socket_buffer(mw_sleep)) != srs_success) {
633642
return srs_error_wrap(err, "set mw_sleep %" PRId64, mw_sleep);
634643
}
635644

636645
// Start a thread to receive all messages from client, then drop them.
637-
SrsHttpRecvThread* trd = new SrsHttpRecvThread(rohc);
646+
SrsHttpRecvThread* trd = new SrsHttpRecvThread(hxc);
638647
SrsAutoFree(SrsHttpRecvThread, trd);
639648

640649
if ((err = trd->start()) != srs_success) {

0 commit comments

Comments
 (0)