fcr-core 3.10.2 → 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,7 +1,11 @@
|
|
|
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.filter.js");
|
|
8
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
5
9
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
6
10
|
require("core-js/modules/esnext.map.emplace.js");
|
|
7
11
|
require("core-js/modules/esnext.map.every.js");
|
|
@@ -19,6 +23,7 @@ require("core-js/modules/esnext.map.update.js");
|
|
|
19
23
|
require("core-js/modules/esnext.symbol.metadata.js");
|
|
20
24
|
require("core-js/modules/esnext.weak-map.delete-all.js");
|
|
21
25
|
require("core-js/modules/esnext.weak-map.emplace.js");
|
|
26
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
22
27
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
23
28
|
Object.defineProperty(exports, "__esModule", {
|
|
24
29
|
value: true
|
|
@@ -26,6 +31,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
26
31
|
exports.FcrWhiteboardControlImpl = void 0;
|
|
27
32
|
require("core-js/modules/esnext.iterator.constructor.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 _appSlide = _interopRequireDefault(require("@netless/app-slide"));
|
|
30
37
|
var _appliancePlugin = require("@netless/appliance-plugin");
|
|
31
38
|
var netlessVideoPlugin = _interopRequireWildcard(require("@netless/video-js-plugin"));
|
|
@@ -44,8 +51,11 @@ var _type2 = require("../sharing-control/type");
|
|
|
44
51
|
var _type3 = require("../whiteboard-control/type");
|
|
45
52
|
var _boardWindow = require("./board-window");
|
|
46
53
|
var _utils = require("./utils");
|
|
47
|
-
|
|
54
|
+
var _FcrWhiteboardControlImpl;
|
|
55
|
+
let _initProto, _openDecs, _setBackgroundColorDecs, _setOperationPrivilegeDecs, _setBoardWritableDecs, _ref;
|
|
48
56
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
|
|
57
|
+
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; }
|
|
58
|
+
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; }
|
|
49
59
|
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)]; } }; }
|
|
50
60
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
51
61
|
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); }
|
|
@@ -54,22 +64,20 @@ function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side
|
|
|
54
64
|
/**
|
|
55
65
|
* @internal
|
|
56
66
|
*/
|
|
67
|
+
_ref = (_openDecs = [_decorator.bound, (0, _imports.trace)(['params'])], _setBackgroundColorDecs = [_decorator.bound, (0, _imports.trace)(['backgroundColor'])], _setOperationPrivilegeDecs = [_decorator.bound, (0, _imports.trace)(['hasPrivilege'])], _setBoardWritableDecs = (0, _imports.trace)(['granted']), "logger");
|
|
57
68
|
class FcrWhiteboardControlImpl {
|
|
58
|
-
static {
|
|
59
|
-
[_initProto] = _applyDecs(this, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [_openDecs, 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 2, "release"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
|
|
60
|
-
}
|
|
61
|
-
[(_openDecs = [_decorator.bound, (0, _imports.trace)(['params'])], _setBackgroundColorDecs = [_decorator.bound, (0, _imports.trace)(['backgroundColor'])], _setOperationPrivilegeDecs = [_decorator.bound, (0, _imports.trace)(['hasPrivilege'])], _setBoardWritableDecs = (0, _imports.trace)(['granted']), "logger")] = (_initProto(this), (0, _logger.createLogger)({
|
|
62
|
-
prefix: 'FcrWhiteboardControlImpl'
|
|
63
|
-
}));
|
|
64
|
-
_client = {};
|
|
65
|
-
_joined = false;
|
|
66
|
-
_connectState = _2.FcrConnectionState.DISCONNECTED;
|
|
67
|
-
_observable = new _observable.AgoraObservable();
|
|
68
|
-
_options = {
|
|
69
|
-
debug: false
|
|
70
|
-
};
|
|
71
|
-
_hasOperationPrivilege = false;
|
|
72
69
|
constructor(_scene, _api, _sharedCache, hasOperationPrivilege) {
|
|
70
|
+
(0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
71
|
+
prefix: 'FcrWhiteboardControlImpl'
|
|
72
|
+
})));
|
|
73
|
+
(0, _defineProperty2.default)(this, "_client", {});
|
|
74
|
+
(0, _defineProperty2.default)(this, "_joined", false);
|
|
75
|
+
(0, _defineProperty2.default)(this, "_connectState", _2.FcrConnectionState.DISCONNECTED);
|
|
76
|
+
(0, _defineProperty2.default)(this, "_observable", new _observable.AgoraObservable());
|
|
77
|
+
(0, _defineProperty2.default)(this, "_options", {
|
|
78
|
+
debug: false
|
|
79
|
+
});
|
|
80
|
+
(0, _defineProperty2.default)(this, "_hasOperationPrivilege", false);
|
|
73
81
|
this._scene = _scene;
|
|
74
82
|
this._api = _api;
|
|
75
83
|
this._sharedCache = _sharedCache;
|
|
@@ -78,26 +86,26 @@ class FcrWhiteboardControlImpl {
|
|
|
78
86
|
this._addLogObserver();
|
|
79
87
|
_scene.addObserver({
|
|
80
88
|
onScenePropertiesUpdated: (_, event) => {
|
|
89
|
+
var _event$cause;
|
|
81
90
|
const operatorUser = (0, _user.convertRteUserToFcrUser)(event.operatorUser, this._roomCache);
|
|
82
|
-
if (event.cause
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
};
|
|
91
|
+
if (((_event$cause = event.cause) === null || _event$cause === void 0 ? void 0 : _event$cause.cmd) === 10) {
|
|
92
|
+
var _ref3, _event$cause$data$wid2;
|
|
93
|
+
const _ref2 = (_ref3 = _scene.getScenePropertiesByKeyPath('widgets.netlessBoard')) !== null && _ref3 !== void 0 ? _ref3 : {
|
|
94
|
+
state: 0,
|
|
95
|
+
extra: {
|
|
96
|
+
backgroundColor: '#fff'
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
state = _ref2.state,
|
|
100
|
+
bgColor = _ref2.extra.backgroundColor;
|
|
94
101
|
if (state === 1) {
|
|
95
102
|
this._observable.notifyObservers('onActive', _scene.getScenePropertiesByKeyPath('widgets.netlessBoard').ownerUserUuid, operatorUser);
|
|
96
103
|
}
|
|
97
104
|
if (state === 0) {
|
|
98
|
-
|
|
105
|
+
var _event$cause$data$wid;
|
|
106
|
+
this._observable.notifyObservers('onInactive', (_event$cause$data$wid = event.cause.data.widgetCause) === null || _event$cause$data$wid === void 0 || (_event$cause$data$wid = _event$cause$data$wid.data) === null || _event$cause$data$wid === void 0 ? void 0 : _event$cause$data$wid.reason, operatorUser);
|
|
99
107
|
}
|
|
100
|
-
if (event.cause.data.widgetCause
|
|
108
|
+
if (((_event$cause$data$wid2 = event.cause.data.widgetCause) === null || _event$cause$data$wid2 === void 0 ? void 0 : _event$cause$data$wid2.cmd) === 100101) {
|
|
101
109
|
this._observable.notifyObservers('onBackgroundColorUpdated', bgColor, operatorUser);
|
|
102
110
|
}
|
|
103
111
|
}
|
|
@@ -114,7 +122,8 @@ class FcrWhiteboardControlImpl {
|
|
|
114
122
|
async inactive() {
|
|
115
123
|
return (0, _error.handleRequestError)(() => this._api.toggleWhiteboardActivityState(this._scene.sceneId, _type2.FcrSharePermissionState.OFF), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'inactive failed');
|
|
116
124
|
}
|
|
117
|
-
async open(
|
|
125
|
+
async open() {
|
|
126
|
+
let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
118
127
|
this._whiteboardPrivateParameters = params;
|
|
119
128
|
// 白板权限禁用状态下,主持人和联席主持人仍然可以发起共享,所以,不能根据是否禁用状态直接拒绝
|
|
120
129
|
|
|
@@ -165,13 +174,12 @@ class FcrWhiteboardControlImpl {
|
|
|
165
174
|
return _type.FcrReturnCode.SUCCESS;
|
|
166
175
|
}
|
|
167
176
|
getBoardActiveInfo() {
|
|
168
|
-
const {
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
ownerUserUuid
|
|
174
|
-
};
|
|
177
|
+
const _ref4 = this._scene.getScenePropertiesByKeyPath('widgets.netlessBoard') || {
|
|
178
|
+
isActive: false,
|
|
179
|
+
ownerUserUuid: null
|
|
180
|
+
},
|
|
181
|
+
state = _ref4.state,
|
|
182
|
+
ownerUserId = _ref4.ownerUserUuid;
|
|
175
183
|
if (state === _type3.FcrBoardPropertiesState.ACTIVE) {
|
|
176
184
|
return {
|
|
177
185
|
isActive: true,
|
|
@@ -240,23 +248,25 @@ class FcrWhiteboardControlImpl {
|
|
|
240
248
|
}), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, 'get whiteboard token failed');
|
|
241
249
|
}
|
|
242
250
|
_handleRoomStateUpdated(state) {
|
|
243
|
-
const
|
|
244
|
-
memberState
|
|
245
|
-
} = state;
|
|
251
|
+
const memberState = state.memberState;
|
|
246
252
|
if (memberState) {
|
|
247
|
-
const
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
shapeType
|
|
253
|
-
} = memberState;
|
|
253
|
+
const strokeColor = memberState.strokeColor,
|
|
254
|
+
strokeWidth = memberState.strokeWidth,
|
|
255
|
+
currentApplianceName = memberState.currentApplianceName,
|
|
256
|
+
textSize = memberState.textSize,
|
|
257
|
+
shapeType = memberState.shapeType;
|
|
254
258
|
const localState = {};
|
|
255
|
-
const
|
|
259
|
+
const _convertToFcrBoardToo = (0, _utils.convertToFcrBoardToolShape)(currentApplianceName, shapeType),
|
|
260
|
+
_convertToFcrBoardToo2 = (0, _slicedToArray2.default)(_convertToFcrBoardToo, 2),
|
|
261
|
+
tool = _convertToFcrBoardToo2[0],
|
|
262
|
+
shape = _convertToFcrBoardToo2[1];
|
|
256
263
|
localState.tool = tool;
|
|
257
264
|
localState.shape = shape;
|
|
258
265
|
if (typeof strokeColor !== 'undefined') {
|
|
259
|
-
const
|
|
266
|
+
const _strokeColor = (0, _slicedToArray2.default)(strokeColor, 3),
|
|
267
|
+
r = _strokeColor[0],
|
|
268
|
+
g = _strokeColor[1],
|
|
269
|
+
b = _strokeColor[2];
|
|
260
270
|
localState.strokeColor = {
|
|
261
271
|
r,
|
|
262
272
|
g,
|
|
@@ -312,22 +322,21 @@ class FcrWhiteboardControlImpl {
|
|
|
312
322
|
}
|
|
313
323
|
async _connect() {
|
|
314
324
|
try {
|
|
325
|
+
var _this$_scene$getUser, _this$_whiteboardPriv, _this$_whiteboardPriv2, _this$_whiteboardPriv3, _this$_whiteboardPriv4;
|
|
315
326
|
this._updateConnnectionState(_2.FcrConnectionState.CONNECTING);
|
|
316
327
|
const roomId = this._scene.sceneId;
|
|
317
328
|
const userId = this._scene.localUser.getLocalUserId();
|
|
318
|
-
const cursorName = this._scene.getUser(userId)
|
|
319
|
-
const syncMode = this._whiteboardPrivateParameters
|
|
320
|
-
const
|
|
321
|
-
data
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
boardToken
|
|
328
|
-
} = data || {};
|
|
329
|
+
const cursorName = (_this$_scene$getUser = this._scene.getUser(userId)) === null || _this$_scene$getUser === void 0 ? void 0 : _this$_scene$getUser.userName;
|
|
330
|
+
const syncMode = (_this$_whiteboardPriv = (_this$_whiteboardPriv2 = this._whiteboardPrivateParameters) === null || _this$_whiteboardPriv2 === void 0 ? void 0 : _this$_whiteboardPriv2.syncMode) !== null && _this$_whiteboardPriv !== void 0 ? _this$_whiteboardPriv : false;
|
|
331
|
+
const _await$this$_getToken = await this._getToken(roomId, userId),
|
|
332
|
+
data = _await$this$_getToken.data;
|
|
333
|
+
const _ref5 = data || {},
|
|
334
|
+
boardAppId = _ref5.boardAppId,
|
|
335
|
+
boardId = _ref5.boardId,
|
|
336
|
+
boardRegion = _ref5.boardRegion,
|
|
337
|
+
boardToken = _ref5.boardToken;
|
|
329
338
|
const plugins = this._createPlugins();
|
|
330
|
-
this._client = new _whiteWebSdk.WhiteWebSdk({
|
|
339
|
+
this._client = new _whiteWebSdk.WhiteWebSdk(_objectSpread({
|
|
331
340
|
appIdentifier: boardAppId,
|
|
332
341
|
useMobXState: true,
|
|
333
342
|
pptParams: {
|
|
@@ -341,9 +350,8 @@ class FcrWhiteboardControlImpl {
|
|
|
341
350
|
reportDebugLogMode: _whiteWebSdk.LoggerReportMode.AlwaysReport,
|
|
342
351
|
reportLevelMask: this._options.debug ? 'debug' : 'info',
|
|
343
352
|
printLevelMask: this._options.debug ? 'debug' : 'info'
|
|
344
|
-
}
|
|
345
|
-
|
|
346
|
-
});
|
|
353
|
+
}
|
|
354
|
+
}, this._whiteboardPrivateParameters));
|
|
347
355
|
const hasPermission = this._hasOperationPrivilege;
|
|
348
356
|
const joinParams = {
|
|
349
357
|
region: boardRegion,
|
|
@@ -365,7 +373,7 @@ class FcrWhiteboardControlImpl {
|
|
|
365
373
|
cursorName,
|
|
366
374
|
disappearCursor: true
|
|
367
375
|
},
|
|
368
|
-
floatBar: this._whiteboardPrivateParameters
|
|
376
|
+
floatBar: (_this$_whiteboardPriv3 = (_this$_whiteboardPriv4 = this._whiteboardPrivateParameters) === null || _this$_whiteboardPriv4 === void 0 ? void 0 : _this$_whiteboardPriv4.floatBar) !== null && _this$_whiteboardPriv3 !== void 0 ? _this$_whiteboardPriv3 : {
|
|
369
377
|
colors: _utils.textColors.map(color => (0, _utils.hexColorToWhiteboardColor)(color))
|
|
370
378
|
}
|
|
371
379
|
};
|
|
@@ -377,7 +385,7 @@ class FcrWhiteboardControlImpl {
|
|
|
377
385
|
if (hasPermission) {
|
|
378
386
|
room.setViewMode(_whiteWebSdk.ViewMode.Broadcaster);
|
|
379
387
|
}
|
|
380
|
-
this.logger.info(
|
|
388
|
+
this.logger.info("set whiteboard sync mode: ".concat(syncMode));
|
|
381
389
|
room.syncMode = syncMode;
|
|
382
390
|
const mountOptions = {};
|
|
383
391
|
const privateParams = this._whiteboardPrivateParameters;
|
|
@@ -437,4 +445,9 @@ class FcrWhiteboardControlImpl {
|
|
|
437
445
|
this.addObserver((0, _logger.generateLogObserver)(this.logger, [['onActive', ['ownerId', 'operatorUser']], ['onInactive', ['reason', 'operatorUser']], ['onBackgroundColorUpdated', ['color', 'operatorUser']], ['onConnectionStateUpdated', ['state']]]));
|
|
438
446
|
}
|
|
439
447
|
}
|
|
440
|
-
exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
|
|
448
|
+
exports.FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
|
|
449
|
+
_FcrWhiteboardControlImpl = FcrWhiteboardControlImpl;
|
|
450
|
+
var _applyDecs$e = _applyDecs(_FcrWhiteboardControlImpl, [[[_decorator.bound, _imports.trace], 2, "active"], [[_decorator.bound, _imports.trace], 2, "inactive"], [_openDecs, 2, "open"], [[_decorator.bound, _imports.trace], 2, "close"], [[_decorator.bound, _imports.trace], 2, "release"], [_setBackgroundColorDecs, 2, "setBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getActivity"], [[_decorator.bound, _imports.trace], 2, "getOwnerId"], [[_decorator.bound, _imports.trace], 2, "getBackgroundColor"], [[_decorator.bound, _imports.trace], 2, "getConnectionState"], [[_decorator.bound, _imports.trace], 2, "getMainWindow"], [[_decorator.bound, _imports.trace], 2, "addObserver"], [[_decorator.bound, _imports.trace], 2, "removeObserver"], [[_decorator.bound, _imports.trace], 2, "getBoardActiveInfo"], [[_decorator.bound, _imports.trace], 2, "hasOperationPrivilege"], [_setOperationPrivilegeDecs, 2, "setOperationPrivilege"], [_setBoardWritableDecs, 2, "_setBoardWritable"], [_decorator.bound, 2, "_getToken"], [_decorator.bound, 2, "_handleRoomStateUpdated"], [_decorator.bound, 2, "_updateConnnectionState"], [_decorator.bound, 2, "_handleConnectionStateUpdated"], [_imports.trace, 2, "_connect"], [_imports.trace, 2, "_clean"]], []).e;
|
|
451
|
+
var _applyDecs$e2 = (0, _slicedToArray2.default)(_applyDecs$e, 1);
|
|
452
|
+
_initProto = _applyDecs$e2[0];
|
|
453
|
+
_applyDecs$e;
|
|
@@ -1,13 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.BoardMountManager = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
9
|
class BoardMountManager {
|
|
8
|
-
static isMounting = false;
|
|
9
10
|
static setIsMounting(isMounting) {
|
|
10
11
|
BoardMountManager.isMounting = isMounting;
|
|
11
12
|
}
|
|
12
13
|
}
|
|
13
|
-
exports.BoardMountManager = BoardMountManager;
|
|
14
|
+
exports.BoardMountManager = BoardMountManager;
|
|
15
|
+
(0, _defineProperty2.default)(BoardMountManager, "isMounting", false);
|
|
@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.windowClassName = exports.widgetContainerClassName = exports.videoRowClassName = exports.verticalPadding = exports.toolbarClassName = exports.textColors = exports.src2DataURL = exports.sceneNavHeight = exports.mergeCanvasImage = exports.mediaMimeTypes = exports.layoutContentClassName = exports.hexColorToWhiteboardColor = exports.heightPerTool = exports.heightPerColor = exports.getImageSize = exports.fetchImageInfoByUrl = exports.defaultToolsRetain = exports.defaultTextSize = exports.defaultStrokeColor = exports.convertToNetlessStorkeType = exports.convertToNetlessBoardTool = exports.convertToFcrBoardToolShape = exports.WINDOW_TITLE_HEIGHT = exports.WINDOW_REMAIN_SIZE = exports.WINDOW_REMAIN_POSITION = exports.WINDOW_MIN_SIZE = exports.WINDOW_ASPECT_RATIO = void 0;
|
|
7
7
|
require("core-js/modules/es.array.push.js");
|
|
8
|
+
require("core-js/modules/es.regexp.exec.js");
|
|
9
|
+
require("core-js/modules/es.string.replace.js");
|
|
10
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
8
11
|
var _jsMd = require("js-md5");
|
|
9
12
|
var _enum = require("./enum");
|
|
10
13
|
var _appliancePlugin = require("@netless/appliance-plugin");
|
|
@@ -131,8 +134,8 @@ const mergeCanvasImage = async scenes => {
|
|
|
131
134
|
canvasArray.push(canvas);
|
|
132
135
|
}
|
|
133
136
|
}
|
|
134
|
-
bigCanvas.setAttribute('width',
|
|
135
|
-
bigCanvas.setAttribute('height',
|
|
137
|
+
bigCanvas.setAttribute('width', "".concat(width));
|
|
138
|
+
bigCanvas.setAttribute('height', "".concat(height * canvasArray.length));
|
|
136
139
|
canvasArray.forEach((canvas, index) => {
|
|
137
140
|
ctx && ctx.drawImage(canvas, 0, index * height, width, height);
|
|
138
141
|
});
|
|
@@ -230,22 +233,22 @@ const convertToFcrBoardToolShape = (tool, shape) => {
|
|
|
230
233
|
case _enum.ApplianceNames.hand:
|
|
231
234
|
return [_enum.FcrBoardToolType.HAND];
|
|
232
235
|
}
|
|
233
|
-
switch (
|
|
234
|
-
case
|
|
236
|
+
switch ("".concat(tool || '').concat(shape || '')) {
|
|
237
|
+
case "".concat(_enum.ApplianceNames.rectangle):
|
|
235
238
|
return [, _enum.FcrBoardShape.Rectangle];
|
|
236
|
-
case
|
|
239
|
+
case "".concat(_enum.ApplianceNames.ellipse):
|
|
237
240
|
return [, _enum.FcrBoardShape.Ellipse];
|
|
238
|
-
case
|
|
241
|
+
case "".concat(_enum.ApplianceNames.straight):
|
|
239
242
|
return [, _enum.FcrBoardShape.Straight];
|
|
240
|
-
case
|
|
243
|
+
case "".concat(_enum.ApplianceNames.arrow):
|
|
241
244
|
return [, _enum.FcrBoardShape.Arrow];
|
|
242
|
-
case
|
|
245
|
+
case "".concat(_enum.ApplianceNames.pencil):
|
|
243
246
|
return [, _enum.FcrBoardShape.Curve];
|
|
244
|
-
case
|
|
247
|
+
case "".concat(_enum.ApplianceNames.shape).concat(_enum.ShapeType.Triangle):
|
|
245
248
|
return [, _enum.FcrBoardShape.Triangle];
|
|
246
|
-
case
|
|
249
|
+
case "".concat((_enum.ApplianceNames.shape, _enum.ShapeType.Pentagram)):
|
|
247
250
|
return [, _enum.FcrBoardShape.Pentagram];
|
|
248
|
-
case
|
|
251
|
+
case "".concat(_enum.ApplianceNames.shape).concat(_enum.ShapeType.Rhombus):
|
|
249
252
|
return [, _enum.FcrBoardShape.Rhombus];
|
|
250
253
|
}
|
|
251
254
|
return [];
|
|
@@ -272,9 +275,9 @@ const src2DataURL = src => {
|
|
|
272
275
|
const ctx = canvas.getContext('2d');
|
|
273
276
|
const image = new Image();
|
|
274
277
|
image.onload = () => {
|
|
275
|
-
canvas.setAttribute('width',
|
|
276
|
-
canvas.setAttribute('height',
|
|
277
|
-
ctx
|
|
278
|
+
canvas.setAttribute('width', "".concat(image.width));
|
|
279
|
+
canvas.setAttribute('height', "".concat(image.height));
|
|
280
|
+
ctx === null || ctx === void 0 || ctx.drawImage(image, 0, 0);
|
|
278
281
|
resolve(canvas.toDataURL('image/jpeg', 0.8));
|
|
279
282
|
};
|
|
280
283
|
image.onerror = () => {
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
4
|
Object.defineProperty(exports, "__esModule", {
|
|
4
5
|
value: true
|
|
5
6
|
});
|
|
6
7
|
exports.FcrStandaloneAnnotationControlImpl = exports.FcrAnnotationControlImpl = void 0;
|
|
8
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
9
|
var _error = require("../../../utilities/error");
|
|
8
10
|
var _logger = require("../../../utilities/logger");
|
|
9
11
|
var _base = require("../base");
|
|
@@ -16,20 +18,22 @@ const addBoardConnectingObserver = (board, sceneConfig) => {
|
|
|
16
18
|
onConnectionStateUpdated: state => {
|
|
17
19
|
if (state === _type2.AgoraRteConnectionState.CONNECTED) {
|
|
18
20
|
if (sceneConfig.isAndroidByOwner()) {
|
|
19
|
-
|
|
21
|
+
var _board$getMainWindow;
|
|
22
|
+
(_board$getMainWindow = board.getMainWindow()) === null || _board$getMainWindow === void 0 || _board$getMainWindow.setAutoCancelDraw(true);
|
|
20
23
|
} else {
|
|
21
|
-
|
|
24
|
+
var _board$getMainWindow2;
|
|
25
|
+
(_board$getMainWindow2 = board.getMainWindow()) === null || _board$getMainWindow2 === void 0 || _board$getMainWindow2.setAutoCancelDraw(false);
|
|
22
26
|
}
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
});
|
|
26
30
|
};
|
|
27
31
|
class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
|
|
28
|
-
logger = (0, _logger.createLogger)({
|
|
29
|
-
prefix: 'FcrAnnotationControlImpl'
|
|
30
|
-
});
|
|
31
32
|
constructor(rtmClient, config, forgeInitConfigFetcher, _sceneConfig, _api) {
|
|
32
33
|
super(rtmClient, config, forgeInitConfigFetcher, _api);
|
|
34
|
+
(0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
|
|
35
|
+
prefix: 'FcrAnnotationControlImpl'
|
|
36
|
+
}));
|
|
33
37
|
this.rtmClient = rtmClient;
|
|
34
38
|
this.config = config;
|
|
35
39
|
this._sceneConfig = _sceneConfig;
|
|
@@ -43,7 +47,7 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
|
|
|
43
47
|
} catch (e) {
|
|
44
48
|
const error = e;
|
|
45
49
|
const errorMessage = error.message;
|
|
46
|
-
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED,
|
|
50
|
+
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.FCR_ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, "sync screen share owner annotation open done failed: ".concat(errorMessage), errorMessage);
|
|
47
51
|
}
|
|
48
52
|
}
|
|
49
53
|
async syncWhiteboardWriteCount(isWritable) {
|
|
@@ -51,7 +55,7 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
|
|
|
51
55
|
roomId: this.config.roomId,
|
|
52
56
|
userId: this.config.userId,
|
|
53
57
|
state: isWritable ? 1 : 0
|
|
54
|
-
}), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD,
|
|
58
|
+
}), _imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, "set whiteboard write permission to ".concat(isWritable, " failed"));
|
|
55
59
|
return 0;
|
|
56
60
|
}
|
|
57
61
|
async open() {
|
|
@@ -78,11 +82,11 @@ class FcrAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
|
|
|
78
82
|
}
|
|
79
83
|
exports.FcrAnnotationControlImpl = FcrAnnotationControlImpl;
|
|
80
84
|
class FcrStandaloneAnnotationControlImpl extends _base.FcrBaseWhiteboardControlImpl {
|
|
81
|
-
logger = (0, _logger.createLogger)({
|
|
82
|
-
prefix: 'FcrStandaloneAnnotationControlImpl'
|
|
83
|
-
});
|
|
84
85
|
constructor(rtmClient, config, forgeInitConfigFetcher, _sceneConfig) {
|
|
85
86
|
super(rtmClient, config, forgeInitConfigFetcher);
|
|
87
|
+
(0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
|
|
88
|
+
prefix: 'FcrStandaloneAnnotationControlImpl'
|
|
89
|
+
}));
|
|
86
90
|
this.rtmClient = rtmClient;
|
|
87
91
|
this.config = config;
|
|
88
92
|
this._sceneConfig = _sceneConfig;
|
|
@@ -1,25 +1,35 @@
|
|
|
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.FcrAnnotationControlFactoryImpl = void 0;
|
|
7
12
|
require("core-js/modules/es.json.stringify.js");
|
|
13
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
8
14
|
var _control = require("./control");
|
|
9
15
|
var _logger = require("../../../utilities/logger");
|
|
10
16
|
var _error = require("../../../utilities/error");
|
|
11
17
|
var _sharedStorage = require("../../../utilities/shared-storage");
|
|
12
18
|
var _imports = require("../../../imports");
|
|
19
|
+
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; }
|
|
20
|
+
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; }
|
|
13
21
|
class FcrAnnotationControlFactoryImpl {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
22
|
+
constructor() {
|
|
23
|
+
(0, _defineProperty2.default)(this, "logger", (0, _logger.createLogger)({
|
|
24
|
+
prefix: 'FcrAnnotationControlFactory'
|
|
25
|
+
}));
|
|
26
|
+
}
|
|
17
27
|
createForSubProcess(rtmClient, config, annotationSceneConfig) {
|
|
18
|
-
this.logger.info(
|
|
28
|
+
this.logger.info("create for sub process with config: ".concat(JSON.stringify(config)));
|
|
19
29
|
return new _control.FcrStandaloneAnnotationControlImpl(rtmClient, config, () => {
|
|
20
30
|
const forgeInitConfig = (0, _sharedStorage.getAnnotationBoardOptions)();
|
|
21
31
|
if (!forgeInitConfig) {
|
|
22
|
-
throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR,
|
|
32
|
+
throw (0, _error.generateFcrCoreClientError)(_imports.ErrorModuleCode.FCR_ROOM_WHITEBOARD, _imports.DetailErrorCode.UNDEFINED_ERROR, "whiteboard init config is not exist");
|
|
23
33
|
}
|
|
24
34
|
return Promise.resolve(forgeInitConfig);
|
|
25
35
|
}, annotationSceneConfig);
|
|
@@ -38,10 +48,9 @@ class FcrAnnotationControlFactoryImpl {
|
|
|
38
48
|
};
|
|
39
49
|
return async () => {
|
|
40
50
|
const response = await getObjectInitConfig(roomId, userId);
|
|
41
|
-
return {
|
|
42
|
-
...response.data,
|
|
51
|
+
return _objectSpread(_objectSpread({}, response.data), {}, {
|
|
43
52
|
boardPerformance
|
|
44
|
-
};
|
|
53
|
+
});
|
|
45
54
|
};
|
|
46
55
|
}
|
|
47
56
|
}
|