fcr-ui-scene 3.7.4 → 3.7.6

package/lib/utilities/dialog-utils.js

@@ -10,32 +10,28 @@ exports.handleCheckMouseOver = handleCheckMouseOver;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.is-array.js");
-require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.timers.js");
 var _env = require("agora-foundation/lib/utilities/env");
 var _constant = require("./constant");
-var _store = require("../modules/dialog/store");
-var _renderer = require("./renderer");
+var _platform = require("./platform");
 var _logger = require("./logger");
 // 修复 windows 无法响应 hover 的问题
 function handleCheckMouseOver(params) {
   if (!(0, _env.isElectron)()) return;
   var logger = (0, _logger.getLogger)();
   var elem = params.elem,
-    browserWindow = params.browserWindow,
     screenBounds = params.screenBounds,
     callback = params.callback,
     newRendererWindow = params.newRendererWindow,
-    dialog = params.dialog;
+    dialog = params.dialog,
+    setIgnoreMouse = params.setIgnoreMouse,
+    setUnignoreMouse = params.setUnignoreMouse;
   var enterHotZoneState = false;
-  browserWindow.focus();
-  browserWindow.setIgnoreMouseEvents(true);
+  setIgnoreMouse();
   var MAX_HEIGHT = 430; // 内容最多的 popover 高度
   var offsetHeight = 0;
   if (newRendererWindow) {
@@ -56,10 +52,12 @@ function handleCheckMouseOver(params) {
       subtree: true
     });
   }
-  var timerId = setInterval(function () {
-    var _window$runtime$scree = window.runtime.screen.getCursorScreenPoint(),
-      mouse_x = _window$runtime$scree.x,
-      mouse_y = _window$runtime$scree.y;
+  var timerId = window.setInterval(function () {
+    // TODO:
+    // @ts-ignore
+    var _renderer$getCursorSc = renderer.getCursorScreenPoint(),
+      mouse_x = _renderer$getCursorSc.x,
+      mouse_y = _renderer$getCursorSc.y;
     var bar_w = elem.offsetWidth,
       bar_h = elem.offsetHeight;
     var _elem$getBoundingClie = elem.getBoundingClientRect(),
@@ -94,20 +92,16 @@ function handleCheckMouseOver(params) {
     var barWrapBoundary = mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2;
     var barControlBoundary = mouse_x > inside_x1 && mouse_x < inside_x2 && mouse_y > inside_y1 && mouse_y < inside_y2;
     var barWrapWithInsideBoundary = mouse_x > bar_x1 && mouse_x < bar_x2 && mouse_y > bar_y1 && mouse_y < bar_y2 - inside_h || barControlBoundary;
-    if (dialog === _constant.FcrUIDialogKey.CONTROL_BAR ? barWrapWithInsideBoundary : barWrapBoundary) {
-      if (!enterHotZoneState) {
-        enterHotZoneState = true;
-        browserWindow.setIgnoreMouseEvents(false);
-        logger.info('[controlbar] Mouse entered hot zone');
-        // 因为当用户点击其他窗口时，鼠标返回热区窗口会自动聚焦返回到上层，经测试这个注释不会影响现有功能，先注释看有没有其它影响
-        // if (!browserWindow.isFocused()) {
-        //   browserWindow.focus();
-        // }
-      }
+    if (dialog === _constant.FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR ? barWrapWithInsideBoundary : barWrapBoundary) {
+      setUnignoreMouse();
+      // 因为当用户点击其他窗口时，鼠标返回热区窗口会自动聚焦返回到上层，经测试这个注释不会影响现有功能，先注释看有没有其它影响
+      // if (!browserWindow.isFocused()) {
+      //   browserWindow.focus();
+      // }
     } else {
       if (enterHotZoneState) {
         enterHotZoneState = false;
-        browserWindow.setIgnoreMouseEvents(true);
+        setIgnoreMouse();
         logger.info('[controlbar] Mouse left hot zone');
       }
     }
@@ -115,34 +109,16 @@ function handleCheckMouseOver(params) {
   callback === null || callback === void 0 || callback(timerId);
   return timerId;
 }
-function getCurrentSharingWorkArea(params) {
-  var currentShareBounds = params.currentShareBounds;
-  var _window$screen = window.screen,
-    availWidth = _window$screen.availWidth,
-    availHeight = _window$screen.availHeight;
-  var nearDisplay = (0, _env.isElectron)() ? window.runtime.screen.getDisplayMatching(currentShareBounds) : null;
-  var dataStruct = {
-    bounds: {
-      x: 0,
-      y: 0,
-      width: availWidth,
-      height: availHeight
-    },
-    id: 0,
-    workArea: {
-      y: 0
-    },
-    scaleFactor: 1
-  };
-  var _ref3 = nearDisplay || dataStruct,
-    _ref3$bounds = _ref3.bounds,
-    x = _ref3$bounds.x,
-    y = _ref3$bounds.y,
-    width = _ref3$bounds.width,
-    height = _ref3$bounds.height,
-    displayId = _ref3.id,
-    scaleFactor = _ref3.scaleFactor,
-    workAreaY = _ref3.workArea.y;
+function getCurrentSharingWorkArea(currentShareBounds, renderer) {
+  var nearDisplay = renderer.getDisplayMatching(currentShareBounds);
+  var _nearDisplay$bounds = nearDisplay.bounds,
+    x = _nearDisplay$bounds.x,
+    y = _nearDisplay$bounds.y,
+    width = _nearDisplay$bounds.width,
+    height = _nearDisplay$bounds.height,
+    displayId = nearDisplay.id,
+    scaleFactor = nearDisplay.scaleFactor,
+    workAreaY = nearDisplay.workArea.y;
   return {
     x: x,
     y: y,
@@ -154,28 +130,39 @@ function getCurrentSharingWorkArea(params) {
     scaleFactor: scaleFactor
   };
 }
-function followCorrectDisplay(_ref4) {
-  var browserWindow = _ref4.browserWindow,
-    dialogKey = _ref4.dialogKey,
-    _ref4$extraRefControl = _ref4.extraRefControlbarCondition,
-    extraRefControlbarCondition = _ref4$extraRefControl === void 0 ? true : _ref4$extraRefControl,
-    _ref4$follow = _ref4.follow,
-    follow = _ref4$follow === void 0 ? 'screen' : _ref4$follow,
-    _ref4$alwaysFollowScr = _ref4.alwaysFollowScreen,
-    alwaysFollowScreen = _ref4$alwaysFollowScr === void 0 ? false : _ref4$alwaysFollowScr;
+function followCorrectDisplay(_ref3) {
+  var browserWindow = _ref3.browserWindow,
+    dialogKey = _ref3.dialogKey,
+    _ref3$extraRefControl = _ref3.extraRefControlbarCondition,
+    extraRefControlbarCondition = _ref3$extraRefControl === void 0 ? true : _ref3$extraRefControl,
+    _ref3$follow = _ref3.follow,
+    follow = _ref3$follow === void 0 ? 'screen' : _ref3$follow,
+    _ref3$alwaysFollowScr = _ref3.alwaysFollowScreen,
+    alwaysFollowScreen = _ref3$alwaysFollowScr === void 0 ? false : _ref3$alwaysFollowScr;
   if (!(0, _env.isElectron)()) return;
   if (!browserWindow && !dialogKey) throw new Error('browserWindow or dialogKey is required');
-  var objectDialog = dialogKey ? Array.isArray(dialogKey) ? dialogKey.map(function (dialog) {
-    return _store.dialogWindows.get(dialog);
-  }) : _store.dialogWindows.get(dialogKey) : browserWindow;
-  var controlbar = _store.dialogWindows.get(_constant.FcrUIDialogKey.CONTROL_BAR);
+
+  // const objectDialog = dialogKey
+  //   ? Array.isArray(dialogKey)
+  //     ? dialogKey.map((dialog) => dialogWindows.get(dialog))
+  //     : dialogWindows.get(dialogKey)
+  //   : browserWindow;
+
+  // const controlbar = dialogWindows.get(FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
+  // TODO: window
+  // @ts-ignore
   var mainAppWindowBounds = window.runtime.browserWindow.getBounds();
 
   // 按当前的窗口管理方式，在关闭 controlbar 的时候，controlbar 实际上是隐藏了自己，所以，依然能够通过 controlbar 访问到，所以需要判断是否是 visible 状态
-  var followControlbar = !!(controlbar && (extraRefControlbarCondition || controlbar.isVisible()));
+  // const followControlbar = !!(
+  //   controlbar &&
+  //   (extraRefControlbarCondition || controlbar.isVisible())
+  // );
 
   // 屏幕抢占时，需要判断是否是抢占屏幕，决定是取 controlbar 所在屏幕计算热区，还是以主窗口所在屏幕计算热区，此类条件通过 extraRefControlbarCondition 传入
-  var nearestPoint = followControlbar ? controlbar === null || controlbar === void 0 ? void 0 : controlbar.getBounds() : mainAppWindowBounds;
+  // const nearestPoint = followControlbar ? controlbar?.getBounds() : mainAppWindowBounds;
+  // TODO: window
+  // @ts-ignore
   var nearDisplay = window.runtime.screen.getDisplayMatching(nearestPoint);
   var nearBounds = nearDisplay.bounds;
 
@@ -197,7 +184,7 @@ function followCorrectDisplay(_ref4) {
   };
   var setBoundsMethod = function setBoundsMethod(dialog) {
     if (alwaysFollowScreen) {
-      if ((0, _renderer.isMac)()) {
+      if ((0, _platform.isMac)()) {
         dialog === null || dialog === void 0 || dialog.setBounds(nearDisplayBounds);
       } else {
         // windows 在屏幕分辨率差异比较大的时候，无法移动到正确的屏幕，需要调整到一个小的分辨率后再进行移动
@@ -216,14 +203,16 @@ function followCorrectDisplay(_ref4) {
       dialog === null || dialog === void 0 || dialog.setBounds(followWithAlignToCenter(dialog.getBounds()));
     }
   };
-  if (follow !== false) {
-    Array.isArray(objectDialog) ? objectDialog.forEach(function (dialog) {
-      return setBoundsMethod(dialog);
-    }) : setBoundsMethod(objectDialog);
-  }
+
+  // if (follow !== false) {
+  //   Array.isArray(objectDialog)
+  //     ? objectDialog.forEach((dialog) => setBoundsMethod(dialog))
+  //     : setBoundsMethod(objectDialog);
+  // }
+
   return {
     nearDisplayBounds: nearDisplayBounds,
     nearDisplay: nearDisplay,
-    followControlbar: followControlbar
+    followControlbar: false
   };
 }

package/lib/utilities/focus-helper.d.ts

@@ -0,0 +1,2 @@
+import { FcrUIWindow, FcrUICurrentWindow } from '../providers/window/type';
+export declare const focusWindow: (window: FcrUIWindow | FcrUICurrentWindow) => void;

package/lib/utilities/focus-helper.js

@@ -0,0 +1,26 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.focusWindow = void 0;
+require("core-js/modules/web.timers.js");
+var _platform = require("./platform");
+var focusWindow = exports.focusWindow = function focusWindow(window) {
+  // Windows 需要此操作来确保窗口在最前，Mac不需要
+  if ((0, _platform.isWindows)()) {
+    window.show();
+    window.focus();
+    window.moveTop();
+    setTimeout(function () {
+      window.moveTop();
+      window.focus();
+    }, 100);
+    // window.setAlwaysOnTop(true);
+
+    // setTimeout(() => {
+    //   window.setAlwaysOnTop(false);
+    // });
+  }
+};

package/lib/utilities/logger.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getLogger = exports.generateLogObserver = exports.createLogger = exports.createFragmentLogger = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -44,4 +46,10 @@ var generateLogObserver = exports.generateLogObserver = function generateLogObse
     };
   });
   return observer;
-};
+};
+window.addEventListener('error', function (e) {
+  getLogger().error('window error event:', JSON.stringify(e));
+});
+window.addEventListener('unhandledrejection', function (e) {
+  getLogger().error('window unhandledrejection event:', e.reason);
+});

package/lib/utilities/meeting-detail.d.ts

@@ -1,2 +1,11 @@
-export declare const generateMeetingDetail: (userName: string, roomName: string, invitationTime: string, shareLink: string, displayMeetingId: string, password: string) => string;
+import { FcrRoomInfo, FcrRoomSchedule } from 'fcr-core/lib/type';
+export declare const generateMeetingDetail: ({ userName, roomName, invitationTime, inviteLink, displayMeetingId, password, }: {
+    userName: string;
+    roomName: string;
+    invitationTime: string;
+    inviteLink: string;
+    displayMeetingId: string;
+    password: string;
+}) => string;
 export declare const generateMeetingDuration: (startTime: number, duration: number) => string;
+export declare const getInvitationInfoByRoomInfo: (roomInfo: FcrRoomInfo, scheduleInfo: FcrRoomSchedule, displayMeetingId: string, localUserName: string) => string;

package/lib/utilities/meeting-detail.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.generateMeetingDuration = exports.generateMeetingDetail = void 0;
+exports.getInvitationInfoByRoomInfo = exports.generateMeetingDuration = exports.generateMeetingDetail = void 0;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.push.js");
@@ -13,7 +13,13 @@ require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.string.replace.js");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _dayjs = _interopRequireDefault(require("dayjs"));
-var generateMeetingDetail = exports.generateMeetingDetail = function generateMeetingDetail(userName, roomName, invitationTime, shareLink, displayMeetingId, password) {
+var generateMeetingDetail = exports.generateMeetingDetail = function generateMeetingDetail(_ref) {
+  var userName = _ref.userName,
+    roomName = _ref.roomName,
+    invitationTime = _ref.invitationTime,
+    inviteLink = _ref.inviteLink,
+    displayMeetingId = _ref.displayMeetingId,
+    password = _ref.password;
   var parts = [];
   parts.push((0, _i18n.transI18n)('fmt_link_invitation', {
     reason1: userName
@@ -22,7 +28,7 @@ var generateMeetingDetail = exports.generateMeetingDetail = function generateMee
     reason1: roomName
   }));
   parts.push((0, _i18n.transI18n)('fmt_link_invitation_link', {
-    reason1: shareLink
+    reason1: inviteLink
   }));
   parts.push((0, _i18n.transI18n)('fmt_link_invitation_id', {
     reason1: displayMeetingId
@@ -57,4 +63,20 @@ var generateMeetingDuration = exports.generateMeetingDuration = function generat
     endDate = (0, _dayjs["default"])(startTimeStamp + durationStamp).format('HH:mm');
   }
   return "".concat(startDate, " - ").concat(endDate);
+};
+var getInvitationInfoByRoomInfo = exports.getInvitationInfoByRoomInfo = function getInvitationInfoByRoomInfo(roomInfo, scheduleInfo, displayMeetingId, localUserName) {
+  var duration = (scheduleInfo === null || scheduleInfo === void 0 ? void 0 : scheduleInfo.duration) || 0;
+  var invitationTime = generateMeetingDuration((scheduleInfo === null || scheduleInfo === void 0 ? void 0 : scheduleInfo.startTime) || 0, duration);
+  var roomName = (roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomName) || '';
+  var inviteLink = (roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.inviteLink) || '';
+  var password = (roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.password) || '';
+  var copyText = generateMeetingDetail({
+    userName: localUserName,
+    roomName: roomName,
+    invitationTime: invitationTime,
+    inviteLink: inviteLink,
+    displayMeetingId: displayMeetingId,
+    password: password
+  });
+  return copyText;
 };

package/lib/utilities/platform.d.ts

@@ -1 +1,2 @@
 export declare const isWindows: () => boolean;
+export declare const isMac: () => boolean;

package/lib/utilities/platform.js

@@ -4,8 +4,11 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isWindows = void 0;
+exports.isWindows = exports.isMac = void 0;
 require("core-js/modules/es.array.index-of.js");
 var isWindows = exports.isWindows = function isWindows() {
   return navigator.userAgent.indexOf('Windows') > -1;
+};
+var isMac = exports.isMac = function isMac() {
+  return navigator.userAgent.indexOf('Mac') > -1;
 };

package/lib/utilities/renderer.d.ts

@@ -1,17 +1,75 @@
-export declare const open: (path: string) => void;
-export declare const close: (path: string) => void;
-export declare const isWindows: () => boolean;
-export declare const isMac: () => boolean;
-/**
- * handle the will-close event of the browserWindow,
- * callback will be called when:
- * 1. closeRendererWindow is called
- * 2. user press the shortcut to close the browserWindow such as Cmd + W on Mac
- *
- * @param browserWindow
- * @param callback
- */
-export declare const handleWillClose: (browserWindow: Electron.BrowserWindow, callback?: () => Promise<boolean>) => void;
-export declare const releaseSubAllWindowRefs: () => void;
-export declare const setInMeetingState: (state: 0 | 1) => void;
-export declare const restartApp: () => void;
+import { BrowserWindowProxy } from '../runtime';
+import { RendererCustomEvent } from '../runtime';
+import { FcrUIManagedObject } from '../object-manager';
+type RendererEventListener = (event: RendererCustomEvent) => void;
+export declare enum MeetingState {
+    NOT_IN_MEETING = 0,
+    IN_MEETING = 1
+}
+export declare class FcrUIRendererWrapper implements FcrUIManagedObject {
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _listeners;
+    constructor();
+    addEventListener(listener: RendererEventListener): void;
+    removeEventListener(listener: RendererEventListener): void;
+    removeAllEventListener(): void;
+    sendEvent(event: RendererCustomEvent): void;
+    openLinkInDefaultBrowser(url: string): void;
+    getMediaSourcesIdByTitle(title: string[]): {
+        windowName: string;
+        windowId: string;
+    }[] | undefined;
+    open(path: string, dialogId?: string): void;
+    close(path: string, dialogId?: string): void;
+    /**
+     * handle the will-close event of the browserWindow,
+     * callback will be called when:
+     * 1. closeRendererWindow is called
+     * 2. user press the shortcut to close the browserWindow such as Cmd + W on Mac
+     *
+     * @param browserWindow
+     * @param callback
+     */
+    handleWillClose(browserWindow: Electron.BrowserWindow, callback?: () => Promise<boolean>): void;
+    setInMeetingState(state: MeetingState): void;
+    release(): void;
+    initialize(): void;
+    restartApp(): void;
+    quitApp(): void;
+    getDisplayMatching(bounds: Electron.Rectangle): Electron.Display;
+    getCursorScreenPoint(): {
+        x: number;
+        y: number;
+    };
+    setUserSettingData(data: Record<string, unknown>): void;
+    getUserSettingData(): object;
+    getAllDisplays(): Electron.Display[];
+    checkMediaPermission(type: 'camera' | 'microphone' | 'sharing'): Promise<boolean>;
+    openSystemPreferences(type: 'camera' | 'microphone' | 'sharing'): void;
+    captureScreen(options?: {
+        hideWindow?: boolean;
+        alwaysHide?: boolean;
+    }): void;
+    getDisplayNearestPoint(point: Electron.Point): Electron.Display;
+    fileToBlob(filePath: string, type: 'image' | 'audio' | 'video'): Blob;
+    getResourceByFileType(url: string, md5Url: string, type: 'image' | 'video' | 'audio'): Promise<string[]>;
+    loadBuiltinResources(): Promise<{
+        virtualBackgroundImages: string[];
+        virtualBackgroundVideos: string[];
+        soundEffects: string[];
+    }>;
+    openDirectory(): Promise<string | undefined>;
+    showItemInFolder(path: string): void;
+    openRendererWindow(frameName: string, callback: (dom: HTMLElement, windowId: string, newRendererWindow: Window) => void, windowOptions: Electron.BrowserWindowConstructorOptions): void;
+    getBaseUrl(): string;
+    getWindowInfoList(): never[];
+    getNetworkType(): Promise<import("../runtime").NetworkType>;
+    getSystemCpuInfo(): import("../runtime").CpuInfo[];
+    getSystemMemorySize(): number;
+    setFragmentOptions(entryPath: string, windowOptions: Electron.BrowserWindowConstructorOptions, webPreferences: Electron.WebPreferences): void;
+    getCurrentBrowserWindow(): Electron.BrowserWindow;
+    createWindowProxy(windowId: string): BrowserWindowProxy;
+    getBrowserWindowById(windowId: string): Electron.BrowserWindow | null;
+    private _checkRuntime;
+}
+export {};