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
package/lib/struct.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
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.FcrCoreEngineConfig = void 0;
|
|
8
|
+
require("core-js/modules/es.array.unshift.js");
|
|
9
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
11
|
var _dualVideoStreamConfig = require("./utilities/dual-video-stream-config");
|
|
8
12
|
var _parameters = require("./utilities/parameters");
|
|
9
13
|
/** 引擎配置类 */
|
|
10
14
|
class FcrCoreEngineConfig {
|
|
11
|
-
__json_serializable__ = true;
|
|
12
|
-
|
|
13
15
|
/** 应用唯一标识 */
|
|
14
16
|
|
|
15
17
|
/** 身份验证令牌 */
|
|
@@ -25,6 +27,7 @@ class FcrCoreEngineConfig {
|
|
|
25
27
|
/** 额外参数配置 */
|
|
26
28
|
|
|
27
29
|
constructor(params) {
|
|
30
|
+
(0, _defineProperty2.default)(this, "__json_serializable__", true);
|
|
28
31
|
this.appId = params.appId;
|
|
29
32
|
this.token = params.token;
|
|
30
33
|
this.userId = params.userId;
|
|
@@ -4,7 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.abortableRetry = void 0;
|
|
7
|
+
require("core-js/modules/es.regexp.exec.js");
|
|
8
|
+
require("core-js/modules/web.dom-exception.constructor.js");
|
|
7
9
|
require("core-js/modules/web.dom-exception.stack.js");
|
|
10
|
+
require("core-js/modules/web.dom-exception.to-string-tag.js");
|
|
8
11
|
var _imports = require("../imports");
|
|
9
12
|
/**
|
|
10
13
|
* Creates an abortable retry operation that can be cancelled at any time.
|
|
@@ -1,19 +1,24 @@
|
|
|
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.iterateSet = exports.iterateMap = exports.convertToStructure = void 0;
|
|
7
8
|
require("core-js/modules/es.array.push.js");
|
|
9
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
10
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
8
11
|
const iterateMap = (map, processors) => {
|
|
9
|
-
const onFilter = processors
|
|
10
|
-
const {
|
|
11
|
-
onMap,
|
|
12
|
-
onReduce
|
|
13
|
-
} = processors || {};
|
|
12
|
+
const onFilter = (processors === null || processors === void 0 ? void 0 : processors.onFilter) || (() => true);
|
|
13
|
+
const _ref = processors || {},
|
|
14
|
+
onMap = _ref.onMap,
|
|
15
|
+
onReduce = _ref.onReduce;
|
|
14
16
|
const list = [];
|
|
15
17
|
let prev = undefined;
|
|
16
|
-
for (const
|
|
18
|
+
for (const _ref2 of map.entries()) {
|
|
19
|
+
var _ref3 = (0, _slicedToArray2.default)(_ref2, 2);
|
|
20
|
+
const k = _ref3[0];
|
|
21
|
+
const v = _ref3[1];
|
|
17
22
|
if (onFilter(k, v)) {
|
|
18
23
|
if (onMap) list.push(onMap(k, v));
|
|
19
24
|
if (onReduce) prev = onReduce(prev, k, v);
|
|
@@ -26,11 +31,10 @@ const iterateMap = (map, processors) => {
|
|
|
26
31
|
};
|
|
27
32
|
exports.iterateMap = iterateMap;
|
|
28
33
|
const iterateSet = (map, processors) => {
|
|
29
|
-
const onFilter = processors
|
|
30
|
-
const {
|
|
31
|
-
onMap,
|
|
32
|
-
onReduce
|
|
33
|
-
} = processors || {};
|
|
34
|
+
const onFilter = (processors === null || processors === void 0 ? void 0 : processors.onFilter) || (() => true);
|
|
35
|
+
const _ref4 = processors || {},
|
|
36
|
+
onMap = _ref4.onMap,
|
|
37
|
+
onReduce = _ref4.onReduce;
|
|
34
38
|
const list = [];
|
|
35
39
|
let prev = undefined;
|
|
36
40
|
for (const item of map.values()) {
|
|
@@ -1,12 +1,19 @@
|
|
|
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.roomControlErrorHelper = exports.liveStreamingErrorHelper = exports.engineErrorHelper = exports.defaultErrorHelper = exports.FcrErrorHelper = exports.ControllerType = void 0;
|
|
12
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
13
|
var _imports = require("../imports");
|
|
8
14
|
var _error = require("./error");
|
|
9
|
-
|
|
15
|
+
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; }
|
|
16
|
+
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; } /**
|
|
10
17
|
* 通用错误处理辅助工具
|
|
11
18
|
*
|
|
12
19
|
* 提供统一的错误创建和处理机制,支持实例化配置
|
|
@@ -39,14 +46,14 @@ let ControllerType = exports.ControllerType = /*#__PURE__*/function (ControllerT
|
|
|
39
46
|
* 错误处理助手类 - 支持实例化配置
|
|
40
47
|
*/
|
|
41
48
|
class FcrErrorHelper {
|
|
42
|
-
constructor(
|
|
43
|
-
|
|
49
|
+
constructor() {
|
|
50
|
+
let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
51
|
+
this.config = _objectSpread({
|
|
44
52
|
defaultModuleCode: _imports.ErrorModuleCode.FCR_ROOM,
|
|
45
53
|
enableDetailedMessages: true,
|
|
46
54
|
logPrefix: 'FCR',
|
|
47
|
-
autoLog: false
|
|
48
|
-
|
|
49
|
-
};
|
|
55
|
+
autoLog: false
|
|
56
|
+
}, config);
|
|
50
57
|
}
|
|
51
58
|
/**
|
|
52
59
|
* 生成控制器未初始化错误
|
|
@@ -55,11 +62,11 @@ class FcrErrorHelper {
|
|
|
55
62
|
* @returns FcrError
|
|
56
63
|
*/
|
|
57
64
|
createControllerNotInitializedError(controllerType, moduleCode) {
|
|
58
|
-
const module = moduleCode
|
|
59
|
-
const message = this.config.enableDetailedMessages ?
|
|
65
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
66
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] The ").concat(controllerType, " controller is not initialized, please join the room first") : "".concat(controllerType, " controller not initialized");
|
|
60
67
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.NOT_JOINED_ROOM, message);
|
|
61
68
|
if (this.config.autoLog) {
|
|
62
|
-
console.error(
|
|
69
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
63
70
|
}
|
|
64
71
|
return error;
|
|
65
72
|
}
|
|
@@ -72,11 +79,11 @@ class FcrErrorHelper {
|
|
|
72
79
|
* @returns FcrError
|
|
73
80
|
*/
|
|
74
81
|
createOperationConflictError(operation, reason, moduleCode) {
|
|
75
|
-
const module = moduleCode
|
|
76
|
-
const message = this.config.enableDetailedMessages ?
|
|
82
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
83
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Failed to ").concat(operation, ": ").concat(reason) : "".concat(operation, " failed: ").concat(reason);
|
|
77
84
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.JOIN_CONFLICT, message);
|
|
78
85
|
if (this.config.autoLog) {
|
|
79
|
-
console.error(
|
|
86
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
80
87
|
}
|
|
81
88
|
return error;
|
|
82
89
|
}
|
|
@@ -88,11 +95,11 @@ class FcrErrorHelper {
|
|
|
88
95
|
* @returns FcrError
|
|
89
96
|
*/
|
|
90
97
|
createOperationCanceledError(operation, moduleCode) {
|
|
91
|
-
const module = moduleCode
|
|
92
|
-
const message = this.config.enableDetailedMessages ?
|
|
98
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
99
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] ").concat(operation, " operation has been cancelled") : "".concat(operation, " cancelled");
|
|
93
100
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.NOT_JOINED_ROOM, message);
|
|
94
101
|
if (this.config.autoLog) {
|
|
95
|
-
console.error(
|
|
102
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
96
103
|
}
|
|
97
104
|
return error;
|
|
98
105
|
}
|
|
@@ -104,11 +111,11 @@ class FcrErrorHelper {
|
|
|
104
111
|
* @returns FcrError
|
|
105
112
|
*/
|
|
106
113
|
createSendMessageError(originalError, moduleCode) {
|
|
107
|
-
const module = moduleCode
|
|
108
|
-
const message = this.config.enableDetailedMessages ?
|
|
114
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
115
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Send message failed: ").concat(originalError.message) : 'send message failed';
|
|
109
116
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.UNDEFINED_ERROR, message);
|
|
110
117
|
if (this.config.autoLog) {
|
|
111
|
-
console.error(
|
|
118
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message), originalError);
|
|
112
119
|
}
|
|
113
120
|
return error;
|
|
114
121
|
}
|
|
@@ -121,11 +128,11 @@ class FcrErrorHelper {
|
|
|
121
128
|
* @returns FcrError
|
|
122
129
|
*/
|
|
123
130
|
createOperationError(operation, originalError, moduleCode) {
|
|
124
|
-
const module = moduleCode
|
|
125
|
-
const message = this.config.enableDetailedMessages ?
|
|
131
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
132
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] ").concat(operation, " failed").concat(originalError ? ": ".concat(originalError.message) : '') : "".concat(operation, " failed");
|
|
126
133
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.NOT_JOINED_ROOM, message);
|
|
127
134
|
if (this.config.autoLog) {
|
|
128
|
-
console.error(
|
|
135
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message), originalError);
|
|
129
136
|
}
|
|
130
137
|
return error;
|
|
131
138
|
}
|
|
@@ -137,11 +144,11 @@ class FcrErrorHelper {
|
|
|
137
144
|
* @returns FcrError
|
|
138
145
|
*/
|
|
139
146
|
createNetworkError(message, moduleCode) {
|
|
140
|
-
const module = moduleCode
|
|
141
|
-
const formattedMessage = this.config.enableDetailedMessages ?
|
|
147
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
148
|
+
const formattedMessage = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Network error: ").concat(message) : message;
|
|
142
149
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.LOCAL_HTTP_REQUEST_FAILED, formattedMessage);
|
|
143
150
|
if (this.config.autoLog) {
|
|
144
|
-
console.error(
|
|
151
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(formattedMessage));
|
|
145
152
|
}
|
|
146
153
|
return error;
|
|
147
154
|
}
|
|
@@ -154,11 +161,11 @@ class FcrErrorHelper {
|
|
|
154
161
|
* @returns FcrError
|
|
155
162
|
*/
|
|
156
163
|
createInvalidParamsError(paramName, reason, moduleCode) {
|
|
157
|
-
const module = moduleCode
|
|
158
|
-
const message = this.config.enableDetailedMessages ?
|
|
164
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
165
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Invalid parameter '").concat(paramName, "': ").concat(reason) : "Invalid parameter '".concat(paramName, "': ").concat(reason);
|
|
159
166
|
const error = (0, _error.generateFcrCoreClientError)(module, _imports.DetailErrorCode.INVALID_PARAMS, message);
|
|
160
167
|
if (this.config.autoLog) {
|
|
161
|
-
console.error(
|
|
168
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
162
169
|
}
|
|
163
170
|
return error;
|
|
164
171
|
}
|
package/lib/utilities/error.js
CHANGED
|
@@ -32,7 +32,7 @@ const generateFcrCoreClientError = (module, code, message, cause) => {
|
|
|
32
32
|
};
|
|
33
33
|
exports.generateFcrCoreClientError = generateFcrCoreClientError;
|
|
34
34
|
const generateFcrCoreServerError = (code, message) => {
|
|
35
|
-
const errorCode = Number(
|
|
35
|
+
const errorCode = Number("".concat(_imports.ErrorServiceType.FCR_SERVER).concat((0, _imports.padStart)(String(code), 8, '0')));
|
|
36
36
|
const error = new _imports.FcrError({
|
|
37
37
|
message: message,
|
|
38
38
|
code: errorCode
|
|
@@ -47,10 +47,11 @@ const handleRequestError = async (action, errorModuleCode, errorMessage) => {
|
|
|
47
47
|
return await action();
|
|
48
48
|
} catch (e) {
|
|
49
49
|
if (e instanceof _imports.AgoraRestfulClientError) {
|
|
50
|
-
|
|
50
|
+
var _e$serviceCode;
|
|
51
|
+
throw generateFcrCoreServerError((_e$serviceCode = e.serviceCode) !== null && _e$serviceCode !== void 0 ? _e$serviceCode : -1, e.message);
|
|
51
52
|
}
|
|
52
53
|
const error = e;
|
|
53
|
-
throw generateFcrCoreClientError(errorModuleCode, _imports.DetailErrorCode.UNDEFINED_ERROR, errorMessage
|
|
54
|
+
throw generateFcrCoreClientError(errorModuleCode, _imports.DetailErrorCode.UNDEFINED_ERROR, errorMessage !== null && errorMessage !== void 0 ? errorMessage : error.message);
|
|
54
55
|
}
|
|
55
56
|
};
|
|
56
57
|
|
|
@@ -1,23 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.array.push.js");
|
|
4
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
5
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
6
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
7
|
Object.defineProperty(exports, "__esModule", {
|
|
4
8
|
value: true
|
|
5
9
|
});
|
|
6
10
|
exports.FcrJoinHelper = void 0;
|
|
7
11
|
exports.handleJoinRetryFailure = handleJoinRetryFailure;
|
|
12
|
+
require("core-js/modules/es.regexp.exec.js");
|
|
8
13
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
9
14
|
require("core-js/modules/esnext.iterator.map.js");
|
|
15
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
16
|
var _imports = require("../imports");
|
|
11
17
|
var _type = require("../type");
|
|
12
18
|
var _retryHelpers = require("./retry-helpers");
|
|
13
19
|
var _error = require("./error");
|
|
14
20
|
var _constants = require("../room-control/helpers/constants");
|
|
15
|
-
|
|
21
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
22
|
+
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; } /**
|
|
16
23
|
* 房间加入辅助工具
|
|
17
24
|
*
|
|
18
25
|
* 提供房间控制相关的加入逻辑和参数构建,统一处理 room-control 和 room-router 中的公共逻辑
|
|
19
26
|
*/
|
|
20
|
-
|
|
21
27
|
/**
|
|
22
28
|
* 通用的加入房间重试失败处理器
|
|
23
29
|
* @param error 错误对象
|
|
@@ -28,14 +34,15 @@ var _constants = require("../room-control/helpers/constants");
|
|
|
28
34
|
* @param logPrefix 日志前缀
|
|
29
35
|
* @returns 是否继续重试
|
|
30
36
|
*/
|
|
31
|
-
async function handleJoinRetryFailure(error, waitBeforeRetry, attemptCount, canRetryFn, onAborted
|
|
32
|
-
|
|
37
|
+
async function handleJoinRetryFailure(error, waitBeforeRetry, attemptCount, canRetryFn, onAborted) {
|
|
38
|
+
let logPrefix = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'join room';
|
|
39
|
+
onAborted === null || onAborted === void 0 || onAborted();
|
|
33
40
|
if (!canRetryFn(error)) {
|
|
34
41
|
throw error;
|
|
35
42
|
}
|
|
36
43
|
|
|
37
44
|
// 记录重试信息
|
|
38
|
-
console.warn(
|
|
45
|
+
console.warn("Retry attempt ".concat(attemptCount + 1, " to ").concat(logPrefix, ": ").concat(error.message));
|
|
39
46
|
await waitBeforeRetry();
|
|
40
47
|
return true;
|
|
41
48
|
}
|
|
@@ -66,33 +73,31 @@ class FcrJoinHelper {
|
|
|
66
73
|
* @returns CheckIn参数对象
|
|
67
74
|
*/
|
|
68
75
|
static buildCheckInParams(options, userId, roomId, extraParams) {
|
|
69
|
-
|
|
76
|
+
var _options$platform, _options$createStream;
|
|
77
|
+
return _objectSpread(_objectSpread({
|
|
70
78
|
userName: options.userName,
|
|
71
79
|
userId,
|
|
72
80
|
userRole: _type.FcrUserRoleToStringMap[options.userRole],
|
|
73
81
|
userProperties: options.userProperties,
|
|
74
82
|
roomId,
|
|
75
|
-
platform: options.platform
|
|
76
|
-
streams: options.createStreamConfigs
|
|
83
|
+
platform: (_options$platform = options.platform) !== null && _options$platform !== void 0 ? _options$platform : (0, _imports.getPlatform)(),
|
|
84
|
+
streams: (_options$createStream = options.createStreamConfigs) === null || _options$createStream === void 0 ? void 0 : _options$createStream.map(s => _objectSpread(_objectSpread({
|
|
77
85
|
videoSourceUuid: s.videoSourceId,
|
|
78
86
|
audioSourceUuid: s.audioSourceId,
|
|
79
|
-
streamName: s.streamName
|
|
80
|
-
|
|
87
|
+
streamName: s.streamName
|
|
88
|
+
}, (0, _imports.convertStreamTypeToPublishState)(s.streamType)), {}, {
|
|
81
89
|
videoSourceType: s.videoSourceType,
|
|
82
90
|
audioSourceType: s.audioSourceType,
|
|
83
91
|
audioSourceState: s.audioSourceState,
|
|
84
92
|
videoSourceState: s.videoSourceState
|
|
85
93
|
})),
|
|
86
94
|
version: (0, _imports.getVersion)(),
|
|
87
|
-
password: options.password
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
avatar: extraParams.avatar
|
|
94
|
-
})
|
|
95
|
-
};
|
|
95
|
+
password: options.password
|
|
96
|
+
}, (extraParams === null || extraParams === void 0 ? void 0 : extraParams.bypass) !== undefined && {
|
|
97
|
+
bypass: extraParams.bypass
|
|
98
|
+
}), (extraParams === null || extraParams === void 0 ? void 0 : extraParams.avatar) !== undefined && {
|
|
99
|
+
avatar: extraParams.avatar
|
|
100
|
+
});
|
|
96
101
|
}
|
|
97
102
|
|
|
98
103
|
/**
|
|
@@ -117,7 +122,8 @@ class FcrJoinHelper {
|
|
|
117
122
|
* @param useInternalApi 是否使用 checkInInternal API(默认 true)
|
|
118
123
|
* @returns CheckIn响应数据
|
|
119
124
|
*/
|
|
120
|
-
async performCheckIn(options, extraParams
|
|
125
|
+
async performCheckIn(options, extraParams) {
|
|
126
|
+
let useInternalApi = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
|
|
121
127
|
const checkInParams = this._buildCheckInParams(options, extraParams);
|
|
122
128
|
const apiCall = useInternalApi ? () => this._api.checkInInternal(checkInParams) : () => this._api.checkIn(checkInParams);
|
|
123
129
|
const errorMessage = useInternalApi ? 'check in internal failed' : 'check in failed';
|
|
@@ -140,11 +146,11 @@ class FcrJoinHelper {
|
|
|
140
146
|
*/
|
|
141
147
|
async joinWithCheckIn(options, onJoinAborted) {
|
|
142
148
|
await (0, _imports.retryAttempt)(async () => {
|
|
149
|
+
var _options$roomToken;
|
|
143
150
|
// 1. 执行 CheckIn(单次调用,无内部重试)
|
|
144
|
-
const
|
|
145
|
-
data,
|
|
146
|
-
ts
|
|
147
|
-
} = await this.performCheckIn(options);
|
|
151
|
+
const _await$this$performCh = await this.performCheckIn(options),
|
|
152
|
+
data = _await$this$performCh.data,
|
|
153
|
+
ts = _await$this$performCh.ts;
|
|
148
154
|
|
|
149
155
|
// 2. 检查是否中止
|
|
150
156
|
if (onJoinAborted) {
|
|
@@ -152,7 +158,7 @@ class FcrJoinHelper {
|
|
|
152
158
|
}
|
|
153
159
|
|
|
154
160
|
// 3. 使用 CheckIn 结果加入房间
|
|
155
|
-
await this._joinScene(options.streamLatency, options.streamEncryptionConfig, data, ts, options.roomToken
|
|
161
|
+
await this._joinScene(options.streamLatency, options.streamEncryptionConfig, data, ts, (_options$roomToken = options.roomToken) !== null && _options$roomToken !== void 0 ? _options$roomToken : '', undefined);
|
|
156
162
|
|
|
157
163
|
// 4. 再次检查是否中止
|
|
158
164
|
if (onJoinAborted) {
|
|
@@ -160,11 +166,10 @@ class FcrJoinHelper {
|
|
|
160
166
|
}
|
|
161
167
|
}, [], {
|
|
162
168
|
retriesMax: _constants.ROOM_CONTROL_CONSTANTS.MAX_JOIN_ATTEMPTS
|
|
163
|
-
}).fail(async
|
|
164
|
-
error,
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}) => {
|
|
169
|
+
}).fail(async _ref => {
|
|
170
|
+
let error = _ref.error,
|
|
171
|
+
waitBeforeRetry = _ref.timeFn,
|
|
172
|
+
attemptCount = _ref.currentRetry;
|
|
168
173
|
return handleJoinRetryFailure(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, onJoinAborted, 'join room via CheckIn');
|
|
169
174
|
}).exec();
|
|
170
175
|
}
|
|
@@ -220,7 +225,8 @@ class FcrJoinHelper {
|
|
|
220
225
|
* @private
|
|
221
226
|
*/
|
|
222
227
|
async _joinWithSnapshot(options, onJoinAborted) {
|
|
223
|
-
|
|
228
|
+
var _options$roomToken2;
|
|
229
|
+
await this._joinScene(options.streamLatency || _type.FcrStreamLatencyLevel.ULTRA_LOW, options.streamEncryptionConfig, options.snapshot, options.timestamp, (_options$roomToken2 = options.roomToken) !== null && _options$roomToken2 !== void 0 ? _options$roomToken2 : '', onJoinAborted);
|
|
224
230
|
}
|
|
225
231
|
}
|
|
226
232
|
exports.FcrJoinHelper = FcrJoinHelper;
|
package/lib/utilities/logger.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
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.getLogger = exports.generateLogObserver = exports.createLogger = exports.FcrCoreLoggerManagerHolder = void 0;
|
|
8
|
+
require("core-js/modules/es.error.cause.js");
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
7
10
|
var _imports = require("../imports");
|
|
8
11
|
class FcrCoreLoggerManagerHolder {
|
|
9
|
-
static instance = null;
|
|
10
|
-
static isDestroying = false;
|
|
11
|
-
static label = 'fcr-core';
|
|
12
12
|
static initialize(opts) {
|
|
13
13
|
if (this.instance && !this.isDestroying) {
|
|
14
|
-
console.warn(
|
|
14
|
+
console.warn("".concat(this.label, " LoggerManager is already initialized. Reinitializing..."));
|
|
15
15
|
}
|
|
16
16
|
this.destroy();
|
|
17
17
|
this.instance = new _imports.LoggerManager({
|
|
@@ -21,7 +21,7 @@ class FcrCoreLoggerManagerHolder {
|
|
|
21
21
|
}
|
|
22
22
|
static getInstance() {
|
|
23
23
|
if (!this.instance) {
|
|
24
|
-
throw new Error(
|
|
24
|
+
throw new Error("LoggerManager is not initialized. Call ".concat(this.label, " LoggerManager.initialize() first."));
|
|
25
25
|
}
|
|
26
26
|
return this.instance;
|
|
27
27
|
}
|
|
@@ -50,6 +50,9 @@ class FcrCoreLoggerManagerHolder {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.FcrCoreLoggerManagerHolder = FcrCoreLoggerManagerHolder;
|
|
53
|
+
(0, _defineProperty2.default)(FcrCoreLoggerManagerHolder, "instance", null);
|
|
54
|
+
(0, _defineProperty2.default)(FcrCoreLoggerManagerHolder, "isDestroying", false);
|
|
55
|
+
(0, _defineProperty2.default)(FcrCoreLoggerManagerHolder, "label", 'fcr-core');
|
|
53
56
|
const getLogger = exports.getLogger = FcrCoreLoggerManagerHolder.getLogger.bind(FcrCoreLoggerManagerHolder);
|
|
54
57
|
const createLogger = exports.createLogger = FcrCoreLoggerManagerHolder.createLogger.bind(FcrCoreLoggerManagerHolder);
|
|
55
58
|
const generateLogObserver = exports.generateLogObserver = FcrCoreLoggerManagerHolder.generateLogObserver.bind(FcrCoreLoggerManagerHolder);
|
|
@@ -28,6 +28,7 @@ require("core-js/modules/esnext.set.symmetric-difference.v2.js");
|
|
|
28
28
|
require("core-js/modules/esnext.set.symmetric-difference.js");
|
|
29
29
|
require("core-js/modules/esnext.set.union.v2.js");
|
|
30
30
|
require("core-js/modules/esnext.set.union.js");
|
|
31
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
31
32
|
var _imports = require("../imports");
|
|
32
33
|
const DEFAULT_LOG_FILE_SIZE = 512;
|
|
33
34
|
/** RTC preset parameters configuration mapping table */
|
|
@@ -113,48 +114,57 @@ const isTrueValue = value => {
|
|
|
113
114
|
};
|
|
114
115
|
exports.isTrueValue = isTrueValue;
|
|
115
116
|
const getCoreIpList = parameters => {
|
|
116
|
-
|
|
117
|
+
var _parameters$core;
|
|
118
|
+
return parameters === null || parameters === void 0 || (_parameters$core = parameters.core) === null || _parameters$core === void 0 ? void 0 : _parameters$core.coreIpList;
|
|
117
119
|
};
|
|
118
120
|
exports.getCoreIpList = getCoreIpList;
|
|
119
121
|
const getEasemobChatIpList = parameters => {
|
|
120
|
-
|
|
122
|
+
var _parameters$core2;
|
|
123
|
+
return parameters === null || parameters === void 0 || (_parameters$core2 = parameters.core) === null || _parameters$core2 === void 0 ? void 0 : _parameters$core2.easemobChatIpList;
|
|
121
124
|
};
|
|
122
125
|
exports.getEasemobChatIpList = getEasemobChatIpList;
|
|
123
126
|
const getEasemobRestIpList = parameters => {
|
|
124
|
-
|
|
127
|
+
var _parameters$core3;
|
|
128
|
+
return parameters === null || parameters === void 0 || (_parameters$core3 = parameters.core) === null || _parameters$core3 === void 0 ? void 0 : _parameters$core3.easemobRestIpList;
|
|
125
129
|
};
|
|
126
130
|
exports.getEasemobRestIpList = getEasemobRestIpList;
|
|
127
131
|
const getScribbleForgeIpList = parameters => {
|
|
128
|
-
|
|
132
|
+
var _parameters$core4;
|
|
133
|
+
return parameters === null || parameters === void 0 || (_parameters$core4 = parameters.core) === null || _parameters$core4 === void 0 ? void 0 : _parameters$core4.scribbleForgeIpList;
|
|
129
134
|
};
|
|
130
135
|
exports.getScribbleForgeIpList = getScribbleForgeIpList;
|
|
131
136
|
const isEndpointRegionDisabled = parameters => {
|
|
132
|
-
|
|
137
|
+
var _parameters$core5;
|
|
138
|
+
return isTrueValue(parameters === null || parameters === void 0 || (_parameters$core5 = parameters.core) === null || _parameters$core5 === void 0 ? void 0 : _parameters$core5.disableEndpointRegion);
|
|
133
139
|
};
|
|
134
140
|
exports.isEndpointRegionDisabled = isEndpointRegionDisabled;
|
|
135
141
|
const getNeedLogUpload = parameters => {
|
|
136
|
-
|
|
142
|
+
var _parameters$core6;
|
|
143
|
+
if ((0, _imports.isBoolean)(parameters === null || parameters === void 0 || (_parameters$core6 = parameters.core) === null || _parameters$core6 === void 0 ? void 0 : _parameters$core6.needLogUpload)) {
|
|
137
144
|
return parameters.core.needLogUpload;
|
|
138
145
|
}
|
|
139
146
|
return true;
|
|
140
147
|
};
|
|
141
148
|
exports.getNeedLogUpload = getNeedLogUpload;
|
|
142
149
|
const getCoreLogFileSize = parameters => {
|
|
143
|
-
|
|
150
|
+
var _parameters$core7;
|
|
151
|
+
if (!(0, _imports.isNumber)(parameters === null || parameters === void 0 || (_parameters$core7 = parameters.core) === null || _parameters$core7 === void 0 ? void 0 : _parameters$core7.coreLogFileSize)) {
|
|
144
152
|
return DEFAULT_LOG_FILE_SIZE;
|
|
145
153
|
}
|
|
146
154
|
return parameters.core.coreLogFileSize;
|
|
147
155
|
};
|
|
148
156
|
exports.getCoreLogFileSize = getCoreLogFileSize;
|
|
149
157
|
const getEasemobLogFileSize = parameters => {
|
|
150
|
-
|
|
158
|
+
var _parameters$core8;
|
|
159
|
+
if (!(0, _imports.isNumber)(parameters === null || parameters === void 0 || (_parameters$core8 = parameters.core) === null || _parameters$core8 === void 0 ? void 0 : _parameters$core8.easemobLogFileSize)) {
|
|
151
160
|
return DEFAULT_LOG_FILE_SIZE;
|
|
152
161
|
}
|
|
153
162
|
return parameters.core.easemobLogFileSize;
|
|
154
163
|
};
|
|
155
164
|
exports.getEasemobLogFileSize = getEasemobLogFileSize;
|
|
156
165
|
const getNetlessLogFileSize = parameters => {
|
|
157
|
-
|
|
166
|
+
var _parameters$core9;
|
|
167
|
+
if (!(0, _imports.isNumber)(parameters === null || parameters === void 0 || (_parameters$core9 = parameters.core) === null || _parameters$core9 === void 0 ? void 0 : _parameters$core9.netlessLogFileSize)) {
|
|
158
168
|
return DEFAULT_LOG_FILE_SIZE;
|
|
159
169
|
}
|
|
160
170
|
return parameters.core.netlessLogFileSize;
|
|
@@ -163,8 +173,9 @@ const getNetlessLogFileSize = parameters => {
|
|
|
163
173
|
exports.getNetlessLogFileSize = getNetlessLogFileSize;
|
|
164
174
|
const DESKTOP_PLATFORMS = new Set([_imports.FcrApplicationPlatform.WINDOWS, _imports.FcrApplicationPlatform.MACOS]);
|
|
165
175
|
const getRtcPresetParameters = () => {
|
|
176
|
+
var _RTC_PRESET_PARAMS_MA;
|
|
166
177
|
const platform = (0, _imports.getPlatform)();
|
|
167
|
-
const platformParams = RTC_PRESET_PARAMS_MAP[platform]
|
|
178
|
+
const platformParams = (_RTC_PRESET_PARAMS_MA = RTC_PRESET_PARAMS_MAP[platform]) !== null && _RTC_PRESET_PARAMS_MA !== void 0 ? _RTC_PRESET_PARAMS_MA : [];
|
|
168
179
|
const electronParams = ELECTRON_PLATFORMS.has(platform) ? ELECTRON_COMMON_PARAMS : [];
|
|
169
180
|
const harmonyOrElectronParams = HARMONY_OR_ELECTRON_PLATFORMS.has(platform) ? HARMONY_OR_ELECTRON_COMMON_PARAMS : [];
|
|
170
181
|
return [...platformParams, ...electronParams, ...harmonyOrElectronParams].map(p => JSON.stringify(p));
|
|
@@ -7,6 +7,7 @@ exports.ROOM_NON_RETRYABLE_ERRORS = exports.ROOM_JOIN_NON_RETRYABLE_ERRORS = voi
|
|
|
7
7
|
exports.canRetryError = canRetryError;
|
|
8
8
|
exports.canRetryJoinError = canRetryJoinError;
|
|
9
9
|
require("core-js/modules/es.array.includes.js");
|
|
10
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
10
11
|
var _imports = require("../imports");
|
|
11
12
|
/**
|
|
12
13
|
* 通用重试辅助工具
|
package/lib/utilities/stream.js
CHANGED
|
@@ -1,26 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.array.push.js");
|
|
4
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
5
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
6
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
3
7
|
Object.defineProperty(exports, "__esModule", {
|
|
4
8
|
value: true
|
|
5
9
|
});
|
|
6
10
|
exports.getStreamsJoinConfig = exports.getStreamJoinConfig = void 0;
|
|
7
11
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
8
12
|
require("core-js/modules/esnext.iterator.map.js");
|
|
13
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
|
+
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; }
|
|
15
|
+
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; }
|
|
9
16
|
const getStreamJoinConfig = stream => {
|
|
10
|
-
return {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
};
|
|
17
|
+
return _objectSpread(_objectSpread({}, stream), {}, {
|
|
18
|
+
videoSourceUuid: stream === null || stream === void 0 ? void 0 : stream.videoSourceId,
|
|
19
|
+
audioSourceUuid: stream === null || stream === void 0 ? void 0 : stream.audioSourceId
|
|
20
|
+
});
|
|
15
21
|
};
|
|
16
22
|
exports.getStreamJoinConfig = getStreamJoinConfig;
|
|
17
23
|
const getStreamsJoinConfig = streams => {
|
|
18
|
-
return streams
|
|
19
|
-
return {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
};
|
|
24
|
+
return streams === null || streams === void 0 ? void 0 : streams.map(stream => {
|
|
25
|
+
return _objectSpread(_objectSpread({}, stream), {}, {
|
|
26
|
+
videoSourceUuid: stream === null || stream === void 0 ? void 0 : stream.videoSourceId,
|
|
27
|
+
audioSourceUuid: stream === null || stream === void 0 ? void 0 : stream.audioSourceId
|
|
28
|
+
});
|
|
24
29
|
});
|
|
25
30
|
};
|
|
26
31
|
exports.getStreamsJoinConfig = getStreamsJoinConfig;
|
package/lib/utilities/user.js
CHANGED
|
@@ -7,12 +7,13 @@ exports.convertStringPrivilegeRoleToFcrPrivilegeRole = exports.convertRteUserToF
|
|
|
7
7
|
var _type = require("../type");
|
|
8
8
|
var _type2 = require("../room-control/privilege-control/type");
|
|
9
9
|
const convertRteUserToFcrUser = (user, cache) => {
|
|
10
|
+
var _cache$getUserPlatfor, _cache$getUserAvatar;
|
|
10
11
|
const userRole = _type.FcrUserStringToRoleMap[user.userRole];
|
|
11
12
|
if (!userRole) {
|
|
12
13
|
return undefined;
|
|
13
14
|
}
|
|
14
|
-
let platform = cache.getUserPlatform(user.userId)
|
|
15
|
-
const avatar = cache.getUserAvatar(user.userId)
|
|
15
|
+
let platform = (_cache$getUserPlatfor = cache.getUserPlatform(user.userId)) !== null && _cache$getUserPlatfor !== void 0 ? _cache$getUserPlatfor : _type.FcrPlatform.UNSUPPORTED;
|
|
16
|
+
const avatar = (_cache$getUserAvatar = cache.getUserAvatar(user.userId)) !== null && _cache$getUserAvatar !== void 0 ? _cache$getUserAvatar : '';
|
|
16
17
|
const isValidPlatform = platform in _type.FcrPlatform;
|
|
17
18
|
platform = isValidPlatform ? platform : _type.FcrPlatform.UNSUPPORTED;
|
|
18
19
|
return {
|
|
@@ -26,7 +27,7 @@ const convertRteUserToFcrUser = (user, cache) => {
|
|
|
26
27
|
};
|
|
27
28
|
exports.convertRteUserToFcrUser = convertRteUserToFcrUser;
|
|
28
29
|
const checkFcrUserRole = user => {
|
|
29
|
-
if (!user
|
|
30
|
+
if (!(user !== null && user !== void 0 && user.userRole)) return;
|
|
30
31
|
return user;
|
|
31
32
|
};
|
|
32
33
|
exports.checkFcrUserRole = checkFcrUserRole;
|
|
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
var _imports = require("../imports");
|
|
8
8
|
var _error = require("./error");
|
|
9
9
|
var _default = exports.default = (0, _imports.validateParams)(error => {
|
|
10
|
-
const message =
|
|
10
|
+
const message = "invalid params: ".concat(error.message);
|
|
11
11
|
const fcrErrorModuleCode = '00';
|
|
12
12
|
return (0, _error.generateFcrCoreClientError)(fcrErrorModuleCode, _imports.DetailErrorCode.INVALID_PARAMS, message);
|
|
13
13
|
});
|