Modifying SDK for QUIC.

Author: jianjunz

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

@@ -4,8 +4,7 @@
 
 'use strict';
 
-// const conference = new Owt.Conference.ConferenceClient();
-let quicTransport = null;
+let quicChannel = null;
 let bidirectionalStream = null;
 let writeTask;
 const conference=new Owt.Conference.ConferenceClient();
@@ -29,8 +28,10 @@ function joinConference() {
 };
 
 function createQuicTransport() {
+  quicChannel = conference.createQuicChannel();
+  return;
   quicTransport = new QuicTransport(
-      'quic-transport://jianjunz-nuc-ubuntu.sh.intel.com:7700/echo');
+    'quic-transport://jianjunz-nuc-ubuntu.sh.intel.com:7700/echo');
   quicTransport.onstatechange = () => {
     console.log('QuicTransport state changed.');
   };
@@ -47,7 +48,7 @@ function createRandomContentSessionId() {
 }
 
 async function createSendChannel() {
-  bidirectionalStream = await quicTransport.createSendStream();
+  bidirectionalStream = await quicChannel.createSendStream();
   updateConferenceStatus('Created send channel.');
 }
 

src/sdk/conference/client.js

@@ -16,7 +16,7 @@ import * as StreamModule from '../base/stream.js'
 import { Participant } from './participant.js'
 import { ConferenceInfo } from './info.js'
 import { ConferencePeerConnectionChannel, ConferenceQuicChannel } from './channel.js'
-import { ConferenceDataChannel } from './datachannel.js'
+import { QuicChannel } from './quicchannel.js'
 import { RemoteMixedStream, ActiveAudioInputChangeEvent, LayoutChangeEvent } from './mixedstream.js'
 import * as StreamUtilsModule from './streamutils.js'
 import { timingSafeEqual, createSign } from 'crypto';
@@ -113,9 +113,7 @@ export const ConferenceClient = function(config, signalingImpl) {
   const participants = new Map(); // Key is participant ID, value is a Participant object.
   const publishChannels = new Map(); // Key is MediaStream's ID, value is pc channel.
   const channels = new Map(); // Key is channel's internal ID, value is channel.
-  let dataChannel = null;
-  let dataChannelId = null;
-  let incomingDataChannels = new Map(); // TODO: Mutiplexing.
+  const quicTransportChannels = [];
 
   /**
    * @function onSignalingMessage
@@ -491,11 +489,11 @@ export const ConferenceClient = function(config, signalingImpl) {
    * @desc Create a bidirectional stream.
    * @return {Promise<void, Error>} Returned promise will be resolved with a bidirectional stream once stream is created.
    */
-  this.createDataStream = function() {
-    dataChannel = createDataChannel();
-    dataChannel.addEventListener('id', (messageEvent) => {
-      dataChannelId = messageEvent.message;
-    });
-    return dataChannel.createStream();
+  this.createQuicChannel = function() {
+    const quicChannel = new QuicChannel(
+      'quic-transport://jianjunz-nuc-ubuntu.sh.intel.com:7700/echo',
+      createSignalingForChannel());
+    quicTransportChannels.push(quicChannel);
+    return quicChannel;
   };
 };

src/sdk/conference/datachannel.js

@@ -0,0 +1,112 @@
+// Copyright (C) <2018> Intel Corporation
+//
+// SPDX-License-Identifier: Apache-2.0
+
+/* eslint-disable require-jsdoc */
+/* global Promise */
+
+'use strict';
+
+import Logger from '../base/logger.js';
+import {
+  EventDispatcher,
+  MessageEvent,
+} from '../base/event.js';
+
+/**
+ * @class QuicChannel
+ * @classDesc A channel for a QUIC transport between client and conference server.
+ * @hideconstructor
+ * @private
+ */
+export class QuicChannel extends EventDispatcher {
+  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);
+  }
+
+  /**
+   * @function onMessage
+   * @desc Received a message from conference portal. Defined in client-server protocol.
+   * @param {string} notification Notification type.
+   * @param {object} message Message received.
+   * @private
+   */
+  onMessage(notification, message) {
+    switch (notification) {
+      case 'progress':
+        if (message.status === 'soac') {
+          this._soacHandler(message.data);
+        } else if (message.status === 'ready') {
+          this._readyHandler();
+        } else if (message.status === 'error') {
+          this._errorHandler(message.data);
+        }
+        break;
+      case 'stream':
+        this._onStreamEvent(message);
+        break;
+      default:
+        Logger.warning('Unknown notification from MCU.');
+    }
+  }
+
+  async createSendStream(sessionId) {
+    Logger.info('Create stream.');
+    await this._quicTransport.ready;
+    const quicStream=this._quicTransport.createSendStream();
+    const publicationId=await this._initializePublication();
+    // Send publication ID to quicStream.
+  }
+
+  /**
+   * @function createStream
+   * @desc Create a bidirectional stream.
+   * @param {string} sessionId Publication or subscription ID.
+   * @private
+   */
+  createStream(sessionId) {
+    Logger.info('Create stream.');
+    if (this._quicTransport && this._quicTransport.state == 'connected') {
+      this._quicStreams.push(stream);
+      return Promise.resolve(stream);
+    }
+    if (!this._quicTransport) {
+      this._initialize();
+    }
+    return new Promise((resolve, reject) => {
+      this._createStreamPromise = {
+        resolve: resolve,
+        reject: reject
+      };
+    });
+  }
+
+  subscribe(stream) {
+    this._outgoing=false;
+    this._streamSubscribed = stream;
+    if (!this._quicTransport) {
+      this.createStream();
+    }
+  }
+
+  _readAndPrint(){
+    this._quicStreams[0].waitForReadable(5).then(()=>{
+      let data = new Uint8Array(this._quicStreams[0].readBufferedAmount);
+      this._quicStreams[0].readInto(data);
+      Logger.info('Read data: ' + data);
+      this._readAndPrint();
+    });
+  }
+
+  async _initializePublication() {
+    const data = await this._signaling.sendSignalingMessage('publish', {
+      media: null,
+      data: true
+    });
+    return data.id;
+  }
+};