fcr-ui-scene 3.1.0 → 3.2.0

package/lib/utilities/extract.js

@@ -26,10 +26,33 @@ 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.set.add-all.js");
+require("core-js/modules/esnext.set.delete-all.js");
+require("core-js/modules/esnext.set.difference.v2.js");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/web.dom-collections.iterator.js");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var extractUserStreams = exports.extractUserStreams = function extractUserStreams(users, streamByUid, sourceTypes) {
   var streams = new Set();
   var _iterator = _createForOfIteratorHelper(users),

package/lib/utilities/hooks.js

@@ -6,6 +6,8 @@ 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.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");

package/lib/utilities/renderer-event.js

@@ -11,6 +11,34 @@ require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.async-iterator.find.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.find.js");
+require("core-js/modules/esnext.iterator.for-each.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");
+require("core-js/modules/esnext.set.difference.js");
+require("core-js/modules/esnext.set.every.js");
+require("core-js/modules/esnext.set.filter.js");
+require("core-js/modules/esnext.set.find.js");
+require("core-js/modules/esnext.set.intersection.v2.js");
+require("core-js/modules/esnext.set.intersection.js");
+require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
+require("core-js/modules/esnext.set.is-disjoint-from.js");
+require("core-js/modules/esnext.set.is-subset-of.v2.js");
+require("core-js/modules/esnext.set.is-subset-of.js");
+require("core-js/modules/esnext.set.is-superset-of.v2.js");
+require("core-js/modules/esnext.set.is-superset-of.js");
+require("core-js/modules/esnext.set.join.js");
+require("core-js/modules/esnext.set.map.js");
+require("core-js/modules/esnext.set.reduce.js");
+require("core-js/modules/esnext.set.some.js");
+require("core-js/modules/esnext.set.symmetric-difference.v2.js");
+require("core-js/modules/esnext.set.symmetric-difference.js");
+require("core-js/modules/esnext.set.union.v2.js");
+require("core-js/modules/esnext.set.union.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var listeners = new Set();

package/lib/utilities/renderer.js

@@ -10,6 +10,9 @@ require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.index-of.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");
 var open = exports.open = function open(path) {
   window.runtime.open(path);
@@ -93,16 +96,18 @@ var getCurrentWorkArea = exports.getCurrentWorkArea = function getCurrentWorkAre
  */
 var handleWillClose = exports.handleWillClose = function handleWillClose(browserWindow) {
   var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function () {};
-  browserWindow.addListener(
-  // @ts-ignore
-  'will-close', 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();
     }
-  });
+  };
+  browserWindow.removeAllListeners('will-close');
+  browserWindow.addListener(
+  // @ts-ignore
+  'will-close', _callback);
 };
 var releaseSubAllWindowRefs = exports.releaseSubAllWindowRefs = function releaseSubAllWindowRefs() {
   window.runtime.releaseSubAllWindowRefs();

package/lib/utilities/tools.js

@@ -19,6 +19,9 @@ require("core-js/modules/es.regexp.exec.js");
 require("core-js/modules/es.regexp.test.js");
 require("core-js/modules/es.string.ends-with.js");
 require("core-js/modules/es.string.match.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -124,7 +127,7 @@ var getLanguage = exports.getLanguage = function getLanguage() {
   return storage.get('$$fcr_language');
 };
 var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(prediction, memo) {
+  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(prediction, memo) {
     var intervalMs,
       logger,
       _args2 = arguments;
@@ -134,7 +137,7 @@ var waitUntil = exports.waitUntil = /*#__PURE__*/function () {
           intervalMs = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : 100;
           logger = (0, _logger.getLogger)();
           return _context2.abrupt("return", new Promise(function (resolve) {
-            var task = _schedule.AgoraScheduler.shared.addPollingTask( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+            var task = _schedule.AgoraScheduler.shared.addPollingTask(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
               var isTrue;
               return _regenerator["default"].wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {

package/lib/utilities/ui-resources.d.ts

@@ -1,2 +1,2 @@
-export declare const BUILTIN_VIRTUAL_BACKGROUND_IMAGES_URL = "https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip";
-export declare const BUILTIN_VIRTUAL_BACKGROUND_VIDEOS_URL = "https://solutions-apaas.agora.io/fcr-ui-scene/video/common/virtual_background_videos.zip";
+export declare const BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST: string[];
+export declare const BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST: string[];

package/lib/utilities/ui-resources.js

@@ -4,6 +4,23 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEOS_URL = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGES_URL = void 0;
-var BUILTIN_VIRTUAL_BACKGROUND_IMAGES_URL = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGES_URL = 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip';
-var BUILTIN_VIRTUAL_BACKGROUND_VIDEOS_URL = exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEOS_URL = 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/virtual_background_videos.zip';
+exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = void 0;
+var BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_IMAGE_URL_LIST = [
+// electron zip
+'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/virtual_background_images.zip'
+// browser png
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default1.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default2.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default3.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default4.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default5.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default6.jpg',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/picture/common/default7.jpg',
+];
+var BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = exports.BUILTIN_VIRTUAL_BACKGROUND_VIDEO_URL_LIST = [
+// electron zip
+'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/virtual_background_videos.zip'
+// browser png
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default8.mp4',
+// 'https://solutions-apaas.agora.io/fcr-ui-scene/video/common/default9.mp4',
+];

package/lib/utilities/video-track-render-context.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { FcrDeviceStore } from '../common/device-store';
 import { FcrStreamControl } from 'agora-edu-core';
 export interface FcrVideoTrackRenderer {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-desktop.git",
   "author": "agora.io",
@@ -37,7 +37,12 @@
     "tinycolor2": "^1.6.0",
     "electron-screenshots": "^0.5.26",
     "pidusage": "^3.0.2",
-    "systeminformation": "^5.22.11"
+    "systeminformation": "^5.22.11",
+    "jszip": "^3.10.1",
+    "winston": "^3.16.0",
+    "agora-foundation": "^3.2.0",
+    "agora-ui-foundation": "^3.2.0",
+    "agora-edu-core": "^3.2.0"
   },
   "devDependencies": {
     "electron": "24.8.8",
@@ -58,13 +63,10 @@
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
     "react-hot-loader": "^4.13.1",
-    "tslib": "^2.6.2"
+    "tslib": "^2.6.2",
+    "agora-toolchain": "^3.2.0"
   },
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"
-  },
-  "agora_electron": {
-    "electron_version": "24.8.8",
-    "prebuilt": true
   }
-}
+}

package/installer/mac/entitlements.mac.plist

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>com.apple.security.cs.allow-jit</key>
-    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
-    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
-    <true/>
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-    <key>com.apple.security.device.camera</key>
-    <true/>
-  </dict>
-</plist>

package/lib/common/device-streams-store.d.ts

@@ -1,34 +0,0 @@
-import { FcrDesktopMediaControl } from 'agora-edu-core';
-import { FcrRoomControl } from 'agora-edu-core/lib/room-control';
-import { FcrSecurityStore } from './security-store';
-import { FcrDeviceStore } from './device-store';
-export interface FcrDeviceStreamsStoreParams {
-    mediaControl: FcrDesktopMediaControl;
-    roomControl: FcrRoomControl;
-    securityStore: FcrSecurityStore;
-    deviceStore: FcrDeviceStore;
-}
-export declare class FcrDeviceStreamsStore {
-    protected logger: import("agora-foundation/lib/logger").Logger;
-    private _mediaControl;
-    private _roomControl;
-    private _securityStore;
-    private _deviceStore;
-    private _listeners;
-    private get _localUser();
-    private get _localCameraStream();
-    private get _canStartLocalVideo();
-    private get _canStartLocalAudio();
-    constructor({ mediaControl, roomControl, securityStore, deviceStore, }: FcrDeviceStreamsStoreParams);
-    bindLocalAudioStream(): void;
-    bindLocalVideoStream(): void;
-    enableCameraWithStream(enable: boolean): Promise<void>;
-    enableMicrophoneWithStream(enable: boolean): Promise<void>;
-    private _initLocalStream;
-    private _handleCameraChanged;
-    private _handleMicrophoneChanged;
-    private _handleCameraEnabledChanged;
-    private _handleMicrophoneEnabledChanged;
-    private _publishLocalStream;
-}
-export declare const matchVirtualSoundCardPattern: (deviceName: string) => boolean;