Merge branch 'hotfix/2021.2.2'

shiguredo · Feb 2, 2022 · b3c3b08 · b3c3b08
2 parents edb8114 + 280553b
commit b3c3b08
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 40 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,12 @@
 - FIX
     - バグ修正
 
+## 2021.2.2
+- [FIX] fflate package のバージョンを 0.7.1 から 0.7.3 に更新する
+    - 0.7.3 https://github.com/101arrowz/fflate/blob/master/CHANGELOG.md#073
+    - 0.7.2 https://github.com/101arrowz/fflate/blob/master/CHANGELOG.md#072
+    - @yuitowest
+
 ## 2021.2.1
 - [FIX] type redirect 時のシグナリングで接続エラーになった場合、例外が発火しなかった問題を修正する
     - @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.1
+ * @version: 2021.2.2
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -828,8 +828,10 @@
 	    // u16 "map": index -> # of codes with bit length = index
 	    var l = new u16(mb);
 	    // length of cd must be 288 (total # of codes)
-	    for (; i < s; ++i)
-	        ++l[cd[i] - 1];
+	    for (; i < s; ++i) {
+	        if (cd[i])
+	            ++l[cd[i] - 1];
+	    }
 	    // u16 "map": index -> minimum code for bit length = index
 	    var le = new u16(mb);
 	    for (i = 0; i < mb; ++i) {
@@ -915,7 +917,7 @@
 	    if (e == null || e > v.length)
 	        e = v.length;
 	    // can't use .constructor in case user-supplied
-	    var n = new (v instanceof u16 ? u16 : v instanceof u32 ? u32 : u8)(e - s);
+	    var n = new (v.BYTES_PER_ELEMENT == 2 ? u16 : v.BYTES_PER_ELEMENT == 4 ? u32 : u8)(e - s);
 	    n.set(v.subarray(s, e));
 	    return n;
 	};
@@ -1363,15 +1365,11 @@
 	        for (var i = 0; i <= s; i += 65535) {
 	            // end
 	            var e = i + 65535;
-	            if (e < s) {
-	                // write full block
-	                pos = wfblk(w, pos, dat.subarray(i, e));
-	            }
-	            else {
+	            if (e >= s) {
 	                // write final block
-	                w[i] = lst;
-	                pos = wfblk(w, pos, dat.subarray(i, s));
+	                w[pos >> 3] = lst;
 	            }
+	            pos = wfblk(w, pos + 1, dat.subarray(i, e));
 	        }
 	    }
 	    else {
@@ -1635,7 +1633,7 @@
 	    }
 	    const message = {
 	        type: "connect",
-	        sora_client: "Sora JavaScript SDK 2021.2.1",
+	        sora_client: "Sora JavaScript SDK 2021.2.2",
 	        environment: window.navigator.userAgent,
 	        role: role,
 	        channel_id: channelId,
@@ -4378,7 +4376,7 @@
 	     * @public
 	     */
 	    version: function () {
-	        return "2021.2.1";
+	        return "2021.2.2";
 	    },
 	    /**
 	     * WebRTC のユーティリティ関数群

diff --git a/dist/sora.min.js b/dist/sora.min.js
diff --git a/dist/sora.min.js.map b/dist/sora.min.js.map
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.1
+ * @version: 2021.2.2
  * @author: Shiguredo Inc.
  * @license: Apache-2.0
  **/
@@ -822,8 +822,10 @@ var hMap = (function (cd, mb, r) {
     // u16 "map": index -> # of codes with bit length = index
     var l = new u16(mb);
     // length of cd must be 288 (total # of codes)
-    for (; i < s; ++i)
-        ++l[cd[i] - 1];
+    for (; i < s; ++i) {
+        if (cd[i])
+            ++l[cd[i] - 1];
+    }
     // u16 "map": index -> minimum code for bit length = index
     var le = new u16(mb);
     for (i = 0; i < mb; ++i) {
@@ -909,7 +911,7 @@ var slc = function (v, s, e) {
     if (e == null || e > v.length)
         e = v.length;
     // can't use .constructor in case user-supplied
-    var n = new (v instanceof u16 ? u16 : v instanceof u32 ? u32 : u8)(e - s);
+    var n = new (v.BYTES_PER_ELEMENT == 2 ? u16 : v.BYTES_PER_ELEMENT == 4 ? u32 : u8)(e - s);
     n.set(v.subarray(s, e));
     return n;
 };
@@ -1357,15 +1359,11 @@ var dflt = function (dat, lvl, plvl, pre, post, lst) {
         for (var i = 0; i <= s; i += 65535) {
             // end
             var e = i + 65535;
-            if (e < s) {
-                // write full block
-                pos = wfblk(w, pos, dat.subarray(i, e));
-            }
-            else {
+            if (e >= s) {
                 // write final block
-                w[i] = lst;
-                pos = wfblk(w, pos, dat.subarray(i, s));
+                w[pos >> 3] = lst;
             }
+            pos = wfblk(w, pos + 1, dat.subarray(i, e));
         }
     }
     else {
@@ -1629,7 +1627,7 @@ function createSignalingMessage(offerSDP, role, channelId, metadata, options, re
     }
     const message = {
         type: "connect",
-        sora_client: "Sora JavaScript SDK 2021.2.1",
+        sora_client: "Sora JavaScript SDK 2021.2.2",
         environment: window.navigator.userAgent,
         role: role,
         channel_id: channelId,
@@ -4372,7 +4370,7 @@ var sora = {
      * @public
      */
     version: function () {
-        return "2021.2.1";
+        return "2021.2.2";
     },
     /**
      * WebRTC のユーティリティ関数群

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

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@sora/e2ee": "^2021.1.0",
-    "fflate": "^0.7.1",
+    "fflate": "^0.7.3",
     "rollup-plugin-terser": "^7.0.2"
   }
 }