fcr-core 3.7.9-alpha → 3.8.0-alpha
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/chat-connection/index.d.ts +1 -1
- package/lib/chat-connection/index.js +41 -26
- package/lib/engine/index.js +72 -78
- package/lib/imports.d.ts +7 -2
- package/lib/imports.js +26 -4
- package/lib/index.d.ts +2 -2
- package/lib/index.js +12 -0
- package/lib/media-control/desktop.js +22 -17
- package/lib/media-control/mobile.js +38 -33
- package/lib/media-control/type.d.ts +8 -0
- package/lib/monitor-control/index.js +10 -5
- package/lib/peer-session/index.js +48 -39
- package/lib/plugins/chatroom.js +237 -205
- package/lib/room-control/ability-control/index.js +14 -9
- package/lib/room-control/ability-control/type.d.ts +4 -1
- package/lib/room-control/ability-control/type.js +3 -0
- package/lib/room-control/group-control/index.js +21 -16
- package/lib/room-control/helpers/constants.d.ts +4 -0
- package/lib/room-control/helpers/constants.js +5 -1
- package/lib/room-control/helpers/validation-helper.js +1 -1
- package/lib/room-control/index.js +66 -38
- package/lib/room-control/interpreter-control/index.js +49 -38
- 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 +90 -17
- package/lib/room-control/privilege-control/helper.js +8 -5
- package/lib/room-control/privilege-control/index.js +66 -19
- package/lib/room-control/privilege-control/type.d.ts +57 -10
- package/lib/room-control/privilege-control/type.js +17 -0
- package/lib/room-control/room-connector-control/index.js +28 -19
- package/lib/room-control/room-control-factory.js +3 -2
- package/lib/room-control/room-session/index.js +68 -49
- package/lib/room-control/room-session/type.d.ts +2 -2
- package/lib/room-control/shared-cache.js +36 -29
- package/lib/room-control/sharing-control/index.d.ts +5 -5
- package/lib/room-control/sharing-control/index.js +81 -43
- package/lib/room-control/sharing-control/type.d.ts +9 -5
- package/lib/room-control/sharing-control/type.js +6 -1
- package/lib/room-control/stream-control/index.d.ts +8 -1
- package/lib/room-control/stream-control/index.js +310 -199
- package/lib/room-control/stream-control/type.d.ts +6 -0
- package/lib/room-control/stt-control/de-compress-gzip.d.ts +1 -0
- package/lib/room-control/stt-control/de-compress-gzip.js +49 -0
- package/lib/room-control/stt-control/index.d.ts +1 -0
- package/lib/room-control/stt-control/index.js +353 -0
- package/lib/room-control/stt-control/type.d.ts +142 -0
- package/lib/room-control/stt-control/type.js +16 -0
- package/lib/room-control/type.d.ts +15 -0
- package/lib/room-control/type.js +13 -1
- package/lib/room-control/user-control/index.js +143 -136
- package/lib/room-control/waitingroom-control/index.js +14 -9
- package/lib/room-control/whiteboard-control/enum.d.ts +15 -0
- package/lib/room-control/whiteboard-control/{types.js → enum.js} +12 -1
- package/lib/room-control/whiteboard-control/type.d.ts +38 -0
- package/lib/room-control/whiteboard-control/type.js +15 -0
- package/lib/room-control/whiteboard-control/utils.d.ts +3 -0
- package/lib/room-control/whiteboard-control/utils.js +23 -0
- package/lib/room-control/whiteboard-control-v1/board-subwindow.d.ts +6 -0
- package/lib/room-control/whiteboard-control-v1/board-subwindow.js +26 -0
- package/lib/room-control/whiteboard-control-v1/board-window.d.ts +58 -0
- package/lib/room-control/whiteboard-control-v1/board-window.js +571 -0
- package/lib/room-control/{whiteboard-control/enums.d.ts → whiteboard-control-v1/enum.d.ts} +3 -17
- package/lib/room-control/{whiteboard-control/enums.js → whiteboard-control-v1/enum.js} +3 -20
- package/lib/room-control/whiteboard-control-v1/factory.d.ts +9 -0
- package/lib/room-control/whiteboard-control-v1/factory.js +22 -0
- package/lib/room-control/whiteboard-control-v1/index.d.ts +1 -0
- package/lib/room-control/whiteboard-control-v1/index.js +440 -0
- package/lib/room-control/whiteboard-control-v1/mount-manager.d.ts +4 -0
- package/lib/room-control/whiteboard-control-v1/mount-manager.js +15 -0
- package/lib/room-control/whiteboard-control-v1/type.d.ts +300 -0
- package/lib/room-control/whiteboard-control-v1/type.js +13 -0
- package/lib/room-control/whiteboard-control-v1/utils.d.ts +53 -0
- package/lib/room-control/whiteboard-control-v1/utils.js +290 -0
- package/lib/room-control/whiteboard-control-v2/annotation-control/control.d.ts +17 -31
- package/lib/room-control/whiteboard-control-v2/annotation-control/control.js +42 -228
- package/lib/room-control/whiteboard-control-v2/annotation-control/factory.d.ts +10 -0
- package/lib/room-control/whiteboard-control-v2/annotation-control/factory.js +48 -0
- package/lib/room-control/whiteboard-control-v2/annotation-control/type.d.ts +11 -19
- package/lib/room-control/whiteboard-control-v2/annotation-control/type.js +1 -3
- package/lib/room-control/whiteboard-control-v2/base/index.d.ts +42 -0
- package/lib/room-control/whiteboard-control-v2/base/index.js +317 -0
- package/lib/room-control/whiteboard-control-v2/{main-window.d.ts → base/main-window.d.ts} +6 -4
- package/lib/room-control/whiteboard-control-v2/{main-window.js → base/main-window.js} +54 -36
- package/lib/room-control/whiteboard-control-v2/constant.d.ts +6 -0
- package/lib/room-control/whiteboard-control-v2/constant.js +15 -0
- package/lib/room-control/whiteboard-control-v2/enum.d.ts +26 -0
- package/lib/room-control/whiteboard-control-v2/enum.js +34 -0
- package/lib/room-control/{whiteboard-control/types.d.ts → whiteboard-control-v2/type.d.ts} +51 -165
- package/lib/room-control/whiteboard-control-v2/type.js +5 -0
- package/lib/room-control/whiteboard-control-v2/utils.d.ts +5 -4
- package/lib/room-control/whiteboard-control-v2/utils.js +29 -27
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/control.d.ts +34 -33
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/control.js +131 -187
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/factory.d.ts +11 -0
- package/lib/room-control/whiteboard-control-v2/{annotation-control/index.js → whiteboard-control/factory.js} +40 -38
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/type.d.ts +18 -30
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/type.js +1 -9
- package/lib/room-router/index.js +56 -42
- package/lib/schema.d.ts +23 -9
- package/lib/schema.js +10 -4
- package/lib/service/api.d.ts +75 -19
- package/lib/service/api.js +401 -208
- package/lib/type.d.ts +15 -2
- package/lib/type.js +13 -0
- package/lib/utilities/collection.js +3 -2
- package/lib/utilities/error-helpers.d.ts +2 -1
- package/lib/utilities/error-helpers.js +35 -27
- package/lib/utilities/error.d.ts +1 -0
- package/lib/utilities/error.js +10 -8
- package/lib/utilities/join-helper.js +32 -25
- package/lib/utilities/logger.d.ts +2 -2
- package/lib/utilities/logger.js +6 -3
- package/lib/utilities/parameters.js +8 -4
- package/lib/utilities/retry-helpers.js +1 -0
- package/lib/utilities/shared-storage.d.ts +3 -1
- package/lib/utilities/shared-storage.js +10 -1
- package/lib/utilities/storage.js +1 -0
- package/lib/utilities/stream.js +16 -11
- package/lib/utilities/user.js +4 -3
- package/lib/utilities/validate-params.js +2 -1
- package/package.json +11 -5
- package/lib/room-control/whiteboard-control-v2/annotation-control/index.d.ts +0 -19
- package/lib/room-control/whiteboard-control-v2/annotation-control/privilege-control.d.ts +0 -36
- package/lib/room-control/whiteboard-control-v2/annotation-control/privilege-control.js +0 -252
- package/lib/room-control/whiteboard-control-v2/index.d.ts +0 -38
- package/lib/room-control/whiteboard-control-v2/index.js +0 -274
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/index.d.ts +0 -17
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/index.js +0 -30
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/privilege-control.d.ts +0 -36
- package/lib/room-control/whiteboard-control-v2/whiteboard-control/privilege-control.js +0 -240
|
@@ -6,7 +6,7 @@ export declare class FcrChatConnectionImpl implements FcrChatConnection {
|
|
|
6
6
|
private _api;
|
|
7
7
|
private _chatIpList?;
|
|
8
8
|
private _restIpList?;
|
|
9
|
-
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
9
|
+
protected logger: import("agora-foundation/lib/logger/type").Logger;
|
|
10
10
|
private _observable;
|
|
11
11
|
private _initConfig?;
|
|
12
12
|
private _conn?;
|
|
@@ -1,7 +1,12 @@
|
|
|
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.constructor.js");
|
|
8
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
9
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
5
10
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
6
11
|
require("core-js/modules/esnext.map.emplace.js");
|
|
7
12
|
require("core-js/modules/esnext.map.every.js");
|
|
@@ -17,36 +22,41 @@ require("core-js/modules/esnext.map.reduce.js");
|
|
|
17
22
|
require("core-js/modules/esnext.map.some.js");
|
|
18
23
|
require("core-js/modules/esnext.map.update.js");
|
|
19
24
|
require("core-js/modules/esnext.symbol.metadata.js");
|
|
25
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
20
26
|
Object.defineProperty(exports, "__esModule", {
|
|
21
27
|
value: true
|
|
22
28
|
});
|
|
23
29
|
exports.FcrChatConnectionImpl = void 0;
|
|
30
|
+
require("core-js/modules/es.json.stringify.js");
|
|
31
|
+
require("core-js/modules/es.regexp.exec.js");
|
|
32
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
33
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
24
34
|
var _imports = require("../imports");
|
|
25
35
|
var _type = require("./type");
|
|
26
36
|
var _config = require("./config");
|
|
27
37
|
var _logger = require("../utilities/logger");
|
|
28
38
|
var _packageInfo = require("../utilities/package-info");
|
|
39
|
+
var _FcrChatConnectionImpl;
|
|
29
40
|
let _initProto;
|
|
41
|
+
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; }
|
|
42
|
+
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; }
|
|
30
43
|
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)]; } }; }
|
|
31
44
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
32
45
|
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); }
|
|
33
46
|
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; }
|
|
34
47
|
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; }
|
|
35
48
|
class FcrChatConnectionImpl {
|
|
36
|
-
static {
|
|
37
|
-
[_initProto] = _applyDecs(this, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e;
|
|
38
|
-
}
|
|
39
|
-
logger = (_initProto(this), (0, _logger.createLogger)({
|
|
40
|
-
prefix: 'FcrChatConnectionImpl'
|
|
41
|
-
}));
|
|
42
|
-
_observable = new _imports.AgoraObservable();
|
|
43
|
-
_connectionState = _type.FcrChatConnectionState.DISCONNECTED;
|
|
44
49
|
constructor(_userId, _api, _chatIpList, _restIpList) {
|
|
50
|
+
(0, _defineProperty2.default)(this, "logger", (_initProto(this), (0, _logger.createLogger)({
|
|
51
|
+
prefix: 'FcrChatConnectionImpl'
|
|
52
|
+
})));
|
|
53
|
+
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
54
|
+
(0, _defineProperty2.default)(this, "_connectionState", _type.FcrChatConnectionState.DISCONNECTED);
|
|
45
55
|
this._userId = _userId;
|
|
46
56
|
this._api = _api;
|
|
47
57
|
this._chatIpList = _chatIpList;
|
|
48
58
|
this._restIpList = _restIpList;
|
|
49
|
-
this.logger.info(
|
|
59
|
+
this.logger.info("Chat Version: easemob-websdk@".concat((0, _packageInfo.getDependenciesInfo)('easemob-websdk')));
|
|
50
60
|
}
|
|
51
61
|
async login() {
|
|
52
62
|
const privateConfig = this._getPrivateConfig();
|
|
@@ -56,13 +66,11 @@ class FcrChatConnectionImpl {
|
|
|
56
66
|
await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
|
|
57
67
|
const tokenResult = await this._api.getUserToken(this._userId);
|
|
58
68
|
this._initConfig = tokenResult;
|
|
59
|
-
const connParams = {
|
|
60
|
-
..._config.agoraChatConfig,
|
|
61
|
-
...privateConfig,
|
|
69
|
+
const connParams = _objectSpread(_objectSpread(_objectSpread({}, _config.agoraChatConfig), privateConfig), {}, {
|
|
62
70
|
appKey: tokenResult.appKey,
|
|
63
71
|
autoReconnectNumMax: 99999,
|
|
64
72
|
isFixedDeviceId: false
|
|
65
|
-
};
|
|
73
|
+
});
|
|
66
74
|
_imports.EasemobChatSDK.logger.setConsoleLogVisibility(false);
|
|
67
75
|
this._conn = new _imports.EasemobChatSDK.connection(connParams);
|
|
68
76
|
this._addEventListeners();
|
|
@@ -70,25 +78,27 @@ class FcrChatConnectionImpl {
|
|
|
70
78
|
accessToken: this._initConfig.token,
|
|
71
79
|
user: this._userId
|
|
72
80
|
});
|
|
73
|
-
this.logger.info(
|
|
81
|
+
this.logger.info("onConnectionLoginSuccess, token: ".concat(this._initConfig.token, ", userId: ").concat(this._userId));
|
|
74
82
|
this._observable.notifyObservers('onConnectionLoginSuccess');
|
|
75
83
|
}, [], {
|
|
76
84
|
retriesMax: 3
|
|
77
|
-
}).fail(async
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
85
|
+
}).fail(async _ref => {
|
|
86
|
+
let {
|
|
87
|
+
error,
|
|
88
|
+
timeFn,
|
|
89
|
+
currentRetry
|
|
90
|
+
} = _ref;
|
|
82
91
|
if (error instanceof _imports.AgoraRestfulClientError) {
|
|
83
92
|
throw error;
|
|
84
93
|
}
|
|
85
|
-
this.logger.error(
|
|
94
|
+
this.logger.error("retry to login ChatConnection, ".concat(error.message, ",retry ").concat(currentRetry, " times"));
|
|
86
95
|
await timeFn();
|
|
87
96
|
return true;
|
|
88
97
|
}).exec());
|
|
89
98
|
}
|
|
90
99
|
_addEventListeners() {
|
|
91
|
-
|
|
100
|
+
var _this$_conn;
|
|
101
|
+
(_this$_conn = this._conn) === null || _this$_conn === void 0 || _this$_conn.addEventHandler('connectionListener', {
|
|
92
102
|
onError: e => {
|
|
93
103
|
this.logger.error('onError', e.message);
|
|
94
104
|
},
|
|
@@ -119,7 +129,8 @@ class FcrChatConnectionImpl {
|
|
|
119
129
|
});
|
|
120
130
|
}
|
|
121
131
|
logout() {
|
|
122
|
-
|
|
132
|
+
var _this$_conn2;
|
|
133
|
+
(_this$_conn2 = this._conn) === null || _this$_conn2 === void 0 || _this$_conn2.close();
|
|
123
134
|
}
|
|
124
135
|
_setConnectionState(state) {
|
|
125
136
|
this._connectionState = state;
|
|
@@ -138,18 +149,22 @@ class FcrChatConnectionImpl {
|
|
|
138
149
|
this._observable.removeObserver(observer);
|
|
139
150
|
}
|
|
140
151
|
_getPrivateConfig() {
|
|
141
|
-
|
|
152
|
+
var _this$_chatIpList, _this$_restIpList;
|
|
153
|
+
if ((_this$_chatIpList = this._chatIpList) !== null && _this$_chatIpList !== void 0 && _this$_chatIpList.length || (_this$_restIpList = this._restIpList) !== null && _this$_restIpList !== void 0 && _this$_restIpList.length) {
|
|
154
|
+
var _this$_chatIpList2, _this$_restIpList2;
|
|
142
155
|
const privateConfig = {
|
|
143
156
|
isHttpDNS: false
|
|
144
157
|
};
|
|
145
|
-
if (this._chatIpList
|
|
158
|
+
if ((_this$_chatIpList2 = this._chatIpList) !== null && _this$_chatIpList2 !== void 0 && _this$_chatIpList2.length) {
|
|
146
159
|
privateConfig.url = this._chatIpList[0];
|
|
147
160
|
}
|
|
148
|
-
if (this._restIpList
|
|
161
|
+
if ((_this$_restIpList2 = this._restIpList) !== null && _this$_restIpList2 !== void 0 && _this$_restIpList2.length) {
|
|
149
162
|
privateConfig.apiUrl = this._restIpList[0];
|
|
150
163
|
}
|
|
151
164
|
return privateConfig;
|
|
152
165
|
}
|
|
153
166
|
}
|
|
154
167
|
}
|
|
155
|
-
exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
168
|
+
exports.FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
169
|
+
_FcrChatConnectionImpl = FcrChatConnectionImpl;
|
|
170
|
+
[_initProto] = _applyDecs(_FcrChatConnectionImpl, [[_imports.trace, 2, "login"], [_imports.trace, 2, "logout"]], []).e;
|
package/lib/engine/index.js
CHANGED
|
@@ -1,6 +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/esnext.function.metadata.js");
|
|
6
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
7
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
4
8
|
require("core-js/modules/esnext.map.delete-all.js");
|
|
5
9
|
require("core-js/modules/esnext.map.emplace.js");
|
|
6
10
|
require("core-js/modules/esnext.map.every.js");
|
|
@@ -22,8 +26,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
22
26
|
});
|
|
23
27
|
exports.FcrCoreEngine = void 0;
|
|
24
28
|
require("core-js/modules/es.array.push.js");
|
|
29
|
+
require("core-js/modules/es.json.stringify.js");
|
|
30
|
+
require("core-js/modules/es.regexp.exec.js");
|
|
25
31
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
26
32
|
require("core-js/modules/esnext.iterator.map.js");
|
|
33
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
34
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
27
35
|
var _imports = require("../imports");
|
|
28
36
|
var _api = require("../service/api");
|
|
29
37
|
var _monitorControl = require("../monitor-control");
|
|
@@ -50,48 +58,30 @@ var _error2 = require("agora-rte-sdk/lib/core/utilities/error");
|
|
|
50
58
|
var _roomRouter = require("../room-router");
|
|
51
59
|
var _sharedCache = require("../room-control/shared-cache");
|
|
52
60
|
var _packageInfo = require("../utilities/package-info");
|
|
53
|
-
|
|
61
|
+
var _FcrCoreEngine;
|
|
62
|
+
let _initProto, _createMainRoomControlDecs, _createWaitingRoomControlDecs, _createRoomRouterDecs, _createRoomControlAndJoinDecs, _sendPeerMessageDecs, _setParametersDecs, _ref;
|
|
63
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
64
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
54
65
|
function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
|
|
55
66
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
56
67
|
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
57
68
|
function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
|
|
58
69
|
function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
|
|
70
|
+
_ref = (_createMainRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger");
|
|
59
71
|
class FcrCoreEngine {
|
|
60
|
-
static {
|
|
61
|
-
[_initProto] = _applyDecs(this, [[_imports.trace, 2, "release"], [_imports.trace, 2, "login"], [_imports.trace, 2, "logout"], [_imports.trace, 2, "renewUserToken"], [_imports.trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [_imports.trace, 2, "getDesktopMediaControl"], [_imports.trace, 2, "getMobileMediaControl"], [_imports.trace, 2, "getMonitorControl"], [_imports.trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
|
|
62
|
-
}
|
|
63
|
-
// @internal
|
|
64
|
-
[(_createMainRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createWaitingRoomControlDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomRouterDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema)], _createRoomControlAndJoinDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringSchema, _schema.fcrRoomJoinOptionsSchema)], _sendPeerMessageDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema, _schema.booleanSchema, _schema.stringSchema)], _setParametersDecs = [_imports.trace, (0, _validateParams.default)(_schema.stringKeyUnknownValueSchema)], "logger")] = (_initProto(this), (0, _logger.createLogger)({
|
|
65
|
-
prefix: 'FcrCoreEngine'
|
|
66
|
-
}));
|
|
67
|
-
// @internal
|
|
68
|
-
|
|
69
|
-
// @internal
|
|
70
|
-
|
|
71
|
-
// @internal
|
|
72
|
-
|
|
73
|
-
// @internal
|
|
74
|
-
|
|
75
|
-
// @internal
|
|
76
|
-
|
|
77
|
-
// @internal
|
|
78
|
-
|
|
79
|
-
// @internal
|
|
80
|
-
|
|
81
|
-
// @internal
|
|
82
|
-
|
|
83
|
-
// @internal
|
|
84
|
-
|
|
85
|
-
// @internal
|
|
86
|
-
_isLoggingIn = false;
|
|
87
|
-
// @internal
|
|
88
|
-
_sharedCache = new _sharedCache.FcrSharedCache();
|
|
89
|
-
// @internal
|
|
90
|
-
_lock = new _imports.Mutex();
|
|
91
|
-
|
|
92
|
-
// @internal
|
|
93
|
-
_observable = new _imports.AgoraObservable();
|
|
94
72
|
constructor(config) {
|
|
73
|
+
// @internal
|
|
74
|
+
(0, _defineProperty2.default)(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
75
|
+
prefix: 'FcrCoreEngine'
|
|
76
|
+
})));
|
|
77
|
+
// @internal
|
|
78
|
+
(0, _defineProperty2.default)(this, "_isLoggingIn", false);
|
|
79
|
+
// @internal
|
|
80
|
+
(0, _defineProperty2.default)(this, "_sharedCache", new _sharedCache.FcrSharedCache());
|
|
81
|
+
// @internal
|
|
82
|
+
(0, _defineProperty2.default)(this, "_lock", new _imports.Mutex());
|
|
83
|
+
// @internal
|
|
84
|
+
(0, _defineProperty2.default)(this, "_observable", new _imports.AgoraObservable());
|
|
95
85
|
this._config = config;
|
|
96
86
|
(0, _domainHolder.resetSharedDomainHolder)();
|
|
97
87
|
this.logger.info('Fcr core engine is created, version: ', this.getVersion());
|
|
@@ -99,7 +89,7 @@ class FcrCoreEngine {
|
|
|
99
89
|
this._rteEngine = new _imports.AgoraRteEngine({
|
|
100
90
|
appId: config.appId,
|
|
101
91
|
userId: config.userId,
|
|
102
|
-
|
|
92
|
+
userToken: config.token,
|
|
103
93
|
rteRegion: config.region,
|
|
104
94
|
rtcRegion: _imports.AgoraRtcRegion.AREA_GLOBAL,
|
|
105
95
|
rtmRegion: _imports.AgoraRtmRegion.AREA_GLOBAL,
|
|
@@ -111,7 +101,7 @@ class FcrCoreEngine {
|
|
|
111
101
|
dualScreenVideoStreamConfig: config.dualScreenVideoStreamConfig,
|
|
112
102
|
parameters: parameters
|
|
113
103
|
});
|
|
114
|
-
this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(config.region));
|
|
104
|
+
this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(config.region), this._rteEngine.getRequestScheduler());
|
|
115
105
|
this._apiService = new _api.FcrCoreServiceApi(this._restfulClient, config.appId, config.region, !(0, _parameters.isEndpointRegionDisabled)(config.parameters));
|
|
116
106
|
|
|
117
107
|
// cannot be lazy loaded, because all the observers should be added before the engine is started
|
|
@@ -180,12 +170,11 @@ class FcrCoreEngine {
|
|
|
180
170
|
return (0, _imports.getVersion)();
|
|
181
171
|
}
|
|
182
172
|
getDependencyVersions() {
|
|
183
|
-
return {
|
|
184
|
-
...this._rteEngine.getDependencyVersions(),
|
|
173
|
+
return _objectSpread(_objectSpread({}, this._rteEngine.getDependencyVersions()), {}, {
|
|
185
174
|
rte: this._rteEngine.getVersion(),
|
|
186
175
|
whiteboard: (0, _packageInfo.getDependenciesInfo)('@netless/forge-whiteboard'),
|
|
187
176
|
easemob: (0, _packageInfo.getDependenciesInfo)('easemob-websdk')
|
|
188
|
-
};
|
|
177
|
+
});
|
|
189
178
|
}
|
|
190
179
|
|
|
191
180
|
/**
|
|
@@ -197,7 +186,7 @@ class FcrCoreEngine {
|
|
|
197
186
|
const scene = this._rteEngine.createScene({
|
|
198
187
|
sceneId: roomId
|
|
199
188
|
});
|
|
200
|
-
return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache));
|
|
189
|
+
return new _mainroomControl.FcrMainRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
|
|
201
190
|
}
|
|
202
191
|
|
|
203
192
|
/**
|
|
@@ -209,7 +198,7 @@ class FcrCoreEngine {
|
|
|
209
198
|
const scene = this._rteEngine.createScene({
|
|
210
199
|
sceneId: roomId
|
|
211
200
|
});
|
|
212
|
-
return new _waitingroomControl.FcrWaitingRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache));
|
|
201
|
+
return new _waitingroomControl.FcrWaitingRoomControlImpl(this._rteEngine, scene, this._apiService, this._config, this._sharedCache, this._chatConnection, new _chatroom.FcrChatRoomControlImpl(scene, this._chatConnection, this._sharedCache, false));
|
|
213
202
|
}
|
|
214
203
|
|
|
215
204
|
/**
|
|
@@ -233,27 +222,30 @@ class FcrCoreEngine {
|
|
|
233
222
|
} = this._rteEngine.getConfig();
|
|
234
223
|
let roomControl = null;
|
|
235
224
|
let [error] = await (0, _imports.to)((0, _imports.retryAttempt)(async () => {
|
|
236
|
-
const res = await (0, _error.handleRequestError)(() =>
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
225
|
+
const res = await (0, _error.handleRequestError)(() => {
|
|
226
|
+
var _options$createStream;
|
|
227
|
+
return this._apiService.checkIn({
|
|
228
|
+
userName: options.userName,
|
|
229
|
+
userId,
|
|
230
|
+
userRole: _type.FcrUserRoleToStringMap[options.userRole],
|
|
231
|
+
userProperties: options.userProperties,
|
|
232
|
+
roomId,
|
|
233
|
+
platform: (0, _imports.getPlatform)(),
|
|
234
|
+
streams: (_options$createStream = options.createStreamConfigs) === null || _options$createStream === void 0 ? void 0 : _options$createStream.map(s => _objectSpread(_objectSpread({
|
|
235
|
+
videoSourceUuid: s.videoSourceId,
|
|
236
|
+
audioSourceUuid: s.audioSourceId,
|
|
237
|
+
streamName: s.streamName
|
|
238
|
+
}, (0, _helper.convertStreamTypeToPublishState)(s.streamType)), {}, {
|
|
239
|
+
videoSourceType: s.videoSourceType,
|
|
240
|
+
audioSourceType: s.audioSourceType,
|
|
241
|
+
audioSourceState: s.audioSourceState,
|
|
242
|
+
videoSourceState: s.videoSourceState
|
|
243
|
+
})),
|
|
244
|
+
version: (0, _imports.getVersion)(),
|
|
245
|
+
password: options.password,
|
|
246
|
+
avatar: options.avatar
|
|
247
|
+
});
|
|
248
|
+
}, _error.FcrErrorModuleCode.ENGINE);
|
|
257
249
|
const {
|
|
258
250
|
data,
|
|
259
251
|
ts
|
|
@@ -263,28 +255,28 @@ class FcrCoreEngine {
|
|
|
263
255
|
} else {
|
|
264
256
|
roomControl = this.createMainRoomControl(roomId);
|
|
265
257
|
}
|
|
266
|
-
await roomControl.join({
|
|
267
|
-
...options,
|
|
258
|
+
await roomControl.join(_objectSpread(_objectSpread({}, options), {}, {
|
|
268
259
|
snapshot: data,
|
|
269
260
|
timestamp: ts,
|
|
270
261
|
createStreamConfigs: data.room.roomProperties.roomType === _type2.FcrRoomType.Waitingroom ? [] : options.createStreamConfigs
|
|
271
|
-
});
|
|
262
|
+
}));
|
|
272
263
|
}, [], {
|
|
273
264
|
retriesMax: 10
|
|
274
|
-
}).fail(async
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
265
|
+
}).fail(async _ref2 => {
|
|
266
|
+
let {
|
|
267
|
+
error,
|
|
268
|
+
timeFn,
|
|
269
|
+
currentRetry
|
|
270
|
+
} = _ref2;
|
|
279
271
|
if ((error instanceof _error2.AgoraRteError || error instanceof _error.FcrError) && _error.ERROR_CODES_NOT_RETRYABLE_WHEN_JOINING_ROOM.includes(error.code)) {
|
|
280
272
|
throw error;
|
|
281
273
|
}
|
|
282
|
-
this.logger.error(
|
|
274
|
+
this.logger.error("retry to join room, ".concat(error.message, ", retry ").concat(currentRetry, " times"));
|
|
283
275
|
await timeFn();
|
|
284
276
|
return true;
|
|
285
277
|
}).exec());
|
|
286
278
|
if (error) {
|
|
287
|
-
this.logger.error(
|
|
279
|
+
this.logger.error("join room failed, ".concat(error.message, "-").concat(JSON.stringify(error)));
|
|
288
280
|
throw error;
|
|
289
281
|
}
|
|
290
282
|
return roomControl;
|
|
@@ -329,7 +321,7 @@ class FcrCoreEngine {
|
|
|
329
321
|
* @param receiverId
|
|
330
322
|
*/
|
|
331
323
|
async sendPeerMessage(payload, guaranteedDelivery, receiverId) {
|
|
332
|
-
await this._rteEngine.sendPeerMessage(payload,
|
|
324
|
+
await this._rteEngine.sendPeerMessage(payload, "".concat(_cmd.CMD_PEER_MESSAGE), guaranteedDelivery, receiverId);
|
|
333
325
|
}
|
|
334
326
|
|
|
335
327
|
/**
|
|
@@ -388,10 +380,10 @@ class FcrCoreEngine {
|
|
|
388
380
|
_setupCoreIpList(parameters) {
|
|
389
381
|
const coreIpList = (0, _parameters.getCoreIpList)(parameters);
|
|
390
382
|
if (coreIpList) {
|
|
391
|
-
this.logger.info(
|
|
383
|
+
this.logger.info("setup fixed service domain list: ".concat(JSON.stringify(coreIpList)));
|
|
392
384
|
(0, _domainHolder.resetSharedDomainHolder)();
|
|
393
385
|
(0, _imports.getSharedDomainHolder)(this._config.region).setFixedDomainList(coreIpList);
|
|
394
|
-
this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(this._config.region));
|
|
386
|
+
this._restfulClient = new _agoraRteSdk.AgoraRestfulClientImpl(this._rteEngine.getHttpAuthHeadersProvider(), (0, _imports.getSharedDomainHolder)(this._config.region), this._rteEngine.getRequestScheduler());
|
|
395
387
|
this._apiService.setRestfulClient(this._restfulClient);
|
|
396
388
|
}
|
|
397
389
|
}
|
|
@@ -399,7 +391,7 @@ class FcrCoreEngine {
|
|
|
399
391
|
const chatIpList = (0, _parameters.getEasemobChatIpList)(parameters);
|
|
400
392
|
const restIpList = (0, _parameters.getEasemobRestIpList)(parameters);
|
|
401
393
|
if (chatIpList && restIpList) {
|
|
402
|
-
this.logger.info(
|
|
394
|
+
this.logger.info("setup chat ip list: ".concat(JSON.stringify(chatIpList), ", rest ip list: ").concat(JSON.stringify(restIpList)));
|
|
403
395
|
this._chatConnection = this._createChatConnection(parameters);
|
|
404
396
|
}
|
|
405
397
|
}
|
|
@@ -426,4 +418,6 @@ class FcrCoreEngine {
|
|
|
426
418
|
return parametersList;
|
|
427
419
|
}
|
|
428
420
|
}
|
|
429
|
-
exports.FcrCoreEngine = FcrCoreEngine;
|
|
421
|
+
exports.FcrCoreEngine = FcrCoreEngine;
|
|
422
|
+
_FcrCoreEngine = FcrCoreEngine;
|
|
423
|
+
[_initProto] = _applyDecs(_FcrCoreEngine, [[_imports.trace, 2, "release"], [_imports.trace, 2, "login"], [_imports.trace, 2, "logout"], [_imports.trace, 2, "renewUserToken"], [_imports.trace, 2, "getVersion"], [_createMainRoomControlDecs, 2, "createMainRoomControl"], [_createWaitingRoomControlDecs, 2, "createWaitingRoomControl"], [_createRoomRouterDecs, 2, "createRoomRouter"], [_createRoomControlAndJoinDecs, 2, "createRoomControlAndJoin"], [_imports.trace, 2, "getDesktopMediaControl"], [_imports.trace, 2, "getMobileMediaControl"], [_imports.trace, 2, "getMonitorControl"], [_imports.trace, 2, "getPeerSessionControl"], [_sendPeerMessageDecs, 2, "sendPeerMessage"], [_setParametersDecs, 2, "setParameters"]], []).e;
|
package/lib/imports.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export type { Whiteboard as FcrWhiteboard, WhiteboardToolType as FcrWhiteboardTo
|
|
|
16
16
|
export { WhiteboardPermissionFlag as FcrWhiteboardPermissionFlag } from '@netless/forge-whiteboard';
|
|
17
17
|
export type { JoinRoomOptions as FcrJoinRoomOptions } from '@netless/forge-room';
|
|
18
18
|
export { getLogger, createLogger } from 'agora-foundation/lib/logger';
|
|
19
|
+
export type { Logger } from 'agora-foundation/lib/logger';
|
|
19
20
|
export { serializeArgs } from 'agora-foundation/lib/decorator/log/log-serializer';
|
|
20
21
|
export { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
|
|
21
22
|
export { retryAttempt } from 'agora-foundation/lib/utilities/async-retry';
|
|
@@ -28,6 +29,7 @@ export { z, ZodError, anySchema, booleanSchema, numberSchema, stringSchema, fcrR
|
|
|
28
29
|
export { validateParams } from 'agora-foundation/lib/decorator/validate';
|
|
29
30
|
export { Mutex } from 'agora-foundation/lib/worker/mutex';
|
|
30
31
|
export type { AgoraRtcNetworkStats, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteScenePropertiesUpdatedEvent, AgoraRteRenderView, AgoraRteScene, } from 'agora-rte-sdk';
|
|
32
|
+
export type { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
|
|
31
33
|
export type { AgoraRteEngineObserver } from 'agora-rte-sdk/lib/type';
|
|
32
34
|
export type { AgoraRteNetworkQualityEvent } from 'agora-rte-sdk/lib/core/scene/type';
|
|
33
35
|
export type { AgoraRteOperatCause } from 'agora-rte-sdk/lib/core/processor/type';
|
|
@@ -55,9 +57,12 @@ export { registerPlugin } from 'agora-rte-sdk/lib/core/engine/plugin';
|
|
|
55
57
|
export { AgoraRteUserUpdatedReason } from 'agora-rte-sdk/lib/core/scene/type';
|
|
56
58
|
export type { AgoraRteUploadEvent } from 'agora-rte-sdk/lib/core/monitor/type';
|
|
57
59
|
export { FcrCoreEngine } from './engine';
|
|
58
|
-
export { FcrWhiteboardControlFactoryImpl } from './room-control/whiteboard-control-v2/whiteboard-control';
|
|
59
|
-
export { FcrAnnotationControlFactoryImpl } from './room-control/whiteboard-control-v2/annotation-control';
|
|
60
|
+
export { FcrWhiteboardControlFactoryImpl } from './room-control/whiteboard-control-v2/whiteboard-control/factory';
|
|
61
|
+
export { FcrAnnotationControlFactoryImpl } from './room-control/whiteboard-control-v2/annotation-control/factory';
|
|
62
|
+
export { deCompressGzipToJson } from './room-control/stt-control/de-compress-gzip';
|
|
60
63
|
export type FcrImageData = ImageData;
|
|
61
64
|
export type FcrWhiteboardView = HTMLElement;
|
|
62
65
|
export { getVersion } from './utilities/package-info';
|
|
63
66
|
export declare const localStorage: Storage;
|
|
67
|
+
export { v4 } from 'uuid';
|
|
68
|
+
export { default as merge } from 'lodash/merge';
|
package/lib/imports.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
require("core-js/modules/esnext.weak-map.delete-all.js");
|
|
4
4
|
require("core-js/modules/esnext.weak-map.emplace.js");
|
|
5
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
5
6
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
6
7
|
Object.defineProperty(exports, "__esModule", {
|
|
7
8
|
value: true
|
|
@@ -225,7 +226,7 @@ Object.defineProperty(exports, "EasemobChatSDK", {
|
|
|
225
226
|
Object.defineProperty(exports, "FcrAnnotationControlFactoryImpl", {
|
|
226
227
|
enumerable: true,
|
|
227
228
|
get: function () {
|
|
228
|
-
return
|
|
229
|
+
return _factory2.FcrAnnotationControlFactoryImpl;
|
|
229
230
|
}
|
|
230
231
|
});
|
|
231
232
|
Object.defineProperty(exports, "FcrApplicationPlatform", {
|
|
@@ -273,7 +274,7 @@ Object.defineProperty(exports, "FcrWhiteboardApplication", {
|
|
|
273
274
|
Object.defineProperty(exports, "FcrWhiteboardControlFactoryImpl", {
|
|
274
275
|
enumerable: true,
|
|
275
276
|
get: function () {
|
|
276
|
-
return
|
|
277
|
+
return _factory.FcrWhiteboardControlFactoryImpl;
|
|
277
278
|
}
|
|
278
279
|
});
|
|
279
280
|
Object.defineProperty(exports, "FcrWhiteboardPermissionFlag", {
|
|
@@ -342,6 +343,12 @@ Object.defineProperty(exports, "createUnionSchema", {
|
|
|
342
343
|
return _schema.createUnionSchema;
|
|
343
344
|
}
|
|
344
345
|
});
|
|
346
|
+
Object.defineProperty(exports, "deCompressGzipToJson", {
|
|
347
|
+
enumerable: true,
|
|
348
|
+
get: function () {
|
|
349
|
+
return _deCompressGzip.deCompressGzipToJson;
|
|
350
|
+
}
|
|
351
|
+
});
|
|
345
352
|
Object.defineProperty(exports, "fcrRenderViewSchema", {
|
|
346
353
|
enumerable: true,
|
|
347
354
|
get: function () {
|
|
@@ -391,6 +398,12 @@ Object.defineProperty(exports, "md5", {
|
|
|
391
398
|
return _jsMd.md5;
|
|
392
399
|
}
|
|
393
400
|
});
|
|
401
|
+
Object.defineProperty(exports, "merge", {
|
|
402
|
+
enumerable: true,
|
|
403
|
+
get: function () {
|
|
404
|
+
return _merge.default;
|
|
405
|
+
}
|
|
406
|
+
});
|
|
394
407
|
Object.defineProperty(exports, "numberSchema", {
|
|
395
408
|
enumerable: true,
|
|
396
409
|
get: function () {
|
|
@@ -475,6 +488,12 @@ Object.defineProperty(exports, "unknownSchema", {
|
|
|
475
488
|
return _schema.unknownSchema;
|
|
476
489
|
}
|
|
477
490
|
});
|
|
491
|
+
Object.defineProperty(exports, "v4", {
|
|
492
|
+
enumerable: true,
|
|
493
|
+
get: function () {
|
|
494
|
+
return _uuid.v4;
|
|
495
|
+
}
|
|
496
|
+
});
|
|
478
497
|
Object.defineProperty(exports, "validateParams", {
|
|
479
498
|
enumerable: true,
|
|
480
499
|
get: function () {
|
|
@@ -521,9 +540,12 @@ var _domainHolder = require("agora-rte-sdk/lib/core/services/domain-holder");
|
|
|
521
540
|
var _type5 = require("agora-rte-sdk/lib/core/media/type");
|
|
522
541
|
var _plugin = require("agora-rte-sdk/lib/core/engine/plugin");
|
|
523
542
|
var _engine = require("./engine");
|
|
524
|
-
var
|
|
525
|
-
var
|
|
543
|
+
var _factory = require("./room-control/whiteboard-control-v2/whiteboard-control/factory");
|
|
544
|
+
var _factory2 = require("./room-control/whiteboard-control-v2/annotation-control/factory");
|
|
545
|
+
var _deCompressGzip = require("./room-control/stt-control/de-compress-gzip");
|
|
526
546
|
var _packageInfo = require("./utilities/package-info");
|
|
547
|
+
var _uuid = require("uuid");
|
|
548
|
+
var _merge = _interopRequireDefault(require("lodash/merge"));
|
|
527
549
|
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); }
|
|
528
550
|
// Other utility exports
|
|
529
551
|
|
package/lib/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig, FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, FcrMonitorControl, FcrMonitorObserver, FcrBaseRoomControl, FcrRoomObserver, FcrUserControl, FcrUserObserver, FcrStreamControl, FcrStreamObserver, FcrPrivilegeControl, FcrPermission, } from './type';
|
|
2
|
-
export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUserRole, FcrStreamState, FcrRegion, FcrStreamType, FcrUserUpdatedReason, FcrRoomConnectorType, FcrVideoSourceType, FcrAudioSourceType, FcrMediaSourceState, FcrVideoRenderMode, FcrVideoStreamType, FcrCapability, FcrAiDenoiseLevel, FcrStreamPrivilegeOperation, FcrStreamPrivilegeVideoSourceType, FcrStreamPrivilegeAudioSourceType, FcrConnectionState, FcrCoreEngine, registerPlugin, } from './type';
|
|
1
|
+
export type { FcrCoreEngineConfig, FcrDualVideoStreamConfig, FcrDesktopMediaControl, FcrDesktopMediaObserver, FcrMobileMediaControl, FcrMobileMediaObserver, FcrMonitorControl, FcrMonitorObserver, FcrBaseRoomControl, FcrRoomObserver, FcrUserControl, FcrUserObserver, FcrStreamControl, FcrStreamObserver, FcrPrivilegeControl, FcrPermission, FcrBoardMainWindow, FcrBoardMainWindowObserver, FcrColor, } from './type';
|
|
2
|
+
export { FcrStreamLatencyLevel, FcrPermissionAction, FcrPrivilegeUserRole, FcrUserRole, FcrStreamState, FcrRegion, FcrStreamType, FcrUserUpdatedReason, FcrRoomConnectorType, FcrVideoSourceType, FcrAudioSourceType, FcrMediaSourceState, FcrVideoRenderMode, FcrVideoStreamType, FcrCapability, FcrAiDenoiseLevel, FcrStreamPrivilegeOperation, FcrStreamPrivilegeVideoSourceType, FcrStreamPrivilegeAudioSourceType, FcrConnectionState, FcrCoreEngine, registerPlugin, FcrBoardToolType, FcrBoardShape, } from './type';
|
|
3
3
|
export { FcrError } from './type';
|
package/lib/index.js
CHANGED
|
@@ -15,6 +15,18 @@ Object.defineProperty(exports, "FcrAudioSourceType", {
|
|
|
15
15
|
return _type.FcrAudioSourceType;
|
|
16
16
|
}
|
|
17
17
|
});
|
|
18
|
+
Object.defineProperty(exports, "FcrBoardShape", {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
get: function () {
|
|
21
|
+
return _type.FcrBoardShape;
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
Object.defineProperty(exports, "FcrBoardToolType", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
get: function () {
|
|
27
|
+
return _type.FcrBoardToolType;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
18
30
|
Object.defineProperty(exports, "FcrCapability", {
|
|
19
31
|
enumerable: true,
|
|
20
32
|
get: function () {
|