Squash: Support query lastest available version. 5.0.6

CHANGELOG.md

@@ -6,6 +6,7 @@ The changelog for SRS.
 
 ## SRS 5.0 Changelog
 
+* v5.0, 2021-06-28, Squash: Support query lastest available version. 5.0.6
 * v5.0, 2021-06-22, Squash: Support ARM platform. 5.0.5
 * v5.0, 2021-06-16, Change [GB28181](https://github.com/ossrs/srs/issues/1500) to [feature/gb28181](https://github.com/ossrs/srs/tree/feature/gb28181). 5.0.4
 * v5.0, 2021-05-31, Use [SPDX-License-Identifier: MIT](https://spdx.dev/ids/). 5.0.3
@@ -17,6 +18,8 @@ The changelog for SRS.
 
 ## SRS 4.0 Changelog
 
+* v4.0, 2021-06-28, Merge [#2438](https://github.com/ossrs/srs/pull/2438), fix losing of last HLS ts file 4.0.133
+* v4.0, 2021-06-27, Squash for [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 4.0.132
 * v4.0, 2021-06-24, Merge [#2429](https://github.com/ossrs/srs/pull/2429) to fix SRT bug. 4.0.131
 * v4.0, 2021-06-21, Fix [#2413](https://github.com/ossrs/srs/issues/2413), fix RTMP to RTC bug 4.0.130
 * v4.0, 2021-06-20, Guess where FFmpeg is. 4.0.129

README.md

@@ -207,6 +207,7 @@ Please read [CHANGELOG](CHANGELOG.md#changelog).
 
 ## Releases
 
+* 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines.
 * 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
 * 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines.
 * 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines.

trunk/conf/full.conf

@@ -111,6 +111,11 @@ auto_reload_for_docker on;
 # default: 0.8
 tcmalloc_release_rate 0.8;
 
+# Query the latest available version of SRS, write a log to notice user to upgrade.
+# @see https://github.com/ossrs/srs/issues/2424
+# Default: on
+query_latest_version on;
+
 # For system circuit breaker.
 circuit_breaker {
     # Whether enable the circuit breaker.

trunk/configure

@@ -270,7 +270,7 @@ MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_sourc
         "srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
         "srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
         "srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
-        "srs_app_caster_flv" "srs_app_process" "srs_app_ng_exec"
+        "srs_app_caster_flv" "srs_app_latest_version" "srs_app_process" "srs_app_ng_exec"
         "srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
         "srs_app_coworkers" "srs_app_hybrid" "srs_app_threads")
 if [[ $SRS_RTC == YES ]]; then

trunk/src/app/srs_app_config.cpp

@@ -4235,6 +4235,18 @@ bool SrsConfig::get_asprocess()
     return SRS_CONF_PERFER_FALSE(conf->arg0());
 }
 
+bool SrsConfig::whether_query_latest_version()
+{
+    static bool DEFAULT = true;
+
+    SrsConfDirective* conf = root->get("query_latest_version");
+    if (!conf) {
+        return DEFAULT;
+    }
+
+    return SRS_CONF_PERFER_TRUE(conf->arg0());
+}
+
 bool SrsConfig::empty_ip_ok()
 {
     static bool DEFAULT = true;

trunk/src/app/srs_app_config.hpp

@@ -457,6 +457,8 @@ public:
     virtual std::string get_work_dir();
     // Whether use asprocess mode.
     virtual bool get_asprocess();
+    // Whether query the latest available version of SRS.
+    virtual bool whether_query_latest_version();
     // Whether empty client IP is ok.
     virtual bool empty_ip_ok();
     // Get the start wait in ms for gracefully quit.

trunk/src/app/srs_app_latest_version.cpp

@@ -0,0 +1,171 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 SRS(ossrs)
+
+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 <srs_app_latest_version.hpp>
+
+#include <srs_core_autofree.hpp>
+#include <srs_kernel_error.hpp>
+#include <srs_kernel_log.hpp>
+#include <srs_kernel_utility.hpp>
+#include <srs_protocol_json.hpp>
+#include <srs_protocol_utility.hpp>
+#include <srs_app_config.hpp>
+#include <srs_app_http_conn.hpp>
+#include <srs_app_http_client.hpp>
+#include <srs_app_utility.hpp>
+
+#include <unistd.h>
+#include <sstream>
+using namespace std;
+
+SrsLatestVersion::SrsLatestVersion()
+{
+    trd_ = new SrsSTCoroutine("signal", this);
+}
+
+SrsLatestVersion::~SrsLatestVersion()
+{
+    srs_freep(trd_);
+}
+
+srs_error_t SrsLatestVersion::start()
+{
+    if (!_srs_config->whether_query_latest_version()) {
+        return srs_success;
+    }
+
+    char buf[10];
+    srs_random_generate(buf, sizeof(buf));
+    for (int i = 0; i < (int)sizeof(buf); i++) {
+        buf[i] = 'a' + uint8_t(buf[i])%25;
+    }
+    server_id_ = string(buf, sizeof(buf));
+
+    return trd_->start();
+}
+
+srs_error_t SrsLatestVersion::cycle()
+{
+    srs_error_t err = srs_success;
+
+    srs_utime_t starttime = srs_update_system_time();
+    if ((err = query_latest_version()) != srs_success) {
+        srs_warn("query err %s", srs_error_desc(err).c_str());
+        srs_freep(err); // Ignore any error.
+    }
+
+    srs_utime_t first_random_wait = 0;
+    srs_random_generate((char*)&first_random_wait, 8);
+    first_random_wait = srs_utime_t(uint64_t((first_random_wait + starttime + getpid())) % (60 * 60)) * SRS_UTIME_SECONDS; // in s.
+
+    srs_trace("Startup query id=%s, eip=%s, match=%s, stable=%s, wait=%ds, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(first_random_wait)/1000, srsu2msi(srs_update_system_time() - starttime));
+    srs_usleep(first_random_wait);
+
+    while (true) {
+        starttime = srs_update_system_time();
+        if ((err = query_latest_version()) != srs_success) {
+            srs_warn("query err %s", srs_error_desc(err).c_str());
+            srs_freep(err); // Ignore any error.
+        }
+
+        srs_trace("Finish query id=%s, eip=%s, match=%s, stable=%s, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(srs_update_system_time() - starttime));
+        srs_usleep(3600 * SRS_UTIME_SECONDS); // Every an hour.
+    }
+
+    return err;
+}
+
+srs_error_t SrsLatestVersion::query_latest_version()
+{
+    srs_error_t err = srs_success;
+
+    // Generate uri and parse to object.
+    stringstream ss;
+    ss << "http://api.ossrs.net/service/v1/releases?"
+          << "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
+          << "&id=" << server_id_
+          << "&eip=" << srs_get_public_internet_address()
+          << "&ts=" << srsu2ms(srs_get_system_time());
+    string url = ss.str();
+
+    SrsHttpUri uri;
+    if ((err = uri.initialize(url)) != srs_success) {
+        return srs_error_wrap(err, "http: post failed. url=%s", url.c_str());
+    }
+
+    // Start HTTP request and read response.
+    SrsHttpClient http;
+    if ((err = http.initialize(uri.get_schema(), uri.get_host(), uri.get_port())) != srs_success) {
+        return err;
+    }
+
+    // Path with query.
+    string path = uri.get_path();
+    path += "?";
+    path += uri.get_query();
+
+    ISrsHttpMessage* msg = NULL;
+    if ((err = http.get(path, "", &msg)) != srs_success) {
+        return err;
+    }
+    SrsAutoFree(ISrsHttpMessage, msg);
+
+    string res;
+    int code = msg->status_code();
+    if ((err = msg->body_read_all(res)) != srs_success) {
+        return err;
+    }
+
+    // Check the response code and content.
+    if (code != SRS_CONSTS_HTTP_OK) {
+        return srs_error_new(ERROR_HTTP_STATUS_INVALID, "invalid response status=%d", code);
+    }
+
+    if (res.empty()) {
+        return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid empty response");
+    }
+
+    // Response in json object.
+    SrsJsonAny* jres = SrsJsonAny::loads((char*)res.c_str());
+    if (!jres || !jres->is_object()) {
+        return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid response %s", res.c_str());
+    }
+    SrsAutoFree(SrsJsonAny, jres);
+
+    SrsJsonObject* obj = jres->to_object();
+    SrsJsonAny* prop = NULL;
+
+    // Parse fields of response.
+    if ((prop = obj->ensure_property_string("match_version")) == NULL) {
+        return srs_error_new(ERROR_RESPONSE_CODE, "no match_version");
+    }
+    match_version_ = prop->to_str();
+
+    if ((prop = obj->ensure_property_string("stable_version")) == NULL) {
+        return srs_error_new(ERROR_RESPONSE_CODE, "no stable_version");
+    }
+    stable_version_ = prop->to_str();
+
+    return err;
+}
+

trunk/src/app/srs_app_latest_version.hpp

@@ -0,0 +1,58 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2013-2015 SRS(ossrs)
+
+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.
+*/
+
+#ifndef SRS_APP_LATEST_VERSION_HPP
+#define SRS_APP_LATEST_VERSION_HPP
+
+/*
+#include <srs_app_latest_version.hpp>
+*/
+
+#include <srs_core.hpp>
+
+#include <srs_app_st.hpp>
+
+#include <string>
+
+class SrsLatestVersion : public ISrsCoroutineHandler
+{
+private:
+    SrsCoroutine* trd_;
+    std::string server_id_;
+private:
+    std::string match_version_;
+    std::string stable_version_;
+public:
+    SrsLatestVersion();
+    virtual ~SrsLatestVersion();
+public:
+    virtual srs_error_t start();
+// interface ISrsEndlessThreadHandler.
+public:
+    virtual srs_error_t cycle();
+private:
+    srs_error_t query_latest_version();
+};
+
+#endif
+

trunk/src/app/srs_app_server.cpp

@@ -36,6 +36,7 @@ using namespace std;
 #include <srs_kernel_consts.hpp>
 #include <srs_app_coworkers.hpp>
 #include <srs_service_log.hpp>
+#include <srs_app_latest_version.hpp>
 
 std::string srs_listener_type2string(SrsListenerType type)
 {
@@ -572,7 +573,8 @@ SrsServer::SrsServer()
     
     signal_manager = new SrsSignalManager(this);
     conn_manager = new SrsResourceManager("TCP", true);
-    
+    latest_version_ = new SrsLatestVersion();
+
     handler = NULL;
     ppid = ::getppid();
     
@@ -612,6 +614,7 @@ void SrsServer::destroy()
     }
     
     srs_freep(signal_manager);
+    srs_freep(latest_version_);
     srs_freep(conn_manager);
 }
 
@@ -725,7 +728,18 @@ srs_error_t SrsServer::initialize_st()
 
 srs_error_t SrsServer::initialize_signal()
 {
-    return signal_manager->initialize();
+    srs_error_t err = srs_success;
+
+    if ((err = signal_manager->initialize()) != srs_success) {
+        return srs_error_wrap(err, "init signal manager");
+    }
+
+    // Start the version query coroutine.
+    if ((err = latest_version_->start()) != srs_success) {
+        return srs_error_wrap(err, "start version query");
+    }
+
+    return err;
 }
 
 srs_error_t SrsServer::acquire_pid_file()

trunk/src/app/srs_app_server.hpp

@@ -36,6 +36,7 @@ class SrsTcpListener;
 class SrsAppCasterFlv;
 class SrsRtspCaster;
 class SrsResourceManager;
+class SrsLatestVersion;
 
 // The listener type for server to identify the connection,
 // that is, use different type to process the connection.
@@ -233,6 +234,8 @@ private:
     std::vector<SrsListener*> listeners;
     // Signal manager which convert gignal to io message.
     SrsSignalManager* signal_manager;
+    // To query the latest available version of SRS.
+    SrsLatestVersion* latest_version_;
     // Handle in server cycle.
     ISrsServerCycle* handler;
     // User send the signal, convert to variable.

trunk/src/core/srs_core_version3.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
-#define SRS_VERSION3_REVISION 162
+#define SRS_VERSION3_REVISION 163
 
 #endif

trunk/src/core/srs_core_version4.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    131
+#define VERSION_REVISION    133
 
 #endif

trunk/src/core/srs_core_version5.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    5
+#define VERSION_REVISION    6
 
 #endif

trunk/src/protocol/srs_service_http_conn.cpp

@@ -104,7 +104,8 @@ srs_error_t SrsHttpParser::parse_message(ISrsReader* reader, ISrsHttpMessage** p
     // Initialize the basic information.
     msg->set_basic(hp_header.type, hp_header.method, hp_header.status_code, hp_header.content_length);
     msg->set_header(header, http_should_keep_alive(&hp_header));
-    if ((err = msg->set_url(url, jsonp)) != srs_success) {
+    // For HTTP response, no url.
+    if (type_ != HTTP_RESPONSE && (err = msg->set_url(url, jsonp)) != srs_success) {
         srs_freep(msg);
         return srs_error_wrap(err, "set url=%s, jsonp=%d", url.c_str(), jsonp);
     }