fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/providers/user-audio-volume-provider.js

@@ -0,0 +1,312 @@
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.symbol.iterator.js";
+import "core-js/modules/es.symbol.to-primitive.js";
+import "core-js/modules/es.error.cause.js";
+import "core-js/modules/es.error.to-string.js";
+import "core-js/modules/es.array.from.js";
+import "core-js/modules/es.array.is-array.js";
+import "core-js/modules/es.array.slice.js";
+import "core-js/modules/es.date.to-primitive.js";
+import "core-js/modules/es.date.to-string.js";
+import "core-js/modules/es.function.bind.js";
+import "core-js/modules/es.function.name.js";
+import "core-js/modules/es.number.constructor.js";
+import "core-js/modules/es.object.create.js";
+import "core-js/modules/es.object.define-property.js";
+import "core-js/modules/es.object.get-own-property-descriptor.js";
+import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/es.regexp.test.js";
+import "core-js/modules/es.regexp.to-string.js";
+import "core-js/modules/esnext.function.metadata.js";
+import "core-js/modules/esnext.symbol.metadata.js";
+import _typeof from "@babel/runtime/helpers/typeof";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+var _FcrUIUserAudioVolumeProviderImpl;
+var _initProto, _updateAudioVolumesDecs, _ref;
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+import "core-js/modules/es.array.for-each.js";
+import "core-js/modules/es.array.includes.js";
+import "core-js/modules/es.array.iterator.js";
+import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.map.js";
+import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.set.js";
+import "core-js/modules/es.string.includes.js";
+import "core-js/modules/es.string.iterator.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.map.delete-all.js";
+import "core-js/modules/esnext.map.emplace.js";
+import "core-js/modules/esnext.map.every.js";
+import "core-js/modules/esnext.map.filter.js";
+import "core-js/modules/esnext.map.find.js";
+import "core-js/modules/esnext.map.find-key.js";
+import "core-js/modules/esnext.map.includes.js";
+import "core-js/modules/esnext.map.key-of.js";
+import "core-js/modules/esnext.map.map-keys.js";
+import "core-js/modules/esnext.map.map-values.js";
+import "core-js/modules/esnext.map.merge.js";
+import "core-js/modules/esnext.map.reduce.js";
+import "core-js/modules/esnext.map.some.js";
+import "core-js/modules/esnext.map.update.js";
+import "core-js/modules/esnext.set.add-all.js";
+import "core-js/modules/esnext.set.delete-all.js";
+import "core-js/modules/esnext.set.difference.v2.js";
+import "core-js/modules/esnext.set.difference.js";
+import "core-js/modules/esnext.set.every.js";
+import "core-js/modules/esnext.set.filter.js";
+import "core-js/modules/esnext.set.find.js";
+import "core-js/modules/esnext.set.intersection.v2.js";
+import "core-js/modules/esnext.set.intersection.js";
+import "core-js/modules/esnext.set.is-disjoint-from.v2.js";
+import "core-js/modules/esnext.set.is-disjoint-from.js";
+import "core-js/modules/esnext.set.is-subset-of.v2.js";
+import "core-js/modules/esnext.set.is-subset-of.js";
+import "core-js/modules/esnext.set.is-superset-of.v2.js";
+import "core-js/modules/esnext.set.is-superset-of.js";
+import "core-js/modules/esnext.set.join.js";
+import "core-js/modules/esnext.set.map.js";
+import "core-js/modules/esnext.set.reduce.js";
+import "core-js/modules/esnext.set.some.js";
+import "core-js/modules/esnext.set.symmetric-difference.v2.js";
+import "core-js/modules/esnext.set.symmetric-difference.js";
+import "core-js/modules/esnext.set.union.v2.js";
+import "core-js/modules/esnext.set.union.js";
+import "core-js/modules/web.dom-collections.for-each.js";
+import "core-js/modules/web.dom-collections.iterator.js";
+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; }
+import { bound, throttled } from 'agora-foundation/lib/decorator';
+import { FcrMediaSourceState, FcrVideoSourceType } from 'fcr-core/lib/type';
+import { computed, reaction, runInAction } from 'mobx';
+import { FcrUIWindowType } from '../type';
+_ref = (_updateAudioVolumesDecs = throttled(16, {
+  leading: false,
+  trailing: true
+}), "_audioVolumeData");
+export var FcrUIUserAudioVolumeProviderImpl = /*#__PURE__*/function () {
+  function FcrUIUserAudioVolumeProviderImpl(params) {
+    var _this = this;
+    _classCallCheck(this, FcrUIUserAudioVolumeProviderImpl);
+    _defineProperty(this, _ref, void _initProto(this));
+    _defineProperty(this, "_streamControlObserver", {
+      onStreamVolumeIndicationUpdated: this._onAudioVolumeUpdated,
+      onStreamsAdded: this._onStreamsAdded,
+      onStreamsRemoved: this._onStreamsRemoved,
+      onStreamsUpdated: this._onStreamsUpdated
+    });
+    _defineProperty(this, "_setAudioVolumeByStreamIdCache", new Map());
+    _defineProperty(this, "_deleteAudioVolumeByStreamIdCache", new Set());
+    _defineProperty(this, "_isDeleteAudioVolume", false);
+    _defineProperty(this, "_disposers", []);
+    this._audioVolumeData = params.audioVolumeData;
+    this._videoWindowData = params.videoWindowData;
+    this._settingData = params.settingData;
+    this._interpreterData = params.interpreterData;
+    this._deviceProvider = params.deviceProvider;
+    this._screenShareProvider = params.screenShareProvider;
+    this._streamControl = params.streamControl;
+    this._streamControl.addObserver(this._streamControlObserver);
+    this._deviceProvider.setMicrophoneVolumeLevelDelegate(this._handleMicrophoneVolumeUpdated);
+    this._disposers.push(reaction(function () {
+      return _this._settingData.setting.spotlightEnabled;
+    }, function (enableSpotlight) {
+      _this._videoWindowData.setSpotlightEnabled(enableSpotlight);
+    }));
+  }
+  return _createClass(FcrUIUserAudioVolumeProviderImpl, [{
+    key: "_interpreterStreamIds",
+    get: function get() {
+      var _this2 = this;
+      // 同声传译的用户的流 id 列表
+      var interpreterStreamIds = [];
+      if (this._interpreterData.interpreterUserList) {
+        this._interpreterData.interpreterUserList.forEach(function (user) {
+          var streams = _this2._streamControl.getStreamsByUserId(user.userId);
+          streams.forEach(function (stream) {
+            interpreterStreamIds.push(stream.streamId);
+          });
+        });
+      }
+      return interpreterStreamIds;
+    }
+  }, {
+    key: "userIdToAudioStreamIdMap",
+    get: function get() {
+      var map = new Map();
+      this._videoWindowData.mainList.forEach(function (item) {
+        if (item.type === FcrUIWindowType.BOARD) {
+          return;
+        }
+        if (item.videoSourceType === FcrVideoSourceType.SCREEN) {
+          return;
+        }
+        if (item.audioStreamId) {
+          map.set(item.userId, item.audioStreamId);
+        } else if (item.videoStreamId) {
+          map.set(item.userId, item.videoStreamId);
+        }
+      });
+      return map;
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      this._disposers.forEach(function (dispose) {
+        return dispose();
+      });
+      this._disposers = [];
+      this._deviceProvider.clearMicrophoneVolumeLevelDelegate();
+      this._streamControl.removeObserver(this._streamControlObserver);
+      this._setAudioVolumeByStreamIdCache.clear();
+      this._deleteAudioVolumeByStreamIdCache.clear();
+      this._isDeleteAudioVolume = false;
+    }
+  }, {
+    key: "_updateAudioVolumes",
+    value: function _updateAudioVolumes() {
+      var _this3 = this;
+      runInAction(function () {
+        // set audio volumes
+        _this3._setAudioVolumeByStreamIdCache.forEach(function (volume, streamId) {
+          _this3._audioVolumeData.setAudioVolumeByStreamId(streamId, volume);
+          if (streamId === '0') {
+            _this3._deviceProvider.setMicrophoneVolumeLevel(volume);
+          }
+        });
+        _this3._setAudioVolumeByStreamIdCache.clear();
+
+        // delete audio volumes
+        if (_this3._isDeleteAudioVolume) {
+          _this3._deleteAudioVolumeByStreamIdCache.forEach(function (streamId) {
+            _this3._audioVolumeData.deleteAudioVolumeByStreamId(streamId);
+          });
+          _this3._deleteAudioVolumeByStreamIdCache.clear();
+          _this3._isDeleteAudioVolume = false;
+        }
+
+        // 设置语音激励
+        if (_this3._settingData.setting.spotlightEnabled) {
+          var thresholdStreamId = _this3._getThresholdStreamId();
+          if (thresholdStreamId) {
+            _this3._videoWindowData.setSpeakerSpotlight(thresholdStreamId);
+          }
+        }
+      });
+    }
+
+    /** 获取达到阈值的流 id, 此 id 是除自己、 屏幕分享、同声传译之外的流 id*/
+  }, {
+    key: "_getThresholdStreamId",
+    value: function _getThresholdStreamId() {
+      var _this4 = this;
+      var isFilterScreenShareStream = this._screenShareProvider.isLocalUserScreenSharing || this._screenShareProvider.isRemoteUserScreenSharing;
+
+      // 从同声传译的用户中获取同声传译的流 id
+      var interpreterStreamIds = [];
+      if (this._interpreterData.interpreterUserList) {
+        this._interpreterData.interpreterUserList.forEach(function (user) {
+          var streams = _this4._streamControl.getStreamsByUserId(user.userId);
+          streams.forEach(function (stream) {
+            interpreterStreamIds.push(stream.streamId);
+          });
+        });
+      }
+      var audioVolumeMapEntries = this._audioVolumeData.audioVolumeMap.entries();
+      var _iterator = _createForOfIteratorHelper(audioVolumeMapEntries),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _step$value = _slicedToArray(_step.value, 2),
+            streamId = _step$value[0],
+            volume = _step$value[1];
+          // 参照以前的逻辑, 找到第一个达到阈值的流后,就返回该流 id
+          if (volume > 45) {
+            // 过滤掉自己的流
+            if (streamId === '0') {
+              continue;
+            }
+
+            // 过滤掉屏幕分享流
+            if (isFilterScreenShareStream && streamId === this._screenShareProvider.shareStreamId) {
+              continue;
+            }
+
+            // 过滤掉同声传译的流
+            if (this._interpreterStreamIds.includes(streamId)) {
+              continue;
+            }
+            return streamId;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return undefined;
+    }
+  }, {
+    key: "_onAudioVolumeUpdated",
+    value: function _onAudioVolumeUpdated(roomId, streamId, volume) {
+      this._setAudioVolumeByStreamIdCache.set(streamId, Math.floor(volume / 255 * 100));
+      this._updateAudioVolumes();
+    }
+  }, {
+    key: "_onStreamsAdded",
+    value: function _onStreamsAdded(roomId, events) {
+      var _this5 = this;
+      // 新增流时, 设置音频音量默认为 0
+      events.forEach(function (_ref2) {
+        var modifiedStream = _ref2.modifiedStream;
+        _this5._setAudioVolumeByStreamIdCache.set(modifiedStream.streamId, 0);
+      });
+      this._updateAudioVolumes();
+    }
+  }, {
+    key: "_onStreamsRemoved",
+    value: function _onStreamsRemoved(roomId, events) {
+      var _this6 = this;
+      // 删除流时, 删除对应的音频音量
+      events.forEach(function (_ref3) {
+        var modifiedStream = _ref3.modifiedStream;
+        _this6._deleteAudioVolumeByStreamIdCache.add(modifiedStream.streamId);
+      });
+      this._isDeleteAudioVolume = true;
+      this._updateAudioVolumes();
+    }
+  }, {
+    key: "_onStreamsUpdated",
+    value: function _onStreamsUpdated(roomId, events) {
+      var _this7 = this;
+      // 流更新时, 如果音频源关闭, 则将对应的音频音量设置为 0
+      events.forEach(function (_ref4) {
+        var modifiedStream = _ref4.modifiedStream;
+        if (modifiedStream.audioSourceState !== FcrMediaSourceState.OPEN) {
+          _this7._setAudioVolumeByStreamIdCache.set(modifiedStream.streamId, 0);
+        }
+      });
+      this._updateAudioVolumes();
+    }
+  }, {
+    key: "_handleMicrophoneVolumeUpdated",
+    value: function _handleMicrophoneVolumeUpdated(volume) {
+      this._setAudioVolumeByStreamIdCache.set('0', Math.floor(volume / 255 * 100));
+      this._updateAudioVolumes();
+    }
+  }]);
+}();
+_FcrUIUserAudioVolumeProviderImpl = FcrUIUserAudioVolumeProviderImpl;
+var _applyDecs$e = _applyDecs(_FcrUIUserAudioVolumeProviderImpl, [[computed, 3, "_interpreterStreamIds"], [computed, 3, "userIdToAudioStreamIdMap"], [_updateAudioVolumesDecs, 2, "_updateAudioVolumes"], [bound, 2, "_onAudioVolumeUpdated"], [bound, 2, "_onStreamsAdded"], [bound, 2, "_onStreamsRemoved"], [bound, 2, "_onStreamsUpdated"], [bound, 2, "_handleMicrophoneVolumeUpdated"]], []).e;
+var _applyDecs$e2 = _slicedToArray(_applyDecs$e, 1);
+_initProto = _applyDecs$e2[0];
+_applyDecs$e;

package/lib-es/providers/window/provider.js

@@ -56,7 +56,6 @@ import { FcrUIWindowImpl } from './renderer-window';
 import { FcrUICurrentWindowImpl } from './main-window';
 import { bound, trace } from 'agora-foundation/lib/decorator';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
-
 /**
  * FcrUIWindowProvider的实现类
  * 管理Electron的BrowserWindow实例，对相关API调用做一层封装
@@ -69,7 +68,7 @@ export var FcrUIWindowProviderImpl = /*#__PURE__*/function () {
       prefix: 'FcrUIWindowProvider'
     })));
     _defineProperty(this, "_observable", new AgoraObservable());
-    _defineProperty(this, "_windows", new Map());
+    _defineProperty(this, "_windowWithObserverMap", new Map());
     _defineProperty(this, "_windowOptions", new Map());
     this._renderer = renderer;
     this._currentWindow = new FcrUICurrentWindowImpl(renderer);
@@ -90,7 +89,7 @@ export var FcrUIWindowProviderImpl = /*#__PURE__*/function () {
     value: function hasWindow(key) {
       var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : key;
       var index = "".concat(key, "-").concat(id);
-      return this._windows.has(index);
+      return this._windowWithObserverMap.has(index);
     }
   }, {
     key: "getCurrentWindow",
@@ -105,22 +104,30 @@ export var FcrUIWindowProviderImpl = /*#__PURE__*/function () {
   }, {
     key: "getWindowById",
     value: function getWindowById(key) {
-      var _this = this;
+      var _this$_windowWithObse,
+        _this = this;
       var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : key;
       if (!id) {
         throw new Error('window id is required');
       }
       var index = "".concat(key, "-").concat(id);
-      var windowImpl = this._windows.get(index);
+      var windowImpl = (_this$_windowWithObse = this._windowWithObserverMap.get(index)) === null || _this$_windowWithObse === void 0 ? void 0 : _this$_windowWithObse.window;
       if (!windowImpl) {
         var options = this._windowOptions.get(key);
         windowImpl = new FcrUIWindowImpl(key, this._renderer, options);
-        windowImpl.addObserver({
+        var windowObserver = {
+          onReady: function onReady() {
+            _this._observable.notifyObservers('onWindowReady', key, id, windowImpl);
+          },
           onClosed: function onClosed() {
             _this._handleWindowClosed(index);
           }
+        };
+        windowImpl.addObserver(windowObserver);
+        this._windowWithObserverMap.set(index, {
+          window: windowImpl,
+          windowObserver: windowObserver
         });
-        this._windows.set(index, windowImpl);
         this.logger.info("created FcrUIWindow wrapper for ".concat(index, ", options: ").concat(jsonstring(options)));
         this._observable.notifyObservers('onWindowCreated', key, id, windowImpl);
       }
@@ -134,17 +141,20 @@ export var FcrUIWindowProviderImpl = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       this._currentWindow.release();
-      this._windows.forEach(function (window) {
-        window.release();
+      this._windowWithObserverMap.forEach(function (windowWithObserver) {
+        windowWithObserver.window.removeObserver(windowWithObserver.windowObserver);
+        windowWithObserver.window.release();
       });
-      this._windows.clear();
+      this._windowWithObserverMap.clear();
     }
   }, {
     key: "_handleWindowClosed",
     value: function _handleWindowClosed(index) {
-      var window = this._windows.get(index);
-      if (window) {
-        this._windows["delete"](index);
+      var windowWithObserver = this._windowWithObserverMap.get(index);
+      if (windowWithObserver) {
+        windowWithObserver.window.removeObserver(windowWithObserver.windowObserver);
+        windowWithObserver.window.release();
+        this._windowWithObserverMap["delete"](index);
       }
 
       // this.logger.info(`window ${index} closed and removed from provider`);