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
package/lib/type.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteUploadEvent, AgoraRteVideoEncoderConfig } from './imports';
|
|
2
|
-
import { FcrSharePermissionState } from './room-control/
|
|
1
|
+
import { AgoraRtcNetworkStats, AgoraRteNetworkQualityEvent, AgoraRtcDeviceInfo, AgoraRtcDisplayInfo, AgoraRtcWindowInfo, AgoraRtePerformanceInfo, AgoraRteScenePropertiesDeletedEvent, AgoraRteStreamEncryptionConfig, AgoraRteStreamJoinConfig, AgoraRteDualVideoStreamConfig, AgoraRteMessage, AgoraRteConnectionState, AgoraRteScenePropertiesUpdatedEvent, AgoraRteOperatCause, AgoraRteRenderView, AgoraRteUploadEvent, AgoraRteVideoEncoderConfig, FcrWhiteboardView } from './imports';
|
|
2
|
+
import { FcrSharePermissionState } from './room-control/sharing-control/type';
|
|
3
3
|
import { FcrUserRole } from './room-control/user-control/type';
|
|
4
4
|
import type { FcrAudioSourceType, FcrMediaSourceState, FcrRegion, FcrRoomConnectorType, FcrStreamType, FcrVideoSourceType } from '.';
|
|
5
5
|
import { FcrLineType, FcrRoomJoinOptions, FcrRoomType } from './room-control/type';
|
|
@@ -285,3 +285,16 @@ export declare enum FcrStreamState {
|
|
|
285
285
|
PUBLISH = 1
|
|
286
286
|
}
|
|
287
287
|
export { FcrError } from './utilities/error';
|
|
288
|
+
export type FcrWhiteboardParameters = {
|
|
289
|
+
cursor?: boolean;
|
|
290
|
+
syncMode?: boolean;
|
|
291
|
+
extras?: unknown;
|
|
292
|
+
extendClass?: unknown;
|
|
293
|
+
windowManagerParams?: unknown;
|
|
294
|
+
floatBar?: unknown;
|
|
295
|
+
containerElement?: FcrWhiteboardView;
|
|
296
|
+
};
|
|
297
|
+
export { FcrBoardToolType, FcrBoardShape } from './room-control/whiteboard-control-v2/enum';
|
|
298
|
+
export type { FcrBoardMainWindow, FcrBoardMainWindowObserver, } from './room-control/whiteboard-control-v2/type';
|
|
299
|
+
export type { FcrColor } from './room-control/whiteboard-control/type';
|
|
300
|
+
export type { FcrLanguageConfig } from './room-control/stt-control/type';
|
package/lib/type.js
CHANGED
|
@@ -21,6 +21,18 @@ Object.defineProperty(exports, "FcrAudioSourceType", {
|
|
|
21
21
|
return _imports.AgoraRtcAudioSourceType;
|
|
22
22
|
}
|
|
23
23
|
});
|
|
24
|
+
Object.defineProperty(exports, "FcrBoardShape", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
get: function () {
|
|
27
|
+
return _enum.FcrBoardShape;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
Object.defineProperty(exports, "FcrBoardToolType", {
|
|
31
|
+
enumerable: true,
|
|
32
|
+
get: function () {
|
|
33
|
+
return _enum.FcrBoardToolType;
|
|
34
|
+
}
|
|
35
|
+
});
|
|
24
36
|
Object.defineProperty(exports, "FcrCapability", {
|
|
25
37
|
enumerable: true,
|
|
26
38
|
get: function () {
|
|
@@ -292,6 +304,7 @@ var _type6 = require("./room-control/sharing-control/type");
|
|
|
292
304
|
var _type7 = require("./room-control/type");
|
|
293
305
|
var _type8 = require("./media-control/type");
|
|
294
306
|
var _error = require("./utilities/error");
|
|
307
|
+
var _enum = require("./room-control/whiteboard-control-v2/enum");
|
|
295
308
|
// 基础导入类型(集中管理第三方依赖类型别名)
|
|
296
309
|
// 内部枚举与基础类型导入
|
|
297
310
|
// 模块类型导出(按功能模块分组)
|
|
@@ -5,8 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.iterateSet = exports.iterateMap = exports.convertToStructure = void 0;
|
|
7
7
|
require("core-js/modules/es.array.push.js");
|
|
8
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
8
9
|
const iterateMap = (map, processors) => {
|
|
9
|
-
const onFilter = processors
|
|
10
|
+
const onFilter = (processors === null || processors === void 0 ? void 0 : processors.onFilter) || (() => true);
|
|
10
11
|
const {
|
|
11
12
|
onMap,
|
|
12
13
|
onReduce
|
|
@@ -26,7 +27,7 @@ const iterateMap = (map, processors) => {
|
|
|
26
27
|
};
|
|
27
28
|
exports.iterateMap = iterateMap;
|
|
28
29
|
const iterateSet = (map, processors) => {
|
|
29
|
-
const onFilter = processors
|
|
30
|
+
const onFilter = (processors === null || processors === void 0 ? void 0 : processors.onFilter) || (() => true);
|
|
30
31
|
const {
|
|
31
32
|
onMap,
|
|
32
33
|
onReduce
|
|
@@ -1,11 +1,18 @@
|
|
|
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 _error = require("./error");
|
|
8
|
-
|
|
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
|
* 通用错误处理辅助工具
|
|
10
17
|
*
|
|
11
18
|
* 提供统一的错误创建和处理机制,支持实例化配置
|
|
@@ -25,6 +32,7 @@ let ControllerType = exports.ControllerType = /*#__PURE__*/function (ControllerT
|
|
|
25
32
|
ControllerType["WHITEBOARD"] = "whiteboard";
|
|
26
33
|
ControllerType["MONITOR"] = "monitor";
|
|
27
34
|
ControllerType["MEDIA"] = "media";
|
|
35
|
+
ControllerType["STT"] = "stt";
|
|
28
36
|
return ControllerType;
|
|
29
37
|
}({});
|
|
30
38
|
/**
|
|
@@ -34,14 +42,14 @@ let ControllerType = exports.ControllerType = /*#__PURE__*/function (ControllerT
|
|
|
34
42
|
* 错误处理助手类 - 支持实例化配置
|
|
35
43
|
*/
|
|
36
44
|
class FcrErrorHelper {
|
|
37
|
-
constructor(
|
|
38
|
-
|
|
45
|
+
constructor() {
|
|
46
|
+
let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
47
|
+
this.config = _objectSpread({
|
|
39
48
|
defaultModuleCode: _error.FcrErrorModuleCode.ROOM,
|
|
40
49
|
enableDetailedMessages: true,
|
|
41
50
|
logPrefix: 'FCR',
|
|
42
|
-
autoLog: false
|
|
43
|
-
|
|
44
|
-
};
|
|
51
|
+
autoLog: false
|
|
52
|
+
}, config);
|
|
45
53
|
}
|
|
46
54
|
/**
|
|
47
55
|
* 生成控制器未初始化错误
|
|
@@ -50,11 +58,11 @@ class FcrErrorHelper {
|
|
|
50
58
|
* @returns FcrError
|
|
51
59
|
*/
|
|
52
60
|
createControllerNotInitializedError(controllerType, moduleCode) {
|
|
53
|
-
const module = moduleCode
|
|
54
|
-
const message = this.config.enableDetailedMessages ?
|
|
61
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
62
|
+
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");
|
|
55
63
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.NOT_JOINED_ROOM, message);
|
|
56
64
|
if (this.config.autoLog) {
|
|
57
|
-
console.error(
|
|
65
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
58
66
|
}
|
|
59
67
|
return error;
|
|
60
68
|
}
|
|
@@ -67,11 +75,11 @@ class FcrErrorHelper {
|
|
|
67
75
|
* @returns FcrError
|
|
68
76
|
*/
|
|
69
77
|
createOperationConflictError(operation, reason, moduleCode) {
|
|
70
|
-
const module = moduleCode
|
|
71
|
-
const message = this.config.enableDetailedMessages ?
|
|
78
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
79
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Failed to ").concat(operation, ": ").concat(reason) : "".concat(operation, " failed: ").concat(reason);
|
|
72
80
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.JOIN_CONFLICT, message);
|
|
73
81
|
if (this.config.autoLog) {
|
|
74
|
-
console.error(
|
|
82
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
75
83
|
}
|
|
76
84
|
return error;
|
|
77
85
|
}
|
|
@@ -83,11 +91,11 @@ class FcrErrorHelper {
|
|
|
83
91
|
* @returns FcrError
|
|
84
92
|
*/
|
|
85
93
|
createOperationCanceledError(operation, moduleCode) {
|
|
86
|
-
const module = moduleCode
|
|
87
|
-
const message = this.config.enableDetailedMessages ?
|
|
94
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
95
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] ").concat(operation, " operation has been cancelled") : "".concat(operation, " cancelled");
|
|
88
96
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.NOT_JOINED_ROOM, message);
|
|
89
97
|
if (this.config.autoLog) {
|
|
90
|
-
console.error(
|
|
98
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
91
99
|
}
|
|
92
100
|
return error;
|
|
93
101
|
}
|
|
@@ -99,11 +107,11 @@ class FcrErrorHelper {
|
|
|
99
107
|
* @returns FcrError
|
|
100
108
|
*/
|
|
101
109
|
createSendMessageError(originalError, moduleCode) {
|
|
102
|
-
const module = moduleCode
|
|
103
|
-
const message = this.config.enableDetailedMessages ?
|
|
110
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
111
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Send message failed: ").concat(originalError.message) : 'send message failed';
|
|
104
112
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.UNDEFINED_ERROR, message);
|
|
105
113
|
if (this.config.autoLog) {
|
|
106
|
-
console.error(
|
|
114
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message), originalError);
|
|
107
115
|
}
|
|
108
116
|
return error;
|
|
109
117
|
}
|
|
@@ -116,11 +124,11 @@ class FcrErrorHelper {
|
|
|
116
124
|
* @returns FcrError
|
|
117
125
|
*/
|
|
118
126
|
createOperationError(operation, originalError, moduleCode) {
|
|
119
|
-
const module = moduleCode
|
|
120
|
-
const message = this.config.enableDetailedMessages ?
|
|
127
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
128
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] ").concat(operation, " failed").concat(originalError ? ": ".concat(originalError.message) : '') : "".concat(operation, " failed");
|
|
121
129
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.NOT_JOINED_ROOM, message);
|
|
122
130
|
if (this.config.autoLog) {
|
|
123
|
-
console.error(
|
|
131
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message), originalError);
|
|
124
132
|
}
|
|
125
133
|
return error;
|
|
126
134
|
}
|
|
@@ -132,11 +140,11 @@ class FcrErrorHelper {
|
|
|
132
140
|
* @returns FcrError
|
|
133
141
|
*/
|
|
134
142
|
createNetworkError(message, moduleCode) {
|
|
135
|
-
const module = moduleCode
|
|
136
|
-
const formattedMessage = this.config.enableDetailedMessages ?
|
|
143
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
144
|
+
const formattedMessage = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Network error: ").concat(message) : message;
|
|
137
145
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, formattedMessage);
|
|
138
146
|
if (this.config.autoLog) {
|
|
139
|
-
console.error(
|
|
147
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(formattedMessage));
|
|
140
148
|
}
|
|
141
149
|
return error;
|
|
142
150
|
}
|
|
@@ -149,11 +157,11 @@ class FcrErrorHelper {
|
|
|
149
157
|
* @returns FcrError
|
|
150
158
|
*/
|
|
151
159
|
createInvalidParamsError(paramName, reason, moduleCode) {
|
|
152
|
-
const module = moduleCode
|
|
153
|
-
const message = this.config.enableDetailedMessages ?
|
|
160
|
+
const module = moduleCode !== null && moduleCode !== void 0 ? moduleCode : this.config.defaultModuleCode;
|
|
161
|
+
const message = this.config.enableDetailedMessages ? "[".concat(this.config.logPrefix, "] Invalid parameter '").concat(paramName, "': ").concat(reason) : "Invalid parameter '".concat(paramName, "': ").concat(reason);
|
|
154
162
|
const error = (0, _error.generateFcrCoreClientErrorNew)(module, _error.FcrErrorCode.INVALID_PARAMS, message);
|
|
155
163
|
if (this.config.autoLog) {
|
|
156
|
-
console.error(
|
|
164
|
+
console.error("".concat(this.config.logPrefix, ": ").concat(message));
|
|
157
165
|
}
|
|
158
166
|
return error;
|
|
159
167
|
}
|
package/lib/utilities/error.d.ts
CHANGED
package/lib/utilities/error.js
CHANGED
|
@@ -35,6 +35,7 @@ let FcrErrorModuleCode = exports.FcrErrorModuleCode = /*#__PURE__*/function (Fcr
|
|
|
35
35
|
FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_MICROPHONE"] = 32] = "MEDIA_CONTROL_MICROPHONE";
|
|
36
36
|
FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_LOOPBACK"] = 33] = "MEDIA_CONTROL_LOOPBACK";
|
|
37
37
|
FcrErrorModuleCode[FcrErrorModuleCode["MEDIA_CONTROL_SCREEN"] = 34] = "MEDIA_CONTROL_SCREEN";
|
|
38
|
+
FcrErrorModuleCode[FcrErrorModuleCode["ROOM_STT"] = 35] = "ROOM_STT";
|
|
38
39
|
FcrErrorModuleCode[FcrErrorModuleCode["MONITOR"] = 40] = "MONITOR";
|
|
39
40
|
FcrErrorModuleCode[FcrErrorModuleCode["ROOM_LIVE_STREAMING"] = 41] = "ROOM_LIVE_STREAMING";
|
|
40
41
|
return FcrErrorModuleCode;
|
|
@@ -54,9 +55,9 @@ const generateFcrCoreClientError = (module, code, message, origin) => {
|
|
|
54
55
|
const errorType = (0, _imports.padEnd)(String(FcrErrorCodeType.CLIENT), 3, '0'); // 如:'100'
|
|
55
56
|
const moduleCode = (0, _imports.padStart)(String(module), 3, '0'); // 如:'020'
|
|
56
57
|
const errorCode = (0, _imports.padStart)(String(code), 3, '0'); // 如:'001'
|
|
57
|
-
const fullErrorCode = Number(
|
|
58
|
+
const fullErrorCode = Number("".concat(errorType).concat(moduleCode).concat(errorCode)); // 如:'100020001'
|
|
58
59
|
|
|
59
|
-
const errorMessage =
|
|
60
|
+
const errorMessage = "domain: RTE-CLIENT, info: ".concat(message);
|
|
60
61
|
return new _imports.FcrError({
|
|
61
62
|
code: fullErrorCode,
|
|
62
63
|
message: errorMessage
|
|
@@ -64,7 +65,7 @@ const generateFcrCoreClientError = (module, code, message, origin) => {
|
|
|
64
65
|
};
|
|
65
66
|
exports.generateFcrCoreClientError = generateFcrCoreClientError;
|
|
66
67
|
const generateFcrCoreServerError = (code, message, origin) => {
|
|
67
|
-
const errorCode = Number(
|
|
68
|
+
const errorCode = Number("".concat(FcrErrorCodeType.SERVER).concat((0, _imports.padStart)(String(code), 8, '0')));
|
|
68
69
|
const error = new _imports.FcrError({
|
|
69
70
|
message: message,
|
|
70
71
|
code: errorCode
|
|
@@ -79,10 +80,11 @@ const handleRequestError = async (action, errorModuleCode, errorMessage) => {
|
|
|
79
80
|
return await action();
|
|
80
81
|
} catch (e) {
|
|
81
82
|
if (e instanceof _imports.AgoraRestfulClientError) {
|
|
82
|
-
|
|
83
|
+
var _e$serviceCode;
|
|
84
|
+
throw generateFcrCoreServerError((_e$serviceCode = e.serviceCode) !== null && _e$serviceCode !== void 0 ? _e$serviceCode : -1, e.message, e);
|
|
83
85
|
}
|
|
84
86
|
const error = e;
|
|
85
|
-
throw generateFcrCoreClientError(errorModuleCode, FcrErrorCode.UNDEFINED_ERROR, errorMessage
|
|
87
|
+
throw generateFcrCoreClientError(errorModuleCode, FcrErrorCode.UNDEFINED_ERROR, errorMessage !== null && errorMessage !== void 0 ? errorMessage : error.message, error);
|
|
86
88
|
}
|
|
87
89
|
};
|
|
88
90
|
|
|
@@ -103,9 +105,9 @@ const generateFcrCoreClientErrorNew = (module, code, message) => {
|
|
|
103
105
|
const errorType = (0, _imports.padEnd)(String(FcrErrorCodeType.CLIENT), 3, '0'); // 如:'100'
|
|
104
106
|
const moduleCode = (0, _imports.padStart)(String(module), 3, '0'); // 如:'020'
|
|
105
107
|
const errorCode = (0, _imports.padStart)(String(code), 3, '0'); // 如:'001'
|
|
106
|
-
const fullErrorCode = Number(
|
|
108
|
+
const fullErrorCode = Number("".concat(errorType).concat(moduleCode).concat(errorCode)); // 如:'100020001'
|
|
107
109
|
|
|
108
|
-
const errorMessage =
|
|
110
|
+
const errorMessage = "domain: RTE-CLIENT, info: ".concat(message);
|
|
109
111
|
return new _imports.FcrError({
|
|
110
112
|
code: fullErrorCode,
|
|
111
113
|
message: errorMessage
|
|
@@ -113,7 +115,7 @@ const generateFcrCoreClientErrorNew = (module, code, message) => {
|
|
|
113
115
|
};
|
|
114
116
|
exports.generateFcrCoreClientErrorNew = generateFcrCoreClientErrorNew;
|
|
115
117
|
const generateFcrCoreServerErrorNew = (code, message) => {
|
|
116
|
-
const errorCode = Number(
|
|
118
|
+
const errorCode = Number("".concat(FcrErrorCodeType.SERVER).concat((0, _imports.padStart)(String(code), 8, '0')));
|
|
117
119
|
const error = new _imports.FcrError({
|
|
118
120
|
message: message,
|
|
119
121
|
code: errorCode
|
|
@@ -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';
|
|
@@ -160,11 +166,12 @@ class FcrJoinHelper {
|
|
|
160
166
|
}
|
|
161
167
|
}, [], {
|
|
162
168
|
retriesMax: _constants.ROOM_CONTROL_CONSTANTS.MAX_JOIN_ATTEMPTS
|
|
163
|
-
}).fail(async
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
169
|
+
}).fail(async _ref => {
|
|
170
|
+
let {
|
|
171
|
+
error,
|
|
172
|
+
timeFn: waitBeforeRetry,
|
|
173
|
+
currentRetry: attemptCount
|
|
174
|
+
} = _ref;
|
|
168
175
|
return handleJoinRetryFailure(error, waitBeforeRetry, attemptCount, _retryHelpers.canRetryJoinError, onJoinAborted, 'join room via CheckIn');
|
|
169
176
|
}).exec();
|
|
170
177
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getLogger as _getLogger } from '../imports';
|
|
2
|
-
export declare const getLogger: () => import("agora-foundation/lib/logger").Logger;
|
|
2
|
+
export declare const getLogger: () => import("agora-foundation/lib/logger/type").Logger;
|
|
3
3
|
export declare const createLogger: (opts: {
|
|
4
4
|
prefix: string;
|
|
5
|
-
}) => import("agora-foundation/lib/logger").Logger;
|
|
5
|
+
}) => import("agora-foundation/lib/logger/type").Logger;
|
|
6
6
|
export declare const generateLogObserver: <T>(logger: ReturnType<typeof _getLogger>, callbackMethods: (keyof T)[]) => T;
|
package/lib/utilities/logger.js
CHANGED
|
@@ -16,15 +16,18 @@ exports.getLogger = getLogger;
|
|
|
16
16
|
const createLogger = opts => {
|
|
17
17
|
return (0, _imports.createLogger)({
|
|
18
18
|
label: 'fcr-core',
|
|
19
|
-
prefix:
|
|
19
|
+
prefix: "".concat(opts.prefix, "@").concat((0, _imports.randomString)(5))
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
22
|
exports.createLogger = createLogger;
|
|
23
23
|
const generateLogObserver = (logger, callbackMethods) => {
|
|
24
24
|
const observer = {};
|
|
25
25
|
callbackMethods.forEach(method => {
|
|
26
|
-
observer[method] = (
|
|
27
|
-
|
|
26
|
+
observer[method] = function () {
|
|
27
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
28
|
+
args[_key] = arguments[_key];
|
|
29
|
+
}
|
|
30
|
+
logger.info("[API Callback] ".concat(method, " [parameters: ").concat((0, _imports.serializeArgs)(args), "]"));
|
|
28
31
|
};
|
|
29
32
|
});
|
|
30
33
|
return observer;
|
|
@@ -11,19 +11,23 @@ const isTrueValue = value => {
|
|
|
11
11
|
};
|
|
12
12
|
exports.isTrueValue = isTrueValue;
|
|
13
13
|
const getCoreIpList = parameters => {
|
|
14
|
-
|
|
14
|
+
var _parameters$core;
|
|
15
|
+
return parameters === null || parameters === void 0 || (_parameters$core = parameters.core) === null || _parameters$core === void 0 ? void 0 : _parameters$core.coreIpList;
|
|
15
16
|
};
|
|
16
17
|
exports.getCoreIpList = getCoreIpList;
|
|
17
18
|
const getEasemobChatIpList = parameters => {
|
|
18
|
-
|
|
19
|
+
var _parameters$core2;
|
|
20
|
+
return parameters === null || parameters === void 0 || (_parameters$core2 = parameters.core) === null || _parameters$core2 === void 0 ? void 0 : _parameters$core2.easemobChatIpList;
|
|
19
21
|
};
|
|
20
22
|
exports.getEasemobChatIpList = getEasemobChatIpList;
|
|
21
23
|
const getEasemobRestIpList = parameters => {
|
|
22
|
-
|
|
24
|
+
var _parameters$core3;
|
|
25
|
+
return parameters === null || parameters === void 0 || (_parameters$core3 = parameters.core) === null || _parameters$core3 === void 0 ? void 0 : _parameters$core3.easemobRestIpList;
|
|
23
26
|
};
|
|
24
27
|
exports.getEasemobRestIpList = getEasemobRestIpList;
|
|
25
28
|
const isEndpointRegionDisabled = parameters => {
|
|
26
|
-
|
|
29
|
+
var _parameters$core4;
|
|
30
|
+
return isTrueValue(parameters === null || parameters === void 0 || (_parameters$core4 = parameters.core) === null || _parameters$core4 === void 0 ? void 0 : _parameters$core4.disableEndpointRegion);
|
|
27
31
|
};
|
|
28
32
|
exports.isEndpointRegionDisabled = isEndpointRegionDisabled;
|
|
29
33
|
const getRtcPresetParameters = () => {
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.ROOM_NON_RETRYABLE_ERRORS = exports.ROOM_JOIN_NON_RETRYABLE_ERRORS = void 0;
|
|
7
7
|
exports.canRetryError = canRetryError;
|
|
8
8
|
exports.canRetryJoinError = canRetryJoinError;
|
|
9
|
+
require("core-js/modules/web.dom-collections.iterator.js");
|
|
9
10
|
var _imports = require("../imports");
|
|
10
11
|
/**
|
|
11
12
|
* 通用重试辅助工具
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { FcrObjectForgeInitConfig } from '../room-control/whiteboard-control-v2/type';
|
|
1
2
|
export declare const setAnnotationBoardOptions: (options: Record<string, unknown>) => void;
|
|
2
|
-
export declare const getAnnotationBoardOptions: () =>
|
|
3
|
+
export declare const getAnnotationBoardOptions: () => FcrObjectForgeInitConfig | null;
|
|
3
4
|
export declare const clearAnnotationBoardOptions: () => void;
|
|
4
5
|
export declare const setWhiteboardOptions: (options: Record<string, unknown>) => void;
|
|
6
|
+
export declare const getWhiteboardOptions: () => FcrObjectForgeInitConfig | null;
|
|
5
7
|
export declare const clearWhiteboardOptions: () => void;
|
|
@@ -3,7 +3,8 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.setWhiteboardOptions = exports.setAnnotationBoardOptions = exports.getAnnotationBoardOptions = exports.clearWhiteboardOptions = exports.clearAnnotationBoardOptions = void 0;
|
|
6
|
+
exports.setWhiteboardOptions = exports.setAnnotationBoardOptions = exports.getWhiteboardOptions = exports.getAnnotationBoardOptions = exports.clearWhiteboardOptions = exports.clearAnnotationBoardOptions = void 0;
|
|
7
|
+
require("core-js/modules/es.json.stringify.js");
|
|
7
8
|
require("core-js/modules/esnext.json.parse.js");
|
|
8
9
|
var _imports = require("../imports");
|
|
9
10
|
const STORAGE_KEY_ANNOTATION_BOARD_OPTIONS = 'annotation_board_options';
|
|
@@ -28,6 +29,14 @@ const setWhiteboardOptions = options => {
|
|
|
28
29
|
_imports.localStorage.setItem(STORAGE_KEY_WHITEBOARD_OPTIONS, JSON.stringify(options));
|
|
29
30
|
};
|
|
30
31
|
exports.setWhiteboardOptions = setWhiteboardOptions;
|
|
32
|
+
const getWhiteboardOptions = () => {
|
|
33
|
+
const boardOptions = _imports.localStorage.getItem(STORAGE_KEY_WHITEBOARD_OPTIONS);
|
|
34
|
+
if (boardOptions) {
|
|
35
|
+
return JSON.parse(boardOptions);
|
|
36
|
+
}
|
|
37
|
+
return null;
|
|
38
|
+
};
|
|
39
|
+
exports.getWhiteboardOptions = getWhiteboardOptions;
|
|
31
40
|
const clearWhiteboardOptions = () => {
|
|
32
41
|
_imports.localStorage.removeItem(STORAGE_KEY_WHITEBOARD_OPTIONS);
|
|
33
42
|
};
|
package/lib/utilities/storage.js
CHANGED
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;
|
|
@@ -4,10 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
+
require("core-js/modules/es.error.cause.js");
|
|
7
8
|
var _imports = require("../imports");
|
|
8
9
|
var _error = require("./error");
|
|
9
10
|
var _default = exports.default = (0, _imports.validateParams)(error => {
|
|
10
|
-
const message =
|
|
11
|
+
const message = "invalid params: ".concat(error.message);
|
|
11
12
|
const fcrErrorModuleCode = '00';
|
|
12
13
|
return (0, _error.generateFcrCoreClientError)(fcrErrorModuleCode, _error.FcrErrorCode.INVALID_PARAMS, message, new Error(message));
|
|
13
14
|
});
|