fcr-core 3.6.0 → 3.6.2

package/lib/room-control/whiteboard-control-v2/whiteboard-control/index.js

@@ -0,0 +1,261 @@
+"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");
+require("core-js/modules/esnext.map.emplace.js");
+require("core-js/modules/esnext.map.every.js");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+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");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrWhiteboardControlImpl = void 0;
+require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _enums = require("../../whiteboard-control/enums");
+var _forgeRoom = require("@netless/forge-room");
+var _forgeWhiteboard = require("@netless/forge-whiteboard");
+var _forgeRtm = require("@netless/forge-rtm");
+var _asyncRetry = require("agora-foundation/lib/utilities/async-retry");
+var _mainWindow = require("../main-window");
+var _user = require("../../../utilities/user");
+var _observable = require("agora-foundation/lib/utilities/observable");
+var _decorator = require("agora-foundation/lib/decorator");
+var _ = require("../../../");
+var _logger = require("../../../utilities/logger");
+var _error = require("../../../utilities/error");
+var _validateParams = _interopRequireDefault(require("../../../utilities/validate-params"));
+var _schema = require("../../../schema");
+var _FcrWhiteboardControlImpl;
+let _initProto, _setBackgroundColorDecs, _ref;
+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 = (_setBackgroundColorDecs = [_decorator.bound, _logger.trace, (0, _validateParams.default)(_schema.stringSchema)], "logger");
+class FcrWhiteboardControlImpl {
+  constructor(_scene, _api, _engine, _sharedCache) {
+    (0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrWhiteboardControlImpl'
+    })));
+    (0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
+    (0, _defineProperty2.default)(this, "_connectState", _.FcrConnectionState.DISCONNECTED);
+    (0, _defineProperty2.default)(this, "_joined", false);
+    (0, _defineProperty2.default)(this, "_FORGE_WHITEBOARD_APP_ID", 'MainWhiteboard');
+    this._scene = _scene;
+    this._api = _api;
+    this._engine = _engine;
+    this._sharedCache = _sharedCache;
+    this._roomCache = _sharedCache.getRoomCache(this._scene.sceneId);
+    this._addLogObserver();
+    _scene.addObserver(this._notifyObservers());
+  }
+  async open() {
+    var _this$_scene$getUser;
+    // 此宽高为设计稿中的白板尺寸，如无特殊需求，不建议修改
+    const width = 1920;
+    const height = 1220;
+    const roomId = this._scene.sceneId;
+    const userId = this._scene.localUser.getLocalUserId();
+    const nickName = (_this$_scene$getUser = this._scene.getUser(userId)) === null || _this$_scene$getUser === void 0 ? void 0 : _this$_scene$getUser.userName;
+    const {
+      data
+    } = await this._getToken(roomId, userId);
+    const {
+      boardAppId: appIdentifier,
+      boardId,
+      boardRegion: region,
+      boardToken: roomToken
+    } = data || {};
+
+    // @ts-ignore
+    const rtmClient = this._engine._rtmClient._client;
+    const rtmProvider = new _forgeRtm.RTMProvider_2_2(rtmClient);
+    const wbRoom = new _forgeRoom.Room(boardId, rtmProvider);
+    wbRoom.applicationManager.registerApplication(_forgeWhiteboard.WhiteboardApplication);
+    try {
+      this._updateConnnectionState(_.FcrConnectionState.CONNECTING);
+      const retriesMax = 10;
+      await (0, _asyncRetry.retryAttempt)(async () => {
+        await wbRoom.joinRoom({
+          userId,
+          nickName,
+          roomToken,
+          sdkConfig: {
+            // @ts-ignore
+            region,
+            appIdentifier
+          }
+        });
+        this._boardRoom = wbRoom;
+        this.logger.info({
+          appIdentifier,
+          boardId,
+          region,
+          roomToken
+        });
+        const whiteboard = await wbRoom.applicationManager.launchApplication(_forgeWhiteboard.WhiteboardApplication, {
+          width,
+          height,
+          defaultToolbarStyle: {
+            tool: 'laser'
+          }
+        }, this._FORGE_WHITEBOARD_APP_ID);
+        whiteboard.enableCameraByMouse = false;
+        whiteboard.enableCameraByTouch = false;
+        whiteboard.setViewModeToMain();
+        // wbRoom.applicationManager.on('terminal', () => {
+        //   this._updateConnnectionState(FcrConnectionState.DISCONNECTED);
+        // });
+        this._boardView = new _mainWindow.FcrBoardMainWindowImpl(whiteboard, this._scene, this._sharedCache, wbRoom);
+        this._updateConnnectionState(_.FcrConnectionState.CONNECTED);
+      }, [], {
+        retriesMax
+      }).fail(async _ref2 => {
+        let {
+          error,
+          timeFn,
+          currentRetry
+        } = _ref2;
+        this.logger.info("failed to join board room, error: ".concat(error.message, ", current retry: ").concat(currentRetry));
+        this._joined && (await timeFn());
+        this.logger.info("continue attemptting? ".concat(this._joined));
+        return this._joined;
+      }).abort(() => {
+        this._updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
+      }).exec();
+    } catch (e) {
+      this._updateConnnectionState(_.FcrConnectionState.DISCONNECTED);
+    }
+    return this._boardView;
+  }
+  async close() {
+    var _this$_boardRoom, _this$_boardRoom2;
+    this._joined = false;
+    (_this$_boardRoom = this._boardRoom) === null || _this$_boardRoom === void 0 || _this$_boardRoom.applicationManager.terminateApplication(this._FORGE_WHITEBOARD_APP_ID);
+    await ((_this$_boardRoom2 = this._boardRoom) === null || _this$_boardRoom2 === void 0 ? void 0 : _this$_boardRoom2.leaveRoom());
+    this._boardRoom = undefined;
+    this._boardView = undefined;
+  }
+  async active() {
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.ON), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
+  }
+  async inactive() {
+    return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.OFF), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'inactive failed');
+  }
+  getConnectionState() {
+    return this._connectState;
+  }
+  getMainWindow() {
+    return this._boardView;
+  }
+  getBoardActiveInfo() {
+    const {
+      state,
+      ownerUserUuid: ownerUserId
+    } = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard') || {
+      isActive: false,
+      ownerUserUuid: null
+    };
+    const isActive = state === _enums.FcrSharePermissionState.ON;
+    if (isActive) {
+      return {
+        isActive: true,
+        ownerUserId
+      };
+    } else {
+      return {
+        isActive: false,
+        ownerUserId: null
+      };
+    }
+  }
+  async setBackgroundColor(backgroundColor) {
+    var _this$_boardView;
+    await this._api.setBackgroundColor({
+      roomId: this._scene.sceneId,
+      backgroundColor
+    });
+    (_this$_boardView = this._boardView) === null || _this$_boardView === void 0 || _this$_boardView.setBackgroundColor(backgroundColor);
+  }
+  getBackgroundColor() {
+    return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.extra.backgroundColor');
+  }
+  getActivity() {
+    return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard').state === 1;
+  }
+  getOwnerId() {
+    return this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard.ownerUserUuid');
+  }
+  addObserver(observer) {
+    this._observable.addObserver(observer);
+  }
+  removeObserver(observer) {
+    this._observable.removeObserver(observer);
+  }
+  _notifyObservers() {
+    return {
+      onScenePropertiesUpdated: (sceneId, event) => {
+        var _event$cause;
+        const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
+        const getByKeyPath = value => this._scene.getScenePropertiesByKeyPath(value);
+        if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 10) {
+          var _ref3, _ref4, _event$cause$data$wid2;
+          const {
+            state,
+            ownerUserUuid
+          } = (_ref3 = getByKeyPath('widgets.netlessBoard')) !== null && _ref3 !== void 0 ? _ref3 : {
+            state: 0
+          };
+          const {
+            backgroundColor: bgColor
+          } = (_ref4 = getByKeyPath('widgets.netlessBoard.extra')) !== null && _ref4 !== void 0 ? _ref4 : {
+            backgroundColor: '#ffffff'
+          };
+          if (state === 1) {
+            this._observable.notifyObservers('onActive', ownerUserUuid, operatorUser);
+          }
+          if (state === 0) {
+            var _event$cause$data$wid;
+            this._observable.notifyObservers('onInactive', (_event$cause$data$wid = event.cause.data.widgetCause) === null || _event$cause$data$wid === void 0 || (_event$cause$data$wid = _event$cause$data$wid.data) === null || _event$cause$data$wid === void 0 ? void 0 : _event$cause$data$wid.reason, operatorUser);
+          }
+          if (((_event$cause$data$wid2 = event.cause.data.widgetCause) === null || _event$cause$data$wid2 === void 0 ? void 0 : _event$cause$data$wid2.cmd) === 100101) {
+            this._observable.notifyObservers('onBackgroundColorUpdated', bgColor, operatorUser);
+          }
+        }
+      }
+    };
+  }
+  _updateConnnectionState(state) {
+    this._connectState = state;
+    this._observable.notifyObservers('onConnectionStateUpdated', state);
+  }
+  async _getToken(roomId, userId) {
+    return await (0, _error.handleRequestError)(() => this._api.getWhiteboardToken({
+      roomId,
+      userId
+    }), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
+  }
+  _addLogObserver() {
+    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onActive', 'onInactive', 'onBackgroundColorUpdated', 'onConnectionStateUpdated']));
+  }
+}
+exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
+_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
+[_initProto] = _applyDecs(_FcrWhiteboardControlImpl, [[_logger.trace, 2, "open"], [_logger.trace, 2, "close"], [_logger.trace, 2, "active"], [_logger.trace, 2, "inactive"], [[_decorator.bound, _logger.trace], 2, "getConnectionState"], [[_decorator.bound, _logger.trace], 2, "getMainWindow"], [_decorator.bound, 2, "getBoardActiveInfo"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getBackgroundColor"], [[_decorator.bound, _logger.trace], 2, "getActivity"], [[_decorator.bound, _logger.trace], 2, "getOwnerId"], [_decorator.bound, 2, "_notifyObservers"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_getToken"]], []).e;

package/lib/room-control/whiteboard-control-v2/whiteboard-control/type.d.ts

@@ -0,0 +1,42 @@
+import { FcrConnectionState } from '../../..';
+import { FcrUserInfo } from '../../../type';
+import { FcrBaseWhiteboardControl, FcrBoardInactiveReason } from '../../whiteboard-control/types';
+export interface FcrWhiteboardControl extends FcrBaseWhiteboardControl {
+    active(): Promise<void>;
+    inactive(): Promise<void>;
+    getActivity(): boolean;
+    getOwnerId(): string;
+    getBackgroundColor(): string | undefined;
+    setBackgroundColor(color: string): Promise<void>;
+    addObserver(observer: FcrWhiteboardObserver): void;
+    removeObserver(observer: FcrWhiteboardObserver): void;
+}
+export type FcrWhiteboardObserver = {
+    /**
+     * Callback to receive the connection state change.
+     * @param state
+     */
+    onConnectionStateUpdated?(state: FcrConnectionState): void;
+    /**
+     * Callback to receive the background color of the whiteboard change.
+     * @param info
+     */
+    onBackgroundColorUpdated?(color: string, operatorUser?: FcrUserInfo): void;
+    /**
+     * Callback to receive the whiteboard active event.
+     * @param info
+     */
+    onActive?(ownerId: string, operatorUser: FcrUserInfo): void;
+    /**
+     * Callback to receive the whiteboard inactive event.
+     * @param reason
+     * @param operatorUser
+     */
+    onInactive?(reason: FcrBoardInactiveReason, operatorUser?: FcrUserInfo): void;
+};
+export type FcrBoardConfig = {
+    roomId: string;
+    userId: string;
+    userName: string;
+    boardRatio: number;
+};

package/lib/room-control/whiteboard-control-v2/whiteboard-control/type.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/schema.d.ts

@@ -893,7 +893,28 @@ export declare const fcrScreenStreamCreateConfigSchema: z.ZodObject<{
     audioSourceId?: string | undefined;
     audioDeviceName?: string | undefined;
 }>;
+export declare const fcrScreenStreamCreateConfigSize: z.ZodObject<{
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    width: number;
+    height: number;
+}, {
+    width: number;
+    height: number;
+}>;
 export type FcrScreenStreamCreateConfigSchema = z.infer<typeof fcrScreenStreamCreateConfigSchema>;
+export declare const fcrSizeSchema: z.ZodOptional<z.ZodObject<{
+    width: z.ZodNumber;
+    height: z.ZodNumber;
+}, "strip", z.ZodTypeAny, {
+    width: number;
+    height: number;
+}, {
+    width: number;
+    height: number;
+}>>;
+export type fcrSizeSchema = z.infer<typeof fcrSizeSchema>;
 export declare const fcrGroupCreateConfigArraySchema: z.ZodArray<z.ZodObject<{
     groupName: z.ZodString;
     userList: z.ZodArray<z.ZodString, "many">;

package/lib/schema.js

@@ -42,7 +42,7 @@ Object.defineProperty(exports, "fcrRenderViewSchema", {
     return _imports.fcrRenderViewSchema;
   }
 });
-exports.messageSchema = exports.fcrVideoStreamTypeSchema = exports.fcrVideoSourceTypeSchema = exports.fcrUserRolesSchema = exports.fcrUserRoleSchema = exports.fcrUserKickedOutTypeSchema = exports.fcrUpdateStreamPrivilegeScopeSchema = exports.fcrUpdateStreamCustomSchema = exports.fcrStreamPrivilegeVideoSourceTypeSchema = exports.fcrStreamPrivilegeOperation = exports.fcrStreamPrivilegeAudioSourceTypeSchema = exports.fcrStreamJoinConfig = exports.fcrStreamBindConfigSchema = exports.fcrStreamBindConfigArrySchema = exports.fcrSessionBaseSchema = exports.fcrSecuritySendChatPayloadSchema = exports.fcrSecurityPrivateChatConfigSchema = exports.fcrSecurityActionSchema = exports.fcrScreenStreamCreateConfigSchema = exports.fcrRoomSessionParamsSchema = exports.fcrRoomJoinOptionsWithTicketSchema = exports.fcrRoomJoinOptionsSchema = void 0;
+exports.messageSchema = exports.fcrVideoStreamTypeSchema = exports.fcrVideoSourceTypeSchema = exports.fcrUserRolesSchema = exports.fcrUserRoleSchema = exports.fcrUserKickedOutTypeSchema = exports.fcrUpdateStreamPrivilegeScopeSchema = exports.fcrUpdateStreamCustomSchema = exports.fcrStreamPrivilegeVideoSourceTypeSchema = exports.fcrStreamPrivilegeOperation = exports.fcrStreamPrivilegeAudioSourceTypeSchema = exports.fcrStreamJoinConfig = exports.fcrStreamBindConfigSchema = exports.fcrStreamBindConfigArrySchema = exports.fcrSizeSchema = exports.fcrSessionBaseSchema = exports.fcrSecuritySendChatPayloadSchema = exports.fcrSecurityPrivateChatConfigSchema = exports.fcrSecurityActionSchema = exports.fcrScreenStreamCreateConfigSize = exports.fcrScreenStreamCreateConfigSchema = exports.fcrRoomSessionParamsSchema = exports.fcrRoomJoinOptionsWithTicketSchema = exports.fcrRoomJoinOptionsSchema = void 0;
 Object.defineProperty(exports, "numberSchema", {
   enumerable: true,
   get: function () {
@@ -260,6 +260,14 @@ const fcrScreenStreamCreateConfigSchema = exports.fcrScreenStreamCreateConfigSch
   videoSourceId: _imports.stringSchema.optional(),
   audioSourceId: _imports.stringSchema.optional()
 });
+const fcrScreenStreamCreateConfigSize = exports.fcrScreenStreamCreateConfigSize = _imports.z.object({
+  width: _imports.numberSchema,
+  height: _imports.numberSchema
+});
+const fcrSizeSchema = exports.fcrSizeSchema = _imports.z.object({
+  width: _imports.numberSchema,
+  height: _imports.numberSchema
+}).optional();
 const fcrGroupCreateConfigArraySchema = exports.fcrGroupCreateConfigArraySchema = _imports.z.array(fcrGroupCreateConfigSchema);
 const fcrGroupUpdateOptionsArraySchema = exports.fcrGroupUpdateOptionsArraySchema = _imports.z.array(fcrGroupUpdateOptionsSchema);
 const fcrLocalStreamCreateArrayConfigSchema = exports.fcrLocalStreamCreateArrayConfigSchema = _imports.z.array(fcrMediaStreamCreateConfigSchema);

package/lib/service/api.d.ts

@@ -1,10 +1,11 @@
 import { AgoraRestfulClient, AgoraRteEntryRoomResponse } from '../imports';
-import { FcrCloudRecordingConfig, FcrGroupCreateConfig, FcrGroupUpdateOptions, FcrLiveStreamingLayoutType, FcrLiveStreamingConfig, FcrSharePermissionProps, FcrAllowWatermarkPayloadBody } from '../type';
+import { FcrCloudRecordingConfig, FcrGroupCreateConfig, FcrGroupUpdateOptions, FcrLiveStreamingLayoutType, FcrLiveStreamingConfig, FcrSharePermissionProps, FcrAllowWatermarkPayloadBody, FcrAnnotationProps } from '../type';
 import { AgoraRteRegion } from '../imports';
 import { FcrCheckInParams, FcrChatRoomTokenResData } from './type';
 import { FcrBoardRegion, FcrSharePermissionState } from '../room-control/whiteboard-control/enums';
 import { FcrPrivilegeUserRole, FcrSecuritySendChatPayload } from '../room-control/privilege-control/type';
 import { FcrUserKickedOutType } from '../room-control/user-control/type';
+import { AgoraRteAudioSourceType, AgoraRteMediaPublishState, AgoraRteVideoSourceType } from 'agora-rte-sdk/lib/type';
 export declare class FcrCoreServiceApi {
     private _client;
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -248,9 +249,21 @@ export declare class FcrCoreServiceApi {
         };
     }>;
     /**
-     * @description 开 / 关白板
+     * @description 获取批注token
      */
-    toggleWhiteboardActivityState(roomId: string, state: FcrSharePermissionState): Promise<any>;
+    getAnnotationToken({ roomId, userId }: {
+        roomId: string;
+        userId: string;
+    }): Promise<{
+        data: {
+            boardUserUuid: string;
+            boardUserToken: string;
+        };
+    }>;
+    /**
+     * @description 开启/关闭屏幕共享标注权限
+     */
+    toggleAnnotationActivityState(roomId: string, state: FcrSharePermissionState): Promise<any>;
     /**
      * @description 启用/禁用屏幕共享&白板
      */
@@ -285,6 +298,23 @@ export declare class FcrCoreServiceApi {
         code: number;
         ts: number;
     }>;
+    /**
+     * @description 开 / 关白板
+     */
+    toggleWhiteboardActivityState(roomId: string, state: FcrSharePermissionState): Promise<any>;
+    /**
+     * @description 启用/禁用屏幕共享&白板
+     */
+    toggleAnnotation(params: {
+        roomId: string;
+        enable: boolean;
+        targetRoles: string[];
+        payload: FcrAnnotationProps;
+    }): Promise<{
+        msg: string;
+        code: number;
+        ts: number;
+    }>;
     /**
      * @description 修改白板背景
      */
@@ -307,6 +337,12 @@ export declare class FcrCoreServiceApi {
             audioSourceUuid?: string;
             videoSourceState?: number;
             audioSourceState?: number;
+            annotation?: {
+                size: {
+                    width: number;
+                    height: number;
+                };
+            };
         };
     }): Promise<{
         data: {
@@ -347,4 +383,29 @@ export declare class FcrCoreServiceApi {
     closeInterpreter(params: {
         roomId: string;
     }): Promise<any>;
+    upsertStreamBatch(roomUuid: string, streams: {
+        streamName?: string;
+        userUuid?: string;
+        streamUuid?: string;
+        videoState?: AgoraRteMediaPublishState;
+        audioState?: AgoraRteMediaPublishState;
+        videoSourceType?: AgoraRteVideoSourceType;
+        audioSourceType?: AgoraRteAudioSourceType;
+        videoSourceUuid?: string;
+        audioSourceUuid?: string;
+    }[]): Promise<any>;
+    updateStreamBatchByCondition({ roomUuid, videoState, audioState, includeRoles, excludeRoles, condition, }: {
+        roomUuid: string;
+        videoState?: number;
+        audioState?: number;
+        includeRoles?: string[];
+        excludeRoles?: string[];
+        condition?: {
+            videoSourceType?: number;
+            audioSourceType?: number;
+        };
+    }): Promise<any>;
+    deleteStreamBatch(roomUuid: string, streams: {
+        streamUuid: string;
+    }[]): Promise<any>;
 }

package/lib/service/api.js

@@ -848,11 +848,25 @@ class FcrCoreServiceApi {
   }
 
   /**
-   * @description 开 / 关白板
+   * @description 获取批注token
    */
-  async toggleWhiteboardActivityState(roomId, state) {
+  async getAnnotationToken(_ref21) {
+    let {
+      roomId,
+      userId
+    } = _ref21;
     return this._client.fetch({
-      path: "/v1/rooms/".concat(roomId, "/widgets/netlessBoard/states/").concat(state),
+      path: "/v1/rooms/".concat(roomId, "/users/").concat(userId, "/widgets/annotation/token"),
+      method: 'GET'
+    });
+  }
+
+  /**
+   * @description 开启/关闭屏幕共享标注权限
+   */
+  async toggleAnnotationActivityState(roomId, state) {
+    return this._client.fetch({
+      path: "/v1/rooms/".concat(roomId, "/widgets/annotation/states/").concat(state),
       method: 'PUT'
     });
   }
@@ -894,6 +908,36 @@ class FcrCoreServiceApi {
     });
   }
 
+  /**
+   * @description 开 / 关白板
+   */
+  async toggleWhiteboardActivityState(roomId, state) {
+    return this._client.fetch({
+      path: "/v1/rooms/".concat(roomId, "/widgets/netlessBoard/states/").concat(state),
+      method: 'PUT'
+    });
+  }
+
+  /**
+   * @description 启用/禁用屏幕共享&白板
+   */
+  async toggleAnnotation(params) {
+    const {
+      roomId,
+      enable,
+      payload,
+      targetRoles
+    } = params;
+    return this._client.fetch({
+      path: "/v1/rooms/".concat(roomId, "/security/annotation/", 1),
+      method: 'PUT',
+      data: {
+        targetRoles,
+        payload: _objectSpread({}, payload)
+      }
+    });
+  }
+
   /**
    * @description 修改白板背景
    */
@@ -960,5 +1004,46 @@ class FcrCoreServiceApi {
     });
     return res;
   }
+  async upsertStreamBatch(roomUuid, streams) {
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/streams"),
+      method: 'PUT',
+      data: {
+        streams
+      }
+    });
+  }
+  async updateStreamBatchByCondition(_ref22) {
+    let {
+      roomUuid,
+      videoState,
+      audioState,
+      includeRoles,
+      excludeRoles,
+      condition
+    } = _ref22;
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/conditions/streams"),
+      method: 'PUT',
+      data: {
+        includeRoles,
+        excludeRoles,
+        stream: {
+          videoState,
+          audioState
+        },
+        condition
+      }
+    });
+  }
+  async deleteStreamBatch(roomUuid, streams) {
+    return await this._client.fetch({
+      path: "/v1/rooms/".concat(roomUuid, "/streams"),
+      method: 'DELETE',
+      data: {
+        streams
+      }
+    });
+  }
 }
 exports.FcrCoreServiceApi = FcrCoreServiceApi;

package/lib/type.d.ts

@@ -228,6 +228,13 @@ export type FcrSharePermissionProps = {
         start?: FcrSharePermissionState;
         write?: FcrSharePermissionState;
     };
+    annotation?: {
+        start?: FcrSharePermissionState;
+        write?: FcrSharePermissionState;
+    };
+};
+export type FcrAnnotationProps = {
+    write?: FcrSharePermissionState;
 };
 export type FcrVideoRenderConfig = FcrRenderConfigSchema;
 export type FcrAllowWatermarkPayloadBody = {

package/lib/utilities/package-info.d.ts

@@ -1 +1,3 @@
+import packageInfo from '../../package.json';
 export declare const getVersion: () => string;
+export declare const getDependenciesInfo: (packageName: keyof typeof packageInfo.dependencies) => string;

package/lib/utilities/package-info.js

@@ -4,9 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getVersion = void 0;
+exports.getVersion = exports.getDependenciesInfo = void 0;
 var _package = _interopRequireDefault(require("../../package.json"));
 const getVersion = () => {
   return _package.default.version;
 };
-exports.getVersion = getVersion;
+exports.getVersion = getVersion;
+const getDependenciesInfo = packageName => {
+  return _package.default.dependencies[packageName];
+};
+exports.getDependenciesInfo = getDependenciesInfo;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -40,7 +40,7 @@
     "@types/lodash": "^4.14.168",
     "@types/sinon": "^17.0.2",
     "@types/uuid": "^8.3.0",
-    "agora-toolchain": "^3.6.0",
+    "agora-toolchain": "^3.6.2",
     "core-js": "^3.33.3",
     "decomment": "^0.9.5",
     "husky": "^9.0.11",
@@ -54,14 +54,14 @@
   "dependencies": {
     "@netless/app-slide": "^0.2.58",
     "@netless/app-talkative": "^0.1.1",
-    "@netless/forge-room": "0.1.4",
-    "@netless/forge-rtm": "0.1.7",
-    "@netless/forge-whiteboard": "0.1.10",
+    "@netless/forge-room": "0.1.12",
+    "@netless/forge-rtm": "0.1.12",
+    "@netless/forge-whiteboard": "0.1.16",
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
     "@netless/window-manager": "^0.4.72",
-    "agora-foundation": "^3.6.0",
-    "agora-rte-sdk": "^3.6.0",
+    "agora-foundation": "^3.6.2",
+    "agora-rte-sdk": "^3.6.2",
     "await-to-js": "^3.0.0",
     "dayjs": "^1.10.4",
     "easemob-websdk": "4.8.1",