@besovideo/webrtc-player 0.8.61 → 0.8.63

package/dist/main.browser.js

@@ -117,7 +117,7 @@ var bvPlayerCore = (() => {
   var define_processenv_default;
   var init_define_processenv = __esm({
     "<define:processenv>"() {
-      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.61", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.62", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -10354,7 +10354,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   }
   function combinaWebM(webM1, webM2) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a, _b, _c, _d, _e;
       const stream0 = webM1 ? yield GetDemuxer(webM1) : webM1;
       const stream1 = webM2 ? yield GetDemuxer(webM2) : webM2;
       let audio;
@@ -10362,13 +10362,13 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       if ((stream0 == null ? void 0 : stream0.tracks[1].type) == "audio") {
         audio = stream0;
       }
-      if ((stream1 == null ? void 0 : stream1.tracks[1].type) == "audio") {
+      if (((_a = stream1 == null ? void 0 : stream1.tracks[1]) == null ? void 0 : _a.type) == "audio") {
         audio = stream1;
       }
-      if ((stream0 == null ? void 0 : stream0.tracks[1].type) == "video") {
+      if (((_b = stream0 == null ? void 0 : stream0.tracks[1]) == null ? void 0 : _b.type) == "video") {
         video = stream0;
       }
-      if ((stream1 == null ? void 0 : stream1.tracks[1].type) == "video") {
+      if (((_c = stream1 == null ? void 0 : stream1.tracks[1]) == null ? void 0 : _c.type) == "video") {
         video = stream1;
       }
       const videoTrackInfo = video == null ? void 0 : video.tracks[1];
@@ -10393,22 +10393,30 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
         streaming: false
       }));
       const parser = SimpleBlockParser();
-      video == null ? void 0 : video.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
+      video == null ? void 0 : video.elements.filter((item) => item.type == "b" || item.name == "BlockGroup").forEach((simpleBlock) => {
+        if (simpleBlock.name == "BlockGroup") {
+          const tempBlock = simpleBlock.childs.find((item) => item.type == "b");
+          if (tempBlock) {
+            simpleBlock = tempBlock;
+          }
+        }
         const [timestamp, data, bKeyFrame] = parser.parse(simpleBlock, 0);
         muxer.addVideoChunkRaw(data, bKeyFrame ? "key" : "delta", timestamp);
       });
-      const audioCodecPrivate = (_b = (_a = audio == null ? void 0 : audio.elements.find((item) => item.name == "Tracks")) == null ? void 0 : _a.childs[0].childs.find((item) => item.name == "CodecPrivate")) == null ? void 0 : _b.data;
-      const config = {
-        decoderConfig: {
-          sampleRate: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).SamplingFrequency,
-          numberOfChannels: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).Channels,
-          description: audioCodecPrivate
-        }
-      };
-      audio == null ? void 0 : audio.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
-        const [timestamp, data] = parser.parse(simpleBlock, 1);
-        muxer.addAudioChunkRaw(data, "key", timestamp, config);
-      });
+      if (audio) {
+        const audioCodecPrivate = (_e = (_d = audio == null ? void 0 : audio.elements.find((item) => item.name == "Tracks")) == null ? void 0 : _d.childs[0].childs.find((item) => item.name == "CodecPrivate")) == null ? void 0 : _e.data;
+        const config = {
+          decoderConfig: {
+            sampleRate: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).SamplingFrequency,
+            numberOfChannels: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).Channels,
+            description: audioCodecPrivate
+          }
+        };
+        audio == null ? void 0 : audio.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
+          const [timestamp, data] = parser.parse(simpleBlock, 1);
+          muxer.addAudioChunkRaw(data, "key", timestamp, config);
+        });
+      }
       muxer.finalize();
       return new Blob([muxer.target.buffer]);
     });
@@ -10448,13 +10456,17 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     return mediaRecorder;
   };
   var createRecord = (_mediaStream, fileName) => {
-    const mediaStreams = _mediaStream.getTracks().map((item) => {
+    const tempMediaStreams = _mediaStream.getTracks().map((item) => {
       const mediaStream2 = new MediaStream([item]);
       item.addEventListener("ended", () => {
         mediaStream2.getTracks().forEach((item2) => item2.stop());
       });
       return new MediaStream([item]);
     });
+    const mediaStreams = [
+      ...tempMediaStreams.filter((item) => item.getVideoTracks().length > 0),
+      ...tempMediaStreams.filter((item) => item.getAudioTracks().length > 0)
+    ];
     const mediaStream = mediaStreams[0];
     let recordedChunks = [];
     const szWebM = [];
@@ -12032,7 +12044,21 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
         if (targetReceivers.length > 0) {
           report = yield targetReceivers[0].getStats();
         }
-        return report ? {
+        const isTargeReportExist = {
+          codec: false,
+          "inbound-rtp": false
+        };
+        Object.keys(isTargeReportExist).forEach((typeStats) => {
+          if (report) {
+            report.forEach((item) => {
+              if (item.type == typeStats) {
+                isTargeReportExist[typeStats] = true;
+              }
+            });
+          }
+        });
+        const invalid = Object.keys(isTargeReportExist).findIndex((item) => !isTargeReportExist[item]) >= 0;
+        return report && !invalid ? {
           codec: __privateMethod(this, _getLastStatsByType, getLastStatsByType_fn).call(this, report, "codec", {}).now,
           rtp: __privateMethod(this, _getLastStatsByType, getLastStatsByType_fn).call(this, report, "inbound-rtp", {
             bytesReceived: 0,
@@ -19248,7 +19274,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               player.mikeBtn.type = this.protocol;
             }
           } catch (e) {
-            if (signal.aborted) {
+            if (signal.aborted && e != "protocol == ws-bvrtc" && type != "auto") {
               player.mask.visible = true;
               player.mask.text = t("connect-failed");
               onConnectedFailed && onConnectedFailed();
@@ -19542,7 +19568,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
         if (this.protocol == protocol)
           return;
         this.close().then(() => {
-          this.open(currentMuted, protocol);
+          setTimeout(() => {
+            this.open(currentMuted, protocol);
+          }, 500);
         });
       },
       setToken: (newToken) => {

package/dist/main.es.js

@@ -111,7 +111,7 @@ var __async = (__this, __arguments, generator) => {
 var define_processenv_default;
 var init_define_processenv = __esm({
   "<define:processenv>"() {
-    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.61", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.62", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -10340,7 +10340,7 @@ function SimpleBlockParser() {
 }
 function combinaWebM(webM1, webM2) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const stream0 = webM1 ? yield GetDemuxer(webM1) : webM1;
     const stream1 = webM2 ? yield GetDemuxer(webM2) : webM2;
     let audio;
@@ -10348,13 +10348,13 @@ function combinaWebM(webM1, webM2) {
     if ((stream0 == null ? void 0 : stream0.tracks[1].type) == "audio") {
       audio = stream0;
     }
-    if ((stream1 == null ? void 0 : stream1.tracks[1].type) == "audio") {
+    if (((_a = stream1 == null ? void 0 : stream1.tracks[1]) == null ? void 0 : _a.type) == "audio") {
       audio = stream1;
     }
-    if ((stream0 == null ? void 0 : stream0.tracks[1].type) == "video") {
+    if (((_b = stream0 == null ? void 0 : stream0.tracks[1]) == null ? void 0 : _b.type) == "video") {
       video = stream0;
     }
-    if ((stream1 == null ? void 0 : stream1.tracks[1].type) == "video") {
+    if (((_c = stream1 == null ? void 0 : stream1.tracks[1]) == null ? void 0 : _c.type) == "video") {
       video = stream1;
     }
     const videoTrackInfo = video == null ? void 0 : video.tracks[1];
@@ -10379,22 +10379,30 @@ function combinaWebM(webM1, webM2) {
       streaming: false
     }));
     const parser = SimpleBlockParser();
-    video == null ? void 0 : video.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
+    video == null ? void 0 : video.elements.filter((item) => item.type == "b" || item.name == "BlockGroup").forEach((simpleBlock) => {
+      if (simpleBlock.name == "BlockGroup") {
+        const tempBlock = simpleBlock.childs.find((item) => item.type == "b");
+        if (tempBlock) {
+          simpleBlock = tempBlock;
+        }
+      }
       const [timestamp, data, bKeyFrame] = parser.parse(simpleBlock, 0);
       muxer.addVideoChunkRaw(data, bKeyFrame ? "key" : "delta", timestamp);
     });
-    const audioCodecPrivate = (_b = (_a = audio == null ? void 0 : audio.elements.find((item) => item.name == "Tracks")) == null ? void 0 : _a.childs[0].childs.find((item) => item.name == "CodecPrivate")) == null ? void 0 : _b.data;
-    const config = {
-      decoderConfig: {
-        sampleRate: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).SamplingFrequency,
-        numberOfChannels: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).Channels,
-        description: audioCodecPrivate
-      }
-    };
-    audio == null ? void 0 : audio.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
-      const [timestamp, data] = parser.parse(simpleBlock, 1);
-      muxer.addAudioChunkRaw(data, "key", timestamp, config);
-    });
+    if (audio) {
+      const audioCodecPrivate = (_e = (_d = audio == null ? void 0 : audio.elements.find((item) => item.name == "Tracks")) == null ? void 0 : _d.childs[0].childs.find((item) => item.name == "CodecPrivate")) == null ? void 0 : _e.data;
+      const config = {
+        decoderConfig: {
+          sampleRate: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).SamplingFrequency,
+          numberOfChannels: (audioTrackInfo == null ? void 0 : audioTrackInfo.metadata).Channels,
+          description: audioCodecPrivate
+        }
+      };
+      audio == null ? void 0 : audio.elements.filter((item) => item.type == "b").forEach((simpleBlock) => {
+        const [timestamp, data] = parser.parse(simpleBlock, 1);
+        muxer.addAudioChunkRaw(data, "key", timestamp, config);
+      });
+    }
     muxer.finalize();
     return new Blob([muxer.target.buffer]);
   });
@@ -10434,13 +10442,17 @@ var createMediaRecorder = (mediaStream, done, mediaRecorderPartner) => {
   return mediaRecorder;
 };
 var createRecord = (_mediaStream, fileName) => {
-  const mediaStreams = _mediaStream.getTracks().map((item) => {
+  const tempMediaStreams = _mediaStream.getTracks().map((item) => {
     const mediaStream2 = new MediaStream([item]);
     item.addEventListener("ended", () => {
       mediaStream2.getTracks().forEach((item2) => item2.stop());
     });
     return new MediaStream([item]);
   });
+  const mediaStreams = [
+    ...tempMediaStreams.filter((item) => item.getVideoTracks().length > 0),
+    ...tempMediaStreams.filter((item) => item.getAudioTracks().length > 0)
+  ];
   const mediaStream = mediaStreams[0];
   let recordedChunks = [];
   const szWebM = [];
@@ -12018,7 +12030,21 @@ var WebRTCConnect = class {
       if (targetReceivers.length > 0) {
         report = yield targetReceivers[0].getStats();
       }
-      return report ? {
+      const isTargeReportExist = {
+        codec: false,
+        "inbound-rtp": false
+      };
+      Object.keys(isTargeReportExist).forEach((typeStats) => {
+        if (report) {
+          report.forEach((item) => {
+            if (item.type == typeStats) {
+              isTargeReportExist[typeStats] = true;
+            }
+          });
+        }
+      });
+      const invalid = Object.keys(isTargeReportExist).findIndex((item) => !isTargeReportExist[item]) >= 0;
+      return report && !invalid ? {
         codec: __privateMethod(this, _getLastStatsByType, getLastStatsByType_fn).call(this, report, "codec", {}).now,
         rtp: __privateMethod(this, _getLastStatsByType, getLastStatsByType_fn).call(this, report, "inbound-rtp", {
           bytesReceived: 0,
@@ -19234,7 +19260,7 @@ var PuPlayer = (props) => {
             player.mikeBtn.type = this.protocol;
           }
         } catch (e) {
-          if (signal.aborted) {
+          if (signal.aborted && e != "protocol == ws-bvrtc" && type != "auto") {
             player.mask.visible = true;
             player.mask.text = t("connect-failed");
             onConnectedFailed && onConnectedFailed();
@@ -19528,7 +19554,9 @@ var PuPlayer = (props) => {
       if (this.protocol == protocol)
         return;
       this.close().then(() => {
-        this.open(currentMuted, protocol);
+        setTimeout(() => {
+          this.open(currentMuted, protocol);
+        }, 500);
       });
     },
     setToken: (newToken) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@besovideo/webrtc-player",
-  "version": "0.8.61",
+  "version": "0.8.63",
   "description": "@besovideo/webrtc-player desc",
   "type": "module",
   "types": "./dist/types/main.d.ts",