agora-rte-sdk 2.8.21 → 2.8.30

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.
Files changed (47) hide show
  1. package/dist/index.js +2 -2
  2. package/lib/core/decorator/handlers/log-handler.d.ts +2 -0
  3. package/lib/core/decorator/handlers/log-handler.js +34 -0
  4. package/lib/core/decorator/log/log-serializer.d.ts +7 -0
  5. package/lib/core/decorator/log/log-serializer.js +38 -0
  6. package/lib/core/decorator/utils.d.ts +2 -0
  7. package/lib/core/decorator/utils.js +19 -0
  8. package/lib/core/logger/index.d.ts +1 -0
  9. package/lib/core/logger/index.js +16 -0
  10. package/lib/core/logger/log.worker.js +4 -2
  11. package/lib/core/media/control.d.ts +11 -8
  12. package/lib/core/media/control.js +42 -32
  13. package/lib/core/media/player.d.ts +9 -0
  14. package/lib/core/media/player.js +36 -0
  15. package/lib/core/media/track.d.ts +8 -1
  16. package/lib/core/media/track.js +18 -0
  17. package/lib/core/media/type.d.ts +113 -0
  18. package/lib/core/media/type.js +31 -0
  19. package/lib/core/rtc/adapter/base.d.ts +5 -5
  20. package/lib/core/rtc/adapter/electron/device.d.ts +0 -1
  21. package/lib/core/rtc/adapter/electron/device.js +0 -5
  22. package/lib/core/rtc/adapter/electron/index.d.ts +5 -5
  23. package/lib/core/rtc/adapter/electron/index.js +18 -24
  24. package/lib/core/rtc/adapter/web/client.d.ts +7 -5
  25. package/lib/core/rtc/adapter/web/client.js +33 -28
  26. package/lib/core/rtc/adapter/web/device.d.ts +0 -1
  27. package/lib/core/rtc/adapter/web/device.js +0 -5
  28. package/lib/core/rtc/adapter/web/dispatcher.d.ts +61 -0
  29. package/lib/core/rtc/adapter/web/dispatcher.js +166 -0
  30. package/lib/core/rtc/adapter/web/index.d.ts +9 -5
  31. package/lib/core/rtc/adapter/web/index.js +25 -16
  32. package/lib/core/rtc/adapter/web/thread.d.ts +18 -11
  33. package/lib/core/rtc/adapter/web/thread.js +241 -133
  34. package/lib/core/rtc/index.d.ts +5 -4
  35. package/lib/core/rtc/index.js +12 -12
  36. package/lib/core/rtc/type.d.ts +0 -4
  37. package/lib/core/services/api.d.ts +4 -0
  38. package/lib/core/services/api.js +29 -0
  39. package/lib/core/utils/decorator.d.ts +2 -0
  40. package/lib/core/utils/decorator.js +65 -0
  41. package/lib/index.d.ts +3 -1
  42. package/lib/index.js +24 -17
  43. package/lib/scene/index.d.ts +1 -0
  44. package/lib/scene/index.js +23 -13
  45. package/lib/scene/state-sync.d.ts +21 -0
  46. package/lib/scene/state-sync.js +169 -0
  47. package/package.json +1 -1
@@ -4,7 +4,8 @@ import { AGRtcConfig } from './adapter';
4
4
  import { LocalAudioTrackStateEvent, LocalVideoTrackStateEvent, RtcAudioDeviceManagerBase, RtcVideoDeviceManagerBase } from './adapter/base';
5
5
  import { AgoraRtcVideoCanvas } from './canvas';
6
6
  import { AGRtcChannel } from './channel';
7
- import { AGRtcDeviceInfo, AGScreenShareDevice, AGScreenShareType, AGBeautyEffect, AGAudioRawDataConfig } from './type';
7
+ import { AGRtcDeviceInfo, AGScreenShareDevice, AGScreenShareType, AGBeautyEffect } from './type';
8
+ import { AgoraRteAudioRawDataConfig, AgoraRteAudioRawDataObserver, AgoraRteAudioRawDataPosition } from '../media/type';
8
9
  export declare class AGRtcManager {
9
10
  private _adapter;
10
11
  private _channels;
@@ -34,8 +35,6 @@ export declare class AGRtcManager {
34
35
  stopAudioRecordingDeviceTest(): number;
35
36
  startAudioPlaybackDeviceTest(url: string): number;
36
37
  stopAudioPlaybackDeviceTest(): number;
37
- setAudioFrameCallback(): number;
38
- stopAudioFrameCallback(): number;
39
38
  onAutoPlayFailed(cb: () => void): number;
40
39
  onLocalCameraListChanged(cb: (addNewDevice: boolean, newDevices: AGRtcDeviceInfo[], allDevices: AGRtcDeviceInfo[]) => void): number;
41
40
  onLocalRecordingDeviceListChanged(cb: (addNewDevice: boolean, newDevices: AGRtcDeviceInfo[], allDevices: AGRtcDeviceInfo[]) => void): number;
@@ -44,7 +43,9 @@ export declare class AGRtcManager {
44
43
  onLocalAudioTrackStateChanged(cb: LocalAudioTrackStateEvent): number;
45
44
  onLocalAudioVolume(cb: (volume: number) => void): number;
46
45
  setBeautyEffectOptions(enable: boolean, options: AGBeautyEffect): number;
47
- setAudioRawDataConfig(config: AGAudioRawDataConfig): number;
46
+ setAudioRawDataConfig(config: AgoraRteAudioRawDataConfig, position: AgoraRteAudioRawDataPosition): number;
47
+ addAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): number;
48
+ removeAudioRawDataObserver(observer: AgoraRteAudioRawDataObserver, position: AgoraRteAudioRawDataPosition): number;
48
49
  hasScreenSharePermission(): boolean;
49
50
  takeSnapshot(channel: string, streamUuid: number, filePath: string): Promise<void | import("./type").AGSnapshotInfo>;
50
51
  getCurrentFrameData(channelName: string, streamUuid: string, isLocal: boolean): ImageData;
@@ -151,16 +151,6 @@ var AGRtcManager = (_dec = _decorator.Log.attach(), _dec2 = _decorator.Log.silen
151
151
  value: function stopAudioPlaybackDeviceTest() {
152
152
  return this._adapter.stopAudioPlaybackDeviceTest();
153
153
  }
154
- }, {
155
- key: "setAudioFrameCallback",
156
- value: function setAudioFrameCallback() {
157
- return this._adapter.setAudioFrameCallback();
158
- }
159
- }, {
160
- key: "stopAudioFrameCallback",
161
- value: function stopAudioFrameCallback() {
162
- return this._adapter.stopAudioFrameCallback();
163
- }
164
154
  }, {
165
155
  key: "onAutoPlayFailed",
166
156
  value: function onAutoPlayFailed(cb) {
@@ -203,8 +193,18 @@ var AGRtcManager = (_dec = _decorator.Log.attach(), _dec2 = _decorator.Log.silen
203
193
  }
204
194
  }, {
205
195
  key: "setAudioRawDataConfig",
206
- value: function setAudioRawDataConfig(config) {
207
- return this._adapter.setAudioRawDataConfig(config);
196
+ value: function setAudioRawDataConfig(config, position) {
197
+ return this._adapter.setAudioRawDataConfig(config, position);
198
+ }
199
+ }, {
200
+ key: "addAudioRawDataObserver",
201
+ value: function addAudioRawDataObserver(observer, position) {
202
+ return this._adapter.addAudioRawDataObserver(observer, position);
203
+ }
204
+ }, {
205
+ key: "removeAudioRawDataObserver",
206
+ value: function removeAudioRawDataObserver(observer, position) {
207
+ return this._adapter.removeAudioRawDataObserver(observer, position);
208
208
  }
209
209
  }, {
210
210
  key: "hasScreenSharePermission",
@@ -132,10 +132,6 @@ export interface AGBeautyEffect {
132
132
  smoothnessLevel: number;
133
133
  sharpnessLevel: number;
134
134
  }
135
- export interface AGAudioRawDataConfig {
136
- frameSize?: 256 | 512 | 1024 | 2048 | 4096 | 8192 | 16384;
137
- sampleRate?: number;
138
- }
139
135
  export declare enum AGRemoteVideoStreamType {
140
136
  /**
141
137
  * 0: High-quality video stream (high-bitrate, high-resolution).
@@ -92,4 +92,8 @@ export declare class AgoraRteService extends ApiBase {
92
92
  }): Promise<any>;
93
93
  sendRoomChatMessage(message: string, roomUuid: string): Promise<any>;
94
94
  publishStreamToCdn(roomUuid: string, userUuid: string, streamUuid: string, params: PublishCdnParams): Promise<any>;
95
+ updateOnlineState({ userUuid, roomUuid }: {
96
+ roomUuid: string;
97
+ userUuid: string;
98
+ }): Promise<any>;
95
99
  }
@@ -569,6 +569,35 @@ var AgoraRteService = (_dec = _log.Log.attach(), _dec(_class = /*#__PURE__*/func
569
569
  }
570
570
  return publishStreamToCdn;
571
571
  }()
572
+ }, {
573
+ key: "updateOnlineState",
574
+ value: function () {
575
+ var _updateOnlineState = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(_ref9) {
576
+ var userUuid, roomUuid;
577
+ return _regeneratorRuntime().wrap(function _callee16$(_context16) {
578
+ while (1) {
579
+ switch (_context16.prev = _context16.next) {
580
+ case 0:
581
+ userUuid = _ref9.userUuid, roomUuid = _ref9.roomUuid;
582
+ _context16.next = 3;
583
+ return this.fetch({
584
+ path: "/v1/rooms/".concat(roomUuid, "/users/").concat(userUuid, "/states/1"),
585
+ method: 'PUT'
586
+ });
587
+ case 3:
588
+ return _context16.abrupt("return", _context16.sent);
589
+ case 4:
590
+ case "end":
591
+ return _context16.stop();
592
+ }
593
+ }
594
+ }, _callee16, this);
595
+ }));
596
+ function updateOnlineState(_x34) {
597
+ return _updateOnlineState.apply(this, arguments);
598
+ }
599
+ return updateOnlineState;
600
+ }()
572
601
  }]);
573
602
  return AgoraRteService;
574
603
  }(_base.ApiBase)) || _class);
@@ -0,0 +1,2 @@
1
+ export declare function immutable(target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor;
2
+ export declare function deepFreeze(object: any): any;
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+
3
+ require("core-js/modules/es.object.keys.js");
4
+ require("core-js/modules/es.symbol.js");
5
+ require("core-js/modules/es.array.filter.js");
6
+ require("core-js/modules/es.object.get-own-property-descriptor.js");
7
+ require("core-js/modules/es.array.for-each.js");
8
+ require("core-js/modules/web.dom-collections.for-each.js");
9
+ require("core-js/modules/es.object.get-own-property-descriptors.js");
10
+ require("core-js/modules/es.object.define-properties.js");
11
+ require("core-js/modules/es.object.define-property.js");
12
+ require("core-js/modules/es.array.slice.js");
13
+ require("core-js/modules/es.object.to-string.js");
14
+ require("core-js/modules/es.function.name.js");
15
+ require("core-js/modules/es.array.from.js");
16
+ require("core-js/modules/es.string.iterator.js");
17
+ require("core-js/modules/es.symbol.description.js");
18
+ require("core-js/modules/es.symbol.iterator.js");
19
+ require("core-js/modules/es.array.iterator.js");
20
+ require("core-js/modules/web.dom-collections.iterator.js");
21
+ require("core-js/modules/es.array.is-array.js");
22
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
23
+ Object.defineProperty(exports, "__esModule", {
24
+ value: true
25
+ });
26
+ exports.deepFreeze = deepFreeze;
27
+ exports.immutable = immutable;
28
+ require("core-js/modules/es.object.get-own-property-names.js");
29
+ require("core-js/modules/es.object.freeze.js");
30
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
31
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
32
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
33
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
34
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
35
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
36
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
37
+ function immutable(target, propertyKey, descriptor) {
38
+ var original = descriptor.get;
39
+ // @ts-ignore
40
+ descriptor.get = function (value) {
41
+ var res = original.call(this, _objectSpread({}, value));
42
+ return deepFreeze(res);
43
+ };
44
+ return descriptor;
45
+ }
46
+ function deepFreeze(object) {
47
+ if (!object) return;
48
+ var propNames = Object.getOwnPropertyNames(object);
49
+ var _iterator = _createForOfIteratorHelper(propNames),
50
+ _step;
51
+ try {
52
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
53
+ var name = _step.value;
54
+ var value = object[name];
55
+ if (value && (0, _typeof2["default"])(value) === 'object') {
56
+ deepFreeze(value);
57
+ }
58
+ }
59
+ } catch (err) {
60
+ _iterator.e(err);
61
+ } finally {
62
+ _iterator.f();
63
+ }
64
+ return Object.freeze(object);
65
+ }
package/lib/index.d.ts CHANGED
@@ -15,11 +15,13 @@ export { retryAttempt } from './core/utils/utils';
15
15
  export { Log, Lodash, bound } from './core/decorator';
16
16
  export { AgoraRteVideoSourceType, AgoraRteAudioSourceType, AgoraRteMediaPublishState, AgoraRteMediaTrack, AgoraRteCameraVideoTrack, AgoraRteMicrophoneAudioTrack, AgoraRteScreenShareTrack, AgoraRteStreamMediaTrack, } from './core/media/track';
17
17
  export { AgoraMediaControlEventType, AgoraMediaControl } from './core/media/control';
18
+ export { AgoraRteAudioRawDataPosition } from './core/media/type';
19
+ export type { AgoraRteAudioRawDataConfig, AgoraRteAudioRawDataObserver } from './core/media/type';
18
20
  export type { AgoraFromUser } from './core/processor/channel-msg/struct';
19
21
  export { Scheduler, ActionWhenTaskFail } from './core/schedule';
20
22
  export { Duration } from './core/schedule/scheduler';
21
23
  export { AGNetworkQuality, AgoraRteMediaSourceState, AGRtcState, AGMediaEncryptionMode, AGRteTrackErrorReason, AGScreenShareType, AGRenderMode, AGLighteningLevel, AGRemoteVideoStreamType, } from './core/rtc/type';
22
- export type { AGNetworkStats, AGRtcDeviceInfo, AGMediaEncryptionConfig, AGScreenShareDevice, AGVideoEncoderConfigurations, AGBeautyEffect, AGAudioRawDataConfig, AGLowStreamParameter, AGSnapshotInfo, } from './core/rtc/type';
24
+ export type { AGNetworkStats, AGRtcDeviceInfo, AGMediaEncryptionConfig, AGScreenShareDevice, AGVideoEncoderConfigurations, AGBeautyEffect, AGLowStreamParameter, AGSnapshotInfo, } from './core/rtc/type';
23
25
  export type { AGRtcConfig } from './core/rtc/adapter/index';
24
26
  export { AGEventEmitter } from './core/utils/events';
25
27
  export { AgoraRteConnectionState, AGChannelProfile, AgoraRteLogLevel } from './type';
package/lib/index.js CHANGED
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
7
7
  Object.defineProperty(exports, "AGChannelProfile", {
8
8
  enumerable: true,
9
9
  get: function get() {
10
- return _type2.AGChannelProfile;
10
+ return _type3.AGChannelProfile;
11
11
  }
12
12
  });
13
13
  Object.defineProperty(exports, "AGError", {
@@ -31,31 +31,31 @@ Object.defineProperty(exports, "AGEventEmitter", {
31
31
  Object.defineProperty(exports, "AGLighteningLevel", {
32
32
  enumerable: true,
33
33
  get: function get() {
34
- return _type.AGLighteningLevel;
34
+ return _type2.AGLighteningLevel;
35
35
  }
36
36
  });
37
37
  Object.defineProperty(exports, "AGMediaEncryptionMode", {
38
38
  enumerable: true,
39
39
  get: function get() {
40
- return _type.AGMediaEncryptionMode;
40
+ return _type2.AGMediaEncryptionMode;
41
41
  }
42
42
  });
43
43
  Object.defineProperty(exports, "AGNetworkQuality", {
44
44
  enumerable: true,
45
45
  get: function get() {
46
- return _type.AGNetworkQuality;
46
+ return _type2.AGNetworkQuality;
47
47
  }
48
48
  });
49
49
  Object.defineProperty(exports, "AGRemoteVideoStreamType", {
50
50
  enumerable: true,
51
51
  get: function get() {
52
- return _type.AGRemoteVideoStreamType;
52
+ return _type2.AGRemoteVideoStreamType;
53
53
  }
54
54
  });
55
55
  Object.defineProperty(exports, "AGRenderMode", {
56
56
  enumerable: true,
57
57
  get: function get() {
58
- return _type.AGRenderMode;
58
+ return _type2.AGRenderMode;
59
59
  }
60
60
  });
61
61
  Object.defineProperty(exports, "AGRtcConnectionType", {
@@ -67,7 +67,7 @@ Object.defineProperty(exports, "AGRtcConnectionType", {
67
67
  Object.defineProperty(exports, "AGRtcState", {
68
68
  enumerable: true,
69
69
  get: function get() {
70
- return _type.AGRtcState;
70
+ return _type2.AGRtcState;
71
71
  }
72
72
  });
73
73
  Object.defineProperty(exports, "AGRteErrorCode", {
@@ -79,13 +79,13 @@ Object.defineProperty(exports, "AGRteErrorCode", {
79
79
  Object.defineProperty(exports, "AGRteTrackErrorReason", {
80
80
  enumerable: true,
81
81
  get: function get() {
82
- return _type.AGRteTrackErrorReason;
82
+ return _type2.AGRteTrackErrorReason;
83
83
  }
84
84
  });
85
85
  Object.defineProperty(exports, "AGScreenShareType", {
86
86
  enumerable: true,
87
87
  get: function get() {
88
- return _type.AGScreenShareType;
88
+ return _type2.AGScreenShareType;
89
89
  }
90
90
  });
91
91
  Object.defineProperty(exports, "AbstractErrorCenter", {
@@ -133,13 +133,13 @@ Object.defineProperty(exports, "AgoraMediaPlayerCanvas", {
133
133
  Object.defineProperty(exports, "AgoraRCEventType", {
134
134
  enumerable: true,
135
135
  get: function get() {
136
- return _type3.AgoraRCEventType;
136
+ return _type4.AgoraRCEventType;
137
137
  }
138
138
  });
139
139
  Object.defineProperty(exports, "AgoraRCRole", {
140
140
  enumerable: true,
141
141
  get: function get() {
142
- return _type3.AgoraRCRole;
142
+ return _type4.AgoraRCRole;
143
143
  }
144
144
  });
145
145
  Object.defineProperty(exports, "AgoraRegion", {
@@ -166,6 +166,12 @@ Object.defineProperty(exports, "AgoraRtcVideoCanvas", {
166
166
  return _canvas.AgoraRtcVideoCanvas;
167
167
  }
168
168
  });
169
+ Object.defineProperty(exports, "AgoraRteAudioRawDataPosition", {
170
+ enumerable: true,
171
+ get: function get() {
172
+ return _type.AgoraRteAudioRawDataPosition;
173
+ }
174
+ });
169
175
  Object.defineProperty(exports, "AgoraRteAudioSourceType", {
170
176
  enumerable: true,
171
177
  get: function get() {
@@ -181,7 +187,7 @@ Object.defineProperty(exports, "AgoraRteCameraVideoTrack", {
181
187
  Object.defineProperty(exports, "AgoraRteConnectionState", {
182
188
  enumerable: true,
183
189
  get: function get() {
184
- return _type2.AgoraRteConnectionState;
190
+ return _type3.AgoraRteConnectionState;
185
191
  }
186
192
  });
187
193
  Object.defineProperty(exports, "AgoraRteEngine", {
@@ -205,7 +211,7 @@ Object.defineProperty(exports, "AgoraRteEventType", {
205
211
  Object.defineProperty(exports, "AgoraRteLogLevel", {
206
212
  enumerable: true,
207
213
  get: function get() {
208
- return _type2.AgoraRteLogLevel;
214
+ return _type3.AgoraRteLogLevel;
209
215
  }
210
216
  });
211
217
  Object.defineProperty(exports, "AgoraRteMediaPublishState", {
@@ -217,7 +223,7 @@ Object.defineProperty(exports, "AgoraRteMediaPublishState", {
217
223
  Object.defineProperty(exports, "AgoraRteMediaSourceState", {
218
224
  enumerable: true,
219
225
  get: function get() {
220
- return _type.AgoraRteMediaSourceState;
226
+ return _type2.AgoraRteMediaSourceState;
221
227
  }
222
228
  });
223
229
  Object.defineProperty(exports, "AgoraRteMediaTrack", {
@@ -354,11 +360,12 @@ var _utils = require("./core/utils/utils");
354
360
  var _decorator = require("./core/decorator");
355
361
  var _track = require("./core/media/track");
356
362
  var _control = require("./core/media/control");
363
+ var _type = require("./core/media/type");
357
364
  var _schedule = require("./core/schedule");
358
365
  var _scheduler = require("./core/schedule/scheduler");
359
- var _type = require("./core/rtc/type");
366
+ var _type2 = require("./core/rtc/type");
360
367
  var _events = require("./core/utils/events");
361
- var _type2 = require("./type");
368
+ var _type3 = require("./type");
362
369
  var _thread = require("./core/utils/thread");
363
- var _type3 = require("./core/rc/type");
370
+ var _type4 = require("./core/rc/type");
364
371
  var _mediaPlayer = require("./core/media-player");
@@ -44,6 +44,7 @@ export declare class AgoraRteScene extends EventEmitter {
44
44
  private _rtcManager;
45
45
  private _rtmChannel;
46
46
  private _rtcChannel;
47
+ private _stateSynchronizer;
47
48
  private _rtmChannelObserver;
48
49
  private _synchronizer?;
49
50
  private _timestampGap;
@@ -62,6 +62,7 @@ var _configs = require("../configs");
62
62
  var _log = require("../core/decorator/log");
63
63
  var _type = require("../type");
64
64
  var _api = require("../core/services/api");
65
+ var _stateSync = require("./state-sync");
65
66
  var _dec, _class;
66
67
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
67
68
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -89,6 +90,7 @@ var AgoraRteScene = (_dec = _log.Log.attach({
89
90
  _this._rtcManager = void 0;
90
91
  _this._rtmChannel = void 0;
91
92
  _this._rtcChannel = void 0;
93
+ _this._stateSynchronizer = void 0;
92
94
  _this._rtmChannelObserver = void 0;
93
95
  _this._synchronizer = void 0;
94
96
  _this._timestampGap = 0;
@@ -101,6 +103,7 @@ var AgoraRteScene = (_dec = _log.Log.attach({
101
103
  _this._rtmChannelObserver = options.rtmChannelObserver;
102
104
  _this._rtcChannel = options.rtcChannel;
103
105
  _this._apiService = new _api.AgoraRteService();
106
+ _this._stateSynchronizer = new _stateSync.AGOnlineStateSynchronizer(_this._apiService, sceneId);
104
107
  _this._apiService.pathPrefix = options.engine.apiServicePathPrefix;
105
108
  _this.dataStore = new _data.AgoraRteSyncDataStore();
106
109
 
@@ -173,7 +176,7 @@ var AgoraRteScene = (_dec = _log.Log.attach({
173
176
  key: "joinScene",
174
177
  value: function () {
175
178
  var _joinScene = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
176
- var mediaControl, _yield$this$getApiSer, user, room, streamUuid, userName, userUuid, role, rtcToken, _user$streams, streams, userProperties, agStreams, stream, snapshotData;
179
+ var mediaControl, _yield$this$getApiSer, user, room, sysConfig, streamUuid, userName, userUuid, role, rtcToken, _user$streams, streams, userProperties, agStreams, stream, snapshotData;
177
180
  return _regeneratorRuntime().wrap(function _callee$(_context) {
178
181
  while (1) {
179
182
  switch (_context.prev = _context.next) {
@@ -205,6 +208,11 @@ var AgoraRteScene = (_dec = _log.Log.attach({
205
208
  _yield$this$getApiSer = _context.sent;
206
209
  user = _yield$this$getApiSer.user;
207
210
  room = _yield$this$getApiSer.room;
211
+ sysConfig = _yield$this$getApiSer.sysConfig;
212
+ if (user.subscribe === 1) {
213
+ this._stateSynchronizer.setSyncDelay(sysConfig.onlineStateEnsureDelay || 5000);
214
+ }
215
+ this._stateSynchronizer.addConnectionStateListeners(this);
208
216
  this.createTs = room.roomState.createTime;
209
217
 
210
218
  // Object.assign(AgoraRteEngineConfig.shared.service.headers, { token: user.userToken });
@@ -214,9 +222,9 @@ var AgoraRteScene = (_dec = _log.Log.attach({
214
222
  });
215
223
 
216
224
  // 2. rtm join
217
- _context.next = 15;
225
+ _context.next = 18;
218
226
  return this._rtmManager.join(this._rtmChannel, this._rtmChannelObserver, this.sceneId);
219
- case 15:
227
+ case 18:
220
228
  // 3. initialize object models
221
229
  streamUuid = user.streamUuid, userName = user.userName, userUuid = user.userUuid, role = user.role, rtcToken = user.rtcToken, _user$streams = user.streams, streams = _user$streams === void 0 ? [] : _user$streams, userProperties = user.userProperties;
222
230
  agStreams = streams.map(function (s) {
@@ -266,27 +274,28 @@ var AgoraRteScene = (_dec = _log.Log.attach({
266
274
  rtm: this._rtmManager
267
275
  });
268
276
  this._addEventListeners(this._synchronizer.handle);
277
+ this._stateSynchronizer.addMessageEventListeners(this._synchronizer.handle);
269
278
 
270
279
  // 4. sync/get snapshot
271
- _context.next = 24;
280
+ _context.next = 28;
272
281
  return this.getApiService().syncSnapShot(this.sceneId);
273
- case 24:
282
+ case 28:
274
283
  snapshotData = _context.sent;
275
284
  this._synchronizer.syncSnapshot(_struct.AgoraRteSyncSnapshotData.fromData(snapshotData));
276
- _context.next = 32;
285
+ _context.next = 36;
277
286
  break;
278
- case 28:
279
- _context.prev = 28;
287
+ case 32:
288
+ _context.prev = 32;
280
289
  _context.t0 = _context["catch"](3);
281
290
  // cleanup
282
291
  this._cleanup();
283
292
  return _context.abrupt("return", _error.RteErrorCenter.shared.handleThrowableError(_error.AGRteErrorCode.RTE_ERR_JOIN_SCENE_FAILED, _context.t0));
284
- case 32:
293
+ case 36:
285
294
  case "end":
286
295
  return _context.stop();
287
296
  }
288
297
  }
289
- }, _callee, this, [[3, 28]]);
298
+ }, _callee, this, [[3, 32]]);
290
299
  }));
291
300
  function joinScene(_x) {
292
301
  return _joinScene.apply(this, arguments);
@@ -302,16 +311,17 @@ var AgoraRteScene = (_dec = _log.Log.attach({
302
311
  while (1) {
303
312
  switch (_context2.prev = _context2.next) {
304
313
  case 0:
305
- _context2.next = 2;
314
+ this._stateSynchronizer.stop();
315
+ _context2.next = 3;
306
316
  return (0, _awaitToJs["default"])(this._rtmManager.leave(this.sceneId));
307
- case 2:
317
+ case 3:
308
318
  _yield$to = _context2.sent;
309
319
  _yield$to2 = (0, _slicedToArray2["default"])(_yield$to, 1);
310
320
  err = _yield$to2[0];
311
321
  err && _error.RteErrorCenter.shared.handleNonThrowableError(_error.AGRteErrorCode.RTE_ERR_LEAVE_SCENE_FAIL, err);
312
322
  this._rtmManager.off(_handler.AgoraRteEventType.RtmConnectionStateChanged, this._handleRtmStateChange);
313
323
  this._cleanup();
314
- case 8:
324
+ case 9:
315
325
  case "end":
316
326
  return _context2.stop();
317
327
  }
@@ -0,0 +1,21 @@
1
+ import { AgoraRteScene } from '.';
2
+ import { Logger } from '../core/logger';
3
+ import { AgoraRteChannelMessageHandle } from '../core/processor/channel-msg/handler';
4
+ import { AgoraRteService } from '../core/services/api';
5
+ export declare class AGOnlineStateSynchronizer {
6
+ logger: Logger;
7
+ private _task?;
8
+ private _api;
9
+ private _sceneId;
10
+ private _delay;
11
+ private _connState;
12
+ private _isOnline;
13
+ constructor(api: AgoraRteService, sceneId: string);
14
+ setSyncDelay(delay: number): void;
15
+ addMessageEventListeners(handle: AgoraRteChannelMessageHandle): void;
16
+ addConnectionStateListeners(scene: AgoraRteScene): void;
17
+ start(): void;
18
+ stop(): void;
19
+ get isStateNotInSync(): boolean;
20
+ private _notifyServerStateOnline;
21
+ }