Fix subscribe method after rebasing.

Author: jianjunz

source/agent/conference/conference.js

@@ -739,7 +739,6 @@ var Conference = function (rpcClient, selfRpcId) {
 
     const isAudioPubPermitted = !!participants[info.owner].isPublishPermitted('audio');
     const subArgs = subscription.toRoomCtrlSubArgs();
-    const subInfo = { transport : transport, media : media, data : dataSpec };
     const subs = subArgs.map(subArg => new Promise((resolve, reject) => {
         if (roomController) {
             const subInfo = { transport : transport, media : subArg.media, data : subArg.data };
@@ -948,7 +947,8 @@ var Conference = function (rpcClient, selfRpcId) {
     }
     const rtcPubInfo = {
       type: pubInfo.type,
-      transportId: pubInfo.transportId,
+      transport: pubInfo.transport,
+      transportId: pubInfo.transport.id,
       tracks: pubInfo.media.tracks,
       legacy: pubInfo.legacy,
       data: pubInfo.data
@@ -962,8 +962,10 @@ var Conference = function (rpcClient, selfRpcId) {
     }
     const rtcSubInfo = {
       type: subDesc.type,
-      transportId: subDesc.transportId,
+      transport: subDesc.transport,
+      transportId: subDesc.transport.id,
       tracks: subDesc.media.tracks,
+      data: subDesc.data,
       legacy: subDesc.legacy,
     };
     return rtcSubInfo;
@@ -1272,30 +1274,32 @@ var Conference = function (rpcClient, selfRpcId) {
       });
     } else {
       var format_preference;
-      if (subDesc.type === 'webrtc') {
+      if (subDesc.type === 'webrtc' || subDesc.type === 'quic') {
         const rtcSubInfo = translateRtcSubIfNeeded(subDesc);
-        // Set formatPreference
-        rtcSubInfo.tracks.forEach(track => {
-          const streamId = streams[track.from]? track.from : trackOwners[track.from];
-          const source = getStreamTrack(track.from, track.type);
-          const formatPreference = {};
-          if (streams[streamId].type === 'forward') {
-            formatPreference.preferred = source.format;
-            source.optional && source.optional.format && (formatPreference.optional = source.optional.format);
-          } else {
-            formatPreference.optional = [source.format];
-            source.optional && source.optional.format && (formatPreference.optional = formatPreference.optional.concat(source.optional.format));
-          }
-          track.formatPreference = formatPreference;
-        });
+        if (rtcSubInfo.tracks){
+          // Set formatPreference
+          rtcSubInfo.tracks.forEach(track => {
+            const streamId = streams[track.from]? track.from : trackOwners[track.from];
+            const source = getStreamTrack(track.from, track.type);
+            const formatPreference = {};
+            if (streams[streamId].type === 'forward') {
+              formatPreference.preferred = source.format;
+              source.optional && source.optional.format && (formatPreference.optional = source.optional.format);
+            } else {
+              formatPreference.optional = [source.format];
+              source.optional && source.optional.format && (formatPreference.optional = formatPreference.optional.concat(source.optional.format));
+            }
+            track.formatPreference = formatPreference;
+          });
+        }
 
         initiateSubscription(subscriptionId, subDesc, {owner: participantId, type: subDesc.type});
         return rtcController.initiate(participantId, subscriptionId, 'out', participants[participantId].getOrigin(), rtcSubInfo)
         .then((result) => {
-          const releasedSource = rtcSubInfo.tracks.find(track => {
-            const sourceStreamId = trackOwners[track.from] || track.from;
-            return !streams[sourceStreamId];
-          });
+          const releasedSource = rtcSubInfo.tracks ? rtcSubInfo.tracks.find(track => {
+              const sourceStreamId = trackOwners[track.from] || track.from;
+              return !streams[sourceStreamId];
+          }) : undefined;
           if (releasedSource) {
             rtcController.terminate(participantId, subscriptionId, 'Participant terminate');
             return Promise.reject('Target audio/video stream early released');
@@ -1671,11 +1675,11 @@ var Conference = function (rpcClient, selfRpcId) {
 
     return removeSubscription(subscriptionId)
       .then((result) => {
-        return addSubscription(subscriptionId, oldSub.locality, newSubMedia, oldSub.info);
+        return addSubscription(subscriptionId, oldSub.locality, newSubMedia, oldSub.data, oldSub.info);
       }).catch((err) => {
         log.info('Update subscription failed:', err.message ? err.message : err);
         log.info('And is recovering the previous subscription:', JSON.stringify(old_su));
-        return addSubscription(subscriptionId, oldSub.locality, oldSub.media, oldSub.info)
+        return addSubscription(subscriptionId, oldSub.locality, oldSub.media, oldSub.data, oldSub.info)
           .then(() => {
             return Promise.reject('Update subscription failed');
           }, () => {

source/agent/conference/stream.js

@@ -224,6 +224,7 @@ class Stream {
           rid: track.rid,
         }))
       },
+      data: this.data,
       info: (this.type === 'mixed') ? this.info : forwardInfo,
     };
     return portalFormat;

source/agent/conference/subscription.js

@@ -186,7 +186,8 @@ class Subscription {
           id: track.id, // Use track ID for webrtc publication
           locality: this.locality,
           type: this.info.type,
-          media
+          media,
+          data: this.data
         };
       });
     } else {

source/agent/quic/index.js

@@ -237,7 +237,6 @@ module.exports = function (rpcClient, selfRpcId, parentRpcId, clusterWorkerIP) {
                     conn.connect(options);//FIXME: May FAIL here!!!!!
                 break;
             case 'quic':
-                quicTransportServer.addTransportId(options.transport.id);
                 conn = createStreamPipeline(connectionId, 'out', options, callback);
                 const stream = quicTransportServer.createSendStream(options.transport.id, connectionId);
                 conn.quicStream(stream);

source/portal/client.js

@@ -99,6 +99,9 @@ var Client = function(clientId, sigConnection, portal, version) {
           } else {
             req.type = 'webrtc'; //FIXME: For backend compatibility with v3.4 clients.
             req.transport = { type : 'webrtc', id : stream_id };
+            if (req.transportId) {
+                req.transport.id = req.transportId;
+            }
           }
           transportId = req.transport.id;
           return portal.publish(clientId, stream_id, req);
@@ -139,15 +142,24 @@ var Client = function(clientId, sigConnection, portal, version) {
       }
 
       //FIXME: move the id assignment to conference
-      var subscription_id = Math.round(Math.random() * 1000000000000000000) + '';
+      var subscription_id = uuidWithoutDash();
       var transportId;
       return adapter.translateReq(ReqType.Sub, subReq)
         .then((req) => {
-          req.type = 'webrtc';//FIXME: For backend compatibility with v3.4 clients.
-          if (!req.transportId) {
-            req.transportId = subscription_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 : subscription_id };
+            if (req.transportId) {
+              req.transport.id = req.transportId;
+            }
           }
-          transportId = req.transportId;
+          transportId = req.transport.id;
           return portal.subscribe(clientId, subscription_id, req);
         }).then((result) => {
           safeCall(callback, 'ok', {id: subscription_id, transportId});

source/portal/versions/requestFormatV1-2.js

@@ -91,7 +91,7 @@ const SubscriptionRequest = {
           },
           additionalProperties: false,
         },
-        'data': {type: 'boolean'}
+        'data': { $ref: '#/definitions/DataSubOptions' },
       },
       additionalProperties: false,
       required: ['media']
@@ -100,7 +100,7 @@ const SubscriptionRequest = {
 
   definitions: {
     'MediaSubOptions': {
-      type: 'object',
+      type: ['object', 'null'],
       properties: {
         'tracks': {
           type: 'array',
@@ -125,6 +125,15 @@ const SubscriptionRequest = {
       required: ['tracks']
     },
 
+    'DataSubOptions': {
+      type: 'object',
+      properties: {
+        'from': {type: 'string'}
+      },
+      additionalProperties: false,
+      required: ['from']
+    },
+
     'AudioFormat': {
       type: 'object',
       properties: {