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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fcr-core",
|
|
3
3
|
"description": "Core APIs for building online scenes",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.8.0-alpha",
|
|
5
5
|
"module": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"build:split:i18n": "node ./build-doc/doc-localization.js",
|
|
27
27
|
"build:en-docs": "typedoc --entryPoints ./build-doc/en-sdk.d.ts --readme ./build-doc/readme-en.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/en/tsconfig.json --out en-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
|
|
28
28
|
"build:cn-docs": "typedoc --entryPoints ./build-doc/cn-sdk.d.ts --readme ./build-doc/readme-cn.md --hideGenerator --name 'Edu Store Typescript API Reference for Web' --tsconfig ./build-doc/cn/tsconfig.json --out cn-docs --excludeExternals --excludePrivate --excludeInternal --excludeProtected --disableSources --theme typedoc-theme",
|
|
29
|
-
"test-browser": "agora-tc-test-karma-browser
|
|
29
|
+
"test-browser": "agora-tc-test-karma-browser",
|
|
30
30
|
"test-electron": "agora-tc-test-karma-electron"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"@types/lodash": "^4.14.168",
|
|
41
41
|
"@types/sinon": "^17.0.2",
|
|
42
42
|
"@types/uuid": "^8.3.0",
|
|
43
|
-
"agora-toolchain": "3.
|
|
43
|
+
"agora-toolchain": "3.8.0-alpha",
|
|
44
44
|
"core-js": "^3.33.3",
|
|
45
45
|
"decomment": "^0.9.5",
|
|
46
46
|
"husky": "^9.0.11",
|
|
@@ -52,11 +52,16 @@
|
|
|
52
52
|
"typescript": "^5.3.2"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
+
"@netless/app-slide": "^0.2.81",
|
|
56
|
+
"@netless/appliance-plugin": "^1.1.21",
|
|
55
57
|
"@netless/forge-room": "1.0.6",
|
|
56
58
|
"@netless/forge-rtm": "1.0.6",
|
|
57
59
|
"@netless/forge-whiteboard": "1.0.6",
|
|
58
|
-
"
|
|
59
|
-
"
|
|
60
|
+
"@netless/video-js-plugin": "^0.3.8",
|
|
61
|
+
"@netless/white-snapshot": "^0.4.2",
|
|
62
|
+
"@netless/window-manager": "^1.0.7-beta.6",
|
|
63
|
+
"agora-foundation": "3.8.0-alpha",
|
|
64
|
+
"agora-rte-sdk": "3.8.0-alpha",
|
|
60
65
|
"await-to-js": "^3.0.0",
|
|
61
66
|
"dayjs": "^1.10.4",
|
|
62
67
|
"easemob-websdk": "4.13.0",
|
|
@@ -68,6 +73,7 @@
|
|
|
68
73
|
"lodash": "^4.17.21",
|
|
69
74
|
"protobufjs": "^6.11.2",
|
|
70
75
|
"uuid": "^9.0.1",
|
|
76
|
+
"white-web-sdk": "^2.16.53",
|
|
71
77
|
"yjs": "^13.6.18"
|
|
72
78
|
},
|
|
73
79
|
"browserslist": {
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { AgoraRteScene } from 'agora-rte-sdk';
|
|
2
|
-
import { FcrAnnotationConfig, FcrAnnotationControl, FcrAnnotationControlFactory } from './type';
|
|
3
|
-
import { FcrPrivilegeControl, FcrStreamControl, FcrUserControl } from '../../..';
|
|
4
|
-
import { FcrPrivilegedAnnotationControlImpl } from './privilege-control';
|
|
5
|
-
import { FcrCoreServiceApi } from '../../../service/api';
|
|
6
|
-
import { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
|
|
7
|
-
export declare class FcrAnnotationControlFactoryImpl implements FcrAnnotationControlFactory {
|
|
8
|
-
private _rtmClient;
|
|
9
|
-
private _scene?;
|
|
10
|
-
private _streamControl?;
|
|
11
|
-
private _userControl?;
|
|
12
|
-
private _privilegeControl?;
|
|
13
|
-
private _api?;
|
|
14
|
-
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
15
|
-
constructor(_rtmClient: AgoraRtmClient, _scene?: AgoraRteScene | undefined, _streamControl?: FcrStreamControl | undefined, _userControl?: FcrUserControl | undefined, _privilegeControl?: FcrPrivilegeControl | undefined, _api?: FcrCoreServiceApi | undefined);
|
|
16
|
-
createForSubProcess(config: FcrAnnotationConfig): FcrAnnotationControl;
|
|
17
|
-
createForMainProcess(): FcrPrivilegedAnnotationControlImpl;
|
|
18
|
-
private _getBoardConfigInfoWithScene;
|
|
19
|
-
}
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import { FcrAnnotationConfig, FcrPrivilegedAnnotationControl } from './type';
|
|
2
|
-
import { AgoraRteScene } from 'agora-rte-sdk';
|
|
3
|
-
import { FcrConnectionState, FcrPrivilegeControl, FcrStreamControl, FcrUserControl, FcrWhiteboardObserver } from '../../../type';
|
|
4
|
-
import { FcrAnnotationControlImpl } from './control';
|
|
5
|
-
import { FcrCoreServiceApi } from '../../../service/api';
|
|
6
|
-
import { AgoraRtmClient } from 'agora-rte-sdk/lib/core/rtm/client';
|
|
7
|
-
import { FcrBoardMainWindow } from '../../whiteboard-control/types';
|
|
8
|
-
export declare class FcrPrivilegedAnnotationControlImpl extends FcrAnnotationControlImpl implements FcrPrivilegedAnnotationControl {
|
|
9
|
-
private _scene;
|
|
10
|
-
private _streamControl;
|
|
11
|
-
private _userControl;
|
|
12
|
-
private _privilegeControl;
|
|
13
|
-
private _api;
|
|
14
|
-
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
15
|
-
private _config;
|
|
16
|
-
private _isOpen;
|
|
17
|
-
private _waitPromise;
|
|
18
|
-
private _waitPromiseResolve;
|
|
19
|
-
private _waitPromiseReject;
|
|
20
|
-
private _privilegeObserver;
|
|
21
|
-
private _sceneObserver;
|
|
22
|
-
constructor(rtmClient: AgoraRtmClient, config: FcrAnnotationConfig, _scene: AgoraRteScene, _streamControl: FcrStreamControl, _userControl: FcrUserControl, _privilegeControl: FcrPrivilegeControl, _api: FcrCoreServiceApi);
|
|
23
|
-
addObserver(observer: FcrWhiteboardObserver): void;
|
|
24
|
-
removeObserver(observer: FcrWhiteboardObserver): void;
|
|
25
|
-
open(): Promise<FcrBoardMainWindow>;
|
|
26
|
-
close(): Promise<void>;
|
|
27
|
-
syncScreenShareOwnerAnnotationOpenDone(): Promise<void>;
|
|
28
|
-
protected updateConnnectionState(state: FcrConnectionState): void;
|
|
29
|
-
protected _connect(): Promise<FcrBoardMainWindow>;
|
|
30
|
-
private _hasBoardWritePermission;
|
|
31
|
-
private _checkForConnect;
|
|
32
|
-
private _clearWaitPromise;
|
|
33
|
-
private _getToken;
|
|
34
|
-
private _handleApplicationLaunch;
|
|
35
|
-
private _handleApplicationTerminal;
|
|
36
|
-
}
|
|
@@ -1,252 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
require("core-js/modules/es.array.push.js");
|
|
4
|
-
require("core-js/modules/esnext.function.metadata.js");
|
|
5
|
-
require("core-js/modules/esnext.map.delete-all.js");
|
|
6
|
-
require("core-js/modules/esnext.map.emplace.js");
|
|
7
|
-
require("core-js/modules/esnext.map.every.js");
|
|
8
|
-
require("core-js/modules/esnext.map.filter.js");
|
|
9
|
-
require("core-js/modules/esnext.map.find.js");
|
|
10
|
-
require("core-js/modules/esnext.map.find-key.js");
|
|
11
|
-
require("core-js/modules/esnext.map.includes.js");
|
|
12
|
-
require("core-js/modules/esnext.map.key-of.js");
|
|
13
|
-
require("core-js/modules/esnext.map.map-keys.js");
|
|
14
|
-
require("core-js/modules/esnext.map.map-values.js");
|
|
15
|
-
require("core-js/modules/esnext.map.merge.js");
|
|
16
|
-
require("core-js/modules/esnext.map.reduce.js");
|
|
17
|
-
require("core-js/modules/esnext.map.some.js");
|
|
18
|
-
require("core-js/modules/esnext.map.update.js");
|
|
19
|
-
require("core-js/modules/esnext.symbol.metadata.js");
|
|
20
|
-
Object.defineProperty(exports, "__esModule", {
|
|
21
|
-
value: true
|
|
22
|
-
});
|
|
23
|
-
exports.FcrPrivilegedAnnotationControlImpl = void 0;
|
|
24
|
-
require("core-js/modules/esnext.iterator.constructor.js");
|
|
25
|
-
require("core-js/modules/esnext.iterator.find.js");
|
|
26
|
-
require("core-js/modules/esnext.iterator.some.js");
|
|
27
|
-
var _type = require("../../../type");
|
|
28
|
-
var _control = require("./control");
|
|
29
|
-
var _forgeWhiteboard = require("@netless/forge-whiteboard");
|
|
30
|
-
var _helper = require("../../privilege-control/helper");
|
|
31
|
-
var _imports = require("../../../imports");
|
|
32
|
-
var _error = require("../../../utilities/error");
|
|
33
|
-
var _logger = require("../../../utilities/logger");
|
|
34
|
-
var _utils = require("../utils");
|
|
35
|
-
let _initProto;
|
|
36
|
-
function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function (e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O.static = l, O.private = f, f ? 2 === o ? k = function (e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function (e) { return e[n]; }, (o < 2 || 4 === o) && (F = function (e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == typeof P && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol.for("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol.for("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function (t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
|
|
37
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
|
|
38
|
-
function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
39
|
-
function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
|
|
40
|
-
function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
|
|
41
|
-
class FcrPrivilegedAnnotationControlImpl extends _control.FcrAnnotationControlImpl {
|
|
42
|
-
static {
|
|
43
|
-
[_initProto] = _applyDecs(this, [[_imports.trace, 2, "open"], [_imports.trace, 2, "close"], [_imports.trace, 2, "syncScreenShareOwnerAnnotationOpenDone"], [[_imports.bound, _imports.trace], 2, "_handleApplicationLaunch"], [[_imports.bound, _imports.trace], 2, "_handleApplicationTerminal"]], [], 0, void 0, _control.FcrAnnotationControlImpl).e;
|
|
44
|
-
}
|
|
45
|
-
logger = (_initProto(this), (0, _logger.createLogger)({
|
|
46
|
-
prefix: 'FcrPrivilegedAnnotationControlImpl'
|
|
47
|
-
}));
|
|
48
|
-
_isOpen = false;
|
|
49
|
-
_waitPromise = null;
|
|
50
|
-
_waitPromiseResolve = null;
|
|
51
|
-
_waitPromiseReject = null;
|
|
52
|
-
_privilegeObserver = {
|
|
53
|
-
onLocalUserPermissionInfoAdded: (roomId, event) => {
|
|
54
|
-
if (this._hasBoardWritePermission(event)) {
|
|
55
|
-
this.logger.info(`add board write permission`);
|
|
56
|
-
const whiteboard = this.annotation;
|
|
57
|
-
if (whiteboard) {
|
|
58
|
-
whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
|
|
59
|
-
} else {
|
|
60
|
-
this.logger.warn('whiteboard is not initialized yet, should add permission when application launched');
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
},
|
|
64
|
-
onLocalUserPermissionInfoDeleted: (roomId, event) => {
|
|
65
|
-
if (this._hasBoardWritePermission(event)) {
|
|
66
|
-
this.logger.info(`remove board write permission`);
|
|
67
|
-
const whiteboard = this.annotation;
|
|
68
|
-
if (whiteboard) {
|
|
69
|
-
whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
|
|
70
|
-
} else {
|
|
71
|
-
this.logger.warn('whiteboard is not initialized yet, should remove permission when application launched');
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
};
|
|
76
|
-
_sceneObserver = {
|
|
77
|
-
onScenePropertiesUpdated: async (sceneId, event) => {
|
|
78
|
-
const hasKey = Object.keys(event.changedProperties).some(changeKey => {
|
|
79
|
-
return changeKey === 'widgets.annotation.extra.boardAppId';
|
|
80
|
-
});
|
|
81
|
-
if (hasKey) {
|
|
82
|
-
this.logger.info('widgets.annotation.extra.boardAppId updated, re-initializing annotation info');
|
|
83
|
-
if (this._isOpen && (await this._checkForConnect())) {
|
|
84
|
-
this._connect();
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
|
-
constructor(rtmClient, config, _scene, _streamControl, _userControl, _privilegeControl, _api) {
|
|
90
|
-
super(rtmClient, config);
|
|
91
|
-
this._scene = _scene;
|
|
92
|
-
this._streamControl = _streamControl;
|
|
93
|
-
this._userControl = _userControl;
|
|
94
|
-
this._privilegeControl = _privilegeControl;
|
|
95
|
-
this._api = _api;
|
|
96
|
-
this._config = config;
|
|
97
|
-
this._privilegeControl.addObserver(this._privilegeObserver);
|
|
98
|
-
this._scene.addObserver(this._sceneObserver);
|
|
99
|
-
this.logger.info(`initialized, config: ${JSON.stringify(config)}`);
|
|
100
|
-
}
|
|
101
|
-
addObserver(observer) {
|
|
102
|
-
this.observable.addObserver(observer);
|
|
103
|
-
}
|
|
104
|
-
removeObserver(observer) {
|
|
105
|
-
this.observable.removeObserver(observer);
|
|
106
|
-
}
|
|
107
|
-
async open() {
|
|
108
|
-
this._isOpen = true;
|
|
109
|
-
this.logger.info(`open privileged annotation control with config: ${(0, _imports.jsonstring)(this._config)}`);
|
|
110
|
-
const isReadyToConnect = await this._checkForConnect();
|
|
111
|
-
if (isReadyToConnect) {
|
|
112
|
-
return this._connect();
|
|
113
|
-
}
|
|
114
|
-
if (!this._waitPromise) {
|
|
115
|
-
this._waitPromise = new Promise((resolve, reject) => {
|
|
116
|
-
this._waitPromiseResolve = resolve;
|
|
117
|
-
this._waitPromiseReject = reject;
|
|
118
|
-
this.logger.info('waiting for annotation config to be ready');
|
|
119
|
-
});
|
|
120
|
-
}
|
|
121
|
-
return this._waitPromise;
|
|
122
|
-
}
|
|
123
|
-
close() {
|
|
124
|
-
this._isOpen = false;
|
|
125
|
-
if (this._waitPromiseReject) {
|
|
126
|
-
this._waitPromiseReject(new Error('closed before connection established'));
|
|
127
|
-
this._clearWaitPromise();
|
|
128
|
-
}
|
|
129
|
-
return super.close();
|
|
130
|
-
}
|
|
131
|
-
async syncScreenShareOwnerAnnotationOpenDone() {
|
|
132
|
-
try {
|
|
133
|
-
await this._api.syncScreenShareOwnerAnnotationOpenDone(this._scene.sceneId);
|
|
134
|
-
} catch (e) {
|
|
135
|
-
const error = e;
|
|
136
|
-
const errorMessage = error.message;
|
|
137
|
-
throw (0, _error.generateFcrCoreClientError)(_error.FcrErrorModuleCode.ROOM_WHITEBOARD, _error.FcrErrorCode.LOCAL_HTTP_REQUEST_FAILED, `sync screen share owner annotation open done failed: ${errorMessage}`, error);
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
updateConnnectionState(state) {
|
|
141
|
-
super.updateConnnectionState(state);
|
|
142
|
-
if (state === _type.FcrConnectionState.CONNECTED) {
|
|
143
|
-
const whiteboard = this.annotation;
|
|
144
|
-
const mainWindow = this.boardView;
|
|
145
|
-
if (!whiteboard) {
|
|
146
|
-
this.logger.error('whiteboard is expected to be initialized at this point');
|
|
147
|
-
return;
|
|
148
|
-
}
|
|
149
|
-
if (!mainWindow) {
|
|
150
|
-
this.logger.error('main window is expected to be initialized at this point');
|
|
151
|
-
return;
|
|
152
|
-
}
|
|
153
|
-
const isEnabled = action => (0, _helper.getLocalUserPermissionInfo)(this._scene, action).enable;
|
|
154
|
-
const hasOperationPrivilege = isEnabled(_type.FcrPermissionAction.BoardWrite) || isEnabled(_type.FcrPermissionAction.AnnotationWrite);
|
|
155
|
-
if (hasOperationPrivilege) {
|
|
156
|
-
this.logger.info('add whiteboard permission');
|
|
157
|
-
whiteboard.permissions.addPermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
|
|
158
|
-
} else {
|
|
159
|
-
this.logger.info('remove whiteboard permission');
|
|
160
|
-
whiteboard.permissions.removePermission(_forgeWhiteboard.WhiteboardPermissionFlag.all);
|
|
161
|
-
}
|
|
162
|
-
const stream = this._streamControl.getStreamList().find(stream => stream.videoSourceType === _type.FcrVideoSourceType.SCREEN);
|
|
163
|
-
const localUserId = this._userControl.getLocalUser().userId;
|
|
164
|
-
if (stream) {
|
|
165
|
-
const ownerId = stream.owner.userId;
|
|
166
|
-
const isNotMeSharing = ownerId !== localUserId;
|
|
167
|
-
const platform = this._userControl.getUser(ownerId)?.platform;
|
|
168
|
-
const isPcPlatform = platform && [_type.FcrPlatform.WEB_DESKTOP, _type.FcrPlatform.WINDOWS, _type.FcrPlatform.MACOS].includes(platform);
|
|
169
|
-
const isAndroidPlatform = platform && platform === _type.FcrPlatform.ANDROID;
|
|
170
|
-
this.logger.debug(`isPcPlatform: ${isPcPlatform}, isAndroidPlatform: ${isAndroidPlatform}, isNotMeSharing: ${isNotMeSharing}, ownerId: ${ownerId}, localUserId: ${localUserId}, platform: ${platform}`);
|
|
171
|
-
if (isPcPlatform) {
|
|
172
|
-
mainWindow.setAutoCancelDraw(false);
|
|
173
|
-
}
|
|
174
|
-
if (isAndroidPlatform) {
|
|
175
|
-
mainWindow.setAutoCancelDraw(isNotMeSharing);
|
|
176
|
-
}
|
|
177
|
-
if (ownerId === localUserId) {
|
|
178
|
-
if (mainWindow) {
|
|
179
|
-
mainWindow.clean();
|
|
180
|
-
mainWindow.updateWindowSize({
|
|
181
|
-
width: this._config.size.width,
|
|
182
|
-
height: this._config.size.height
|
|
183
|
-
});
|
|
184
|
-
this.syncScreenShareOwnerAnnotationOpenDone();
|
|
185
|
-
}
|
|
186
|
-
}
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
}
|
|
190
|
-
async _connect() {
|
|
191
|
-
const promise = super._connect();
|
|
192
|
-
promise.then(boardView => {
|
|
193
|
-
this.boardRoom.applicationManager.on('launch', this._handleApplicationLaunch);
|
|
194
|
-
this.boardRoom.applicationManager.on('terminal', this._handleApplicationTerminal);
|
|
195
|
-
if (this._waitPromiseResolve) {
|
|
196
|
-
this._waitPromiseResolve(boardView);
|
|
197
|
-
this._clearWaitPromise();
|
|
198
|
-
}
|
|
199
|
-
return boardView;
|
|
200
|
-
}).catch(reason => {
|
|
201
|
-
if (this._waitPromiseReject) {
|
|
202
|
-
this._waitPromiseReject(reason);
|
|
203
|
-
this._clearWaitPromise();
|
|
204
|
-
}
|
|
205
|
-
});
|
|
206
|
-
return promise;
|
|
207
|
-
}
|
|
208
|
-
_hasBoardWritePermission(event) {
|
|
209
|
-
const hasPermissionNow = event.permissionInfo.some(perm => perm.info?.action === _type.FcrPermissionAction.BoardWrite);
|
|
210
|
-
return hasPermissionNow;
|
|
211
|
-
}
|
|
212
|
-
async _checkForConnect() {
|
|
213
|
-
const roomId = this._scene.sceneId;
|
|
214
|
-
const userId = this._scene.localUser.getLocalUserId();
|
|
215
|
-
const boardOptions = (await this._getToken(roomId, userId)).data;
|
|
216
|
-
if (boardOptions && boardOptions.boardAppId) {
|
|
217
|
-
this.logger.info(`board options found, ready to connect: ${(0, _imports.jsonstring)(boardOptions)}`);
|
|
218
|
-
if (this.annotationConfig) {
|
|
219
|
-
this.annotationConfig.extra = this.annotationConfig.extra || {};
|
|
220
|
-
this.annotationConfig.extra.boardAppId = boardOptions.boardAppId;
|
|
221
|
-
this.annotationConfig.extra.boardId = boardOptions.boardId;
|
|
222
|
-
this.annotationConfig.extra.boardToken = boardOptions.boardToken;
|
|
223
|
-
this.annotationConfig.extra.region = boardOptions.region;
|
|
224
|
-
const roomProperties = this._scene.getSceneProperties();
|
|
225
|
-
const annotationConfig = (0, _utils.getAnnotationConfigFromRoomProperties)(roomProperties, this.logger);
|
|
226
|
-
this.annotationConfig.size.width = annotationConfig.size.width;
|
|
227
|
-
this.annotationConfig.size.height = annotationConfig.size.height;
|
|
228
|
-
this.logger.info(`update annotation config, config: ${(0, _imports.jsonstring)(this.annotationConfig)}`);
|
|
229
|
-
}
|
|
230
|
-
return true;
|
|
231
|
-
}
|
|
232
|
-
return false;
|
|
233
|
-
}
|
|
234
|
-
_clearWaitPromise() {
|
|
235
|
-
this._waitPromiseResolve = null;
|
|
236
|
-
this._waitPromiseReject = null;
|
|
237
|
-
this._waitPromise = null;
|
|
238
|
-
}
|
|
239
|
-
async _getToken(roomId, userId) {
|
|
240
|
-
return await (0, _error.handleRequestError)(() => this._api.getAnnotationToken({
|
|
241
|
-
roomId,
|
|
242
|
-
userId
|
|
243
|
-
}), _error.FcrErrorModuleCode.ROOM_WHITEBOARD, 'get whiteboard token failed');
|
|
244
|
-
}
|
|
245
|
-
async _handleApplicationLaunch(appId, app) {
|
|
246
|
-
this.annotation = app;
|
|
247
|
-
}
|
|
248
|
-
async _handleApplicationTerminal(appId, app) {
|
|
249
|
-
this.annotation = app;
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
exports.FcrPrivilegedAnnotationControlImpl = FcrPrivilegedAnnotationControlImpl;
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
import { FcrBaseWhiteboardControl, FcrBoardActiveInfo, FcrBoardMainWindow } from '../whiteboard-control/types';
|
|
2
|
-
import { AgoraRteEngine, AgoraRteScene } from '../../imports';
|
|
3
|
-
import { FcrCoreServiceApi } from '../../service/api';
|
|
4
|
-
import { FcrConnectionState } from '../../type';
|
|
5
|
-
import { FcrSharedCache } from '../shared-cache';
|
|
6
|
-
import { FcrWhiteboardObserver } from './whiteboard-control/type';
|
|
7
|
-
export declare class FcrWhiteboardControlImpl implements FcrBaseWhiteboardControl {
|
|
8
|
-
private _scene;
|
|
9
|
-
private _api;
|
|
10
|
-
private _engine;
|
|
11
|
-
private _sharedCache;
|
|
12
|
-
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
13
|
-
private _boardView;
|
|
14
|
-
private _boardRoom;
|
|
15
|
-
private _observable;
|
|
16
|
-
private _connectState;
|
|
17
|
-
private _needRetry;
|
|
18
|
-
private _FORGE_WHITEBOARD_APP_ID;
|
|
19
|
-
private _roomCache;
|
|
20
|
-
constructor(_scene: AgoraRteScene, _api: FcrCoreServiceApi, _engine: AgoraRteEngine, _sharedCache: FcrSharedCache);
|
|
21
|
-
open(): Promise<FcrBoardMainWindow>;
|
|
22
|
-
close(): Promise<void>;
|
|
23
|
-
active(): Promise<void>;
|
|
24
|
-
inactive(): Promise<void>;
|
|
25
|
-
getConnectionState(): FcrConnectionState;
|
|
26
|
-
getMainWindow(): FcrBoardMainWindow | undefined;
|
|
27
|
-
getBoardActiveInfo(): FcrBoardActiveInfo;
|
|
28
|
-
setBackgroundColor(backgroundColor: string): Promise<void>;
|
|
29
|
-
getBackgroundColor(): string | undefined;
|
|
30
|
-
getActivity(): boolean;
|
|
31
|
-
getOwnerId(): string;
|
|
32
|
-
addObserver(observer: FcrWhiteboardObserver): void;
|
|
33
|
-
removeObserver(observer: FcrWhiteboardObserver): void;
|
|
34
|
-
private _notifyObservers;
|
|
35
|
-
private _updateConnnectionState;
|
|
36
|
-
private _getToken;
|
|
37
|
-
private _addLogObserver;
|
|
38
|
-
}
|