fcr-core 3.7.9-alpha → 3.8.0-alpha

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

@@ -1,5 +1,7 @@
 "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");
@@ -17,6 +19,7 @@ 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");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -24,13 +27,17 @@ exports.FcrSharingControlImpl = void 0;
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.some.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("./type");
 var _imports = require("../../imports");
 var _ = require("../..");
-var _enums = require("../whiteboard-control/enums");
 var _logger = require("../../utilities/logger");
-var _whiteboardControl = require("../whiteboard-control-v2/whiteboard-control");
-var _annotationControl = require("../whiteboard-control-v2/annotation-control");
+var _factory = require("../whiteboard-control-v2/whiteboard-control/factory");
+var _factory2 = require("../whiteboard-control-v2/annotation-control/factory");
+var _utils = require("../whiteboard-control/utils");
+var _type2 = require("../type");
+var _FcrSharingControlImpl;
 let _initProto;
 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 + ""; }
@@ -38,29 +45,6 @@ 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; }
 class FcrSharingControlImpl {
-  static {
-    [_initProto] = _applyDecs(this, [[_imports.trace, 2, "startScreenSharing"], [_imports.trace, 2, "startWhiteboard"], [_imports.trace, 2, "updateScreenSharing"], [_imports.trace, 2, "stop"], [_imports.trace, 2, "getScreenSharingState"]], []).e;
-  }
-  logger = (_initProto(this), (0, _logger.createLogger)({
-    prefix: 'FcrSharingControlImpl'
-  }));
-  _observable = new _imports.AgoraObservable();
-  _isActive = false;
-  _shareOwnerId = '';
-  _shareOwnerStream = 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;
   }
@@ -68,6 +52,25 @@ class FcrSharingControlImpl {
     return this._shareOwnerStream;
   }
   constructor(_scene, _api, _engine, _privilegeControl, _streamControl, _sharedCache, _userControl) {
+    (0, _defineProperty2.default)(this, "logger", (_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, "_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;
@@ -82,7 +85,7 @@ class FcrSharingControlImpl {
     this._streamControl.addObserver(this._streamObserver);
     this._whiteboardControl.addObserver(this._whiteboardObserver);
     this._scene.addObserver(this._sceneObserver);
-    this.logger.info(`initialized, room id: ${this._scene.sceneId}`);
+    this.logger.info("initialized, room id: ".concat(this._scene.sceneId));
   }
   async startScreenSharing(config, size) {
     try {
@@ -99,9 +102,9 @@ class FcrSharingControlImpl {
     const currentShareState = this.getScreenSharingState();
     if (currentShareState === _type.FcrScreenSharingState.START_ONLY_SCREEN) {
       if (enableAnnotation) {
-        return this._api.toggleAnnotationActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.ON);
+        return this._api.toggleAnnotationActivityState(this._scene.sceneId, _type.FcrSharePermissionState.ON);
       } else {
-        return this._api.toggleAnnotationActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.OFF);
+        return this._api.toggleAnnotationActivityState(this._scene.sceneId, _type.FcrSharePermissionState.OFF);
       }
     }
     return Promise.resolve();
@@ -133,9 +136,25 @@ class FcrSharingControlImpl {
   }
   getAnnotationControl() {
     if (!this._annotationControl) {
-      this._annotationControl = new _annotationControl.FcrAnnotationControlFactoryImpl(
+      const {
+        userId,
+        userName
+      } = this._userControl.getLocalUser();
+      const annotationConfig = {
+        userId,
+        userName,
+        roomId: this._scene.sceneId,
+        boardRatio: 1,
+        size: {
+          width: 1280,
+          height: 720
+        }
+      };
+      const permissions = this._privilegeControl.getAllLocalUserPermissionInfo();
+      const hasOperationPrivilege = (0, _utils.hasAnnotationWritePermission)(permissions);
+      this._annotationControl = new _factory2.FcrAnnotationControlFactoryImpl().createForMainProcess(
       // @ts-ignore
-      this._engine._rtmClient._client, this._scene, this._streamControl, this._userControl, this._privilegeControl, this._api).createForMainProcess();
+      this._engine._rtmClient._client, hasOperationPrivilege, annotationConfig, this._api);
     }
     return this._annotationControl;
   }
@@ -152,9 +171,22 @@ class FcrSharingControlImpl {
   }
   getBoardControl() {
     if (!this._whiteboardControl) {
-      this._whiteboardControl = new _whiteboardControl.FcrWhiteboardControlFactoryImpl(
+      const factory = new _factory.FcrWhiteboardControlFactoryImpl();
+      const permissions = this._privilegeControl.getAllLocalUserPermissionInfo();
+      const hasOperationPrivilege = (0, _utils.hasBoardWritePermission)(permissions);
+      const {
+        userId,
+        userName
+      } = this._userControl.getLocalUser();
+      const boardConfig = {
+        userId,
+        userName,
+        roomId: this._scene.sceneId,
+        boardRatio: 0
+      };
+      this._whiteboardControl = factory.createForMainProcess(
       // @ts-ignore
-      this._engine._rtmClient._client, this._scene, this._api, this._sharedCache, this._privilegeControl).createForMainProcess();
+      this._engine._rtmClient._client, hasOperationPrivilege, boardConfig, this._scene, this._api, this._sharedCache);
     }
     return this._whiteboardControl;
   }
@@ -198,8 +230,9 @@ class FcrSharingControlImpl {
         if (this.getScreenSharingState() === _type.FcrScreenSharingState.END) {
           const isMeSharing = ownerId === this._userControl.getLocalUser().userId;
           if (isMeSharing) {
+            var _this$_annotationCont;
             this.logger.info('[sharing]: on stream removed, clean before terminal Annotation app');
-            this._annotationControl.getMainWindow()?.clean();
+            (_this$_annotationCont = this._annotationControl.getMainWindow()) === null || _this$_annotationCont === void 0 || _this$_annotationCont.clean();
           }
         }
       }
@@ -209,26 +242,29 @@ class FcrSharingControlImpl {
     const {
       cause
     } = event;
-    const causeData = cause?.data;
+    const causeData = cause === null || cause === void 0 ? void 0 : cause.data;
     const currentScreenSharingState = this.getScreenSharingState();
-    const causeCmd = cause?.cmd;
+    const causeCmd = cause === null || cause === void 0 ? void 0 : cause.cmd;
     if (currentScreenSharingState === _type.FcrScreenSharingState.END) {
-      if (causeData && causeCmd === 10 && causeData.widgetUuid === 'annotation') {
-        if (causeData.widgetCause?.cmd === 1) {
+      if (causeData && causeCmd === 10 && causeData.widgetUuid === _type2.FcrWidgetUuid.ANNOTATION) {
+        var _causeData$widgetCaus;
+        if (((_causeData$widgetCaus = causeData.widgetCause) === null || _causeData$widgetCaus === void 0 ? void 0 : _causeData$widgetCaus.cmd) === _type2.FcrWidgetCauseCmd.ANNOTATION) {
           this._observable.notifyObservers('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._annotationControl.getMainWindow()?.clean();
+            (_this$_annotationCont2 = this._annotationControl.getMainWindow()) === null || _this$_annotationCont2 === void 0 || _this$_annotationCont2.clean();
           }
         }
       }
     } else {
       // 当屏幕共享开启时
-      if (causeData && causeCmd === 10 && causeData.widgetUuid === 'annotation') {
-        if (causeData.widgetCause?.cmd === 1) {
+      if (causeData && causeCmd === 10 && causeData.widgetUuid === _type2.FcrWidgetUuid.ANNOTATION) {
+        var _causeData$widgetCaus2;
+        if (((_causeData$widgetCaus2 = causeData.widgetCause) === null || _causeData$widgetCaus2 === void 0 ? void 0 : _causeData$widgetCaus2.cmd) === _type2.FcrWidgetCauseCmd.ANNOTATION) {
           const screenStream = this._getScreenShareStreamByUuid();
-          this._observable.notifyObservers('onScreenSharingUpdated', screenStream ?? this.ownerStream, _type.FcrScreenSharingState.START_WHIT_ANNOTATION);
+          this._observable.notifyObservers('onScreenSharingUpdated', screenStream !== null && screenStream !== void 0 ? screenStream : this.ownerStream, _type.FcrScreenSharingState.START_WHIT_ANNOTATION);
           // const owner = this._userControl.getUser(this.ownerId);
           // const isElectron =
           //   owner &&
@@ -274,4 +310,6 @@ class FcrSharingControlImpl {
     this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onScreenSharingUpdated', 'onWhiteboardStarted', 'onWhiteboardEnded']));
   }
 }
-exports.FcrSharingControlImpl = FcrSharingControlImpl;
+exports.FcrSharingControlImpl = FcrSharingControlImpl;
+_FcrSharingControlImpl = FcrSharingControlImpl;
+[_initProto] = _applyDecs(_FcrSharingControlImpl, [[_imports.trace, 2, "startScreenSharing"], [_imports.trace, 2, "startWhiteboard"], [_imports.trace, 2, "updateScreenSharing"], [_imports.trace, 2, "stop"], [_imports.trace, 2, "getScreenSharingState"]], []).e;

package/lib/room-control/sharing-control/type.d.ts

@@ -1,8 +1,8 @@
 import { FcrStreamInfo, FcrUserInfo } from '../../type';
 import { FcrScreenStreamCreateConfig, FcrSize } from '../stream-control/type';
-import { FcrPrivilegedAnnotationControl } from '../whiteboard-control-v2/annotation-control/type';
-import { FcrPrivilegedWhiteboardControl } from '../whiteboard-control-v2/whiteboard-control/type';
-import { FcrBoardInactiveReason } from '../whiteboard-control/types';
+import { FcrBoardInactiveReason } from '../whiteboard-control/enum';
+import { FcrAnnotationControl } from '../whiteboard-control-v2/annotation-control/type';
+import { FcrWhiteboardControl } from '../whiteboard-control-v2/whiteboard-control/type';
 export interface FcrSharingControl {
     startScreenSharing(config: FcrScreenStreamCreateConfig, size?: FcrSize): Promise<string>;
     startWhiteboard(): Promise<void>;
@@ -10,8 +10,8 @@ export interface FcrSharingControl {
     stop(): Promise<void>;
     getScreenSharingState(): FcrScreenSharingState;
     getWhiteboardState(): FcrWhiteboardState;
-    getAnnotationControl(): FcrPrivilegedAnnotationControl;
-    getBoardControl(): FcrPrivilegedWhiteboardControl;
+    getAnnotationControl(): FcrAnnotationControl;
+    getBoardControl(): FcrWhiteboardControl;
     getSharingWindowSize(): FcrSize | undefined;
     addObserver(observer: FcrSharingObserver): void;
     removeObserver(observer: FcrSharingObserver): void;
@@ -30,3 +30,7 @@ export declare enum FcrWhiteboardState {
     END = 0,
     START = 1
 }
+export declare enum FcrSharePermissionState {
+    ON = 1,
+    OFF = 0
+}

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrWhiteboardState = exports.FcrScreenSharingState = void 0;
+exports.FcrWhiteboardState = exports.FcrSharePermissionState = exports.FcrScreenSharingState = void 0;
 let FcrScreenSharingState = exports.FcrScreenSharingState = /*#__PURE__*/function (FcrScreenSharingState) {
   FcrScreenSharingState[FcrScreenSharingState["END"] = 0] = "END";
   FcrScreenSharingState[FcrScreenSharingState["START_ONLY_SCREEN"] = 1] = "START_ONLY_SCREEN";
@@ -14,4 +14,9 @@ let FcrWhiteboardState = exports.FcrWhiteboardState = /*#__PURE__*/function (Fcr
   FcrWhiteboardState[FcrWhiteboardState["END"] = 0] = "END";
   FcrWhiteboardState[FcrWhiteboardState["START"] = 1] = "START";
   return FcrWhiteboardState;
+}({});
+let FcrSharePermissionState = exports.FcrSharePermissionState = /*#__PURE__*/function (FcrSharePermissionState) {
+  FcrSharePermissionState[FcrSharePermissionState["ON"] = 1] = "ON";
+  FcrSharePermissionState[FcrSharePermissionState["OFF"] = 0] = "OFF";
+  return FcrSharePermissionState;
 }({});

package/lib/room-control/stream-control/index.d.ts

@@ -1 +1,8 @@
-export {};
+import { AgoraRteRenderView } from '../../imports';
+export declare class FcrSubscribedStreamsControl {
+    private logger;
+    getViewId(element: AgoraRteRenderView): string;
+    isEmpty(streamId: string): boolean;
+    bind(viewId: string, streamId: string): void;
+    unbind(viewId: string, streamId: string): void;
+}