Fix issues for publications after rebasing.

Author: jianjunz

source/agent/conference/stream.js

@@ -294,7 +294,6 @@ class ForwardStream extends Stream {
     }
   }
 
-<<<<<<< HEAD
   update(info) {
     let updateTrack;
     let updateParameters;
@@ -306,18 +305,6 @@ class ForwardStream extends Stream {
       updateTrack = this.media.tracks.find(t => t.type === 'video');
       updateParameters = info.video ? info.video.parameters : null;
     }
-=======
-  var forwardStreamInfo = {
-    id,
-    type: 'forward',
-    media: result,
-    // Indicates whether this is a data stream.
-    data: data,
-    info
-  };
-  return forwardStreamInfo;
-}
->>>>>>> Stream info has data property.
 
     if (updateParameters && updateParameters.resolution) {
       if (!updateTrack.parameters ||
@@ -343,7 +330,7 @@ class MixedStream extends Stream {
       audio: Object.assign({}, view.audio.format),
       video: Object.assign({}, view.video.format, view.video.parameters)
     };
-    super(id, 'mixed', media, info);
+    super(id, 'mixed', media, null, info);
   }
 }
 

source/portal/client.js

@@ -7,6 +7,7 @@
 var log = require('./logger').logger.getLogger('Client');
 var ReqType = require('./versions/requestType');
 var dataAdapter = require('./versions/portalDataAdapter');
+const { v4: uuid } = require('uuid');
 
 var idPattern = /^[0-9a-zA-Z\-]+$/;
 function isValidIdString(str) {
@@ -61,6 +62,10 @@ var Client = function(clientId, sigConnection, portal, version) {
     }
   };
 
+  const uuidWithoutDash = function() {
+    return uuid().replace(/-/g, '');
+  };
+
   const listenAt = (socket) => {
     socket.on('text', function(textReq, callback) {
       if(!that.inRoom){
@@ -81,15 +86,21 @@ var Client = function(clientId, sigConnection, portal, version) {
       }
 
       //FIXME: move the id assignment to conference
-      var stream_id = Math.round(Math.random() * 1000000000000000000) + '';
+      var stream_id = uuidWithoutDash();
       var transportId;
       return adapter.translateReq(ReqType.Pub, pubReq)
         .then((req) => {
-          req.type = 'webrtc';//FIXME: For backend compatibility with v3.4 clients.
-          if (!req.transportId) {
-            req.transportId = stream_id;
+          if (req.transport && req.transport.type == 'quic') {
+            req.type = 'quic';
+            if (!req.transport.id) {
+                req.transport.id = uuidWithoutDash();
+            }
+            transportId = req.transport.id;
+          } else {
+            req.type = 'webrtc'; //FIXME: For backend compatibility with v3.4 clients.
+            req.transport = { type : 'webrtc', id : stream_id };
           }
-          transportId = req.transportId;
+          transportId = req.transport.id;
           return portal.publish(clientId, stream_id, req);
         }).then((result) => {
           safeCall(callback, 'ok', {id: stream_id, transportId});

source/portal/versions/requestFormatV1-2.js

@@ -39,7 +39,15 @@ const PublicationRequest = {
       properties: {
         'media': { $ref: '#/definitions/WebRTCMediaOptions' },
         'attributes': { type: 'object' },
-        'transportId': { type: 'string' }
+        'data': {type: 'boolean'},
+        'transport': {
+          type: 'object',
+          properties: {
+            'type': {type: 'string'},
+            'id': {type: 'string'},
+          },
+          additionalProperties: false,
+        },
       },
       additionalProperties: false,
       required: ['media']
@@ -48,7 +56,7 @@ const PublicationRequest = {
 
   definitions: {
     'WebRTCMediaOptions': {
-      type: 'object',
+      type: ['object', 'null'],
       properties: {
         'tracks': {
           type: 'array',
@@ -75,7 +83,15 @@ const SubscriptionRequest = {
       type: 'object',
       properties: {
         'media': { $ref: '#/definitions/MediaSubOptions' },
-        'transportId': { type: 'string' }
+        'transport': {
+          type: 'object',
+          properties: {
+            'type': {type: 'string'},
+            'id': {type: 'string'},
+          },
+          additionalProperties: false,
+        },
+        'data': {type: 'boolean'}
       },
       additionalProperties: false,
       required: ['media']