fcr-ui-scene 3.1.1 → 3.3.0

package/lib/electron/main.js

@@ -6,20 +6,24 @@ 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/web.timers.js");
 var _window = require("./window");
 var _screenshot = require("./plugins/screenshot");
+var _logger = require("./logger");
+var _meetingState = require("./plugins/meeting-state");
 var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
-  mainWindow.webContents.addListener('did-start-loading', function () {
-    console.log('main window is gone, close all windows');
-    (0, _window.closeAllWindows)();
-    (0, _window.clearAllRendererWindows)();
-  });
+  var logger = (0, _logger.getLogger)();
   mainWindow.webContents.addListener('did-create-window', function (window, details) {
-    console.log('browser window is opened, frameName:', details.frameName);
+    logger.info("browser window is opened, frameName: ".concat(details.frameName));
+    var builtinFrameNames = ['device-setting', 'chat', 'live-streaming', 'participant', 'screen-selection', 'invite', 'video-window', 'confirm-dialog', 'connection-gateway', 'whiteboard', 'progress-dialog', 'operation-waiting-room', 'operation-waiting-room-remove', 'operation-waiting-room-removeAll', 'operation-waiting-room-admitAll'];
+    if (!builtinFrameNames.includes(details.frameName)) {
+      logger.info("frameName [".concat(details.frameName, "] is not in builtinFrameNames, ignore it"));
+      return;
+    }
     (0, _window.putRendererWindow)(details.frameName, window);
     window.webContents.addListener('destroyed', function () {
-      console.log('browser window is destroyed, frameName:', details.frameName);
+      logger.info("browser window is destroyed, frameName: ".concat(details.frameName));
       (0, _window.deleteRendererWindow)(details.frameName);
     });
 
@@ -27,23 +31,23 @@ var hookWindow = exports.hookWindow = function hookWindow(mainWindow) {
     // renderer process will receive the will-close event, do some clean up and then call window.close() to close the window
     window.addListener('close', function (event) {
       event.preventDefault();
-      console.log("Window [".concat(window.title, ":").concat(window.id, "] is closed by shortcut CMD + W, send 'will-close' event to that window"));
+      logger.info("Window [".concat(window.title, ":").concat(window.id, "] is closed by shortcut CMD + W, send 'will-close' event to that window"));
       window.emit('will-close');
     });
     attachEventOnMethod(window, 'hide', 'CALL_HIDE');
     attachEventOnMethod(window, 'show', 'CALL_SHOW');
   });
   mainWindow.webContents.addListener('render-process-gone', function (event, details) {
-    console.log('main window render-process-gone, details', details);
-    console.log('will reload main window');
+    logger.info("main window render-process-gone, details: ".concat(details));
     (0, _window.closeAllWindows)();
     (0, _window.clearAllRendererWindows)();
     setTimeout(function () {
-      console.log('reload main window...');
+      logger.info('start reloading main window...');
       mainWindow.reload();
     }, 1000);
   });
   (0, _screenshot.listenScreenshot)(mainWindow);
+  (0, _meetingState.listenMeetingState)(mainWindow);
 };
 var attachEventOnMethod = function attachEventOnMethod(browserWindow, method, action) {
   var func = browserWindow[method];

package/lib/electron/plugins/meeting-state.d.ts

@@ -0,0 +1,2 @@
+import { BrowserWindow } from 'electron';
+export declare const listenMeetingState: (window: BrowserWindow) => void;

package/lib/electron/plugins/meeting-state.js

@@ -0,0 +1,39 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.listenMeetingState = void 0;
+require("core-js/modules/es.array.concat.js");
+var _electron = require("electron");
+var _logger = require("../logger");
+var listenMeetingState = exports.listenMeetingState = function listenMeetingState(window) {
+  var logger = (0, _logger.getLogger)();
+  var isInMeeting = 0;
+  var saveBlockerId = 0;
+  _electron.ipcMain.addListener('set-in-meeting-state', function (_, state) {
+    isInMeeting = state;
+    logger.info('in-meeting state changed', state);
+    if (state === 1) {
+      if (!_electron.powerSaveBlocker.isStarted(saveBlockerId)) {
+        saveBlockerId = _electron.powerSaveBlocker.start('prevent-display-sleep');
+        logger.info("power save blocker is started, blocker id: ".concat(saveBlockerId));
+      }
+    } else {
+      if (_electron.powerSaveBlocker.isStarted(saveBlockerId)) {
+        var isStopped = _electron.powerSaveBlocker.stop(saveBlockerId);
+        logger.info("power save blocker is stopped, blocker id: ".concat(saveBlockerId, ", isStopped: ").concat(isStopped));
+      }
+    }
+  });
+  window.addListener('close', function (event) {
+    if (isInMeeting === 1) {
+      event.preventDefault();
+      window.webContents.send('custom-event', {
+        action: 'CALL_CLOSE_MAIN_WINDOW',
+        payload: window.id
+      });
+    }
+  });
+};

package/lib/electron/preload.js

@@ -31,5 +31,6 @@ window.runtime = {
   fileToBase64: _injections.fileToBase64,
   registerListenerReady: _injections.registerListenerReady,
   releaseSubAllWindowRefs: _injections.releaseSubAllWindowRefs,
-  getMediaSourceIdList: _injections.getMediaSourceIdList
+  getMediaSourceIdList: _injections.getMediaSourceIdList,
+  setInMeetingState: _injections.setInMeetingState
 };

package/lib/electron/tools.js

@@ -18,6 +18,15 @@ require("core-js/modules/es.number.to-fixed.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.string.includes.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 var _systeminformation = _interopRequireDefault(require("systeminformation"));
 function getProcessIds(processName) {

package/lib/electron/window.d.ts

@@ -1,4 +1,4 @@
-import Electron, { BrowserWindow } from 'electron';
+import Electron from 'electron';
 export declare const windowOptionsMap: Record<string, Electron.BrowserWindowConstructorOptions>;
 export declare const webPreferencesMap: Record<string, Electron.WebPreferences>;
 export declare const open: (entryPath: string, dialogId?: string) => void;

package/lib/electron/window.js

@@ -9,10 +9,16 @@ require("core-js/modules/es.object.define-properties.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.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.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.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -23,9 +29,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.windowOptionsMap = exports.webPreferencesMap = exports.setFragmentBaseUrl = exports.putRendererWindow = exports.open = exports.getWindowKeyById = exports.getRendererWindow = exports.deleteRendererWindow = exports.closeAllWindows = exports.close = exports.clearAllRendererWindows = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.object.keys.js");
 var _electron = require("electron");
 var _defaultOptions = require("./default-options");
 var env = _interopRequireWildcard(require("./env"));
+var _logger = require("./logger");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 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; }
@@ -37,6 +45,7 @@ var rendererWindows = {};
 var windowKeyById = {};
 var isDev = env.isDev;
 var baseUrl = env.devPageUrl;
+var logger = (0, _logger.getLogger)();
 var loadFragment = function loadFragment(browserWindow, path) {
   var url = isDev ? "".concat(baseUrl, "/").concat(path, ".html") : "dist/".concat(path, ".html");
   if (isDev) {
@@ -59,7 +68,7 @@ var open = exports.open = function open(entryPath, dialogId) {
       delete windowKeyById[windowId];
     });
     browserWindow.webContents.addListener('render-process-gone', function (event, arg) {
-      console.log('browserWindow render-process-gone', arg);
+      logger.info("BrowserWindow [".concat(entryPath, "] render-process-gone: ").concat(arg));
     });
     loadFragment(browserWindow, entryPath);
     windows[key] = browserWindow;
@@ -91,12 +100,15 @@ var closeAllWindows = exports.closeAllWindows = function closeAllWindows() {
   windowKeyById = {};
 };
 var putRendererWindow = exports.putRendererWindow = function putRendererWindow(entryPath, browserWindow) {
+  logger.info('[RendererWindow] putRendererWindow', entryPath);
   rendererWindows[entryPath] = browserWindow;
 };
 var deleteRendererWindow = exports.deleteRendererWindow = function deleteRendererWindow(entryPath) {
+  logger.info('[RendererWindow] deleteRendererWindow', entryPath);
   delete rendererWindows[entryPath];
 };
 var getRendererWindow = exports.getRendererWindow = function getRendererWindow(entryPath) {
+  logger.info('[RendererWindow] getRendererWindow', entryPath, Object.keys(rendererWindows));
   return rendererWindows[entryPath];
 };
 var clearAllRendererWindows = exports.clearAllRendererWindows = function clearAllRendererWindows() {

package/lib/fragments/control-bar/context.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import ControlBarStore from './control-bar-store';
 export declare const StoreContext: import("react").Context<ControlBarStore>;

package/lib/fragments/control-bar/control-bar-store.d.ts

@@ -1,7 +1,7 @@
 import { RendererEventAction } from '../../utilities/constant';
 import { AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
-import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState } from 'agora-edu-core/lib/type';
+import { FcrRecordingState, FcrUserRole, FcrLiveStreamingState, FcrRoomInfo, FcrUserInfo } from 'agora-edu-core/lib/type';
 import { ConnectType } from '../../modules/action-bar/type';
 export default class ControlBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -26,6 +26,7 @@ export default class ControlBarStore {
     accessor allowChat: boolean;
     accessor allowJoinWithMuteAudio: boolean;
     accessor allowShareScreen: boolean;
+    accessor allowBoardWrite: boolean;
     accessor allowUnmuteSelfVideo: boolean;
     accessor allowUnmuteSelfAudio: boolean;
     accessor isLockRoomEnabled: boolean;
@@ -38,6 +39,7 @@ export default class ControlBarStore {
     accessor hasEnableChangeNamePermission: boolean;
     accessor hasEnableStartVideoPermission: boolean;
     accessor hasLockRoomPermission: boolean;
+    accessor hasAllowWriteBoardPermission: boolean;
     accessor roomDuration: number;
     accessor startTime: number;
     accessor videoSteamingUrl: string;
@@ -49,9 +51,23 @@ export default class ControlBarStore {
     accessor hasGetLiveStreamingUrlPermission: boolean;
     accessor hasStopLiveStreamingPermission: boolean;
     accessor hasStartLiveStreamingPermission: boolean;
+    accessor hasWaitingRoomPermission: boolean;
     accessor allApplicationWindows: AgoraRtcWindowInfo[];
     accessor phoneMicEnabled: boolean;
+    accessor roomInfo: FcrRoomInfo;
+    accessor userName: string;
+    accessor inviteLink: string;
+    accessor isShowMeetingDetailPortal: boolean;
+    accessor meetingDetailPortalLeft: number;
+    accessor meetingDetailPortalTop: number;
+    accessor remoteUsers: FcrUserInfo[];
+    accessor hasAssignHostBeforeLeavingPermission: boolean;
+    accessor isPstnUser: boolean;
+    accessor hasEndRoomPermission: boolean;
+    accessor isLocked: boolean;
+    accessor hiddenShareActionNav: boolean;
     constructor();
+    setHiddenShareActionNav(hiddenShareActionNav: boolean): void;
     initControlBar(payload: any): void;
     private _setControlBarWindowBounds;
     get hasSecurityPermission(): boolean;
@@ -74,6 +90,7 @@ export default class ControlBarStore {
     }): void;
     setLiveStreamingState(liveStreamingState: FcrLiveStreamingState): void;
     setStartTime(startTime: any): void;
+    setRoomInfo(roomInfo: FcrRoomInfo): void;
     setRoomDuration(duration: number): void;
     setStartScreenSharePermission(hasPermission: boolean): void;
     setPermissionToControlAllowSendAll(hasPermission: boolean): void;
@@ -127,6 +144,9 @@ export default class ControlBarStore {
     updateAllowJoinWithMuteAudio(allow: boolean): void;
     setAllowShareScreen(allow: boolean): void;
     updateAllowShareScreen(allow: boolean): void;
+    setBoardWriteEnabled(allow: boolean): void;
+    updateBoardWriteEnabled(): void;
+    setHasAllowWriteBoardPermission(allow: boolean): void;
     setAllowUnmuteSelfVideo(allow: boolean): void;
     updateAllowUnmuteSelfVideo(allow: boolean): void;
     setAllowUnmuteSelfAudio(allow: boolean): void;
@@ -135,6 +155,7 @@ export default class ControlBarStore {
     updateLockRoomEnabled(lock: boolean): void;
     setWaitingRoomEnabled(allow: boolean): void;
     setHasStartCloudRecordingPermission(allow: boolean): void;
+    setHasWaitingRoomPermission(allow: boolean): void;
     setHasGetLiveStreamingUrlPermission(hasGetLiveStreamingUrlPermission: boolean): void;
     setHasStopLiveStreamingPermission(hasStopLiveStreamingPermission: boolean): void;
     setHasStartLiveStreamingPermission(hasStartLiveStreamingPermission: boolean): void;
@@ -148,5 +169,17 @@ export default class ControlBarStore {
         x: number;
         y: number;
     };
+    fetchLeavingRoomPropsAfterInit(): void;
+    setShowMeetingDetailPortal(show: boolean): void;
+    setMeetingDetailPortalPosition(left: number, top: number): void;
+    setRemoteUsers(remoteUsers: FcrUserInfo[]): void;
+    setHasAssignHostBeforeLeavingPermission(hasAssignHostBeforeLeavingPermission: boolean): void;
+    setIsPstnUser(isPstnUser: boolean): void;
+    setHasEndRoomPermission(hasEndRoomPermission: boolean): void;
+    setIsLocked(isLocked: boolean): void;
+    sendLeave(): void;
+    keepPhoneAudioConnection(): void;
+    sendEnd(): void;
+    sendAssign(user: FcrUserInfo): void;
     showToast(params: any): void;
 }