fcr-ui-scene 3.6.4 → 3.7.1

package/lib/electron/main.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.hookWindow = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.string.starts-with.js");
 require("core-js/modules/web.timers.js");
 var _electron = require("electron");
@@ -19,7 +21,7 @@ var logger = (0, _logger.getLogger)();
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
     logger.info("[electron][window]: browser window is opened, frameName: ".concat(details.frameName, ", windowId: ").concat(window.id));
-    var builtinFrameNames = ['device-settings', 'chat', 'live-streaming', 'participant', 'share-screen-selection', 'invite', 'video-window', 'confirm', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room', 'interpreter-setting', 'waiting-room-single-remove', 'waiting-room-all-remove', 'waiting-room-all-admit', 'control-bar', 'show-toast', 'system-preference', 'rename', 'annotation-tool', 'leave-meeting'];
+    var builtinFrameNames = ['device-settings', 'chat', 'live-streaming', 'participant', 'share-screen-selection', 'invite', 'video-window', 'confirm', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room', 'interpreter-setting', 'waiting-room-single-remove', 'waiting-room-all-remove', 'waiting-room-all-admit', 'control-bar', 'show-toast', 'system-preference', 'rename', 'annotation-tool', 'leave-meeting', 'end-meeting'];
     if (!builtinFrameNames.includes(details.frameName) && !details.frameName.startsWith('widget')) {
       logger.info("[electron][window]: frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
       return;
@@ -126,10 +128,11 @@ var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, ac
   if (typeof func === 'function') {
     // @ts-ignore
     browserWindow[method] = function () {
+      logger.info("[electron][window]: attachEventOnMethod, method: ".concat(String(method), ", action: ").concat(action, ", broswerWindow title: ").concat(browserWindow.title, ", browserWindow bounds: ").concat(JSON.stringify(browserWindow.getBounds())));
+      // @ts-ignore
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      // @ts-ignore
       func.apply(this, args);
       this.webContents.send('custom-event', {
         action: action

package/lib/electron/preload.js

@@ -50,7 +50,11 @@ window.runtime = {
   launchFailure: _injections.launchFailure,
   setParameters: _injections.setParameters,
   exitedMeeting: _injections.exitedMeeting,
-  getIsMeetingLaunched: _injections.getIsMeetingLaunched
+  getIsMeetingLaunched: _injections.getIsMeetingLaunched,
+  onWidgetClicked: _injections.onWidgetClicked,
+  onUserTokenWillExpire: _injections.onUserTokenWillExpire,
+  refreshUserToken: _injections.refreshUserToken,
+  onExitUiScene: _injections.onExitUiScene
 };
 _renderer.ipcRenderer.on(_type.IPCMessageCMD.InitCreator, function (_event, value) {
   if (window.runtime.onCreatorInit) {
@@ -90,19 +94,44 @@ _renderer.ipcRenderer.on(_type.IPCMessageCMD.LaunchMeeting, function (_event, va
     }
     window.runtime.onLaunchMeeting(data);
   }
+  _renderer.ipcRenderer.on(_type.IPCMessageCMD.RenewUserToken, function (_event, value) {
+    if (window.runtime.onRenewUserToken) {
+      window.runtime.onRenewUserToken(value);
+    }
+  });
+  _renderer.ipcRenderer.on(_type.IPCMessageCMD.ExitUiScene, function (_event, value) {
+    if (window.runtime.exitUiScene) {
+      window.runtime.exitUiScene();
+    }
+  });
 });
 _renderer.ipcRenderer.on('sdk-ready', function () {
   if (window.runtime.onSDKReady) {
     window.runtime.onSDKReady();
   }
 });
+_renderer.ipcRenderer.on('launch-failure', function (_event, roomId, errorCode) {
+  if (window.runtime.onLaunchFailure) {
+    window.runtime.onLaunchFailure(roomId, errorCode);
+  }
+});
 _renderer.ipcRenderer.on('close-window-before-launch-success', function () {
-  if (window.runtime.onCloseWindowBeforeLaunchSuccess) {
-    window.runtime.onCloseWindowBeforeLaunchSuccess();
+  if (window.runtime.exitUiScene) {
+    window.runtime.exitUiScene();
   }
 });
 _renderer.ipcRenderer.on('exited-meeting', function (_event, roomId, reason) {
-  if (window.runtime.exitedMeeting) {
-    window.runtime.exitedMeeting(roomId, reason);
+  if (window.runtime.onExitedMeeting) {
+    window.runtime.onExitedMeeting(roomId, reason);
+  }
+});
+_renderer.ipcRenderer.on('refresh-user-token', function () {
+  if (window.runtime.onRefreshUserToken) {
+    window.runtime.onRefreshUserToken();
+  }
+});
+_renderer.ipcRenderer.on('launch-success', function (_event, roomId) {
+  if (window.runtime.onLaunchSuccess) {
+    window.runtime.onLaunchSuccess(roomId);
   }
 });

package/lib/fragments/annotation/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseFragment } from '../base';
-export declare class Annotation extends BaseFragment {
-    private _store;
+export declare class AnnotationFragment extends BaseFragment {
+    private _fragmentStore;
     get name(): string;
     get component(): import("react/jsx-runtime").JSX.Element;
     constructor(runtime: Runtime);

package/lib/fragments/annotation/index.js

@@ -1,42 +1,33 @@
 "use strict";
 
-require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.weak-map.delete-all.js");
-require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.windowOptions = exports.webPreferences = exports.title = exports.Annotation = void 0;
+exports.windowOptions = exports.webPreferences = exports.title = exports.AnnotationFragment = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _base = require("../base");
-var _store = _interopRequireWildcard(require("./store"));
 var _constant = require("../../utilities/constant");
+var _base = require("../base");
+var _store = require("./store");
 var _view = _interopRequireDefault(require("./view"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-var Annotation = exports.Annotation = /*#__PURE__*/function (_BaseFragment) {
-  function Annotation(runtime) {
+var AnnotationFragment = exports.AnnotationFragment = /*#__PURE__*/function (_BaseFragment) {
+  function AnnotationFragment(runtime) {
     var _this;
-    (0, _classCallCheck2["default"])(this, Annotation);
-    _this = _callSuper(this, Annotation, [runtime]);
-    _this._store = new _store["default"]();
+    (0, _classCallCheck2["default"])(this, AnnotationFragment);
+    _this = _callSuper(this, AnnotationFragment, [runtime]);
+    (0, _defineProperty2["default"])(_this, "_fragmentStore", new _store.FragmentAnnotationStore());
     window.addEventListener('keydown', function (event) {
       if ((event.ctrlKey || event.metaKey) && event.key === 'w') {
         event.preventDefault();
@@ -44,8 +35,8 @@ var Annotation = exports.Annotation = /*#__PURE__*/function (_BaseFragment) {
     });
     return _this;
   }
-  (0, _inherits2["default"])(Annotation, _BaseFragment);
-  return (0, _createClass2["default"])(Annotation, [{
+  (0, _inherits2["default"])(AnnotationFragment, _BaseFragment);
+  return (0, _createClass2["default"])(AnnotationFragment, [{
     key: "name",
     get: function get() {
       return 'annotation';
@@ -53,8 +44,8 @@ var Annotation = exports.Annotation = /*#__PURE__*/function (_BaseFragment) {
   }, {
     key: "component",
     get: function get() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.AnnotationStoreContext.Provider, {
-        value: this._store,
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.FragmentAnnotationStoreContext.Provider, {
+        value: this._fragmentStore,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view["default"], {})
       });
     }
@@ -62,24 +53,43 @@ var Annotation = exports.Annotation = /*#__PURE__*/function (_BaseFragment) {
     key: "onEvent",
     value: function onEvent(event) {
       switch (event.action) {
+        case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_OPEN:
+          if (event.payload) {
+            console.log('onEvent open annotation');
+            this._fragmentStore.open();
+          } else {
+            console.log('onEvent close annotation');
+            this._fragmentStore.close();
+          }
+          break;
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_SHOW:
           if (event.payload) {
             console.log('show annotation');
-            this._store.open();
+            this._fragmentStore.show();
           } else {
             console.log('hide annotation');
-            this._store.close();
+            this._fragmentStore.hide();
           }
           break;
+        case _constant.FcrUIRendererEventAction.SET_ANNOTATION_TO_FOCUS:
+          console.log('focus annotation');
+          this._fragmentStore.focus();
+          break;
         case _constant.FcrUIRendererEventAction.SET_CURRENT_SHARE_SCREEN_BOUNDS:
           console.log('[annotation][onEvent]: set current share screen bounds', event);
-          this._store.setBounds(event.payload);
+          this._fragmentStore.setBounds(event.payload);
           break;
         case _constant.FcrUIRendererEventAction.SET_ANNOTATION_IGNORE:
-          this._store.setIgnore(event.payload);
+          this._fragmentStore.setIgnore(event.payload);
+          break;
+        case _constant.FcrUIRendererEventAction.UPDATE_ANNOTATION_WINDOW_SIZE:
+          var size = event.payload;
+          if (size) {
+            this._fragmentStore.updateWindowSize(size.width, size.height);
+          }
           break;
         default:
-          this._store.toolChanged(event);
+          this._fragmentStore.toolChanged(event);
           break;
       }
     }
@@ -111,7 +121,7 @@ var title = exports.title = 'Annotation';
 var webPreferences = exports.webPreferences = {
   nodeIntegration: true
 };
-var $$fragment = new Annotation(window.runtime);
+var $$fragment = new AnnotationFragment(window.runtime);
 var App = function App() {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react["default"].Fragment, {
     children: $$fragment.component

package/lib/fragments/annotation/libs.d.ts

@@ -1,6 +1,6 @@
-import { WhiteboardToolType } from '@netless/forge-whiteboard';
+import { FcrWhiteboardToolType } from 'fcr-core/lib/imports';
 import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
-export declare function convertTool(type: FcrBoardToolType): WhiteboardToolType;
+export declare function convertTool(type: FcrBoardToolType): FcrWhiteboardToolType;
 export declare const engineRestConfig: {
     dualCameraVideoStreamConfig: {
         highVideoEncoderConfig: {

package/lib/fragments/annotation/store.d.ts

@@ -1,4 +1,4 @@
-declare class AnnotationStore {
+export declare class FragmentAnnotationStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _engine;
     private _FORGE_WHITEBOARD_APP_ID;
@@ -10,14 +10,27 @@ declare class AnnotationStore {
     accessor joined: boolean;
     accessor bounds: Electron.Rectangle;
     accessor currentTool: string;
-    private timer;
+    accessor isIgnore: boolean;
+    accessor drawing: boolean;
+    private _hasWaitingOpen;
+    private _lastViewPortSet;
+    private _currentAnntationView;
+    private _pollingCancelHandler;
     constructor();
     open(): Promise<void>;
     handleBoardDomLoad(dom: HTMLDivElement): void;
     close(): Promise<void>;
+    hide(): void;
+    show(): void;
+    focus(): void;
     setBounds(bounds: Electron.Rectangle): void;
+    updateWindowSize(paramWidth: number, paramHeight: number): void;
+    private _updateWindowSizeWithCurrentBounds;
+    private _updateWindowSize;
+    private _updateBoardElBySize;
     setIgnore(ignore: boolean): void;
     toolChanged(event: RendererCustomEvent): void;
+    setDrawing(drawing: boolean): void;
     private _initBoardStyle;
     private _handleSetTool;
     private _init;
@@ -25,6 +38,10 @@ declare class AnnotationStore {
     private _initEngine;
     private _launchHandler;
     private _terminalHandler;
+    private _resizeToMax;
+    private _cancelCurrentUpdateWindowSizeTimber;
+    private _handlePollingUpdateWindowSize;
+    private _handleBoardRoomUserJoin;
+    private _syncScreenShareOwnerOpenDone;
 }
-export default AnnotationStore;
-export declare const AnnotationStoreContext: import("react").Context<AnnotationStore>;
+export declare const FragmentAnnotationStoreContext: import("react").Context<FragmentAnnotationStore>;