fcr-ui-scene 3.3.1 → 3.4.1

package/lib/common/type.d.ts

@@ -0,0 +1,8 @@
+export type FcrSecuritySendChatOriginalPayload = {
+    public: 0 | 1;
+    private: {
+        host: 0 | 1;
+        cohost: 0 | 1;
+        participant: 0 | 1;
+    };
+};

package/lib/common/type.js

@@ -0,0 +1,6 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/creator.d.ts

@@ -1,8 +1,10 @@
-import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback } from './type';
+import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig } from './type';
 import { FcrUIDefaultScene } from './ui-scene';
 export declare class FcrUISceneCreator {
     private _config;
     protected logger: import("agora-foundation/lib/logger").Logger;
+    settingConfig: FcrUISettingConfig;
     constructor(_config: FcrUISceneCreatorConfig);
     launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
+    getSettingConfig(): FcrUISettingConfig;
 }

package/lib/creator.js

@@ -20,13 +20,20 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
     this._config = _config;
     this.logger.info("[FcrUISceneCreator] creator config: ".concat(JSON.stringify(_config)));
+    this.settingConfig = {
+      media: {
+        autoConnectAudio: true,
+        microphoneExpectedOff: true,
+        cameraExpectedOff: true
+      }
+    };
   }
   return (0, _createClass2["default"])(FcrUISceneCreator, [{
     key: "launch",
     value: function launch(config, onCancel, onSuccess, onFailure, dom) {
       this.logger.info("[FcrUISceneCreator] scene config: ".concat(JSON.stringify(config)));
       (0, _i18n.changeLanguage)(config.language);
-      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom);
+      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this.settingConfig);
       scene.addObserver({
         onLaunchSuccess: onSuccess,
         onLaunchFailure: onFailure,
@@ -35,5 +42,10 @@ var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
       scene.launch();
       return scene;
     }
+  }, {
+    key: "getSettingConfig",
+    value: function getSettingConfig() {
+      return this.settingConfig;
+    }
   }]);
 }();

package/lib/electron/app.js

@@ -1,11 +1,14 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.regexp.exec.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.hookApp = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.join.js");
@@ -24,11 +27,18 @@ var _window = require("./window");
 var _electron = require("electron");
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("./logger");
+var _child_process = require("child_process");
 var hookApp = exports.hookApp = function hookApp(app) {
   var logger = (0, _logger.getLogger)();
   var isWindowDestroyed = function isWindowDestroyed(window) {
     return window.isDestroyed();
   };
+  var appUserModelId = process.argv.find(function (arg) {
+    return arg.startsWith('--app-user-model-id=');
+  });
+  if (appUserModelId) {
+    app.setAppUserModelId(appUserModelId.substring('--app-user-model-id='.length));
+  }
   app.addListener('browser-window-created', function (_, window) {
     var windowId = window.id;
     window.addListener('close', function () {
@@ -135,6 +145,52 @@ var hookApp = exports.hookApp = function hookApp(app) {
       var _getRendererWindow;
       return (_getRendererWindow = (0, _window.getRendererWindow)(frameName)) === null || _getRendererWindow === void 0 ? void 0 : _getRendererWindow.id;
     });
+    _electron.ipcMain.handle('checkMediaPermission', /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(_, mediaType) {
+        var accessStatus, res;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!(mediaType === 'sharing')) {
+                _context.next = 3;
+                break;
+              }
+              // below API call will trigger the system to add the permission for screen recording on macOS
+              _electron.desktopCapturer.getSources({
+                types: ['screen']
+              });
+              return _context.abrupt("return", true);
+            case 3:
+              accessStatus = _electron.systemPreferences.getMediaAccessStatus(mediaType);
+              if (!(accessStatus !== 'granted')) {
+                _context.next = 11;
+                break;
+              }
+              _context.next = 7;
+              return _electron.systemPreferences.askForMediaAccess(mediaType);
+            case 7:
+              res = _context.sent;
+              return _context.abrupt("return", res);
+            case 11:
+              return _context.abrupt("return", true);
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x, _x2) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+    _electron.ipcMain.addListener('openSystemPreferences', function (_, mediaType) {
+      var execMap = {
+        camera: "open x-apple.systempreferences:com.apple.preference.security?Privacy_Camera",
+        microphone: "open x-apple.systempreferences:com.apple.preference.security?Privacy_Microphone",
+        sharing: "open x-apple.systempreferences:com.apple.preference.security?Privacy_AudioCapture"
+      };
+      (0, _child_process.exec)(execMap[mediaType]);
+    });
     _electron.ipcMain.addListener('open', function (_, entryPath, dialogId) {
       (0, _window.open)(entryPath, dialogId);
     });
@@ -153,4 +209,7 @@ var hookApp = exports.hookApp = function hookApp(app) {
       (0, _window.clearAllRendererWindows)();
     });
   });
+  app.addListener('will-quit', function () {
+    _electron.globalShortcut.unregister('CommandOrControl+Shift+X');
+  });
 };

package/lib/electron/injections.d.ts

@@ -20,10 +20,11 @@ export declare const registerListenerReady: () => void;
 export declare const captureScreen: (options?: {
     hideWindow?: boolean;
 }) => void;
-export declare const openRendererWindow: (frameName: string, renderFn: (dom: Element, browserWindow: Electron.BrowserWindow) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
+export declare const openRendererWindow: (frameName: string, renderFn: (dom: Element, browserWindow: Electron.BrowserWindow, newRendererWindow: Window) => void, windowOptions: BrowserWindowConstructorOptions) => Promise<void>;
+export declare const checkMediaPermission: (mediaType: "microphone" | "camera" | "sharing") => Promise<any>;
+export declare const openSystemPreferences: (mediaType: "microphone" | "camera") => void;
 export declare const closeRendererWindow: (frameName: string) => Promise<void>;
 export declare const launch: (options: any) => Promise<any>;
-export declare const setAlwaysOnTop: () => void;
 export declare const quitApp: () => void;
 export declare const getSystemMemorySize: () => number;
 export declare const getSystemCpuInfo: () => os.CpuInfo[];
@@ -35,11 +36,12 @@ export declare const getRendererProcessUsage: () => Promise<{
     totalMemoryUsage: number;
     totalCpuUsage: number;
 }>;
-export declare const getVirtualBgResource: (url: string, md5Url: string, type: "image" | "video") => Promise<string[]>;
-export declare const fileToBase64: (file: string, type: "image" | "video") => string;
+export declare const getResourceByFileType: (url: string, md5Url: string, type: "image" | "video" | "audio") => Promise<string[]>;
+export declare const fileToBase64: (file: string, type: "image" | "video" | "audio") => string;
 export declare const releaseSubAllWindowRefs: () => void;
 export declare const getMediaSourceIdList: () => {
     title: string;
     mediaSourceId: string;
 }[];
 export declare const setInMeetingState: (state: 0 | 1) => void;
+export declare const restartApp: () => void;