fcr-core 3.10.1 → 3.10.5
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/engine/index.js +102 -108
- package/lib/imports.js +1 -0
- package/lib/media-control/desktop.js +22 -13
- package/lib/media-control/mobile.js +27 -19
- package/lib/media-control/type.d.ts +3 -3
- package/lib/monitor-control/index.js +17 -7
- package/lib/peer-session/index.js +120 -121
- package/lib/plugins/chat/chatroom.js +119 -96
- package/lib/plugins/chat/connector.js +69 -48
- package/lib/remote-control/index.js +194 -216
- package/lib/room-control/ability-control/index.js +20 -10
- package/lib/room-control/application-control/index.js +82 -75
- package/lib/room-control/group-control/index.js +31 -30
- package/lib/room-control/helpers/board-init-info-helper.js +16 -10
- package/lib/room-control/helpers/validation-helper.js +1 -1
- package/lib/room-control/index.js +70 -51
- package/lib/room-control/infinity-room-control/index.js +27 -19
- package/lib/room-control/interpreter-control/index.js +77 -65
- package/lib/room-control/interpreter-control/room.js +6 -4
- package/lib/room-control/join-before-host-waitingroom-control/index.js +6 -4
- package/lib/room-control/mainroom-control/index.js +37 -25
- package/lib/room-control/privilege-control/helper.js +28 -13
- package/lib/room-control/privilege-control/index.js +36 -28
- package/lib/room-control/room-connector-control/index.js +52 -49
- package/lib/room-control/room-connector-control/type.d.ts +1 -1
- package/lib/room-control/room-control-factory.js +10 -12
- package/lib/room-control/room-session/index.js +77 -74
- package/lib/room-control/shared-cache.js +63 -56
- package/lib/room-control/sharing-control/index.js +65 -57
- package/lib/room-control/stream-control/index.js +197 -193
- package/lib/room-control/stt-control/de-compress-gzip.js +10 -0
- package/lib/room-control/stt-control/index.js +93 -86
- package/lib/room-control/user-control/index.js +162 -155
- package/lib/room-control/waitingroom-control/index.js +18 -9
- package/lib/room-control/whiteboard-control/utils.js +4 -2
- package/lib/room-control/whiteboard-control-v1/board-subwindow.js +2 -1
- package/lib/room-control/whiteboard-control-v1/board-window.js +120 -103
- package/lib/room-control/whiteboard-control-v1/factory.js +7 -4
- package/lib/room-control/whiteboard-control-v1/index.js +80 -67
- package/lib/room-control/whiteboard-control-v1/mount-manager.js +4 -2
- package/lib/room-control/whiteboard-control-v1/utils.js +17 -14
- package/lib/room-control/whiteboard-control-v2/annotation-control/control.js +14 -10
- package/lib/room-control/whiteboard-control-v2/annotation-control/factory.js +17 -8
- package/lib/room-control/whiteboard-control-v2/base/index.js +61 -53
- package/lib/room-control/whiteboard-control-v2/base/main-window.js +39 -30
- package/lib/room-control/whiteboard-control-v2/utils.js +10 -10
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/control.js +45 -33
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/factory.js +27 -11
- package/lib/room-control/widget-control/index.js +43 -33
- package/lib/room-router/index.js +66 -58
- package/lib/schema.d.ts +15 -15
- package/lib/service/api.js +446 -548
- package/lib/struct.js +5 -2
- package/lib/utilities/abortable-retry.js +3 -0
- package/lib/utilities/collection.js +15 -11
- package/lib/utilities/error-helpers.js +34 -27
- package/lib/utilities/error.js +4 -3
- package/lib/utilities/join-helper.js +37 -31
- package/lib/utilities/logger.js +8 -5
- package/lib/utilities/parameters.js +21 -10
- package/lib/utilities/retry-helpers.js +1 -0
- package/lib/utilities/stream.js +16 -11
- package/lib/utilities/user.js +4 -3
- package/lib/utilities/validate-params.js +1 -1
- package/lib/utilities/video-encoder-config.js +10 -5
- package/lib-es/engine/index.js +102 -108
- package/lib-es/media-control/desktop.js +22 -13
- package/lib-es/media-control/mobile.js +27 -19
- package/lib-es/monitor-control/index.js +16 -7
- package/lib-es/peer-session/index.js +120 -121
- package/lib-es/plugins/chat/chatroom.js +118 -95
- package/lib-es/plugins/chat/connector.js +67 -47
- package/lib-es/remote-control/index.js +194 -216
- package/lib-es/room-control/ability-control/index.js +19 -10
- package/lib-es/room-control/application-control/index.js +81 -75
- package/lib-es/room-control/group-control/index.js +31 -30
- package/lib-es/room-control/helpers/board-init-info-helper.js +15 -10
- package/lib-es/room-control/helpers/validation-helper.js +1 -1
- package/lib-es/room-control/index.js +69 -51
- package/lib-es/room-control/infinity-room-control/index.js +26 -19
- package/lib-es/room-control/interpreter-control/index.js +77 -65
- package/lib-es/room-control/interpreter-control/room.js +5 -4
- package/lib-es/room-control/join-before-host-waitingroom-control/index.js +5 -4
- package/lib-es/room-control/mainroom-control/index.js +37 -25
- package/lib-es/room-control/privilege-control/helper.js +27 -13
- package/lib-es/room-control/privilege-control/index.js +36 -28
- package/lib-es/room-control/room-connector-control/index.js +52 -49
- package/lib-es/room-control/room-control-factory.js +10 -12
- package/lib-es/room-control/room-session/index.js +77 -74
- package/lib-es/room-control/shared-cache.js +62 -56
- package/lib-es/room-control/sharing-control/index.js +64 -57
- package/lib-es/room-control/stream-control/index.js +197 -193
- package/lib-es/room-control/stt-control/de-compress-gzip.js +10 -0
- package/lib-es/room-control/stt-control/index.js +93 -86
- package/lib-es/room-control/user-control/index.js +162 -155
- package/lib-es/room-control/waitingroom-control/index.js +18 -9
- package/lib-es/room-control/whiteboard-control/utils.js +4 -2
- package/lib-es/room-control/whiteboard-control-v1/board-subwindow.js +2 -1
- package/lib-es/room-control/whiteboard-control-v1/board-window.js +120 -103
- package/lib-es/room-control/whiteboard-control-v1/factory.js +6 -4
- package/lib-es/room-control/whiteboard-control-v1/index.js +80 -67
- package/lib-es/room-control/whiteboard-control-v1/mount-manager.js +3 -2
- package/lib-es/room-control/whiteboard-control-v1/utils.js +17 -14
- package/lib-es/room-control/whiteboard-control-v2/annotation-control/control.js +13 -10
- package/lib-es/room-control/whiteboard-control-v2/annotation-control/factory.js +16 -8
- package/lib-es/room-control/whiteboard-control-v2/base/index.js +60 -53
- package/lib-es/room-control/whiteboard-control-v2/base/main-window.js +39 -30
- package/lib-es/room-control/whiteboard-control-v2/utils.js +10 -10
- package/lib-es/room-control/whiteboard-control-v2/whiteboard-control/control.js +45 -33
- package/lib-es/room-control/whiteboard-control-v2/whiteboard-control/factory.js +26 -11
- package/lib-es/room-control/widget-control/index.js +42 -33
- package/lib-es/room-router/index.js +66 -58
- package/lib-es/service/api.js +445 -548
- package/lib-es/struct.js +4 -2
- package/lib-es/utilities/abortable-retry.js +3 -0
- package/lib-es/utilities/collection.js +14 -11
- package/lib-es/utilities/error-helpers.js +33 -26
- package/lib-es/utilities/error.js +4 -3
- package/lib-es/utilities/join-helper.js +36 -29
- package/lib-es/utilities/logger.js +7 -5
- package/lib-es/utilities/parameters.js +21 -10
- package/lib-es/utilities/retry-helpers.js +1 -0
- package/lib-es/utilities/stream.js +15 -11
- package/lib-es/utilities/user.js +4 -3
- package/lib-es/utilities/validate-params.js +1 -1
- package/lib-es/utilities/video-encoder-config.js +10 -5
- package/package.json +4 -4
|
@@ -1,5 +1,7 @@
|
|
|
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.function.metadata.js");
|
|
5
7
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
@@ -17,37 +19,40 @@ require("core-js/modules/esnext.map.reduce.js");
|
|
|
17
19
|
require("core-js/modules/esnext.map.some.js");
|
|
18
20
|
require("core-js/modules/esnext.map.update.js");
|
|
19
21
|
require("core-js/modules/esnext.symbol.metadata.js");
|
|
22
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
23
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
20
24
|
Object.defineProperty(exports, "__esModule", {
|
|
21
25
|
value: true
|
|
22
26
|
});
|
|
23
27
|
exports.FcrAbilityControlImpl = void 0;
|
|
24
28
|
require("core-js/modules/es.array.includes.js");
|
|
29
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
30
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
25
31
|
var _imports = require("../../imports");
|
|
26
32
|
var _type = require("../../type");
|
|
27
33
|
var _logger = require("../../utilities/logger");
|
|
28
|
-
|
|
34
|
+
var _FcrAbilityControlImpl;
|
|
35
|
+
let _initProto, _isPlatformAbilitySupportedDecs, _ref;
|
|
29
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)]; } }; }
|
|
30
37
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
31
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); }
|
|
32
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; }
|
|
33
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; }
|
|
41
|
+
_ref = (_isPlatformAbilitySupportedDecs = (0, _imports.trace)(['platform', 'ability']), "logger");
|
|
34
42
|
/**
|
|
35
43
|
* 平台能力控制的实现类
|
|
36
44
|
* @internal
|
|
37
45
|
*/
|
|
38
46
|
class FcrAbilityControlImpl {
|
|
39
|
-
static {
|
|
40
|
-
[_initProto] = _applyDecs(this, [[_isPlatformAbilitySupportedDecs, 2, "isPlatformAbilitySupported"], [_imports.trace, 2, "release"]], []).e;
|
|
41
|
-
}
|
|
42
|
-
//@internal
|
|
43
|
-
[(_isPlatformAbilitySupportedDecs = (0, _imports.trace)(['platform', 'ability']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
|
|
44
|
-
prefix: 'FcrAbilityControlImpl'
|
|
45
|
-
}));
|
|
46
47
|
constructor(_scene) {
|
|
48
|
+
//@internal
|
|
49
|
+
(0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
50
|
+
prefix: 'FcrAbilityControlImpl'
|
|
51
|
+
})));
|
|
47
52
|
this._scene = _scene;
|
|
48
53
|
}
|
|
49
54
|
getPlatformAbility(ability) {
|
|
50
|
-
const platforms = this._scene.getScenePropertiesByKeyPath(
|
|
55
|
+
const platforms = this._scene.getScenePropertiesByKeyPath("setting.ability.".concat(ability));
|
|
51
56
|
if (!Array.isArray(platforms)) {
|
|
52
57
|
return [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.MACOS, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.IOS, _type.FcrPlatform.ANDROID, _type.FcrPlatform.WEB_MOBILE, _type.FcrPlatform.HARMONY, _type.FcrPlatform.LINUX, _type.FcrPlatform.CONNECTOR_PSTN, _type.FcrPlatform.CONNECTOR_SIP, _type.FcrPlatform.CONNECTOR_H323];
|
|
53
58
|
}
|
|
@@ -64,4 +69,9 @@ class FcrAbilityControlImpl {
|
|
|
64
69
|
}
|
|
65
70
|
release() {}
|
|
66
71
|
}
|
|
67
|
-
exports.FcrAbilityControlImpl = FcrAbilityControlImpl;
|
|
72
|
+
exports.FcrAbilityControlImpl = FcrAbilityControlImpl;
|
|
73
|
+
_FcrAbilityControlImpl = FcrAbilityControlImpl;
|
|
74
|
+
var _applyDecs$e = _applyDecs(_FcrAbilityControlImpl, [[_isPlatformAbilitySupportedDecs, 2, "isPlatformAbilitySupported"], [_imports.trace, 2, "release"]], []).e;
|
|
75
|
+
var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
|
|
76
|
+
_initProto = _applyDecs$e2[0];
|
|
77
|
+
_applyDecs$e;
|
|
@@ -1,7 +1,10 @@
|
|
|
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.function.metadata.js");
|
|
7
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
5
8
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
6
9
|
require("core-js/modules/esnext.map.emplace.js");
|
|
7
10
|
require("core-js/modules/esnext.map.every.js");
|
|
@@ -17,6 +20,8 @@ require("core-js/modules/esnext.map.reduce.js");
|
|
|
17
20
|
require("core-js/modules/esnext.map.some.js");
|
|
18
21
|
require("core-js/modules/esnext.map.update.js");
|
|
19
22
|
require("core-js/modules/esnext.symbol.metadata.js");
|
|
23
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
24
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
20
25
|
Object.defineProperty(exports, "__esModule", {
|
|
21
26
|
value: true
|
|
22
27
|
});
|
|
@@ -26,75 +31,76 @@ require("core-js/modules/esnext.iterator.constructor.js");
|
|
|
26
31
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
27
32
|
require("core-js/modules/esnext.iterator.find.js");
|
|
28
33
|
require("core-js/modules/esnext.iterator.map.js");
|
|
34
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
35
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
29
36
|
var _imports = require("../../imports");
|
|
30
37
|
var _error = require("../../utilities/error");
|
|
31
38
|
var _type = require("../privilege-control/type");
|
|
32
39
|
var _type2 = require("./type");
|
|
33
40
|
var _logger = require("../../utilities/logger");
|
|
34
|
-
|
|
41
|
+
var _FcrApplicationControlImpl;
|
|
42
|
+
let _initProto, _startApplicatioByRoleDecs, _cancelApplicationDecs, _acceptApplicationByUserIdDecs, _acceptAllApplicationDecs, _rejectApplicationByUserIdDecs, _rejectAllApplicationDecs, _getApplicationUserListDecs, _ref;
|
|
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; }
|
|
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; }
|
|
35
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)]; } }; }
|
|
36
46
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
37
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); }
|
|
38
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; }
|
|
39
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; }
|
|
50
|
+
_ref = (_startApplicatioByRoleDecs = (0, _imports.trace)(['params', 'targetRoles']), _cancelApplicationDecs = (0, _imports.trace)(['applicationKey', 'cause']), _acceptApplicationByUserIdDecs = (0, _imports.trace)(['applicationKey', 'targetUserIds', 'cause']), _acceptAllApplicationDecs = (0, _imports.trace)(['applicationKey', 'cause']), _rejectApplicationByUserIdDecs = (0, _imports.trace)(['applicationKey', 'targetUserIds', 'cause']), _rejectAllApplicationDecs = (0, _imports.trace)(['applicationKey', 'cause']), _getApplicationUserListDecs = (0, _imports.trace)(['applicationKey']), "logger");
|
|
40
51
|
class FcrApplicationControlImpl {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
const localUserId = this._scene.localUser.getLocalUserId();
|
|
65
|
-
const localUser = this._scene.getUser(localUserId);
|
|
66
|
-
if (!localUser) {
|
|
67
|
-
this.logger.error('onScenePropertiesUpdated local user is not found');
|
|
68
|
-
return;
|
|
69
|
-
}
|
|
70
|
-
if (data.reason === 1) {
|
|
71
|
-
this._handleApplicationReceivedEvent(roomId, events, data, localUser);
|
|
72
|
-
}
|
|
73
|
-
const responderId = events.operatorUser.userId;
|
|
74
|
-
const isResponder = responderId == localUser.userId;
|
|
75
|
-
if (!isResponder) {
|
|
76
|
-
const applicationResponse = {
|
|
77
|
-
applicationKey: data.applicationKey,
|
|
78
|
-
responderId: events.operatorUser.userId,
|
|
79
|
-
cause: data.payload,
|
|
80
|
-
senderIds: data.removeApplicationUsers?.map(user => user.userUuid) || []
|
|
81
|
-
};
|
|
82
|
-
if (data.reason === 2) {
|
|
83
|
-
this._handleApplicationAcceptedEvent(roomId, applicationResponse, data, localUser);
|
|
52
|
+
constructor(_scene, _api, _sharedCache) {
|
|
53
|
+
//@internal
|
|
54
|
+
(0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
55
|
+
prefix: 'FcrApplicationControlImpl'
|
|
56
|
+
})));
|
|
57
|
+
//@internal
|
|
58
|
+
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
59
|
+
//@internal
|
|
60
|
+
(0, _defineProperty2.default)(this, "_sceneObserver", {
|
|
61
|
+
onScenePropertiesUpdated: (roomId, events) => {
|
|
62
|
+
var _events$cause;
|
|
63
|
+
if (!(events !== null && events !== void 0 && (_events$cause = events.cause) !== null && _events$cause !== void 0 && _events$cause.data)) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
const data = events.cause.data;
|
|
67
|
+
if (events.cause.cmd === 12) {
|
|
68
|
+
this._handleApplicationUserListAddedEvent(roomId, data);
|
|
69
|
+
if ([1, 2, 3, 4, 5].includes(data.reason)) {
|
|
70
|
+
const localUserId = this._scene.localUser.getLocalUserId();
|
|
71
|
+
const localUser = this._scene.getUser(localUserId);
|
|
72
|
+
if (!localUser) {
|
|
73
|
+
this.logger.error('onScenePropertiesUpdated local user is not found');
|
|
74
|
+
return;
|
|
84
75
|
}
|
|
85
|
-
if (data.reason ===
|
|
86
|
-
this.
|
|
76
|
+
if (data.reason === 1) {
|
|
77
|
+
this._handleApplicationReceivedEvent(roomId, events, data, localUser);
|
|
87
78
|
}
|
|
88
|
-
|
|
89
|
-
|
|
79
|
+
const responderId = events.operatorUser.userId;
|
|
80
|
+
const isResponder = responderId == localUser.userId;
|
|
81
|
+
if (!isResponder) {
|
|
82
|
+
var _data$removeApplicati;
|
|
83
|
+
const applicationResponse = {
|
|
84
|
+
applicationKey: data.applicationKey,
|
|
85
|
+
responderId: events.operatorUser.userId,
|
|
86
|
+
cause: data.payload,
|
|
87
|
+
senderIds: ((_data$removeApplicati = data.removeApplicationUsers) === null || _data$removeApplicati === void 0 ? void 0 : _data$removeApplicati.map(user => user.userUuid)) || []
|
|
88
|
+
};
|
|
89
|
+
if (data.reason === 2) {
|
|
90
|
+
this._handleApplicationAcceptedEvent(roomId, applicationResponse, data, localUser);
|
|
91
|
+
}
|
|
92
|
+
if (data.reason === 4) {
|
|
93
|
+
this._handleApplicationRejectedEvent(roomId, applicationResponse, data, localUser);
|
|
94
|
+
}
|
|
95
|
+
if ([3, 5].includes(data.reason)) {
|
|
96
|
+
this._handleApplicationCancelledEvent(roomId, applicationResponse, data, localUser);
|
|
97
|
+
}
|
|
90
98
|
}
|
|
91
99
|
}
|
|
100
|
+
this._handleApplicationUserListRemovedEvent(roomId, data);
|
|
92
101
|
}
|
|
93
|
-
this._handleApplicationUserListRemovedEvent(roomId, data);
|
|
94
102
|
}
|
|
95
|
-
}
|
|
96
|
-
};
|
|
97
|
-
constructor(_scene, _api, _sharedCache) {
|
|
103
|
+
});
|
|
98
104
|
this._scene = _scene;
|
|
99
105
|
this._api = _api;
|
|
100
106
|
this._sharedCache = _sharedCache;
|
|
@@ -103,52 +109,46 @@ class FcrApplicationControlImpl {
|
|
|
103
109
|
this._addLogObserver();
|
|
104
110
|
}
|
|
105
111
|
startApplicatioByRole(params, targetRoles) {
|
|
106
|
-
return (0, _error.handleRequestError)(() => this._api.startApplicatioByRole({
|
|
107
|
-
...this._getApiCommonParams(),
|
|
112
|
+
return (0, _error.handleRequestError)(() => this._api.startApplicatioByRole(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
108
113
|
applicationKey: params.applicationKey,
|
|
109
114
|
targetRoles: targetRoles.map(role => _type.FcrTargetUserTypeToStringMap[role]),
|
|
110
115
|
cause: params.body
|
|
111
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'start application failed');
|
|
116
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'start application failed');
|
|
112
117
|
}
|
|
113
118
|
cancelApplication(applicationKey, cause) {
|
|
114
|
-
return (0, _error.handleRequestError)(() => this._api.cancelApplication({
|
|
115
|
-
...this._getApiCommonParams(),
|
|
119
|
+
return (0, _error.handleRequestError)(() => this._api.cancelApplication(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
116
120
|
applicationKey: applicationKey,
|
|
117
121
|
cause
|
|
118
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'cancel application failed');
|
|
122
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'cancel application failed');
|
|
119
123
|
}
|
|
120
124
|
acceptApplicationByUserId(applicationKey, targetUserIds, cause) {
|
|
121
|
-
return (0, _error.handleRequestError)(() => this._api.acceptApplicationByUserId({
|
|
122
|
-
...this._getApiCommonParams(),
|
|
125
|
+
return (0, _error.handleRequestError)(() => this._api.acceptApplicationByUserId(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
123
126
|
applicationKey: applicationKey,
|
|
124
127
|
targetUserIds,
|
|
125
128
|
cause
|
|
126
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept application by user id failed');
|
|
129
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept application by user id failed');
|
|
127
130
|
}
|
|
128
131
|
acceptAllApplication(applicationKey, cause) {
|
|
129
|
-
return (0, _error.handleRequestError)(() => this._api.acceptAllApplication({
|
|
130
|
-
...this._getApiCommonParams(),
|
|
132
|
+
return (0, _error.handleRequestError)(() => this._api.acceptAllApplication(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
131
133
|
applicationKey: applicationKey,
|
|
132
134
|
cause
|
|
133
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept all application failed');
|
|
135
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept all application failed');
|
|
134
136
|
}
|
|
135
137
|
rejectApplicationByUserId(applicationKey, targetUserIds, cause) {
|
|
136
|
-
return (0, _error.handleRequestError)(() => this._api.rejectApplicationByUserId({
|
|
137
|
-
...this._getApiCommonParams(),
|
|
138
|
+
return (0, _error.handleRequestError)(() => this._api.rejectApplicationByUserId(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
138
139
|
applicationKey: applicationKey,
|
|
139
140
|
targetUserIds,
|
|
140
141
|
cause
|
|
141
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'reject application by user id failed');
|
|
142
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'reject application by user id failed');
|
|
142
143
|
}
|
|
143
144
|
rejectAllApplication(applicationKey, cause) {
|
|
144
|
-
return (0, _error.handleRequestError)(() => this._api.rejectAllApplication({
|
|
145
|
-
...this._getApiCommonParams(),
|
|
145
|
+
return (0, _error.handleRequestError)(() => this._api.rejectAllApplication(_objectSpread(_objectSpread({}, this._getApiCommonParams()), {}, {
|
|
146
146
|
applicationKey: applicationKey,
|
|
147
147
|
cause
|
|
148
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept all application failed');
|
|
148
|
+
})), _imports.ErrorModuleCode.FCR_ROOM_APPLICATION, 'accept all application failed');
|
|
149
149
|
}
|
|
150
150
|
getApplicationUserList(applicationKey) {
|
|
151
|
-
const users = this._scene.getScenePropertiesByKeyPath(
|
|
151
|
+
const users = this._scene.getScenePropertiesByKeyPath("applications.".concat(applicationKey, ".users"));
|
|
152
152
|
if (!users) {
|
|
153
153
|
return undefined;
|
|
154
154
|
}
|
|
@@ -158,7 +158,7 @@ class FcrApplicationControlImpl {
|
|
|
158
158
|
if (userInfo) {
|
|
159
159
|
return userInfo;
|
|
160
160
|
} else {
|
|
161
|
-
this.logger.error(
|
|
161
|
+
this.logger.error(" application user not found, userId: ".concat(user.userUuid));
|
|
162
162
|
return {
|
|
163
163
|
userId: user.userUuid
|
|
164
164
|
};
|
|
@@ -183,7 +183,8 @@ class FcrApplicationControlImpl {
|
|
|
183
183
|
return approveTargetUserIdCondition || approveTargetUserRoleCondition;
|
|
184
184
|
}
|
|
185
185
|
_getRemoveApplicationUserIdCondition(data, localUser) {
|
|
186
|
-
|
|
186
|
+
var _data$removeApplicati2;
|
|
187
|
+
const removeApplicationUserIdCondition = (_data$removeApplicati2 = data.removeApplicationUsers) === null || _data$removeApplicati2 === void 0 ? void 0 : _data$removeApplicati2.find(user => user.userUuid === localUser.userId);
|
|
187
188
|
return removeApplicationUserIdCondition;
|
|
188
189
|
}
|
|
189
190
|
_getApplicationCancelledReason(data) {
|
|
@@ -232,8 +233,9 @@ class FcrApplicationControlImpl {
|
|
|
232
233
|
this._observable.notifyObservers('onApplicationCancelled', roomId, applicationResponse, reason);
|
|
233
234
|
}
|
|
234
235
|
_handleApplicationAcceptedEvent(roomId, applicationResponse, data, localUser) {
|
|
236
|
+
var _data$addApplicationU;
|
|
235
237
|
const approveTargetCondition = this._getApproveTargetCondition(data, localUser);
|
|
236
|
-
const addApplicationUsersCondition = data.addApplicationUsers
|
|
238
|
+
const addApplicationUsersCondition = (_data$addApplicationU = data.addApplicationUsers) === null || _data$addApplicationU === void 0 ? void 0 : _data$addApplicationU.find(user => user.userUuid === localUser.userId);
|
|
237
239
|
if (!approveTargetCondition && !addApplicationUsersCondition) {
|
|
238
240
|
return;
|
|
239
241
|
}
|
|
@@ -261,4 +263,9 @@ class FcrApplicationControlImpl {
|
|
|
261
263
|
this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onApplicationReceived', ['roomId', 'application']], ['onApplicationCancelled', ['roomId', 'response', 'reason']], ['onApplicationAccepted', ['roomId', 'response']], ['onApplicationRejected', ['roomId', 'response']]]));
|
|
262
264
|
}
|
|
263
265
|
}
|
|
264
|
-
exports.FcrApplicationControlImpl = FcrApplicationControlImpl;
|
|
266
|
+
exports.FcrApplicationControlImpl = FcrApplicationControlImpl;
|
|
267
|
+
_FcrApplicationControlImpl = FcrApplicationControlImpl;
|
|
268
|
+
var _applyDecs$e = _applyDecs(_FcrApplicationControlImpl, [[_startApplicatioByRoleDecs, 2, "startApplicatioByRole"], [_cancelApplicationDecs, 2, "cancelApplication"], [_acceptApplicationByUserIdDecs, 2, "acceptApplicationByUserId"], [_acceptAllApplicationDecs, 2, "acceptAllApplication"], [_rejectApplicationByUserIdDecs, 2, "rejectApplicationByUserId"], [_rejectAllApplicationDecs, 2, "rejectAllApplication"], [_getApplicationUserListDecs, 2, "getApplicationUserList"]], []).e;
|
|
269
|
+
var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
|
|
270
|
+
_initProto = _applyDecs$e2[0];
|
|
271
|
+
_applyDecs$e;
|
|
@@ -1,5 +1,7 @@
|
|
|
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/esnext.function.metadata.js");
|
|
4
6
|
require("core-js/modules/esnext.symbol.metadata.js");
|
|
5
7
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -25,6 +27,9 @@ require("core-js/modules/esnext.map.merge.js");
|
|
|
25
27
|
require("core-js/modules/esnext.map.reduce.js");
|
|
26
28
|
require("core-js/modules/esnext.map.some.js");
|
|
27
29
|
require("core-js/modules/esnext.map.update.js");
|
|
30
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
31
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
32
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
28
33
|
var _imports = require("../../imports");
|
|
29
34
|
var _type = require("../../type");
|
|
30
35
|
var _user = require("../../utilities/user");
|
|
@@ -32,24 +37,21 @@ var _logger = require("../../utilities/logger");
|
|
|
32
37
|
var _error = require("../../utilities/error");
|
|
33
38
|
var _validateParams = _interopRequireDefault(require("../../utilities/validate-params"));
|
|
34
39
|
var _schema = require("../../schema");
|
|
35
|
-
|
|
40
|
+
var _FcrGroupControl;
|
|
41
|
+
let _initProto, _getGroupUserListDecs, _addGroupsDecs, _updateGroupsDecs, _deleteGroupsDecs, _addUsersDecs, _removeUsersDecs, _moveUsersDecs, _ref;
|
|
36
42
|
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
43
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
38
44
|
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
45
|
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
46
|
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; }
|
|
47
|
+
_ref = (_getGroupUserListDecs = [(0, _imports.trace)(['groupId']), (0, _validateParams.default)(_schema.stringSchema)], _addGroupsDecs = [(0, _imports.trace)(['groups']), (0, _validateParams.default)(_schema.fcrGroupCreateConfigArraySchema)], _updateGroupsDecs = [(0, _imports.trace)(['groups']), (0, _validateParams.default)(_schema.fcrGroupUpdateOptionsArraySchema)], _deleteGroupsDecs = [(0, _imports.trace)(['groupIds']), (0, _validateParams.default)(_schema.stringArraySchema)], _addUsersDecs = [(0, _imports.trace)(['userList', 'groupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema)], _removeUsersDecs = [(0, _imports.trace)(['userList', 'groupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema)], _moveUsersDecs = [(0, _imports.trace)(['userList', 'fromGroupId', 'toGroupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema, _schema.stringSchema)], "logger");
|
|
41
48
|
class FcrGroupControl {
|
|
42
|
-
static {
|
|
43
|
-
[_initProto] = _applyDecs(this, [[_imports.trace, 2, "getGroupList"], [_getGroupUserListDecs, 2, "getGroupUserList"], [_addGroupsDecs, 2, "addGroups"], [_updateGroupsDecs, 2, "updateGroups"], [_deleteGroupsDecs, 2, "deleteGroups"], [_imports.trace, 2, "deleteAllGroups"], [_addUsersDecs, 2, "addUsers"], [_removeUsersDecs, 2, "removeUsers"], [_moveUsersDecs, 2, "moveUsers"], [_imports.trace, 2, "release"]], []).e;
|
|
44
|
-
}
|
|
45
|
-
//@internal
|
|
46
|
-
[(_getGroupUserListDecs = [(0, _imports.trace)(['groupId']), (0, _validateParams.default)(_schema.stringSchema)], _addGroupsDecs = [(0, _imports.trace)(['groups']), (0, _validateParams.default)(_schema.fcrGroupCreateConfigArraySchema)], _updateGroupsDecs = [(0, _imports.trace)(['groups']), (0, _validateParams.default)(_schema.fcrGroupUpdateOptionsArraySchema)], _deleteGroupsDecs = [(0, _imports.trace)(['groupIds']), (0, _validateParams.default)(_schema.stringArraySchema)], _addUsersDecs = [(0, _imports.trace)(['userList', 'groupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema)], _removeUsersDecs = [(0, _imports.trace)(['userList', 'groupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema)], _moveUsersDecs = [(0, _imports.trace)(['userList', 'fromGroupId', 'toGroupId']), (0, _validateParams.default)(_schema.stringArraySchema, _schema.stringSchema, _schema.stringSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
|
|
47
|
-
prefix: 'FcrGroupControl'
|
|
48
|
-
}));
|
|
49
|
-
//@internal
|
|
50
|
-
|
|
51
|
-
_observable = new _imports.AgoraObservable();
|
|
52
49
|
constructor(_engine, _scene, _api, _sharedCache) {
|
|
50
|
+
//@internal
|
|
51
|
+
(0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
52
|
+
prefix: 'FcrGroupControl'
|
|
53
|
+
})));
|
|
54
|
+
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
53
55
|
this._engine = _engine;
|
|
54
56
|
this._scene = _scene;
|
|
55
57
|
this._api = _api;
|
|
@@ -61,7 +63,8 @@ class FcrGroupControl {
|
|
|
61
63
|
_addSceneObserver() {
|
|
62
64
|
this._sceneObserver = {
|
|
63
65
|
onScenePropertiesUpdated: (sceneId, event) => {
|
|
64
|
-
|
|
66
|
+
var _event$cause;
|
|
67
|
+
if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 11) {
|
|
65
68
|
const data = event.cause.data;
|
|
66
69
|
const changedProperties = event.changedProperties;
|
|
67
70
|
const groupDetails = changedProperties.groups.details;
|
|
@@ -89,11 +92,10 @@ class FcrGroupControl {
|
|
|
89
92
|
this._observable.notifyObservers('onGroupsUpdated', groupEvents);
|
|
90
93
|
}
|
|
91
94
|
if (data.actionType === 4) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
groupUuid
|
|
96
|
-
} = group;
|
|
95
|
+
var _data$changeGroups, _data$changeGroups2, _data$changeGroups3;
|
|
96
|
+
(_data$changeGroups = data.changeGroups) === null || _data$changeGroups === void 0 || _data$changeGroups.forEach(group => {
|
|
97
|
+
const removeUsers = group.removeUsers,
|
|
98
|
+
groupUuid = group.groupUuid;
|
|
97
99
|
if (removeUsers) {
|
|
98
100
|
this._observable.notifyObservers('onUserListRemovedFromGroup', removeUsers.map(user => {
|
|
99
101
|
let operatorUser;
|
|
@@ -110,10 +112,8 @@ class FcrGroupControl {
|
|
|
110
112
|
}
|
|
111
113
|
});
|
|
112
114
|
const toGroupMap = new Map();
|
|
113
|
-
data.changeGroups
|
|
114
|
-
const
|
|
115
|
-
removeUsers
|
|
116
|
-
} = group;
|
|
115
|
+
(_data$changeGroups2 = data.changeGroups) === null || _data$changeGroups2 === void 0 || _data$changeGroups2.forEach(group => {
|
|
116
|
+
const removeUsers = group.removeUsers;
|
|
117
117
|
if (removeUsers) {
|
|
118
118
|
removeUsers.forEach(user => {
|
|
119
119
|
if (user.toGroupUuid) {
|
|
@@ -153,11 +153,9 @@ class FcrGroupControl {
|
|
|
153
153
|
};
|
|
154
154
|
}));
|
|
155
155
|
});
|
|
156
|
-
data.changeGroups
|
|
157
|
-
const
|
|
158
|
-
|
|
159
|
-
groupUuid
|
|
160
|
-
} = group;
|
|
156
|
+
(_data$changeGroups3 = data.changeGroups) === null || _data$changeGroups3 === void 0 || _data$changeGroups3.forEach(group => {
|
|
157
|
+
const addUsers = group.addUsers,
|
|
158
|
+
groupUuid = group.groupUuid;
|
|
161
159
|
if (addUsers) {
|
|
162
160
|
this._observable.notifyObservers('onUserListAddedToGroup', addUsers.map(user => {
|
|
163
161
|
let operatorUser;
|
|
@@ -185,9 +183,7 @@ class FcrGroupControl {
|
|
|
185
183
|
const groupDetails = this._getGroupDetails();
|
|
186
184
|
const list = [];
|
|
187
185
|
Object.keys(groupDetails).forEach(groupId => {
|
|
188
|
-
const
|
|
189
|
-
groupName
|
|
190
|
-
} = groupDetails[groupId];
|
|
186
|
+
const groupName = groupDetails[groupId].groupName;
|
|
191
187
|
list.push({
|
|
192
188
|
groupId,
|
|
193
189
|
groupName
|
|
@@ -267,4 +263,9 @@ class FcrGroupControl {
|
|
|
267
263
|
this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onGroupsAdded', ['events']], ['onGroupsUpdated', ['events']], ['onGroupsRemoved', ['events']], ['onUserListAddedToGroup', ['events']], ['onUserListRemovedFromGroup', ['events']], ['onUserListMoveToGroup', ['events']]]));
|
|
268
264
|
}
|
|
269
265
|
}
|
|
270
|
-
exports.FcrGroupControl = FcrGroupControl;
|
|
266
|
+
exports.FcrGroupControl = FcrGroupControl;
|
|
267
|
+
_FcrGroupControl = FcrGroupControl;
|
|
268
|
+
var _applyDecs$e = _applyDecs(_FcrGroupControl, [[_imports.trace, 2, "getGroupList"], [_getGroupUserListDecs, 2, "getGroupUserList"], [_addGroupsDecs, 2, "addGroups"], [_updateGroupsDecs, 2, "updateGroups"], [_deleteGroupsDecs, 2, "deleteGroups"], [_imports.trace, 2, "deleteAllGroups"], [_addUsersDecs, 2, "addUsers"], [_removeUsersDecs, 2, "removeUsers"], [_moveUsersDecs, 2, "moveUsers"], [_imports.trace, 2, "release"]], []).e;
|
|
269
|
+
var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
|
|
270
|
+
_initProto = _applyDecs$e2[0];
|
|
271
|
+
_applyDecs$e;
|
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.array.push.js");
|
|
4
|
+
require("core-js/modules/esnext.iterator.constructor.js");
|
|
5
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
6
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
7
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
8
|
Object.defineProperty(exports, "__esModule", {
|
|
4
9
|
value: true
|
|
5
10
|
});
|
|
6
11
|
exports.addBoardInitInfoObserver = addBoardInitInfoObserver;
|
|
12
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
13
|
var _imports = require("../../imports");
|
|
8
14
|
var _error = require("../../utilities/error");
|
|
9
15
|
var _sceneProperties = require("../../utilities/scene-properties");
|
|
10
16
|
var _sharedStorage = require("../../utilities/shared-storage");
|
|
17
|
+
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; }
|
|
18
|
+
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; }
|
|
11
19
|
async function _getAnnotationToken(api, roomId, userId) {
|
|
12
20
|
return await (0, _error.handleRequestError)(() => api.getAnnotationToken({
|
|
13
21
|
roomId,
|
|
@@ -25,13 +33,12 @@ async function initAnnotationInfo(scene, api, logger) {
|
|
|
25
33
|
const userId = scene.localUser.getLocalUserId();
|
|
26
34
|
const boardToken = (await _getAnnotationToken(api, roomId, userId)).data;
|
|
27
35
|
if (!boardToken) {
|
|
28
|
-
logger.error(
|
|
36
|
+
logger.error("get annotation board options failed, roomId: ".concat(roomId, ", userId: ").concat(userId, ", boardOptions: ").concat((0, _imports.jsonstring)(boardToken)));
|
|
29
37
|
} else {
|
|
30
|
-
const boardOptions = {
|
|
31
|
-
...boardToken,
|
|
38
|
+
const boardOptions = _objectSpread(_objectSpread({}, boardToken), {}, {
|
|
32
39
|
boardPerformance: (0, _sceneProperties.getBoardPerformance)(scene)
|
|
33
|
-
};
|
|
34
|
-
logger.info(
|
|
40
|
+
});
|
|
41
|
+
logger.info("get annotation board options success, roomId: ".concat(roomId, ", userId: ").concat(userId, ", boardOptions: ").concat((0, _imports.jsonstring)(boardOptions)));
|
|
35
42
|
(0, _sharedStorage.setAnnotationBoardOptions)(boardOptions);
|
|
36
43
|
}
|
|
37
44
|
}
|
|
@@ -40,13 +47,12 @@ async function initBoardInfo(scene, api, logger) {
|
|
|
40
47
|
const userId = scene.localUser.getLocalUserId();
|
|
41
48
|
const boardToken = (await _getBoardToken(api, roomId, userId)).data;
|
|
42
49
|
if (!boardToken) {
|
|
43
|
-
logger.error(
|
|
50
|
+
logger.error("get whiteboard options failed, roomId: ".concat(roomId, ", userId: ").concat(userId, ", boardToken: ").concat((0, _imports.jsonstring)(boardToken)));
|
|
44
51
|
} else {
|
|
45
|
-
const boardOptions = {
|
|
46
|
-
...boardToken,
|
|
52
|
+
const boardOptions = _objectSpread(_objectSpread({}, boardToken), {}, {
|
|
47
53
|
boardPerformance: (0, _sceneProperties.getBoardPerformance)(scene)
|
|
48
|
-
};
|
|
49
|
-
logger.info(
|
|
54
|
+
});
|
|
55
|
+
logger.info("get whiteboard options success, roomId: ".concat(roomId, ", userId: ").concat(userId, ", boardOptions: ").concat((0, _imports.jsonstring)(boardOptions)));
|
|
50
56
|
(0, _sharedStorage.setWhiteboardOptions)(boardOptions);
|
|
51
57
|
}
|
|
52
58
|
}
|
|
@@ -33,7 +33,7 @@ function validateControllerInitialized(controller, controllerType) {
|
|
|
33
33
|
*/
|
|
34
34
|
function validateRoomJoined(joinRoomSuccess, operation) {
|
|
35
35
|
if (!joinRoomSuccess) {
|
|
36
|
-
throw _errorHelpers.roomControlErrorHelper.createOperationError(
|
|
36
|
+
throw _errorHelpers.roomControlErrorHelper.createOperationError("".concat(operation, ", please join room first"));
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
|