call-live-sdk1 0.0.9 → 0.0.10

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

@@ -82768,7 +82768,7 @@ const useCallStore = create$c()(
       token: "",
       // RTC令牌
       // LoginResponseData 字段
-      nickname: "头痛",
+      nickname: "",
       // 用户昵称
       rtc_userid: "",
       // RTC用户ID
@@ -82947,7 +82947,9 @@ const useCallStore = create$c()(
         nickname,
         token: token2,
         rule,
-        waiting_mode
+        waiting_mode,
+        isVideoEnabled,
+        isAudioEnabled
       } = callConfig;
       if (isUserExists(rtc_userid || "")) {
         console.warn(`本地用户 ${rtc_userid} 已存在，跳过添加`);
@@ -82964,8 +82966,8 @@ const useCallStore = create$c()(
         ...initCallUser,
         // 根据enter_muted配置设置初始音频状态
         // enter_muted: 0-否(音频开启) 1-是(音频关闭/静音)
-        isAudioEnabled: true,
-        isVideoEnabled: false,
+        isAudioEnabled: isAudioEnabled ?? true,
+        isVideoEnabled: isVideoEnabled ?? false,
         joinTime: Date.now(),
         waiting_mode_state: rule === "main" || !waiting_mode ? 0 : 1
         /* WAITING */
@@ -83025,6 +83027,17 @@ const useCallStore = create$c()(
         callCurrentUser: void 0,
         layoutMode: "main_plus_list",
         callUsersCurrentPageRef: 1,
+        callConfig: {
+          ...callConfig,
+          isCall: false,
+          // 连麦是否开启
+          isAudioEnabled: true,
+          // 音频是否开启
+          isScreenEnabled: false,
+          // 屏幕共享是否开启
+          isVideoEnabled: false
+          // 视频是否开启
+        },
         mainCanvasId: callConfig.rule === "main" ? (callConfig == null ? void 0 : callConfig.drawing_board_id) || "" : ""
       });
       if (rtc) {
@@ -194938,7 +194951,7 @@ class RtcClient {
    * @param {string} userId - 用户ID
    * @param {Function} callback - 回调函数，返回创建结果和设备状态
    */
-  async createLocalStream(userId, callback, renderMode = VideoRenderMode.RENDER_MODE_FIT) {
+  async createLocalStream(userId, callback, { video = true, audio = true, renderMode = VideoRenderMode.RENDER_MODE_FIT }) {
     const devices = await this.getDevices();
     this.devicesSettings = devices.cameraId = devices.videoInputs[0].deviceId;
     this.devicesSettings = devices.microphoneId = devices.audioInputs[0].deviceId;
@@ -194986,24 +194999,26 @@ class RtcClient {
       contentHint: "motion"
       // 屏幕采集场景，流畅度优先
     });
-    if (this.streamOptions.audio && devices.audioInputs.length) {
+    if (this.streamOptions.audio && devices.audioInputs.length && audio) {
       await this.engine.startAudioCapture(this.devicesSettings.microphoneId);
+      await this.engine.publishStream(MediaType$1.AUDIO);
     } else {
       devicesStatus["audio"] = 0;
       this.engine.unpublishStream(MediaType$1.AUDIO);
     }
-    if (this.streamOptions.video && devices.videoInputs.length) {
+    if (this.streamOptions.video && devices.videoInputs.length && video) {
       await this.engine.startVideoCapture(this.devicesSettings.cameraId);
+      await this.engine.setLocalVideoMirrorType(MirrorType.MIRROR_TYPE_RENDER);
+      this.engine.setLocalVideoPlayer(StreamIndex$1.STREAM_INDEX_MAIN, {
+        renderDom: userId,
+        userId,
+        renderMode
+      });
+      await this.engine.publishStream(MediaType$1.VIDEO);
     } else {
       devicesStatus["video"] = 0;
       this.engine.unpublishStream(MediaType$1.VIDEO);
     }
-    await this.engine.setLocalVideoMirrorType(MirrorType.MIRROR_TYPE_RENDER);
-    this.engine.setLocalVideoPlayer(StreamIndex$1.STREAM_INDEX_MAIN, {
-      renderDom: userId,
-      userId,
-      renderMode
-    });
     if (callback) {
       callback({
         code: 0,
@@ -289436,7 +289451,7 @@ const ChatComponent = () => {
     if (res.success) {
       setLoading(false);
       setCurrent(res.data.pagination.current);
-      setInteractionList((list) => [...list, ...res.data.list]);
+      setInteractionList(res.data.list);
       if (res.data.list.length < 10 || res.data.list.length === res.data.pagination.total || res.data.list.length + interactionList.length >= res.data.pagination.total) {
         setFinished(true);
       }
@@ -292039,7 +292054,6 @@ const RtcJoomRoom = reactExports.memo(({
     callCurrentUser,
     callUsers,
     callAudioMixing,
-    updateCallConfig,
     leaveRemoteUser,
     joinCallUser,
     updateCallUser,
@@ -292050,7 +292064,27 @@ const RtcJoomRoom = reactExports.memo(({
     handleRemoteUserPublishScreen,
     handleRemoteUserUnpublishScreen,
     getCallConfig
-  } = useCallStore();
+  } = useCallStore((state) => ({
+    callConfig: state.callConfig,
+    rtc: state.rtc,
+    getter: state.getter,
+    setRtc: state.setRtc,
+    mainCanvasId: state.mainCanvasId,
+    callCurrentUser: state.callCurrentUser,
+    callUsers: state.callUsers,
+    callAudioMixing: state.callAudioMixing,
+    updateCallConfig: state.updateCallConfig,
+    leaveRemoteUser: state.leaveRemoteUser,
+    joinCallUser: state.joinCallUser,
+    updateCallUser: state.updateCallUser,
+    leave: state.leave,
+    toggleVideo: state.toggleVideo,
+    toggleAudio: state.toggleAudio,
+    setMainCanvasId: state.setMainCanvasId,
+    handleRemoteUserPublishScreen: state.handleRemoteUserPublishScreen,
+    handleRemoteUserUnpublishScreen: state.handleRemoteUserUnpublishScreen,
+    getCallConfig: state.getCallConfig
+  }));
   const playStatus = reactExports.useRef({});
   const errorMessageCache = reactExports.useRef({});
   const ERROR_DEBOUNCE_TIME = 3e3;
@@ -292123,15 +292157,16 @@ const RtcJoomRoom = reactExports.memo(({
     }
   }, [originalInviteData, handleInviteConfirm, hideInviteConfirm, setInviteLoading]);
   const handleUserPublishStream = reactExports.useCallback(async (stream) => {
-    var _a2, _b, _c2;
-    console.log("handleUserPublishStream");
+    var _a2, _b, _c2, _d2, _e2;
+    console.log("发布流", stream);
     const userId = stream.userId;
     if (stream.mediaType & MediaType$1.VIDEO) {
+      await ((_b = (_a2 = getter().rtc) == null ? void 0 : _a2.engine) == null ? void 0 : _b.subscribeStream(userId, MediaType$1.VIDEO));
       updateCallUser(userId, {
-        isPublishStream: true
+        isVideoEnabled: true
       });
       if (callConfig.rule === "main") {
-        await ((_a2 = getter().rtc) == null ? void 0 : _a2.engine.sendRoomMessage(JSON.stringify({
+        await ((_c2 = getter().rtc) == null ? void 0 : _c2.engine.sendRoomMessage(JSON.stringify({
           type: "users",
           data: {
             users: callUsers.map((user) => ({
@@ -292149,10 +292184,9 @@ const RtcJoomRoom = reactExports.memo(({
     if (stream.mediaType & MediaType$1.AUDIO) {
       const cuser = callUsers.find((user) => user.rtc_userid === callConfig.rtc_userid);
       if ((cuser == null ? void 0 : cuser.waiting_mode_state) !== WaitingModeState.WAITING) {
-        console.log("当前不是等待用户 订阅 音频流", userId);
-        await ((_c2 = (_b = getter().rtc) == null ? void 0 : _b.engine) == null ? void 0 : _c2.subscribeStream(userId, MediaType$1.AUDIO));
+        await ((_e2 = (_d2 = getter().rtc) == null ? void 0 : _d2.engine) == null ? void 0 : _e2.subscribeStream(userId, MediaType$1.AUDIO));
         updateCallUser(userId, {
-          isSubscribeAudio: true
+          isAudioEnabled: true
         });
         if (callConfig.rule === "main") {
           setTimeout(() => {
@@ -292202,7 +292236,7 @@ const RtcJoomRoom = reactExports.memo(({
     });
   };
   const rtcJoin = async () => {
-    var _a2, _b, _c2, _d2;
+    var _a2, _b, _c2;
     const localUser = joinCallUser();
     const {
       rtc_room_id,
@@ -292213,7 +292247,7 @@ const RtcJoomRoom = reactExports.memo(({
       rtc_userid,
       token: token2,
       appid
-    } = callConfig;
+    } = getter().callConfig;
     if (!localUser) {
       staticMethods.error("加入房间失败，本地用户不存在");
       return;
@@ -292228,7 +292262,7 @@ const RtcJoomRoom = reactExports.memo(({
         camera: isVideoEnabled ?? false
       }), {
         // 自动发布本地音视频流
-        isAutoPublish: true,
+        isAutoPublish: false,
         // 自动订阅房间内其他用户的音频流
         isAutoSubscribeAudio: false,
         // 自动订阅房间内其他用户的视频流
@@ -292247,15 +292281,14 @@ const RtcJoomRoom = reactExports.memo(({
           if (code === -1) {
             window.confirm(`创建本地流失败：${msg2}`);
           }
-        }, VideoRenderMode.RENDER_MODE_HIDDEN));
+        }, {
+          video: isVideoEnabled,
+          audio: isAudioEnabled,
+          renderMode: VideoRenderMode.RENDER_MODE_HIDDEN
+        }));
         if (callConfig.rule === "sub" && callConfig.enter_muted) {
           await toggleAudio(false);
-        } else {
-          updateCallConfig({
-            isReady: true
-          });
         }
-        await ((_d2 = getter().rtc) == null ? void 0 : _d2.publishStream());
         if (callConfig.rule === "main") {
           console.log("主播 发布 音视频流 ");
           callAudioMixing();
@@ -292304,14 +292337,25 @@ const RtcJoomRoom = reactExports.memo(({
             video: callConfig.isVideoEnabled ?? false
           },
           handleUserPublishStream,
-          handleUserUnpublishStream: (event) => {
-            var _a2;
+          handleUserUnpublishStream: async (event) => {
+            var _a2, _b, _c2;
+            console.log("取消发布流", event);
             const {
               userId,
               mediaType
             } = event;
             if (mediaType & MediaType$1.VIDEO) {
               (_a2 = getter().rtc) == null ? void 0 : _a2.setRemoteVideoPlayer(userId, void 0);
+              await ((_b = getter().rtc) == null ? void 0 : _b.engine.unsubscribeStream(userId, MediaType$1.VIDEO));
+              updateCallUser(userId, {
+                isVideoEnabled: false
+              });
+            }
+            if (mediaType & MediaType$1.AUDIO) {
+              await ((_c2 = getter().rtc) == null ? void 0 : _c2.engine.unsubscribeStream(userId, MediaType$1.AUDIO));
+              updateCallUser(userId, {
+                isAudioEnabled: false
+              });
             }
           },
           handleUserStartVideoCapture: (event) => {
@@ -292539,10 +292583,10 @@ const RtcJoomRoom = reactExports.memo(({
   }, [callConfig.isCall, callConfig.rtc_room_id, callConfig.rule]);
   reactExports.useEffect(() => {
     const handleAdmittedUser = async () => {
-      var _a2, _b, _c2, _d2, _e2;
+      var _a2, _b, _c2, _d2, _e2, _f2;
       if (!mainCanvasId) {
         try {
-          await ((_a2 = getter().rtc) == null ? void 0 : _a2.createLocalStream(callConfig.rtc_userid, (res) => {
+          await ((_c2 = getter().rtc) == null ? void 0 : _c2.createLocalStream(callConfig.rtc_userid, (res) => {
             const {
               code,
               msg: msg2
@@ -292550,13 +292594,17 @@ const RtcJoomRoom = reactExports.memo(({
             if (code === -1) {
               window.confirm(`创建本地流失败：${msg2}`);
             }
-          }, VideoRenderMode.RENDER_MODE_HIDDEN));
+          }, {
+            video: (_a2 = getter().callConfig) == null ? void 0 : _a2.isVideoEnabled,
+            audio: (_b = getter().callConfig) == null ? void 0 : _b.isAudioEnabled,
+            renderMode: VideoRenderMode.RENDER_MODE_HIDDEN
+          }));
         } catch (error2) {
           console.error("准入 本地流创建失败:", error2);
         }
       } else {
-        await ((_b = getter().rtc) == null ? void 0 : _b.setLocalVideoPlayer(callConfig.rtc_userid, callConfig.rtc_userid, callConfig.rtc_userid, (callCurrentUser == null ? void 0 : callCurrentUser.device) === "mobile" ? VideoRenderMode.RENDER_MODE_HIDDEN : VideoRenderMode.RENDER_MODE_FIT));
-        await ((_c2 = getter().rtc) == null ? void 0 : _c2.setLocalVideoPlayer(callConfig.rtc_userid, callConfig.rtc_userid + "self", callConfig.rtc_userid + "self", VideoRenderMode.RENDER_MODE_FILL));
+        await ((_d2 = getter().rtc) == null ? void 0 : _d2.setLocalVideoPlayer(callConfig.rtc_userid, callConfig.rtc_userid, callConfig.rtc_userid, (callCurrentUser == null ? void 0 : callCurrentUser.device) === "mobile" ? VideoRenderMode.RENDER_MODE_HIDDEN : VideoRenderMode.RENDER_MODE_FIT));
+        await ((_e2 = getter().rtc) == null ? void 0 : _e2.setLocalVideoPlayer(callConfig.rtc_userid, callConfig.rtc_userid + "self", callConfig.rtc_userid + "self", VideoRenderMode.RENDER_MODE_FILL));
         access == null ? void 0 : access();
       }
       callUsers.forEach((user) => {
@@ -292571,13 +292619,7 @@ const RtcJoomRoom = reactExports.memo(({
         toggleAudio(false);
       }
       try {
-        await ((_d2 = getter().rtc) == null ? void 0 : _d2.publishStream());
-        console.log("准入 发布本地流成功");
-      } catch (error2) {
-        console.error("准入 发布本地流失败:", error2);
-      }
-      try {
-        await ((_e2 = getter().rtc) == null ? void 0 : _e2.engine.sendRoomMessage(JSON.stringify({
+        await ((_f2 = getter().rtc) == null ? void 0 : _f2.engine.sendRoomMessage(JSON.stringify({
           type: "change_user",
           data: {
             user: {
@@ -294806,7 +294848,6 @@ const MobileLive = reactExports.memo(({ className = "" }) => {
   const { setStatus } = useGuestStore((state) => ({
     setStatus: state.setStatus
   }));
-  useSdkStore((state) => state.callConfig.title);
   const [isBackCamera, setIsBackCamera] = reactExports.useState(false);
   const [showDeviceSettings, setShowDeviceSettings] = reactExports.useState(false);
   const [isDeviceSelected, setIsDeviceSelected] = reactExports.useState({