@besovideo/webrtc-player 0.8.52 → 0.8.53

package/dist/main.browser.js

@@ -105,7 +105,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.49", PROJECT_NAMESPACE: "bvplayer" };
+      define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.53", PROJECT_NAMESPACE: "bvplayer" };
     }
   });
 
@@ -11168,6 +11168,7 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   }
 
   // src/templates/icons.tsx
+  init_jsx();
   var Icon = ({ children, className, style: style2 }) => {
     const clsName = core_default.style.cls(["icon", className]);
     return /* @__PURE__ */ jsx.h("span", { className: clsName, style: style2, withNamespace: true }, children);
@@ -11479,7 +11480,8 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   // src/components/subComponent/mikeButton.tsx
   init_define_processenv();
   init_jsx_shim();
-  var _onIcon, _offIcon, _talk, _intercom, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
+  init_jsx();
+  var _onIcon, _offIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
   var MikeButton = class extends HTMLElement {
     constructor() {
       super();
@@ -11488,13 +11490,18 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
       // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Private_class_fields weakmep实现的私有变量
       __privateAdd(this, _onIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx.h(icons_default.MikeOn, null)));
       __privateAdd(this, _offIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx.h(icons_default.MikeOff, null)));
+      __privateAdd(this, _isBusy, false);
       //是否正在喊话
       __privateAdd(this, _talk, false);
       // 麦克风实例
       __privateAdd(this, _intercom, void 0);
+      // 协议类型
+      __privateAdd(this, _type, void 0);
       this.attachShadow({ mode: "open" });
       this.addEventListener("click", () => {
-        this.talking = !this.talking;
+        if (!__privateGet(this, _isBusy)) {
+          this.talking = !this.talking;
+        }
       });
       this.talking = false;
     }
@@ -11504,16 +11511,22 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
     set talking(state) {
       if (__privateGet(this, _talk) === state)
         return;
-      __privateSet(this, _talk, state);
-      if (state) {
-        __privateMethod(this, _onTalkStart, onTalkStart_fn).call(this);
-      } else {
-        __privateMethod(this, _onTalkEnd, onTalkEnd_fn).call(this);
+      if (!__privateGet(this, _isBusy)) {
+        __privateSet(this, _isBusy, true);
+        __privateSet(this, _talk, state);
+        let pm;
+        pm = state ? __privateMethod(this, _onTalkStart, onTalkStart_fn).call(this) : __privateMethod(this, _onTalkEnd, onTalkEnd_fn).call(this);
+        pm.finally(() => {
+          __privateSet(this, _isBusy, false);
+        });
       }
     }
     set intercom(ins) {
       __privateSet(this, _intercom, ins);
     }
+    set type(type) {
+      __privateSet(this, _type, type);
+    }
     connectedCallback() {
       this.render();
     }
@@ -11525,21 +11538,27 @@ If you want to allow non-zero first timestamps, set firstTimestampBehavior: 'per
   };
   _onIcon = new WeakMap();
   _offIcon = new WeakMap();
+  _isBusy = new WeakMap();
   _talk = new WeakMap();
   _intercom = new WeakMap();
+  _type = new WeakMap();
   _onTalkStart = new WeakSet();
   onTalkStart_fn = function() {
-    var _a;
-    if (!__privateGet(this, _intercom))
-      return;
-    (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open();
-    __privateGet(this, _offIcon).replaceWith(__privateGet(this, _onIcon));
+    return __async(this, null, function* () {
+      var _a;
+      if (!__privateGet(this, _intercom))
+        return;
+      yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open(void 0, __privateGet(this, _type));
+      __privateGet(this, _offIcon).replaceWith(__privateGet(this, _onIcon));
+    });
   };
   _onTalkEnd = new WeakSet();
   onTalkEnd_fn = function() {
-    var _a;
-    (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
-    __privateGet(this, _onIcon).replaceWith(__privateGet(this, _offIcon));
+    return __async(this, null, function* () {
+      var _a;
+      yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
+      __privateGet(this, _onIcon).replaceWith(__privateGet(this, _offIcon));
+    });
   };
   customElements.define("mike-button", MikeButton);
 
@@ -17689,8 +17708,10 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
       enableController: false
     });
     const instance2 = __spreadProps(__spreadValues({}, bvWebrtcComponentInstance), {
-      open: (..._0) => __async(void 0, [..._0], function* (protocol = type) {
+      open: (..._0) => __async(void 0, [..._0], function* (protocol = type, mikeButtonType) {
         var _a, _b, _c;
+        if (mikeButtonType)
+          protocol = mikeButtonType;
         const player = bvWebrtcComponentInstance.__dangerGetPlayer();
         let hplayer = null;
         try {
@@ -17776,15 +17797,17 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               }
             };
             player.spinner.spin = false;
-            player.addEventListener("close", () => __async(void 0, null, function* () {
+            const closeHandle = () => __async(void 0, null, function* () {
               if (!hplayer)
                 return;
+              player.removeEventListener("close", closeHandle);
               hplayer.close();
               yield dialog_default.closeDialogs(
                 [hplayer.getDialogID()],
                 sdpFetcher.token
               );
-            }));
+            });
+            player.addEventListener("close", closeHandle);
           } catch (e2) {
             console.error("\u51FA\u9519", e2);
             player.mask.visible = true;
@@ -18275,6 +18298,7 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
   };
 
   // src/components/puPlayer.tsx
+  init_jsx();
   var createProductRemoteSdp = (puOption, tempToken, callBack) => (localDescription) => __async(void 0, null, function* () {
     if (localDescription.type !== "offer")
       return void 0;
@@ -18604,8 +18628,10 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               audioWaveShow.setMediaStream(player.video.srcObject);
               audioWaveShow.setEle(playerEl);
             }
-            if (player.mikeBtn)
+            if (player.mikeBtn) {
               player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+              player.mikeBtn.type = this.protocol;
+            }
           } catch (e) {
             try {
               let DisplayVolumn2 = function(volume) {
@@ -18694,9 +18720,13 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
                 });
               };
               player.spinner.spin = false;
-              player.addEventListener("close", () => __async(this, null, function* () {
+              const closeHandle = () => __async(this, null, function* () {
                 var _a3;
-                (_a3 = player.panel) == null ? void 0 : _a3.controller.removeEventListener("volume", updateVolumeWrapper);
+                player.removeEventListener("close", closeHandle);
+                (_a3 = player.panel) == null ? void 0 : _a3.controller.removeEventListener(
+                  "volume",
+                  updateVolumeWrapper
+                );
                 player.clearEventListener("recordStart");
                 player.clearEventListener("recordStop");
                 player.clearEventListener("screenshot");
@@ -18708,7 +18738,8 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
                 yield new Promise((r) => {
                   setTimeout(r, 100);
                 });
-              }));
+              });
+              player.addEventListener("close", closeHandle);
               onConnected && onConnected();
               reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
               dialog_default.closeDialogs([dialogId || ""], tempToken || "");
@@ -18803,7 +18834,10 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
               let updateVolumeWrapper = () => {
                 updateVolumeButton();
               };
-              player.panel.controller.addEventListener("volume", updateVolumeWrapper);
+              player.panel.controller.addEventListener(
+                "volume",
+                updateVolumeWrapper
+              );
               const volumeSlider = player.panel.controller.VolumeSlider;
               if (volumeSlider) {
                 volumeSlider.percent = hplayer.getVolume();
@@ -18817,8 +18851,10 @@ ${event.candidate ? event.candidate.candidate : "(null)"}`
                   DisplayVolumn2(Number(e2 == null ? void 0 : e2.percent));
                 });
               }
-              if (player.mikeBtn)
+              if (player.mikeBtn) {
                 player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+                player.mikeBtn.type = this.protocol;
+              }
             } catch (e2) {
               player.mask.visible = true;
               player.mask.text = t("connect-failed");

package/dist/main.es.js

@@ -99,7 +99,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.49", PROJECT_NAMESPACE: "bvplayer" };
+    define_processenv_default = { NODE_ENV: "production", SH_LIB_NAME: "@besovideo/webrtc-player", SH_LIB_VERSION: "0.8.53", PROJECT_NAMESPACE: "bvplayer" };
   }
 });
 
@@ -11154,6 +11154,7 @@ function SvgElementbvPlayerCoreMikeOff({ className }) {
 }
 
 // src/templates/icons.tsx
+init_jsx();
 var Icon = ({ children, className, style: style2 }) => {
   const clsName = core_default.style.cls(["icon", className]);
   return /* @__PURE__ */ jsx.h("span", { className: clsName, style: style2, withNamespace: true }, children);
@@ -11465,7 +11466,8 @@ init_logger();
 // src/components/subComponent/mikeButton.tsx
 init_define_processenv();
 init_jsx_shim();
-var _onIcon, _offIcon, _talk, _intercom, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
+init_jsx();
+var _onIcon, _offIcon, _isBusy, _talk, _intercom, _type, _onTalkStart, onTalkStart_fn, _onTalkEnd, onTalkEnd_fn;
 var MikeButton = class extends HTMLElement {
   constructor() {
     super();
@@ -11474,13 +11476,18 @@ var MikeButton = class extends HTMLElement {
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Private_class_fields weakmep实现的私有变量
     __privateAdd(this, _onIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx.h(icons_default.MikeOn, null)));
     __privateAdd(this, _offIcon, core_default.dom.createByJsx(/* @__PURE__ */ jsx.h(icons_default.MikeOff, null)));
+    __privateAdd(this, _isBusy, false);
     //是否正在喊话
     __privateAdd(this, _talk, false);
     // 麦克风实例
     __privateAdd(this, _intercom, void 0);
+    // 协议类型
+    __privateAdd(this, _type, void 0);
     this.attachShadow({ mode: "open" });
     this.addEventListener("click", () => {
-      this.talking = !this.talking;
+      if (!__privateGet(this, _isBusy)) {
+        this.talking = !this.talking;
+      }
     });
     this.talking = false;
   }
@@ -11490,16 +11497,22 @@ var MikeButton = class extends HTMLElement {
   set talking(state) {
     if (__privateGet(this, _talk) === state)
       return;
-    __privateSet(this, _talk, state);
-    if (state) {
-      __privateMethod(this, _onTalkStart, onTalkStart_fn).call(this);
-    } else {
-      __privateMethod(this, _onTalkEnd, onTalkEnd_fn).call(this);
+    if (!__privateGet(this, _isBusy)) {
+      __privateSet(this, _isBusy, true);
+      __privateSet(this, _talk, state);
+      let pm;
+      pm = state ? __privateMethod(this, _onTalkStart, onTalkStart_fn).call(this) : __privateMethod(this, _onTalkEnd, onTalkEnd_fn).call(this);
+      pm.finally(() => {
+        __privateSet(this, _isBusy, false);
+      });
     }
   }
   set intercom(ins) {
     __privateSet(this, _intercom, ins);
   }
+  set type(type) {
+    __privateSet(this, _type, type);
+  }
   connectedCallback() {
     this.render();
   }
@@ -11511,21 +11524,27 @@ var MikeButton = class extends HTMLElement {
 };
 _onIcon = new WeakMap();
 _offIcon = new WeakMap();
+_isBusy = new WeakMap();
 _talk = new WeakMap();
 _intercom = new WeakMap();
+_type = new WeakMap();
 _onTalkStart = new WeakSet();
 onTalkStart_fn = function() {
-  var _a;
-  if (!__privateGet(this, _intercom))
-    return;
-  (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open();
-  __privateGet(this, _offIcon).replaceWith(__privateGet(this, _onIcon));
+  return __async(this, null, function* () {
+    var _a;
+    if (!__privateGet(this, _intercom))
+      return;
+    yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.open(void 0, __privateGet(this, _type));
+    __privateGet(this, _offIcon).replaceWith(__privateGet(this, _onIcon));
+  });
 };
 _onTalkEnd = new WeakSet();
 onTalkEnd_fn = function() {
-  var _a;
-  (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
-  __privateGet(this, _onIcon).replaceWith(__privateGet(this, _offIcon));
+  return __async(this, null, function* () {
+    var _a;
+    yield (_a = __privateGet(this, _intercom)) == null ? void 0 : _a.close();
+    __privateGet(this, _onIcon).replaceWith(__privateGet(this, _offIcon));
+  });
 };
 customElements.define("mike-button", MikeButton);
 
@@ -17675,8 +17694,10 @@ var AudioPlayer = (props) => {
     enableController: false
   });
   const instance2 = __spreadProps(__spreadValues({}, bvWebrtcComponentInstance), {
-    open: (..._0) => __async(void 0, [..._0], function* (protocol = type) {
+    open: (..._0) => __async(void 0, [..._0], function* (protocol = type, mikeButtonType) {
       var _a, _b, _c;
+      if (mikeButtonType)
+        protocol = mikeButtonType;
       const player = bvWebrtcComponentInstance.__dangerGetPlayer();
       let hplayer = null;
       try {
@@ -17762,15 +17783,17 @@ var AudioPlayer = (props) => {
             }
           };
           player.spinner.spin = false;
-          player.addEventListener("close", () => __async(void 0, null, function* () {
+          const closeHandle = () => __async(void 0, null, function* () {
             if (!hplayer)
               return;
+            player.removeEventListener("close", closeHandle);
             hplayer.close();
             yield dialog_default.closeDialogs(
               [hplayer.getDialogID()],
               sdpFetcher.token
             );
-          }));
+          });
+          player.addEventListener("close", closeHandle);
         } catch (e2) {
           console.error("\u51FA\u9519", e2);
           player.mask.visible = true;
@@ -18261,6 +18284,7 @@ var MediaStreamAudioWaveShowBVRtc = class {
 };
 
 // src/components/puPlayer.tsx
+init_jsx();
 var createProductRemoteSdp = (puOption, tempToken, callBack) => (localDescription) => __async(void 0, null, function* () {
   if (localDescription.type !== "offer")
     return void 0;
@@ -18590,8 +18614,10 @@ var PuPlayer = (props) => {
             audioWaveShow.setMediaStream(player.video.srcObject);
             audioWaveShow.setEle(playerEl);
           }
-          if (player.mikeBtn)
+          if (player.mikeBtn) {
             player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+            player.mikeBtn.type = this.protocol;
+          }
         } catch (e) {
           try {
             let DisplayVolumn2 = function(volume) {
@@ -18680,9 +18706,13 @@ var PuPlayer = (props) => {
               });
             };
             player.spinner.spin = false;
-            player.addEventListener("close", () => __async(this, null, function* () {
+            const closeHandle = () => __async(this, null, function* () {
               var _a3;
-              (_a3 = player.panel) == null ? void 0 : _a3.controller.removeEventListener("volume", updateVolumeWrapper);
+              player.removeEventListener("close", closeHandle);
+              (_a3 = player.panel) == null ? void 0 : _a3.controller.removeEventListener(
+                "volume",
+                updateVolumeWrapper
+              );
               player.clearEventListener("recordStart");
               player.clearEventListener("recordStop");
               player.clearEventListener("screenshot");
@@ -18694,7 +18724,8 @@ var PuPlayer = (props) => {
               yield new Promise((r) => {
                 setTimeout(r, 100);
               });
-            }));
+            });
+            player.addEventListener("close", closeHandle);
             onConnected && onConnected();
             reconnectMgr == null ? void 0 : reconnectMgr.cancelReconnect();
             dialog_default.closeDialogs([dialogId || ""], tempToken || "");
@@ -18789,7 +18820,10 @@ var PuPlayer = (props) => {
             let updateVolumeWrapper = () => {
               updateVolumeButton();
             };
-            player.panel.controller.addEventListener("volume", updateVolumeWrapper);
+            player.panel.controller.addEventListener(
+              "volume",
+              updateVolumeWrapper
+            );
             const volumeSlider = player.panel.controller.VolumeSlider;
             if (volumeSlider) {
               volumeSlider.percent = hplayer.getVolume();
@@ -18803,8 +18837,10 @@ var PuPlayer = (props) => {
                 DisplayVolumn2(Number(e2 == null ? void 0 : e2.percent));
               });
             }
-            if (player.mikeBtn)
+            if (player.mikeBtn) {
               player.mikeBtn.intercom = intercom == null ? void 0 : intercom.instance;
+              player.mikeBtn.type = this.protocol;
+            }
           } catch (e2) {
             player.mask.visible = true;
             player.mask.text = t("connect-failed");

package/dist/types/components/bvWebrtc/index.d.ts

@@ -16,7 +16,7 @@ export interface IBvWebrtcComponentProps extends Props {
     enableController?: boolean;
 }
 export interface IBvWebrtcComponentInstance extends IComponentInstance {
-    open(protocol?: "auto" | "webrtc" | "ws-bvrtc"): Promise<any>;
+    open(protocol?: "auto" | "webrtc" | "ws-bvrtc", mikeButtonType?: "auto" | "webrtc" | "ws-bvrtc"): Promise<any>;
     close(): Promise<any>;
     destroy(): void;
     setOption?(option: any): void;

package/dist/types/components/subComponent/mikeButton.d.ts

@@ -5,6 +5,7 @@ export declare class MikeButton extends HTMLElement {
     get talking(): boolean;
     set talking(state: boolean);
     set intercom(ins: IIntercomInstance | undefined);
+    set type(type: "auto" | "webrtc" | "ws-bvrtc" | undefined);
     connectedCallback(): void;
     render(): void;
 }

package/package.json

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

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

@@ -1,12 +0,0 @@
-import { ShLogger } from "@shirtiny/logger";
-declare class EmbedLogger extends ShLogger {
-    http(_message: string, ..._data: any[]): void;
-    info: (message: string, ...data: any[]) => void;
-    debug: (message: string, ...data: any[]) => void;
-    test: (message: string, ...data: any[]) => void;
-    gc: (message: string, ...data: any[]) => void;
-    libWarn: (message: string, ...data: any[]) => void;
-    libError: (message: string, ...data: any[]) => void;
-}
-declare const logger: EmbedLogger;
-export default logger;