fcr-core 3.10.5 → 3.10.6

package/lib/room-control/sharing-control/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -19,8 +17,6 @@ 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");
-require("core-js/modules/web.dom-collections.iterator.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -29,8 +25,6 @@ require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.some.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("./type");
 var _type2 = require("../../type");
 var _imports = require("../../imports");
@@ -43,15 +37,38 @@ var _type4 = require("../whiteboard-control/type");
 var _sceneProperties = require("../../utilities/scene-properties");
 var _parameters = require("../../utilities/parameters");
 var _sharedStorage = require("../../utilities/shared-storage");
-var _FcrSharingControlImpl;
-let _initProto, _startScreenSharingDecs, _updateScreenSharingDecs, _ref;
+let _initProto, _startScreenSharingDecs, _updateScreenSharingDecs;
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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; }
-_ref = (_startScreenSharingDecs = (0, _imports.trace)(['config', 'size', 'labels']), _updateScreenSharingDecs = (0, _imports.trace)(['enableAnnotation']), "logger");
 class FcrSharingControlImpl {
+  static {
+    [_initProto] = _applyDecs(this, [[_startScreenSharingDecs, 2, "startScreenSharing"], [_imports.trace, 2, "startWhiteboard"], [_updateScreenSharingDecs, 2, "updateScreenSharing"], [_imports.trace, 2, "stop"], [_imports.trace, 2, "getScreenSharingState"]], []).e;
+  }
+  [(_startScreenSharingDecs = (0, _imports.trace)(['config', 'size', 'labels']), _updateScreenSharingDecs = (0, _imports.trace)(['enableAnnotation']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
+    prefix: 'FcrSharingControlImpl'
+  }));
+  _observable = new _imports.AgoraObservable();
+  _isActive = false;
+  _shareOwnerId = '';
+  _shareOwnerStream = null;
+  _lastScreenSharingState = _type.FcrScreenSharingState.END;
+  _lastScreenSharingStreamId = null;
+  _streamObserver = {
+    onStreamsAdded: this._handleOnStreamsAdded.bind(this),
+    onStreamsRemoved: this._handleOnStreamsRemoved.bind(this)
+  };
+  _sceneObserver = {
+    onScenePropertiesUpdated: this._handleOnScenePropertiesUpdated.bind(this)
+  };
+
+  // TODO: 这里不应该再维护一套白板的状态和事件了， ui-scene 应该直接用 board control 的
+  _whiteboardObserver = {
+    onActive: this._handleOnWhiteboardActive.bind(this),
+    onInactive: this._handleOnWhiteboardInActive.bind(this)
+  };
   get ownerId() {
     return this._shareOwnerId;
   }
@@ -59,27 +76,6 @@ class FcrSharingControlImpl {
     return this._shareOwnerStream;
   }
   constructor(_scene, _api, _engine, _config, _privilegeControl, _streamControl, _sharedCache, _userControl) {
-    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
-      prefix: 'FcrSharingControlImpl'
-    })));
-    (0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
-    (0, _defineProperty2.default)(this, "_isActive", false);
-    (0, _defineProperty2.default)(this, "_shareOwnerId", '');
-    (0, _defineProperty2.default)(this, "_shareOwnerStream", null);
-    (0, _defineProperty2.default)(this, "_lastScreenSharingState", _type.FcrScreenSharingState.END);
-    (0, _defineProperty2.default)(this, "_lastScreenSharingStreamId", null);
-    (0, _defineProperty2.default)(this, "_streamObserver", {
-      onStreamsAdded: this._handleOnStreamsAdded.bind(this),
-      onStreamsRemoved: this._handleOnStreamsRemoved.bind(this)
-    });
-    (0, _defineProperty2.default)(this, "_sceneObserver", {
-      onScenePropertiesUpdated: this._handleOnScenePropertiesUpdated.bind(this)
-    });
-    // TODO: 这里不应该再维护一套白板的状态和事件了， ui-scene 应该直接用 board control 的
-    (0, _defineProperty2.default)(this, "_whiteboardObserver", {
-      onActive: this._handleOnWhiteboardActive.bind(this),
-      onInactive: this._handleOnWhiteboardInActive.bind(this)
-    });
     this._scene = _scene;
     this._api = _api;
     this._engine = _engine;
@@ -101,7 +97,7 @@ class FcrSharingControlImpl {
       this.logger.info('set board ip list to storage ', boardIpList);
       (0, _sharedStorage.setBoardIpList)(boardIpList);
     }
-    this.logger.info("initialized, room id: ".concat(this._scene.sceneId));
+    this.logger.info(`initialized, room id: ${this._scene.sceneId}`);
   }
   async startScreenSharing(config, size, labels) {
     try {
@@ -163,9 +159,10 @@ class FcrSharingControlImpl {
   }
   getAnnotationControl() {
     if (!this._annotationControl) {
-      const _this$_userControl$ge = this._userControl.getLocalUser(),
-        userId = _this$_userControl$ge.userId,
-        userName = _this$_userControl$ge.userName;
+      const {
+        userId,
+        userName
+      } = this._userControl.getLocalUser();
       const annotationConfig = {
         userId,
         userName,
@@ -182,17 +179,15 @@ class FcrSharingControlImpl {
       this._engine._rtmClient._client, annotationConfig, {
         sceneId: this._scene.sceneId,
         getAnnotationState: () => {
-          var _this$_scene$getScene;
-          return (_this$_scene$getScene = this._scene.getScenePropertiesByKeyPath('widgets.annotation.state')) !== null && _this$_scene$getScene !== void 0 ? _this$_scene$getScene : _type4.FcrBoardPropertiesState.INACTIVE;
+          return this._scene.getScenePropertiesByKeyPath('widgets.annotation.state') ?? _type4.FcrBoardPropertiesState.INACTIVE;
         },
         getBoardPerformance: () => (0, _sceneProperties.getBoardPerformance)(this._scene),
         isAndroidByOwner: () => {
-          var _this$_streamControl$, _this$_userControl$ge2;
-          const sharingOwner = (_this$_streamControl$ = this._streamControl.getStreamList().find(stream => stream.videoSourceType === _.FcrVideoSourceType.SCREEN)) === null || _this$_streamControl$ === void 0 ? void 0 : _this$_streamControl$.owner;
+          const sharingOwner = this._streamControl.getStreamList().find(stream => stream.videoSourceType === _.FcrVideoSourceType.SCREEN)?.owner;
           if (!sharingOwner) {
             return false;
           }
-          return ((_this$_userControl$ge2 = this._userControl.getUser(sharingOwner.userId)) === null || _this$_userControl$ge2 === void 0 ? void 0 : _this$_userControl$ge2.platform) === _type2.FcrPlatform.ANDROID;
+          return this._userControl.getUser(sharingOwner.userId)?.platform === _type2.FcrPlatform.ANDROID;
         }
       }, this._api);
     }
@@ -212,9 +207,10 @@ class FcrSharingControlImpl {
   getBoardControl() {
     if (!this._whiteboardControl) {
       const factory = new _factory.FcrWhiteboardControlFactoryImpl();
-      const _this$_userControl$ge3 = this._userControl.getLocalUser(),
-        userId = _this$_userControl$ge3.userId,
-        userName = _this$_userControl$ge3.userName;
+      const {
+        userId,
+        userName
+      } = this._userControl.getLocalUser();
       const boardConfig = {
         userId,
         userName,
@@ -248,7 +244,9 @@ class FcrSharingControlImpl {
   }
   _handleOnStreamsAdded(roomId, events) {
     events.forEach(event => {
-      const modifiedStream = event.modifiedStream;
+      const {
+        modifiedStream
+      } = event;
       if (this._isStreamToHandleScreenSharing(modifiedStream)) {
         this._shareOwnerId = modifiedStream.owner.userId;
         this._shareOwnerStream = modifiedStream;
@@ -258,48 +256,48 @@ class FcrSharingControlImpl {
   }
   _handleOnStreamsRemoved(roomId, events) {
     events.forEach(event => {
-      const modifiedStream = event.modifiedStream;
+      const {
+        modifiedStream
+      } = event;
       const ownerId = modifiedStream.owner.userId;
       if (this._isStreamToHandleScreenSharing(modifiedStream)) {
         this._notifyScreenSharingUpdated('onScreenSharingUpdated', modifiedStream, _type.FcrScreenSharingState.END);
         if (this.getScreenSharingState() === _type.FcrScreenSharingState.END) {
           const isMeSharing = ownerId === this._userControl.getLocalUser().userId;
           if (isMeSharing) {
-            var _this$_annotationCont;
             this.logger.info('on stream removed, clean before terminal Annotation app');
-            (_this$_annotationCont = this._annotationControl.getMainWindow()) === null || _this$_annotationCont === void 0 || _this$_annotationCont.clean();
+            this._annotationControl.getMainWindow()?.clean();
           }
         }
       }
     });
   }
   _handleOnScenePropertiesUpdated(sceneId, event) {
-    var _causeData$widgetCaus;
-    const cause = event.cause;
-    const causeData = cause === null || cause === void 0 ? void 0 : cause.data;
+    const {
+      cause
+    } = event;
+    const causeData = cause?.data;
     const currentScreenSharingState = this.getScreenSharingState();
-    const causeCmd = cause === null || cause === void 0 ? void 0 : cause.cmd;
+    const causeCmd = cause?.cmd;
     const isWidgetPropertiesUpdated = causeCmd === 10;
-    const isAnnotationWidgetUpdated = (causeData === null || causeData === void 0 ? void 0 : causeData.widgetUuid) === _type3.FcrWidgetUuid.ANNOTATION;
-    const isAnnotationStateUpdated = (causeData === null || causeData === void 0 || (_causeData$widgetCaus = causeData.widgetCause) === null || _causeData$widgetCaus === void 0 ? void 0 : _causeData$widgetCaus.cmd) === _type3.FcrWidgetCauseCmd.ANNOTATION;
+    const isAnnotationWidgetUpdated = causeData?.widgetUuid === _type3.FcrWidgetUuid.ANNOTATION;
+    const isAnnotationStateUpdated = causeData?.widgetCause?.cmd === _type3.FcrWidgetCauseCmd.ANNOTATION;
     if (!isWidgetPropertiesUpdated || !isAnnotationWidgetUpdated) {
       return;
     }
     if (currentScreenSharingState === _type.FcrScreenSharingState.END) {
-      var _causeData$widgetCaus2;
-      if (((_causeData$widgetCaus2 = causeData.widgetCause) === null || _causeData$widgetCaus2 === void 0 ? void 0 : _causeData$widgetCaus2.cmd) === _type3.FcrWidgetCauseCmd.ANNOTATION) {
+      if (causeData.widgetCause?.cmd === _type3.FcrWidgetCauseCmd.ANNOTATION) {
         this._notifyScreenSharingUpdated('onScreenSharingUpdated', this.ownerStream, _type.FcrScreenSharingState.END);
         const isMeSharing = this.ownerId === this._userControl.getLocalUser().userId;
         if (isMeSharing) {
-          var _this$_annotationCont2;
           this.logger.info('clean annotation board');
-          (_this$_annotationCont2 = this._annotationControl.getMainWindow()) === null || _this$_annotationCont2 === void 0 || _this$_annotationCont2.clean();
+          this._annotationControl.getMainWindow()?.clean();
         }
       }
     } else {
       if (isAnnotationStateUpdated) {
         const screenStream = this._getScreenShareStreamByUuid();
-        this._notifyScreenSharingUpdated('onScreenSharingUpdated', screenStream !== null && screenStream !== void 0 ? screenStream : this.ownerStream, _type.FcrScreenSharingState.START_WHIT_ANNOTATION);
+        this._notifyScreenSharingUpdated('onScreenSharingUpdated', screenStream ?? this.ownerStream, _type.FcrScreenSharingState.START_WHIT_ANNOTATION);
         // const owner = this._userControl.getUser(this.ownerId);
         // const isElectron =
         //   owner &&
@@ -340,8 +338,7 @@ class FcrSharingControlImpl {
     return typeof stream === 'undefined' ? null : stream;
   }
   _notifyScreenSharingUpdated(eventName, streamInfo, state) {
-    var _streamInfo$streamId;
-    const streamId = (_streamInfo$streamId = streamInfo === null || streamInfo === void 0 ? void 0 : streamInfo.streamId) !== null && _streamInfo$streamId !== void 0 ? _streamInfo$streamId : null;
+    const streamId = streamInfo?.streamId ?? null;
     if (this._lastScreenSharingState === state && this._lastScreenSharingStreamId === streamId) {
       return;
     }
@@ -353,9 +350,4 @@ class FcrSharingControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onScreenSharingUpdated', ['streamInfo', 'state']], ['onWhiteboardStarted', ['ownerId', 'operatorUser']], ['onWhiteboardEnded', ['reason', 'operatorUser']]]));
   }
 }
-exports.FcrSharingControlImpl = FcrSharingControlImpl;
-_FcrSharingControlImpl = FcrSharingControlImpl;
-var _applyDecs$e = _applyDecs(_FcrSharingControlImpl, [[_startScreenSharingDecs, 2, "startScreenSharing"], [_imports.trace, 2, "startWhiteboard"], [_updateScreenSharingDecs, 2, "updateScreenSharing"], [_imports.trace, 2, "stop"], [_imports.trace, 2, "getScreenSharingState"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+exports.FcrSharingControlImpl = FcrSharingControlImpl;