fcr-core 3.4.0 → 3.4.1
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/chat-connection/index.d.ts +1 -0
- package/lib/chat-connection/index.js +42 -3
- package/lib/engine/index.d.ts +1 -1
- package/lib/engine/index.js +113 -79
- package/lib/imports.d.ts +2 -1
- package/lib/imports.js +13 -0
- package/lib/media-control/desktop.js +33 -3
- package/lib/media-control/mobile.js +31 -2
- package/lib/media-control/type.d.ts +1 -1
- package/lib/monitor-control/index.js +34 -1
- package/lib/peer-session/index.js +3 -2
- package/lib/plugins/chatroom.js +84 -51
- package/lib/room-control/group-control/index.d.ts +1 -1
- package/lib/room-control/group-control/index.js +38 -16
- package/lib/room-control/index.js +86 -37
- package/lib/room-control/interpreter-control/index.js +45 -5
- package/lib/room-control/mainroom-control/index.js +48 -6
- package/lib/room-control/privilege-control/index.js +61 -19
- package/lib/room-control/privilege-control/type.d.ts +1 -1
- package/lib/room-control/room-connector-control/index.js +44 -7
- package/lib/room-control/room-session/index.js +9 -2
- package/lib/room-control/stream-control/index.js +26 -10
- package/lib/room-control/user-control/index.js +35 -23
- package/lib/room-control/waitingroom-control/index.js +47 -3
- package/lib/room-control/whiteboard-control/board-window.d.ts +1 -0
- package/lib/room-control/whiteboard-control/board-window.js +8 -5
- package/lib/room-control/whiteboard-control/index.js +11 -6
- package/lib/room-control/whiteboard-control-v2/index.d.ts +1 -0
- package/lib/room-control/whiteboard-control-v2/index.js +14 -7
- package/lib/room-control/whiteboard-control-v2/main-window.d.ts +2 -0
- package/lib/room-control/whiteboard-control-v2/main-window.js +7 -2
- package/lib/service/api.js +2 -1
- package/lib/utilities/error.d.ts +4 -0
- package/lib/utilities/error.js +18 -3
- package/lib/utilities/logger.d.ts +7 -0
- package/lib/utilities/logger.js +37 -0
- package/package.json +4 -4
|
@@ -12,6 +12,7 @@ export declare class FcrChatConnectionImpl implements FcrChatConnection {
|
|
|
12
12
|
private _restIpList?;
|
|
13
13
|
private _conn?;
|
|
14
14
|
private _connectionState;
|
|
15
|
+
private _offlineListener;
|
|
15
16
|
constructor(_config: FcrCoreEngineConfig, _api: FcrCoreServiceApi);
|
|
16
17
|
login(): Promise<void>;
|
|
17
18
|
private _addEventListeners;
|
|
@@ -1,11 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.description.js");
|
|
4
|
+
require("core-js/modules/es.error.cause.js");
|
|
3
5
|
require("core-js/modules/es.array.push.js");
|
|
4
6
|
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
5
7
|
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
8
|
+
require("core-js/modules/esnext.function.metadata.js");
|
|
6
9
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
7
10
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
8
11
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
12
|
+
require("core-js/modules/esnext.map.delete-all.js");
|
|
13
|
+
require("core-js/modules/esnext.map.emplace.js");
|
|
14
|
+
require("core-js/modules/esnext.map.every.js");
|
|
15
|
+
require("core-js/modules/esnext.map.filter.js");
|
|
16
|
+
require("core-js/modules/esnext.map.find.js");
|
|
17
|
+
require("core-js/modules/esnext.map.find-key.js");
|
|
18
|
+
require("core-js/modules/esnext.map.includes.js");
|
|
19
|
+
require("core-js/modules/esnext.map.key-of.js");
|
|
20
|
+
require("core-js/modules/esnext.map.map-keys.js");
|
|
21
|
+
require("core-js/modules/esnext.map.map-values.js");
|
|
22
|
+
require("core-js/modules/esnext.map.merge.js");
|
|
23
|
+
require("core-js/modules/esnext.map.reduce.js");
|
|
24
|
+
require("core-js/modules/esnext.map.some.js");
|
|
25
|
+
require("core-js/modules/esnext.map.update.js");
|
|
26
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
9
27
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
10
28
|
Object.defineProperty(exports, "__esModule", {
|
|
11
29
|
value: true
|
|
@@ -13,18 +31,32 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
13
31
|
exports.FcrChatConnectionImpl = void 0;
|
|
14
32
|
require("core-js/modules/es.json.stringify.js");
|
|
15
33
|
require("core-js/modules/es.regexp.exec.js");
|
|
34
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
16
35
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
36
|
var _imports = require("../imports");
|
|
18
37
|
var _type = require("./type");
|
|
19
38
|
var _parameters = require("../utilities/parameters");
|
|
20
39
|
var _config2 = require("./config");
|
|
40
|
+
var _logger = require("../utilities/logger");
|
|
41
|
+
var _FcrChatConnectionImpl;
|
|
42
|
+
let _initProto;
|
|
21
43
|
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; }
|
|
22
44
|
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; }
|
|
45
|
+
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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
|
|
46
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
47
|
+
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); }
|
|
48
|
+
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; }
|
|
49
|
+
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; }
|
|
23
50
|
class FcrChatConnectionImpl {
|
|
24
51
|
constructor(_config, _api) {
|
|
25
|
-
(0, _defineProperty2.default)(this, "logger", (0, _imports.getLogger)());
|
|
52
|
+
(0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _imports.getLogger)()));
|
|
26
53
|
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
27
54
|
(0, _defineProperty2.default)(this, "_connectionState", _type.FcrChatConnectionState.DISCONNECTED);
|
|
55
|
+
(0, _defineProperty2.default)(this, "_offlineListener", () => {
|
|
56
|
+
if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
|
|
57
|
+
this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
28
60
|
this._config = _config;
|
|
29
61
|
this._api = _api;
|
|
30
62
|
}
|
|
@@ -41,6 +73,7 @@ class FcrChatConnectionImpl {
|
|
|
41
73
|
const connParams = _objectSpread(_objectSpread(_objectSpread({}, _config2.agoraChatConfig), privateConfig), {}, {
|
|
42
74
|
appKey: tokenResult.appKey
|
|
43
75
|
});
|
|
76
|
+
_imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
|
|
44
77
|
this._conn = new _imports.EasemobChatSDK.connection(connParams);
|
|
45
78
|
await this._conn.open({
|
|
46
79
|
accessToken: this._initConfig.token,
|
|
@@ -66,6 +99,7 @@ class FcrChatConnectionImpl {
|
|
|
66
99
|
}
|
|
67
100
|
_addEventListeners() {
|
|
68
101
|
var _this$_conn;
|
|
102
|
+
window.addEventListener('offline', this._offlineListener);
|
|
69
103
|
(_this$_conn = this._conn) === null || _this$_conn === void 0 || _this$_conn.addEventHandler('connection', {
|
|
70
104
|
onError: e => {
|
|
71
105
|
// this._observable.notifyObservers('onErrorOccurred', this._initConfig.roomId);
|
|
@@ -74,12 +108,15 @@ class FcrChatConnectionImpl {
|
|
|
74
108
|
this._setConnectionState(_type.FcrChatConnectionState.CONNECTED);
|
|
75
109
|
},
|
|
76
110
|
onDisconnected: () => {
|
|
77
|
-
this.
|
|
111
|
+
if (this._connectionState !== _type.FcrChatConnectionState.DISCONNECTED) {
|
|
112
|
+
this._setConnectionState(_type.FcrChatConnectionState.DISCONNECTED);
|
|
113
|
+
}
|
|
78
114
|
}
|
|
79
115
|
});
|
|
80
116
|
}
|
|
81
117
|
logout() {
|
|
82
118
|
var _this$_conn2;
|
|
119
|
+
window.removeEventListener('offline', this._offlineListener);
|
|
83
120
|
(_this$_conn2 = this._conn) === null || _this$_conn2 === void 0 || _this$_conn2.close();
|
|
84
121
|
}
|
|
85
122
|
_setConnectionState(state) {
|
|
@@ -115,4 +152,6 @@ class FcrChatConnectionImpl {
|
|
|
115
152
|
}
|
|
116
153
|
}
|
|
117
154
|
}
|
|
118
|
-
exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
155
|
+
exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
156
|
+
_FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
157
|
+
[_initProto] = _applyDecs(_FcrChatConnectionImpl, [[_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getConnectionState"], [_logger.trace, 2, "getConnectionInstance"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
|
package/lib/engine/index.d.ts
CHANGED
|
@@ -39,7 +39,7 @@ export declare class FcrCoreEngine {
|
|
|
39
39
|
* @param roomId
|
|
40
40
|
* @returns The room control.
|
|
41
41
|
*/
|
|
42
|
-
createRoomControlAndJoin
|
|
42
|
+
createRoomControlAndJoin(roomId: string, options: FcrRoomJoinOptions): Promise<FcrMainRoomControl | FcrWaitingRoomControl>;
|
|
43
43
|
/**
|
|
44
44
|
* Gets the media control.
|
|
45
45
|
* @returns The media control.
|
package/lib/engine/index.js
CHANGED
|
@@ -1,11 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.description.js");
|
|
3
4
|
require("core-js/modules/es.array.push.js");
|
|
4
5
|
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
5
6
|
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
7
|
+
require("core-js/modules/esnext.function.metadata.js");
|
|
6
8
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
7
9
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
8
10
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
11
|
+
require("core-js/modules/esnext.map.delete-all.js");
|
|
12
|
+
require("core-js/modules/esnext.map.emplace.js");
|
|
13
|
+
require("core-js/modules/esnext.map.every.js");
|
|
14
|
+
require("core-js/modules/esnext.map.filter.js");
|
|
15
|
+
require("core-js/modules/esnext.map.find.js");
|
|
16
|
+
require("core-js/modules/esnext.map.find-key.js");
|
|
17
|
+
require("core-js/modules/esnext.map.includes.js");
|
|
18
|
+
require("core-js/modules/esnext.map.key-of.js");
|
|
19
|
+
require("core-js/modules/esnext.map.map-keys.js");
|
|
20
|
+
require("core-js/modules/esnext.map.map-values.js");
|
|
21
|
+
require("core-js/modules/esnext.map.merge.js");
|
|
22
|
+
require("core-js/modules/esnext.map.reduce.js");
|
|
23
|
+
require("core-js/modules/esnext.map.some.js");
|
|
24
|
+
require("core-js/modules/esnext.map.update.js");
|
|
25
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
9
26
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
10
27
|
Object.defineProperty(exports, "__esModule", {
|
|
11
28
|
value: true
|
|
@@ -40,92 +57,23 @@ var _mobile = require("../media-control/mobile");
|
|
|
40
57
|
var _chatroom = require("../plugins/chatroom");
|
|
41
58
|
var _whiteboardControlV = require("../room-control/whiteboard-control-v2");
|
|
42
59
|
var _privilegeControl = require("../room-control/privilege-control");
|
|
60
|
+
var _logger = require("../utilities/logger");
|
|
61
|
+
var _FcrCoreEngine;
|
|
62
|
+
let _initProto;
|
|
43
63
|
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; }
|
|
44
64
|
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; }
|
|
65
|
+
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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
|
|
66
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
67
|
+
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); }
|
|
68
|
+
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; }
|
|
69
|
+
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; }
|
|
45
70
|
class FcrCoreEngine {
|
|
46
71
|
constructor(config) {
|
|
47
72
|
var _config$parameters, _config$parameters2, _config$parameters3;
|
|
48
73
|
// @internal
|
|
49
|
-
(0, _defineProperty2.default)(this, "logger", (0,
|
|
74
|
+
(0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.getLogger)()));
|
|
50
75
|
// @internal
|
|
51
76
|
(0, _defineProperty2.default)(this, "_isLoggingIn", false);
|
|
52
|
-
/**
|
|
53
|
-
* Creates a main room control or a waiting room control.
|
|
54
|
-
* @param roomId
|
|
55
|
-
* @returns The room control.
|
|
56
|
-
*/
|
|
57
|
-
(0, _defineProperty2.default)(this, "createRoomControlAndJoin", async (roomId, options) => {
|
|
58
|
-
const {
|
|
59
|
-
userId
|
|
60
|
-
} = this._rteEngine.getConfig();
|
|
61
|
-
let res = undefined;
|
|
62
|
-
const [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
|
|
63
|
-
var _options$createStream;
|
|
64
|
-
res = await this._apiService.checkIn({
|
|
65
|
-
userName: options.userName,
|
|
66
|
-
userId,
|
|
67
|
-
userRole: _type.FcrUserRoleToStringMap[options.userRole],
|
|
68
|
-
roomId,
|
|
69
|
-
platform: (0, _imports.getPlatform)(),
|
|
70
|
-
streams: (_options$createStream = options.createStreamConfigs) === null || _options$createStream === void 0 ? void 0 : _options$createStream.map(s => _objectSpread(_objectSpread({
|
|
71
|
-
videoSourceUuid: s.videoSourceId,
|
|
72
|
-
audioSourceUuid: s.audioSourceId,
|
|
73
|
-
streamName: s.streamName
|
|
74
|
-
}, (0, _helper.convertStreamTypeToPublishState)(s.streamType)), {}, {
|
|
75
|
-
videoSourceType: s.videoSourceType,
|
|
76
|
-
audioSourceType: s.audioSourceType,
|
|
77
|
-
audioSourceState: s.audioSourceState,
|
|
78
|
-
videoSourceState: s.videoSourceState
|
|
79
|
-
})),
|
|
80
|
-
version: (0, _packageInfo.getVersion)(),
|
|
81
|
-
password: options.password
|
|
82
|
-
});
|
|
83
|
-
}, [], {
|
|
84
|
-
retriesMax: 3
|
|
85
|
-
}).fail(async _ref => {
|
|
86
|
-
let {
|
|
87
|
-
error,
|
|
88
|
-
timeFn,
|
|
89
|
-
currentRetry
|
|
90
|
-
} = _ref;
|
|
91
|
-
if (error instanceof _imports.AgoraRestfulClientError) {
|
|
92
|
-
throw error;
|
|
93
|
-
}
|
|
94
|
-
this.logger.error("[RoomControl] retry to check in room, ".concat(error.message, ",retry ").concat(currentRetry, " times"));
|
|
95
|
-
await timeFn();
|
|
96
|
-
return true;
|
|
97
|
-
}).exec());
|
|
98
|
-
if (error) {
|
|
99
|
-
this.logger.error("[RoomControl] check in room failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
|
|
100
|
-
if (error instanceof _imports.AgoraRestfulClientError) {
|
|
101
|
-
var _error$serviceCode;
|
|
102
|
-
throw (0, _error.generateFcrCoreServerError)((_error$serviceCode = error.serviceCode) !== null && _error$serviceCode !== void 0 ? _error$serviceCode : -1, error.message, error);
|
|
103
|
-
}
|
|
104
|
-
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'join room failed', error);
|
|
105
|
-
}
|
|
106
|
-
if (!res) {
|
|
107
|
-
this.logger.error("[RoomControl] cannot get data from check in respnose");
|
|
108
|
-
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'join room failed', new Error('cannot get data from check in respnose'));
|
|
109
|
-
}
|
|
110
|
-
const {
|
|
111
|
-
data,
|
|
112
|
-
ts
|
|
113
|
-
} = res;
|
|
114
|
-
// console.log('data.room.roomProperties.roomType', data.room.roomProperties.roomType);
|
|
115
|
-
|
|
116
|
-
let roomControl = null;
|
|
117
|
-
if (data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom) {
|
|
118
|
-
roomControl = this.createWaitingRoomControl(data.room.roomInfo.roomUuid);
|
|
119
|
-
} else {
|
|
120
|
-
roomControl = this.createMainRoomControl(roomId);
|
|
121
|
-
}
|
|
122
|
-
await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
|
|
123
|
-
snapshot: data,
|
|
124
|
-
timestamp: ts,
|
|
125
|
-
createStreamConfigs: data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
|
|
126
|
-
}));
|
|
127
|
-
return roomControl;
|
|
128
|
-
});
|
|
129
77
|
this._config = config;
|
|
130
78
|
(0, _domainHolder.resetSharedDomainHolder)();
|
|
131
79
|
this._rteEngine = new _imports.AgoraRteEngine({
|
|
@@ -226,6 +174,90 @@ class FcrCoreEngine {
|
|
|
226
174
|
});
|
|
227
175
|
return new _waitingroomControl.FcrWaitingRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, _type2.FcrRoomType.Waitingroom, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection));
|
|
228
176
|
}
|
|
177
|
+
|
|
178
|
+
/**
|
|
179
|
+
* Creates a main room control or a waiting room control.
|
|
180
|
+
* @param roomId
|
|
181
|
+
* @returns The room control.
|
|
182
|
+
*/
|
|
183
|
+
async createRoomControlAndJoin(roomId, options) {
|
|
184
|
+
const {
|
|
185
|
+
userId
|
|
186
|
+
} = this._rteEngine.getConfig();
|
|
187
|
+
let res = undefined;
|
|
188
|
+
const [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
|
|
189
|
+
var _options$createStream;
|
|
190
|
+
res = await this._apiService.checkIn({
|
|
191
|
+
userName: options.userName,
|
|
192
|
+
userId,
|
|
193
|
+
userRole: _type.FcrUserRoleToStringMap[options.userRole],
|
|
194
|
+
userProperties: options.userProperties,
|
|
195
|
+
roomId,
|
|
196
|
+
platform: (0, _imports.getPlatform)(),
|
|
197
|
+
streams: (_options$createStream = options.createStreamConfigs) === null || _options$createStream === void 0 ? void 0 : _options$createStream.map(s => _objectSpread(_objectSpread({
|
|
198
|
+
videoSourceUuid: s.videoSourceId,
|
|
199
|
+
audioSourceUuid: s.audioSourceId,
|
|
200
|
+
streamName: s.streamName
|
|
201
|
+
}, (0, _helper.convertStreamTypeToPublishState)(s.streamType)), {}, {
|
|
202
|
+
videoSourceType: s.videoSourceType,
|
|
203
|
+
audioSourceType: s.audioSourceType,
|
|
204
|
+
audioSourceState: s.audioSourceState,
|
|
205
|
+
videoSourceState: s.videoSourceState
|
|
206
|
+
})),
|
|
207
|
+
version: (0, _packageInfo.getVersion)(),
|
|
208
|
+
password: options.password
|
|
209
|
+
});
|
|
210
|
+
}, [], {
|
|
211
|
+
retriesMax: 3
|
|
212
|
+
}).fail(async _ref => {
|
|
213
|
+
let {
|
|
214
|
+
error,
|
|
215
|
+
timeFn,
|
|
216
|
+
currentRetry
|
|
217
|
+
} = _ref;
|
|
218
|
+
if (error instanceof _imports.AgoraRestfulClientError) {
|
|
219
|
+
throw error;
|
|
220
|
+
}
|
|
221
|
+
this.logger.error("[RoomControl] retry to check in room, ".concat(error.message, ",retry ").concat(currentRetry, " times"));
|
|
222
|
+
await timeFn();
|
|
223
|
+
return true;
|
|
224
|
+
}).exec());
|
|
225
|
+
if (error) {
|
|
226
|
+
this.logger.error("[RoomControl] check in room failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
|
|
227
|
+
if (error instanceof _imports.AgoraRestfulClientError) {
|
|
228
|
+
if (error.httpCode < 100) {
|
|
229
|
+
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "entry room failed, ".concat(error.message), error);
|
|
230
|
+
} else {
|
|
231
|
+
var _error$serviceCode;
|
|
232
|
+
throw (0, _error.generateFcrCoreServerError)((_error$serviceCode = error.serviceCode) !== null && _error$serviceCode !== void 0 ? _error$serviceCode : -1, error.message, error);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'join room failed', error);
|
|
236
|
+
}
|
|
237
|
+
if (!res) {
|
|
238
|
+
this.logger.error("[RoomControl] cannot get data from check in respnose");
|
|
239
|
+
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM, _error.FcrErrorCode.UNDEFINED_ERROR, 'join room failed', new Error('cannot get data from check in respnose'));
|
|
240
|
+
}
|
|
241
|
+
const {
|
|
242
|
+
data,
|
|
243
|
+
ts
|
|
244
|
+
} = res;
|
|
245
|
+
// console.log('data.room.roomProperties.roomType', data.room.roomProperties.roomType);
|
|
246
|
+
|
|
247
|
+
let roomControl = null;
|
|
248
|
+
if (data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom) {
|
|
249
|
+
roomControl = this.createWaitingRoomControl(data.room.roomInfo.roomUuid);
|
|
250
|
+
} else {
|
|
251
|
+
roomControl = this.createMainRoomControl(roomId);
|
|
252
|
+
}
|
|
253
|
+
await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
|
|
254
|
+
snapshot: data,
|
|
255
|
+
timestamp: ts,
|
|
256
|
+
createStreamConfigs: data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
|
|
257
|
+
}));
|
|
258
|
+
return roomControl;
|
|
259
|
+
}
|
|
260
|
+
|
|
229
261
|
/**
|
|
230
262
|
* Gets the media control.
|
|
231
263
|
* @returns The media control.
|
|
@@ -314,4 +346,6 @@ class FcrCoreEngine {
|
|
|
314
346
|
});
|
|
315
347
|
}
|
|
316
348
|
}
|
|
317
|
-
exports.FcrCoreEngine = FcrCoreEngine;
|
|
349
|
+
exports.FcrCoreEngine = FcrCoreEngine;
|
|
350
|
+
_FcrCoreEngine = FcrCoreEngine;
|
|
351
|
+
[_initProto] = _applyDecs(_FcrCoreEngine, [[_logger.trace, 2, "release"], [_logger.trace, 2, "login"], [_logger.trace, 2, "logout"], [_logger.trace, 2, "getVersion"], [_logger.trace, 2, "createMainRoomControl"], [_logger.trace, 2, "createWaitingRoomControl"], [_logger.trace, 2, "createRoomControlAndJoin"], [_logger.trace, 2, "getDesktopMediaControl"], [_logger.trace, 2, "getMobileMediaControl"], [_logger.trace, 2, "getMonitorControl"], [_logger.trace, 2, "getPeerSessionControl"], [_logger.trace, 2, "sendPeerMessage"], [_logger.trace, 2, "setParameters"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
|
package/lib/imports.d.ts
CHANGED
|
@@ -10,7 +10,8 @@ export { EasemobChat } from 'easemob-websdk';
|
|
|
10
10
|
export { WhiteWebSdk, createPlugins } from 'white-web-sdk';
|
|
11
11
|
export * as netlessVideoPlugin from '@netless/video-js-plugin';
|
|
12
12
|
export { WindowManager } from '@netless/window-manager';
|
|
13
|
-
export { getLogger } from 'agora-foundation/lib/logger';
|
|
13
|
+
export { getLogger, createLogger } from 'agora-foundation/lib/logger';
|
|
14
|
+
export { serializeArgs } from 'agora-foundation/lib/decorator/log/log-serializer';
|
|
14
15
|
export { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
|
|
15
16
|
export { retryAttempt } from 'agora-foundation/lib/utilities/async-retry';
|
|
16
17
|
export { getPlatform } from 'agora-foundation/lib/utilities/env';
|
package/lib/imports.js
CHANGED
|
@@ -211,6 +211,12 @@ Object.defineProperty(exports, "convertStreamTypeToPublishState", {
|
|
|
211
211
|
return _agoraRteSdk.convertStreamTypeToPublishState;
|
|
212
212
|
}
|
|
213
213
|
});
|
|
214
|
+
Object.defineProperty(exports, "createLogger", {
|
|
215
|
+
enumerable: true,
|
|
216
|
+
get: function () {
|
|
217
|
+
return _logger.createLogger;
|
|
218
|
+
}
|
|
219
|
+
});
|
|
214
220
|
Object.defineProperty(exports, "createPlugins", {
|
|
215
221
|
enumerable: true,
|
|
216
222
|
get: function () {
|
|
@@ -272,6 +278,12 @@ Object.defineProperty(exports, "retryAttempt", {
|
|
|
272
278
|
return _asyncRetry.retryAttempt;
|
|
273
279
|
}
|
|
274
280
|
});
|
|
281
|
+
Object.defineProperty(exports, "serializeArgs", {
|
|
282
|
+
enumerable: true,
|
|
283
|
+
get: function () {
|
|
284
|
+
return _logSerializer.serializeArgs;
|
|
285
|
+
}
|
|
286
|
+
});
|
|
275
287
|
Object.defineProperty(exports, "to", {
|
|
276
288
|
enumerable: true,
|
|
277
289
|
get: function () {
|
|
@@ -302,6 +314,7 @@ var _netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plu
|
|
|
302
314
|
exports.netlessVideoPlugin = _netlessVideoPlugin;
|
|
303
315
|
var _windowManager = require("@netless/window-manager");
|
|
304
316
|
var _logger = require("agora-foundation/lib/logger");
|
|
317
|
+
var _logSerializer = require("agora-foundation/lib/decorator/log/log-serializer");
|
|
305
318
|
var _observable = require("agora-foundation/lib/utilities/observable");
|
|
306
319
|
var _asyncRetry = require("agora-foundation/lib/utilities/async-retry");
|
|
307
320
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.description.js");
|
|
4
|
+
require("core-js/modules/es.error.cause.js");
|
|
5
|
+
require("core-js/modules/es.array.push.js");
|
|
6
|
+
require("core-js/modules/esnext.function.metadata.js");
|
|
7
|
+
require("core-js/modules/esnext.map.delete-all.js");
|
|
8
|
+
require("core-js/modules/esnext.map.emplace.js");
|
|
9
|
+
require("core-js/modules/esnext.map.every.js");
|
|
10
|
+
require("core-js/modules/esnext.map.filter.js");
|
|
11
|
+
require("core-js/modules/esnext.map.find.js");
|
|
12
|
+
require("core-js/modules/esnext.map.find-key.js");
|
|
13
|
+
require("core-js/modules/esnext.map.includes.js");
|
|
14
|
+
require("core-js/modules/esnext.map.key-of.js");
|
|
15
|
+
require("core-js/modules/esnext.map.map-keys.js");
|
|
16
|
+
require("core-js/modules/esnext.map.map-values.js");
|
|
17
|
+
require("core-js/modules/esnext.map.merge.js");
|
|
18
|
+
require("core-js/modules/esnext.map.reduce.js");
|
|
19
|
+
require("core-js/modules/esnext.map.some.js");
|
|
20
|
+
require("core-js/modules/esnext.map.update.js");
|
|
21
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
3
22
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
23
|
Object.defineProperty(exports, "__esModule", {
|
|
5
24
|
value: true
|
|
@@ -8,14 +27,23 @@ exports.FcrDesktopMediaControlImpl = void 0;
|
|
|
8
27
|
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
9
28
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
10
29
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
30
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
11
31
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
32
|
var _imports = require("../imports");
|
|
33
|
+
var _logger = require("../utilities/logger");
|
|
34
|
+
var _FcrDesktopMediaControlImpl;
|
|
35
|
+
let _initProto;
|
|
36
|
+
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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
|
|
37
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
38
|
+
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); }
|
|
39
|
+
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; }
|
|
40
|
+
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; }
|
|
13
41
|
/**
|
|
14
42
|
* @internal
|
|
15
43
|
*/
|
|
16
44
|
class FcrDesktopMediaControlImpl {
|
|
17
45
|
constructor(mediaControl) {
|
|
18
|
-
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
46
|
+
(0, _defineProperty2.default)(this, "_observable", (_initProto(this), new _imports.AgoraObservable()));
|
|
19
47
|
this._mediaControl = mediaControl;
|
|
20
48
|
this._mediaControl.addObserver({
|
|
21
49
|
onAutoPlayFailed: () => {
|
|
@@ -98,7 +126,7 @@ class FcrDesktopMediaControlImpl {
|
|
|
98
126
|
isCapabilitySupported(capability) {
|
|
99
127
|
return this._mediaControl.isCapabilitySupported(capability);
|
|
100
128
|
}
|
|
101
|
-
|
|
129
|
+
adjustOutputVolume(volume) {
|
|
102
130
|
this._mediaControl.adjustAudioOutputVolume(volume);
|
|
103
131
|
}
|
|
104
132
|
setSelectedSpeakerVolume(volume) {
|
|
@@ -117,4 +145,6 @@ class FcrDesktopMediaControlImpl {
|
|
|
117
145
|
return this._mediaControl.checkLoopbackDevice();
|
|
118
146
|
}
|
|
119
147
|
}
|
|
120
|
-
exports.FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;
|
|
148
|
+
exports.FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;
|
|
149
|
+
_FcrDesktopMediaControlImpl = FcrDesktopMediaControlImpl;
|
|
150
|
+
[_initProto] = _applyDecs(_FcrDesktopMediaControlImpl, [[_logger.trace, 2, "getCameraList"], [_logger.trace, 2, "getMicrophoneList"], [_logger.trace, 2, "getSpeakerList"], [_logger.trace, 2, "getSystemSelectedMicrophone"], [_logger.trace, 2, "getSystemSelectedSpeaker"], [_logger.trace, 2, "getWindowList"], [_logger.trace, 2, "getDisplayList"], [_logger.trace, 2, "getCameraTrack"], [_logger.trace, 2, "getMicrophoneTrack"], [_logger.trace, 2, "getScreenTrack"], [_logger.trace, 2, "getLoopbackTrack"], [_logger.trace, 2, "setSelectedSpeaker"], [_logger.trace, 2, "startSelectedSpeakerTest"], [_logger.trace, 2, "stopSelectedSpeakerTest"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "setSelectedSpeakerVolume"], [_logger.trace, 2, "getSelectedSpeakerVolume"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
|
|
@@ -1,21 +1,48 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.description.js");
|
|
4
|
+
require("core-js/modules/es.array.push.js");
|
|
5
|
+
require("core-js/modules/esnext.function.metadata.js");
|
|
6
|
+
require("core-js/modules/esnext.map.delete-all.js");
|
|
7
|
+
require("core-js/modules/esnext.map.emplace.js");
|
|
8
|
+
require("core-js/modules/esnext.map.every.js");
|
|
9
|
+
require("core-js/modules/esnext.map.filter.js");
|
|
10
|
+
require("core-js/modules/esnext.map.find.js");
|
|
11
|
+
require("core-js/modules/esnext.map.find-key.js");
|
|
12
|
+
require("core-js/modules/esnext.map.includes.js");
|
|
13
|
+
require("core-js/modules/esnext.map.key-of.js");
|
|
14
|
+
require("core-js/modules/esnext.map.map-keys.js");
|
|
15
|
+
require("core-js/modules/esnext.map.map-values.js");
|
|
16
|
+
require("core-js/modules/esnext.map.merge.js");
|
|
17
|
+
require("core-js/modules/esnext.map.reduce.js");
|
|
18
|
+
require("core-js/modules/esnext.map.some.js");
|
|
19
|
+
require("core-js/modules/esnext.map.update.js");
|
|
20
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
3
21
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
22
|
Object.defineProperty(exports, "__esModule", {
|
|
5
23
|
value: true
|
|
6
24
|
});
|
|
7
25
|
exports.FcrMobileMediaControlImpl = void 0;
|
|
8
26
|
require("core-js/modules/es.error.cause.js");
|
|
27
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
9
28
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
29
|
var _imports = require("../imports");
|
|
11
30
|
var _type = require("../type");
|
|
12
31
|
var _ = require("..");
|
|
32
|
+
var _logger = require("../utilities/logger");
|
|
33
|
+
var _FcrMobileMediaControlImpl;
|
|
34
|
+
let _initProto;
|
|
35
|
+
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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
|
|
36
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
37
|
+
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); }
|
|
38
|
+
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; }
|
|
39
|
+
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; }
|
|
13
40
|
/**
|
|
14
41
|
* @internal
|
|
15
42
|
*/
|
|
16
43
|
class FcrMobileMediaControlImpl {
|
|
17
44
|
constructor(mediaControl) {
|
|
18
|
-
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
45
|
+
(0, _defineProperty2.default)(this, "_observable", (_initProto(this), new _imports.AgoraObservable()));
|
|
19
46
|
(0, _defineProperty2.default)(this, "_cameraDeviceName", undefined);
|
|
20
47
|
(0, _defineProperty2.default)(this, "_microphoneDeviceName", undefined);
|
|
21
48
|
(0, _defineProperty2.default)(this, "_screenDeviceName", undefined);
|
|
@@ -165,4 +192,6 @@ class FcrMobileMediaControlImpl {
|
|
|
165
192
|
this._observable.removeObserver(observer);
|
|
166
193
|
}
|
|
167
194
|
}
|
|
168
|
-
exports.FcrMobileMediaControlImpl = FcrMobileMediaControlImpl;
|
|
195
|
+
exports.FcrMobileMediaControlImpl = FcrMobileMediaControlImpl;
|
|
196
|
+
_FcrMobileMediaControlImpl = FcrMobileMediaControlImpl;
|
|
197
|
+
[_initProto] = _applyDecs(_FcrMobileMediaControlImpl, [[_logger.trace, 2, "getDeviceId"], [_logger.trace, 2, "getDeviceState"], [_logger.trace, 2, "startCameraTest"], [_logger.trace, 2, "stopCameraTest"], [_logger.trace, 2, "startCameraPreview"], [_logger.trace, 2, "stopCameraPreview"], [_logger.trace, 2, "stopCameraPreviewOnAllCanvas"], [_logger.trace, 2, "startScreenCapture"], [_logger.trace, 2, "updateScreenCapture"], [_logger.trace, 2, "stopScreenCapture"], [_logger.trace, 2, "getScreenCaptureState"], [_logger.trace, 2, "enableSpeaker"], [_logger.trace, 2, "getAudioOutputRouting"], [_logger.trace, 2, "getAudioEffectEnhancer"], [_logger.trace, 2, "getVideoEffectEnhancer"], [_logger.trace, 2, "openDevice"], [_logger.trace, 2, "closeDevice"], [_logger.trace, 2, "switchCamera"], [_logger.trace, 2, "getCameraPosition"], [_logger.trace, 2, "isCapabilitySupported"], [_logger.trace, 2, "adjustOutputVolume"], [_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
|
|
@@ -554,7 +554,7 @@ export interface FcrDesktopMediaControl {
|
|
|
554
554
|
* Adjust the output volume.
|
|
555
555
|
* @param volume Range from 0 to 400. 100 is the default volume.
|
|
556
556
|
*/
|
|
557
|
-
|
|
557
|
+
adjustOutputVolume(volume: number): void;
|
|
558
558
|
/**
|
|
559
559
|
* Check if the media control supports the specified capability.
|
|
560
560
|
* @param capability
|
|
@@ -1,14 +1,45 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.description.js");
|
|
4
|
+
require("core-js/modules/es.error.cause.js");
|
|
5
|
+
require("core-js/modules/es.array.push.js");
|
|
6
|
+
require("core-js/modules/esnext.function.metadata.js");
|
|
7
|
+
require("core-js/modules/esnext.map.delete-all.js");
|
|
8
|
+
require("core-js/modules/esnext.map.emplace.js");
|
|
9
|
+
require("core-js/modules/esnext.map.every.js");
|
|
10
|
+
require("core-js/modules/esnext.map.filter.js");
|
|
11
|
+
require("core-js/modules/esnext.map.find.js");
|
|
12
|
+
require("core-js/modules/esnext.map.find-key.js");
|
|
13
|
+
require("core-js/modules/esnext.map.includes.js");
|
|
14
|
+
require("core-js/modules/esnext.map.key-of.js");
|
|
15
|
+
require("core-js/modules/esnext.map.map-keys.js");
|
|
16
|
+
require("core-js/modules/esnext.map.map-values.js");
|
|
17
|
+
require("core-js/modules/esnext.map.merge.js");
|
|
18
|
+
require("core-js/modules/esnext.map.reduce.js");
|
|
19
|
+
require("core-js/modules/esnext.map.some.js");
|
|
20
|
+
require("core-js/modules/esnext.map.update.js");
|
|
21
|
+
require("core-js/modules/esnext.symbol.metadata.js");
|
|
22
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
23
|
Object.defineProperty(exports, "__esModule", {
|
|
4
24
|
value: true
|
|
5
25
|
});
|
|
6
26
|
exports.FcrMonitorControlImpl = void 0;
|
|
27
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
28
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
29
|
+
var _logger = require("../utilities/logger");
|
|
30
|
+
var _FcrMonitorControlImpl;
|
|
31
|
+
let _initProto;
|
|
32
|
+
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 (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 (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (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 (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)]; } }; }
|
|
33
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
34
|
+
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); }
|
|
35
|
+
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; }
|
|
36
|
+
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; }
|
|
7
37
|
/**
|
|
8
38
|
* @internal
|
|
9
39
|
*/
|
|
10
40
|
class FcrMonitorControlImpl {
|
|
11
41
|
constructor(engine, _config) {
|
|
42
|
+
(0, _defineProperty2.default)(this, "_monitor", void _initProto(this));
|
|
12
43
|
this._config = _config;
|
|
13
44
|
this._monitor = engine.getMonitor();
|
|
14
45
|
}
|
|
@@ -19,4 +50,6 @@ class FcrMonitorControlImpl {
|
|
|
19
50
|
this._monitor.addObserver(observer);
|
|
20
51
|
}
|
|
21
52
|
}
|
|
22
|
-
exports.FcrMonitorControlImpl = FcrMonitorControlImpl;
|
|
53
|
+
exports.FcrMonitorControlImpl = FcrMonitorControlImpl;
|
|
54
|
+
_FcrMonitorControlImpl = FcrMonitorControlImpl;
|
|
55
|
+
[_initProto] = _applyDecs(_FcrMonitorControlImpl, [[_logger.trace, 2, "addObserver"], [_logger.trace, 2, "removeObserver"]], []).e;
|