fcr-core 3.4.1 → 3.4.100

package/lib/engine/index.js

@@ -55,7 +55,7 @@ var _agoraRteSdk = require("agora-rte-sdk");
 var _helper = require("agora-rte-sdk/lib/core/scene/helper");
 var _mobile = require("../media-control/mobile");
 var _chatroom = require("../plugins/chatroom");
-var _whiteboardControlV = require("../room-control/whiteboard-control-v2");
+var _whiteboardControl = require("../room-control/whiteboard-control");
 var _privilegeControl = require("../room-control/privilege-control");
 var _logger = require("../utilities/logger");
 var _FcrCoreEngine;
@@ -160,7 +160,7 @@ class FcrCoreEngine {
     const scene = this._rteEngine.createScene({
       sceneId: roomId
     });
-    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, _type2.FcrRoomType.Mainroom, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection), new _whiteboardControlV.FcrWhiteboardControlImpl(scene, new _privilegeControl.FcrPrivilegeControlImpl(this._rteEngine, scene, this._apiService), this._apiService, this._rteEngine));
+    return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, _type2.FcrRoomType.Mainroom, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection), new _whiteboardControl.FcrWhiteboardControlImpl(scene, new _privilegeControl.FcrPrivilegeControlImpl(this._rteEngine, scene, this._apiService), this._apiService));
   }
 
   /**

package/lib/imports.d.ts

@@ -39,6 +39,7 @@ export { getSharedDomainHolder } from 'agora-rte-sdk/lib/core/services/domain-ho
 export { AgoraRteScreenCaptureType, AgoraRteVideoOrientation, } from 'agora-rte-sdk/lib/core/media/type';
 export { registerPlugin } from 'agora-rte-sdk/lib/core/engine/plugin';
 export { AgoraRteUserUpdatedReason } from 'agora-rte-sdk/lib/core/scene/type';
+export type { AgoraRteUploadEvent } from 'agora-rte-sdk/lib/core/monitor/type';
 export { FcrCoreEngine } from './engine';
 export type FcrImageData = ImageData;
 export type FcrWhiteboardView = HTMLElement;

package/lib/monitor-control/index.js

@@ -43,6 +43,9 @@ class FcrMonitorControlImpl {
     this._config = _config;
     this._monitor = engine.getMonitor();
   }
+  async uploadEvent(event) {
+    return this._monitor.uploadEvent(event);
+  }
   addObserver(observer) {
     this._monitor.addObserver(observer);
   }
@@ -52,4 +55,4 @@ class FcrMonitorControlImpl {
 }
 exports.FcrMonitorControlImpl = FcrMonitorControlImpl;
 _FcrMonitorControlImpl = FcrMonitorControlImpl;
-[_initProto] = _applyDecs(_FcrMonitorControlImpl, [[_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrMonitorControlImpl, [[_logger.trace, 2, "uploadEvent"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;

package/lib/monitor-control/type.d.ts

@@ -1,8 +1,15 @@
-import { FcrPerformanceInfo } from '../type';
+import { FcrMonitorUploadEvent, FcrPerformanceInfo } from '../type';
 export interface FcrMonitorObserver {
     onPerformanceInfoUpdated?: (status: FcrPerformanceInfo) => void;
 }
 export interface FcrMonitorControl {
+    /**
+     * Uploads an event to the Agora Real-Time Engagement Monitor.
+     * @param event The event to be uploaded.
+     * @param success Callback function to be called if the upload is successful.
+     * @param failure Callback function to be called if the upload fails, with an error parameter.
+     */
+    uploadEvent(event: FcrMonitorUploadEvent): Promise<void>;
     /**
      * Add an observer to the monitor.
      * @param observer

package/lib/plugins/chatroom.js

@@ -29,6 +29,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrChatRoomControlImpl = void 0;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _observable = require("agora-foundation/lib/utilities/observable");
@@ -51,6 +53,10 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
  * @internal
  */
 class FcrChatRoomControlImpl {
+  _setConnectionState(state) {
+    this._connectionState = state;
+    this._observable.notifyObservers('onConnectionStateUpdated', this._scene.sceneId, state);
+  }
   get conn() {
     if (!this._chatConnection.getConnectionInstance()) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'chat room connection not initialized, please get chat room token first', new Error('chat room connection not initialized, please get chat room token first'));
@@ -108,27 +114,24 @@ class FcrChatRoomControlImpl {
             };
             return message;
           }
-        // TODO: 3.x
-        // case 'IMAGE': {
-        //   const message: FcrChatRoomReceiveImageMessage = {
-        //     id: msg.id,
-        //     //@ts-ignore
-        //     from: msg.ext.sender,
-        //     type: FcrChatRoomMessageType.Image,
-        //     //@ts-ignore
-        //     timestamp: parseInt(msg.time),
-        //     //@ts-ignore
-        //     file: msg.url,
-        //     //@ts-ignore
-        //     isPrivate: msg.ext.isPrivate,
-        //   };
-        //   return message;
-        // }
+        case 'img':
+          {
+            var _msg$ext, _msg$ext2;
+            const message = {
+              id: msg.id,
+              from: (_msg$ext = msg.ext) === null || _msg$ext === void 0 ? void 0 : _msg$ext.sender,
+              type: _type.FcrChatRoomMessageType.Image,
+              timestamp: msg.time,
+              url: msg.url || '',
+              isPrivate: (_msg$ext2 = msg.ext) === null || _msg$ext2 === void 0 ? void 0 : _msg$ext2.isPrivate
+            };
+            return message;
+          }
       }
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown remote message type', new Error('unknown remote message type'));
     });
-    (0, _defineProperty2.default)(this, "_convertFcrChatRoomSendBaseMessageToAgoraChatMessage", msg => {
-      var _message$to;
+    (0, _defineProperty2.default)(this, "_convertFcrChatRoomSendBaseMessageToAgoraChatMessage", (msg, progress) => {
+      var _message$to, _imageMessage$to;
       switch (msg.type) {
         case _type.FcrChatRoomMessageType.Text:
           const message = msg;
@@ -146,12 +149,36 @@ class FcrChatRoomControlImpl {
             },
             receiverList: message.to
           });
+        case _type.FcrChatRoomMessageType.Image:
+          const imageMessage = msg;
+          const isPrivateImage = !!((_imageMessage$to = imageMessage.to) !== null && _imageMessage$to !== void 0 && _imageMessage$to.length);
+          const localUser = this._scene.getUser(this._scene.getLocalUser().getLocalUserId());
+          return _easemobWebsdk.default.message.create({
+            to: this.chatRoomId,
+            type: 'img',
+            chatType: 'chatRoom',
+            url: imageMessage.file.filePath,
+            file: {
+              filename: imageMessage.file.fileName,
+              filetype: imageMessage.file.fileType,
+              data: imageMessage.file.data,
+              url: ''
+            },
+            ext: {
+              sender: (0, _user.convertRteUserToFcrUser)(localUser),
+              roomUuid: this._scene.sceneId,
+              isPrivate: isPrivateImage
+            },
+            receiverList: imageMessage.to,
+            onFileUploadProgress: e => {
+              progress === null || progress === void 0 || progress(Math.round(e.loaded / e.total * 100));
+            }
+          });
       }
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'unknown local message type', new Error('unknown local message type'));
     });
     this._scene = _scene;
     this._chatConnection = _chatConnection;
-    this._addLogObserver();
     this._chatConnection.addObserver(this._chatConnectionObserver);
     if (this._chatConnection.getConnectionInstance()) {
       this._addEventListener();
@@ -160,22 +187,74 @@ class FcrChatRoomControlImpl {
   async join() {
     await this._joinChatRoom(this._chatConnection.getConnectionState());
   }
+  _removeEventListener() {
+    this.conn.removeEventHandler("chatroom".concat(this._scene.sceneId));
+  }
+  _addEventListener() {
+    this._removeEventListener();
+    this.conn.addEventHandler("chatroom".concat(this._scene.sceneId), {
+      onTextMessage: msg => {
+        if (msg.to !== this.chatRoomId) {
+          return;
+        }
+        const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
+        this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
+      }
+    });
+    this.conn.onPictureMessage = msg => {
+      if (msg.to !== this.chatRoomId) {
+        return;
+      }
+      // 这里的数据结构和 onTextMessage 不一样,实际上contentsType是img ，type是chatroom，
+      // 但是因为在onPictureMessage的回调中，所以这里直接用type: 'img'，后续可以考虑优化
+      const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(_objectSpread(_objectSpread({}, msg), {}, {
+        type: 'img'
+      }));
+      this._observable.notifyObservers('onImageMessageReceived', this._scene.sceneId, message);
+    };
+
+    // TODO: 3.x
+    // this.conn.onCmdMessage = (msg) => {
+    //   if (msg.to !== this.initConfig.chatRoomId) {
+    //     return;
+    //   }
+    //   const message: FcrChatRoomReceiveCustomMessage =
+    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
+    //   this._observable.notifyObservers('onCustomMessageReceived', this._scene.sceneId, message);
+    // };
+
+    // TODO: 3.x
+    // this.conn.onChatroomEvent = (eventData: EasemobChat.ChatroomEvent) => {
+    //   if (eventData.operation === 'updateAnnouncement') {
+    //     this._observable.notifyObservers(
+    //       'onAnnouncementUpdated',
+    //       this._scene.sceneId,
+    //       // TODO: 应该用什么字段传递?
+    //       (eventData.attributes as { [key: string]: string })?.announcement,
+    //     );
+    //   } else if (eventData.operation === 'deleteAnnouncement') {
+    //     this._observable.notifyObservers('onAnnouncementDeleted', this._scene.sceneId);
+    //   }
+    // };
+  }
   getConnectionState() {
     return this._connectionState;
   }
-  async sendMessage(message) {
+  async sendMessage(message, progress) {
     var _message$to2;
-    const msg = this._convertFcrChatRoomSendBaseMessageToAgoraChatMessage(message);
-    await this.conn.send(msg);
+    const msg = this._convertFcrChatRoomSendBaseMessageToAgoraChatMessage(message, progress);
+    const sendMsgRes = await this.conn.send(msg);
     const localUserInfo = this._scene.getUser(this._scene.getLocalUser().getLocalUserId());
     const res = _objectSpread(_objectSpread({}, message.type === _type.FcrChatRoomMessageType.Text ? {
       content: message.content
-    } : {
-      file: message.file
+    } :
+    // @ts-ignore
+    {
+      url: sendMsgRes.message.url
     }), {}, {
       from: (0, _user.convertRteUserToFcrUser)(localUserInfo),
       id: msg.id,
-      type: _type.FcrChatRoomMessageType.Text,
+      type: message.type,
       properties: message.properties,
       timestamp: Date.now(),
       isPrivate: !!((_message$to2 = message.to) !== null && _message$to2 !== void 0 && _message$to2.length)
@@ -206,107 +285,25 @@ class FcrChatRoomControlImpl {
       }
     });
   }
-  _removeEventListener() {
-    this.conn.removeEventHandler("chatroom".concat(this._scene.sceneId));
-  }
-  _addEventListener() {
-    this._removeEventListener();
-    this.conn.addEventHandler("chatroom".concat(this._scene.sceneId), {
-      onTextMessage: msg => {
-        if (msg.to !== this.chatRoomId) {
-          return;
-        }
-        const message = this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
-        this._observable.notifyObservers('onTextMessageReceived', this._scene.sceneId, message);
+  async getHistoryMessageList(pageSize, startedMessageId) {
+    if (pageSize > 50) {
+      throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'pageSize should be less than 50', new Error('pageSize should be less than 50'));
+    }
+    const assembleRet = await this.conn.fetchHistoryMessages({
+      queue: this.chatRoomId,
+      count: pageSize,
+      start: startedMessageId,
+      isGroup: true,
+      fail(error) {
+        throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_CHATROOM, _error.FcrErrorCode.UNDEFINED_ERROR, error.message, new Error('get history message list failed'));
       }
     });
-    // TODO: 3.x
-    // this.conn.onPictureMessage = (msg) => {
-    //   if (msg.to !== this.initConfig.chatRoomId) {
-    //     return;
-    //   }
-    //   const message: FcrChatRoomReceiveImageMessage =
-    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(
-    //       msg,
-    //     ) as FcrChatRoomReceiveImageMessage;
-    //   this._observable.notifyObservers('onImageMessageReceived', this._scene.sceneId, message);
-    // };
-
-    // TODO: 3.x
-    // this.conn.onCmdMessage = (msg) => {
-    //   if (msg.to !== this.initConfig.chatRoomId) {
-    //     return;
-    //   }
-    //   const message: FcrChatRoomReceiveCustomMessage =
-    //     this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msg);
-    //   this._observable.notifyObservers('onCustomMessageReceived', this._scene.sceneId, message);
-    // };
-
-    // TODO: 3.x
-    // this.conn.onChatroomEvent = (eventData: EasemobChat.ChatroomEvent) => {
-    //   if (eventData.operation === 'updateAnnouncement') {
-    //     this._observable.notifyObservers(
-    //       'onAnnouncementUpdated',
-    //       this._scene.sceneId,
-    //       // TODO: 应该用什么字段传递?
-    //       (eventData.attributes as { [key: string]: string })?.announcement,
-    //     );
-    //   } else if (eventData.operation === 'deleteAnnouncement') {
-    //     this._observable.notifyObservers('onAnnouncementDeleted', this._scene.sceneId);
-    //   }
-    // };
-  }
-  _setConnectionState(state) {
-    this._connectionState = state;
-    this._observable.notifyObservers('onConnectionStateUpdated', this._scene.sceneId, state);
-  }
-  _addLogObserver() {
-    this.addObserver((0, _logger.generateLogObserver)(this.logger, ['onConnectionStateUpdated', 'onErrorOccurred'
-    // 'onTextMessageReceived'
-    ]));
+    const ret = assembleRet.map(msgBody => {
+      return this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msgBody);
+    });
+    return ret;
   }
 
-  // TODO: 3.x
-  // /**
-  //  *
-  //  * @param pageSize max 50
-  //  * @param startedMessageId
-  //  * @returns
-  //  */
-  // async getHistoryMessageList(
-  //   pageSize: number,
-  //   startedMessageId: string,
-  // ): Promise<Array<FcrChatRoomReceiveBaseMessage>> {
-  //   if (pageSize > 50) {
-  //     throw generateFcrCoreClientError(
-  //       FcrErrorModuleCode.ROOM_CHATROOM,
-  //       FcrErrorCode.UNDEFINED_ERROR,
-  //       'pageSize should be less than 50',
-  //       new Error('pageSize should be less than 50'),
-  //     );
-  //   }
-
-  //   const assembleRet = await this.conn.fetchHistoryMessages({
-  //     queue: this.initConfig.chatRoomId,
-  //     isGroup: true,
-  //     count: pageSize,
-  //     start: startedMessageId,
-  //     fail(error) {
-  //       throw generateFcrCoreClientError(
-  //         FcrErrorModuleCode.ROOM_CHATROOM,
-  //         FcrErrorCode.UNDEFINED_ERROR,
-  //         error.message,
-  //         new Error('get history message list failed'),
-  //       );
-  //     },
-  //   });
-
-  //   const ret: FcrChatRoomReceiveBaseMessage[] = assembleRet.map((msgBody) => {
-  //     return this._convertAgoraChatMessageToFcrChatRoomReceiveMessage(msgBody);
-  //   });
-  //   return ret;
-  // }
-
   // TODO: 3.x
   // async getAnnouncement(): Promise<string> {
   //   const announcement = await this.conn.fetchChatRoomAnnouncement({

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

@@ -9,8 +9,9 @@ export interface FcrChatRoomControl {
     /**
      * Sends a message to the chat room.
      * @param message
+     * @param onProgress
      */
-    sendMessage(message: FcrChatRoomSendBaseMessage): Promise<FcrChatRoomReceiveBaseMessage>;
+    sendMessage(message: FcrChatRoomSendBaseMessage, progress?: (progress: number) => void): Promise<FcrChatRoomReceivedBaseMessage>;
     /**
      * Adds an observer to the chat room.
      * @param observer
@@ -21,6 +22,12 @@ export interface FcrChatRoomControl {
      * @param observer
      */
     removeObserver(observer: FcrChatRoomObserver): void;
+    /**
+     * Gets the history message list of the chat room.
+     * @param pageSize
+     * @param startedMessageId
+     */
+    getHistoryMessageList(pageSize: number, startedMessageId?: string): Promise<FcrChatRoomReceivedBaseMessage[]>;
 }
 export declare enum FcrChatRoomConnectionState {
     Disconnected = 0,
@@ -40,7 +47,7 @@ export type FcrChatRoomSendBaseMessage = {
 export type FcrChatRoomSendTextMessage = FcrChatRoomSendBaseMessage & {
     content: string;
 };
-export type FcrChatRoomReceiveBaseMessage = {
+export type FcrChatRoomReceivedBaseMessage = {
     id: string;
     from: FcrUserInfo;
     type: FcrChatRoomMessageType;
@@ -48,22 +55,22 @@ export type FcrChatRoomReceiveBaseMessage = {
     timestamp: number;
     isPrivate: boolean;
 };
-export type FcrChatRoomReceiveTextMessage = FcrChatRoomReceiveBaseMessage & {
+export type FcrChatRoomReceivedTextMessage = FcrChatRoomReceivedBaseMessage & {
     content: string;
 };
 export type FcrChatRoomFile = {
-    filename: string;
-    filetype: string;
-    url: string;
-    data: any;
+    fileName: string;
+    fileType: string;
+    filePath?: string;
+    data?: any;
 };
-export type FcrChatRoomReceiveImageMessage = FcrChatRoomReceiveBaseMessage & {
-    file: FcrChatRoomFile;
+export type FcrChatRoomReceivedImageMessage = FcrChatRoomReceivedBaseMessage & {
+    url: string;
 };
 export type FcrChatRoomSendImageMessage = FcrChatRoomSendBaseMessage & {
     file: FcrChatRoomFile;
 };
-export type FcrChatRoomReceiveCustomMessage = FcrChatRoomReceiveBaseMessage & {};
+export type FcrChatRoomReceiveCustomMessage = FcrChatRoomReceivedBaseMessage & {};
 export type FcrChatRoomObserver = {
     /**
      * Callback to receive the connection state change of the chat room.
@@ -78,7 +85,7 @@ export type FcrChatRoomObserver = {
      * @param message
      * @returns
      */
-    onTextMessageReceived?: (roomId: string, message: FcrChatRoomReceiveTextMessage) => void;
+    onTextMessageReceived?: (roomId: string, message: FcrChatRoomReceivedTextMessage) => void;
     /**
      * Callback when an error occurs.
      * @param roomId
@@ -86,6 +93,13 @@ export type FcrChatRoomObserver = {
      * @returns
      */
     onErrorOccurred?: (roomId: string, error: FcrError) => void;
+    /**
+     * Callback to receive the image message sent to the chat room.
+     * @param roomId The ID of the chat room.
+     * @param message The image message received in the chat room.
+     * @returns void
+     */
+    onImageMessageReceived?: (roomId: string, message: FcrChatRoomReceivedImageMessage) => void;
 };
 export type FcrChatRoomControlInitConfig = {
     appkey: string;

package/lib/room-control/index.js

@@ -79,54 +79,42 @@ class FcrBaseRoomControlImpl {
     this._addSceneObserver();
     this._addRteEngineObserver();
   }
-  // @trace
   getUserControl() {
     if (!this._userControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'user control not initialized, please join room first', new Error('user control not initialized, please join room first'));
     }
     return this._userControl;
   }
-  // @trace
   getBoardControl() {
     if (!this._whiteboardControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'whiteboard control not initialized, please join room first', new Error('whiteboard control not initialized, please join room first'));
     }
     return this._whiteboardControl;
   }
-
-  // @trace
   getStreamControl() {
     if (!this._streamControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'stream control not initialized, please join room first', new Error('stream control not initialized, please join room first'));
     }
     return this._streamControl;
   }
-
-  // @trace
   getRoomSessionControl() {
     if (!this._roomSessionControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'room session control not initialized, please join room first', new Error('room session control not initialized, please join room first'));
     }
     return this._roomSessionControl;
   }
-
-  // @trace
   getChatRoomControl() {
     if (!this._chatRoomControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'chat room control not initialized, please join room first', new Error('chat room control not initialized, please join room first'));
     }
     return this._chatRoomControl;
   }
-
-  // @trace
   getPrivilegeControl() {
     if (!this._privilegeControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'privilege control not initialized, please join room first', new Error('privilege control not initialized, please join room first'));
     }
     return this._privilegeControl;
   }
-
-  // @trace
   getRoomConnectorControl() {
     if (!this._roomConnectorControl) {
       throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.NOT_JOINED_ROOM, 'room connector control not initialized, please join room first', new Error('room connector control not initialized, please join room first'));
@@ -503,6 +491,6 @@ class FcrBaseRoomControlImpl {
  */
 exports.FcrBaseRoomControlImpl = FcrBaseRoomControlImpl;
 _FcrBaseRoomControlImpl = FcrBaseRoomControlImpl;
-[_initProto] = _applyDecs(_FcrBaseRoomControlImpl, [[_logger.trace, 2, "getSyncTimestamp"], [_logger.trace, 2, "getRoomInfo"], [_logger.trace, 2, "getRoomSchedule"], [_logger.trace, 2, "join"], [_logger.trace, 2, "leave"], [_logger.trace, 2, "start"], [_logger.trace, 2, "end"], [_logger.trace, 2, "close"], [_logger.trace, 2, "getRoomState"], [_logger.trace, 2, "getRoomProperties"], [_logger.trace, 2, "getRoomPropertiesByKeyPath"], [_logger.trace, 2, "updateRoomProperties"], [_logger.trace, 2, "updateIncrementRoomProperties"], [_logger.trace, 2, "deleteRoomProperties"], [_logger.trace, 2, "startCloudRecording"], [_logger.trace, 2, "pauseCloudRecording"], [_logger.trace, 2, "resumeCloudRecording"], [_logger.trace, 2, "stopCloudRecording"], [_logger.trace, 2, "getLiveStreamingState"], [_logger.trace, 2, "getLiveStreamingConfig"], [_logger.trace, 2, "startLiveStreaming"], [_logger.trace, 2, "updateLiveStreamingLayout"], [_logger.trace, 2, "stopLiveStreaming"], [_logger.trace, 2, "getCloudRecordingState"], [_logger.trace, 2, "sendRoomMessage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrBaseRoomControlImpl, [[_logger.trace, 2, "getUserControl"], [_logger.trace, 2, "getBoardControl"], [_logger.trace, 2, "getStreamControl"], [_logger.trace, 2, "getRoomSessionControl"], [_logger.trace, 2, "getChatRoomControl"], [_logger.trace, 2, "getPrivilegeControl"], [_logger.trace, 2, "getSyncTimestamp"], [_logger.trace, 2, "getRoomInfo"], [_logger.trace, 2, "getRoomSchedule"], [_logger.trace, 2, "join"], [_logger.trace, 2, "leave"], [_logger.trace, 2, "start"], [_logger.trace, 2, "end"], [_logger.trace, 2, "close"], [_logger.trace, 2, "getRoomState"], [_logger.trace, 2, "getRoomProperties"], [_logger.trace, 2, "getRoomPropertiesByKeyPath"], [_logger.trace, 2, "updateRoomProperties"], [_logger.trace, 2, "updateIncrementRoomProperties"], [_logger.trace, 2, "deleteRoomProperties"], [_logger.trace, 2, "startCloudRecording"], [_logger.trace, 2, "pauseCloudRecording"], [_logger.trace, 2, "resumeCloudRecording"], [_logger.trace, 2, "stopCloudRecording"], [_logger.trace, 2, "getLiveStreamingState"], [_logger.trace, 2, "getLiveStreamingConfig"], [_logger.trace, 2, "startLiveStreaming"], [_logger.trace, 2, "updateLiveStreamingLayout"], [_logger.trace, 2, "stopLiveStreaming"], [_logger.trace, 2, "getCloudRecordingState"], [_logger.trace, 2, "sendRoomMessage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
 class FcrSubRoomControlImpl extends FcrBaseRoomControlImpl {}
 exports.FcrSubRoomControlImpl = FcrSubRoomControlImpl;

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

@@ -75,8 +75,6 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
     this._addLogObserver();
     this._addSceneMainObserver();
   }
-
-  // @trace
   getInterpreterControl() {
     return this._interpreterControl;
   }
@@ -90,8 +88,6 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
       }
     });
   }
-
-  // @trace
   getGroupControl() {
     return this._groupControl;
   }
@@ -220,4 +216,4 @@ class FcrMainRoomControlImpl extends _.FcrBaseRoomControlImpl {
 }
 exports.FcrMainRoomControlImpl = FcrMainRoomControlImpl;
 _FcrMainRoomControlImpl = FcrMainRoomControlImpl;
-[_initProto] = _applyDecs(_FcrMainRoomControlImpl, [[_logger.trace, 2, "join"], [_logger.trace, 2, "leave"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "enableWaitingRoom"], [_logger.trace, 2, "moveToWaitingRoomByUserIds"], [_logger.trace, 2, "moveToWaitingRoomByUserRoles"], [_logger.trace, 2, "joinWithTicket"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;
+[_initProto] = _applyDecs(_FcrMainRoomControlImpl, [[_logger.trace, 2, "getInterpreterControl"], [_logger.trace, 2, "getGroupControl"], [_logger.trace, 2, "join"], [_logger.trace, 2, "leave"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "enableWaitingRoom"], [_logger.trace, 2, "moveToWaitingRoomByUserIds"], [_logger.trace, 2, "moveToWaitingRoomByUserRoles"], [_logger.trace, 2, "joinWithTicket"]], [], 0, void 0, _.FcrBaseRoomControlImpl).e;

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

@@ -67,7 +67,6 @@ class FcrPrivilegeControlImpl {
     const info = this._scene.getScenePropertiesByKeyPath("security.".concat(action));
     return this._convertSecurityInfo(info, action);
   }
-  // @trace
   getAllSecurityInfo() {
     const map = this._scene.getScenePropertiesByKeyPath('security');
     const securityKeys = Object.keys(map);
@@ -85,7 +84,6 @@ class FcrPrivilegeControlImpl {
     );
      return infoListOfTargetRole.map((key) => this._convertSecurityInfo(map[key], key));
   } */
-
   getLocalUserPermissionInfo(action) {
     const permissionStringArray = this._scene.getUserPropertiesByKeyPath("permission.list", this._scene.localUser.getLocalUserId());
     const permissionString = permissionStringArray.find(permission => permission.startsWith(action));
@@ -96,8 +94,6 @@ class FcrPrivilegeControlImpl {
     }
     return this._convertPermissionInfo(_helper.FcrPermission.fromString(permissionString), _type2.FcrOperatePermissionType.GET);
   }
-
-  // @trace
   getAllLocalUserPermissionInfo() {
     const permissionStringArray = this._scene.getUserPropertiesByKeyPath("permission.list", this._scene.localUser.getLocalUserId());
     return permissionStringArray.map(permissionString => this._convertPermissionInfo(_helper.FcrPermission.fromString(permissionString), _type2.FcrOperatePermissionType.GET));
@@ -284,4 +280,4 @@ class FcrPrivilegeControlImpl {
 }
 exports.FcrPrivilegeControlImpl = FcrPrivilegeControlImpl;
 _FcrPrivilegeControlImpl = FcrPrivilegeControlImpl;
-[_initProto] = _applyDecs(_FcrPrivilegeControlImpl, [[_logger.trace, 2, "getSecurityInfo"], [_logger.trace, 2, "getLocalUserPermissionInfo"], [_logger.trace, 2, "enableLockedRoom"], [_logger.trace, 2, "allowShare"], [_logger.trace, 2, "allowWriteBoard"], [_logger.trace, 2, "allowSendChat"], [_logger.trace, 2, "allowStartAudio"], [_logger.trace, 2, "allowStartVideo"], [_logger.trace, 2, "allowJoinWithMutedAudio"], [_logger.trace, 2, "allowWatermark"], [_logger.trace, 2, "allowChangeUserName"]], []).e;
+[_initProto] = _applyDecs(_FcrPrivilegeControlImpl, [[_logger.trace, 2, "getSecurityInfo"], [_logger.trace, 2, "getAllSecurityInfo"], [_logger.trace, 2, "getLocalUserPermissionInfo"], [_logger.trace, 2, "getAllLocalUserPermissionInfo"], [_logger.trace, 2, "enableLockedRoom"], [_logger.trace, 2, "allowShare"], [_logger.trace, 2, "allowWriteBoard"], [_logger.trace, 2, "allowSendChat"], [_logger.trace, 2, "allowStartAudio"], [_logger.trace, 2, "allowStartVideo"], [_logger.trace, 2, "allowJoinWithMutedAudio"], [_logger.trace, 2, "allowWatermark"], [_logger.trace, 2, "allowChangeUserName"]], []).e;

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

@@ -204,19 +204,15 @@ class FcrStreamControlImpl {
     this._scene.addObserver(this._sceneObserver);
     this._scene.streamPlayer.addObserver(this._addSceneStreamPlayerObserver);
   }
-  // @trace
   getStreams() {
     return this._streamMapByUserId;
   }
-  // @trace
   getStreamList() {
     return this._streamList;
   }
-  // @trace
   getStreamsByUserId(userId) {
     return this._scene.getStreamsByUserId(userId).map(this._convertStreamInfo);
   }
-  // @trace
   getStreamByStreamId(streamId) {
     const streamInfo = this._scene.getStreamByStreamId(streamId);
     if (streamInfo) {
@@ -354,4 +350,4 @@ class FcrStreamControlImpl {
 }
 exports.FcrStreamControlImpl = FcrStreamControlImpl;
 _FcrStreamControlImpl = FcrStreamControlImpl;
-[_initProto] = _applyDecs(_FcrStreamControlImpl, [[_imports.bound, 2, "getStreams"], [_imports.bound, 2, "getStreamList"], [_imports.bound, 2, "getStreamsByUserId"], [_imports.bound, 2, "getStreamByStreamId"], [[_imports.bound, _logger.trace], 2, "addLocalStreams"], [[_imports.bound, _logger.trace], 2, "bindLocalStreams"], [[_imports.bound, _logger.trace], 2, "updatePublishPrivilegeOfStreams"], [[_imports.bound, _logger.trace], 2, "removeStreams"], [[_imports.bound, _logger.trace], 2, "setVideoEncoderConfig"], [[_imports.bound, _logger.trace], 2, "startRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "stopRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "startPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "stopPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "takeSnapshot"], [[_imports.bound, _logger.trace], 2, "addLocalScreenStream"], [[_imports.bound, _logger.trace], 2, "removeScreenStream"], [[_imports.bound, _logger.trace], 2, "adjustRemoteAudioStreamVolume"], [[_imports.bound, _logger.trace], 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "splitAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrStreamControlImpl, [[[_imports.bound, _logger.trace], 2, "getStreams"], [[_imports.bound, _logger.trace], 2, "getStreamList"], [[_imports.bound, _logger.trace], 2, "getStreamsByUserId"], [[_imports.bound, _logger.trace], 2, "getStreamByStreamId"], [[_imports.bound, _logger.trace], 2, "addLocalStreams"], [[_imports.bound, _logger.trace], 2, "bindLocalStreams"], [[_imports.bound, _logger.trace], 2, "updatePublishPrivilegeOfStreams"], [[_imports.bound, _logger.trace], 2, "removeStreams"], [[_imports.bound, _logger.trace], 2, "setVideoEncoderConfig"], [[_imports.bound, _logger.trace], 2, "startRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "stopRenderRemoteVideoStream"], [[_imports.bound, _logger.trace], 2, "startPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "stopPlayRemoteAudioStream"], [[_imports.bound, _logger.trace], 2, "takeSnapshot"], [[_imports.bound, _logger.trace], 2, "addLocalScreenStream"], [[_imports.bound, _logger.trace], 2, "removeScreenStream"], [[_imports.bound, _logger.trace], 2, "adjustRemoteAudioStreamVolume"], [[_imports.bound, _logger.trace], 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "splitAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;

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

@@ -73,12 +73,12 @@ class FcrUserControlImpl {
       onRemoteUsersJoined: (roomId, events) => {
         const fcrUserEvents = events.map(e => {
           return {
-            modifiedUser: e.modifiedUser && (0, _user.convertRteUserToFcrUser)(e.modifiedUser),
+            userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo),
             operatorUser: e.operatorUser && (0, _user.convertRteUserToFcrUser)(e.operatorUser)
           };
         });
         fcrUserEvents.forEach(event => {
-          const user = event.modifiedUser;
+          const user = event.userInfo;
           const exists = user.userId in this._userMapByUserId;
           if (exists) {
             this.logger.warn("[FcrUserControl] user joined when the user already exists, userId: ".concat(user.userId));
@@ -93,13 +93,14 @@ class FcrUserControlImpl {
         const fcrUserEvents = events.map(e => {
           var _e$cause;
           return {
-            modifiedUser: e.modifiedUser && (0, _user.convertRteUserToFcrUser)(e.modifiedUser),
+            userInfo: e.userInfo && (0, _user.convertRteUserToFcrUser)(e.userInfo),
+            userProperties: e.userProperties,
             operatorUser: e.operatorUser && (0, _user.convertRteUserToFcrUser)(e.operatorUser),
             reason: ((_e$cause = e.cause) === null || _e$cause === void 0 ? void 0 : _e$cause.cmd) === 5 ? _type2.FcrUserLeftReason.kickOut : _type2.FcrUserLeftReason.LeaveRoom
           };
         });
         fcrUserEvents.forEach(event => {
-          const user = event.modifiedUser;
+          const user = event.userInfo;
           const exists = user.userId in this._userMapByUserId;
           if (!exists) {
             this.logger.warn("[FcrUserControl] user left when the user does not exist, userId: ".concat(user.userId));
@@ -196,20 +197,16 @@ class FcrUserControlImpl {
     this._addLogObserver();
     this._scene.addObserver(this._sceneObserver);
   }
-  // @trace
   getLocalUser() {
     const localUserId = this._scene.localUser.getLocalUserId();
     return (0, _user.convertRteUserToFcrUser)(this._scene.getUser(localUserId));
   }
-  // @trace
   getUsers() {
     return this._userMapByUserId;
   }
-  // @trace
   getUserList() {
     return this._userList;
   }
-  // @trace
   getUser(userId) {
     const user = this._scene.getUser(userId);
     if (user) {
@@ -327,4 +324,4 @@ class FcrUserControlImpl {
 }
 exports.FcrUserControlImpl = FcrUserControlImpl;
 _FcrUserControlImpl = FcrUserControlImpl;
-[_initProto] = _applyDecs(_FcrUserControlImpl, [[_imports.bound, 2, "getLocalUser"], [_imports.bound, 2, "getUsers"], [_imports.bound, 2, "getUserList"], [_imports.bound, 2, "getUser"], [[_imports.bound, _logger.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [[_imports.bound, _logger.trace], 2, "fetchUserList"], [[_imports.bound, _logger.trace], 2, "updateUserName"], [[_imports.bound, _logger.trace], 2, "updateUserProperties"], [[_imports.bound, _logger.trace], 2, "updateIncrementUserProperties"], [[_imports.bound, _logger.trace], 2, "deleteUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByUserId"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByKeyPath"], [[_imports.bound, _logger.trace], 2, "updateRemoteUserRole"], [[_imports.bound, _logger.trace], 2, "revokeHost"], [[_imports.bound, _logger.trace], 2, "kickOut"], [_logger.trace, 2, "kickOutByUserIds"], [_logger.trace, 2, "kickOutByUserRoles"], [_logger.trace, 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;
+[_initProto] = _applyDecs(_FcrUserControlImpl, [[[_imports.bound, _logger.trace], 2, "getLocalUser"], [[_imports.bound, _logger.trace], 2, "getUsers"], [[_imports.bound, _logger.trace], 2, "getUserList"], [[_imports.bound, _logger.trace], 2, "getUser"], [[_imports.bound, _logger.trace], 2, "getAllUserCount"], [_imports.bound, 2, "getWaterMarkContent"], [[_imports.bound, _logger.trace], 2, "fetchUserList"], [[_imports.bound, _logger.trace], 2, "updateUserName"], [[_imports.bound, _logger.trace], 2, "updateUserProperties"], [[_imports.bound, _logger.trace], 2, "updateIncrementUserProperties"], [[_imports.bound, _logger.trace], 2, "deleteUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserProperties"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByUserId"], [[_imports.bound, _logger.trace], 2, "getUserPropertiesByKeyPath"], [[_imports.bound, _logger.trace], 2, "updateRemoteUserRole"], [[_imports.bound, _logger.trace], 2, "revokeHost"], [[_imports.bound, _logger.trace], 2, "kickOut"], [_logger.trace, 2, "kickOutByUserIds"], [_logger.trace, 2, "kickOutByUserRoles"], [_logger.trace, 2, "mergeAudioStream"], [[_imports.bound, _logger.trace], 2, "addObserver"], [[_imports.bound, _logger.trace], 2, "removeObserver"]], []).e;

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

@@ -106,11 +106,12 @@ export type FcrUserPageParams = AgoraRteUserPageParams;
 export type FcrUserPageResponse = AgoraRteUserPageResponse;
 /** user */
 export type FcrUserJoinedEvent = {
-    readonly modifiedUser: FcrUserInfo;
+    readonly userInfo: FcrUserInfo;
 };
 export type FcrUserLeftEvent = {
-    readonly modifiedUser: FcrUserInfo;
+    readonly userInfo: FcrUserInfo;
     readonly operatorUser?: FcrUserInfo;
+    readonly userProperties?: Record<string, unknown>;
     readonly reason: FcrUserLeftReason;
 };
 export type FcrUserUpdatedEvent = {

package/lib/room-control/whiteboard-control/board-subwindow.d.ts

@@ -0,0 +1,6 @@
+import { FcrBoardSubWindow } from './types';
+export declare class FcrBoardSubWindowImpl implements FcrBoardSubWindow {
+    private _appId;
+    constructor(_appId: string);
+    exportPdf(): Promise<ArrayBuffer>;
+}

package/lib/room-control/whiteboard-control/board-subwindow.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrBoardSubWindowImpl = void 0;
+class FcrBoardSubWindowImpl {
+  constructor(_appId) {
+    this._appId = _appId;
+  }
+  exportPdf() {
+    window.postMessage({
+      type: '@netless/_request_save_pdf_',
+      appId: this._appId /* windowManager.addApp 返回的值, 指定要保存哪个窗口的板书, */
+    });
+    return new Promise((resolve, reject) => {
+      window.addEventListener('message', event => {
+        if (event.data.type === '@netless/_result_save_pdf_') {
+          var _event$data$result;
+          event.data.progress === 100 && resolve((_event$data$result = event.data.result) === null || _event$data$result === void 0 ? void 0 : _event$data$result.pdf);
+        }
+      });
+    });
+  }
+}
+exports.FcrBoardSubWindowImpl = FcrBoardSubWindowImpl;

package/lib/room-control/whiteboard-control/board-window.d.ts

@@ -1,8 +1,10 @@
 import { Room } from '@netless/window-manager';
+import '@netless/appliance-plugin/dist/style.css';
 import '@netless/window-manager/dist/style.css';
 import { FcrBoardToolType } from './enums';
-import { Color, FcrBoardWindowObserver, FcrBoardMainWindow } from './types';
+import { Color, FcrBoardWindowObserver, FcrBoardMainWindow, FcrBoardPage, FcrBoardEraserSize } from './types';
 import { FcrPrivilegeControl } from '../privilege-control/type';
+import { FcrBoardSubWindowImpl } from './board-subwindow';
 export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _whiteBoardroom;
@@ -18,6 +20,9 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     addObserver(observer: FcrBoardWindowObserver): void;
     removeObserver(observer: FcrBoardWindowObserver): void;
     getContentView(): HTMLElement;
+    setScale(value: number): void;
+    openSubWindowWithTaskId(title: string, taskId: string, urlPrefix?: string): Promise<FcrBoardSubWindowImpl | undefined>;
+    openSubWindowWithPageList(title: string, pageList: FcrBoardPage[]): Promise<FcrBoardSubWindowImpl | undefined>;
     setContainerSizeRatio(ratio: number): Promise<void>;
     getPageInfo(): {
         showIndex: number;
@@ -35,9 +40,13 @@ export declare class FcrBoardMainWindowImpl implements FcrBoardMainWindow {
     setStrokeColor(color: Color): Promise<void>;
     setTextColor(color: Color): Promise<void>;
     setTextSize(size: number): Promise<void>;
+    setFillColor(fillColor: Color): Promise<void>;
+    setEraserSize(size: FcrBoardEraserSize): Promise<void>;
     setBackgroundColor(color: string): Promise<void>;
     insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
+    insertMedia(resourceUrl: string, title?: string): Promise<void>;
     destroy(): void;
+    private _convertToScenes;
     private _preCheck;
     private _setBoardWritable;
     private _addWindowManagerEventListeners;

package/lib/room-control/whiteboard-control/board-window.js

@@ -33,17 +33,29 @@ require("core-js/modules/es.promise.finally.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/web.url.js");
+require("core-js/modules/web.url.to-json.js");
+require("core-js/modules/web.url-search-params.js");
+require("core-js/modules/web.url-search-params.delete.js");
+require("core-js/modules/web.url-search-params.has.js");
+require("core-js/modules/web.url-search-params.size.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _whiteSnapshot = require("@netless/white-snapshot");
 var _windowManager = require("@netless/window-manager");
+var _appliancePlugin = require("@netless/appliance-plugin");
+require("@netless/appliance-plugin/dist/style.css");
 require("@netless/window-manager/dist/style.css");
 var _utils = require("./utils");
 var _mountManager = require("./mount-manager");
 var _jsMd = require("js-md5");
 var _logger = require("../../utilities/logger");
 var _imports = require("../../imports");
+var _boardSubwindow = require("./board-subwindow");
+var _fullWorker = _interopRequireDefault(require("@netless/appliance-plugin/dist/fullWorker.js?raw"));
+var _subWorker = _interopRequireDefault(require("@netless/appliance-plugin/dist/subWorker.js?raw"));
 var _FcrBoardMainWindowImpl;
-let _initProto;
+let _initProto; //@ts-ignore
+//@ts-ignore
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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)]; } }; }
@@ -111,10 +123,53 @@ class FcrBoardMainWindowImpl {
   getContentView() {
     return this._whiteView;
   }
-  async setContainerSizeRatio(ratio) {
+  setScale(value) {
     var _this$_windowManager;
+    const scale = Math.max(Math.min(value, 3), -3);
+    (_this$_windowManager = this._windowManager) === null || _this$_windowManager === void 0 || _this$_windowManager.moveCamera({
+      scale
+    });
+  }
+  async openSubWindowWithTaskId(title, taskId, urlPrefix) {
+    var _this$_windowManager2;
+    const appId = await ((_this$_windowManager2 = this._windowManager) === null || _this$_windowManager2 === void 0 ? void 0 : _this$_windowManager2.addApp({
+      kind: 'Slide',
+      options: {
+        scenePath: "/ppt".concat(taskId),
+        title
+      },
+      attributes: {
+        taskId,
+        url: urlPrefix
+      }
+    }));
+    if (appId) {
+      var _this$_windowManager3;
+      const app = (_this$_windowManager3 = this._windowManager) === null || _this$_windowManager3 === void 0 || (_this$_windowManager3 = _this$_windowManager3.apps) === null || _this$_windowManager3 === void 0 ? void 0 : _this$_windowManager3[appId];
+      return app ? new _boardSubwindow.FcrBoardSubWindowImpl(appId) : undefined;
+    }
+  }
+  async openSubWindowWithPageList(title, pageList) {
+    var _this$_windowManager4;
+    const scenePath = "/".concat(Date.now());
+    const appId = await ((_this$_windowManager4 = this._windowManager) === null || _this$_windowManager4 === void 0 ? void 0 : _this$_windowManager4.addApp({
+      kind: _windowManager.BuiltinApps.DocsViewer,
+      options: {
+        scenePath,
+        title,
+        scenes: this._convertToScenes(pageList)
+      }
+    }));
+    if (appId) {
+      var _this$_windowManager5;
+      const app = (_this$_windowManager5 = this._windowManager) === null || _this$_windowManager5 === void 0 || (_this$_windowManager5 = _this$_windowManager5.apps) === null || _this$_windowManager5 === void 0 ? void 0 : _this$_windowManager5[appId];
+      return app ? new _boardSubwindow.FcrBoardSubWindowImpl(appId) : undefined;
+    }
+  }
+  async setContainerSizeRatio(ratio) {
+    var _this$_windowManager6;
     this._preCheck();
-    (_this$_windowManager = this._windowManager) === null || _this$_windowManager === void 0 || _this$_windowManager.setContainerSizeRatio(ratio);
+    (_this$_windowManager6 = this._windowManager) === null || _this$_windowManager6 === void 0 || _this$_windowManager6.setContainerSizeRatio(ratio);
   }
   getPageInfo() {
     this._preCheck();
@@ -125,31 +180,31 @@ class FcrBoardMainWindowImpl {
     };
   }
   async addPage() {
-    var _this$_windowManager2;
+    var _this$_windowManager7;
     this._preCheck();
-    if ((_this$_windowManager2 = this._windowManager) !== null && _this$_windowManager2 !== void 0 && _this$_windowManager2.addPage) {
+    if ((_this$_windowManager7 = this._windowManager) !== null && _this$_windowManager7 !== void 0 && _this$_windowManager7.addPage) {
       await this._windowManager.addPage();
       await this._windowManager.nextPage();
     }
   }
   async removePage() {
-    var _this$_windowManager3;
+    var _this$_windowManager8;
     this._preCheck();
-    if ((_this$_windowManager3 = this._windowManager) !== null && _this$_windowManager3 !== void 0 && _this$_windowManager3.removePage) {
+    if ((_this$_windowManager8 = this._windowManager) !== null && _this$_windowManager8 !== void 0 && _this$_windowManager8.removePage) {
       await this._windowManager.removePage();
     }
   }
   async prevPage() {
-    var _this$_windowManager4;
+    var _this$_windowManager9;
     this._preCheck();
-    if ((_this$_windowManager4 = this._windowManager) !== null && _this$_windowManager4 !== void 0 && _this$_windowManager4.prevPage) {
+    if ((_this$_windowManager9 = this._windowManager) !== null && _this$_windowManager9 !== void 0 && _this$_windowManager9.prevPage) {
       await this._windowManager.prevPage();
     }
   }
   async nextPage() {
-    var _this$_windowManager5;
+    var _this$_windowManager10;
     this._preCheck();
-    if ((_this$_windowManager5 = this._windowManager) !== null && _this$_windowManager5 !== void 0 && _this$_windowManager5.nextPage) {
+    if ((_this$_windowManager10 = this._windowManager) !== null && _this$_windowManager10 !== void 0 && _this$_windowManager10.nextPage) {
       await this._windowManager.nextPage();
     }
   }
@@ -197,9 +252,11 @@ class FcrBoardMainWindowImpl {
     }
   }
   async setStrokeColor(color) {
+    var _color$a;
     this._preCheck();
     const change = {
-      strokeColor: [color.r, color.g, color.b]
+      strokeColor: [color.r, color.g, color.b],
+      strokeOpacity: (_color$a = color.a) !== null && _color$a !== void 0 ? _color$a : 1
     };
     this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
     if (this._windowManager) {
@@ -207,9 +264,11 @@ class FcrBoardMainWindowImpl {
     }
   }
   async setTextColor(color) {
+    var _color$a2;
     this._preCheck();
     const change = {
-      textColor: [color.r, color.g, color.b]
+      textColor: [color.r, color.g, color.b],
+      textOpacity: (_color$a2 = color.a) !== null && _color$a2 !== void 0 ? _color$a2 : 1
     };
     this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
     if (this._windowManager) {
@@ -226,6 +285,28 @@ class FcrBoardMainWindowImpl {
       this._whiteBoardroom.setMemberState(change);
     }
   }
+  async setFillColor(fillColor) {
+    var _fillColor$a;
+    this._preCheck();
+    const change = {
+      fillColor: [fillColor.r, fillColor.g, fillColor.b],
+      fillOpacity: (_fillColor$a = fillColor.a) !== null && _fillColor$a !== void 0 ? _fillColor$a : 1
+    };
+    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    if (this._windowManager) {
+      this._whiteBoardroom.setMemberState(change);
+    }
+  }
+  async setEraserSize(size) {
+    this._preCheck();
+    const change = {
+      pencilEraserSize: size
+    };
+    this._memberState = _objectSpread(_objectSpread({}, this._memberState), change);
+    if (this._windowManager) {
+      this._whiteBoardroom.setMemberState(change);
+    }
+  }
   async setBackgroundColor(color) {
     var _this$_whiteView$quer;
     this._preCheck();
@@ -276,6 +357,22 @@ class FcrBoardMainWindowImpl {
       room.completeImageUpload(uuid, resourceUrl);
     }
   }
+  async insertMedia(resourceUrl, title) {
+    const windowManager = this._windowManager;
+    const room = this._whiteBoardroom;
+    if (windowManager) {
+      windowManager.addApp({
+        kind: _windowManager.BuiltinApps.MediaPlayer,
+        src: resourceUrl,
+        options: {
+          title: title
+        },
+        attributes: {
+          url: resourceUrl
+        }
+      });
+    }
+  }
   destroy() {
     if (this._windowManager) {
       this._windowManager.destroy();
@@ -283,6 +380,17 @@ class FcrBoardMainWindowImpl {
     }
     this._destroyed = true;
   }
+  _convertToScenes(pageList) {
+    return pageList.map(page => ({
+      name: page.name,
+      ppt: {
+        src: page.contentUrl,
+        width: page.contentWidth,
+        height: page.contentHeight,
+        previewURL: page.previewUrl
+      }
+    }));
+  }
   _preCheck() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     const {
@@ -360,7 +468,8 @@ class FcrBoardMainWindowImpl {
         cursor: true,
         chessboard: false,
         collectorContainer: options.collectorContainer,
-        containerSizeRatio: options.containerSizeRatio
+        containerSizeRatio: options.containerSizeRatio,
+        supportAppliancePlugin: true
       }).then(async wm => {
         if (this._destroyed) {
           wm.destroy();
@@ -377,6 +486,23 @@ class FcrBoardMainWindowImpl {
           var _this$_whiteView$quer2;
           (_this$_whiteView$quer2 = this._whiteView.querySelector('.netless-whiteboard')) === null || _this$_whiteView$quer2 === void 0 || _this$_whiteView$quer2.style.setProperty('background-color', this._backgroundColor);
         }
+        const fullWorkerBlob = new Blob([_fullWorker.default], {
+          type: 'text/javascript'
+        });
+        const fullWorkerUrl = URL.createObjectURL(fullWorkerBlob);
+        const subWorkerBlob = new Blob([_subWorker.default], {
+          type: 'text/javascript'
+        });
+        const subWorkerUrl = URL.createObjectURL(subWorkerBlob);
+        await this._windowManager.switchMainViewToWriter();
+        await _appliancePlugin.ApplianceMultiPlugin.getInstance(wm, {
+          options: {
+            cdn: {
+              fullWorkerUrl,
+              subWorkerUrl
+            }
+          }
+        });
       }).catch(e => {
         this.logger.error('[FcrBoardMainWindow] failed to mount', e);
       }).finally(() => {
@@ -396,4 +522,4 @@ class FcrBoardMainWindowImpl {
 }
 exports.FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
 _FcrBoardMainWindowImpl = FcrBoardMainWindowImpl;
-[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _logger.trace], 2, "getSnapshotImage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "getContentView"], [_logger.trace, 2, "setContainerSizeRatio"], [_logger.trace, 2, "getPageInfo"], [[_imports.bound, _logger.trace], 2, "addPage"], [[_imports.bound, _logger.trace], 2, "removePage"], [_logger.trace, 2, "prevPage"], [_logger.trace, 2, "nextPage"], [[_imports.bound, _logger.trace], 2, "undo"], [[_imports.bound, _logger.trace], 2, "redo"], [[_imports.bound, _logger.trace], 2, "clean"], [[_imports.bound, _logger.trace], 2, "setToolType"], [[_imports.bound, _logger.trace], 2, "setStrokeWidth"], [[_imports.bound, _logger.trace], 2, "setStrokeColor"], [[_imports.bound, _logger.trace], 2, "setTextColor"], [[_imports.bound, _logger.trace], 2, "setTextSize"], [[_imports.bound, _logger.trace], 2, "setBackgroundColor"], [[_imports.bound, _logger.trace], 2, "insertImage"], [_logger.trace, 2, "destroy"], [_imports.bound, 2, "_updateOperationPrivilege"], [_imports.bound, 2, "_mount"]], []).e;
+[_initProto] = _applyDecs(_FcrBoardMainWindowImpl, [[[_imports.bound, _logger.trace], 2, "getSnapshotImage"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"], [_logger.trace, 2, "getContentView"], [_imports.bound, 2, "setScale"], [_imports.bound, 2, "openSubWindowWithTaskId"], [_imports.bound, 2, "openSubWindowWithPageList"], [_logger.trace, 2, "getPageInfo"], [[_imports.bound, _logger.trace], 2, "addPage"], [[_imports.bound, _logger.trace], 2, "removePage"], [_logger.trace, 2, "prevPage"], [_logger.trace, 2, "nextPage"], [[_imports.bound, _logger.trace], 2, "undo"], [[_imports.bound, _logger.trace], 2, "redo"], [[_imports.bound, _logger.trace], 2, "clean"], [[_imports.bound, _logger.trace], 2, "setToolType"], [[_imports.bound, _logger.trace], 2, "setStrokeWidth"], [[_imports.bound, _logger.trace], 2, "setStrokeColor"], [[_imports.bound, _logger.trace], 2, "setTextColor"], [[_imports.bound, _logger.trace], 2, "setTextSize"], [[_imports.bound, _logger.trace], 2, "setFillColor"], [[_imports.bound, _logger.trace], 2, "setEraserSize"], [[_imports.bound, _logger.trace], 2, "setBackgroundColor"], [[_imports.bound, _logger.trace], 2, "insertImage"], [[_imports.bound, _logger.trace], 2, "insertMedia"], [_logger.trace, 2, "destroy"], [_imports.bound, 2, "_updateOperationPrivilege"], [_imports.bound, 2, "_mount"]], []).e;

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

@@ -31,9 +31,11 @@ require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _appSlide = _interopRequireDefault(require("@netless/app-slide"));
 var _whiteWebSdk = require("white-web-sdk");
 var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
 var _windowManager = require("@netless/window-manager");
+var _appliancePlugin = require("@netless/appliance-plugin");
 var _utils = require("./utils");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _asyncRetry = require("agora-foundation/lib/utilities/async-retry");
@@ -99,7 +101,10 @@ class FcrWhiteboardControlImpl {
         }
       }
     });
-    this._addLogObserver();
+    _windowManager.WindowManager.register({
+      kind: 'Slide',
+      src: _appSlide.default
+    });
   }
   async active() {
     return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _enums.FcrSharePermissionState.ON), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'active failed');
@@ -155,7 +160,7 @@ class FcrWhiteboardControlImpl {
       disableNewPencil: false,
       disableEraseImage: false,
       wrappedComponents: [],
-      invisiblePlugins: [_windowManager.WindowManager],
+      invisiblePlugins: [_windowManager.WindowManager, _appliancePlugin.ApplianceMultiPlugin],
       useMultiViews: true,
       disableMagixEventDispatchLimit: true,
       userPayload: {

package/lib/room-control/whiteboard-control/types.d.ts

@@ -54,7 +54,13 @@ export type Color = {
     r: number;
     g: number;
     b: number;
+    a?: number;
 };
+export declare enum FcrBoardEraserSize {
+    SMALL = 1,
+    MEDIUM = 2,
+    LARGE = 3
+}
 export type BoardState = {
     strokeColor: Color;
     strokeWidth: number;
@@ -246,6 +252,16 @@ export interface FcrBoardMainWindow {
      * @param textSize
      */
     setTextSize(textSize: number): Promise<void>;
+    /**
+     * Sets the fill color.
+     * @param color
+     */
+    setFillColor(color: Color): Promise<void>;
+    /**
+     * Set eraser size.
+     * @param size  small: 1, medium: 2, large: 3
+     */
+    setEraserSize(size: FcrBoardEraserSize): Promise<void>;
     /**
      * Inserts an image.
      * @param resourceUrl
@@ -255,6 +271,12 @@ export interface FcrBoardMainWindow {
      * @param height
      */
     insertImage(resourceUrl: string, x: number, y: number, width: number, height: number): Promise<void>;
+    /**
+     * Inserts a media.
+     * @param resourceUrl
+     * @param title
+     */
+    insertMedia(resourceUrl: string, title?: string): Promise<void>;
     /**
      * Gets the content view.
      */
@@ -264,6 +286,24 @@ export interface FcrBoardMainWindow {
      * @param ratio
      */
     setContainerSizeRatio(ratio: number): Promise<void>;
+    /**
+     * open the sub window with task id.
+     * @param title
+     * @param taskId
+     * @param urlPrefix
+     */
+    openSubWindowWithTaskId(title: string, taskId: string, urlPrefix?: string): Promise<FcrBoardSubWindow | undefined>;
+    /**
+     * open the sub window with page list.
+     * @param title
+     * @param pageList
+     */
+    openSubWindowWithPageList(title: string, pageList: FcrBoardPage[]): Promise<FcrBoardSubWindow | undefined>;
+    /**
+     * set scale.
+     * @param scale
+     */
+    setScale(scale: number): void;
     /**
      * Adds an observer to the main window.
      * @param observer
@@ -275,6 +315,9 @@ export interface FcrBoardMainWindow {
      */
     removeObserver(observer: FcrBoardWindowObserver): void;
 }
+export interface FcrBoardSubWindow {
+    exportPdf(): Promise<ArrayBuffer>;
+}
 export type FcrBoardInfo = {
     state: FcrSharePermissionState;
     isActive: boolean;

package/lib/room-control/whiteboard-control/types.js

@@ -3,7 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrBoardInactiveReason = void 0;
+exports.FcrBoardInactiveReason = exports.FcrBoardEraserSize = void 0;
+let FcrBoardEraserSize = exports.FcrBoardEraserSize = /*#__PURE__*/function (FcrBoardEraserSize) {
+  FcrBoardEraserSize[FcrBoardEraserSize["SMALL"] = 1] = "SMALL";
+  FcrBoardEraserSize[FcrBoardEraserSize["MEDIUM"] = 2] = "MEDIUM";
+  FcrBoardEraserSize[FcrBoardEraserSize["LARGE"] = 3] = "LARGE";
+  return FcrBoardEraserSize;
+}({});
 let FcrBoardInactiveReason = exports.FcrBoardInactiveReason = /*#__PURE__*/function (FcrBoardInactiveReason) {
   FcrBoardInactiveReason[FcrBoardInactiveReason["CLOSE"] = 1] = "CLOSE";
   FcrBoardInactiveReason[FcrBoardInactiveReason["TIMEOUT"] = 2] = "TIMEOUT";

package/lib/room-control/whiteboard-control/utils.d.ts

@@ -45,7 +45,7 @@ export declare const defaultStrokeColor: {
 };
 export declare const defaultTextSize = 24;
 export declare const mediaMimeTypes: Record<string, string>;
-export declare const convertToNetlessBoardTool: (tool: FcrBoardToolType) => never[] | readonly [ApplianceNames.selector] | readonly [ApplianceNames.pencilEraser] | readonly [ApplianceNames.laserPointer] | readonly [ApplianceNames.hand] | readonly [ApplianceNames.text] | readonly [ApplianceNames.arrow] | readonly [ApplianceNames.rectangle] | readonly [ApplianceNames.ellipse] | readonly [ApplianceNames.straight] | readonly [ApplianceNames.pencil] | readonly [ApplianceNames.shape, ShapeType.Triangle] | readonly [ApplianceNames.shape, ShapeType.Pentagram] | readonly [ApplianceNames.shape, ShapeType.Rhombus];
+export declare const convertToNetlessBoardTool: (tool: FcrBoardToolType) => never[] | readonly [ApplianceNames.selector] | readonly [ApplianceNames.pencilEraser] | readonly [ApplianceNames.laserPointer] | readonly [ApplianceNames.hand] | readonly [ApplianceNames.text] | readonly [ApplianceNames.arrow] | readonly [ApplianceNames.rectangle] | readonly [ApplianceNames.ellipse] | readonly [ApplianceNames.straight] | readonly [ApplianceNames.pencil] | readonly [ApplianceNames.shape, ShapeType.Triangle] | readonly [ApplianceNames.shape, ShapeType.Pentagram] | readonly [ApplianceNames.shape, ShapeType.Rhombus] | readonly [ApplianceNames.clicker];
 export declare const convertToFcrBoardToolShape: (tool?: ApplianceNames, shape?: ShapeType) => FcrBoardToolType[] | (FcrBoardShape | undefined)[];
 export declare const hexColorToWhiteboardColor: (val: string) => number[];
 export declare const src2DataURL: (src: string) => Promise<string>;

package/lib/room-control/whiteboard-control/utils.js

@@ -198,6 +198,8 @@ const convertToNetlessBoardTool = tool => {
       return [_enums.ApplianceNames.shape, _enums.ShapeType.Pentagram];
     case _enums.FcrBoardToolType.RHOMBUS:
       return [_enums.ApplianceNames.shape, _enums.ShapeType.Rhombus];
+    case _enums.FcrBoardToolType.NONE:
+      return [_enums.ApplianceNames.clicker];
     default:
       return [];
   }

package/lib/type.d.ts

@@ -1,4 +1,4 @@
-import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteVideoEncoderConfig, AgoraRteLatencyLevel } from './imports';
+import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteUploadEvent, AgoraRteVideoEncoderConfig, AgoraRteLatencyLevel } from './imports';
 import { FcrSharePermissionState } from './room-control/whiteboard-control/enums';
 import { FcrUserLeftReason } from './room-control/user-control/type';
 import { FcrAudioSourceType, FcrMediaSourceState, FcrRegion, FcrRoomConnectorType, FcrStreamType, FcrVideoRenderMode, FcrVideoSourceType } from '.';
@@ -251,4 +251,5 @@ export declare enum RoomMessageKey {
     USER_WAITING_ROOM_JOINED = "USER_WAITING_ROOM_JOINED"
 }
 export type FcrRenderView = AgoraRteRenderView;
+export type FcrMonitorUploadEvent = AgoraRteUploadEvent;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fcr-core",
   "description": "Core APIs for building online scenes",
-  "version": "3.4.1",
+  "version": "3.4.100",
   "module": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -52,14 +52,16 @@
     "typescript": "^5.3.2"
   },
   "dependencies": {
+    "@netless/app-docs-viewer": "^0.2.17",
     "@netless/app-slide": "^0.2.58",
     "@netless/app-talkative": "^0.1.1",
+    "@netless/appliance-plugin": "^1.1.9",
     "@netless/forge-room": "0.1.4",
     "@netless/forge-rtm": "^0.1.6",
     "@netless/forge-whiteboard": "0.1.10",
     "@netless/video-js-plugin": "^0.3.8",
     "@netless/white-snapshot": "^0.4.2",
-    "@netless/window-manager": "^0.4.72",
+    "@netless/window-manager": "^1.0.0",
     "agora-foundation": "^3.4.1",
     "agora-rte-sdk": "^3.4.1",
     "await-to-js": "^3.0.0",