Merge branch 'hotfix/2021.2.1'

shiguredo · Jan 27, 2022 · edb8114 · edb8114
2 parents 0ce0576 + e20a913
commit edb8114
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,10 @@
 - FIX
     - バグ修正
 
+## 2021.2.1
+- [FIX] type redirect 時のシグナリングで接続エラーになった場合、例外が発火しなかった問題を修正する
+    - @yuitowest
+
 ## 2021.2.0
 - [UPDATE] simulcast 時の transceiver 判定条件に offer.mids.video での分岐を追加する
     - @yuitowest

diff --git a/dist/sora.js b/dist/sora.js
@@ -1,7 +1,7 @@
 /**
  * sora-js-sdk
  * WebRTC SFU Sora JavaScript SDK
- * @version: 2021.2.0
+ * @version: 2021.2.1
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -1635,7 +1635,7 @@
 	    }
 	    const message = {
 	        type: "connect",
-	        sora_client: "Sora JavaScript SDK 2021.2.0",
+	        sora_client: "Sora JavaScript SDK 2021.2.1",
 	        environment: window.navigator.userAgent,
 	        role: role,
 	        channel_id: channelId,
@@ -2873,8 +2873,13 @@
 	                }
 	                else if (message.type == "redirect") {
 	                    this.writeWebSocketSignalingLog("onmessage-redirect", message);
-	                    const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
-	                    resolve(redirectMessage);
+	                    try {
+	                        const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
+	                        resolve(redirectMessage);
+	                    }
+	                    catch (error) {
+	                        reject(error);
+	                    }
 	                }
 	            };
 	            // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -4373,7 +4378,7 @@
 	     * @public
 	     */
 	    version: function () {
-	        return "2021.2.0";
+	        return "2021.2.1";
 	    },
 	    /**
 	     * WebRTC のユーティリティ関数群

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-js-sdk
  * WebRTC SFU Sora JavaScript SDK
- * @version: 2021.2.0
+ * @version: 2021.2.1
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -1629,7 +1629,7 @@ function createSignalingMessage(offerSDP, role, channelId, metadata, options, re
     }
     const message = {
         type: "connect",
-        sora_client: "Sora JavaScript SDK 2021.2.0",
+        sora_client: "Sora JavaScript SDK 2021.2.1",
         environment: window.navigator.userAgent,
         role: role,
         channel_id: channelId,
@@ -2867,8 +2867,13 @@ class ConnectionBase {
                 }
                 else if (message.type == "redirect") {
                     this.writeWebSocketSignalingLog("onmessage-redirect", message);
-                    const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
-                    resolve(redirectMessage);
+                    try {
+                        const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
+                        resolve(redirectMessage);
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
                 }
             };
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -4367,7 +4372,7 @@ var sora = {
      * @public
      */
     version: function () {
-        return "2021.2.0";
+        return "2021.2.1";
     },
     /**
      * WebRTC のユーティリティ関数群

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sora-js-sdk",
-  "version": "2021.2.0",
+  "version": "2021.2.1",
   "description": "WebRTC SFU Sora JavaScript SDK",
   "main": "dist/sora.min.js",
   "module": "dist/sora.mjs",

diff --git a/packages/sdk/src/base.ts b/packages/sdk/src/base.ts
@@ -1128,8 +1128,12 @@ export default class ConnectionBase {
           this.signalingOnMessageTypeSwitched(message);
         } else if (message.type == "redirect") {
           this.writeWebSocketSignalingLog("onmessage-redirect", message);
-          const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
-          resolve(redirectMessage);
+          try {
+            const redirectMessage = await this.signalingOnMessageTypeRedirect(message);
+            resolve(redirectMessage);
+          } catch (error) {
+            reject(error);
+          }
         }
       };
       // eslint-disable-next-line @typescript-eslint/no-floating-promises