Merge branch 'hotfix/2020.6.1' into master

shiguredo · Dec 22, 2020 · 7e2c611 · 7e2c611
2 parents 0a1b317 + 263c2f4
commit 7e2c611
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,12 @@
 - FIX
     - バグ修正
 
+## 2020.6.1
+- [FIX] simulcast 時に setParameters するための RTCRtpTransceiver 検索条件を変更する
+    - getUserMedia constraints の audio/video と Sora signaling の audio/video が一致しなかった場合に `DOMException: Read-only field modified in setParameters().` が発生する
+    - encodings が readonly な RTCRtpSender を持つ RTCRtpTransceiver を検索条件から除外して対応
+    - @yuitowest
+
 ## 2020.6.0
 - [UPDATE] e2ee 処理で signaling notify 時に metadata / authn_metadata どちらでも動作するように修正する
     - @yuitowest

diff --git a/dist/sora.js b/dist/sora.js
@@ -1,7 +1,7 @@
 /**
  * @sora/sdk
  * undefined
- * @version: 2020.6.0
+ * @version: 2020.6.1
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -867,7 +867,7 @@
 	        type: "connect",
 	        // @ts-ignore
 	        // eslint-disable-next-line @typescript-eslint/camelcase
-	        sora_client: `Sora JavaScript SDK ${'2020.6.0'}`,
+	        sora_client: `Sora JavaScript SDK ${'2020.6.1'}`,
 	        environment: window.navigator.userAgent,
 	        role: role,
 	        // eslint-disable-next-line @typescript-eslint/camelcase
@@ -1374,7 +1374,10 @@
 	        // simulcast の場合
 	        if (this.options.simulcast && (this.role === "upstream" || this.role === "sendrecv" || this.role === "sendonly")) {
 	            const transceiver = this.pc.getTransceivers().find((t) => {
-	                if (t.mid && 0 <= t.mid.indexOf("video") && t.sender.track !== null) {
+	                if (t.mid &&
+	                    0 <= t.mid.indexOf("video") &&
+	                    t.sender.track !== null &&
+	                    (t.currentDirection === null || t.currentDirection === "sendonly")) {
 	                    return t;
 	                }
 	            });
@@ -1768,7 +1771,7 @@
 	    },
 	    version: function () {
 	        // @ts-ignore
-	        return '2020.6.0';
+	        return '2020.6.1';
 	    },
 	};
 

diff --git a/dist/sora.min.js b/dist/sora.min.js
diff --git a/dist/sora.mjs b/dist/sora.mjs
@@ -1,7 +1,7 @@
 /**
  * @sora/sdk
  * undefined
- * @version: 2020.6.0
+ * @version: 2020.6.1
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -861,7 +861,7 @@ function createSignalingMessage(offerSDP, role, channelId, metadata, options) {
         type: "connect",
         // @ts-ignore
         // eslint-disable-next-line @typescript-eslint/camelcase
-        sora_client: `Sora JavaScript SDK ${'2020.6.0'}`,
+        sora_client: `Sora JavaScript SDK ${'2020.6.1'}`,
         environment: window.navigator.userAgent,
         role: role,
         // eslint-disable-next-line @typescript-eslint/camelcase
@@ -1368,7 +1368,10 @@ class ConnectionBase {
         // simulcast の場合
         if (this.options.simulcast && (this.role === "upstream" || this.role === "sendrecv" || this.role === "sendonly")) {
             const transceiver = this.pc.getTransceivers().find((t) => {
-                if (t.mid && 0 <= t.mid.indexOf("video") && t.sender.track !== null) {
+                if (t.mid &&
+                    0 <= t.mid.indexOf("video") &&
+                    t.sender.track !== null &&
+                    (t.currentDirection === null || t.currentDirection === "sendonly")) {
                     return t;
                 }
             });
@@ -1762,7 +1765,7 @@ var sora = {
     },
     version: function () {
         // @ts-ignore
-        return '2020.6.0';
+        return '2020.6.1';
     },
 };
 

diff --git a/lerna.json b/lerna.json
@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2020.6.0"
+  "version": "2020.6.1"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sora-js-sdk",
-  "version": "2020.6.0",
+  "version": "2020.6.1",
   "description": "WebRTC SFU Sora JavaScript SDK",
   "main": "dist/sora.min.js",
   "module": "dist/sora.mjs",

diff --git a/packages/sdk/package-lock.json b/packages/sdk/package-lock.json
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sora/sdk",
-  "version": "2020.6.0",
+  "version": "2020.6.1",
   "author": "Shiguredo Inc.",
   "license": "Apache-2.0",
   "main": "dist/sora.min.js",

diff --git a/packages/sdk/src/base.ts b/packages/sdk/src/base.ts
@@ -366,7 +366,12 @@ export default class ConnectionBase {
     // simulcast の場合
     if (this.options.simulcast && (this.role === "upstream" || this.role === "sendrecv" || this.role === "sendonly")) {
       const transceiver = this.pc.getTransceivers().find((t) => {
-        if (t.mid && 0 <= t.mid.indexOf("video") && t.sender.track !== null) {
+        if (
+          t.mid &&
+          0 <= t.mid.indexOf("video") &&
+          t.sender.track !== null &&
+          (t.currentDirection === null || t.currentDirection === "sendonly")
+        ) {
           return t;
         }
       });