Add OnClosed event for WebTransportClientInterface. (#61)

Author: jianjunz

web_transport/sdk/api/owt/quic/web_transport_client_interface.h

@@ -33,7 +33,9 @@ class OWT_EXPORT WebTransportClientInterface {
     // Called when an incoming stream is received.
     virtual void OnIncomingStream(WebTransportStreamInterface*) = 0;
     // Called when datagram is processed.
-    virtual void OnDatagramProcessed(MessageStatus) {}
+    virtual void OnDatagramProcessed(MessageStatus) = 0;
+    // Called when the connection is closed.
+    virtual void OnClosed(uint32_t code, const char* reason) = 0;
   };
   virtual ~WebTransportClientInterface() = default;
   // Set a visitor for the client.

web_transport/sdk/impl/tests/web_transport_echo_visitors.cc

@@ -46,11 +46,11 @@ ServerEchoVisitor::~ServerEchoVisitor() {}
 
 void ServerEchoVisitor::OnSession(WebTransportSessionInterface* session) {
   CHECK(session);
-  LOG(INFO) << "Server on session.";
   std::unique_ptr<SessionEchoVisitor> visitor =
       std::make_unique<SessionEchoVisitor>();
   session->SetVisitor(visitor.get());
   session_visitors_.push_back(std::move(visitor));
+  sessions_.emplace_back(session);
 }
 
 }  // namespace test

web_transport/sdk/impl/tests/web_transport_echo_visitors.h

@@ -49,8 +49,15 @@ class ServerEchoVisitor : public WebTransportServerInterface::Visitor {
   void OnEnded() override {}
   void OnSession(WebTransportSessionInterface* session) override;
 
+  std::vector<WebTransportSessionInterface*> Sessions() const {
+    return sessions_;
+  }
+
  private:
   std::vector<std::unique_ptr<SessionEchoVisitor>> session_visitors_;
+  // A list of sessions created in the order of their creation. Closed sessions
+  // are not removed.
+  std::vector<WebTransportSessionInterface*> sessions_;
 };
 
 }  // namespace test

web_transport/sdk/impl/tests/web_transport_owt_end_to_end_test.cc

@@ -39,6 +39,7 @@ class ClientMockVisitor : public WebTransportClientInterface::Visitor {
   MOCK_METHOD0(OnConnectionFailed, void());
   MOCK_METHOD1(OnIncomingStream, void(WebTransportStreamInterface*));
   MOCK_METHOD1(OnDatagramProcessed, void(MessageStatus));
+  MOCK_METHOD2(OnClosed, void(uint32_t, const char*));
 };
 
 class StreamMockVisitor : public WebTransportStreamInterface::Visitor {
@@ -214,7 +215,7 @@ class WebTransportOwtEndToEndTest : public net::TestWithTaskEnvironment {
   TestConnectionHelper* helper_;  // Owned by |context_|.
   ClientMockVisitor visitor_;
   std::unique_ptr<WebTransportClientInterface> client_;
-  std::unique_ptr<WebTransportServerInterface::Visitor> server_visitor_;
+  std::unique_ptr<ServerEchoVisitor> server_visitor_;
 };
 
 TEST_F(WebTransportOwtEndToEndTest, Connect) {
@@ -281,6 +282,20 @@ TEST_F(WebTransportOwtEndToEndTest, ClientSendsDatagram) {
   client_->SendOrQueueDatagram(data, data_size);
 }
 
+TEST_F(WebTransportOwtEndToEndTest, ClientOnClosed) {
+  StartEchoServer();
+  client_ = CreateClient(GetServerUrl("/echo"));
+  client_->SetVisitor(&visitor_);
+  EXPECT_CALL(visitor_, OnConnected()).WillOnce(StopRunning());
+  client_->Connect();
+  Run();
+  EXPECT_EQ(server_visitor_->Sessions().size(), (unsigned long)1);
+  EXPECT_CALL(visitor_, OnClosed(testing::_, testing::_))
+      .WillOnce(StopRunning());
+  server_visitor_->Sessions()[0]->Close(0, "");
+  Run();
+}
+
 }  // namespace test
 }  // namespace quic
 }  // namespace owt

web_transport/sdk/impl/web_transport_http3_client.cc

@@ -721,7 +721,11 @@ void WebTransportHttp3Client::OnConnectionClosed(
   }
 
   if (error == ::quic::QUIC_NO_ERROR) {
-    TransitionToState(net::WebTransportState::CLOSED);
+    // Session might be closed before connection is closed, e.g.: received a
+    // CLOSE_WEBTRANSPORT_SESSION capsule.
+    if (state_ != net::WebTransportState::CLOSED) {
+      TransitionToState(net::WebTransportState::CLOSED);
+    }
     return;
   }
 

web_transport/sdk/impl/web_transport_owt_client_impl.cc

@@ -150,8 +150,12 @@ void WebTransportOwtClientImpl::OnError(const net::WebTransportError& error) {
 }
 
 void WebTransportOwtClientImpl::OnClosed(
-      const absl::optional<net::WebTransportCloseInfo>& close_info) {
-  LOG(INFO) << "OnClosed.";
+    const absl::optional<net::WebTransportCloseInfo>& close_info) {
+  if (!visitor_)
+    return;
+  bool has_value(close_info.has_value());
+  visitor_->OnClosed(has_value ? close_info->code : 0,
+                     has_value ? nullptr : close_info->reason.c_str());
 }
 
 WebTransportStreamInterface*