call-live-sdk1 0.0.33 → 0.0.35

package/dist/call-live-sdk.es.js

@@ -28814,7 +28814,7 @@ function removeSign(options = {}) {
   localStorage.removeItem(storageKey);
 }
 const isMobile$3 = (() => {
-  const mobileRegex = /Android|webOS|iPhone|iPod|BlackBerry|IEMobile|Opera Mini|Mobile|mobile|CriOS/i;
+  const mobileRegex = /\b(Android|Adr|adr|iPhone|iPad|iPod|webOS|BlackBerry|IEMobile|Opera Mini|Mobile|mobile|CriOS|Kindle|Silk|Windows Phone|Windows Mobile)\b/i;
   const tabletRegex = /iPad/i;
   const userAgent2 = navigator.userAgent;
   const platform2 = navigator.platform;
@@ -28822,6 +28822,10 @@ const isMobile$3 = (() => {
   if (mobileRegex.test(userAgent2)) {
     return true;
   }
+  const isAndroid2 = /(^|\W)(Android|Adr|adr)(\W|$)/i.test(userAgent2) || /\bLinux\b/i.test(userAgent2) && /(\bMobile\b|\bTablet\b|\bAdr\b)/i.test(userAgent2);
+  if (isAndroid2) {
+    return true;
+  }
   if ((platform2 === "MacIntel" || platform2 === "iPad") && isTouchDevice) {
     const screenWidth = window.screen.width;
     const screenHeight = window.screen.height;
@@ -169785,41 +169789,6 @@ function debounce$2(func, wait2, options) {
   debounced.flush = flush3;
   return debounced;
 }
-const CountDown = ({ isLive }) => {
-  const [timer, setTimer] = reactExports.useState("00:00:00");
-  const timerIntervalRef = reactExports.useRef(null);
-  const secondsRef = reactExports.useRef(0);
-  const formatTime2 = (totalSeconds) => {
-    const hours = Math.floor(totalSeconds / 3600);
-    const minutes = Math.floor(totalSeconds % 3600 / 60);
-    const seconds = totalSeconds % 60;
-    return [hours, minutes, seconds].map((v3) => v3 < 10 ? `0${v3}` : v3).join(":");
-  };
-  reactExports.useEffect(() => {
-    if (isLive) {
-      secondsRef.current = 0;
-      setTimer("00:00:00");
-      timerIntervalRef.current = setInterval(() => {
-        secondsRef.current += 1;
-        setTimer(formatTime2(secondsRef.current));
-      }, 1e3);
-    } else {
-      if (timerIntervalRef.current) {
-        clearInterval(timerIntervalRef.current);
-        timerIntervalRef.current = null;
-      }
-      secondsRef.current = 0;
-      setTimer("00:00:00");
-    }
-    return () => {
-      if (timerIntervalRef.current) {
-        clearInterval(timerIntervalRef.current);
-      }
-    };
-  }, [isLive]);
-  return isLive && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-16px text-#fff h-full flex items-center mr-3", children: timer });
-};
-const CountDown$1 = reactExports.memo(CountDown);
 const useLivePushCodeStore = create$c((set3, get4) => ({
   livePushCode: null,
   isLoading: false,
@@ -169893,6 +169862,41 @@ const useCommentChatUrlStore = create$c((set3) => ({
     }
   }
 }));
+const CountDown = ({ isLive }) => {
+  const [timer, setTimer] = reactExports.useState("00:00:00");
+  const timerIntervalRef = reactExports.useRef(null);
+  const secondsRef = reactExports.useRef(0);
+  const formatTime2 = (totalSeconds) => {
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor(totalSeconds % 3600 / 60);
+    const seconds = totalSeconds % 60;
+    return [hours, minutes, seconds].map((v3) => v3 < 10 ? `0${v3}` : v3).join(":");
+  };
+  reactExports.useEffect(() => {
+    if (isLive) {
+      secondsRef.current = 0;
+      setTimer("00:00:00");
+      timerIntervalRef.current = setInterval(() => {
+        secondsRef.current += 1;
+        setTimer(formatTime2(secondsRef.current));
+      }, 1e3);
+    } else {
+      if (timerIntervalRef.current) {
+        clearInterval(timerIntervalRef.current);
+        timerIntervalRef.current = null;
+      }
+      secondsRef.current = 0;
+      setTimer("00:00:00");
+    }
+    return () => {
+      if (timerIntervalRef.current) {
+        clearInterval(timerIntervalRef.current);
+      }
+    };
+  }, [isLive]);
+  return isLive && /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "text-16px text-#fff h-full flex items-center mr-3", children: timer });
+};
+const CountDown$1 = reactExports.memo(CountDown);
 const useActivityTypeStore = create$c((set3, get4) => ({
   activityType: {
     active_type: 0
@@ -186061,7 +186065,7 @@ class WTNStream extends EnhancedEventEmitter {
   }
 }
 __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "startPushWTN"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "stopPushWTN"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "muteWTNLocalAudio"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "muteWTNLocalVideo"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "sendWTNSEIMessage"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "startPlayWTN"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "stopPlayWTN"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "muteWTNRemoteAudio"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "muteWTNRemoteVideo"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "setWTNRemoteVideoPlayer"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "setWTNRemoteAudioPlaybackVolume"), __decorateClass$2([reportRtcSdkApi()], WTNStream.prototype, "getWTNVideoPlayerVisibility"), __decorateClass$2([pubSubLock], WTNStream.prototype, "_sendStartPushStreamSignal"), __decorateClass$2([pubSubLock], WTNStream.prototype, "_stopLocalStream"), __decorateClass$2([pubSubLock], WTNStream.prototype, "_sendStartPullStreamSignal"), __decorateClass$2([pubSubLock], WTNStream.prototype, "_unsubscribePublicStream");
-const logger$1 = new Logger$1$1("AudioDeviceManager", 1);
+const logger$1$1 = new Logger$1$1("AudioDeviceManager", 1);
 class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
   constructor(e3) {
     super(), _defineProperty$a(this, "_audioLevelFetcher", void 0), _defineProperty$a(this, "_playbackDeviceTestTimer", void 0), _defineProperty$a(this, "_audioElement", void 0), _defineProperty$a(this, "_audioTrack", void 0), _defineProperty$a(this, "_mediaRecorder", void 0), _defineProperty$a(this, "_recoderTimer", void 0), _defineProperty$a(this, "_isAudioPlaybackDeviceTesting", false), _defineProperty$a(this, "_isAudioDeviceRecordTesting", false), _defineProperty$a(this, "_audioCaptureAndRecoderResolve", void 0), _defineProperty$a(this, "_onAutoplayFailed", void 0), _defineProperty$a(this, "_audioPlaybackDeviceId", void 0), this._ctx = e3;
@@ -186072,16 +186076,16 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
   async startAudioPlaybackDeviceTest(e3, t2) {
     if (this._isAudioPlaybackDeviceTesting || this._isAudioDeviceRecordTesting)
       throw new SDKError(ErrorCode.REPEAT_DEVICE_TEST, "device test cannot be called repeatedly at the same time.");
-    this._isAudioPlaybackDeviceTesting = true, logger$1.info("startAudioPlaybackDeviceTest()", "Invoke");
+    this._isAudioPlaybackDeviceTesting = true, logger$1$1.info("startAudioPlaybackDeviceTest()", "Invoke");
     try {
       await this._playAudioFile(e3, { loop: true });
     } catch (e4) {
-      throw logger$1.error("startAudioPlaybackDeviceTest()", "error", e4), this.stopAudioPlaybackDeviceTest(), e4;
+      throw logger$1$1.error("startAudioPlaybackDeviceTest()", "error", e4), this.stopAudioPlaybackDeviceTest(), e4;
     }
     this._startEmitAudioPlaybackDeviceTestVolume(t2);
   }
   stopAudioPlaybackDeviceTest() {
-    this._isAudioPlaybackDeviceTesting && (logger$1.info("stopAudioPlaybackDeviceTest()", "Invoke"), this._isAudioPlaybackDeviceTesting = false, this._stopEmitAudioPlaybackDeviceTestVolume(), this._destroyAudioElement());
+    this._isAudioPlaybackDeviceTesting && (logger$1$1.info("stopAudioPlaybackDeviceTest()", "Invoke"), this._isAudioPlaybackDeviceTesting = false, this._stopEmitAudioPlaybackDeviceTestVolume(), this._destroyAudioElement());
   }
   async startAudioDeviceRecordTest(e3, t2, i) {
     let o2 = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : 3e4;
@@ -186089,8 +186093,8 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
       throw new SDKError(ErrorCode.NOT_SUPPORTED, "Your browser does not support MediaRecorder.");
     if (this._isAudioDeviceRecordTesting || this._isAudioPlaybackDeviceTesting)
       throw new SDKError(ErrorCode.REPEAT_DEVICE_TEST, "device test cannot be called repeatedly at the same time.");
-    this._isAudioDeviceRecordTesting = true, logger$1.info("startAudioDeviceRecordTest()", "Invoke"), this._recoderTimer = setTimeout(() => {
-      logger$1.info("startAudioDeviceRecordTest()", "".concat(o2, 'ms automatic call method "stopAudioDeviceRecordAndPlayTest"')), this._stopAudioCaptureAndRecoder();
+    this._isAudioDeviceRecordTesting = true, logger$1$1.info("startAudioDeviceRecordTest()", "Invoke"), this._recoderTimer = setTimeout(() => {
+      logger$1$1.info("startAudioDeviceRecordTest()", "".concat(o2, 'ms automatic call method "stopAudioDeviceRecordAndPlayTest"')), this._stopAudioCaptureAndRecoder();
     }, o2);
     try {
       this._onAutoplayFailed = t2, await this._startAudioCaptureAndRecoder(e3, null != i ? i : 100);
@@ -186100,16 +186104,16 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
     delete this._audioCaptureAndRecoderResolve;
   }
   stopAudioDeviceRecordAndPlayTest() {
-    logger$1.info("stopAudioDeviceRecordAndPlayTest()", "Invoke"), void 0 !== this._recoderTimer && (clearTimeout(this._recoderTimer), delete this._recoderTimer), this._stopAudioCaptureAndRecoder();
+    logger$1$1.info("stopAudioDeviceRecordAndPlayTest()", "Invoke"), void 0 !== this._recoderTimer && (clearTimeout(this._recoderTimer), delete this._recoderTimer), this._stopAudioCaptureAndRecoder();
   }
   stopAudioDevicePlayTest() {
-    this._isAudioDeviceRecordTesting && (logger$1.info("stopAudioDevicePlayTest()", "Invoke"), this._isAudioDeviceRecordTesting = false, this._mediaRecorder && (this._mediaRecorder.ondataavailable = null), this.stopAudioDeviceRecordAndPlayTest(), this._stopEmitAudioPlaybackDeviceTestVolume(), this._destroyAudioElement()), delete this._onAutoplayFailed;
+    this._isAudioDeviceRecordTesting && (logger$1$1.info("stopAudioDevicePlayTest()", "Invoke"), this._isAudioDeviceRecordTesting = false, this._mediaRecorder && (this._mediaRecorder.ondataavailable = null), this.stopAudioDeviceRecordAndPlayTest(), this._stopEmitAudioPlaybackDeviceTestVolume(), this._destroyAudioElement()), delete this._onAutoplayFailed;
   }
   getRecordTrack() {
     return this._audioTrack;
   }
   async setSinkId(e3) {
-    if (logger$1.info("setSinkId()", "Invoke"), void 0 === HTMLAudioElement.prototype.setSinkId)
+    if (logger$1$1.info("setSinkId()", "Invoke"), void 0 === HTMLAudioElement.prototype.setSinkId)
       throw new SDKError(ErrorCode.NOT_SUPPORTED, "setSinkId not supported by current browser");
     const t2 = await dd.getAudioPlaybackDeviceById(e3);
     if (!t2)
@@ -186120,22 +186124,22 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
     return this._audioPlaybackDeviceId;
   }
   destroy() {
-    logger$1.info("destroy()", "Invoke"), super.removeAllListeners(), this.stopAudioPlaybackDeviceTest(), this.stopAudioDevicePlayTest();
+    logger$1$1.info("destroy()", "Invoke"), super.removeAllListeners(), this.stopAudioPlaybackDeviceTest(), this.stopAudioDevicePlayTest();
   }
   async _playAudioFile(e3, t2) {
-    return logger$1.info("_playAudioFile()", "Invoke url=".concat(e3, "; loop=").concat(t2.loop)), new Promise((i, o2) => {
+    return logger$1$1.info("_playAudioFile()", "Invoke url=".concat(e3, "; loop=").concat(t2.loop)), new Promise((i, o2) => {
       const r3 = createElement$3("audio", { attributes: { src: e3, crossOrigin: "anonymous" } });
       this._audioElement = r3, r3.loop = t2.loop, this._audioLevelFetcher = new AudioLevelFetcher(r3), r3.onplaying = () => {
-        r3.onplaying = null, logger$1.info("_playAudioFile()", "onplaying"), i();
+        r3.onplaying = null, logger$1$1.info("_playAudioFile()", "onplaying"), i();
       }, r3.onerror = async (e4) => {
         var t3;
-        logger$1.error("_playAudioFile()", "onerror", e4);
+        logger$1$1.error("_playAudioFile()", "onerror", e4);
         const i2 = e4.message || (null == r3 || null === (t3 = r3.error) || void 0 === t3 ? void 0 : t3.message);
         o2(new SDKError(ErrorCode.LOAD_RESOURCES_FAILED, "Failed to play recorded audio".concat(i2 ? ", reason: ".concat(i2) : ".")));
       }, this._setAudioCtxSinkId().then(() => {
         var e4, t3;
         return null === (e4 = r3.play()) || void 0 === e4 || null === (t3 = e4.catch) || void 0 === t3 ? void 0 : t3.call(e4, (e5) => {
-          logger$1.warn("_playAudioFile()", "autoplay error", e5);
+          logger$1$1.warn("_playAudioFile()", "autoplay error", e5);
           const t4 = "Failed to play recorded audio, ".concat(e5.name, ": ").concat(e5.message);
           "NotAllowedError" === e5.name && this._onAutoplayFailed ? this._onAutoplayFailed(() => {
             var e6;
@@ -186146,28 +186150,28 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
     });
   }
   _destroyAudioElement() {
-    this._audioElement && (logger$1.info("_destroyAudioElement()", "Invoke"), this._audioElement.onplaying = null, this._audioElement.onerror = null, this._audioElement.src = "", delete this._audioElement, "function" == typeof this._audioCaptureAndRecoderResolve && this._audioCaptureAndRecoderResolve());
+    this._audioElement && (logger$1$1.info("_destroyAudioElement()", "Invoke"), this._audioElement.onplaying = null, this._audioElement.onerror = null, this._audioElement.src = "", delete this._audioElement, "function" == typeof this._audioCaptureAndRecoderResolve && this._audioCaptureAndRecoderResolve());
   }
   _startEmitAudioPlaybackDeviceTestVolume(e3) {
-    e3 = Math.max(e3, 100), this._audioElement && (logger$1.info("_startEmitAudioPlaybackDeviceTestVolume()", "start timer(".concat(e3, "ms)")), this._playbackDeviceTestTimer = self.setInterval(() => {
+    e3 = Math.max(e3, 100), this._audioElement && (logger$1$1.info("_startEmitAudioPlaybackDeviceTestVolume()", "start timer(".concat(e3, "ms)")), this._playbackDeviceTestTimer = self.setInterval(() => {
       this._audioLevelFetcher && this.emit("onAudioPlaybackDeviceTestVolume", this._audioLevelFetcher.getAudioLevel());
     }, e3));
   }
   _stopEmitAudioPlaybackDeviceTestVolume() {
     var e3;
-    void 0 !== this._playbackDeviceTestTimer && (logger$1.info("_stopEmitAudioPlaybackDeviceTestVolume()", "stop timer"), self.clearInterval(this._playbackDeviceTestTimer), delete this._playbackDeviceTestTimer), null === (e3 = this._audioLevelFetcher) || void 0 === e3 || e3.destroy(), delete this._audioLevelFetcher;
+    void 0 !== this._playbackDeviceTestTimer && (logger$1$1.info("_stopEmitAudioPlaybackDeviceTestVolume()", "stop timer"), self.clearInterval(this._playbackDeviceTestTimer), delete this._playbackDeviceTestTimer), null === (e3 = this._audioLevelFetcher) || void 0 === e3 || e3.destroy(), delete this._audioLevelFetcher;
   }
   async _startAudioCaptureAndRecoder(e3, t2) {
     this._audioTrack = await createMicrophoneAudioTrack(this._ctx, this._ctx.audioProfileManager.getConstraints()), this._audioTrack.setVolume(t2 + 0.01);
     const i = new MediaStream([this._audioTrack.preprocessingTrack]);
-    return logger$1.info("startAudioDeviceRecordTest()", "create microphone track success!"), new Promise((t3, o2) => {
+    return logger$1$1.info("startAudioDeviceRecordTest()", "create microphone track success!"), new Promise((t3, o2) => {
       let r3;
-      "function" == typeof MediaRecorder.isTypeSupported && (r3 = ["audio/webm", "audio/mp4"].find((e4) => MediaRecorder.isTypeSupported(e4)), logger$1.info("startAudioDeviceRecordTest()", "use mimeType: ".concat(r3))), this._mediaRecorder = new MediaRecorder(i, r3 ? { mimeType: r3 } : void 0);
+      "function" == typeof MediaRecorder.isTypeSupported && (r3 = ["audio/webm", "audio/mp4"].find((e4) => MediaRecorder.isTypeSupported(e4)), logger$1$1.info("startAudioDeviceRecordTest()", "use mimeType: ".concat(r3))), this._mediaRecorder = new MediaRecorder(i, r3 ? { mimeType: r3 } : void 0);
       const s3 = this._mediaRecorder.mimeType;
       this._mediaRecorder.ondataavailable = async (i2) => {
         if (this._isAudioDeviceRecordTesting) {
           var r4;
-          logger$1.info("startAudioDeviceRecordTest()", "get recorded file(mimeType: ".concat(s3, ")."));
+          logger$1$1.info("startAudioDeviceRecordTest()", "get recorded file(mimeType: ".concat(s3, ")."));
           const n3 = new Blob([i2.data], { type: s3 });
           try {
             await this._playAudioFile(_URL.createObjectURL(n3), { loop: false });
@@ -186194,9 +186198,9 @@ class AudioDeviceManager extends eventemitter3Exports$1.EventEmitter {
       "default" === e3 && (e3 = "");
       try {
         var t2, i;
-        null === (t2 = audioContextManager.getAudioContextInstance()) || void 0 === t2 || null === (i = t2.setSinkId) || void 0 === i || i.call(t2, e3), logger$1.info("setSinkId", "ctx.sinkId=".concat(e3));
+        null === (t2 = audioContextManager.getAudioContextInstance()) || void 0 === t2 || null === (i = t2.setSinkId) || void 0 === i || i.call(t2, e3), logger$1$1.info("setSinkId", "ctx.sinkId=".concat(e3));
       } catch (e4) {
-        logger$1.error("setSinkId", "failed, ".concat(e4.name, " - ").concat(e4.message));
+        logger$1$1.error("setSinkId", "failed, ".concat(e4.name, " - ").concat(e4.message));
       }
     }
   }
@@ -211308,6 +211312,73 @@ class bh extends Va {
   }
 }
 t(bh, "type", "Vibrance"), t(bh, "defaults", { vibrance: 0 }), t(bh, "uniformLocations", ["uVibrance"]), tt.setClass(bh);
+const useCallUserPagination = (config2) => {
+  const { gridCols } = config2;
+  const [currentPage, setCurrentPage] = reactExports.useState(1);
+  const { callUsers, setCallUsersCurrentPageRef, layoutMode } = useCallStore();
+  reactExports.useEffect(() => {
+    setCallUsersCurrentPageRef(currentPage);
+  }, [currentPage]);
+  reactExports.useEffect(() => {
+    setCurrentPage(1);
+  }, [layoutMode]);
+  const usersPerPage = reactExports.useMemo(() => {
+    return gridCols <= 1 ? 5 : 9;
+  }, [gridCols]);
+  const getTotalVideoCount = reactExports.useMemo(() => {
+    const videoList = callUsers.flatMap((item) => {
+      var _a2, _b, _c2;
+      if (item.waiting_mode_state === WaitingModeState.WAITING) {
+        return [];
+      }
+      if (item.isScreenEnabled) {
+        return [(_a2 = item.videoList) == null ? void 0 : _a2[1], (_b = item.videoList) == null ? void 0 : _b[0]];
+      }
+      return [(_c2 = item.videoList) == null ? void 0 : _c2[0]];
+    });
+    return videoList.length;
+  }, [callUsers]);
+  reactExports.useEffect(() => {
+    if (gridCols <= 1 && getTotalVideoCount <= 5) {
+      setCurrentPage(1);
+    }
+  }, [gridCols, getTotalVideoCount]);
+  const getTotalPages = reactExports.useMemo(() => {
+    return Math.ceil(getTotalVideoCount / usersPerPage) || 1;
+  }, [getTotalVideoCount, usersPerPage]);
+  const calculateOptimalGridCols = (userCount, defaultGridCols) => {
+    if (defaultGridCols <= 1)
+      return defaultGridCols;
+    if (userCount <= 1)
+      return 1;
+    if (userCount === 2)
+      return 2;
+    if (userCount <= 4)
+      return 2;
+    if (userCount <= 9)
+      return 3;
+    return 3;
+  };
+  const handlePrevPage = () => {
+    setCurrentPage((prev2) => Math.max(prev2 - 1, 1));
+  };
+  const handleNextPage = () => {
+    setCurrentPage((prev2) => Math.min(prev2 + 1, getTotalPages));
+  };
+  const goToPage = (pageNumber) => {
+    setCurrentPage(Math.min(Math.max(pageNumber, 1), getTotalPages));
+  };
+  return {
+    currentPage,
+    usersPerPage,
+    totalPages: getTotalPages,
+    totalVideoCount: getTotalVideoCount,
+    handlePrevPage,
+    handleNextPage,
+    goToPage,
+    calculateOptimalGridCols
+  };
+};
 function _extends$y() {
   _extends$y = Object.assign ? Object.assign.bind() : function(target) {
     for (var i = 1; i < arguments.length; i++) {
@@ -211780,73 +211851,6 @@ const CallSingleColumnLayout = ({
     })]
   });
 };
-const useCallUserPagination = (config2) => {
-  const { gridCols } = config2;
-  const [currentPage, setCurrentPage] = reactExports.useState(1);
-  const { callUsers, setCallUsersCurrentPageRef, layoutMode } = useCallStore();
-  reactExports.useEffect(() => {
-    setCallUsersCurrentPageRef(currentPage);
-  }, [currentPage]);
-  reactExports.useEffect(() => {
-    setCurrentPage(1);
-  }, [layoutMode]);
-  const usersPerPage = reactExports.useMemo(() => {
-    return gridCols <= 1 ? 5 : 9;
-  }, [gridCols]);
-  const getTotalVideoCount = reactExports.useMemo(() => {
-    const videoList = callUsers.flatMap((item) => {
-      var _a2, _b, _c2;
-      if (item.waiting_mode_state === WaitingModeState.WAITING) {
-        return [];
-      }
-      if (item.isScreenEnabled) {
-        return [(_a2 = item.videoList) == null ? void 0 : _a2[1], (_b = item.videoList) == null ? void 0 : _b[0]];
-      }
-      return [(_c2 = item.videoList) == null ? void 0 : _c2[0]];
-    });
-    return videoList.length;
-  }, [callUsers]);
-  reactExports.useEffect(() => {
-    if (gridCols <= 1 && getTotalVideoCount <= 5) {
-      setCurrentPage(1);
-    }
-  }, [gridCols, getTotalVideoCount]);
-  const getTotalPages = reactExports.useMemo(() => {
-    return Math.ceil(getTotalVideoCount / usersPerPage) || 1;
-  }, [getTotalVideoCount, usersPerPage]);
-  const calculateOptimalGridCols = (userCount, defaultGridCols) => {
-    if (defaultGridCols <= 1)
-      return defaultGridCols;
-    if (userCount <= 1)
-      return 1;
-    if (userCount === 2)
-      return 2;
-    if (userCount <= 4)
-      return 2;
-    if (userCount <= 9)
-      return 3;
-    return 3;
-  };
-  const handlePrevPage = () => {
-    setCurrentPage((prev2) => Math.max(prev2 - 1, 1));
-  };
-  const handleNextPage = () => {
-    setCurrentPage((prev2) => Math.min(prev2 + 1, getTotalPages));
-  };
-  const goToPage = (pageNumber) => {
-    setCurrentPage(Math.min(Math.max(pageNumber, 1), getTotalPages));
-  };
-  return {
-    currentPage,
-    usersPerPage,
-    totalPages: getTotalPages,
-    totalVideoCount: getTotalVideoCount,
-    handlePrevPage,
-    handleNextPage,
-    goToPage,
-    calculateOptimalGridCols
-  };
-};
 const useOnlineUsers = () => {
   const { callUsers, callConfig } = useCallStore();
   const [isLoading, setIsLoading] = reactExports.useState(false);
@@ -270450,6 +270454,87 @@ const SvgGuideO = reactExports.forwardRef((props, ref) => {
     reactExports.createElement(SvgIcon$6, null)
   );
 });
+const useDrawingToolsStore = create$c((set3, get4) => ({
+  // 选中的工具
+  selectedTool: 0,
+  setSelectedTool: (tool) => set3({ selectedTool: tool }),
+  // 画笔设置
+  penSize: 2,
+  setPenSize: (size) => set3((state) => {
+    const newSize = typeof size === "function" ? size(state.penSize) : size;
+    return {
+      penSize: newSize
+    };
+  }),
+  penColor: "#ff5a5a",
+  setPenColor: (color) => set3((state) => {
+    const newColor = typeof color === "function" ? color(state.penColor) : color;
+    return {
+      penColor: newColor
+    };
+  }),
+  // 激光笔设置
+  laserPenSize: 2,
+  setLaserPenSize: (size) => set3((state) => {
+    const newSize = typeof size === "function" ? size(state.laserPenSize) : size;
+    return {
+      laserPenSize: newSize
+    };
+  }),
+  laserPenColor: "#ff5a5a",
+  setLaserPenColor: (color) => set3((state) => {
+    const newColor = typeof color === "function" ? color(state.laserPenColor) : color;
+    return {
+      laserPenColor: newColor
+    };
+  }),
+  // 形状设置
+  shapeSize: 2,
+  setShapeSize: (size) => set3((state) => {
+    const newSize = typeof size === "function" ? size(state.shapeSize) : size;
+    return {
+      shapeSize: newSize
+    };
+  }),
+  shapeType: "rect",
+  setShapeType: (type4) => set3((state) => {
+    const newType = typeof type4 === "function" ? type4(state.shapeType) : type4;
+    return {
+      shapeType: newType,
+      shapeTypeRef: { current: newType }
+    };
+  }),
+  shapeColor: "#ff5a5a",
+  setShapeColor: (color) => set3((state) => {
+    const newColor = typeof color === "function" ? color(state.shapeColor) : color;
+    return {
+      shapeColor: newColor
+    };
+  }),
+  // 文字设置
+  textSize: 16,
+  setTextSize: (size) => set3((state) => {
+    const newSize = typeof size === "function" ? size(state.textSize) : size;
+    return {
+      textSize: newSize
+    };
+  }),
+  textColor: "#ff5a5a",
+  setTextColor: (color) => set3((state) => {
+    const newColor = typeof color === "function" ? color(state.textColor) : color;
+    return {
+      textColor: newColor
+    };
+  }),
+  // 预览弹窗状态
+  isPreviewModalVisible: false,
+  setIsPreviewModalVisible: (visible) => set3({ isPreviewModalVisible: visible }),
+  // 绘图相关引用
+  downPoint: { current: null },
+  upPoint: { current: null },
+  currentShape: { current: null },
+  getter: () => get4()
+}));
 const ShapeTypePicker = reactExports.memo(
   ({
     types: types2 = ["rect", "circle"],
@@ -270597,87 +270682,6 @@ const ToolOption = reactExports.memo(({
   });
 });
 ToolOption.displayName = "ToolOption";
-const useDrawingToolsStore = create$c((set3, get4) => ({
-  // 选中的工具
-  selectedTool: 0,
-  setSelectedTool: (tool) => set3({ selectedTool: tool }),
-  // 画笔设置
-  penSize: 2,
-  setPenSize: (size) => set3((state) => {
-    const newSize = typeof size === "function" ? size(state.penSize) : size;
-    return {
-      penSize: newSize
-    };
-  }),
-  penColor: "#ff5a5a",
-  setPenColor: (color) => set3((state) => {
-    const newColor = typeof color === "function" ? color(state.penColor) : color;
-    return {
-      penColor: newColor
-    };
-  }),
-  // 激光笔设置
-  laserPenSize: 2,
-  setLaserPenSize: (size) => set3((state) => {
-    const newSize = typeof size === "function" ? size(state.laserPenSize) : size;
-    return {
-      laserPenSize: newSize
-    };
-  }),
-  laserPenColor: "#ff5a5a",
-  setLaserPenColor: (color) => set3((state) => {
-    const newColor = typeof color === "function" ? color(state.laserPenColor) : color;
-    return {
-      laserPenColor: newColor
-    };
-  }),
-  // 形状设置
-  shapeSize: 2,
-  setShapeSize: (size) => set3((state) => {
-    const newSize = typeof size === "function" ? size(state.shapeSize) : size;
-    return {
-      shapeSize: newSize
-    };
-  }),
-  shapeType: "rect",
-  setShapeType: (type4) => set3((state) => {
-    const newType = typeof type4 === "function" ? type4(state.shapeType) : type4;
-    return {
-      shapeType: newType,
-      shapeTypeRef: { current: newType }
-    };
-  }),
-  shapeColor: "#ff5a5a",
-  setShapeColor: (color) => set3((state) => {
-    const newColor = typeof color === "function" ? color(state.shapeColor) : color;
-    return {
-      shapeColor: newColor
-    };
-  }),
-  // 文字设置
-  textSize: 16,
-  setTextSize: (size) => set3((state) => {
-    const newSize = typeof size === "function" ? size(state.textSize) : size;
-    return {
-      textSize: newSize
-    };
-  }),
-  textColor: "#ff5a5a",
-  setTextColor: (color) => set3((state) => {
-    const newColor = typeof color === "function" ? color(state.textColor) : color;
-    return {
-      textColor: newColor
-    };
-  }),
-  // 预览弹窗状态
-  isPreviewModalVisible: false,
-  setIsPreviewModalVisible: (visible) => set3({ isPreviewModalVisible: visible }),
-  // 绘图相关引用
-  downPoint: { current: null },
-  upPoint: { current: null },
-  currentShape: { current: null },
-  getter: () => get4()
-}));
 const COLORS = ["#ff5a5a", "#ffbf48", "#3a9bff", "#58efb8", "#000000", "#808080", "#ffffff"];
 const LINE_SIZES = [2, 4, 6];
 const TEXT_SIZES = [16, 20, 24, 28, 32];
@@ -279082,7 +279086,7 @@ var __defProp$1 = _Object$defineProperty, __getOwnPropDesc = _Object$getOwnPrope
   for (var o2, a7 = __getOwnPropDesc(t2, r3), i = e3.length - 1; i >= 0; i--)
     (o2 = e3[i]) && (a7 = o2(t2, r3, a7) || a7);
   return a7 && __defProp$1(t2, r3, a7), a7;
-}, logger = new Logger3("RTCBeautyExtension", 1);
+}, logger$1 = new Logger3("RTCBeautyExtension", 1);
 function getBrowser() {
   var e3 = "none";
   return null !== window.navigator.userAgent.match("Firefox") ? e3 = "mozilla" : null !== window.navigator.userAgent.match("Chrome") ? (e3 = "chrome-stable", null !== window.navigator.userAgent.match("Electron") && (e3 = "electron")) : (null !== window.navigator.userAgent.match("Safari") || null !== window.navigator.userAgent.match("AppleWebKit")) && (e3 = "safari"), e3;
@@ -279464,7 +279468,7 @@ var _RTCBeautyExtension2 = (_Class = function() {
               var t3 = e6.ARSDK;
               _RTCBeautyExtension2.WebARMainSDK = t3;
             }).catch(function(e6) {
-              throw logger.error("load ar sdk error", e6), new Error(TIME_OUT_MESSAGE);
+              throw logger$1.error("load ar sdk error", e6), new Error(TIME_OUT_MESSAGE);
             }));
           case 1:
           case "end":
@@ -290682,20 +290686,25 @@ const WaitingUserList = ({
   waitingUsers
 }) => {
   const {
-    callUsers,
+    updateCallUser,
     getter,
     kickRoomUser
   } = useCallStore();
   const handleAdmitUser = (userId) => {
     var _a2;
+    updateCallUser(userId, {
+      waiting_mode_state: WaitingModeState.ADMITTED
+    });
+    const latestCallUsers = getter().callUsers;
     (_a2 = getter().rtc) == null ? void 0 : _a2.engine.sendRoomMessage(JSON.stringify({
       type: "waiting_mode",
       data: {
         rtc_userid: userId,
         waiting_mode_state: WaitingModeState.ADMITTED,
-        users: callUsers.map((user) => ({
+        users: latestCallUsers.map((user) => ({
           rtc_userid: user.rtc_userid,
-          waiting_mode_state: user.waiting_mode_state
+          // 如果是当前准入的用户，使用最新的 ADMITTED 状态
+          waiting_mode_state: user.rtc_userid === userId ? WaitingModeState.ADMITTED : user.waiting_mode_state
         }))
       }
     }));
@@ -301811,9 +301820,17 @@ const useRoomMessageHandler = (params = {}) => {
     console.log("处理用户变更消息", {
       user,
       users,
-      action
+      action,
+      senderId: userid
     });
     try {
+      if (action === "confirm" && (user == null ? void 0 : user.waiting_mode_state) === WaitingModeState.ADMITTED) {
+        console.log(`[准入确认] 用户 ${userid} 确认准入`);
+        updateCallUser(userid, {
+          waiting_mode_state: WaitingModeState.ADMITTED
+        });
+        return;
+      }
       if (user) {
         updateCallUser(userid, {
           ...user
@@ -301846,7 +301863,7 @@ const useRoomMessageHandler = (params = {}) => {
         userid
       });
     }
-  }, [updateCallUser]);
+  }, [updateCallUser, callConfig.rtc_userid]);
   const handleChangeMediaMessage = reactExports.useCallback((data2, userid) => {
     var _a2;
     const mediaData = data2.data;
@@ -303898,8 +303915,10 @@ const WebLiveLogin = () => {
     };
   }, [handleLogin]);
   reactExports.useEffect(() => {
-    window.log = [];
-  });
+    if (!window.log) {
+      window.log = [];
+    }
+  }, []);
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
     className: "web-live-login-container",
     children: [/* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
@@ -304975,6 +304994,286 @@ const PageIndicator = reactExports.memo(
   }
 );
 PageIndicator.displayName = "PageIndicator";
+const DEFAULT_CONFIG = {
+  enabled: false,
+  // 开发环境默认启用
+  maxSize: 1e3,
+  cleanupThreshold: 1200,
+  retainSize: 800,
+  autoCleanupInterval: 6e4,
+  // 60秒
+  logToConsole: true,
+  levelFilter: "debug"
+  /* DEBUG */
+};
+class LoggerManager {
+  constructor(config2 = {}) {
+    this.cleanupIntervalId = null;
+    this.config = { ...DEFAULT_CONFIG, ...config2 };
+    this.initialize();
+  }
+  /**
+   * 初始化日志管理器
+   */
+  initialize() {
+    if (!window.log) {
+      window.log = [];
+    }
+    if (this.config.autoCleanupInterval && this.config.autoCleanupInterval > 0) {
+      this.startAutoCleanup();
+    }
+  }
+  /**
+   * 开始自动清理
+   */
+  startAutoCleanup() {
+    if (this.cleanupIntervalId) {
+      clearInterval(this.cleanupIntervalId);
+    }
+    this.cleanupIntervalId = setInterval(() => {
+      this.performCleanup();
+    }, this.config.autoCleanupInterval);
+  }
+  /**
+   * 执行日志清理
+   */
+  performCleanup() {
+    const cleaned = this.cleanupLogs(this.config.retainSize);
+    if (cleaned > 0 && this.config.logToConsole) {
+      console.log(`[Logger] 自动清理了 ${cleaned} 条旧日志，保留 ${this.config.retainSize} 条`);
+    }
+  }
+  /**
+   * 检查是否应该记录此级别日志
+   */
+  shouldLog(level) {
+    if (!this.config.enabled)
+      return false;
+    if (!this.config.levelFilter)
+      return true;
+    const levelOrder = {
+      [
+        "debug"
+        /* DEBUG */
+      ]: 0,
+      [
+        "info"
+        /* INFO */
+      ]: 1,
+      [
+        "warn"
+        /* WARN */
+      ]: 2,
+      [
+        "error"
+        /* ERROR */
+      ]: 3,
+      [
+        "critical"
+        /* CRITICAL */
+      ]: 4
+    };
+    return levelOrder[level] >= levelOrder[this.config.levelFilter];
+  }
+  /**
+   * 核心日志记录方法
+   */
+  logInternal(data2) {
+    if (!this.shouldLog(
+      data2.level || "info"
+      /* INFO */
+    ))
+      return;
+    if (!window.log) {
+      window.log = [];
+    }
+    const logEntry = {
+      timestamp: Date.now(),
+      level: data2.level || "info",
+      ...data2
+    };
+    window.log.push(logEntry);
+    if (window.log.length > this.config.cleanupThreshold) {
+      const beforeLength = window.log.length;
+      window.log = window.log.slice(-this.config.retainSize);
+      if (this.config.logToConsole) {
+        console.log(`[Logger] 清理日志: ${beforeLength} -> ${window.log.length}`);
+      }
+    }
+    if (this.config.logToConsole) {
+      const prefix2 = `[${logEntry.component}] ${logEntry.event}`;
+      const message2 = typeof logEntry.content === "string" ? logEntry.content : JSON.stringify(logEntry.content);
+      switch (logEntry.level) {
+        case "error":
+        case "critical":
+          console.error(`${prefix2}: ${message2}`, logEntry.extra);
+          break;
+        case "warn":
+          console.warn(`${prefix2}: ${message2}`, logEntry.extra);
+          break;
+        case "info":
+          console.info(`${prefix2}: ${message2}`, logEntry.extra);
+          break;
+        default:
+          console.debug(`${prefix2}: ${message2}`, logEntry.extra);
+      }
+    }
+  }
+  /**
+   * 公共方法：记录调试日志
+   */
+  debug(data2) {
+    this.logInternal({
+      ...data2,
+      level: "debug"
+      /* DEBUG */
+    });
+  }
+  /**
+   * 公共方法：记录信息日志
+   */
+  info(data2) {
+    this.logInternal({
+      ...data2,
+      level: "info"
+      /* INFO */
+    });
+  }
+  /**
+   * 公共方法：记录警告日志
+   */
+  warn(data2) {
+    this.logInternal({
+      ...data2,
+      level: "warn"
+      /* WARN */
+    });
+  }
+  /**
+   * 公共方法：记录错误日志
+   */
+  error(data2) {
+    this.logInternal({
+      ...data2,
+      level: "error"
+      /* ERROR */
+    });
+  }
+  /**
+   * 公共方法：记录关键错误日志
+   */
+  critical(data2) {
+    this.logInternal({
+      ...data2,
+      level: "critical"
+      /* CRITICAL */
+    });
+  }
+  /**
+   * 手动清理日志
+   */
+  cleanupLogs(retainCount = this.config.retainSize) {
+    if (!window.log || window.log.length <= retainCount) {
+      return 0;
+    }
+    const beforeLength = window.log.length;
+    window.log = window.log.slice(-retainCount);
+    return beforeLength - window.log.length;
+  }
+  /**
+   * 获取日志统计信息
+   */
+  getStats() {
+    if (!window.log)
+      return null;
+    const logs = window.log;
+    const byLevel = {
+      [
+        "debug"
+        /* DEBUG */
+      ]: 0,
+      [
+        "info"
+        /* INFO */
+      ]: 0,
+      [
+        "warn"
+        /* WARN */
+      ]: 0,
+      [
+        "error"
+        /* ERROR */
+      ]: 0,
+      [
+        "critical"
+        /* CRITICAL */
+      ]: 0
+    };
+    logs.forEach((log2) => {
+      const level = log2.level || "info";
+      byLevel[level] = (byLevel[level] || 0) + 1;
+    });
+    const memoryEstimate = this.estimateMemoryUsage(logs);
+    return {
+      total: logs.length,
+      byLevel,
+      memoryEstimate
+    };
+  }
+  /**
+   * 估算日志内存占用
+   */
+  estimateMemoryUsage(logs) {
+    if (!logs || logs.length === 0)
+      return "0KB";
+    const avgSize = 350;
+    const totalBytes = logs.length * avgSize;
+    if (totalBytes < 1024) {
+      return `${totalBytes}B`;
+    } else if (totalBytes < 1024 * 1024) {
+      return `${(totalBytes / 1024).toFixed(2)}KB`;
+    } else {
+      return `${(totalBytes / (1024 * 1024)).toFixed(2)}MB`;
+    }
+  }
+  /**
+   * 清除所有日志
+   */
+  clearLogs() {
+    if (window.log) {
+      const length2 = window.log.length;
+      window.log = [];
+      if (this.config.logToConsole) {
+        console.log(`[Logger] 清除所有日志，共 ${length2} 条`);
+      }
+    }
+  }
+  /**
+   * 更新配置
+   */
+  updateConfig(newConfig) {
+    const oldAutoCleanup = this.config.autoCleanupInterval;
+    this.config = { ...this.config, ...newConfig };
+    if (newConfig.autoCleanupInterval !== void 0 && newConfig.autoCleanupInterval !== oldAutoCleanup) {
+      if (this.cleanupIntervalId) {
+        clearInterval(this.cleanupIntervalId);
+      }
+      if (this.config.autoCleanupInterval && this.config.autoCleanupInterval > 0) {
+        this.startAutoCleanup();
+      }
+    }
+  }
+  /**
+   * 销毁资源
+   */
+  destroy() {
+    if (this.cleanupIntervalId) {
+      clearInterval(this.cleanupIntervalId);
+      this.cleanupIntervalId = null;
+    }
+  }
+}
+const logger = new LoggerManager();
 const UserVideoContainer = reactExports.memo(({
   user,
   isSelected = false,
@@ -304982,10 +305281,15 @@ const UserVideoContainer = reactExports.memo(({
   className = "",
   videoId = ""
 }) => {
-  window.log.push({
-    com: "UserVideoContainer",
-    event: "UserVideoContainer mounted",
-    content: "进入UserVideoContainer组件"
+  logger.info({
+    component: "UserVideoContainer",
+    event: "component_mounted",
+    content: "组件挂载",
+    extra: {
+      userId: user.rtc_userid,
+      videoId,
+      isSelected
+    }
   });
   const {
     rtc,
@@ -305041,14 +305345,18 @@ const UserVideoContainer = reactExports.memo(({
       shouldMirror: +!noMirror
     });
     const isModeFit = user.rtc_userid === callConfig.drawing_board_id || (videoId == null ? void 0 : videoId.includes("screen")) || user.device === "pc" || videoId.includes("self");
-    window.log.push({
-      com: "UserVideoContainer",
-      params: {
-        user,
-        videoId
-      },
-      event: "isModeFit",
-      content: `isModeFit ${isModeFit}`
+    logger.debug({
+      component: "UserVideoContainer",
+      event: "video_mode_calculated",
+      content: `isModeFit = ${isModeFit}`,
+      extra: {
+        userId: user.rtc_userid,
+        videoId,
+        isScreen: videoId == null ? void 0 : videoId.includes("screen"),
+        isSelf: videoId.includes("self"),
+        userDevice: user.device,
+        isDrawingBoard: user.rtc_userid === callConfig.drawing_board_id
+      }
     });
     if (user.rtc_userid === callConfig.rtc_userid) {
       rtc.engine.setLocalVideoPlayer((videoId == null ? void 0 : videoId.includes("screen")) ? StreamIndex$1.STREAM_INDEX_SCREEN : StreamIndex$1.STREAM_INDEX_MAIN, {
@@ -305067,19 +305375,17 @@ const UserVideoContainer = reactExports.memo(({
       });
       rtc == null ? void 0 : rtc.engine.setRemoteVideoMirrorType(user.rtc_userid, StreamIndex$1.STREAM_INDEX_MAIN, +!noMirror);
     }
-    window.log.push({
-      com: "UserVideoContainer",
-      params: {
-        StreamIndex: (videoId == null ? void 0 : videoId.includes("screen")) ? StreamIndex$1.STREAM_INDEX_SCREEN : StreamIndex$1.STREAM_INDEX_MAIN,
-        videoOption: {
-          userId: user.rtc_userid,
-          renderDom: videoId,
-          playerId: videoId,
-          renderMode: isModeFit ? VideoRenderMode.RENDER_MODE_FIT : VideoRenderMode.RENDER_MODE_HIDDEN
-        }
-      },
-      event: "setVideoPlayer",
-      content: `设置视频播放器 ${videoId}`
+    logger.info({
+      component: "UserVideoContainer",
+      event: "video_player_setup",
+      content: `设置视频播放器 ${videoId}`,
+      extra: {
+        userId: user.rtc_userid,
+        videoId,
+        isSelf: user.rtc_userid === callConfig.rtc_userid,
+        streamIndex: (videoId == null ? void 0 : videoId.includes("screen")) ? "STREAM_INDEX_SCREEN" : "STREAM_INDEX_MAIN",
+        renderMode: isModeFit ? "RENDER_MODE_FIT" : "RENDER_MODE_HIDDEN"
+      }
     });
     return () => {
       if (user.rtc_userid === callConfig.rtc_userid) {
@@ -305761,10 +306067,13 @@ const LiveWaitingRoom = ({
 const MobileLive = reactExports.memo(({
   className = ""
 }) => {
-  window.log.push({
-    com: "MobileLive",
-    event: "MobileLive mounted",
-    content: "进入MobileLive组件"
+  logger.info({
+    component: "MobileLive",
+    event: "component_mounted",
+    content: "进入MobileLive组件",
+    extra: {
+      userAgent: navigator.userAgent
+    }
   });
   const {
     layoutMode,