fcr-ui-scene 3.7.7 → 3.7.8-rc.2

package/public/index.html

@@ -157,6 +157,7 @@
         }
       }
     };
+
     const setFullScreenFailureComp = (visible, errorMsg) => {
       setLoading(false);
       const dom = document.querySelector('#fcr-launch-failure-comp');
@@ -176,154 +177,6 @@
         }
       }
     };
-
-    (async () => {
-      let creator;
-      let uiScene;
-      let sendExitedEventFlag = true;
-      window.cppSdkHelper.onCreatorInit = (config) => {
-        if (creator) {
-          creator.release();
-          creator = undefined;
-        }
-
-        creator = new FcrUIScene.FcrUISceneCreator(config);
-      };
-
-      window.cppSdkHelper.onSettingOpen = () => {
-        creator.openSetting();
-      };
-
-      window.cppSdkHelper.onSettingClose = () => {
-        creator.closeSetting();
-      };
-
-      window.cppSdkHelper.onSetParameters = (parameters) => {
-        creator.setParameters(parameters);
-      };
-
-      window.cppSdkHelper.onRenewUserToken = (token) => {
-        creator.renewUserToken(token);
-      };
-
-      window.cppSdkHelper.onLaunchMeeting = (launchOptions) => {
-        try {
-          if (uiScene) {
-            console.log('the previous sequence ui scene exists, exit it');
-            uiScene.exit();
-            sendExitedEventFlag = false;
-          }
-        } catch (error) {
-          // 这里可能会有报错，但是不影响后续的流程
-          console.error(
-            ' the previous sequence ui scene exists, exit it,but exit  has error',
-            JSON.stringify(error),
-          );
-        }
-        setFullScreenFailureComp(false);
-        setLoading(true);
-
-        // 定义事件处理函数，以便可以正确移除
-        const handleConfirmClick = () => {
-          setFullScreenFailureComp(false);
-          console.log('windows_release error button clicked');
-          window.runtime.getCurrentBrowserWindow().hide();
-        };
-
-        document
-          .querySelector('#fcr-launch-failure-confirm-btn')
-          .removeEventListener('click', handleConfirmClick);
-        document
-          .querySelector('#fcr-launch-failure-confirm-btn')
-          .addEventListener('click', handleConfirmClick);
-
-        const { widgets, ...others } = launchOptions;
-
-        if (widgets && widgets instanceof Array) {
-          widgets.forEach((w) => {
-            creator.registerWidget(w);
-          });
-        }
-        uiScene = creator.launch(
-          others,
-          () => {
-            console.log('windows_release ui scene closed callback');
-            window.runtime.getCurrentBrowserWindow().hide();
-          },
-          () => {},
-          () => {},
-          document.getElementById('root'),
-        );
-
-        window.cppSdkHelper.exitUiScene = () => {
-          try {
-            uiScene.exit();
-          } catch (error) {
-            window.cppSdkHelper.exitedMeeting(roomId, FcrUIExitReason.USER_QUIT);
-          }
-        };
-
-        uiScene.addObserver({
-          onLaunchSuccess: () => {
-            setLoading(false);
-            sendExitedEventFlag = true;
-            const roomProvider = uiScene._objectManager.getObject('roomProvider');
-            if (!roomProvider) {
-              throw new Error('roomProvider not found in uiScene');
-            }
-            const currentRoomControl = roomProvider.currentRoomControl;
-            if (!currentRoomControl) {
-              throw new Error('currentRoomControl not found in uiScene');
-            }
-            const roomInfo = currentRoomControl.getRoomInfo();
-
-            if (!roomInfo) {
-              throw new Error('roomInfo not found in uiScene');
-            }
-            const { roomName, roomId } = roomInfo;
-            document.querySelector('title').innerText = roomName;
-            window.cppSdkHelper.launchSuccess(roomId);
-          },
-          onLaunchFailure: (roomId, error) => {
-            const errorCode = Number(error.code);
-            let errorMessage = error.message;
-
-            if (errorCode === 732403100 || errorCode === 631735290) {
-              errorMessage = window._transI18n('fmt_lock_error');
-            } else if (errorCode === 732403101) {
-              errorMessage = window._transI18n('fmt_pc_room_not_exist_error');
-            } else if (errorCode === 732403103) {
-              errorMessage = window._transI18n('fmt_host_leave_error');
-            } else if (errorCode === 720410100) {
-              errorMessage = window._transI18n('fmt_end_error');
-            } else {
-              errorMessage = `Error: code=${errorCode}, message=${errorMessage}`;
-            }
-
-            setFullScreenFailureComp(true, errorMessage);
-            window.cppSdkHelper.launchFailure(roomId, errorCode);
-          },
-
-          onExited: (roomId, reason) => {
-            if (!sendExitedEventFlag) {
-              return;
-            }
-            console.log('the previous sequence ui scene : ui scene exited');
-            window.cppSdkHelper.exitedMeeting(roomId, reason);
-            uiScene = null;
-            setTimeout(() => {
-              console.log('windows_release ui scene exited callback');
-              window.runtime.getCurrentBrowserWindow().hide();
-            });
-          },
-          onWidgetClicked: (widgetId) => {
-            window.cppSdkHelper.onWidgetClicked(widgetId);
-          },
-          onUserTokenWillExpire: () => {
-            window.cppSdkHelper.onUserTokenWillExpire();
-          },
-        });
-      };
-    })();
   </script>
+  <script src="meeting-manager.js"></script>
 </html>

package/public/meeting-manager.js

@@ -0,0 +1,391 @@
+/**
+ * 会议管理器 - 负责处理会议的生命周期管理
+ * 包括创建者初始化、会议启动、错误处理等功能
+ */
+class MeetingManager {
+  constructor() {
+    this.creator = null;
+    this.uiScene = null;
+
+    this.sendExitedEventFlag = true;
+    this.lastInitParams = '';
+
+    this.bindGlobalMethods();
+  }
+
+  /**
+   * 重新加载创建者
+   * @param {string} stringInitParams - 初始化参数字符串
+   */
+  reloadCreator(stringInitParams) {
+    try {
+      const config = JSON.parse(stringInitParams);
+      this.creator = new FcrUIScene.FcrUISceneCreator(config);
+      this.logInfo('Creator reloaded successfully');
+    } catch (error) {
+      this.logError('Failed to parse init options:', error);
+    }
+  }
+
+  /**
+   * 创建或初始化创建者
+   * @param {Object} config - 配置对象
+   */
+  createOrInitCreator(config) {
+    try {
+      // 如果存在旧的创建者，先释放
+      if (this.creator) {
+        this.logInfo('Creator exists, releasing previous creator');
+        this.releasePreviousScene();
+        this.creator.release();
+        this.creator = undefined;
+      }
+    } catch (error) {
+      this.logError('Failed to release creator:', error);
+    }
+
+    // 创建新的创建者
+    this.lastInitParams = JSON.stringify(config);
+    this.logInfo(`Creating new creator with config: ${this.lastInitParams}`);
+    this.creator = new FcrUIScene.FcrUISceneCreator(config);
+  }
+
+  /**
+   * 释放之前的场景
+   */
+  releasePreviousScene() {
+    if (this.uiScene) {
+      this.sendExitedEventFlag = false;
+      this.uiScene.exit();
+      this.uiScene = null;
+      this.logInfo('Previous UI scene released');
+    }
+  }
+
+  /**
+   * 启动会议
+   * @param {Object} launchOptions - 启动选项
+   */
+  launchMeeting(launchOptions) {
+    const { data, lastInitParams: initParamsFromMainProcess } = launchOptions;
+
+    this.logInfo(`Launching meeting with params: ${initParamsFromMainProcess}`);
+
+    // 检查是否需要重新加载创建者
+    if (initParamsFromMainProcess !== this.lastInitParams) {
+      this.logInfo('Init params changed, reloading creator');
+      this.lastInitParams = initParamsFromMainProcess;
+      this.reloadCreator(initParamsFromMainProcess);
+    }
+
+    // 清理之前的场景
+    this.cleanupPreviousScene();
+
+    // 设置UI状态
+    this.setFullScreenFailureComp(false);
+    this.setLoading(true);
+
+    // 绑定错误处理事件
+    this.bindErrorHandlers();
+
+    // 注册小部件
+    this.registerWidgets(data);
+
+    // 启动场景
+    this.startUIScene(data);
+
+    // 添加观察者
+    this.addSceneObservers();
+  }
+
+  /**
+   * 清理之前的场景
+   */
+  cleanupPreviousScene() {
+    try {
+      if (this.uiScene) {
+        this.logInfo('Cleaning up previous UI scene');
+        this.uiScene.exit();
+        this.sendExitedEventFlag = false;
+      }
+    } catch (error) {
+      this.logError('Error during scene cleanup:', error);
+    }
+  }
+
+  /**
+   * 绑定错误处理事件
+   */
+  bindErrorHandlers() {
+    const confirmBtn = document.querySelector('#fcr-launch-failure-confirm-btn');
+    if (confirmBtn) {
+      confirmBtn.removeEventListener('click', this.handleConfirmClick);
+      confirmBtn.addEventListener('click', this.handleConfirmClick.bind(this));
+    }
+  }
+
+  /**
+   * 注册小部件
+   * @param {Object} data - 数据对象
+   */
+  registerWidgets(data) {
+    const { widgets, ...others } = data;
+    if (widgets && Array.isArray(widgets)) {
+      widgets.forEach(widget => {
+        this.creator.registerWidget(widget);
+      });
+    }
+  }
+
+  /**
+   * 启动UI场景
+   * @param {Object} data - 数据对象
+   */
+  startUIScene(data) {
+    const { widgets, ...others } = data;
+
+    this.uiScene = this.creator.launch(
+      others,
+      () => {
+        this.logInfo('UI scene closed callback');
+        window.runtime.getCurrentBrowserWindow().hide();
+      },
+      () => { }, // 空回调
+      () => { }, // 空回调
+      document.getElementById('root')
+    );
+  }
+
+  /**
+   * 添加场景观察者
+   */
+  addSceneObservers() {
+    this.uiScene.addObserver({
+      onLaunchSuccess: () => this.handleLaunchSuccess(),
+      onLaunchFailure: (roomId, error) => this.handleLaunchFailure(roomId, error),
+      onExited: (roomId, reason) => this.handleSceneExited(roomId, reason),
+      onWidgetClicked: (widgetId) => this.handleWidgetClicked(widgetId),
+      onUserTokenWillExpire: () => this.handleUserTokenWillExpire()
+    });
+  }
+
+  /**
+   * 处理启动成功
+   */
+  handleLaunchSuccess() {
+    this.setLoading(false);
+    this.sendExitedEventFlag = true;
+
+    try {
+      const roomProvider = this.uiScene._objectManager.getObject('roomProvider');
+      if (!roomProvider) {
+        throw new Error('roomProvider not found in uiScene');
+      }
+
+      const currentRoomControl = roomProvider.currentRoomControl;
+      if (!currentRoomControl) {
+        throw new Error('currentRoomControl not found in uiScene');
+      }
+
+      const roomInfo = currentRoomControl.getRoomInfo();
+      if (!roomInfo) {
+        throw new Error('roomInfo not found in uiScene');
+      }
+
+      const { roomName, roomId } = roomInfo;
+      document.querySelector('title').innerText = roomName;
+      window.cppSdkHelper.launchSuccess(roomId);
+    } catch (error) {
+      this.logError('Error in launch success handler:', error);
+    }
+  }
+
+  /**
+   * 处理启动失败
+   * @param {string} roomId - 房间ID
+   * @param {Object} error - 错误对象
+   */
+  handleLaunchFailure(roomId, error) {
+    const errorCode = Number(error.code);
+    let errorMessage = this.getErrorMessage(errorCode, error.message);
+
+    this.setFullScreenFailureComp(true, errorMessage);
+    window.cppSdkHelper.launchFailure(roomId, errorCode);
+  }
+
+  /**
+   * 获取错误消息
+   * @param {number} errorCode - 错误代码
+   * @param {string} defaultMessage - 默认错误消息
+   * @returns {string} 错误消息
+   */
+  getErrorMessage(errorCode, defaultMessage) {
+    const errorCodeMap = {
+      732403100: 'fmt_lock_error',
+      631735290: 'fmt_lock_error',
+      732403101: 'fmt_pc_room_not_exist_error',
+      732403103: 'fmt_host_leave_error',
+      720410100: 'fmt_end_error'
+    };
+
+    const errorKey = errorCodeMap[errorCode];
+    if (errorKey) {
+      return window._transI18n(errorKey);
+    }
+
+    return `Error: code=${errorCode}, message=${defaultMessage}`;
+  }
+
+  /**
+   * 处理场景退出
+   * @param {string} roomId - 房间ID
+   * @param {string} reason - 退出原因
+   */
+  handleSceneExited(roomId, reason) {
+    if (!this.sendExitedEventFlag) {
+      return;
+    }
+
+    this.logInfo('UI scene exited');
+    window.cppSdkHelper.exitedMeeting(roomId, reason);
+    this.uiScene = null;
+
+    setTimeout(() => {
+      this.logInfo('UI scene exited callback');
+      window.runtime.getCurrentBrowserWindow().hide();
+    });
+  }
+
+  /**
+   * 处理小部件点击
+   * @param {string} widgetId - 小部件ID
+   */
+  handleWidgetClicked(widgetId) {
+    window.cppSdkHelper.onWidgetClicked(widgetId);
+  }
+
+  /**
+   * 处理用户令牌即将过期
+   */
+  handleUserTokenWillExpire() {
+    window.cppSdkHelper.onUserTokenWillExpire();
+  }
+
+  /**
+   * 退出UI场景
+   */
+  exitUiScene() {
+    try {
+      if (!this.uiScene) {
+        return;
+      }
+      this.uiScene.exit();
+      this.lastInitParams = '';
+    } catch (error) {
+      window.cppSdkHelper.exitedMeeting(roomId, FcrUIExitReason.USER_QUIT);
+    }
+  }
+
+  /**
+   * 处理确认按钮点击
+   */
+  handleConfirmClick() {
+    this.setFullScreenFailureComp(false);
+    this.logInfo('Error confirmation button clicked');
+    window.runtime.getCurrentBrowserWindow().hide();
+  }
+
+  /**
+   * 绑定全局方法
+   */
+  bindGlobalMethods() {
+    window.cppSdkHelper.onCreatorInit = (config) => {
+      window.__AgoraMutex.dispatch(() => {
+        this.createOrInitCreator(config);
+      });
+    };
+
+    window.cppSdkHelper.onSettingOpen = () => {
+      this.creator.openSetting();
+    };
+
+    window.cppSdkHelper.onSettingClose = () => {
+      this.creator.closeSetting();
+    };
+
+    window.cppSdkHelper.onSetParameters = (parameters) => {
+      this.creator.setParameters(parameters);
+    };
+
+    window.cppSdkHelper.onRenewUserToken = (token) => {
+      this.creator.renewUserToken(token);
+    };
+
+    window.cppSdkHelper.exitUiScene = () => {
+      window.__AgoraMutex.dispatch(() => {
+        this.exitUiScene();
+      });
+    };
+
+    window.cppSdkHelper.onLaunchMeeting = (launchOptions) => {
+      window.__AgoraMutex.dispatch(() => {
+        this.launchMeeting(launchOptions);
+      })
+    };
+  }
+
+  /**
+   * 设置加载状态
+   * @param {boolean} visible - 是否显示加载状态
+   */
+  setLoading(visible) {
+    const dom = document.querySelector('#launch-loading');
+    if (dom) {
+      dom.style.display = visible ? 'flex' : 'none';
+    }
+  }
+
+  /**
+   * 设置全屏失败组件
+   * @param {boolean} visible - 是否显示
+   * @param {string} errorMsg - 错误消息
+   */
+  setFullScreenFailureComp(visible, errorMsg) {
+    this.setLoading(false);
+    const dom = document.querySelector('#fcr-launch-failure-comp');
+    const btnTextDom = document.querySelector('#fcr-launch-failure-btn-text');
+
+    if (dom) {
+      if (visible) {
+        dom.style.display = 'flex';
+        btnTextDom.innerText = window.$$agora_language === 'zh' ? '我已知悉' : 'I know';
+        if (errorMsg) {
+          const msgDom = document.querySelector('#fcr-launch-failure-error-info');
+          msgDom.innerText = errorMsg;
+        }
+      } else {
+        dom.style.display = 'none';
+      }
+    }
+  }
+
+  /**
+   * 记录信息日志
+   * @param {string} message - 日志消息
+   */
+  logInfo(message) {
+    window.__AgoraLogger.info(`MEETING MANAGER: ${message}`);
+  }
+
+  /**
+   * 记录错误日志
+   * @param {string} message - 错误消息
+   * @param {Error} error - 错误对象
+   */
+  logError(message, error) {
+    window.__AgoraLogger.error(`MEETING MANAGER: ${message}`, error);
+  }
+}
+
+// 初始化会议管理器
+const meetingManager = new MeetingManager();

package/installer/mac/entitlements.mac.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-    <key>com.apple.security.device.camera</key>
-    <true/>
-  </dict>
-</plist>

package/lib/creator.d.ts

@@ -1,36 +0,0 @@
-import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from './type';
-import { FcrUIDefaultScene } from './ui-scene';
-import SettingStore from './modules/setting/store';
-export interface FcrObservableSettingStore {
-    value: SettingStore | null;
-}
-export declare class FcrUISceneCreator {
-    private _config;
-    accessor observableSettingStore: FcrObservableSettingStore;
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _userSettingStorageProvider;
-    private _registeredWidgetConfigs;
-    private _released;
-    private _scene;
-    private _microphoneKeepRecording;
-    private _sceneObserver;
-    constructor(_config: FcrUISceneCreatorConfig);
-    private _initProviders;
-    launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
-    getSettingConfig(): FcrUISettingConfig;
-    registerWidget(config: FcrUIWebWidgetConfig): void;
-    unregisterWidget(widgetId: string): void;
-    renewUserToken(token: string): void;
-    setParameters(parameters: Record<string, unknown>): void;
-    getVersion(): string;
-    getDependencyVersions(): Record<string, string>;
-    openSetting(): void;
-    closeSetting(): void;
-    private _releaseProviders;
-    release(): void;
-    private _resetScene;
-    private _precheckState;
-    private _filterKeepRecordingValueFromParameters;
-    private _setKeepRecordingValueFromParameters;
-    private _createSettingStore;
-}