fcr-ui-scene 3.7.2 → 3.7.3

package/lib/utilities/renderer-event.js

@@ -1,19 +1,25 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getVideoWindowMediaSourceId = exports.getControlBarMediaSourceId = exports.getBrowserWindowById = exports.getAnnotationMediaSourceId = exports.addEventListener = void 0;
-require("core-js/modules/es.array.find.js");
+exports.sendEvent = exports.removeEventListener = exports.openLinkInDefaultBrowser = exports.getMediaSourcesIdByTitle = exports.addEventListener = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
+require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.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.set.add-all.js");
 require("core-js/modules/esnext.set.delete-all.js");
 require("core-js/modules/esnext.set.difference.v2.js");
@@ -67,49 +73,23 @@ var openLinkInDefaultBrowser = exports.openLinkInDefaultBrowser = function openL
     window.open(url);
   }
 };
-var getBrowserWindowById = exports.getBrowserWindowById = function getBrowserWindowById(id) {
-  if (window.runtime) {
-    return window.runtime.getBrowserWindowById(id);
-  } else {
-    console.error('failed to call sendEvent, window.runtime is not available');
-  }
-};
-var getControlBarMediaSourceId = exports.getControlBarMediaSourceId = function getControlBarMediaSourceId() {
-  if (window.runtime) {
-    var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === 'Control Bar';
-    });
-    if (info) {
-      return info.mediaSourceId;
-    }
-  } else {
-    console.error('failed to call getControlBarMediaSourceId, window.runtime is not available');
-  }
-};
-var getVideoWindowMediaSourceId = exports.getVideoWindowMediaSourceId = function getVideoWindowMediaSourceId() {
-  if (window.runtime) {
-    var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === 'Video Window';
-    });
-    if (info) {
-      return info.mediaSourceId;
-    }
-  } else {
-    console.error('failed to call getVideoWindowMediaSourceId, window.runtime is not available');
-  }
-};
-var getAnnotationMediaSourceId = exports.getAnnotationMediaSourceId = function getAnnotationMediaSourceId(title) {
+var getMediaSourcesIdByTitle = exports.getMediaSourcesIdByTitle = function getMediaSourcesIdByTitle(title) {
   if (window.runtime) {
     var mediaSourceList = window.runtime.getMediaSourceIdList();
-    var info = mediaSourceList.find(function (item) {
-      return item.title === title;
+    var infos = mediaSourceList.filter(function (item) {
+      return title.includes(item.title);
     });
-    if (info) {
-      return info.mediaSourceId;
+    if (infos.length > 0) {
+      return infos.map(function (item) {
+        var _item$mediaSourceId$s = item.mediaSourceId.split(':'),
+          _item$mediaSourceId$s2 = (0, _slicedToArray2["default"])(_item$mediaSourceId$s, 2),
+          windowId = _item$mediaSourceId$s2[1];
+        var windowName = item.title;
+        return {
+          windowName: windowName,
+          windowId: windowId
+        };
+      });
     }
-  } else {
-    console.error('failed to call getMediaSourceId, window.runtime is not available');
   }
 };

package/lib/utilities/renderer.d.ts

@@ -11,7 +11,7 @@ export declare const isMac: () => boolean;
  * @param browserWindow
  * @param callback
  */
-export declare const handleWillClose: (browserWindow: Electron.BrowserWindow, callback?: () => void) => void;
+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;

package/lib/utilities/renderer.js

@@ -1,10 +1,13 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setInMeetingState = exports.restartApp = exports.releaseSubAllWindowRefs = exports.open = exports.isWindows = exports.isMac = exports.handleWillClose = exports.close = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 require("core-js/modules/es.array.index-of.js");
 var open = exports.open = function open(path) {
   window.runtime.open(path);
@@ -29,16 +32,47 @@ var isMac = exports.isMac = function isMac() {
  * @param callback
  */
 var handleWillClose = exports.handleWillClose = function handleWillClose(browserWindow) {
-  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
-  var _callback = function _callback() {
-    // console.log('browserWindow will-close fired');
-
-    callback();
-    if (!browserWindow.isDestroyed()) {
-      // dont close the window as it will carsh the renderer process of the main window
-      browserWindow.hide();
-    }
-  };
+  var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    return _regenerator["default"].wrap(function (_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", false);
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  var _callback = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+      var interception;
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 1;
+            return callback();
+          case 1:
+            interception = _context2.sent;
+            if (!interception) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            if (!browserWindow.isDestroyed()) {
+              // dont close the window as it will carsh the renderer process of the main window
+              browserWindow.hide();
+            }
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function _callback() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   browserWindow.removeAllListeners('will-close');
   browserWindow.addListener(
   // @ts-ignore

package/lib/utilities/shared-storage.d.ts

@@ -0,0 +1,18 @@
+/**
+ * This file is for managing shared storage utilities.
+ */
+import type { FcrConnectionState } from 'fcr-core';
+export declare const setAnnotationEngineState: (state: FcrConnectionState) => void;
+export declare const getAnnotationEngineState: () => FcrConnectionState;
+export declare const setAnnotationRtmAppId: (appId: string) => void;
+export declare const setAnnotationNickName: (nickName: string) => void;
+export declare const getBoardOptions: () => {
+    boardAppId: string;
+    boardId: string;
+    boardRegion: string;
+    boardToken: string;
+    boardUserToken: string;
+    boardUserUuid: string;
+    nickName: string;
+    rtmAppId: string;
+} | undefined;

package/lib/utilities/shared-storage.js

@@ -0,0 +1,63 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+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.to-string.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/web.dom-collections.for-each.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setAnnotationRtmAppId = exports.setAnnotationNickName = exports.setAnnotationEngineState = exports.getBoardOptions = exports.getAnnotationEngineState = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+require("core-js/modules/es.date.to-json.js");
+require("core-js/modules/es.json.stringify.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/esnext.json.parse.js");
+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; }
+/**
+ * This file is for managing shared storage utilities.
+ */
+
+var STORAGE_KEY_ANNOTATION_RTM_APP_ID = 'annotation_rtm_app_id';
+var STORAGE_KEY_ANNOTATION_BOARD_OPTIONS = 'annotation_board_options';
+var STORAGE_KEY_ANNOTATION_NICK_NAME = 'annotation_nickname';
+var setAnnotationEngineState = exports.setAnnotationEngineState = function setAnnotationEngineState(state) {
+  localStorage.setItem('annotation_engine_state', JSON.stringify(state));
+};
+var getAnnotationEngineState = exports.getAnnotationEngineState = function getAnnotationEngineState() {
+  var stateStr = localStorage.getItem('annotation_engine_state');
+  if (!stateStr) {
+    return 0;
+  }
+  return JSON.parse(stateStr);
+};
+var setAnnotationRtmAppId = exports.setAnnotationRtmAppId = function setAnnotationRtmAppId(appId) {
+  localStorage.setItem(STORAGE_KEY_ANNOTATION_RTM_APP_ID, appId);
+};
+var setAnnotationNickName = exports.setAnnotationNickName = function setAnnotationNickName(nickName) {
+  localStorage.setItem(STORAGE_KEY_ANNOTATION_NICK_NAME, nickName);
+};
+var getBoardOptions = exports.getBoardOptions = function getBoardOptions() {
+  var boardOptionsStr = localStorage.getItem(STORAGE_KEY_ANNOTATION_BOARD_OPTIONS);
+  var rtmAppId = localStorage.getItem(STORAGE_KEY_ANNOTATION_RTM_APP_ID) || '';
+  var nickName = localStorage.getItem(STORAGE_KEY_ANNOTATION_NICK_NAME) || '';
+  if (boardOptionsStr) {
+    var boardOptions = JSON.parse(boardOptionsStr || '{}');
+    return _objectSpread(_objectSpread({}, boardOptions), {}, {
+      rtmAppId: rtmAppId,
+      nickName: nickName
+    });
+  }
+  return undefined;
+};

package/lib/utilities/tools.js

@@ -219,6 +219,7 @@ width,
  */
 height) {
   var isProvider = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+  var logger = (0, _logger.getLogger)();
   /**
    * 如果宽大于高, 则把 boardView 的高度设置为 100vh, 然后获取 boardView 最新的高度
    * 用新的高度计算宽高比为 16:9 的比例下的宽度是否大于原宽度，如果大于等于原宽度，则把 boardView 的高度设置为当前高度
@@ -247,7 +248,7 @@ height) {
     boardView.style.width = "".concat(_newHeight / 9 * 16, "px");
     boardView.style.height = "".concat(_newHeight, "px");
   }
-  console.log('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
+  logger.info('annotation compute area size: ', boardView.style.width, '=====', boardView.style.height);
 }
 var getBrowserLanguage = exports.getBrowserLanguage = function getBrowserLanguage() {
   var usrlang = navigator.language;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -22,13 +22,13 @@
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
     "agora-electron-sdk": "4.3.2-build.145-rc.4",
-    "agora-foundation": "~3.7.2",
-    "agora-ui-foundation": "~3.7.2",
+    "agora-foundation": "~3.7.3",
+    "agora-ui-foundation": "~3.7.3",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
     "electron-screenshots": "^0.5.26",
-    "fcr-core": "~3.7.2",
+    "fcr-core": "~3.7.3",
     "js-md5": "^0.8.3",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -42,7 +42,6 @@
     "react-rnd": "^10.4.1",
     "react-use-measure": "^2.1.1",
     "react-virtualized": "^9.22.5",
-    "systeminformation": "^5.22.11",
     "tinycolor2": "^1.6.0",
     "winston": "^3.16.0",
     "winston-daily-rotate-file": "^4.7.1"
@@ -60,7 +59,7 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
-    "agora-toolchain": "~3.7.2",
+    "agora-toolchain": "~3.7.3",
     "core-js": "^3.33.3",
     "electron": "22.3.27",
     "husky": "^9.0.11",

package/lib/electron/tools.d.ts

@@ -1,5 +0,0 @@
-export declare function getProcessIds(processName: string): Promise<string[]>;
-export declare function getCpuUsage(): Promise<{
-    coreCount: number;
-    totalUsage: number;
-}>;

package/lib/electron/tools.js

@@ -1,62 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.object.define-property.js");
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getCpuUsage = getCpuUsage;
-exports.getProcessIds = getProcessIds;
-require("core-js/modules/es.array.concat.js");
-require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.includes.js");
-require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.array.reduce.js");
-require("core-js/modules/es.function.name.js");
-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.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) {
-  return new Promise(function (resolve, reject) {
-    _systeminformation["default"].processes().then(function (processes) {
-      var appProcess = processes.list.filter(function (process) {
-        return process.name.includes(processName);
-      });
-      var processIds = appProcess.map(function (item) {
-        return String(item.pid);
-      });
-      console.log("Process IDs for ".concat(processName, ":"), processIds);
-      resolve(processIds);
-    })["catch"](function (err) {
-      return reject(err);
-    });
-  });
-}
-function getCpuUsage() {
-  return new Promise(function (resolve, reject) {
-    _systeminformation["default"].currentLoad().then(function (data) {
-      var total = data.cpus.reduce(function (prev, curr) {
-        return prev + curr.load;
-      }, 0);
-      console.log("Total CPU Usage: ".concat(data.currentLoad.toFixed(2), "%, total: ").concat(total, ", average: ").concat(total / data.cpus.length));
-      data.cpus.forEach(function (cpu, index) {
-        console.log("Core ".concat(index, " - CPU Usage: ").concat(cpu.load.toFixed(2), "%"));
-      });
-      resolve({
-        coreCount: data.cpus.length,
-        totalUsage: total
-      });
-    })["catch"](function (err) {
-      return reject(err);
-    });
-  });
-}