Raise default subscribe timeout to 30s and fix timeout log units

Author: mondain

examples/psychedelic/Psychedelic.cpp

@@ -135,7 +135,6 @@ int main(int argc, char** argv) {
         base_config.include_sap = false;
         base_config.paced = false;
         base_config.loop = false;
-        base_config.subscriber_timeout = std::chrono::seconds(3);
 
         EndpointConfig endpoint;
         endpoint.transport = TransportKind::kWebTransport;

include/openmoq/publisher/cli_options.h

@@ -36,7 +36,7 @@ struct CliOptions {
     bool paced = false;
     bool loop = false;
     bool dump_plan = false;
-    std::chrono::seconds subscriber_timeout = std::chrono::seconds(3);
+    std::chrono::seconds subscriber_timeout = std::chrono::seconds(30);
 };
 
 CliOptions parse_cli_options(int argc, char** argv);

include/openmoq/publisher/publisher_api.h

@@ -27,7 +27,7 @@ struct PublisherConfig {
     bool split_cmaf_chunks = true;
     bool paced = false;
     bool loop = false;
-    std::chrono::seconds subscriber_timeout = std::chrono::seconds(3);
+    std::chrono::seconds subscriber_timeout = std::chrono::seconds(30);
 };
 
 struct PreparedPublish {

include/openmoq/publisher/transport/moqt_session.h

@@ -35,7 +35,7 @@ class MoqtSession {
                          bool publish_catalog = false,
                          bool paced = false,
                          bool loop = false,
-                         std::chrono::seconds subscriber_timeout = std::chrono::seconds(3));
+                         std::chrono::seconds subscriber_timeout = std::chrono::seconds(30));
 
     TransportStatus connect(const EndpointConfig& endpoint, const TlsConfig& tls);
     TransportStatus publish(const openmoq::publisher::PublishPlan& plan);
@@ -59,7 +59,7 @@ class MoqtSession {
     bool publish_catalog_ = false;
     bool paced_ = false;
     bool loop_ = false;
-    std::chrono::seconds subscriber_timeout_ = std::chrono::seconds(3);
+    std::chrono::seconds subscriber_timeout_ = std::chrono::seconds(30);
     std::optional<EndpointConfig> endpoint_;
     std::uint64_t control_stream_id_ = 0;
     std::uint64_t peer_max_request_id_ = 0;

src/transport/moqt_session.cpp

@@ -1815,7 +1815,13 @@ TransportStatus serve_subscriptions(PublisherTransport& transport,
     }
 
     if (!served_any_subscription) {
-        std::cerr << "[moqt-session] no downstream SUBSCRIBE before timeout; closing idle publish session" << '\n';
+        std::cerr << "[moqt-session] no downstream SUBSCRIBE before timeout; "
+                     "idle await-subscribe publish closing"
+                  << " namespace=" << track_namespace
+                  << " draft=" << openmoq::publisher::to_string(draft)
+                  << " timeout_s=" << subscriber_timeout.count()
+                  << " note=expecting relay/internal subscriber subscription"
+                  << '\n';
         pending_control_bytes = std::move(buffer);
         if (!send_namespace_done) {
             return TransportStatus::success();
@@ -2888,7 +2894,13 @@ TransportStatus MoqtSession::publish_live(std::istream& input,
             } else if (read_status.message == "timed out waiting for stream data" ||
                        read_status.message == "no queued read for stream") {
                 if (active_subscriptions.empty()) {
-                    std::cerr << "[moqt-session] live: no subscribers before timeout\n";
+                    std::cerr << "[moqt-session] live: no downstream SUBSCRIBE before timeout; "
+                                 "idle await-subscribe publish exiting"
+                              << " namespace=" << track_namespace_
+                              << " draft=" << openmoq::publisher::to_string(draft_version)
+                              << " timeout_s=" << subscriber_timeout_.count()
+                              << " note=expecting relay/internal subscriber subscription"
+                              << '\n';
                     break;
                 }
             } else {

tests/cli_options_test.cpp

@@ -35,8 +35,8 @@ int main() {
 
     {
         const CliOptions options = parse({"openmoq-publisher", "--input", "sample.mp4"});
-        ok &= expect(options.subscriber_timeout == std::chrono::seconds(3),
-                     "expected default subscriber timeout to remain 3 seconds");
+        ok &= expect(options.subscriber_timeout == std::chrono::seconds(30),
+                     "expected default subscriber timeout to be 30 seconds");
         ok &= expect(options.split_cmaf_chunks, "expected chunk splitting to be enabled by default");
         ok &= expect(options.input_source.kind == openmoq::publisher::InputSourceKind::kFile,
                      "expected file input to remain the default input source kind");

tests/moqt_session_test.cpp

@@ -763,9 +763,9 @@ int main() {
         ok &= expect(transport.writes[8].bytes == std::vector<std::uint8_t>({0x09, 0x00, 0x09, 0x01, 0x07, 0x69, 0x6e,
                                                                              0x74, 0x65, 0x72, 0x6f, 0x70}),
                      "expected draft-14 PUBLISH_NAMESPACE_DONE to contain the configured track namespace");
-        ok &= expect(std::find(transport.read_timeouts.begin(), transport.read_timeouts.end(), std::chrono::seconds(3)) !=
+        ok &= expect(std::find(transport.read_timeouts.begin(), transport.read_timeouts.end(), std::chrono::seconds(30)) !=
                          transport.read_timeouts.end(),
-                     "expected default subscriber wait timeout to be 3 seconds");
+                     "expected default subscriber wait timeout to be 30 seconds");
     }
 
     {