fcr-ui-scene 3.7.2 → 3.7.4

package/lib/shared-data-source/whiteboard-data.js

@@ -0,0 +1,348 @@
+"use strict";
+
+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.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.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/esnext.function.metadata.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");
+require("core-js/modules/esnext.map.filter.js");
+require("core-js/modules/esnext.map.find.js");
+require("core-js/modules/esnext.map.find-key.js");
+require("core-js/modules/esnext.map.includes.js");
+require("core-js/modules/esnext.map.key-of.js");
+require("core-js/modules/esnext.map.map-keys.js");
+require("core-js/modules/esnext.map.map-values.js");
+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.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FcrUISharedWhiteboardDataSourceImpl = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.find.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.push.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.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.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.for-each.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 _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _type = require("fcr-core/lib/type");
+var _base = require("../base");
+var _mobx = require("mobx");
+var _type2 = require("../modules/secondary-window/type");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
+var _toolbar = require("../modules/components/toolbar");
+var _libs = _interopRequireDefault(require("../modules/whiteboard/components/switch-theme/libs"));
+var _decorator = require("agora-foundation/lib/decorator");
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _utils = require("../modules/whiteboard/utils");
+var _logger = require("../utilities/logger");
+var _FcrUISharedWhiteboardDataSourceImpl;
+var _initProto, _init_currentTheme, _init_sharingUserInfo, _init_backgroundColor, _init_hasWriteBoardPermission, _init_connectionState, _init_joinSuccess, _init_toolbarState, _setControlEnableDecs, _setSharingUserDecs, _setBackgroundColorDecs, _setWhiteboardToolDecs, _setThemeDecs, _setShowLoadingDecs, _setCommonColorsDecs, _setProgressDecs, _setJoinSuccessDecs, _handleConnectionStateUpdatedDecs, _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; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+var _D = /*#__PURE__*/new WeakMap();
+var _E = /*#__PURE__*/new WeakMap();
+var _F = /*#__PURE__*/new WeakMap();
+var _G = /*#__PURE__*/new WeakMap();
+_ref = (_setControlEnableDecs = [_mobx.action, _mobx.action.bound], _setSharingUserDecs = [_mobx.action, _mobx.action.bound], _setBackgroundColorDecs = [_mobx.action, _mobx.action.bound], _setWhiteboardToolDecs = [_mobx.action, _mobx.action.bound], _setThemeDecs = [_mobx.action, _mobx.action.bound], _setShowLoadingDecs = [_mobx.action, _mobx.action.bound], _setCommonColorsDecs = [_mobx.action, _mobx.action.bound], _setProgressDecs = [_mobx.action, _mobx.action.bound], _setJoinSuccessDecs = [_mobx.action, _mobx.action.bound], _handleConnectionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
+var FcrUISharedWhiteboardDataSourceImpl = exports.FcrUISharedWhiteboardDataSourceImpl = /*#__PURE__*/function () {
+  function FcrUISharedWhiteboardDataSourceImpl(_whiteboardControl, _privilegeProvider, _fcrUIMainWindowRenderer) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUISharedWhiteboardDataSourceImpl);
+    (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'shared-whiteboard-data-source'
+    })));
+    (0, _defineProperty2["default"])(this, "_showLoading", true);
+    (0, _defineProperty2["default"])(this, "_disposers", []);
+    (0, _defineProperty2["default"])(this, "_toolbarStateObserver", {
+      onUndoStepsUpdated: function onUndoStepsUpdated(steps) {
+        _this.toolbarState.undoSteps = steps;
+      },
+      onRedoStepsUpdated: function onRedoStepsUpdated(steps) {
+        _this.toolbarState.redoSteps = steps;
+      },
+      onConnectionStateUpdated: this._handleConnectionStateUpdated,
+      onDraftSaved: function onDraftSaved(image) {
+        var fileName = "".concat((0, _dayjs["default"])().format('YYYYMMDD_HHmmSSS'), ".jpg");
+        (0, _utils.downloadImageData)(image, fileName);
+      }
+    });
+    _classPrivateFieldInitSpec(this, _A, _init_currentTheme(this, (0, _libs["default"])()[0]));
+    _classPrivateFieldInitSpec(this, _B, _init_sharingUserInfo(this, undefined));
+    _classPrivateFieldInitSpec(this, _C, _init_backgroundColor(this, '#ffffff'));
+    _classPrivateFieldInitSpec(this, _D, _init_hasWriteBoardPermission(this, false));
+    _classPrivateFieldInitSpec(this, _E, _init_connectionState(this, _type.FcrConnectionState.DISCONNECTED));
+    _classPrivateFieldInitSpec(this, _F, _init_joinSuccess(this, false));
+    _classPrivateFieldInitSpec(this, _G, _init_toolbarState(this, {
+      controlEnable: false,
+      currentTool: _enums.FcrBoardToolType.LASER_POINTER,
+      currentStrokeWidth: 2,
+      currentColor: _toolbar.colors[7],
+      currentShape: _enums.FcrBoardShape.Rectangle,
+      redoSteps: false,
+      undoSteps: false,
+      themeColors: this.currentTheme.colors,
+      commonColors: [this.currentTheme.colors[2], this.currentTheme.colors[5]],
+      progress: 0
+    }));
+    this._whiteboardControl = _whiteboardControl;
+    this._privilegeProvider = _privilegeProvider;
+    this._fcrUIMainWindowRenderer = _fcrUIMainWindowRenderer;
+    this._disposers.push((0, _mobx.reaction)(function () {
+      return _this.canWriteBoard;
+    }, function (canWrite) {
+      var _this$_fcrUIMainWindo;
+      (_this$_fcrUIMainWindo = _this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo === void 0 || _this$_fcrUIMainWindo.notifyObservers('onPermissionUpdated', canWrite);
+    }));
+  }
+  return (0, _createClass2["default"])(FcrUISharedWhiteboardDataSourceImpl, [{
+    key: "currentTheme",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "sharingUserInfo",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "backgroundColor",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "hasWriteBoardPermission",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "connectionState",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
+  }, {
+    key: "joinSuccess",
+    get: function get() {
+      return _classPrivateFieldGet(_F, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_F, this, v);
+    }
+  }, {
+    key: "toolbarState",
+    get: function get() {
+      return _classPrivateFieldGet(_G, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_G, this, v);
+    }
+  }, {
+    key: "toolbarStateObserver",
+    get: function get() {
+      return this._toolbarStateObserver;
+    }
+  }, {
+    key: "showLoading",
+    get: function get() {
+      return [_type.FcrConnectionState.CONNECTING, _type.FcrConnectionState.RECONNECTING].includes(this.connectionState) && this._showLoading;
+    }
+  }, {
+    key: "canWriteBoard",
+    get: function get() {
+      var canWrite = this._privilegeProvider.hasWriteBoardPermission();
+      return canWrite;
+    }
+  }, {
+    key: "setControlEnable",
+    value: function setControlEnable(enable) {
+      this.toolbarState.controlEnable = enable;
+    }
+  }, {
+    key: "setSharingUser",
+    value: function setSharingUser(userInfo) {
+      this.sharingUserInfo = userInfo;
+    }
+  }, {
+    key: "setBackgroundColor",
+    value: function setBackgroundColor(color) {
+      var _this$_fcrUIMainWindo2;
+      this.logger.info("[shared-whiteboard-data-source]: setBackgroundColor ".concat(color));
+      this.backgroundColor = color;
+      (_this$_fcrUIMainWindo2 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo2 === void 0 || _this$_fcrUIMainWindo2.notifyObservers('onBackgroundColorUpdated', color);
+    }
+  }, {
+    key: "setWhiteboardTool",
+    value: function setWhiteboardTool(tool) {
+      var _this$_fcrUIMainWindo3;
+      this.logger.info("[shared-whiteboard-data-source]: setWhiteboardTool ".concat(tool));
+      (_this$_fcrUIMainWindo3 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo3 === void 0 || _this$_fcrUIMainWindo3.notifyObservers('onWhiteboardToolSelected', tool);
+      switch (tool.action) {
+        case _type2.WhiteboardToolAction.TOOL:
+          this.toolbarState.currentTool = tool.tool;
+          break;
+        case _type2.WhiteboardToolAction.WIDTH:
+          this.toolbarState.currentStrokeWidth = tool.tool;
+          break;
+        case _type2.WhiteboardToolAction.COLOR:
+          this.toolbarState.currentColor = tool.tool;
+          break;
+        case _type2.WhiteboardToolAction.SHAPE:
+          this.toolbarState.currentShape = tool.tool;
+          break;
+      }
+    }
+  }, {
+    key: "setTheme",
+    value: function setTheme(theme) {
+      var _this$_fcrUIMainWindo4;
+      (_this$_fcrUIMainWindo4 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo4 === void 0 || _this$_fcrUIMainWindo4.notifyObservers('onBackgroundColorUpdated', theme.background);
+      this.toolbarState.themeColors = theme.colors;
+      this.currentTheme = (0, _libs["default"])().find(function (t) {
+        return t.theme === theme.theme;
+      });
+      this._whiteboardControl.setBackgroundColor(theme.background);
+    }
+  }, {
+    key: "setShowLoading",
+    value: function setShowLoading(show) {
+      this._showLoading = show;
+    }
+  }, {
+    key: "setCommonColors",
+    value: function setCommonColors(colors) {
+      this.toolbarState.commonColors = colors;
+    }
+  }, {
+    key: "saveDraft",
+    value: function saveDraft() {
+      var _this$_fcrUIMainWindo5;
+      (_this$_fcrUIMainWindo5 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo5 === void 0 || _this$_fcrUIMainWindo5.notifyObservers('onSaveDraft');
+    }
+  }, {
+    key: "setProgress",
+    value: function setProgress(progress) {
+      this.toolbarState.progress = progress;
+    }
+  }, {
+    key: "setJoinSuccess",
+    value: function setJoinSuccess(success) {
+      this.joinSuccess = success;
+    }
+  }, {
+    key: "inActive",
+    value: function inActive() {
+      var _this$_fcrUIMainWindo6;
+      (_this$_fcrUIMainWindo6 = this._fcrUIMainWindowRenderer) === null || _this$_fcrUIMainWindo6 === void 0 || _this$_fcrUIMainWindo6.notifyObservers('onWhiteboardInActive');
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._fcrUIMainWindowRenderer.removeObserver(this._toolbarStateObserver);
+      this._disposers.forEach(function (disposer) {
+        return disposer();
+      });
+      this.setJoinSuccess(false);
+      this.setShowLoading(true);
+    }
+  }, {
+    key: "_resetWhiteboardTool",
+    value: function _resetWhiteboardTool() {
+      this.setWhiteboardTool({
+        action: _type2.WhiteboardToolAction.TOOL,
+        tool: _enums.FcrBoardToolType.LASER_POINTER
+      });
+      this.setWhiteboardTool({
+        action: _type2.WhiteboardToolAction.WIDTH,
+        tool: 2
+      });
+      this.setWhiteboardTool({
+        action: _type2.WhiteboardToolAction.COLOR,
+        tool: this.currentTheme.colors[2]
+      });
+    }
+  }, {
+    key: "_handleConnectionStateUpdated",
+    value: function _handleConnectionStateUpdated(state) {
+      this.connectionState = state;
+      if (state === _type.FcrConnectionState.CONNECTED) {
+        this._showLoading = false;
+        this.joinSuccess = true;
+        setTimeout(this._resetWhiteboardTool);
+      }
+      if (state === _type.FcrConnectionState.CONNECTING || state === _type.FcrConnectionState.DISCONNECTED) {
+        this._showLoading = true;
+        this.joinSuccess = false;
+      }
+      this.logger.info("[shared-whiteboard-data-source]: onConnectionStateUpdated: ".concat(_type.FcrConnectionState[state], ", joinSuccess: ").concat(this.joinSuccess, ", showLoading: ").concat(this._showLoading));
+    }
+  }]);
+}();
+_FcrUISharedWhiteboardDataSourceImpl = FcrUISharedWhiteboardDataSourceImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharedWhiteboardDataSourceImpl, [[_mobx.observable, 1, "currentTheme"], [_mobx.observable, 1, "sharingUserInfo"], [_mobx.observable, 1, "backgroundColor"], [_mobx.observable, 1, "hasWriteBoardPermission"], [_mobx.observable, 1, "connectionState"], [_mobx.observable, 1, "joinSuccess"], [_mobx.observable, 1, "toolbarState"], [_mobx.computed, 3, "canWriteBoard"], [_setControlEnableDecs, 18, "setControlEnable"], [_setSharingUserDecs, 18, "setSharingUser"], [_setBackgroundColorDecs, 18, "setBackgroundColor"], [_setWhiteboardToolDecs, 18, "setWhiteboardTool"], [_setThemeDecs, 18, "setTheme"], [_setShowLoadingDecs, 18, "setShowLoading"], [_setCommonColorsDecs, 18, "setCommonColors"], [_decorator.bound, 2, "saveDraft"], [_setProgressDecs, 18, "setProgress"], [_setJoinSuccessDecs, 18, "setJoinSuccess"], [_decorator.bound, 2, "inActive"], [_decorator.bound, 2, "_resetWhiteboardTool"], [_handleConnectionStateUpdatedDecs, 18, "_handleConnectionStateUpdated"]], []).e, 8);
+_init_currentTheme = _applyDecs$e[0];
+_init_sharingUserInfo = _applyDecs$e[1];
+_init_backgroundColor = _applyDecs$e[2];
+_init_hasWriteBoardPermission = _applyDecs$e[3];
+_init_connectionState = _applyDecs$e[4];
+_init_joinSuccess = _applyDecs$e[5];
+_init_toolbarState = _applyDecs$e[6];
+_initProto = _applyDecs$e[7];
+(0, _base.registerDependency)('sharedWhiteboardDataSource');

package/lib/translations/enUS.d.ts

@@ -1999,4 +1999,5 @@ export declare const enUs: {
     fmt_jbh_title_meeting_topic: string;
     fmt_apps_button_automatic_screenshot: string;
     fmt_webinar_tips_welcome_greetings: string;
+    fmt_screenshare_toolbar_label_reconnecting: string;
 };

package/lib/translations/enUS.js

@@ -2044,5 +2044,6 @@ var enUs = exports.enUs = {
   //****************** APPS ******************
   fmt_apps_button_automatic_screenshot: 'Automatic screenshot',
   //****************** Webinar ******************
-  fmt_webinar_tips_welcome_greetings: '{英文欢迎语} '
+  fmt_webinar_tips_welcome_greetings: '{英文欢迎语} ',
+  fmt_screenshare_toolbar_label_reconnecting: 'Network disconnected, reconnecting...'
 };

package/lib/translations/zhCN.d.ts

@@ -1997,4 +1997,5 @@ export declare const zhCn: {
     fmt_jbh_title_meeting_topic: string;
     fmt_apps_button_automatic_screenshot: string;
     fmt_webinar_tips_welcome_greetings: string;
+    fmt_screenshare_toolbar_label_reconnecting: string;
 };

package/lib/translations/zhCN.js

@@ -2042,5 +2042,6 @@ var zhCn = exports.zhCn = {
   //****************** APPS ******************
   fmt_apps_button_automatic_screenshot: '自动截屏',
   //****************** Webinar ******************
-  fmt_webinar_tips_welcome_greetings: '{中文欢迎语} '
+  fmt_webinar_tips_welcome_greetings: '{中文欢迎语} ',
+  fmt_screenshare_toolbar_label_reconnecting: '网络已断开，正在重连...'
 };

package/lib/ui-scene.d.ts

@@ -18,6 +18,7 @@ export declare class FcrUIDefaultScene {
     private _registeredWidgetConfigs;
     private _engine;
     private _joinSuccess;
+    private _joinAbortController;
     constructor({ config, creatorConfig, dom, registeredWidgetConfigs, engine, eventProvider, monitorProvider, deviceProvider, messageProvider, dialogProvider, localStorageProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, }: {
         config: FcrUISceneConfig;
         creatorConfig: FcrUISceneCreatorConfig;

package/lib/ui-scene.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.iterator.js");
 require("core-js/modules/es.array.push.js");
@@ -40,6 +38,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIDefaultScene = 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.date.to-string.js");
 require("core-js/modules/es.number.constructor.js");
 require("core-js/modules/es.object.to-string.js");
@@ -110,7 +110,14 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     // @internal
     (0, _defineProperty2["default"])(this, "_isLaunched", false);
+    // @internal
+    (0, _defineProperty2["default"])(this, "_dialogObserver", {
+      onOpenSettingDialog: function onOpenSettingDialog() {
+        _this._observable.notifyObservers('onOpenSettingDialog');
+      }
+    });
     (0, _defineProperty2["default"])(this, "_joinSuccess", false);
+    (0, _defineProperty2["default"])(this, "_joinAbortController", null);
     (0, _defineProperty2["default"])(this, "_handleBeforeUnload", function () {
       (0, _renderer.setInMeetingState)(0);
       (0, _renderer.releaseSubAllWindowRefs)();
@@ -148,6 +155,10 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
   return (0, _createClass2["default"])(FcrUIDefaultScene, [{
     key: "exit",
     value: function exit() {
+      if (this._joinAbortController) {
+        this._joinAbortController.abort();
+        this._joinAbortController = null;
+      }
       this._observable.notifyObservers('onExited', this._config.roomId, _type.FcrUIExitReason.LEAVE_ROOM);
       this._release();
     }
@@ -212,9 +223,6 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
 
       // const skipPretest = isSkipPretest(config.parameters);
       var skipPretest = true;
-      var renderSceneUI = function renderSceneUI(response) {
-        _this2._renderSceneUI(response, uiManager, eventProvider, deviceProvider, roomProvider, sharedConfigDataSource, sharedSettingDataSource, sharedLayoutDataSource, sharedSpeakerSpotlightDataSource, sharedPinDataSource, messageProvider, dialogProvider, sharedVideoWindowDataSource, sharedDevicePrivilegeDataSource, widgetProvider, sharedScreenShareDataSource, sharedConfirmDataSource, monitorProvider);
-      };
       if (!skipPretest) {
         var joining = false;
         uiManager.renderDevicePretestUi(deviceProvider,
@@ -358,33 +366,81 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
       // joinRoomCallback: () => void,
       ) {
         var _this4 = this;
-        var p;
+        var abortController, p;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              p = engine.login().then(function () {
-                return roomControl.handleJoinRoom();
-              }).then(/*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(response) {
+              abortController = new AbortController();
+              this._joinAbortController = abortController;
+              p = new Promise(/*#__PURE__*/function () {
+                var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(resolve, reject) {
+                  var onAbort, response, _t;
                   return _regenerator["default"].wrap(function (_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
-                        // joinRoomCallback();
+                        onAbort = function onAbort() {
+                          return reject(new Error('join aborted'));
+                        };
+                        abortController.signal.addEventListener('abort', onAbort, {
+                          once: true
+                        });
+                        _context.prev = 1;
+                        _context.next = 2;
+                        return engine.login();
+                      case 2:
+                        if (!abortController.signal.aborted) {
+                          _context.next = 3;
+                          break;
+                        }
+                        throw new Error('join aborted');
+                      case 3:
+                        _context.next = 4;
+                        return roomControl.handleJoinRoom();
+                      case 4:
+                        response = _context.sent;
+                        if (!abortController.signal.aborted) {
+                          _context.next = 5;
+                          break;
+                        }
+                        throw new Error('join aborted');
+                      case 5:
+                        if (_this4._isLaunched) {
+                          _context.next = 6;
+                          break;
+                        }
+                        return _context.abrupt("return", reject());
+                      case 6:
                         _this4._joinSuccess = true;
-                        return _context.abrupt("return", response);
-                      case 1:
+                        // joinRoomCallback();
+                        return _context.abrupt("return", resolve());
+                      case 7:
+                        _context.prev = 7;
+                        _t = _context["catch"](1);
+                        return _context.abrupt("return", reject(_t));
+                      case 8:
+                        _context.prev = 8;
+                        abortController.signal.removeEventListener('abort', onAbort);
+                        _this4._joinAbortController = null;
+                        return _context.finish(8);
+                      case 9:
                       case "end":
                         return _context.stop();
                     }
-                  }, _callee);
+                  }, _callee, null, [[1, 7, 8, 9]]);
                 }));
-                return function (_x3) {
+                return function (_x3, _x4) {
                   return _ref2.apply(this, arguments);
                 };
               }());
               p.then(function () {
+                if (!_this4._isLaunched) return;
                 _this4._observable.notifyObservers('onLaunchSuccess', _this4._config.roomId);
               })["catch"](function (e) {
+                if (!_this4._isLaunched) return;
+                if ((e === null || e === void 0 ? void 0 : e.message) === 'join aborted') {
+                  _this4.logger.info('join aborted');
+                  return;
+                }
                 _this4._observable.notifyObservers('onLaunchFailure', _this4._config.roomId, e);
               });
               return _context2.abrupt("return", p);
@@ -392,7 +448,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
       function _joinRoom(_x, _x2) {
         return _joinRoom2.apply(this, arguments);
@@ -447,7 +503,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function _renderSceneUI(_x4, _x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19) {
+      function _renderSceneUI(_x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11, _x12, _x13, _x14, _x15, _x16, _x17, _x18, _x19, _x20) {
         return _renderSceneUI2.apply(this, arguments);
       }
       return _renderSceneUI;
@@ -525,8 +581,6 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
   }, {
     key: "_initSettingStore",
     value: function _initSettingStore(_ref3) {
-      var _this$_dialogProvider,
-        _this5 = this;
       var roomProvider = _ref3.roomProvider,
         eventProvider = _ref3.eventProvider,
         deviceProvider = _ref3.deviceProvider,
@@ -537,6 +591,7 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         dialogProvider = _ref3.dialogProvider,
         monitorProvider = _ref3.monitorProvider,
         sharedInterpreterDataSource = _ref3.sharedInterpreterDataSource;
+      this.logger.debug('init SettingStore');
       var settingStore = new _store["default"]({
         eventProvider: eventProvider,
         monitorProvider: monitorProvider,
@@ -549,11 +604,9 @@ var FcrUIDefaultScene = exports.FcrUIDefaultScene = /*#__PURE__*/function () {
         dialogProvider: dialogProvider,
         sharedInterpreterDataSource: sharedInterpreterDataSource
       });
-      (_this$_dialogProvider = this._dialogProvider) === null || _this$_dialogProvider === void 0 || _this$_dialogProvider.addObserver({
-        onOpenSettingDialog: function onOpenSettingDialog() {
-          _this5._observable.notifyObservers('onOpenSettingDialog');
-        }
-      });
+      settingStore.startMeeting();
+      this._dialogProvider.removeObserver(this._dialogObserver);
+      this._dialogProvider.addObserver(this._dialogObserver);
       this._observable.notifyObservers('onSettingStore', settingStore);
     }
   }, {

package/lib/utilities/constant.d.ts

@@ -129,7 +129,8 @@ export declare enum FcrUIAction {
     CLOSE_VIDEO_WINDOW = 60,
     OPEN_CONFIRM = 61,
     OPEN_TOP_VIDEO_WINDOW = 62,
-    RESET_WHITEBOARD_TOOLBAR_VARS = 63
+    CLOSE_TOP_VIDEO_WINDOW = 63,
+    RESET_WHITEBOARD_TOOLBAR_VARS = 64
 }
 export declare enum FcrUIDialogKey {
     DEVICE_SETTINGS = "device-settings",
@@ -156,7 +157,8 @@ export declare enum FcrUIDialogKey {
     ANNOTATION_TOOL = "annotation-tool",
     ANNOTATION = "annotation",
     LEAVE_MEETING = "leave-meeting",
-    END_MEETING = "end-meeting"
+    END_MEETING = "end-meeting",
+    SUB_WINDOW = "sub-window"
 }
 export declare enum FcrUIHighlightElement {
     VIDEO_BASIC = "fcr_VIDEO_BASIC_highlighter",
@@ -172,3 +174,8 @@ export declare enum FcrUIHighlightElement {
     TRANSLATE_TARGET = "fcr_TRANSLATE_TARGET_highlighter",
     TRANSLATE_INTERPRETER = "fcr_TRANSLATE_INTERPRETER_highlighter"
 }
+export declare const ErrorCode: {
+    FAILED_TO_MOVE_USER_TO_WAITING_ROOM: number;
+    FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE: number;
+    FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED: number;
+};

package/lib/utilities/constant.js

@@ -4,7 +4,7 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.FcrUIVideoWindowPinType = exports.FcrUIRoomControlType = exports.FcrUIRendererEventAction = exports.FcrUIParticipantType = exports.FcrUIHighlightElement = exports.FcrUIDialogKey = exports.FcrUIAction = void 0;
+exports.FcrUIVideoWindowPinType = exports.FcrUIRoomControlType = exports.FcrUIRendererEventAction = exports.FcrUIParticipantType = exports.FcrUIHighlightElement = exports.FcrUIDialogKey = exports.FcrUIAction = exports.ErrorCode = void 0;
 var FcrUIRendererEventAction = exports.FcrUIRendererEventAction = /*#__PURE__*/function (FcrUIRendererEventAction) {
   /**
    * Indicates that the fragment has been loaded.
@@ -141,7 +141,8 @@ var FcrUIAction = exports.FcrUIAction = /*#__PURE__*/function (FcrUIAction) {
   FcrUIAction[FcrUIAction["CLOSE_VIDEO_WINDOW"] = 60] = "CLOSE_VIDEO_WINDOW";
   FcrUIAction[FcrUIAction["OPEN_CONFIRM"] = 61] = "OPEN_CONFIRM";
   FcrUIAction[FcrUIAction["OPEN_TOP_VIDEO_WINDOW"] = 62] = "OPEN_TOP_VIDEO_WINDOW";
-  FcrUIAction[FcrUIAction["RESET_WHITEBOARD_TOOLBAR_VARS"] = 63] = "RESET_WHITEBOARD_TOOLBAR_VARS";
+  FcrUIAction[FcrUIAction["CLOSE_TOP_VIDEO_WINDOW"] = 63] = "CLOSE_TOP_VIDEO_WINDOW";
+  FcrUIAction[FcrUIAction["RESET_WHITEBOARD_TOOLBAR_VARS"] = 64] = "RESET_WHITEBOARD_TOOLBAR_VARS";
   return FcrUIAction;
 }({});
 var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialogKey) {
@@ -170,6 +171,7 @@ var FcrUIDialogKey = exports.FcrUIDialogKey = /*#__PURE__*/function (FcrUIDialog
   FcrUIDialogKey["ANNOTATION"] = "annotation";
   FcrUIDialogKey["LEAVE_MEETING"] = "leave-meeting";
   FcrUIDialogKey["END_MEETING"] = "end-meeting";
+  FcrUIDialogKey["SUB_WINDOW"] = "sub-window";
   return FcrUIDialogKey;
 }({});
 var FcrUIHighlightElement = exports.FcrUIHighlightElement = /*#__PURE__*/function (FcrUIHighlightElement) {
@@ -186,4 +188,9 @@ var FcrUIHighlightElement = exports.FcrUIHighlightElement = /*#__PURE__*/functio
   FcrUIHighlightElement["TRANSLATE_TARGET"] = "fcr_TRANSLATE_TARGET_highlighter";
   FcrUIHighlightElement["TRANSLATE_INTERPRETER"] = "fcr_TRANSLATE_INTERPRETER_highlighter";
   return FcrUIHighlightElement;
-}({});
+}({});
+var ErrorCode = exports.ErrorCode = {
+  FAILED_TO_MOVE_USER_TO_WAITING_ROOM: 732403470,
+  FAILED_TO_UPDATE_USER_ROLE_DUE_TO_PRIVILEGE: 700000403,
+  FAILED_TO_UPDATE_USER_ROLE_DUE_TO_LIMIT_REACHED: 720403001
+};