Fix single pc client failure after 721 merged (#733)

starwarfan · web-flow · commit ca2faecddc27 · 2020-11-30T16:55:57.000+08:00
diff --git a/source/portal/client.js b/source/portal/client.js
@@ -98,9 +98,8 @@ var Client = function(clientId, sigConnection, portal, version) {
             transportId = req.transport.id;
           } 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;
+            if (!req.transport || !req.transport.id) {
+              req.transport = { type : 'webrtc', id : stream_id };
             }
           }
           transportId = req.transport.id;
@@ -154,9 +153,8 @@ var Client = function(clientId, sigConnection, portal, version) {
             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;
+            if (!req.transport || !req.transport.id) {
+              req.transport = { type : 'webrtc', id : subscription_id };
             }
           }
           transportId = req.transport.id;

Original file line number	Diff line number	Diff line change
`@@ -98,9 +98,8 @@ var Client = function(clientId, sigConnection, portal, version) {`
`98`	`98`	`transportId = req.transport.id;`
`99`	`99`	`} else {`
`100`	`100`	`req.type = 'webrtc'; //FIXME: For backend compatibility with v3.4 clients.`
`101`		`- req.transport = { type : 'webrtc', id : stream_id };`
`102`		`- if (req.transportId) {`
`103`		`- req.transport.id = req.transportId;`
	`101`	`+ if (!req.transport \|\| !req.transport.id) {`
	`102`	`+ req.transport = { type : 'webrtc', id : stream_id };`
`104`	`103`	`}`
`105`	`104`	`}`
`106`	`105`	`transportId = req.transport.id;`
`@@ -154,9 +153,8 @@ var Client = function(clientId, sigConnection, portal, version) {`
`154`	`153`	`transportId = req.transport.id;`
`155`	`154`	`} else {`
`156`	`155`	`req.type = 'webrtc'; //FIXME: For backend compatibility with v3.4 clients.`
`157`		`- req.transport = { type : 'webrtc', id : subscription_id };`
`158`		`- if (req.transportId) {`
`159`		`- req.transport.id = req.transportId;`
	`156`	`+ if (!req.transport \|\| !req.transport.id) {`
	`157`	`+ req.transport = { type : 'webrtc', id : subscription_id };`
`160`	`158`	`}`
`161`	`159`	`}`
`162`	`160`	`transportId = req.transport.id;`