fcr-ui-scene 3.5.1 → 3.6.1

package/lib/creator.d.ts

@@ -1,13 +1,27 @@
 import { FcrUISceneCancelCallback, FcrUISceneConfig, FcrUISceneCreatorConfig, FcrUISceneFailureCallback, FcrUISceneSuccessCallback, FcrUISettingConfig, FcrUIWebWidgetConfig } from './type';
 import { FcrUIDefaultScene } from './ui-scene';
+import SettingStore from './modules/setting/store';
+export interface FcrObservableSettingStore {
+    value: SettingStore | null;
+}
 export declare class FcrUISceneCreator {
     private _config;
+    accessor observableSettingStore: FcrObservableSettingStore;
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _settingConfigStorage;
     private _registeredWidgetConfigs;
+    private _released;
+    private _scene;
     constructor(_config: FcrUISceneCreatorConfig);
     launch(config: FcrUISceneConfig, onCancel: FcrUISceneCancelCallback, onSuccess: FcrUISceneSuccessCallback, onFailure: FcrUISceneFailureCallback, dom: HTMLElement): FcrUIDefaultScene;
     getSettingConfig(): FcrUISettingConfig;
     registerWidget(config: FcrUIWebWidgetConfig): void;
     unregisterWidget(widgetId: string): void;
+    renewUserToken(token: string): void;
+    setParameters(parameters: Record<string, unknown>): void;
+    private _initSettingStore;
+    openSetting(): void;
+    closeSetting(): void;
+    release(): void;
+    private _precheckState;
 }

package/lib/creator.js

@@ -3,8 +3,6 @@
 require("core-js/modules/es.symbol.js");
 require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
@@ -22,12 +20,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FcrUISceneCreator = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.date.to-json.js");
 require("core-js/modules/es.json.stringify.js");
 require("core-js/modules/es.map.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.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
 require("core-js/modules/esnext.map.every.js");
@@ -42,68 +44,291 @@ require("core-js/modules/esnext.map.merge.js");
 require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.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");
+require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _logger = require("agora-foundation/lib/logger");
 var _uiScene = require("./ui-scene");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _settingConfigStorage = require("./utilities/setting-config-storage");
 var _validateParams = _interopRequireDefault(require("./utilities/validate-params"));
 var _schema = require("./schema");
 var _decorator = require("agora-foundation/lib/decorator");
+var _mobx = require("mobx");
+var _store = _interopRequireDefault(require("./modules/setting/store"));
+var _reactDom = _interopRequireDefault(require("react-dom"));
+var _view = require("./modules/setting/view");
+var _deviceProvider = require("./providers/device-provider");
+var _fcrCore = require("fcr-core");
+var _dialogProvider = require("./providers/dialog-provider");
+var _eventProvider = require("./providers/event-provider");
+var _messageProvider = require("./providers/message-provider");
+var _monitorProvider = require("./providers/monitor-provider");
+var _config2 = require("./shared-data-source/config");
+var _setting = require("./shared-data-source/setting");
+var _parameters = require("./utilities/parameters");
+var _defaultConfig = require("./utilities/default-config");
+var _imports = require("fcr-core/lib/imports");
+var _localStorageProvider = require("./providers/local-storage-provider");
+var _uiResources = require("./utilities/ui-resources");
+var _logger = require("./utilities/logger");
+var _jsxRuntime = require("react/jsx-runtime");
 var _FcrUISceneCreator;
-var _initProto, _launchDecs, _ref;
+var _initProto, _init_observableSettingStore, _launchDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
-_ref = (_launchDecs = [(0, _validateParams["default"])(_schema.fcrUISceneConfigSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneFailureCallbackSchema, _schema.fcrRenderViewSchema), _decorator.trace], "logger");
+var _A = /*#__PURE__*/new WeakMap();
+_ref = (_launchDecs = [_decorator.trace, (0, _validateParams["default"])(_schema.fcrUISceneConfigSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneCallbackSchema, _schema.fcrUISceneFailureCallbackSchema, _schema.fcrRenderViewSchema)], "_engine");
 var FcrUISceneCreator = exports.FcrUISceneCreator = /*#__PURE__*/function () {
   function FcrUISceneCreator(_config) {
     (0, _classCallCheck2["default"])(this, FcrUISceneCreator);
-    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.getLogger)()));
-    (0, _defineProperty2["default"])(this, "_settingConfigStorage", new _settingConfigStorage.FcrSettingConfigStorage());
+    // @internal
+    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    _classPrivateFieldInitSpec(this, _A, _init_observableSettingStore(this, {
+      value: null
+      // isPreMeetingSettingsStore: true
+    }));
+    (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrUISceneCreator'
+    }));
     (0, _defineProperty2["default"])(this, "_registeredWidgetConfigs", new Map([]));
+    (0, _defineProperty2["default"])(this, "_released", false);
+    (0, _defineProperty2["default"])(this, "_scene", null);
     this._config = _config;
-    this.logger.info("[FcrUISceneCreator] creator config: ".concat(JSON.stringify(_config)));
+    this.logger.info("creator config: ".concat(JSON.stringify(_config)));
+    this._localStorageProvider = new _localStorageProvider.FcrUILocalStorageProviderImpl();
+    this._settingConfigStorage = new _settingConfigStorage.FcrSettingConfigStorage({
+      localStorageProvider: this._localStorageProvider
+    });
+    var dualCameraVideoStreamConfigFromParameters = (0, _parameters.getDualCameraVideoStreamConfig)(this._config.parameters);
+    var dualScreenVideoStreamConfigFromParameters = (0, _parameters.getDualScreenVideoStreamConfig)(this._config.parameters);
+    (0, _defaultConfig.mergeDefaultDualStreamConfig)(dualCameraVideoStreamConfigFromParameters, dualScreenVideoStreamConfigFromParameters);
+    var dualCameraVideoStreamConfig = {
+      lowVideoEncoderConfig: _defaultConfig.cameraVideoLowStreamEncoderConfig,
+      highVideoEncoderConfig: _defaultConfig.cameraVideoHighStreamEncoderConfig,
+      enableDualStreamMode: (0, _defaultConfig.isCameraDualStreamModeEnabled)()
+    };
+    var dualScreenVideoStreamConfig = {
+      lowVideoEncoderConfig: _defaultConfig.screenCaptureLowStreamEncoderConfig,
+      highVideoEncoderConfig: _defaultConfig.screenCaptureHighStreamEncoderConfig,
+      enableDualStreamMode: (0, _defaultConfig.isScreenDualStreamModeEnabled)()
+    };
+    var config = {
+      appId: this._config.appId,
+      userId: this._config.userId,
+      parameters: this._config.parameters,
+      token: this._config.token,
+      region: _fcrCore.FcrRegion.CN,
+      dualCameraVideoStreamConfig: dualCameraVideoStreamConfig,
+      dualScreenVideoStreamConfig: dualScreenVideoStreamConfig
+    };
+    this.logger.info("create core engine with config: ".concat((0, _imports.jsonstring)(config)));
+    var engine = new _imports.FcrCoreEngine(config);
+
+    // @ts-ignore
+    window.__core_engine = engine;
+    this._engine = engine;
+    this._initSettingStore();
   }
   return (0, _createClass2["default"])(FcrUISceneCreator, [{
+    key: "observableSettingStore",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
     key: "launch",
     value: function launch(config, onCancel, onSuccess, onFailure, dom) {
-      this.logger.info("[FcrUISceneCreator] scene config: ".concat(JSON.stringify(config)));
+      var _this = this;
+      this._precheckState();
+      if (this._scene) {
+        throw new Error('scene is launched, please exit it before launching a new one.');
+      }
       (0, _i18n.changeLanguage)(config.language);
-      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage, this._registeredWidgetConfigs);
+      var scene = new _uiScene.FcrUIDefaultScene(config, this._config, dom, this._settingConfigStorage, this._registeredWidgetConfigs, this._engine);
       scene.addObserver({
         onLaunchSuccess: onSuccess,
         onLaunchFailure: onFailure,
-        onLaunchCancel: onCancel
+        onLaunchCancel: onCancel,
+        onSettingStore: function onSettingStore(store) {
+          _this.observableSettingStore.value = store;
+          _this.closeSetting();
+        },
+        onExited: function onExited() {
+          _this.closeSetting();
+          _this._initSettingStore();
+        },
+        onOpenSettingDialog: function onOpenSettingDialog() {
+          _this.openSetting();
+        }
+      });
+      var resetScene = function resetScene() {
+        _this._scene = null;
+      };
+      scene.addObserver({
+        onLaunchFailure: resetScene,
+        onLaunchCancel: resetScene,
+        onExited: resetScene
       });
       scene.launch();
+      this._scene = scene;
       return scene;
     }
   }, {
     key: "getSettingConfig",
     value: function getSettingConfig() {
+      this._precheckState();
       return this._settingConfigStorage;
     }
   }, {
     key: "registerWidget",
     value: function registerWidget(config) {
+      this._precheckState();
       this._registeredWidgetConfigs.set(config.id, config);
     }
   }, {
     key: "unregisterWidget",
     value: function unregisterWidget(widgetId) {
+      this._precheckState();
       this._registeredWidgetConfigs["delete"](widgetId);
     }
+  }, {
+    key: "renewUserToken",
+    value: function renewUserToken(token) {
+      this._engine.renewUserToken(token);
+    }
+  }, {
+    key: "setParameters",
+    value: function setParameters(parameters) {
+      var _this$_engine;
+      this._precheckState();
+      (_this$_engine = this._engine) === null || _this$_engine === void 0 || _this$_engine.setParameters(parameters);
+    }
+  }, {
+    key: "_initSettingStore",
+    value: function () {
+      var _initSettingStore2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var openDefaultCamera, openDefaultMicrophone, eventProvider, deviceProvider, dialogProvider, messageProvider, sharedConfigDataSource, sharedSettingDataSource, monitorProvider;
+        return _regenerator["default"].wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this._eventProvider = new _eventProvider.FcrUIEventProviderImpl();
+              this._messageProvider = new _messageProvider.FcrUIMessageProviderImpl();
+              this._dialogProvider = new _dialogProvider.FcrUIDialogProviderImpl();
+              this._deviceProvider = new _deviceProvider.FcrUIDeviceProviderImpl(this._eventProvider, this._engine.getDesktopMediaControl(), this._settingConfigStorage.media, this._localStorageProvider);
+              this._sharedConfigDataSource = new _config2.FcrUISharedConfigDataSourceImpl({
+                creatorConfig: this._config,
+                settingConfig: this._settingConfigStorage,
+                localStorageProvider: this._localStorageProvider
+              });
+              this._sharedSettingDataSource = new _setting.FcrUISharedSettingDataSourceImpl(this._config, this._localStorageProvider);
+              openDefaultCamera = (0, _parameters.isOpenDefaultCamera)(this._config.parameters);
+              openDefaultMicrophone = (0, _parameters.isOpenDefaultMicrophone)(this._config.parameters);
+              if (openDefaultCamera) {
+                this._settingConfigStorage.media.cameraExpectedOff = false;
+              }
+              if (openDefaultMicrophone) {
+                this._settingConfigStorage.media.autoConnectAudio = true;
+                this._settingConfigStorage.media.microphoneExpectedOff = false;
+              }
+              eventProvider = this._eventProvider;
+              deviceProvider = this._deviceProvider;
+              dialogProvider = this._dialogProvider;
+              messageProvider = this._messageProvider;
+              sharedConfigDataSource = this._sharedConfigDataSource;
+              sharedSettingDataSource = this._sharedSettingDataSource;
+              monitorProvider = new _monitorProvider.FcrUIMonitorProviderImpl(this._engine.getMonitorControl());
+              deviceProvider.loadUiResources((0, _uiResources.getNormalDownloadResources)(this._config.resource));
+              _context.next = 20;
+              return deviceProvider.init();
+            case 20:
+              this.observableSettingStore.value = new _store["default"]({
+                uiEventStore: eventProvider,
+                monitorControl: monitorProvider,
+                deviceStore: deviceProvider,
+                config: sharedConfigDataSource === null || sharedConfigDataSource === void 0 ? void 0 : sharedConfigDataSource.sceneConfig,
+                parameters: sharedConfigDataSource === null || sharedConfigDataSource === void 0 ? void 0 : sharedConfigDataSource.creatorConfig.parameters,
+                messageProvider: messageProvider,
+                sharedSettingDataSource: sharedSettingDataSource,
+                dialogProvider: dialogProvider,
+                settingConfig: sharedConfigDataSource.settingConfig,
+                localStorageProvider: this._localStorageProvider,
+                userId: this._config.userId
+              });
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function _initSettingStore() {
+        return _initSettingStore2.apply(this, arguments);
+      }
+      return _initSettingStore;
+    }()
+  }, {
+    key: "openSetting",
+    value: function openSetting() {
+      var _this2 = this;
+      this._precheckState();
+      this.closeSetting();
+      setTimeout(function () {
+        var settingContainer = document.createElement('div');
+        settingContainer.setAttribute('id', 'setting-container');
+        var body = document.querySelector('body');
+        body === null || body === void 0 || body.appendChild(settingContainer);
+        //  this._renderSettingsViewe()
+        var dom = document.querySelector('#setting-container');
+        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(_view.SettingsView, {
+          onClose: _this2.closeSetting,
+          store: _this2.observableSettingStore
+        }), dom);
+      }, 400);
+    }
+  }, {
+    key: "closeSetting",
+    value: function closeSetting() {
+      this._precheckState();
+      var settingContainer = document.querySelector('#setting-container');
+      if (settingContainer) {
+        _reactDom["default"].unmountComponentAtNode(settingContainer);
+        document.body.removeChild(settingContainer);
+      }
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      var _this$_engine2;
+      (_this$_engine2 = this._engine) === null || _this$_engine2 === void 0 || _this$_engine2.release();
+      this._released = true;
+    }
+  }, {
+    key: "_precheckState",
+    value: function _precheckState() {
+      if (this._released) {
+        throw new Error('FcrUISceneCreator has been released.');
+      }
+    }
   }]);
 }();
 _FcrUISceneCreator = FcrUISceneCreator;
-var _applyDecs$e = _applyDecs(_FcrUISceneCreator, [[_launchDecs, 2, "launch"], [_decorator.trace, 2, "getSettingConfig"], [_decorator.trace, 2, "registerWidget"], [_decorator.trace, 2, "unregisterWidget"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
+var _applyDecs$e = _applyDecs(_FcrUISceneCreator, [[_mobx.observable, 1, "observableSettingStore"], [_launchDecs, 2, "launch"], [_decorator.trace, 2, "getSettingConfig"], [_decorator.trace, 2, "registerWidget"], [_decorator.trace, 2, "unregisterWidget"], [_decorator.trace, 2, "renewUserToken"], [_decorator.trace, 2, "setParameters"], [[_decorator.trace, _decorator.bound], 2, "openSetting"], [[_decorator.trace, _decorator.bound], 2, "closeSetting"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 2);
+_init_observableSettingStore = _applyDecs$e2[0];
+_initProto = _applyDecs$e2[1];
 _applyDecs$e;

package/lib/electron/app.js

@@ -36,12 +36,6 @@ var hookApp = exports.hookApp = function hookApp(app) {
     return window.isDestroyed();
   };
   app.commandLine.appendSwitch('ignore-certificate-errors');
-  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 () {
@@ -121,21 +115,6 @@ var hookApp = exports.hookApp = function hookApp(app) {
         logger.error('Invalid JSON argument:', jsonStr);
       }
     });
-    _electron.ipcMain.handle('launch', function (_e, launchOptions) {
-      if (process.platform === 'darwin') {
-        var ext = require(_path["default"].join(process.resourcesPath, 'Frameworks', 'FcrUISceneLauncher.node'));
-        var res = ext.launch(launchOptions);
-        if (res !== 0) {
-          logger.error('Failed to launch FcrUISceneLauncher');
-        }
-      } else {
-        var _ext = require(_path["default"].join(process.resourcesPath, 'Libs', 'FcrUISceneLauncher.node'));
-        var _res = _ext.launch(launchOptions);
-        if (_res !== 0) {
-          logger.error('Failed to launch FcrUISceneLauncher');
-        }
-      }
-    });
     _electron.ipcMain.handle('getBundleType', function () {
       if (process.env.DEV === 'true') {
         return 'JS_BUNDLE';

package/lib/electron/bootstrap-sdk.js

@@ -8,18 +8,26 @@ 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/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/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.join.js");
 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/es.object.to-string.js");
+require("core-js/modules/es.parse-int.js");
+require("core-js/modules/es.string.starts-with.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");
+require("core-js/modules/esnext.json.parse.js");
+require("core-js/modules/web.timers.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _electron = require("electron");
 var _main = require("@electron/remote/main");
@@ -27,32 +35,162 @@ var _2 = require(".");
 var _defaultOptions = require("./default-options");
 var _env = require("./env");
 var _path = _interopRequireDefault(require("path"));
+var _os = _interopRequireDefault(require("os"));
 var _logger = require("./logger");
 var _devtoolShortcut = require("./plugins/devtool-shortcut");
+var _ipc = require("./ipc/ipc");
+var _type = require("./ipc/type");
+var _meetingState = require("./plugins/meeting-state");
+var _process$argv$find;
 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; }
+var mainWindow;
+var mainWindowReady = false;
 (0, _main.initialize)();
+var port = (_process$argv$find = process.argv.find(function (arg) {
+  return arg.startsWith('--port=');
+})) === null || _process$argv$find === void 0 ? void 0 : _process$argv$find.split('=')[1];
+var ipcClient = new _ipc.IPCClient({
+  port: port ? parseInt(port, 10) : 50000
+});
+ipcClient.addObserver({
+  onConnected: function onConnected() {
+    (0, _logger.getLogger)().info('IPC client connected to server');
+    if (mainWindowReady) {
+      ipcClient.sendMessage({
+        cmd: _type.IPCMessageCMD.ElectronMainWindowLoaded,
+        data: {}
+      });
+    }
+  },
+  onMessageReceived: function onMessageReceived(message) {
+    switch (message.cmd) {
+      case _type.IPCMessageCMD.LaunchMeeting:
+        (0, _logger.getLogger)().info("LaunchMeeting: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.LaunchMeeting, message.data);
+          mainWindow.show();
+          mainWindow.focus();
+          var platform = _os["default"].platform();
+          if (platform === 'win32') {
+            mainWindow.setAlwaysOnTop(true);
+            setTimeout(function () {
+              mainWindow.setAlwaysOnTop(false);
+            }, 100);
+          }
+        }
+        break;
+      case _type.IPCMessageCMD.InitCreator:
+        (0, _logger.getLogger)().info("InitCreator: ".concat(JSON.stringify(message.data)));
+        try {
+          var data = message.data;
+          if (typeof message.data == 'string') {
+            data = JSON.parse(message.data);
+          }
+          if (data['appUserModelId']) {
+            _electron.app.setAppUserModelId(data['appUserModelId']);
+          }
+        } catch (e) {
+          (0, _logger.getLogger)().error("InitCreator: ".concat(e));
+        }
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.InitCreator, message.data);
+        }
+        break;
+      case _type.IPCMessageCMD.OpenSetting:
+        (0, _logger.getLogger)().info("OpenSetting: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.OpenSetting, message.data);
+        }
+        break;
+      case _type.IPCMessageCMD.CloseSetting:
+        (0, _logger.getLogger)().info("CloseSetting: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.CloseSetting, message.data);
+        }
+        break;
+      case _type.IPCMessageCMD.SetParameters:
+        (0, _logger.getLogger)().info("SetParameters: ".concat(JSON.stringify(message.data)));
+        if (mainWindow) {
+          mainWindow.webContents.send(_type.IPCMessageCMD.SetParameters, message.data);
+        }
+        break;
+      default:
+        (0, _logger.getLogger)().info("Unknown command: ".concat(message.cmd));
+        break;
+    }
+  },
+  onError: function onError(error) {
+    (0, _logger.getLogger)().error("Error: ".concat(error));
+  }
+});
 _electron.crashReporter.start({
   uploadToServer: false
 });
 (0, _2.hookApp)(_electron.app);
 _electron.app.addListener('ready', function () {
-  var mainWindow = new _electron.BrowserWindow(_objectSpread(_objectSpread({}, _defaultOptions.defaultWindowOptions), {}, {
+  mainWindow = new _electron.BrowserWindow(_objectSpread(_objectSpread({}, _defaultOptions.defaultWindowOptions), {}, {
     webPreferences: _objectSpread({}, _defaultOptions.defaultWebPreferences),
     show: false
   }));
   _electron.Menu.setApplicationMenu(null);
+  _electron.ipcMain.addListener('launch-success', function (_, roomId) {
+    (0, _logger.getLogger)().info("launch-success in bootstrap-sdk: ".concat(roomId));
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.LaunchSuccess,
+      data: {
+        roomId: roomId
+      }
+    });
+  });
+  _electron.ipcMain.addListener('launch-failure', function (_, roomId, errorCode) {
+    (0, _logger.getLogger)().info("launch-failure in bootstrap-sdk: ".concat(roomId, ", ").concat(errorCode));
+    if (!roomId || typeof roomId !== 'string') {
+      (0, _logger.getLogger)().error("Invalid roomId: ".concat(roomId));
+      return;
+    }
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.LaunchFailure,
+      data: {
+        roomId: roomId,
+        errorCode: errorCode
+      }
+    });
+  });
+  _electron.ipcMain.addListener('exited-meeting', function (_, roomId, reason) {
+    (0, _logger.getLogger)().info("exited-meeting in bootstrap-sdk: ".concat(roomId, ", ").concat(reason));
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.ExitedMeeting,
+      data: {
+        roomId: roomId,
+        reason: reason
+      }
+    });
+  });
   (0, _2.hookWindow)(mainWindow);
+  mainWindow.webContents.addListener('did-finish-load', function () {
+    mainWindowReady = true;
+    ipcClient.sendMessage({
+      cmd: _type.IPCMessageCMD.ElectronMainWindowLoaded,
+      data: {}
+    });
+  });
   mainWindow.addListener('closed', function () {
     _electron.app.exit(0);
   });
+  mainWindow.addListener('close', function (e) {
+    var closeListenerCount = mainWindow.listenerCount('close');
+    (0, _logger.getLogger)().info("mainWindow close listener count: ".concat(closeListenerCount, ", isInMeeting: ").concat(_meetingState.isInMeeting));
+    if (_meetingState.isInMeeting === 0) {
+      e.preventDefault();
+      mainWindow.hide();
+      mainWindow.webContents.send('close-window-before-launch-success');
+    }
+  });
   mainWindow.webContents.addListener('render-process-gone', function (e, details) {
     (0, _logger.getLogger)().info("app exit due to render-process-gone event: ".concat(JSON.stringify(details)));
     _electron.app.exit(0);
   });
-  mainWindow.addListener('ready-to-show', function () {
-    mainWindow.show();
-  });
   if (_env.isDev) {
     mainWindow.webContents.openDevTools({
       mode: 'detach'

package/lib/electron/injections.d.ts

@@ -1,6 +1,12 @@
 import { IpcRendererEvent } from 'electron';
 import { BrowserWindowConstructorOptions } from 'electron/renderer';
 import os from 'os';
+export declare enum FcrNumericExitReason {
+    LEAVE_ROOM = 1,// 自己离开而退出
+    CLOSE_ROOM = 2,// 房间关闭而退出
+    KICKED_OUT = 3,// 被踢出房间而退出
+    ABORTED = 4
+}
 export declare const getBundleType: () => Promise<"JS_BUNDLE" | "NATIVE_BUNDLE">;
 export declare const openDirectory: () => Promise<string | undefined>;
 export declare const showItemInFolder: (path: string) => void;
@@ -29,15 +35,14 @@ export declare const quitApp: () => void;
 export declare const getSystemMemorySize: () => number;
 export declare const getSystemCpuInfo: () => os.CpuInfo[];
 export declare const getNetworkType: () => Promise<NetworkType>;
-export declare const getAssetUrl: (path: string) => string;
-export declare const getRendererProcessUsage: () => Promise<{
-    memoryUsage: number;
-    cpuUsage: number;
-    totalMemoryUsage: number;
-    totalCpuUsage: number;
-}>;
 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 fileToBlob: (file: string, type: "image" | "video" | "audio") => Blob;
+export declare const loadBuiltinResources: () => Promise<{
+    virtualBackgroundImages: string[];
+    virtualBackgroundVideos: string[];
+    soundEffects: string[];
+}>;
 export declare const releaseSubAllWindowRefs: () => void;
 export declare const getMediaSourceIdList: () => {
     title: string;
@@ -47,3 +52,10 @@ export declare const setInMeetingState: (state: 0 | 1) => void;
 export declare const restartApp: () => void;
 export declare const getUserSettingData: () => any;
 export declare const setUserSettingData: (data: object) => void;
+export declare const initSDK: (options: any) => void;
+export declare const openSetting: () => void;
+export declare const getIsSDKReady: () => Promise<any>;
+export declare const launchSuccess: (roomId: string) => void;
+export declare const launchFailure: (roomId: string, errorCode: number) => void;
+export declare const setParameters: (parameters: string) => void;
+export declare const exitedMeeting: (roomId: string, reason: string) => void;