@besovideo/webrtc-player 0.8.68 → 0.8.69

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.68", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.69", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -5913,7 +5913,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       fixStack(this);
     }
     toString() {
-      return `Error: status: ${this.status}, message: ${this.message}, ${new Error().stack}`;
+      return `Error: status: ${this.status}, message: ${this.message}`;
     }
   };
   // 错误码
@@ -5931,18 +5931,27 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     constructor(message) {
       super(CustomError.ErrorStatus.OPEN_DIALOG_FAILED, message);
     }
+    toString() {
+      return t("da-kai-shi-bai") + "\n" + super.toString();
+    }
   };
+  function AppendHost(data) {
+    const hostAppend = {
+      host: apiUrls.bvscpV1().includes("://") ? new URL(apiUrls.bvscpV1()).host : new URL(apiUrls.bvscpV1(), location.origin).host
+    };
+    return __spreadValues(__spreadValues({}, data), hostAppend);
+  }
   var DialogIdsKey = core_default.field.createPrefixStorageField("DialogIds");
   var getDeviceWebrtc = (param, token, signal) => __async(void 0, null, function* () {
     var _a;
     const headers = {
       Authorization: token || ""
     };
-    const params = {
+    const params = AppendHost({
       id: param.id,
       index: param.index,
       sdp: param.sdp
-    };
+    });
     const resData = yield http_default.post(
       `${apiUrls.bvscpV1()}/dialog/device/webrtc`,
       params,
@@ -5968,11 +5977,11 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     const headers = {
       Authorization: token || ""
     };
-    const params = {
+    const params = AppendHost({
       id: param.id,
       index: param.index,
       sdp: param.sdp
-    };
+    });
     const resData = yield http_default.post(
       `${apiUrls.bvscpV1()}/dialog/device/bvrtc`,
       params,
@@ -5998,11 +6007,11 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     const headers = {
       Authorization: token || ""
     };
-    const params = {
+    const params = AppendHost({
       id: param.id,
       index: param.index,
       sdp: param.sdp
-    };
+    });
     const resData = yield http_default.post(
       `${apiUrls.bvscpV1()}/dialog/conference/webrtc`,
       params,
@@ -6025,11 +6034,11 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     const headers = {
       Authorization: token || ""
     };
-    const params = {
+    const params = AppendHost({
       id: param.id,
       index: param.index,
       sdp: param.sdp
-    };
+    });
     const resData = yield http_default.post(
       `${apiUrls.bvscpV1()}/dialog/conference/bvrtc`,
       params,
@@ -6365,6 +6374,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     set text(v2) {
       this._text = v2;
       this._textEl.textContent = v2;
+      this._textEl.style.textAlign = "center";
     }
     beforeDestroy() {
     }
@@ -6828,13 +6838,66 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       }
     };
   };
+  function webcodecVisiableChangeResumePlay(videoEle) {
+    function isWebcodec() {
+      return videoEle.srcObject instanceof MediaStream && videoEle.srcObject.getTracks().every((item) => item instanceof MediaStreamTrackGenerator);
+    }
+    function HandleEnd() {
+      return __async(this, null, function* () {
+        if (isWebcodec()) {
+          const mediaStream = videoEle.srcObject;
+          yield Promise.allSettled(
+            mediaStream.getTracks().map((item) => {
+              return new Promise((r) => {
+                let intervalToken = setInterval(() => {
+                  if (item.readyState == "ended") {
+                    clearInterval(intervalToken);
+                    r();
+                  }
+                }, 500);
+              });
+            })
+          );
+        }
+      });
+    }
+    videoEle.addEventListener("loadedmetadata", () => {
+      function check() {
+        if (isWebcodec()) {
+          if (videoEle.checkVisibility()) {
+            if (intervalToken) {
+              clearInterval(intervalToken);
+              intervalToken = null;
+            }
+            videoEle.play();
+          }
+        }
+      }
+      let intervalToken = null;
+      function RunInterval() {
+        if (isWebcodec() && intervalToken == null) {
+          intervalToken = setInterval(check, 1e3);
+        }
+      }
+      function OnEnd() {
+        if (intervalToken) {
+          clearInterval(intervalToken);
+          intervalToken = null;
+        }
+        videoEle.removeEventListener("pause", RunInterval);
+      }
+      videoEle.addEventListener("pause", RunInterval);
+      HandleEnd().then(OnEnd);
+    });
+  }
   var media = {
     canvasToBlob,
     screenshotByCanvas,
     screenshot,
     record,
     getMediaDir,
-    video2Canvas
+    video2Canvas,
+    webcodecVisiableChangeResumePlay
   };
   var media_default = media;
 
@@ -6985,6 +7048,9 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       }
       this._canvasEl = newEl;
       this._mediaStream = null;
+      if (newEl.tagName == "VIDEO") {
+        media_default.webcodecVisiableChangeResumePlay(newEl);
+      }
     }
     setCaptureProvider(capture) {
       this._captureStream = capture;
@@ -8398,6 +8464,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     const {
       offerParam,
       productRemoteSdp,
+      closeDialog: closeDialog2,
       customerRTCPeerConnection,
       onConnected,
       onConnectedFailed,
@@ -8417,7 +8484,17 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
       "connectionstatechange",
       (e) => onConnectionStateChange(pc, e)
     );
-    pc.addEventListener("track", (e) => gotRemoteStream(pc, e, onGotStream));
+    let trackEvent = null;
+    const invokeTrack = (e) => {
+      if (e) {
+        trackEvent = e;
+      }
+      if (pc.connectionState == "connected" && trackEvent) {
+        gotRemoteStream(pc, trackEvent, onGotStream);
+        trackEvent = null;
+      }
+    };
+    pc.addEventListener("track", (e) => invokeTrack(e));
     onPcEventAdded && (yield onPcEventAdded(pc));
     if (isCustomerPc) {
       return new WebRTCConnect(pc);
@@ -8433,7 +8510,8 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
       logger_default.info("\u521B\u5EFAoffer\uFF0C\u53C2\u6570\uFF1A", offerParam, "\uFF0C \u7ED3\u679C\uFF1A", offer);
       yield pc.setLocalDescription(offer);
       onLocalDescriptionReady && onLocalDescriptionReady(pc);
-      const remoteSdp = yield productRemoteSdp(new RTCSessionDescription(offer));
+      let remoteSdp = "";
+      remoteSdp = yield productRemoteSdp(new RTCSessionDescription(offer));
       logger_default.info("webrtc remoteSDP: ", remoteSdp);
       if (/a=rtpmap:\d+ H265/gi.test(remoteSdp || "")) {
         throw new WebrtcH265Error(
@@ -8446,6 +8524,22 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
       });
       yield pc.setRemoteDescription(remoteDescription);
       logger_default.debug("getTransceivers", pc.getTransceivers());
+      yield new Promise((r, j) => {
+        let iCount = 1;
+        const intervalToken = setInterval(() => {
+          if (pc.connectionState == "connected") {
+            invokeTrack();
+            r();
+          } else if (iCount > 500) {
+            closeDialog2 && closeDialog2();
+            j(t("connect-failed"));
+          } else {
+            iCount++;
+            return;
+          }
+          clearInterval(intervalToken);
+        }, 20);
+      });
       onConnected && onConnected(pc);
     } catch (e) {
       onConnectedFailed && onConnectedFailed(pc);
@@ -14201,7 +14295,8 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     transfer: "transfer",
     type: "type",
     "yu-zhi-dian": "preset",
-    "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "Mic not found or permission deny"
+    "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "Mic not found or permission deny",
+    "da-kai-shi-bai": "open fail"
   };
 
   // src/locales/zh.json
@@ -14241,7 +14336,8 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
     transfer: "\u4F20\u8F93",
     type: "\u65B9\u5F0F",
     "yu-zhi-dian": "\u9884\u5236\u70B9",
-    "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "\u6CA1\u6709\u9EA6\u514B\u98CE\uFF0C\u6216\u8005\u6CA1\u6709\u6743\u9650"
+    "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "\u6CA1\u6709\u9EA6\u514B\u98CE\uFF0C\u6216\u8005\u6CA1\u6709\u6743\u9650",
+    "da-kai-shi-bai": "\u6253\u5F00\u5931\u8D25"
   };
 
   // src/locales/i18n.ts
@@ -15511,6 +15607,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
             );
             return product(localDescription);
           }),
+          closeDialog() {
+            handleClose();
+          },
           onIceDisconnected: () => {
             player.mask.visible = true;
             player.mask.text = t("lost-connection");
@@ -15621,9 +15720,9 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               player.mikeBtn.type = this.protocol;
             }
           } catch (e) {
-            if (signal.aborted && e != "protocol == ws-bvrtc" && type != "auto") {
+            if (type == "webrtc") {
               player.mask.visible = true;
-              player.mask.text = t("connect-failed");
+              player.mask.text = e.toString();
               onConnectedFailed && onConnectedFailed();
               useRecntMgr == null ? void 0 : useRecntMgr.reconnect();
               return;
@@ -15842,7 +15941,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               }
             } catch (e2) {
               player.mask.visible = true;
-              player.mask.text = t("connect-failed");
+              player.mask.text = e2.toString();
               hplayer == null ? void 0 : hplayer.close();
               onConnectedFailed && onConnectedFailed();
               useRecntMgr == null ? void 0 : useRecntMgr.reconnect();

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.68", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.69", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -5899,7 +5899,7 @@ var CustomError = class extends Error {
     fixStack(this);
   }
   toString() {
-    return `Error: status: ${this.status}, message: ${this.message}, ${new Error().stack}`;
+    return `Error: status: ${this.status}, message: ${this.message}`;
   }
 };
 // 错误码
@@ -5917,18 +5917,27 @@ var OpenDialogError = class extends CustomError {
   constructor(message) {
     super(CustomError.ErrorStatus.OPEN_DIALOG_FAILED, message);
   }
+  toString() {
+    return t("da-kai-shi-bai") + "\n" + super.toString();
+  }
 };
+function AppendHost(data) {
+  const hostAppend = {
+    host: apiUrls.bvscpV1().includes("://") ? new URL(apiUrls.bvscpV1()).host : new URL(apiUrls.bvscpV1(), location.origin).host
+  };
+  return __spreadValues(__spreadValues({}, data), hostAppend);
+}
 var DialogIdsKey = core_default.field.createPrefixStorageField("DialogIds");
 var getDeviceWebrtc = (param, token, signal) => __async(void 0, null, function* () {
   var _a;
   const headers = {
     Authorization: token || ""
   };
-  const params = {
+  const params = AppendHost({
     id: param.id,
     index: param.index,
     sdp: param.sdp
-  };
+  });
   const resData = yield http_default.post(
     `${apiUrls.bvscpV1()}/dialog/device/webrtc`,
     params,
@@ -5954,11 +5963,11 @@ var getDeviceBvrtc = (param, token, signal) => __async(void 0, null, function* (
   const headers = {
     Authorization: token || ""
   };
-  const params = {
+  const params = AppendHost({
     id: param.id,
     index: param.index,
     sdp: param.sdp
-  };
+  });
   const resData = yield http_default.post(
     `${apiUrls.bvscpV1()}/dialog/device/bvrtc`,
     params,
@@ -5984,11 +5993,11 @@ var getConferenceWebrtc = (param, token) => __async(void 0, null, function* () {
   const headers = {
     Authorization: token || ""
   };
-  const params = {
+  const params = AppendHost({
     id: param.id,
     index: param.index,
     sdp: param.sdp
-  };
+  });
   const resData = yield http_default.post(
     `${apiUrls.bvscpV1()}/dialog/conference/webrtc`,
     params,
@@ -6011,11 +6020,11 @@ var getConferenceBvrtc = (param, token) => __async(void 0, null, function* () {
   const headers = {
     Authorization: token || ""
   };
-  const params = {
+  const params = AppendHost({
     id: param.id,
     index: param.index,
     sdp: param.sdp
-  };
+  });
   const resData = yield http_default.post(
     `${apiUrls.bvscpV1()}/dialog/conference/bvrtc`,
     params,
@@ -6351,6 +6360,7 @@ var MaskPlugin = class extends Plugin {
   set text(v2) {
     this._text = v2;
     this._textEl.textContent = v2;
+    this._textEl.style.textAlign = "center";
   }
   beforeDestroy() {
   }
@@ -6814,13 +6824,66 @@ var video2Canvas = (video, opts) => {
     }
   };
 };
+function webcodecVisiableChangeResumePlay(videoEle) {
+  function isWebcodec() {
+    return videoEle.srcObject instanceof MediaStream && videoEle.srcObject.getTracks().every((item) => item instanceof MediaStreamTrackGenerator);
+  }
+  function HandleEnd() {
+    return __async(this, null, function* () {
+      if (isWebcodec()) {
+        const mediaStream = videoEle.srcObject;
+        yield Promise.allSettled(
+          mediaStream.getTracks().map((item) => {
+            return new Promise((r) => {
+              let intervalToken = setInterval(() => {
+                if (item.readyState == "ended") {
+                  clearInterval(intervalToken);
+                  r();
+                }
+              }, 500);
+            });
+          })
+        );
+      }
+    });
+  }
+  videoEle.addEventListener("loadedmetadata", () => {
+    function check() {
+      if (isWebcodec()) {
+        if (videoEle.checkVisibility()) {
+          if (intervalToken) {
+            clearInterval(intervalToken);
+            intervalToken = null;
+          }
+          videoEle.play();
+        }
+      }
+    }
+    let intervalToken = null;
+    function RunInterval() {
+      if (isWebcodec() && intervalToken == null) {
+        intervalToken = setInterval(check, 1e3);
+      }
+    }
+    function OnEnd() {
+      if (intervalToken) {
+        clearInterval(intervalToken);
+        intervalToken = null;
+      }
+      videoEle.removeEventListener("pause", RunInterval);
+    }
+    videoEle.addEventListener("pause", RunInterval);
+    HandleEnd().then(OnEnd);
+  });
+}
 var media = {
   canvasToBlob,
   screenshotByCanvas,
   screenshot,
   record,
   getMediaDir,
-  video2Canvas
+  video2Canvas,
+  webcodecVisiableChangeResumePlay
 };
 var media_default = media;
 
@@ -6971,6 +7034,9 @@ var VideoPlugin = class extends Plugin {
     }
     this._canvasEl = newEl;
     this._mediaStream = null;
+    if (newEl.tagName == "VIDEO") {
+      media_default.webcodecVisiableChangeResumePlay(newEl);
+    }
   }
   setCaptureProvider(capture) {
     this._captureStream = capture;
@@ -8384,6 +8450,7 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
   const {
     offerParam,
     productRemoteSdp,
+    closeDialog: closeDialog2,
     customerRTCPeerConnection,
     onConnected,
     onConnectedFailed,
@@ -8403,7 +8470,17 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
     "connectionstatechange",
     (e) => onConnectionStateChange(pc, e)
   );
-  pc.addEventListener("track", (e) => gotRemoteStream(pc, e, onGotStream));
+  let trackEvent = null;
+  const invokeTrack = (e) => {
+    if (e) {
+      trackEvent = e;
+    }
+    if (pc.connectionState == "connected" && trackEvent) {
+      gotRemoteStream(pc, trackEvent, onGotStream);
+      trackEvent = null;
+    }
+  };
+  pc.addEventListener("track", (e) => invokeTrack(e));
   onPcEventAdded && (yield onPcEventAdded(pc));
   if (isCustomerPc) {
     return new WebRTCConnect(pc);
@@ -8419,7 +8496,8 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
     logger_default.info("\u521B\u5EFAoffer\uFF0C\u53C2\u6570\uFF1A", offerParam, "\uFF0C \u7ED3\u679C\uFF1A", offer);
     yield pc.setLocalDescription(offer);
     onLocalDescriptionReady && onLocalDescriptionReady(pc);
-    const remoteSdp = yield productRemoteSdp(new RTCSessionDescription(offer));
+    let remoteSdp = "";
+    remoteSdp = yield productRemoteSdp(new RTCSessionDescription(offer));
     logger_default.info("webrtc remoteSDP: ", remoteSdp);
     if (/a=rtpmap:\d+ H265/gi.test(remoteSdp || "")) {
       throw new WebrtcH265Error(
@@ -8432,6 +8510,22 @@ var connect = (param, onGotStream) => __async(void 0, null, function* () {
     });
     yield pc.setRemoteDescription(remoteDescription);
     logger_default.debug("getTransceivers", pc.getTransceivers());
+    yield new Promise((r, j) => {
+      let iCount = 1;
+      const intervalToken = setInterval(() => {
+        if (pc.connectionState == "connected") {
+          invokeTrack();
+          r();
+        } else if (iCount > 500) {
+          closeDialog2 && closeDialog2();
+          j(t("connect-failed"));
+        } else {
+          iCount++;
+          return;
+        }
+        clearInterval(intervalToken);
+      }, 20);
+    });
     onConnected && onConnected(pc);
   } catch (e) {
     onConnectedFailed && onConnectedFailed(pc);
@@ -14187,7 +14281,8 @@ var en_default = {
   transfer: "transfer",
   type: "type",
   "yu-zhi-dian": "preset",
-  "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "Mic not found or permission deny"
+  "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "Mic not found or permission deny",
+  "da-kai-shi-bai": "open fail"
 };
 
 // src/locales/zh.json
@@ -14227,7 +14322,8 @@ var zh_default = {
   transfer: "\u4F20\u8F93",
   type: "\u65B9\u5F0F",
   "yu-zhi-dian": "\u9884\u5236\u70B9",
-  "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "\u6CA1\u6709\u9EA6\u514B\u98CE\uFF0C\u6216\u8005\u6CA1\u6709\u6743\u9650"
+  "mei-you-mai-ke-feng-huo-zhe-mei-you-quan-xian": "\u6CA1\u6709\u9EA6\u514B\u98CE\uFF0C\u6216\u8005\u6CA1\u6709\u6743\u9650",
+  "da-kai-shi-bai": "\u6253\u5F00\u5931\u8D25"
 };
 
 // src/locales/i18n.ts
@@ -15497,6 +15593,9 @@ var PuPlayer = (props) => {
           );
           return product(localDescription);
         }),
+        closeDialog() {
+          handleClose();
+        },
         onIceDisconnected: () => {
           player.mask.visible = true;
           player.mask.text = t("lost-connection");
@@ -15607,9 +15706,9 @@ var PuPlayer = (props) => {
             player.mikeBtn.type = this.protocol;
           }
         } catch (e) {
-          if (signal.aborted && e != "protocol == ws-bvrtc" && type != "auto") {
+          if (type == "webrtc") {
             player.mask.visible = true;
-            player.mask.text = t("connect-failed");
+            player.mask.text = e.toString();
             onConnectedFailed && onConnectedFailed();
             useRecntMgr == null ? void 0 : useRecntMgr.reconnect();
             return;
@@ -15828,7 +15927,7 @@ var PuPlayer = (props) => {
             }
           } catch (e2) {
             player.mask.visible = true;
-            player.mask.text = t("connect-failed");
+            player.mask.text = e2.toString();
             hplayer == null ? void 0 : hplayer.close();
             onConnectedFailed && onConnectedFailed();
             useRecntMgr == null ? void 0 : useRecntMgr.reconnect();

package/dist/types/api/dialog.d.ts

@@ -1,6 +1,7 @@
 import { CustomError } from "src/core/error";
 export declare class OpenDialogError extends CustomError {
     constructor(message?: string);
+    toString(): string;
 }
 export interface IDialog {
     dialogId?: string;

package/dist/types/utils/media.d.ts

@@ -27,6 +27,10 @@ export declare class VideoProcessor {
     extractPixels(): Uint8Array;
     private setupCanvas;
 }
+declare global {
+    const MediaStreamTrackGenerator: any;
+}
+declare function webcodecVisiableChangeResumePlay(videoEle: HTMLVideoElement): void;
 declare const media: {
     canvasToBlob: (canvas: HTMLCanvasElement) => Promise<Blob | null>;
     screenshotByCanvas: (canvas?: HTMLCanvasElement | null | undefined, fileName?: string) => Promise<void>;
@@ -34,5 +38,6 @@ declare const media: {
     record: (element: IStreamProvider, stream?: MediaStream | null | undefined, fileName?: string) => [MediaRecorder?, MediaStream?];
     getMediaDir: (option: IMediaOption) => number;
     video2Canvas: (video: HTMLVideoElement, opts: IVideo2CanvasOptions) => ICanvasControl;
+    webcodecVisiableChangeResumePlay: typeof webcodecVisiableChangeResumePlay;
 };
 export default media;

package/package.json

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