fcr-ui-scene 3.7.7 → 3.7.8-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/creator/index.js +13 -19
- package/lib/creator/provider-initializer.browser.js +2 -2
- package/lib/creator/provider-initializer.electron.js +2 -2
- package/lib/electron/bootstrap-sdk.js +89 -35
- package/lib/electron/hang-detection/index.d.ts +3 -0
- package/lib/electron/hang-detection/index.js +15 -0
- package/lib/electron/hang-detection/manager.d.ts +28 -0
- package/lib/electron/hang-detection/manager.js +231 -0
- package/lib/electron/hang-detection/types.d.ts +14 -0
- package/lib/electron/sdk-helper.js +6 -2
- package/lib/electron/until.d.ts +1 -4
- package/lib/electron/until.js +12 -4
- package/lib/index.js +8 -1
- package/lib/modules/action-bar/components/screen-share/index.electron.js +1 -1
- package/lib/modules/components/control-bar/components/switch-theme/index.js +4 -2
- package/lib/modules/components/control-bar/index.js +1 -3
- package/lib/modules/components/leave-meeting/store.base.d.ts +1 -0
- package/lib/modules/components/leave-meeting/store.base.js +46 -5
- package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.d.ts +1 -0
- package/lib/modules/dialog/dialogs/confirm-leave-meeting/index.js +2 -1
- package/lib/modules/dialog/dialogs/share-screen-selection/index.js +0 -12
- package/lib/modules/participant/store.base.js +0 -1
- package/lib/modules/share-screen/store.base.js +0 -2
- package/lib/modules/share-screen/store.electron.js +54 -22
- package/lib/modules/state-bar/store.base.electron.js +6 -2
- package/lib/modules/video-window/popover-watcher.js +4 -1
- package/lib/modules/video-window/store.js +7 -1
- package/lib/modules/video-window/view.js +14 -4
- package/lib/providers/board-share/bar-control/base.d.ts +2 -0
- package/lib/providers/board-share/bar-control/base.js +13 -3
- package/lib/providers/board-share/bar-control/electron.d.ts +1 -0
- package/lib/providers/board-share/bar-control/electron.js +15 -4
- package/lib/providers/board-share/provider.base.d.ts +1 -0
- package/lib/providers/board-share/provider.base.js +3 -1
- package/lib/providers/board-share/provider.electron.d.ts +1 -0
- package/lib/providers/board-share/provider.electron.js +8 -2
- package/lib/providers/board-share/type.d.ts +2 -0
- package/lib/providers/dialog/provider.electron.js +10 -2
- package/lib/providers/screen-share/strategy/browser.js +51 -4
- package/lib/providers/screen-share/strategy/electron.js +77 -8
- package/lib/providers/screen-share/stream-state-sync.d.ts +3 -1
- package/lib/providers/screen-share/stream-state-sync.js +133 -40
- package/lib/providers/window/main-window.js +0 -3
- package/lib/providers/window/renderer-window.d.ts +3 -0
- package/lib/providers/window/renderer-window.js +47 -4
- package/lib/providers/window/type.d.ts +1 -0
- package/lib/scenes/main-scene.d.ts +1 -0
- package/lib/scenes/main-scene.js +32 -1
- package/lib/utilities/logger.js +1 -1
- package/package.json +5 -5
- package/public/index.html +2 -149
- package/public/meeting-manager.js +391 -0
- package/installer/icons/favicon.ico +0 -0
- package/installer/icons/favicon.png +0 -0
- package/installer/icons/icon.png +0 -0
- package/installer/mac/entitlements.mac.plist +0 -16
- package/lib/creator.d.ts +0 -36
- package/lib/creator.js +0 -465
- package/lib/modules/action-bar/index.d.ts +0 -58
- package/lib/modules/action-bar/index.dev.d.ts +0 -0
- package/lib/modules/action-bar/index.dev.js +0 -94
- package/lib/modules/action-bar/index.js +0 -109
- package/lib/modules/action-bar/store.d.ts +0 -259
- package/lib/modules/action-bar/store.js +0 -1529
- package/lib/modules/action-bar/types.d.ts +0 -90
- package/lib/modules/action-bar/view.d.ts +0 -5
- package/lib/modules/action-bar/view.js +0 -112
- package/lib/modules/annotation/annotation-index.d.ts +0 -2
- package/lib/modules/annotation/annotation-index.js +0 -80
- package/lib/modules/annotation/annotation-toolbar-store.d.ts +0 -75
- package/lib/modules/annotation/annotation-toolbar-store.js +0 -459
- package/lib/modules/annotation/board-cursor.css +0 -77
- package/lib/modules/annotation/components/color-picker/components/color.d.ts +0 -5
- package/lib/modules/annotation/components/color-picker/components/color.js +0 -38
- package/lib/modules/annotation/components/color-picker/components/panel.d.ts +0 -1
- package/lib/modules/annotation/components/color-picker/components/panel.js +0 -109
- package/lib/modules/annotation/components/color-picker/components/picker.d.ts +0 -1
- package/lib/modules/annotation/components/color-picker/components/picker.js +0 -75
- package/lib/modules/annotation/components/color-picker/index.d.ts +0 -2
- package/lib/modules/annotation/components/color-picker/index.js +0 -47
- package/lib/modules/annotation/components/eraser-picker.d.ts +0 -4
- package/lib/modules/annotation/components/eraser-picker.js +0 -144
- package/lib/modules/annotation/components/expansion/index.d.ts +0 -1
- package/lib/modules/annotation/components/expansion/index.js +0 -100
- package/lib/modules/annotation/components/extra-tool-picker.d.ts +0 -1
- package/lib/modules/annotation/components/extra-tool-picker.js +0 -62
- package/lib/modules/annotation/components/history.d.ts +0 -2
- package/lib/modules/annotation/components/history.js +0 -78
- package/lib/modules/annotation/components/icons/fold-icon.d.ts +0 -2
- package/lib/modules/annotation/components/icons/fold-icon.js +0 -41
- package/lib/modules/annotation/components/icons/move-icon.d.ts +0 -1
- package/lib/modules/annotation/components/icons/move-icon.js +0 -66
- package/lib/modules/annotation/components/item/index.d.ts +0 -1
- package/lib/modules/annotation/components/item/index.js +0 -43
- package/lib/modules/annotation/components/move-handle.d.ts +0 -5
- package/lib/modules/annotation/components/move-handle.js +0 -134
- package/lib/modules/annotation/components/pen-picker.d.ts +0 -4
- package/lib/modules/annotation/components/pen-picker.js +0 -155
- package/lib/modules/annotation/components/screen-capture-picker.d.ts +0 -4
- package/lib/modules/annotation/components/screen-capture-picker.js +0 -85
- package/lib/modules/annotation/components/shape-picker.d.ts +0 -4
- package/lib/modules/annotation/components/shape-picker.js +0 -210
- package/lib/modules/annotation/hooks/index.d.ts +0 -14
- package/lib/modules/annotation/hooks/index.js +0 -292
- package/lib/modules/annotation/index.d.ts +0 -45
- package/lib/modules/annotation/index.js +0 -168
- package/lib/modules/annotation/store.d.ts +0 -98
- package/lib/modules/annotation/store.js +0 -620
- package/lib/modules/annotation/style.css +0 -36
- package/lib/modules/annotation/view.d.ts +0 -3
- package/lib/modules/annotation/view.js +0 -44
- package/lib/modules/components/device-control/store.d.ts +0 -42
- package/lib/modules/components/device-control/store.js +0 -241
- package/lib/modules/components/leave-meeting/store.d.ts +0 -39
- package/lib/modules/components/leave-meeting/store.js +0 -270
- package/lib/modules/control-bar/components/annotation-button/index.d.ts +0 -1
- package/lib/modules/control-bar/components/annotation-button/index.js +0 -72
- package/lib/modules/control-bar/reactor.d.ts +0 -2
- package/lib/modules/control-bar/reactor.js +0 -8
- package/lib/modules/control-bar/types.d.ts +0 -20
- package/lib/modules/control-bar/types.js +0 -6
- package/lib/modules/dialog/dialogs/pre-setting/index.css +0 -26
- package/lib/modules/dialog/dialogs/pre-setting/index.d.ts +0 -6
- package/lib/modules/dialog/dialogs/pre-setting/index.js +0 -62
- package/lib/modules/dialog/dialogs/widget/electron.d.ts +0 -6
- package/lib/modules/dialog/dialogs/widget/electron.js +0 -38
- package/lib/modules/dialog/hooks/use-popover-watcher.d.ts +0 -14
- package/lib/modules/dialog/hooks/use-popover-watcher.js +0 -110
- package/lib/modules/dialog/hooks/useElectron.d.ts +0 -28
- package/lib/modules/dialog/hooks/useElectron.js +0 -277
- package/lib/modules/dialog/store.d.ts +0 -135
- package/lib/modules/dialog/store.js +0 -616
- package/lib/modules/event-confirm/components/window/index.d.ts +0 -7
- package/lib/modules/event-confirm/components/window/index.js +0 -221
- package/lib/modules/event-confirm/index.css +0 -24
- package/lib/modules/event-confirm/index.d.ts +0 -27
- package/lib/modules/event-confirm/index.js +0 -76
- package/lib/modules/event-confirm/store.d.ts +0 -50
- package/lib/modules/event-confirm/store.js +0 -394
- package/lib/modules/event-confirm/view.d.ts +0 -2
- package/lib/modules/event-confirm/view.js +0 -55
- package/lib/modules/event-toast/store.d.ts +0 -27
- package/lib/modules/event-toast/store.js +0 -205
- package/lib/modules/layout/store.d.ts +0 -176
- package/lib/modules/layout/store.js +0 -1452
- package/lib/modules/participant/store.d.ts +0 -222
- package/lib/modules/participant/store.js +0 -1929
- package/lib/modules/pc-audio-connect/index.d.ts +0 -22
- package/lib/modules/pc-audio-connect/index.js +0 -67
- package/lib/modules/pc-audio-connect/store.d.ts +0 -46
- package/lib/modules/pc-audio-connect/store.js +0 -304
- package/lib/modules/setting/common/advance-link.d.ts +0 -3
- package/lib/modules/setting/common/advance-link.js +0 -27
- package/lib/modules/setting/common/index.css +0 -26
- package/lib/modules/setting/common/useNamespace.d.ts +0 -15
- package/lib/modules/setting/common/useNamespace.js +0 -66
- package/lib/modules/setting/dialog-wrapper.d.ts +0 -2
- package/lib/modules/setting/dialog-wrapper.js +0 -110
- package/lib/modules/setting/store.d.ts +0 -261
- package/lib/modules/setting/store.js +0 -1321
- package/lib/modules/share-screen/store.d.ts +0 -148
- package/lib/modules/share-screen/store.js +0 -960
- package/lib/modules/share-screen/types.d.ts +0 -26
- package/lib/modules/share-screen/types.js +0 -6
- package/lib/modules/state-bar/store.d.ts +0 -124
- package/lib/modules/state-bar/store.js +0 -664
- package/lib/modules/whiteboard/components/progress/electron.d.ts +0 -1
- package/lib/modules/whiteboard/components/progress/electron.js +0 -33
- package/lib/modules/widget/store.d.ts +0 -14
- package/lib/modules/widget/store.js +0 -28
- package/lib/providers/annotation-provider.d.ts +0 -124
- package/lib/providers/annotation-provider.js +0 -369
- package/lib/providers/dialog-provider.d.ts +0 -137
- package/lib/providers/dialog-provider.js +0 -194
- package/lib/providers/message-provider.d.ts +0 -69
- package/lib/providers/message-provider.js +0 -140
- package/lib/providers/room-provider.d.ts +0 -194
- package/lib/providers/room-provider.js +0 -916
- package/lib/providers/screen-share-provider.d.ts +0 -245
- package/lib/providers/screen-share-provider.js +0 -850
- package/lib/providers/sharing-provider.d.ts +0 -42
- package/lib/providers/sharing-provider.js +0 -228
- package/lib/providers/user-setting-storage-provider.d.ts +0 -21
- package/lib/providers/user-setting-storage-provider.js +0 -65
- package/lib/providers/whiteboard-provider.d.ts +0 -24
- package/lib/providers/whiteboard-provider.js +0 -128
- package/lib/shared-data-source/annotation-data.d.ts +0 -17
- package/lib/shared-data-source/annotation-data.js +0 -110
- package/lib/shared-data-source/app-list-data.d.ts +0 -34
- package/lib/shared-data-source/app-list-data.js +0 -133
- package/lib/shared-data-source/chat-data.d.ts +0 -25
- package/lib/shared-data-source/chat-data.js +0 -139
- package/lib/shared-data-source/config.d.ts +0 -35
- package/lib/shared-data-source/config.js +0 -40
- package/lib/shared-data-source/confirm-data.d.ts +0 -44
- package/lib/shared-data-source/confirm-data.js +0 -201
- package/lib/shared-data-source/device-privilege-data.d.ts +0 -8
- package/lib/shared-data-source/device-privilege-data.js +0 -25
- package/lib/shared-data-source/interpreter.d.ts +0 -77
- package/lib/shared-data-source/interpreter.js +0 -247
- package/lib/shared-data-source/layout-data.d.ts +0 -31
- package/lib/shared-data-source/layout-data.js +0 -189
- package/lib/shared-data-source/meeting-time.d.ts +0 -90
- package/lib/shared-data-source/meeting-time.js +0 -416
- package/lib/shared-data-source/member-data.d.ts +0 -139
- package/lib/shared-data-source/member-data.js +0 -517
- package/lib/shared-data-source/pin-data.d.ts +0 -13
- package/lib/shared-data-source/pin-data.js +0 -111
- package/lib/shared-data-source/screen-share-data.d.ts +0 -357
- package/lib/shared-data-source/screen-share-data.js +0 -513
- package/lib/shared-data-source/security-data.d.ts +0 -39
- package/lib/shared-data-source/security-data.js +0 -156
- package/lib/shared-data-source/setting.d.ts +0 -67
- package/lib/shared-data-source/setting.js +0 -220
- package/lib/shared-data-source/speaker-spotlight.d.ts +0 -5
- package/lib/shared-data-source/speaker-spotlight.js +0 -15
- package/lib/shared-data-source/video-window.d.ts +0 -165
- package/lib/shared-data-source/video-window.js +0 -1266
- package/lib/shared-data-source/waiting-room.d.ts +0 -46
- package/lib/shared-data-source/waiting-room.js +0 -222
- package/lib/shared-data-source/whiteboard-data.d.ts +0 -70
- package/lib/shared-data-source/whiteboard-data.js +0 -348
- package/lib/utilities/board-context.d.ts +0 -4
- package/lib/utilities/board-context.js +0 -12
- package/lib/utilities/copyText.d.ts +0 -2
- package/lib/utilities/copyText.js +0 -48
- package/lib/utilities/renderer-event.d.ts +0 -10
- package/lib/utilities/renderer-event.js +0 -95
- package/lib/utilities/screen-capture-permission.d.ts +0 -2
- package/lib/utilities/screen-capture-permission.js +0 -24
- package/lib/utilities/screen.d.ts +0 -3
- package/lib/utilities/screen.js +0 -53
- package/lib/utilities/video-track-render-context.d.ts +0 -6
- package/lib/utilities/video-track-render-context.js +0 -9
- package/lib/waiting-room-control-manager.d.ts +0 -28
- package/lib/waiting-room-control-manager.js +0 -230
- /package/lib/{modules/action-bar → electron/hang-detection}/types.js +0 -0
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import { FcrMainRoomControl, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
|
|
2
|
-
import { FcrUISceneConfig } from './type';
|
|
3
|
-
import { FcrCoreEngine } from 'fcr-core/lib/imports';
|
|
4
|
-
export interface FcrUIWaitingRoomControlManagerObserver {
|
|
5
|
-
onWaitingRoomControlCreated?: (roomControl: FcrWaitingRoomControl) => void;
|
|
6
|
-
onWaitingRoomControlLeft?: () => void;
|
|
7
|
-
}
|
|
8
|
-
export default class FcrUIWaitingRoomControlManager {
|
|
9
|
-
private _sceneConfig;
|
|
10
|
-
private _engine;
|
|
11
|
-
private _mainRoomControl;
|
|
12
|
-
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
13
|
-
private _observable;
|
|
14
|
-
private _waitingRoomControl;
|
|
15
|
-
private _isJoining;
|
|
16
|
-
private _mainRoomUserObserver;
|
|
17
|
-
constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _mainRoomControl: FcrMainRoomControl);
|
|
18
|
-
private _isWaitingRoomManager;
|
|
19
|
-
private _createAndJoinWaitingRoom;
|
|
20
|
-
private _leaveWaitingRoom;
|
|
21
|
-
private _getMainRoomControlInfo;
|
|
22
|
-
private _getJoinRoomOption;
|
|
23
|
-
getWaitingRoomControl(): FcrWaitingRoomControl | null;
|
|
24
|
-
addObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
|
|
25
|
-
removeObserver(observer: FcrUIWaitingRoomControlManagerObserver): void;
|
|
26
|
-
setMainRoomControl(mainRoomControl: FcrMainRoomControl): void;
|
|
27
|
-
release(): void;
|
|
28
|
-
}
|
|
@@ -1,230 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
require("core-js/modules/es.symbol.js");
|
|
4
|
-
require("core-js/modules/es.array.filter.js");
|
|
5
|
-
require("core-js/modules/es.array.for-each.js");
|
|
6
|
-
require("core-js/modules/es.array.push.js");
|
|
7
|
-
require("core-js/modules/es.object.define-properties.js");
|
|
8
|
-
require("core-js/modules/es.object.define-property.js");
|
|
9
|
-
require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
10
|
-
require("core-js/modules/es.object.get-own-property-descriptors.js");
|
|
11
|
-
require("core-js/modules/es.object.keys.js");
|
|
12
|
-
require("core-js/modules/es.object.to-string.js");
|
|
13
|
-
require("core-js/modules/esnext.iterator.constructor.js");
|
|
14
|
-
require("core-js/modules/esnext.iterator.filter.js");
|
|
15
|
-
require("core-js/modules/esnext.iterator.for-each.js");
|
|
16
|
-
require("core-js/modules/web.dom-collections.for-each.js");
|
|
17
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
18
|
-
Object.defineProperty(exports, "__esModule", {
|
|
19
|
-
value: true
|
|
20
|
-
});
|
|
21
|
-
exports["default"] = void 0;
|
|
22
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
23
|
-
require("core-js/modules/es.array.join.js");
|
|
24
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
25
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
26
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
27
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
28
|
-
var _fcrCore = require("fcr-core");
|
|
29
|
-
var _type = require("fcr-core/lib/room-control/user-control/type");
|
|
30
|
-
var _type2 = require("fcr-core/lib/room-control/privilege-control/type");
|
|
31
|
-
var _imports = require("fcr-core/lib/imports");
|
|
32
|
-
var _type3 = require("fcr-core/lib/type");
|
|
33
|
-
var _logger = require("./utilities/logger");
|
|
34
|
-
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; }
|
|
35
|
-
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; }
|
|
36
|
-
var FcrUIWaitingRoomControlManager = exports["default"] = /*#__PURE__*/function () {
|
|
37
|
-
function FcrUIWaitingRoomControlManager(_sceneConfig, _engine, _mainRoomControl) {
|
|
38
|
-
var _this = this;
|
|
39
|
-
(0, _classCallCheck2["default"])(this, FcrUIWaitingRoomControlManager);
|
|
40
|
-
(0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
|
|
41
|
-
prefix: 'FcrUIWaitingRoomControlManagerObserver'
|
|
42
|
-
}));
|
|
43
|
-
(0, _defineProperty2["default"])(this, "_observable", new _imports.AgoraObservable());
|
|
44
|
-
(0, _defineProperty2["default"])(this, "_waitingRoomControl", null);
|
|
45
|
-
(0, _defineProperty2["default"])(this, "_isJoining", false);
|
|
46
|
-
(0, _defineProperty2["default"])(this, "_mainRoomUserObserver", {
|
|
47
|
-
onUserInfoUpdated: function onUserInfoUpdated(_roomId, event) {
|
|
48
|
-
var isLocalUserInfoUpdated = event.modifiedUser.userId === _this._mainRoomControl.getUserControl().getLocalUser().userId;
|
|
49
|
-
|
|
50
|
-
// 权限变更的时候
|
|
51
|
-
if (isLocalUserInfoUpdated) {
|
|
52
|
-
_this._sceneConfig.userRole = event.modifiedUser.userRole;
|
|
53
|
-
var isWaitingRoomManager = _this._isWaitingRoomManager();
|
|
54
|
-
if (isWaitingRoomManager) {
|
|
55
|
-
_this._createAndJoinWaitingRoom();
|
|
56
|
-
} else {
|
|
57
|
-
_this._leaveWaitingRoom();
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
});
|
|
62
|
-
this._sceneConfig = _sceneConfig;
|
|
63
|
-
this._engine = _engine;
|
|
64
|
-
this._mainRoomControl = _mainRoomControl;
|
|
65
|
-
this._mainRoomControl.getUserControl().addObserver(this._mainRoomUserObserver);
|
|
66
|
-
var _isWaitingRoomManager = this._isWaitingRoomManager();
|
|
67
|
-
if (_isWaitingRoomManager) {
|
|
68
|
-
this._createAndJoinWaitingRoom();
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
return (0, _createClass2["default"])(FcrUIWaitingRoomControlManager, [{
|
|
72
|
-
key: "_isWaitingRoomManager",
|
|
73
|
-
value: function _isWaitingRoomManager() {
|
|
74
|
-
var isWaitingRoomManager = this._mainRoomControl.getPrivilegeControl().getLocalUserPermissionInfo(_type2.FcrPermissionAction.WaitingRoomOpen).enable;
|
|
75
|
-
return isWaitingRoomManager;
|
|
76
|
-
}
|
|
77
|
-
}, {
|
|
78
|
-
key: "_createAndJoinWaitingRoom",
|
|
79
|
-
value: function () {
|
|
80
|
-
var _createAndJoinWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
81
|
-
var info, waitingRoomId, room, _t;
|
|
82
|
-
return _regenerator["default"].wrap(function (_context) {
|
|
83
|
-
while (1) switch (_context.prev = _context.next) {
|
|
84
|
-
case 0:
|
|
85
|
-
if (this._isJoining) {
|
|
86
|
-
_context.next = 9;
|
|
87
|
-
break;
|
|
88
|
-
}
|
|
89
|
-
info = this._getMainRoomControlInfo();
|
|
90
|
-
if (this._waitingRoomControl) {
|
|
91
|
-
_context.next = 7;
|
|
92
|
-
break;
|
|
93
|
-
}
|
|
94
|
-
this._isJoining = true;
|
|
95
|
-
if (!info) {
|
|
96
|
-
_context.next = 5;
|
|
97
|
-
break;
|
|
98
|
-
}
|
|
99
|
-
waitingRoomId = info.payload.roomUuid;
|
|
100
|
-
room = this._engine.createWaitingRoomControl(waitingRoomId);
|
|
101
|
-
this._waitingRoomControl = room;
|
|
102
|
-
this.logger.info("before waitingRoomManager join waiting room, waitingRoomId:", waitingRoomId);
|
|
103
|
-
_context.prev = 1;
|
|
104
|
-
_context.next = 2;
|
|
105
|
-
return room.join(_objectSpread(_objectSpread({}, this._getJoinRoomOption()), {}, {
|
|
106
|
-
createStreamConfigs: []
|
|
107
|
-
}));
|
|
108
|
-
case 2:
|
|
109
|
-
this._observable.notifyObservers('onWaitingRoomControlCreated', room);
|
|
110
|
-
this.logger.info("after waitingRoomManager join waiting room");
|
|
111
|
-
_context.next = 4;
|
|
112
|
-
break;
|
|
113
|
-
case 3:
|
|
114
|
-
_context.prev = 3;
|
|
115
|
-
_t = _context["catch"](1);
|
|
116
|
-
this.logger.error("waiting room join error: ".concat(_t));
|
|
117
|
-
case 4:
|
|
118
|
-
_context.next = 6;
|
|
119
|
-
break;
|
|
120
|
-
case 5:
|
|
121
|
-
this.logger.info('mainroomControl info is null, cannot create waiting room');
|
|
122
|
-
case 6:
|
|
123
|
-
this._isJoining = false;
|
|
124
|
-
_context.next = 8;
|
|
125
|
-
break;
|
|
126
|
-
case 7:
|
|
127
|
-
this.logger.info('waiting room is already created, cannot create waiting room');
|
|
128
|
-
case 8:
|
|
129
|
-
_context.next = 10;
|
|
130
|
-
break;
|
|
131
|
-
case 9:
|
|
132
|
-
this.logger.info('waiting room is joining, cannot create waiting room');
|
|
133
|
-
case 10:
|
|
134
|
-
case "end":
|
|
135
|
-
return _context.stop();
|
|
136
|
-
}
|
|
137
|
-
}, _callee, this, [[1, 3]]);
|
|
138
|
-
}));
|
|
139
|
-
function _createAndJoinWaitingRoom() {
|
|
140
|
-
return _createAndJoinWaitingRoom2.apply(this, arguments);
|
|
141
|
-
}
|
|
142
|
-
return _createAndJoinWaitingRoom;
|
|
143
|
-
}()
|
|
144
|
-
}, {
|
|
145
|
-
key: "_leaveWaitingRoom",
|
|
146
|
-
value: function () {
|
|
147
|
-
var _leaveWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
148
|
-
var _this$_waitingRoomCon;
|
|
149
|
-
return _regenerator["default"].wrap(function (_context2) {
|
|
150
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
151
|
-
case 0:
|
|
152
|
-
this._isJoining = false;
|
|
153
|
-
this.logger.info('mainRoomControl is not waiting room manager, leave waiting room');
|
|
154
|
-
(_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 || _this$_waitingRoomCon.leave();
|
|
155
|
-
this._waitingRoomControl = null;
|
|
156
|
-
this._observable.notifyObservers('onWaitingRoomControlLeft');
|
|
157
|
-
case 1:
|
|
158
|
-
case "end":
|
|
159
|
-
return _context2.stop();
|
|
160
|
-
}
|
|
161
|
-
}, _callee2, this);
|
|
162
|
-
}));
|
|
163
|
-
function _leaveWaitingRoom() {
|
|
164
|
-
return _leaveWaitingRoom2.apply(this, arguments);
|
|
165
|
-
}
|
|
166
|
-
return _leaveWaitingRoom;
|
|
167
|
-
}()
|
|
168
|
-
}, {
|
|
169
|
-
key: "_getMainRoomControlInfo",
|
|
170
|
-
value: function _getMainRoomControlInfo() {
|
|
171
|
-
var _getPrivilegeControl$ = this._mainRoomControl.getPrivilegeControl().getSecurityInfo(_type2.FcrSecurityAction.WaitingRoom),
|
|
172
|
-
info = _getPrivilegeControl$.info;
|
|
173
|
-
return info;
|
|
174
|
-
}
|
|
175
|
-
}, {
|
|
176
|
-
key: "_getJoinRoomOption",
|
|
177
|
-
value: function _getJoinRoomOption() {
|
|
178
|
-
var config = this._sceneConfig;
|
|
179
|
-
var streams = [{
|
|
180
|
-
streamName: 'default',
|
|
181
|
-
streamType: _type3.FcrStreamType.BOTH,
|
|
182
|
-
videoSourceType: _type3.FcrVideoSourceType.CAMERA,
|
|
183
|
-
audioSourceType: _fcrCore.FcrAudioSourceType.MICROPHONE,
|
|
184
|
-
videoSourceState: _type3.FcrMediaSourceState.CLOSE,
|
|
185
|
-
audioSourceState: _type3.FcrMediaSourceState.CLOSE
|
|
186
|
-
}];
|
|
187
|
-
if (config.userRole === _type.FcrUserRole.ROBOT) {
|
|
188
|
-
streams = [];
|
|
189
|
-
}
|
|
190
|
-
return {
|
|
191
|
-
userName: config.userName,
|
|
192
|
-
userRole: config.userRole,
|
|
193
|
-
userProperties: config.userProperties,
|
|
194
|
-
streamLatency: _fcrCore.FcrStreamLatencyLevel.ULTRA_LOW,
|
|
195
|
-
createStreamConfigs: streams,
|
|
196
|
-
roomToken: config.roomToken,
|
|
197
|
-
password: config.password
|
|
198
|
-
};
|
|
199
|
-
}
|
|
200
|
-
}, {
|
|
201
|
-
key: "getWaitingRoomControl",
|
|
202
|
-
value: function getWaitingRoomControl() {
|
|
203
|
-
return this._waitingRoomControl;
|
|
204
|
-
}
|
|
205
|
-
}, {
|
|
206
|
-
key: "addObserver",
|
|
207
|
-
value: function addObserver(observer) {
|
|
208
|
-
this._observable.addObserver(observer);
|
|
209
|
-
}
|
|
210
|
-
}, {
|
|
211
|
-
key: "removeObserver",
|
|
212
|
-
value: function removeObserver(observer) {
|
|
213
|
-
this._observable.removeObserver(observer);
|
|
214
|
-
}
|
|
215
|
-
}, {
|
|
216
|
-
key: "setMainRoomControl",
|
|
217
|
-
value: function setMainRoomControl(mainRoomControl) {
|
|
218
|
-
this._mainRoomControl = mainRoomControl;
|
|
219
|
-
}
|
|
220
|
-
}, {
|
|
221
|
-
key: "release",
|
|
222
|
-
value: function release() {
|
|
223
|
-
if (this._waitingRoomControl) {
|
|
224
|
-
this._leaveWaitingRoom();
|
|
225
|
-
this._mainRoomControl.getUserControl().removeObserver(this._mainRoomUserObserver);
|
|
226
|
-
this._waitingRoomControl = null;
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
}]);
|
|
230
|
-
}();
|
|
File without changes
|