fcr-ui-scene 3.4.4 → 3.5.0

package/lib/{common/remote-renderer.js → shared-data-source/security-data.js}

@@ -8,25 +8,13 @@ require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
-require("core-js/modules/es.function.bind.js");
 require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.create.js");
 require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/esnext.function.metadata.js");
-require("core-js/modules/esnext.symbol.metadata.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.FcrRemoteVideoRenderManager = void 0;
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.map.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -41,18 +29,34 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
+require("core-js/modules/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISecuritySharedDataSourceImpl = void 0;
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
 var _mobx = require("mobx");
-var _mobxUtils = require("mobx-utils");
-var _FcrRemoteVideoRenderManager;
-var _initProto, _init__firstFrameState, _startRenderRemoteVideoDecs, _stopRenderRemoteVideoDecs, _ref;
+var _base = require("../base");
+var _logger = require("../utilities/logger");
+var _FcrUISecuritySharedDataSourceImpl;
+var _initProto, _init__checkedStateMap, _setCheckedStateMapDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
@@ -64,32 +68,25 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var _A = /*#__PURE__*/new WeakMap();
-_ref = (_startRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], _stopRenderRemoteVideoDecs = [_mobx.action, _mobx.action.bound], "logger");
-var FcrRemoteVideoRenderManager = exports.FcrRemoteVideoRenderManager = /*#__PURE__*/function () {
-  function FcrRemoteVideoRenderManager(_streamControl) {
-    var _this = this;
-    (0, _classCallCheck2["default"])(this, FcrRemoteVideoRenderManager);
+_ref = (_setCheckedStateMapDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUISecuritySharedDataSourceImpl = exports.FcrUISecuritySharedDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISecuritySharedDataSourceImpl(_privilegeProvider, _sharedMemberDataSource) {
+    (0, _classCallCheck2["default"])(this, FcrUISecuritySharedDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrRemoteVideoRenderManager'
+      prefix: 'FcrUISecuritySharedDataSourceImpl'
     })));
-    _classPrivateFieldInitSpec(this, _A, _init__firstFrameState(this, new Map()));
-    (0, _defineProperty2["default"])(this, "_renderCount", new Map());
-    (0, _defineProperty2["default"])(this, "isStreamFirstFrameRendered", (0, _mobxUtils.computedFn)(function (streamId) {
-      return _this._firstFrameState.get(streamId) || false;
-    }));
-    this._streamControl = _streamControl;
-    this._streamObserver = {
-      onFirstRemoteVideoFrameRendered: function onFirstRemoteVideoFrameRendered(roomId, streamId) {
-        _this.logger.debug('onFirstRemoteVideoFrameRendered', roomId, streamId);
-        (0, _mobx.runInAction)(function () {
-          _this._firstFrameState.set(streamId, true);
-        });
-      }
-    };
-    _streamControl.addObserver(this._streamObserver);
+    (0, _defineProperty2["default"])(this, "_disposers", []);
+    (0, _defineProperty2["default"])(this, "_privilegeObserver", {
+      onLocalUserSecurityInfosUpdated: this._handleLocalUserSecurityInfosUpdated.bind(this)
+    });
+    _classPrivateFieldInitSpec(this, _A, _init__checkedStateMap(this));
+    this._privilegeProvider = _privilegeProvider;
+    this._sharedMemberDataSource = _sharedMemberDataSource;
+    this._privilegeProvider.addObserver(this._privilegeObserver);
+    this._checkedStateMap = this._getCurrentCheckedStateMap();
   }
-  return (0, _createClass2["default"])(FcrRemoteVideoRenderManager, [{
-    key: "_firstFrameState",
+  return (0, _createClass2["default"])(FcrUISecuritySharedDataSourceImpl, [{
+    key: "_checkedStateMap",
     get: function get() {
       return _classPrivateFieldGet(_A, this);
     },
@@ -97,42 +94,62 @@ var FcrRemoteVideoRenderManager = exports.FcrRemoteVideoRenderManager = /*#__PUR
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "release",
-    value: function release() {
-      this._renderCount.clear();
-      this._firstFrameState.clear();
-      this._streamControl.removeObserver(this._streamObserver);
+    key: "checkedStateMap",
+    get: function get() {
+      return this._checkedStateMap;
     }
   }, {
-    key: "startRenderRemoteVideo",
-    value: function startRenderRemoteVideo(streamId, streamType, config, el) {
-      this.logger.debug('startRenderRemoteVideo', streamId, streamType, config);
-      var count = this._renderCount.get(streamId);
-      if (count) {
-        this._renderCount.set(streamId, count + 1);
-      } else {
-        this._renderCount.set(streamId, 1);
-      }
-      this._streamControl.startRenderRemoteVideoStream(streamId, streamType, config, el);
+    key: "_getCurrentCheckedStateMap",
+    value: function _getCurrentCheckedStateMap() {
+      return {
+        lockRoom: this._privilegeProvider.isLockRoomEnabled(),
+        enableWaitingRoom: this._privilegeProvider.isWaitingRoomEnabled(),
+        enableJoinWithAudio: this._privilegeProvider.allowJoinWithMuteAudio(),
+        enableWatermark: this._privilegeProvider.isWaterMarkEnabled(),
+        shareScreen: this._privilegeProvider.allowScreenShareAndBoard(),
+        shareWhiteboard: this._privilegeProvider.allowBoardWrite(),
+        chat: this._privilegeProvider.allowChat(),
+        unmuteYourself: this._privilegeProvider.allowUnmuteSelfAudio(),
+        startVideo: this._privilegeProvider.allowUnmuteSelfVideo(),
+        rename: this._privilegeProvider.allowChangeSelfName()
+      };
+    }
+  }, {
+    key: "_refreshCheckedStateMap",
+    value: function _refreshCheckedStateMap() {
+      this._checkedStateMap = this._getCurrentCheckedStateMap();
+    }
+  }, {
+    key: "localUserId",
+    get: function get() {
+      return this._sharedMemberDataSource.localUser.userId;
+    }
+  }, {
+    key: "setCheckedStateMap",
+    value: function setCheckedStateMap(val) {
+      this._checkedStateMap = val;
     }
   }, {
-    key: "stopRenderRemoteVideo",
-    value: function stopRenderRemoteVideo(streamId, el) {
-      this.logger.debug('stopRenderRemoteVideo', streamId);
-      var count = this._renderCount.get(streamId) || 0;
-      if (count - 1 > 0) {
-        this._renderCount.set(streamId, count - 1);
-      } else {
-        this._renderCount["delete"](streamId);
-        this._firstFrameState["delete"](streamId);
+    key: "_handleLocalUserSecurityInfosUpdated",
+    value: function _handleLocalUserSecurityInfosUpdated(event) {
+      var _event$operatorUser;
+      if (((_event$operatorUser = event.operatorUser) === null || _event$operatorUser === void 0 ? void 0 : _event$operatorUser.userId) !== this.localUserId) {
+        this._refreshCheckedStateMap();
       }
-      this._streamControl.stopRenderRemoteVideoStream(streamId, el);
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this._disposers = [];
+      this._privilegeProvider.removeObserver(this._privilegeObserver);
     }
   }]);
 }();
-_FcrRemoteVideoRenderManager = FcrRemoteVideoRenderManager;
-var _applyDecs$e = _applyDecs(_FcrRemoteVideoRenderManager, [[_mobx.observable, 1, "_firstFrameState"], [_mobx.action, 2, "release"], [_startRenderRemoteVideoDecs, 18, "startRenderRemoteVideo"], [_stopRenderRemoteVideoDecs, 18, "stopRenderRemoteVideo"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
-_init__firstFrameState = _applyDecs$e2[0];
-_initProto = _applyDecs$e2[1];
-_applyDecs$e;
+_FcrUISecuritySharedDataSourceImpl = FcrUISecuritySharedDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISecuritySharedDataSourceImpl, [[_mobx.observable, 1, "_checkedStateMap"], [_mobx.computed, 3, "localUserId"], [_setCheckedStateMapDecs, 18, "setCheckedStateMap"]], []).e, 2);
+_init__checkedStateMap = _applyDecs$e[0];
+_initProto = _applyDecs$e[1];
+(0, _base.registerDependency)('sharedSecuritySharedDataSource');

package/lib/shared-data-source/setting.d.ts

@@ -1,5 +1,6 @@
 import { CustomSetting } from '../modules/setting/store';
 import { FcrUISceneCreatorConfig } from '../type';
+import { FcrUILocalStorageProvider } from '../providers/local-storage-provider';
 /**
  * FcrUISharedSettingDataSource 接口定义了用于获取和修改共享 UI 设置数据的方法。
  * 通过该接口，可以方便地对自定义设置进行读取和更新操作，适用于管理和维护 UI 相关的共享配置。
@@ -23,9 +24,10 @@ export interface FcrUISharedSettingDataSource {
 }
 export declare class FcrUISharedSettingDataSourceImpl implements FcrUISharedSettingDataSource {
     private _creatorConfig?;
+    private _localStorageProvider;
     accessor _setting: CustomSetting;
     private _useDefaultAudioEchoCancellation;
-    constructor(creatorConfig: FcrUISceneCreatorConfig);
+    constructor(creatorConfig: FcrUISceneCreatorConfig, localStorageProvider: FcrUILocalStorageProvider);
     get setting(): CustomSetting;
     private _preHandleSetting;
     setSetting(assignedSetting: Partial<CustomSetting>): void;

package/lib/shared-data-source/setting.js

@@ -20,8 +20,6 @@ require("core-js/modules/es.object.define-property.js");
 require("core-js/modules/es.object.get-own-property-descriptor.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
@@ -64,6 +62,7 @@ var _fcrCore = require("fcr-core");
 var _parameters = require("../utilities/parameters");
 var _mobx = require("mobx");
 var _base = require("../base");
+var _localStorageProvider = require("../providers/local-storage-provider");
 var _FcrUISharedSettingDataSourceImpl;
 var _initProto, _init__setting, _preHandleSettingDecs, _setSettingDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -85,7 +84,8 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
 var _A = /*#__PURE__*/new WeakMap();
 _ref = (_preHandleSettingDecs = [_mobx.action, _mobx.action.bound], _setSettingDecs = [_mobx.action, _mobx.action.bound], "_creatorConfig");
 var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl = /*#__PURE__*/function () {
-  function FcrUISharedSettingDataSourceImpl(creatorConfig) {
+  function FcrUISharedSettingDataSourceImpl(creatorConfig, localStorageProvider) {
+    var _this = this;
     (0, _classCallCheck2["default"])(this, FcrUISharedSettingDataSourceImpl);
     (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
     _classPrivateFieldInitSpec(this, _A, _init__setting(this, {
@@ -107,11 +107,18 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
       spotlightEnabled: true
     }));
     (0, _defineProperty2["default"])(this, "_useDefaultAudioEchoCancellation", true);
+    this._localStorageProvider = localStorageProvider;
     this._creatorConfig = creatorConfig;
     var defaultVideoGallerySize = (0, _parameters.getDefaultVideoGallerySize)(this._creatorConfig.parameters);
     if (defaultVideoGallerySize) {
       defaultVideoGallerySize = Math.min(Math.max(defaultVideoGallerySize, 16), 25);
     }
+    var readAndSetSetting = function readAndSetSetting(key, defaultValue) {
+      var value = _this._localStorageProvider.read(key);
+      _this._setting[key] = value === null ? defaultValue : Boolean(value);
+    };
+    readAndSetSetting(_localStorageProvider.FcrLocalStorageSettingKey.SpotlightEnabled, true);
+    readAndSetSetting(_localStorageProvider.FcrLocalStorageSettingKey.ShouldHideNonVideoParticipants, false);
     this._setting.displayedMaxAttendees = defaultVideoGallerySize || 0;
   }
   return (0, _createClass2["default"])(FcrUISharedSettingDataSourceImpl, [{
@@ -142,6 +149,8 @@ var FcrUISharedSettingDataSourceImpl = exports.FcrUISharedSettingDataSourceImpl
     key: "setSetting",
     value: function setSetting(assignedSetting) {
       var newSetting = this._preHandleSetting(assignedSetting);
+      this._localStorageProvider.write(_localStorageProvider.FcrLocalStorageSettingKey.SpotlightEnabled, newSetting.spotlightEnabled);
+      this._localStorageProvider.write(_localStorageProvider.FcrLocalStorageSettingKey.ShouldHideNonVideoParticipants, newSetting.shouldHideNonVideoParticipants);
       this._setting = newSetting;
     }
   }]);

package/lib/shared-data-source/video-window.d.ts

@@ -1,6 +1,6 @@
 import { FcrUIVideoWindowData, FcrUIVideoWindowFoldSortingPriority, FcrUIVideoWindowLayoutType, FcrUIVideoWindowMainSortingPriority, FcrUIWindowType } from './../type';
 import { FcrStreamInfo, FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
-import { FcrRoomConnectorType, FcrVideoSourceType } from 'fcr-core';
+import { FcrAudioSourceType, FcrRoomConnectorType, FcrVideoSourceType } from 'fcr-core';
 import { FcrUISharedSettingDataSource } from './setting';
 import { FcrUIEventProvider } from '../providers/event-provider';
 type FcrStreamUIData = Omit<FcrStreamInfo, 'owner'> & {
@@ -9,8 +9,6 @@ type FcrStreamUIData = Omit<FcrStreamInfo, 'owner'> & {
 export interface FcrUIVideoWindowDataSource {
     addPin(streamId: string): boolean;
     removePin(streamId: string): void;
-    addPinToast(streamId: string): void;
-    removePinToast(streamId: string, toastText: string): void;
     layoutType: FcrUIVideoWindowLayoutType;
     manualLayout: FcrUIVideoWindowLayoutType | undefined;
     mainList: FcrUIVideoWindowDataImpl[];
@@ -28,7 +26,6 @@ export interface FcrUIVideoWindowDataSource {
     setSpotlightEnabled(enabled: boolean): void;
     setSpeakerSpotlight(streamId: string): void;
     spotlightStreamId: string;
-    layoutMainList: FcrUIVideoWindowDataImpl[];
     shouldHideNonVideoParticipants: boolean;
 }
 export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
@@ -45,6 +42,8 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     type: FcrUIWindowType;
     accessor isPin: boolean;
     accessor hasScreenSharing: boolean;
+    accessor hasBoardSharing: boolean;
+    accessor hasLoopbackSharing: boolean;
     get isSpeakerSpotlight(): boolean;
     get windowId(): string;
     get videoStreamId(): string | undefined;
@@ -52,13 +51,14 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     get audioStreamConnectorType(): FcrRoomConnectorType;
     get videoStreamConnectorType(): FcrRoomConnectorType;
     get hasMicrophoneAudioStream(): boolean;
+    get hasLoopbackAudioStream(): boolean;
     get phoneMicEnabled(): boolean;
     get hasVideoStream(): boolean;
-    get hasLoopbackAudioStream(): boolean;
     get userId(): string;
     get userName(): string;
     get ownerRoleType(): FcrUserRole;
     get videoSourceType(): FcrVideoSourceType.CAMERA | FcrVideoSourceType.SCREEN;
+    get audioSourceType(): FcrAudioSourceType;
     get isMySelf(): boolean;
     get sortingPriority(): FcrUIVideoWindowMainSortingPriority | FcrUIVideoWindowFoldSortingPriority;
     constructor(type: FcrUIWindowType, { videoStream, audioStream, boardUserInfo, }: {
@@ -73,8 +73,10 @@ export declare class FcrUIVideoWindowDataImpl implements FcrUIVideoWindowData {
     setAudioStreamOwnerInfo(userInfo: FcrUserInfo): void;
     setPin(pin: boolean): void;
     setSpotlightEnabled(enabled: boolean): void;
+    setHasBoardSharing(isSharing: boolean): void;
     setSpeakerSpotlight(speakerSpotlight: boolean): void;
     setHasScreenSharing(screenSharing: boolean): void;
+    setHasLoopbackSharing(hasLoopbackSharing: boolean): void;
     setBoardCanEdit(canEdit: boolean): void;
 }
 export interface FcrUIVideoWindowDataSourceObserver {
@@ -104,7 +106,6 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     accessor spotlightStreamId: string;
     constructor(_sharedSettingDataSource: FcrUISharedSettingDataSource, _eventProvider: FcrUIEventProvider);
     get shouldHideNonVideoParticipants(): boolean;
-    get layoutMainList(): FcrUIVideoWindowDataImpl[];
     setSpotlightEnabled(enabled: boolean): void;
     setLayout(layout: FcrUIVideoWindowLayoutType, manual?: boolean): void;
     onSpotlightRemoved(streamId: string): void;
@@ -118,8 +119,6 @@ export declare class FcrUIVideoWindowDataSourceImpl implements FcrUIVideoWindowD
     update(user: FcrUserInfo): void;
     delete(stream: FcrStreamInfo): void;
     addPin(streamId: string): boolean;
-    addPinToast(streamId: string): void;
-    removePinToast(streamId: string, toastText?: string): void;
     private _updateSpeakerSpotlightPosition;
     removePin(streamId: string): true | undefined;
     setSpeakerSpotlight(streamId: string): void;