Add transport info in publication and subscription.

Author: jianjunz

scripts/Gruntfile.js

@@ -52,7 +52,8 @@ window.L = L;\n\
           },
           transform: [
             ["babelify", {
-              "presets": ["@babel/preset-env"]
+              "presets": ["@babel/preset-env"],
+              "plugins": ["@babel/plugin-transform-runtime"]
             }]
           ]
         },

src/samples/conference/public/scripts/quic.js

@@ -26,7 +26,7 @@ conference.addEventListener('streamadded', async (event) => {
 
 function updateConferenceStatus(message) {
   document.getElementById('conference-status').innerHTML +=
-      ('<p>' + message + '</p>');
+    ('<p>' + message + '</p>');
 }
 
 
@@ -104,7 +104,7 @@ document.getElementById('start-sending').addEventListener('click', async () => {
     return;
   }
   await writeUuid();
-  // writeTask = setInterval(writeData, 500);
+  writeTask = setInterval(writeData, 2000);
   updateConferenceStatus('Started sending.');
 });
 

src/sdk/base/export.js

@@ -7,3 +7,4 @@
 export * from './mediastream-factory.js';
 export * from './stream.js';
 export * from './mediaformat.js';
+export * from './transport.js';

src/sdk/base/publication.js

@@ -180,7 +180,7 @@ export class Publication extends EventDispatcher {
  */
 export class PublishOptions {
   // eslint-disable-next-line require-jsdoc
-  constructor(audio, video) {
+  constructor(audio, video, transport) {
     /**
      * @member {?Array<Owt.Base.AudioEncodingParameters> | ?Array<RTCRtpEncodingParameters>} audio
      * @instance
@@ -195,5 +195,11 @@ export class PublishOptions {
      * @desc Parameters for video RtpSender. Publishing with RTCRtpEncodingParameters is an experimental feature. It is subject to change.
      */
     this.video = video;
+    /**
+     * @member {?Owt.Base.TransportConstraints} transport
+     * @instance
+     * @memberof Owt.Base.PublishOptions
+     */
+    this.transport = transport;
   }
 }

src/sdk/base/transport.js

@@ -0,0 +1,73 @@
+// Copyright (C) <2020> Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+'use strict';
+
+/**
+ * @class TransportType
+ * @memberOf Owt.Base
+ * @classDesc Transport type enumeration.
+ * @hideconstructor
+ */
+export const TransportType = {
+  QUIC: 'quic',
+  WEBRTC: 'webrtc',
+};
+
+/**
+ * @class TransportConstraints
+ * @memberOf Owt.Base
+ * @classDesc Represents the transport constraints for publication and
+ * subscription.
+ * @hideconstructor
+ */
+export class TransportConstraints {
+  // eslint-disable-next-line require-jsdoc
+  constructor(type, id) {
+    /**
+     * @member {Array.<Owt.Base.TransportType>} type
+     * @instance
+     * @memberof Owt.Base.TransportConstraints
+     * @desc Transport type for publication and subscription.
+     */
+    this.type = type;
+    /**
+     * @member {?string} id
+     * @instance
+     * @memberof Owt.Base.TransportConstraints
+     * @desc Transport ID. Undefined transport ID results server to assign a new
+     * one. It should always be undefined if transport type is webrtc since the
+     * webrtc agent of OWT server doesn't support multiple transceivers on a
+     * single PeerConnection.
+     */
+    this.id = id;
+  }
+}
+
+/**
+ * @class TransportSettings
+ * @memberOf Owt.Base
+ * @classDesc Represents the transport settings for publication and
+ * subscription.
+ * @hideconstructor
+ */
+export class TransportSettings {
+  // eslint-disable-next-line require-jsdoc
+  constructor(type, id) {
+    /**
+     * @member {Array.<Owt.Base.TransportType>} type
+     * @instance
+     * @memberof Owt.Base.TransportConstraints
+     * @desc Transport type for publication and subscription.
+     */
+    this.type = type;
+    /**
+     * @member {string} id
+     * @instance
+     * @memberof Owt.Base.TransportConstraints
+     * @desc Transport ID.
+     */
+    this.id = id;
+  }
+}

src/sdk/conference/client.js

@@ -488,9 +488,9 @@ export const ConferenceClient = function(config, signalingImpl) {
    */
   this.createQuicConnection = function() {
     const quicConnection = new QuicConnection(
-      'quic-transport://example.com', me.id,
-      createSignalingForChannel());
-    quicTransportChannel=quicConnection;
+        'quic-transport://jianjunz-nuc-ubuntu.sh.intel.com:7700/echo',
+        createSignalingForChannel());
+    quicTransportChannel = quicConnection;
     return quicConnection;
   };
 };

src/sdk/conference/quicconnection.js

@@ -21,14 +21,15 @@ import {Subscription} from './subscription.js';
  * @private
  */
 export class QuicConnection extends EventDispatcher {
-  constructor(url, token, signaling) {
+  constructor(url, signaling) {
     super();
     this._signaling = signaling;
     this._ended = false;
     this._quicStreams = new Map(); // Key is publication or subscription ID.
     this._quicTransport = new QuicTransport(url);
     this._subscribePromises = new Map(); // Key is subscription ID.
-    this._init(token);
+    this._transportId = undefined;
+    this._init();
   }
 
   /**
@@ -57,8 +58,7 @@ export class QuicConnection extends EventDispatcher {
     }
   }
 
-  async _init(token) {
-    this._authenticate(token);
+  async _init() {
     const receiveStreamReader =
         this._quicTransport.receiveStreams().getReader();
     Logger.info('Reader: '+receiveStreamReader);
@@ -117,14 +117,16 @@ export class QuicConnection extends EventDispatcher {
   async createSendStream(sessionId) {
     Logger.info('Create stream.');
     await this._quicTransport.ready;
-    // TODO: Creating quicStream and initializing publication concurrently.
-    const quicStream = await this._quicTransport.createSendStream();
+    // TODO: Potential failure because of publication stream is created faster
+    // than signaling stream(created by the 1st call to initiatePublication).
     const publicationId = await this._initiatePublication();
+    const quicStream = await this._quicTransport.createSendStream();
     const writer= quicStream.writable.getWriter();
     await writer.ready;
     writer.write(this._uuidToUint8Array(publicationId));
-    writer.write(this._uuidToUint8Array(publicationId));
+    writer.releaseLock();
     this._quicStreams.set(publicationId, quicStream);
+    return quicStream;
   }
 
   hasContentSessionId(id) {
@@ -178,16 +180,19 @@ export class QuicConnection extends EventDispatcher {
   subscribe(stream) {
     const p = new Promise((resolve, reject) => {
       this._signaling
-          .sendSignalingMessage(
-              'subscribe',
-              {media: null, data: {from: stream.id}, transport: {type: 'quic'}})
+          .sendSignalingMessage('subscribe', {
+            media: null,
+            data: {from: stream.id},
+            transport: {type: 'quic', id: this._transportId},
+          })
           .then((data) => {
             if (this._quicStreams.has(data.id)) {
               // QUIC stream created before signaling returns.
               const subscription = this._createSubscription(
                   data.id, this._quicStreams.get(data.id));
               resolve(subscription);
             } else {
+              this._quicStreams.set(data.id, null);
               // QUIC stream is not created yet, resolve promise after getting
               // QUIC stream.
               this._subscribePromises.set(
@@ -207,12 +212,28 @@ export class QuicConnection extends EventDispatcher {
     });
   }
 
+  _updateTransportId(id) {
+    if (this._transportId) {
+      Logger.error('Update transport ID is not supported.');
+      return;
+    }
+    this._transportId = id;
+    this._authenticate(id);
+  }
+
   async _initiatePublication() {
     const data = await this._signaling.sendSignalingMessage('publish', {
       media: null,
       data: true,
-      transport: {type:'quic'}
+      transport: {type: 'quic', id: this._transportId},
     });
+    if (data.transportId) {
+      this._updateTransportId(data.transportId);
+    } else {
+      if (this._transportId !== data.transportId) {
+        throw new Error('Transport ID not match.');
+      }
+    }
     return data.id;
   }
 

src/sdk/conference/subscription.js

@@ -172,7 +172,7 @@ export class VideoSubscriptionConstraints {
  */
 export class SubscribeOptions {
   // eslint-disable-next-line require-jsdoc
-  constructor(audio, video) {
+  constructor(audio, video, transport) {
     /**
      * @member {?Owt.Conference.AudioSubscriptionConstraints} audio
      * @instance
@@ -185,6 +185,12 @@ export class SubscribeOptions {
      * @memberof Owt.Conference.SubscribeOptions
      */
     this.video = video;
+    /**
+     * @member {?Owt.Base.TransportConstraints} transport
+     * @instance
+     * @memberof Owt.Conference.SubscribeOptions
+     */
+    this.transport = transport;
   }
 }