Add close method to WebTransport session. (#1110)

Author: jianjunz

source/agent/addons/quic/QuicTransportConnection.cc

@@ -40,6 +40,7 @@ NAN_MODULE_INIT(QuicTransportConnection::init)
     instanceTpl->SetInternalFieldCount(1);
 
     Nan::SetPrototypeMethod(tpl, "createBidirectionalStream", createBidirectionalStream);
+    Nan::SetPrototypeMethod(tpl, "close", close);
 
     s_constructor.Reset(Nan::GetFunction(tpl).ToLocalChecked());
     Nan::Set(target, Nan::New("QuicTransportConnection").ToLocalChecked(), Nan::GetFunction(tpl).ToLocalChecked());
@@ -116,9 +117,30 @@ NAUV_WORK_CB(QuicTransportConnection::onStreamCallback)
     }
 }
 
-NAN_METHOD(QuicTransportConnection::createBidirectionalStream){
+NAN_METHOD(QuicTransportConnection::createBidirectionalStream)
+{
     QuicTransportConnection* obj = Nan::ObjectWrap::Unwrap<QuicTransportConnection>(info.Holder());
-    auto stream=obj->m_session->CreateBidirectionalStream();
+    auto stream = obj->m_session->CreateBidirectionalStream();
     v8::Local<v8::Object> streamObject = QuicTransportStream::newInstance(stream);
     info.GetReturnValue().Set(streamObject);
+}
+
+NAN_METHOD(QuicTransportConnection::close)
+{
+    QuicTransportConnection* obj = Nan::ObjectWrap::Unwrap<QuicTransportConnection>(info.Holder());
+    uint32_t closeCode = 0;
+    std::string reason;
+    if (info.Length() != 0) {
+        auto maybeCloseCode = Nan::Get(Nan::To<v8::Object>(info[0]).ToLocalChecked(), Nan::New<v8::String>("closeCode").ToLocalChecked());
+        if (!maybeCloseCode.IsEmpty()) {
+            closeCode = Nan::To<uint32_t>(maybeCloseCode.ToLocalChecked()).ToChecked();
+        }
+        auto maybeReason = Nan::Get(Nan::To<v8::Object>(info[0]).ToLocalChecked(), Nan::New<v8::String>("reason").ToLocalChecked());
+        if (!maybeReason.IsEmpty()) {
+            auto reasonObj =maybeReason.ToLocalChecked();
+            Nan::Utf8String reasonStr(Nan::To<v8::String>(reasonObj).ToLocalChecked());
+            reason = std::string(*reasonStr);
+        }
+    }
+    obj->m_session->Close(closeCode, reason.c_str());
 }

source/agent/addons/quic/QuicTransportConnection.h

@@ -36,6 +36,8 @@ class QuicTransportConnection : public Nan::ObjectWrap, public owt::quic::WebTra
     static NAN_MODULE_INIT(init);
     static NAN_METHOD(newInstance);
     static NAN_METHOD(createBidirectionalStream);
+    // Close a WebTransport session, take an optional argument of WebTransportCloseInfo defined in https://w3c.github.io/webtransport/#web-transport-close-info.
+    static NAN_METHOD(close);
     static NAUV_WORK_CB(onStreamCallback);
 
     static Nan::Persistent<v8::Function> s_constructor;

source/agent/addons/quic/quic_sdk_url

@@ -1 +1 @@
-https://api.github.com/repos/open-webrtc-toolkit/owt-sdk-quic/actions/artifacts/97822442/zip
+https://api.github.com/repos/open-webrtc-toolkit/owt-sdk-quic/actions/artifacts/114967253/zip

source/agent/quic/index.js

@@ -251,7 +251,9 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
         var conn = router.getConnection(connectionId);
         router.removeConnection(connectionId).then(function(ok) {
             if (conn) {
+              if (typeof conn.close === 'function') {
                 conn.close();
+              }
             }
             callback('callback', 'ok');
         }, onError(callback));
@@ -298,7 +300,9 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
         var conn = router.getConnection(connectionId);
         router.removeConnection(connectionId).then(function(ok) {
             if (conn) {
+              if (typeof conn.close === 'function') {
                 conn.close();
+              }
             }
             callback('callback', 'ok');
         }, onError(callback));

source/agent/quic/webtransport/quicTransportServer.js

@@ -36,7 +36,8 @@ module.exports = class QuicTransportServer extends EventEmitter {
       setTimeout(() => {
         // Must be authenticated in `authenticationTimeout` seconds.
         if (!connection.transportId) {
-          connection.close();
+          connection.close(
+              {closeCode: 0, reason: 'Timeout for authentication.'});
         }
       }, authenticationTimeout * 1000);
       connection.onincomingstream = (stream) => {
@@ -49,14 +50,21 @@ module.exports = class QuicTransportServer extends EventEmitter {
             if (connection.transportId) {
               log.error(
                   'Received a new signaling stream on an authenticated connection. Close connection.')
-              connection.close();
+              connection.close({
+                closeCode: 0,
+                reason:
+                    'Received a new signaling stream on an authenticated connection.'
+              });
             }
             // Signaling stream. Waiting for transport ID then.
           } else if (!connection.transportId) {
             log.error(
                 'Stream ' + streamId +
                 ' added on unauthenticated transport. Close connection.');
-            connection.close();
+            connection.close({
+              closeCode: 0,
+              reason: 'Stream added on unauthenticated transport'
+            });
           } else {
             log.debug(
                 'A new stream ' + streamId + ' is created on transport ' +
@@ -120,13 +128,14 @@ module.exports = class QuicTransportServer extends EventEmitter {
                   token = JSON.parse(Buffer.from(message, 'base64').toString());
                 } catch (error) {
                   log.error('Invalid token.');
-                  connection.close();
+                  connection.close({closeCode: 0, reason: 'Invalid token.'});
                   return;
                 }
                 this._validateTokenCallback(token).then(result => {
                   if (result !== 'ok') {
                     log.error('Authentication failed.');
-                    connection.close();
+                    connection.close(
+                        {closeCode: 0, reason: 'Authentication failed.'});
                     return;
                   }
                   log.debug('Created connection for transport ID '+connection.transportId);