fcr-ui-scene 3.7.5 → 3.7.7

package/lib/providers/sharing-provider.d.ts

@@ -0,0 +1,42 @@
+import { FcrScreenSharingState, FcrSharingControl, FcrWhiteboardState } from 'fcr-core/lib/room-control/sharing-control/type';
+import { FcrScreenStreamCreateConfig } from 'fcr-core/lib/room-control/stream-control/type';
+import { FcrUserControl } from 'fcr-core/lib/type';
+import { FcrUIScreenShareSharedDataSource } from '../shared-data-source/screen-share-data';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
+import { FcrUIWhiteboardProvider } from './whiteboard-provider';
+export interface FcrUISharingProvider {
+    get screenSharingOwnerId(): string;
+    get whiteboardOwnerId(): string;
+    get screenSharingState(): FcrScreenSharingState;
+    get whiteboardState(): FcrWhiteboardState;
+    startScreenSharing: (config: FcrScreenStreamCreateConfig) => void;
+    startWhiteboard: () => void;
+    updateScreenSharing: (enableAnnotation: boolean) => void;
+    stop: () => void;
+    getScreenSharingState: () => FcrScreenSharingState;
+    getWhiteboardState: () => FcrWhiteboardState;
+    getSharingControl: () => FcrSharingControl;
+}
+export declare class FcrUISharingProviderImpl implements FcrUISharingProvider {
+    private _sharingControl;
+    private _sharedScreenShareSharedDataSource;
+    private _sharedWhiteboardDataSource;
+    private _whiteboardProvider;
+    private _userControl;
+    protected logger: import("agora-foundation/lib/logger").Logger;
+    private _observer;
+    accessor screenSharingOwnerId: string;
+    accessor whiteboardOwnerId: string;
+    accessor screenSharingState: FcrScreenSharingState;
+    accessor whiteboardState: FcrWhiteboardState;
+    get isSeizeStream(): boolean;
+    constructor(_sharingControl: FcrSharingControl, _sharedScreenShareSharedDataSource: FcrUIScreenShareSharedDataSource, _sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource, _whiteboardProvider: FcrUIWhiteboardProvider, _userControl: FcrUserControl);
+    startScreenSharing(config: FcrScreenStreamCreateConfig): void;
+    startWhiteboard(): void;
+    updateScreenSharing(enableAnnotation: boolean): void;
+    stop(): void;
+    getScreenSharingState(): FcrScreenSharingState;
+    getWhiteboardState(): FcrWhiteboardState;
+    getSharingControl(): FcrSharingControl;
+    release(): void;
+}

package/lib/providers/sharing-provider.js

@@ -0,0 +1,228 @@
+"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.array.push.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.FcrUISharingProviderImpl = void 0;
+require("core-js/modules/es.array.concat.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.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 _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 _decorator = require("agora-foundation/lib/decorator");
+var _type = require("fcr-core/lib/room-control/sharing-control/type");
+var _mobx = require("mobx");
+var _base = require("../base");
+var _logger = require("../utilities/logger");
+var _env = require("agora-foundation/lib/utilities/env");
+var _FcrUISharingProviderImpl;
+var _initProto, _init_screenSharingOwnerId, _init_whiteboardOwnerId, _init_screenSharingState, _init_whiteboardState;
+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 FcrUISharingProviderImpl = exports.FcrUISharingProviderImpl = /*#__PURE__*/function () {
+  function FcrUISharingProviderImpl(_sharingControl, _sharedScreenShareSharedDataSource, _sharedWhiteboardDataSource, _whiteboardProvider, _userControl) {
+    var _this = this;
+    (0, _classCallCheck2["default"])(this, FcrUISharingProviderImpl);
+    (0, _defineProperty2["default"])(this, "logger", (_initProto(this), (0, _logger.createLogger)({
+      prefix: 'FcrUISharingProviderImpl'
+    })));
+    (0, _defineProperty2["default"])(this, "_observer", {
+      onScreenSharingUpdated: function onScreenSharingUpdated(ownerStream, state) {
+        _this.screenSharingOwnerId = (ownerStream === null || ownerStream === void 0 ? void 0 : ownerStream.owner.userId) || '';
+        _this.screenSharingState = state;
+        if (state === _type.FcrScreenSharingState.END && (0, _env.isElectron)()) {
+          _this._sharedScreenShareSharedDataSource.setSharingInReplace(false);
+        }
+      },
+      onWhiteboardStarted: function onWhiteboardStarted(ownerId, operatorUser) {
+        if (_this.whiteboardState === _type.FcrWhiteboardState.START) {
+          return;
+        }
+        _this.whiteboardOwnerId = ownerId;
+        _this.whiteboardState = _type.FcrWhiteboardState.START;
+        var owner = _this._userControl.getUser(ownerId);
+        if (owner) {
+          _this._sharedWhiteboardDataSource.setSharingUser(owner);
+        }
+        var background = _this._whiteboardProvider.backgroundColor;
+        if (background) {
+          _this._sharedWhiteboardDataSource.setBackgroundColor(background);
+        }
+        _this.logger.info("[sharing-provider]: onWhiteboardStarted ".concat(ownerId, ", ").concat(JSON.stringify(operatorUser), ", backgroundColor: ").concat(_this._whiteboardProvider.backgroundColor));
+      },
+      onWhiteboardEnded: function onWhiteboardEnded(reason, operatorUser) {
+        if (_this.whiteboardState === _type.FcrWhiteboardState.END) {
+          return;
+        }
+        _this._sharedWhiteboardDataSource.setJoinSuccess(false);
+        _this._sharedWhiteboardDataSource.setShowLoading(true);
+        _this._sharedWhiteboardDataSource.inActive();
+        _this._sharedWhiteboardDataSource.setSharingUser(undefined);
+        _this.logger.info("[sharing-provider]: onWhiteboardEnded, joinSuccess: ".concat(_this._sharedWhiteboardDataSource.joinSuccess));
+        _this.whiteboardState = _type.FcrWhiteboardState.END;
+      }
+    });
+    _classPrivateFieldInitSpec(this, _A, _init_screenSharingOwnerId(this, ''));
+    _classPrivateFieldInitSpec(this, _B, _init_whiteboardOwnerId(this, ''));
+    _classPrivateFieldInitSpec(this, _C, _init_screenSharingState(this, _type.FcrScreenSharingState.END));
+    _classPrivateFieldInitSpec(this, _D, _init_whiteboardState(this, _type.FcrWhiteboardState.END));
+    this._sharingControl = _sharingControl;
+    this._sharedScreenShareSharedDataSource = _sharedScreenShareSharedDataSource;
+    this._sharedWhiteboardDataSource = _sharedWhiteboardDataSource;
+    this._whiteboardProvider = _whiteboardProvider;
+    this._userControl = _userControl;
+    this._sharingControl.addObserver(this._observer);
+    this.screenSharingState = this._sharingControl.getScreenSharingState();
+    this.whiteboardState = this._sharingControl.getWhiteboardState();
+    if (this.screenSharingState !== _type.FcrScreenSharingState.END) {
+      var _this$_sharedScreenSh;
+      this.screenSharingOwnerId = ((_this$_sharedScreenSh = this._sharedScreenShareSharedDataSource.screenSharingOwner) === null || _this$_sharedScreenSh === void 0 ? void 0 : _this$_sharedScreenSh.userId) || '';
+    }
+    if (this.whiteboardState === _type.FcrWhiteboardState.START) {
+      this.whiteboardOwnerId = this._sharingControl.getBoardControl().getOwnerId();
+    }
+
+    // @ts-ignore
+    window._sharingProvider = this;
+  }
+  return (0, _createClass2["default"])(FcrUISharingProviderImpl, [{
+    key: "screenSharingOwnerId",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "whiteboardOwnerId",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "screenSharingState",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "whiteboardState",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "isSeizeStream",
+    get: function get() {
+      return this._sharedScreenShareSharedDataSource.isSeizeStream;
+    }
+  }, {
+    key: "startScreenSharing",
+    value: function startScreenSharing(config) {
+      this._sharingControl.startScreenSharing(config);
+    }
+  }, {
+    key: "startWhiteboard",
+    value: function startWhiteboard() {
+      this._sharingControl.startWhiteboard();
+    }
+  }, {
+    key: "updateScreenSharing",
+    value: function updateScreenSharing(enableAnnotation) {
+      this._sharingControl.updateScreenSharing(enableAnnotation);
+    }
+  }, {
+    key: "stop",
+    value: function stop() {
+      this._sharingControl.stop();
+    }
+  }, {
+    key: "getScreenSharingState",
+    value: function getScreenSharingState() {
+      return this._sharingControl.getScreenSharingState();
+    }
+  }, {
+    key: "getWhiteboardState",
+    value: function getWhiteboardState() {
+      return this._sharingControl.getWhiteboardState();
+    }
+  }, {
+    key: "getSharingControl",
+    value: function getSharingControl() {
+      return this._sharingControl;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._sharingControl.removeObserver(this._observer);
+    }
+  }]);
+}();
+_FcrUISharingProviderImpl = FcrUISharingProviderImpl;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUISharingProviderImpl, [[_mobx.observable, 1, "screenSharingOwnerId"], [_mobx.observable, 1, "whiteboardOwnerId"], [_mobx.observable, 1, "screenSharingState"], [_mobx.observable, 1, "whiteboardState"], [_decorator.bound, 2, "startScreenSharing"], [_decorator.bound, 2, "startWhiteboard"], [_decorator.bound, 2, "updateScreenSharing"], [_decorator.bound, 2, "stop"], [_decorator.bound, 2, "getScreenSharingState"], [_decorator.bound, 2, "getWhiteboardState"], [_decorator.bound, 2, "getSharingControl"], [_decorator.bound, 2, "release"]], []).e, 5);
+_init_screenSharingOwnerId = _applyDecs$e[0];
+_init_whiteboardOwnerId = _applyDecs$e[1];
+_init_screenSharingState = _applyDecs$e[2];
+_init_whiteboardState = _applyDecs$e[3];
+_initProto = _applyDecs$e[4];
+(0, _base.registerDependency)('sharingProvider');

package/lib/providers/user-setting-storage-provider.d.ts

@@ -0,0 +1,21 @@
+import { FcrUISettingConfig } from '../type';
+export declare const settingConfigStorageKey = "fcr-ui-setting-config";
+export interface FcrUIUserSettingStorageProvider {
+    /**
+     * 写入本地存储
+     * @param key
+     * @param value
+     */
+    write(value: Partial<FcrUISettingConfig>): number;
+    /**
+     * 从本地存储读取
+     * @param key
+     */
+    read(): FcrUISettingConfig | null;
+}
+export declare class FcrUIUserSettingStorageProviderImpl implements FcrUIUserSettingStorageProvider {
+    private _isElectron;
+    constructor();
+    write(value: Partial<FcrUISettingConfig>): number;
+    read(): any;
+}

package/lib/providers/user-setting-storage-provider.js

@@ -0,0 +1,65 @@
+"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.settingConfigStorageKey = exports.FcrUIUserSettingStorageProviderImpl = void 0;
+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");
+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 _base = require("../base");
+var _env = require("agora-foundation/lib/utilities/env");
+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 settingConfigStorageKey = exports.settingConfigStorageKey = 'fcr-ui-setting-config';
+var FcrUIUserSettingStorageProviderImpl = exports.FcrUIUserSettingStorageProviderImpl = /*#__PURE__*/function () {
+  function FcrUIUserSettingStorageProviderImpl() {
+    (0, _classCallCheck2["default"])(this, FcrUIUserSettingStorageProviderImpl);
+    (0, _defineProperty2["default"])(this, "_isElectron", false);
+    this._isElectron = (0, _env.isElectron)();
+  }
+  return (0, _createClass2["default"])(FcrUIUserSettingStorageProviderImpl, [{
+    key: "write",
+    value: function write(value) {
+      var userSetting = this.read();
+      if (userSetting) {
+        value = _objectSpread(_objectSpread({}, userSetting), value);
+      }
+      if (this._isElectron) {
+        window.runtime.setUserSettingData(value);
+      } else {
+        localStorage.setItem(settingConfigStorageKey, JSON.stringify(value));
+      }
+      return 1;
+    }
+  }, {
+    key: "read",
+    value: function read() {
+      if (this._isElectron) {
+        return window.runtime.getUserSettingData();
+      } else {
+        var getItem = localStorage.getItem(settingConfigStorageKey);
+        return getItem ? JSON.parse(getItem) : null;
+      }
+    }
+  }]);
+}();
+(0, _base.registerDependency)('userSettingStorageProvider');

package/lib/providers/whiteboard-provider.d.ts

@@ -1,7 +1,6 @@
 import { FcrPrivilegedWhiteboardControl } from 'fcr-core/lib/room-control/whiteboard-control-v2/whiteboard-control/type';
 import { FcrConnectionState, FcrUserControl, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUISharedWhiteboardDataSource } from '../shared-data/whiteboard-data';
-import { FcrUIManagedObject } from '../object-manager';
+import { FcrUISharedWhiteboardDataSource } from '../shared-data-source/whiteboard-data';
 export interface FcrUIWhiteboardProvider {
     get backgroundColor(): string;
     get isActive(): boolean;
@@ -9,7 +8,7 @@ export interface FcrUIWhiteboardProvider {
     get ownerUser(): FcrUserInfo | undefined;
     setBackground: (color: string) => void;
 }
-export declare class FcrUIWhiteboardProviderImpl implements FcrUIWhiteboardProvider, FcrUIManagedObject {
+export declare class FcrUIWhiteboardProviderImpl implements FcrUIWhiteboardProvider {
     private _whiteboardControl;
     private _sharedWhiteboardDataSource;
     private _userControl;
@@ -21,6 +20,5 @@ export declare class FcrUIWhiteboardProviderImpl implements FcrUIWhiteboardProvi
     get connectionState(): FcrConnectionState;
     get ownerUser(): FcrUserInfo | undefined;
     constructor(_whiteboardControl: FcrPrivilegedWhiteboardControl, _sharedWhiteboardDataSource: FcrUISharedWhiteboardDataSource, _userControl: FcrUserControl);
-    release(): void;
     setBackground(color: string): void;
 }

package/lib/providers/whiteboard-provider.js

@@ -48,6 +48,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 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 _base = require("../base");
 var _logger = require("../utilities/logger");
 var _decorator = require("agora-foundation/lib/decorator");
 var _FcrUIWhiteboardProviderImpl;
@@ -113,9 +114,6 @@ var FcrUIWhiteboardProviderImpl = exports.FcrUIWhiteboardProviderImpl = /*#__PUR
     get: function get() {
       return this._ownerUser;
     }
-  }, {
-    key: "release",
-    value: function release() {}
   }, {
     key: "setBackground",
     value: function setBackground(color) {
@@ -125,7 +123,6 @@ var FcrUIWhiteboardProviderImpl = exports.FcrUIWhiteboardProviderImpl = /*#__PUR
   }]);
 }();
 _FcrUIWhiteboardProviderImpl = FcrUIWhiteboardProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWhiteboardProviderImpl, [[_decorator.bound, 2, "setBackground"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 1);
-_initProto = _applyDecs$e2[0];
-_applyDecs$e;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_FcrUIWhiteboardProviderImpl, [[_decorator.bound, 2, "setBackground"]], []).e, 1);
+_initProto = _applyDecs$e[0];
+(0, _base.registerDependency)('whiteboardProvider');

package/lib/providers/widget-provider.d.ts

@@ -3,6 +3,7 @@ import { FcrRegisteredWidgetConfigs, FcrUIWebWidget, ID } from '../modules/widge
 import { FcrUIWebWidgetConfig } from '../type';
 import { FcrUIManagedObject } from '../object-manager';
 import { FcrUIDialogProvider } from './dialog/type';
+import { FcrUISharedWidgetDataSource } from '../shared-data/widget-data';
 export interface FcrUIWidgetObserver {
     onWidgetClicked(widgetId: string): void;
 }
@@ -60,11 +61,12 @@ export declare class FcrUIWidgetProviderImpl implements FcrUIWidgetProvider, Fcr
     private _dialogProvider;
     private _dialogProviderObserver;
     private _observable;
+    private _sharedWidgetDataSource;
     accessor dialogIds: Map<ID, string>;
-    accessor registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
     accessor openedWidgets: Map<ID, FcrUIWebWidget>;
-    constructor({ registeredWidgetConfigs, roomProvider, dialogProvider, }: {
-        registeredWidgetConfigs: FcrRegisteredWidgetConfigs;
+    get registeredWidgetConfigs(): FcrRegisteredWidgetConfigs;
+    constructor({ sharedWidgetDataSource, roomProvider, dialogProvider, }: {
+        sharedWidgetDataSource: FcrUISharedWidgetDataSource;
         roomProvider: FcrUIRoomProvider;
         dialogProvider: FcrUIDialogProvider;
     });

package/lib/providers/widget-provider.js

@@ -58,7 +58,7 @@ var _webWidget = require("../modules/widget/web-widget");
 var _observable = require("agora-foundation/lib/utilities/observable");
 var _logger = require("../utilities/logger");
 var _FcrUIWidgetProviderImpl;
-var _initProto, _init_dialogIds, _init_registeredWidgetConfigs, _init_openedWidgets;
+var _initProto, _init_dialogIds, _init_openedWidgets;
 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; }
@@ -71,11 +71,10 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
 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 FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/function () {
   function FcrUIWidgetProviderImpl(_ref) {
     var _this = this;
-    var registeredWidgetConfigs = _ref.registeredWidgetConfigs,
+    var sharedWidgetDataSource = _ref.sharedWidgetDataSource,
       roomProvider = _ref.roomProvider,
       dialogProvider = _ref.dialogProvider;
     (0, _classCallCheck2["default"])(this, FcrUIWidgetProviderImpl);
@@ -101,12 +100,11 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
     });
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     _classPrivateFieldInitSpec(this, _A, _init_dialogIds(this, new Map()));
-    _classPrivateFieldInitSpec(this, _B, _init_registeredWidgetConfigs(this, new Map()));
-    _classPrivateFieldInitSpec(this, _C, _init_openedWidgets(this, new Map()));
+    _classPrivateFieldInitSpec(this, _B, _init_openedWidgets(this, new Map()));
     this._roomProvider = roomProvider;
     this._dialogProvider = dialogProvider;
     this._dialogProvider.addObserver(this._dialogProviderObserver);
-    this.registeredWidgetConfigs = registeredWidgetConfigs;
+    this._sharedWidgetDataSource = sharedWidgetDataSource;
   }
   return (0, _createClass2["default"])(FcrUIWidgetProviderImpl, [{
     key: "dialogIds",
@@ -117,7 +115,7 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       _classPrivateFieldSet(_A, this, v);
     }
   }, {
-    key: "registeredWidgetConfigs",
+    key: "openedWidgets",
     get: function get() {
       return _classPrivateFieldGet(_B, this);
     },
@@ -125,17 +123,14 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
       _classPrivateFieldSet(_B, this, v);
     }
   }, {
-    key: "openedWidgets",
+    key: "registeredWidgetConfigs",
     get: function get() {
-      return _classPrivateFieldGet(_C, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_C, this, v);
+      return this._sharedWidgetDataSource.registeredWidgetConfigs;
     }
   }, {
     key: "openWidget",
     value: function openWidget(widgetId) {
-      var widgetConfig = this.registeredWidgetConfigs.get(widgetId);
+      var widgetConfig = this._sharedWidgetDataSource.registeredWidgetConfigs.get(widgetId);
       if (!widgetConfig) {
         this.logger.error('widgetConfig not found', widgetId);
         return;
@@ -189,10 +184,9 @@ var FcrUIWidgetProviderImpl = exports.FcrUIWidgetProviderImpl = /*#__PURE__*/fun
   }]);
 }();
 _FcrUIWidgetProviderImpl = FcrUIWidgetProviderImpl;
-var _applyDecs$e = _applyDecs(_FcrUIWidgetProviderImpl, [[_mobx.observable, 1, "dialogIds"], [_mobx.observable, 1, "registeredWidgetConfigs"], [_mobx.observable, 1, "openedWidgets"]], []).e;
-var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 4);
+var _applyDecs$e = _applyDecs(_FcrUIWidgetProviderImpl, [[_mobx.observable, 1, "dialogIds"], [_mobx.observable, 1, "openedWidgets"]], []).e;
+var _applyDecs$e2 = (0, _slicedToArray2["default"])(_applyDecs$e, 3);
 _init_dialogIds = _applyDecs$e2[0];
-_init_registeredWidgetConfigs = _applyDecs$e2[1];
-_init_openedWidgets = _applyDecs$e2[2];
-_initProto = _applyDecs$e2[3];
+_init_openedWidgets = _applyDecs$e2[1];
+_initProto = _applyDecs$e2[2];
 _applyDecs$e;

package/lib/providers/window/main-window.d.ts

@@ -11,8 +11,6 @@ export declare class FcrUICurrentWindowImpl implements FcrUICurrentWindow, FcrUI
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _observable;
     private _browserWindowProxy;
-    private _hangDetectionTimer;
-    private readonly _HANG_DETECTION_TIMEOUT;
     private _browserWindowListeners;
     private _preventClose;
     get browserWindow(): BrowserWindow;
@@ -45,7 +43,4 @@ export declare class FcrUICurrentWindowImpl implements FcrUICurrentWindow, FcrUI
     release(): void;
     private _setupEventListeners;
     private _addLogObserver;
-    private _handleUnresponsive;
-    private _handleResponsive;
-    private _clearHangDetectionTimer;
 }

package/lib/providers/window/main-window.js

@@ -41,7 +41,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.FcrUICurrentWindowImpl = void 0;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.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"));
@@ -68,9 +67,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
     })));
     (0, _defineProperty2["default"])(this, "_observable", new _observable.AgoraObservable());
     (0, _defineProperty2["default"])(this, "_browserWindowProxy", null);
-    (0, _defineProperty2["default"])(this, "_hangDetectionTimer", null);
-    (0, _defineProperty2["default"])(this, "_HANG_DETECTION_TIMEOUT", 60 * 1000);
-    // 1分钟（毫s秒）
     (0, _defineProperty2["default"])(this, "_browserWindowListeners", {
       onShow: function onShow() {
         _this._observable.notifyObservers('onVisibilityChanged', true);
@@ -86,12 +82,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
       },
       onClose: function onClose() {
         _this._observable.notifyObservers('onClose');
-      },
-      onUnresponsive: function onUnresponsive() {
-        _this._handleUnresponsive();
-      },
-      onResponsive: function onResponsive() {
-        _this._handleResponsive();
       }
     });
     (0, _defineProperty2["default"])(this, "_preventClose", false);
@@ -155,6 +145,9 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
   }, {
     key: "setAlwaysOnTop",
     value: function setAlwaysOnTop(flag) {
+      //  这里目前没有地方调用，因为annotation调用了setAlwaysOnTop,并且设置了pop-up-menu
+      // 窗口在windows上设置的是pop-up-menu,看看是不是要成对出现
+      this.logger.info('windows_index setAlwaysOnTop in main-window');
       this.browserWindow.setAlwaysOnTop(flag);
     }
   }, {
@@ -232,8 +225,6 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
   }, {
     key: "release",
     value: function release() {
-      // 清理hang检测计时器
-      this._clearHangDetectionTimer();
       if (this._browserWindowProxy && !this._browserWindowProxy.isDestroyed()) {
         this._browserWindowProxy.removeAllListeners();
       }
@@ -256,44 +247,12 @@ var FcrUICurrentWindowImpl = exports.FcrUICurrentWindowImpl = /*#__PURE__*/funct
       this._browserWindowProxy.addListener('resized', this._browserWindowListeners.onResized);
       this._browserWindowProxy.addListener('moved', this._browserWindowListeners.onMoved);
       this._browserWindowProxy.addListener('close', this._browserWindowListeners.onClose);
-      this._browserWindowProxy.addListener('unresponsive', this._browserWindowListeners.onUnresponsive);
-      this._browserWindowProxy.addListener('responsive', this._browserWindowListeners.onResponsive);
     }
   }, {
     key: "_addLogObserver",
     value: function _addLogObserver() {
       this._observable.addObserver((0, _logger.generateLogObserver)(this.logger, ['onFocused', 'onBlurred', 'onBoundsChanged', 'onVisibilityChanged', 'onReady', 'onClose']));
     }
-  }, {
-    key: "_handleUnresponsive",
-    value: function _handleUnresponsive() {
-      var _this2 = this;
-      this.logger.warn('Window became unresponsive, starting hang detection timer');
-      this._clearHangDetectionTimer();
-      this._hangDetectionTimer = setTimeout(function () {
-        _this2.logger.error('Window has been unresponsive for 1 minute, forcing application exit');
-        try {
-          // app.quit();
-        } catch (error) {
-          _this2.logger.error('Failed to exit application gracefully:', error);
-          // process.exit(1);
-        }
-      }, this._HANG_DETECTION_TIMEOUT);
-    }
-  }, {
-    key: "_handleResponsive",
-    value: function _handleResponsive() {
-      this.logger.info('Window became responsive again, clearing hang detection timer');
-      this._clearHangDetectionTimer();
-    }
-  }, {
-    key: "_clearHangDetectionTimer",
-    value: function _clearHangDetectionTimer() {
-      if (this._hangDetectionTimer) {
-        clearTimeout(this._hangDetectionTimer);
-        this._hangDetectionTimer = null;
-      }
-    }
   }]);
 }();
 _FcrUICurrentWindowImpl = FcrUICurrentWindowImpl;

package/lib/providers/window/renderer-window.d.ts

@@ -15,6 +15,7 @@ export declare class FcrUIWindowImpl implements FcrUIWindow, FcrUIManagedObject
     private _preventClose;
     private _visible;
     private _showInactive;
+    private _isClosed;
     private _isBrowserWindowReady;
     private _ignoreMouseEvents?;
     private _ignoreMouseEventsOptions?;