Fix ESLint errors.

Author: jianjunz

src/sdk/conference/channel.js

@@ -800,100 +800,3 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
     return !!param.codec;
   }
 }
-export class ConferenceQuicChannel extends EventDispatcher {
-  // TODO: share code with ConferencePeerConnectionChannel.
-
-  constructor(config, signaling) {
-    super();
-    if (typeof RTCIceTransport !== 'function' || typeof RTCQuicTransport !==
-      'function') {
-      throw new TypeError(
-        'RTCIceTransport or RTCQuicTransport is not supported. Please use WebRTC connection.'
-      )
-    }
-    this._signaling = signaling;
-    this._iceTransport = null;
-    this._quicTransport = null;
-    this._subscribedStream = null;
-    this._subscribePromise = null;
-  }
-
-  subscribe(stream, options) {
-    this._subscribedStream = stream;
-    this._iceTransport = new RTCIceTransport();
-    this._iceTransport.onicecandidate=(event)=>{
-      const candidate=event.candidate;
-      this._signaling.sendSignalingMessage('soac', {
-        id: this._internalId,
-        signaling: {
-          type: 'candidate',
-          candidate: {
-            candidate: 'a=' + candidate.candidate,
-            sdpMid: candidate.sdpMid,
-            sdpMLineIndex: candidate.sdpMLineIndex
-          }
-        }
-      });
-    };
-    const mediaOptions=Object.create({});
-    mediaOptions.audio = {};
-    mediaOptions.audio.from = stream.id;
-    mediaOptions.video = {};
-    mediaOptions.video.from = stream.id;
-    this._signaling.sendSignalingMessage('subscribe', {
-      transport: {protocol:'quic'},
-      media:mediaOptions
-    }).then((data) => {
-      const messageEvent = new MessageEvent('id', {
-        message: data.id,
-        origin: this._remoteId
-      });
-      this.dispatchEvent(messageEvent);
-      this._internalId = data.id;
-      this._signaling.sendSignalingMessage('soac', {
-        id: this._internalId,
-        signaling: {
-          type: 'ice-parameters',
-          parameters: this._iceTransport.getLocalParameters()
-        }
-      });
-    });
-    return new Promise((resolve, reject) => {
-      this._subscribePromise = { resolve: resolve, reject: reject };
-    });
-  }
-
-  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.');
-    }
-  }
-
-  _soacHandler(data) {
-    if (data.type === 'ice-parameters') {
-      Logger.debug('Username: ' + data.parameters.usernameFragment +
-        ', password:' + data.parameters.password);
-      this._iceTransport.start(data.parameters);
-      this._iceTransport.gather({gatherPolicy:'all', iceServers:[]});
-    } else if (data.type === 'candidate') {
-      const candidate=new RTCIceCandidate({
-        candidate: data.candidate.candidate,
-        sdpMid: data.candidate.sdpMid,
-        sdpMLineIndex: data.candidate.sdpMLineIndex
-      });
-      this._iceTransport.addRemoteCandidate(candidate);
-    }
-  }
-}

src/sdk/conference/client.js

@@ -6,19 +6,20 @@
 
 'use strict';
 
-import * as EventModule from '../base/event.js'
-import { SioSignaling as Signaling } from './signaling.js'
-import Logger from '../base/logger.js'
-import { Base64 } from '../base/base64.js'
-import { ConferenceError } from './error.js'
-import * as Utils from '../base/utils.js'
-import * as StreamModule from '../base/stream.js'
-import { Participant } from './participant.js'
-import { ConferenceInfo } from './info.js'
-import { ConferencePeerConnectionChannel } from './channel.js'
-import { QuicConnection } from './quicconnection.js'
-import { RemoteMixedStream, ActiveAudioInputChangeEvent, LayoutChangeEvent } from './mixedstream.js'
-import * as StreamUtilsModule from './streamutils.js'
+import * as EventModule from '../base/event.js';
+import {SioSignaling as Signaling} from './signaling.js';
+import Logger from '../base/logger.js';
+import {Base64} from '../base/base64.js';
+import {ConferenceError} from './error.js';
+import * as Utils from '../base/utils.js';
+import * as StreamModule from '../base/stream.js';
+import {Participant} from './participant.js';
+import {ConferenceInfo} from './info.js';
+import {ConferencePeerConnectionChannel} from './channel.js';
+import {QuicConnection} from './quicconnection.js';
+import {RemoteMixedStream, ActiveAudioInputChangeEvent, LayoutChangeEvent}
+  from './mixedstream.js';
+import * as StreamUtilsModule from './streamutils.js';
 
 const SignalingState = {
   READY: 1,
@@ -311,7 +312,8 @@ export const ConferenceClient = function(config, signalingImpl) {
   // eslint-disable-next-line require-jsdoc
   function createPeerConnectionChannel(transport) {
     const signalingForChannel = createSignalingForChannel();
-    const channel = new ConferencePeerConnectionChannel(config, signalingForChannel);
+    const channel =
+        new ConferencePeerConnectionChannel(config, signalingForChannel);
     channel.addEventListener('id', (messageEvent) => {
       channels.set(messageEvent.message, channel);
     });
@@ -324,11 +326,6 @@ export const ConferenceClient = function(config, signalingImpl) {
     remoteStreams.clear();
   }
 
-  function createDataChannel() {
-    const signalingForChannel = createSignalingForChannel();
-    return new ConferenceDataChannel(config, signalingForChannel);
-  }
-
   Object.defineProperty(this, 'info', {
     configurable: false,
     get: () => {
@@ -447,8 +444,8 @@ export const ConferenceClient = function(config, signalingImpl) {
     if (stream.source.data) {
       if (stream.source.audio || stream.source.video) {
         return Promise.reject(new TypeError(
-          'Invalid source info. A remote stream is either a data stream or a media stream.'
-          ));
+            'Invalid source info. A remote stream is either a data stream or ' +
+            'a media stream.'));
       }
       return quicTransportChannel.subscribe(stream);
       // TODO

src/sdk/conference/quicconnection.js

@@ -3,21 +3,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable require-jsdoc */
-/* global Promise, Map, QuicTransport, Uint8Array */
+/* global Promise, Map, QuicTransport, Uint8Array, TextEncoder */
 
 'use strict';
 
 import Logger from '../base/logger.js';
-import {
-  EventDispatcher,
-  MessageEvent,
-} from '../base/event.js';
+import {EventDispatcher} from '../base/event.js';
 import {Publication} from '../base/publication.js';
 import {Subscription} from './subscription.js';
 
 /**
  * @class QuicConnection
- * @classDesc A channel for a QUIC transport between client and conference server.
+ * @classDesc A channel for a QUIC transport between client and conference
+ * server.
  * @hideconstructor
  * @private
  */
@@ -35,7 +33,8 @@ export class QuicConnection extends EventDispatcher {
 
   /**
    * @function onMessage
-   * @desc Received a message from conference portal. Defined in client-server protocol.
+   * @desc Received a message from conference portal. Defined in client-server
+   * protocol.
    * @param {string} notification Notification type.
    * @param {object} message Message received.
    * @private
@@ -62,21 +61,18 @@ export class QuicConnection extends EventDispatcher {
   async _init() {
     const receiveStreamReader =
         this._quicTransport.receiveStreams().getReader();
-    Logger.info('Reader: '+receiveStreamReader);
-    while (true) {
-      const {
-        value: receiveStream,
-        done: readingReceiveStreamsDone
-      } = await receiveStreamReader.read();
+    Logger.info('Reader: ' + receiveStreamReader);
+    let receivingDone = false;
+    while (!receivingDone) {
+      const {value: receiveStream, done: readingReceiveStreamsDone} =
+          await receiveStreamReader.read();
       Logger.info('New stream received');
       if (readingReceiveStreamsDone) {
+        receivingDone = true;
         break;
       }
       const chunkReader = receiveStream.readable.getReader();
-      const {
-        value: uuid,
-        done: readingChunksDone
-      } = await chunkReader.read();
+      const {value: uuid, done: readingChunksDone} = await chunkReader.read();
       if (readingChunksDone) {
         Logger.error('Stream closed unexpectedly.');
         return;
@@ -129,7 +125,7 @@ export class QuicConnection extends EventDispatcher {
     // 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();
+    const writer = quicStream.writable.getWriter();
     await writer.ready;
     writer.write(this._uuidToUint8Array(publicationId));
     writer.releaseLock();
@@ -171,13 +167,12 @@ export class QuicConnection extends EventDispatcher {
     for (let i = 0; i < 16; i++) {
       uuidArray[i] = parseInt(uuidString.substring(i * 2, i * 2 + 2), 16);
     }
-    console.log(uuidArray);
     return uuidArray;
   }
 
   _uint8ArrayToUuid(uuidBytes) {
     let s = '';
-    for (let hex of uuidBytes) {
+    for (const hex of uuidBytes) {
       const str = hex.toString(16);
       s += str.padStart(2, '0');
     }
@@ -212,7 +207,7 @@ export class QuicConnection extends EventDispatcher {
 
   _readAndPrint() {
     this._quicStreams[0].waitForReadable(5).then(() => {
-      let data = new Uint8Array(this._quicStreams[0].readBufferedAmount);
+      const data = new Uint8Array(this._quicStreams[0].readBufferedAmount);
       this._quicStreams[0].readInto(data);
       Logger.info('Read data: ' + data);
       this._readAndPrint();
@@ -245,6 +240,7 @@ export class QuicConnection extends EventDispatcher {
   }
 
   _readyHandler() {
-    // Ready message from server is useless for QuicStream since QuicStream has its own status. Do nothing here.
+    // Ready message from server is useless for QuicStream since QuicStream has
+    // its own status. Do nothing here.
   }
-};
+}