@whereby.com/media 1.11.0 → 1.11.1
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/dist/index.cjs +3 -26
- package/dist/index.d.cts +3 -7
- package/dist/index.d.mts +3 -7
- package/dist/index.d.ts +3 -7
- package/dist/index.mjs +3 -26
- package/dist/legacy-esm.js +3 -26
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -1421,10 +1421,6 @@ class VegaConnection extends EventEmitter.EventEmitter {
|
|
|
1421
1421
|
var _a;
|
|
1422
1422
|
(_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
|
|
1423
1423
|
}
|
|
1424
|
-
isConnected() {
|
|
1425
|
-
var _a, _b;
|
|
1426
|
-
return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN || ((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.CONNECTING;
|
|
1427
|
-
}
|
|
1428
1424
|
_onOpen() {
|
|
1429
1425
|
logger$9.info("Connected");
|
|
1430
1426
|
this.emit("open");
|
|
@@ -5104,9 +5100,6 @@ class VegaRtcManager {
|
|
|
5104
5100
|
}), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
|
|
5105
5101
|
if (this._screenVideoTrack)
|
|
5106
5102
|
this._emitScreenshareStarted();
|
|
5107
|
-
if (!this._vegaConnection.isConnected() && this._reconnect) {
|
|
5108
|
-
this._connect();
|
|
5109
|
-
}
|
|
5110
5103
|
}));
|
|
5111
5104
|
this._connect();
|
|
5112
5105
|
}
|
|
@@ -5117,13 +5110,6 @@ class VegaRtcManager {
|
|
|
5117
5110
|
});
|
|
5118
5111
|
}
|
|
5119
5112
|
_connect() {
|
|
5120
|
-
if (!this._serverSocket.isConnected()) {
|
|
5121
|
-
const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
|
|
5122
|
-
if (!reconnectThresholdInMs)
|
|
5123
|
-
return;
|
|
5124
|
-
if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
|
|
5125
|
-
return;
|
|
5126
|
-
}
|
|
5127
5113
|
const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
|
|
5128
5114
|
const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
|
|
5129
5115
|
.filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
|
|
@@ -5834,7 +5820,7 @@ class VegaRtcManager {
|
|
|
5834
5820
|
if (!videoTrack.effectTrack) {
|
|
5835
5821
|
this._monitorVideoTrack(videoTrack);
|
|
5836
5822
|
}
|
|
5837
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5823
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "video");
|
|
5838
5824
|
if (beforeEffectTrack) {
|
|
5839
5825
|
this._monitorVideoTrack(beforeEffectTrack);
|
|
5840
5826
|
}
|
|
@@ -5845,7 +5831,7 @@ class VegaRtcManager {
|
|
|
5845
5831
|
if (!audioTrack.effectTrack) {
|
|
5846
5832
|
this._monitorAudioTrack(audioTrack);
|
|
5847
5833
|
}
|
|
5848
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5834
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "audio");
|
|
5849
5835
|
if (beforeEffectTrack) {
|
|
5850
5836
|
this._monitorAudioTrack(beforeEffectTrack);
|
|
5851
5837
|
}
|
|
@@ -5916,9 +5902,7 @@ class VegaRtcManager {
|
|
|
5916
5902
|
}
|
|
5917
5903
|
if (!enable) {
|
|
5918
5904
|
clearTimeout(this._stopCameraTimeout);
|
|
5919
|
-
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended"
|
|
5920
|
-
? 0
|
|
5921
|
-
: 5000;
|
|
5905
|
+
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
|
|
5922
5906
|
this._stopCameraTimeout = setTimeout(() => {
|
|
5923
5907
|
localStream.getVideoTracks().forEach((track) => {
|
|
5924
5908
|
if (track.enabled === false) {
|
|
@@ -6470,7 +6454,6 @@ const logger = new Logger();
|
|
|
6470
6454
|
class ReconnectManager extends EventEmitter {
|
|
6471
6455
|
constructor(socket) {
|
|
6472
6456
|
super();
|
|
6473
|
-
this.reconnectThresholdInMs = 0;
|
|
6474
6457
|
this._socket = socket;
|
|
6475
6458
|
this._clients = {};
|
|
6476
6459
|
this._signalDisconnectTime = undefined;
|
|
@@ -6496,7 +6479,6 @@ class ReconnectManager extends EventEmitter {
|
|
|
6496
6479
|
_onRoomJoined(payload) {
|
|
6497
6480
|
var _a, _b;
|
|
6498
6481
|
return __awaiter(this, void 0, void 0, function* () {
|
|
6499
|
-
this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8 || 0;
|
|
6500
6482
|
if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
|
|
6501
6483
|
this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
|
|
6502
6484
|
return;
|
|
@@ -6750,7 +6732,6 @@ class ServerSocket {
|
|
|
6750
6732
|
}
|
|
6751
6733
|
});
|
|
6752
6734
|
this._socket.on("disconnect", () => {
|
|
6753
|
-
this.disconnectTimestamp = Date.now();
|
|
6754
6735
|
if (this.noopKeepaliveInterval) {
|
|
6755
6736
|
clearInterval(this.noopKeepaliveInterval);
|
|
6756
6737
|
this.noopKeepaliveInterval = null;
|
|
@@ -6834,10 +6815,6 @@ class ServerSocket {
|
|
|
6834
6815
|
var _a;
|
|
6835
6816
|
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
|
|
6836
6817
|
}
|
|
6837
|
-
getReconnectThreshold() {
|
|
6838
|
-
var _a;
|
|
6839
|
-
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
|
|
6840
|
-
}
|
|
6841
6818
|
}
|
|
6842
6819
|
|
|
6843
6820
|
const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;
|
package/dist/index.d.cts
CHANGED
|
@@ -488,7 +488,6 @@ declare class ReconnectManager extends EventEmitter {
|
|
|
488
488
|
evaluationFailed: number;
|
|
489
489
|
roomJoined: number;
|
|
490
490
|
};
|
|
491
|
-
reconnectThresholdInMs: number;
|
|
492
491
|
constructor(socket: any);
|
|
493
492
|
_onRoomJoined(payload: any): Promise<void>;
|
|
494
493
|
_onClientLeft(payload: any): void;
|
|
@@ -517,7 +516,6 @@ declare class ServerSocket {
|
|
|
517
516
|
_reconnectManager?: ReconnectManager | null;
|
|
518
517
|
noopKeepaliveInterval: any;
|
|
519
518
|
_wasConnectedUsingWebsocket?: boolean;
|
|
520
|
-
disconnectTimestamp: number | undefined;
|
|
521
519
|
constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
|
|
522
520
|
setRtcManager(rtcManager?: RtcManager): void;
|
|
523
521
|
connect(): void;
|
|
@@ -527,8 +525,8 @@ declare class ServerSocket {
|
|
|
527
525
|
emitIfConnected(eventName: string, data: any): void;
|
|
528
526
|
getTransport(): any;
|
|
529
527
|
getManager(): any;
|
|
530
|
-
isConnecting():
|
|
531
|
-
isConnected():
|
|
528
|
+
isConnecting(): any;
|
|
529
|
+
isConnected(): any;
|
|
532
530
|
on(eventName: string, handler: Function): () => void;
|
|
533
531
|
once(eventName: string, handler: Function): void;
|
|
534
532
|
off(eventName: string, handler: Function): void;
|
|
@@ -539,7 +537,6 @@ declare class ServerSocket {
|
|
|
539
537
|
evaluationFailed: number;
|
|
540
538
|
roomJoined: number;
|
|
541
539
|
} | undefined;
|
|
542
|
-
getReconnectThreshold(): number | undefined;
|
|
543
540
|
}
|
|
544
541
|
|
|
545
542
|
declare const maybeTurnOnly: (transportConfig: any, features: {
|
|
@@ -1003,7 +1000,6 @@ declare class VegaConnection extends EventEmitter$1 {
|
|
|
1003
1000
|
_setupSocket(): void;
|
|
1004
1001
|
_tearDown(): void;
|
|
1005
1002
|
close(): void;
|
|
1006
|
-
isConnected(): boolean;
|
|
1007
1003
|
_onOpen(): void;
|
|
1008
1004
|
_onMessage(event: MessageEvent): void;
|
|
1009
1005
|
_onClose(): void;
|
|
@@ -1079,7 +1075,7 @@ declare class VegaRtcManager implements RtcManager {
|
|
|
1079
1075
|
_room: any;
|
|
1080
1076
|
_roomSessionId: any;
|
|
1081
1077
|
_emitter: any;
|
|
1082
|
-
_serverSocket:
|
|
1078
|
+
_serverSocket: any;
|
|
1083
1079
|
_webrtcProvider: any;
|
|
1084
1080
|
_features: any;
|
|
1085
1081
|
_eventClaim?: any;
|
package/dist/index.d.mts
CHANGED
|
@@ -488,7 +488,6 @@ declare class ReconnectManager extends EventEmitter {
|
|
|
488
488
|
evaluationFailed: number;
|
|
489
489
|
roomJoined: number;
|
|
490
490
|
};
|
|
491
|
-
reconnectThresholdInMs: number;
|
|
492
491
|
constructor(socket: any);
|
|
493
492
|
_onRoomJoined(payload: any): Promise<void>;
|
|
494
493
|
_onClientLeft(payload: any): void;
|
|
@@ -517,7 +516,6 @@ declare class ServerSocket {
|
|
|
517
516
|
_reconnectManager?: ReconnectManager | null;
|
|
518
517
|
noopKeepaliveInterval: any;
|
|
519
518
|
_wasConnectedUsingWebsocket?: boolean;
|
|
520
|
-
disconnectTimestamp: number | undefined;
|
|
521
519
|
constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
|
|
522
520
|
setRtcManager(rtcManager?: RtcManager): void;
|
|
523
521
|
connect(): void;
|
|
@@ -527,8 +525,8 @@ declare class ServerSocket {
|
|
|
527
525
|
emitIfConnected(eventName: string, data: any): void;
|
|
528
526
|
getTransport(): any;
|
|
529
527
|
getManager(): any;
|
|
530
|
-
isConnecting():
|
|
531
|
-
isConnected():
|
|
528
|
+
isConnecting(): any;
|
|
529
|
+
isConnected(): any;
|
|
532
530
|
on(eventName: string, handler: Function): () => void;
|
|
533
531
|
once(eventName: string, handler: Function): void;
|
|
534
532
|
off(eventName: string, handler: Function): void;
|
|
@@ -539,7 +537,6 @@ declare class ServerSocket {
|
|
|
539
537
|
evaluationFailed: number;
|
|
540
538
|
roomJoined: number;
|
|
541
539
|
} | undefined;
|
|
542
|
-
getReconnectThreshold(): number | undefined;
|
|
543
540
|
}
|
|
544
541
|
|
|
545
542
|
declare const maybeTurnOnly: (transportConfig: any, features: {
|
|
@@ -1003,7 +1000,6 @@ declare class VegaConnection extends EventEmitter$1 {
|
|
|
1003
1000
|
_setupSocket(): void;
|
|
1004
1001
|
_tearDown(): void;
|
|
1005
1002
|
close(): void;
|
|
1006
|
-
isConnected(): boolean;
|
|
1007
1003
|
_onOpen(): void;
|
|
1008
1004
|
_onMessage(event: MessageEvent): void;
|
|
1009
1005
|
_onClose(): void;
|
|
@@ -1079,7 +1075,7 @@ declare class VegaRtcManager implements RtcManager {
|
|
|
1079
1075
|
_room: any;
|
|
1080
1076
|
_roomSessionId: any;
|
|
1081
1077
|
_emitter: any;
|
|
1082
|
-
_serverSocket:
|
|
1078
|
+
_serverSocket: any;
|
|
1083
1079
|
_webrtcProvider: any;
|
|
1084
1080
|
_features: any;
|
|
1085
1081
|
_eventClaim?: any;
|
package/dist/index.d.ts
CHANGED
|
@@ -488,7 +488,6 @@ declare class ReconnectManager extends EventEmitter {
|
|
|
488
488
|
evaluationFailed: number;
|
|
489
489
|
roomJoined: number;
|
|
490
490
|
};
|
|
491
|
-
reconnectThresholdInMs: number;
|
|
492
491
|
constructor(socket: any);
|
|
493
492
|
_onRoomJoined(payload: any): Promise<void>;
|
|
494
493
|
_onClientLeft(payload: any): void;
|
|
@@ -517,7 +516,6 @@ declare class ServerSocket {
|
|
|
517
516
|
_reconnectManager?: ReconnectManager | null;
|
|
518
517
|
noopKeepaliveInterval: any;
|
|
519
518
|
_wasConnectedUsingWebsocket?: boolean;
|
|
520
|
-
disconnectTimestamp: number | undefined;
|
|
521
519
|
constructor(hostName: string, optionsOverrides?: any, glitchFree?: boolean);
|
|
522
520
|
setRtcManager(rtcManager?: RtcManager): void;
|
|
523
521
|
connect(): void;
|
|
@@ -527,8 +525,8 @@ declare class ServerSocket {
|
|
|
527
525
|
emitIfConnected(eventName: string, data: any): void;
|
|
528
526
|
getTransport(): any;
|
|
529
527
|
getManager(): any;
|
|
530
|
-
isConnecting():
|
|
531
|
-
isConnected():
|
|
528
|
+
isConnecting(): any;
|
|
529
|
+
isConnected(): any;
|
|
532
530
|
on(eventName: string, handler: Function): () => void;
|
|
533
531
|
once(eventName: string, handler: Function): void;
|
|
534
532
|
off(eventName: string, handler: Function): void;
|
|
@@ -539,7 +537,6 @@ declare class ServerSocket {
|
|
|
539
537
|
evaluationFailed: number;
|
|
540
538
|
roomJoined: number;
|
|
541
539
|
} | undefined;
|
|
542
|
-
getReconnectThreshold(): number | undefined;
|
|
543
540
|
}
|
|
544
541
|
|
|
545
542
|
declare const maybeTurnOnly: (transportConfig: any, features: {
|
|
@@ -1003,7 +1000,6 @@ declare class VegaConnection extends EventEmitter$1 {
|
|
|
1003
1000
|
_setupSocket(): void;
|
|
1004
1001
|
_tearDown(): void;
|
|
1005
1002
|
close(): void;
|
|
1006
|
-
isConnected(): boolean;
|
|
1007
1003
|
_onOpen(): void;
|
|
1008
1004
|
_onMessage(event: MessageEvent): void;
|
|
1009
1005
|
_onClose(): void;
|
|
@@ -1079,7 +1075,7 @@ declare class VegaRtcManager implements RtcManager {
|
|
|
1079
1075
|
_room: any;
|
|
1080
1076
|
_roomSessionId: any;
|
|
1081
1077
|
_emitter: any;
|
|
1082
|
-
_serverSocket:
|
|
1078
|
+
_serverSocket: any;
|
|
1083
1079
|
_webrtcProvider: any;
|
|
1084
1080
|
_features: any;
|
|
1085
1081
|
_eventClaim?: any;
|
package/dist/index.mjs
CHANGED
|
@@ -1400,10 +1400,6 @@ class VegaConnection extends EventEmitter {
|
|
|
1400
1400
|
var _a;
|
|
1401
1401
|
(_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
|
|
1402
1402
|
}
|
|
1403
|
-
isConnected() {
|
|
1404
|
-
var _a, _b;
|
|
1405
|
-
return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN || ((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.CONNECTING;
|
|
1406
|
-
}
|
|
1407
1403
|
_onOpen() {
|
|
1408
1404
|
logger$9.info("Connected");
|
|
1409
1405
|
this.emit("open");
|
|
@@ -5083,9 +5079,6 @@ class VegaRtcManager {
|
|
|
5083
5079
|
}), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
|
|
5084
5080
|
if (this._screenVideoTrack)
|
|
5085
5081
|
this._emitScreenshareStarted();
|
|
5086
|
-
if (!this._vegaConnection.isConnected() && this._reconnect) {
|
|
5087
|
-
this._connect();
|
|
5088
|
-
}
|
|
5089
5082
|
}));
|
|
5090
5083
|
this._connect();
|
|
5091
5084
|
}
|
|
@@ -5096,13 +5089,6 @@ class VegaRtcManager {
|
|
|
5096
5089
|
});
|
|
5097
5090
|
}
|
|
5098
5091
|
_connect() {
|
|
5099
|
-
if (!this._serverSocket.isConnected()) {
|
|
5100
|
-
const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
|
|
5101
|
-
if (!reconnectThresholdInMs)
|
|
5102
|
-
return;
|
|
5103
|
-
if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
|
|
5104
|
-
return;
|
|
5105
|
-
}
|
|
5106
5092
|
const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
|
|
5107
5093
|
const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
|
|
5108
5094
|
.filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
|
|
@@ -5813,7 +5799,7 @@ class VegaRtcManager {
|
|
|
5813
5799
|
if (!videoTrack.effectTrack) {
|
|
5814
5800
|
this._monitorVideoTrack(videoTrack);
|
|
5815
5801
|
}
|
|
5816
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5802
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "video");
|
|
5817
5803
|
if (beforeEffectTrack) {
|
|
5818
5804
|
this._monitorVideoTrack(beforeEffectTrack);
|
|
5819
5805
|
}
|
|
@@ -5824,7 +5810,7 @@ class VegaRtcManager {
|
|
|
5824
5810
|
if (!audioTrack.effectTrack) {
|
|
5825
5811
|
this._monitorAudioTrack(audioTrack);
|
|
5826
5812
|
}
|
|
5827
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5813
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "audio");
|
|
5828
5814
|
if (beforeEffectTrack) {
|
|
5829
5815
|
this._monitorAudioTrack(beforeEffectTrack);
|
|
5830
5816
|
}
|
|
@@ -5895,9 +5881,7 @@ class VegaRtcManager {
|
|
|
5895
5881
|
}
|
|
5896
5882
|
if (!enable) {
|
|
5897
5883
|
clearTimeout(this._stopCameraTimeout);
|
|
5898
|
-
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended"
|
|
5899
|
-
? 0
|
|
5900
|
-
: 5000;
|
|
5884
|
+
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
|
|
5901
5885
|
this._stopCameraTimeout = setTimeout(() => {
|
|
5902
5886
|
localStream.getVideoTracks().forEach((track) => {
|
|
5903
5887
|
if (track.enabled === false) {
|
|
@@ -6449,7 +6433,6 @@ const logger = new Logger();
|
|
|
6449
6433
|
class ReconnectManager extends EventEmitter$1 {
|
|
6450
6434
|
constructor(socket) {
|
|
6451
6435
|
super();
|
|
6452
|
-
this.reconnectThresholdInMs = 0;
|
|
6453
6436
|
this._socket = socket;
|
|
6454
6437
|
this._clients = {};
|
|
6455
6438
|
this._signalDisconnectTime = undefined;
|
|
@@ -6475,7 +6458,6 @@ class ReconnectManager extends EventEmitter$1 {
|
|
|
6475
6458
|
_onRoomJoined(payload) {
|
|
6476
6459
|
var _a, _b;
|
|
6477
6460
|
return __awaiter(this, void 0, void 0, function* () {
|
|
6478
|
-
this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8 || 0;
|
|
6479
6461
|
if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
|
|
6480
6462
|
this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
|
|
6481
6463
|
return;
|
|
@@ -6729,7 +6711,6 @@ class ServerSocket {
|
|
|
6729
6711
|
}
|
|
6730
6712
|
});
|
|
6731
6713
|
this._socket.on("disconnect", () => {
|
|
6732
|
-
this.disconnectTimestamp = Date.now();
|
|
6733
6714
|
if (this.noopKeepaliveInterval) {
|
|
6734
6715
|
clearInterval(this.noopKeepaliveInterval);
|
|
6735
6716
|
this.noopKeepaliveInterval = null;
|
|
@@ -6813,10 +6794,6 @@ class ServerSocket {
|
|
|
6813
6794
|
var _a;
|
|
6814
6795
|
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
|
|
6815
6796
|
}
|
|
6816
|
-
getReconnectThreshold() {
|
|
6817
|
-
var _a;
|
|
6818
|
-
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
|
|
6819
|
-
}
|
|
6820
6797
|
}
|
|
6821
6798
|
|
|
6822
6799
|
const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;
|
package/dist/legacy-esm.js
CHANGED
|
@@ -1400,10 +1400,6 @@ class VegaConnection extends EventEmitter {
|
|
|
1400
1400
|
var _a;
|
|
1401
1401
|
(_a = this.socket) === null || _a === void 0 ? void 0 : _a.close();
|
|
1402
1402
|
}
|
|
1403
|
-
isConnected() {
|
|
1404
|
-
var _a, _b;
|
|
1405
|
-
return ((_a = this.socket) === null || _a === void 0 ? void 0 : _a.readyState) === WebSocket.OPEN || ((_b = this.socket) === null || _b === void 0 ? void 0 : _b.readyState) === WebSocket.CONNECTING;
|
|
1406
|
-
}
|
|
1407
1403
|
_onOpen() {
|
|
1408
1404
|
logger$9.info("Connected");
|
|
1409
1405
|
this.emit("open");
|
|
@@ -5083,9 +5079,6 @@ class VegaRtcManager {
|
|
|
5083
5079
|
}), this._serverSocket.on(PROTOCOL_RESPONSES.ROOM_JOINED, () => {
|
|
5084
5080
|
if (this._screenVideoTrack)
|
|
5085
5081
|
this._emitScreenshareStarted();
|
|
5086
|
-
if (!this._vegaConnection.isConnected() && this._reconnect) {
|
|
5087
|
-
this._connect();
|
|
5088
|
-
}
|
|
5089
5082
|
}));
|
|
5090
5083
|
this._connect();
|
|
5091
5084
|
}
|
|
@@ -5096,13 +5089,6 @@ class VegaRtcManager {
|
|
|
5096
5089
|
});
|
|
5097
5090
|
}
|
|
5098
5091
|
_connect() {
|
|
5099
|
-
if (!this._serverSocket.isConnected()) {
|
|
5100
|
-
const reconnectThresholdInMs = this._serverSocket.getReconnectThreshold();
|
|
5101
|
-
if (!reconnectThresholdInMs)
|
|
5102
|
-
return;
|
|
5103
|
-
if (Date.now() > (this._serverSocket.disconnectTimestamp || 0) + reconnectThresholdInMs)
|
|
5104
|
-
return;
|
|
5105
|
-
}
|
|
5106
5092
|
const host = this._features.sfuServerOverrideHost || [this._sfuServer.url];
|
|
5107
5093
|
const searchParams = new URLSearchParams(Object.assign({ clientId: this._selfId, organizationId: this._room.organizationId, roomName: this._room.name, eventClaim: this._room.isClaimed ? this._eventClaim : null, lowBw: "true" }, Object.keys(this._features || {})
|
|
5108
5094
|
.filter((featureKey) => this._features[featureKey] && /^sfu/.test(featureKey))
|
|
@@ -5813,7 +5799,7 @@ class VegaRtcManager {
|
|
|
5813
5799
|
if (!videoTrack.effectTrack) {
|
|
5814
5800
|
this._monitorVideoTrack(videoTrack);
|
|
5815
5801
|
}
|
|
5816
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5802
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "video");
|
|
5817
5803
|
if (beforeEffectTrack) {
|
|
5818
5804
|
this._monitorVideoTrack(beforeEffectTrack);
|
|
5819
5805
|
}
|
|
@@ -5824,7 +5810,7 @@ class VegaRtcManager {
|
|
|
5824
5810
|
if (!audioTrack.effectTrack) {
|
|
5825
5811
|
this._monitorAudioTrack(audioTrack);
|
|
5826
5812
|
}
|
|
5827
|
-
const beforeEffectTrack = beforeEffectTracks.find(
|
|
5813
|
+
const beforeEffectTrack = beforeEffectTracks.find(t => t.kind === "audio");
|
|
5828
5814
|
if (beforeEffectTrack) {
|
|
5829
5815
|
this._monitorAudioTrack(beforeEffectTrack);
|
|
5830
5816
|
}
|
|
@@ -5895,9 +5881,7 @@ class VegaRtcManager {
|
|
|
5895
5881
|
}
|
|
5896
5882
|
if (!enable) {
|
|
5897
5883
|
clearTimeout(this._stopCameraTimeout);
|
|
5898
|
-
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended"
|
|
5899
|
-
? 0
|
|
5900
|
-
: 5000;
|
|
5884
|
+
const stopCameraDelay = ((_a = localStream.getVideoTracks().find((t) => !t.enabled)) === null || _a === void 0 ? void 0 : _a.readyState) === "ended" ? 0 : 5000;
|
|
5901
5885
|
this._stopCameraTimeout = setTimeout(() => {
|
|
5902
5886
|
localStream.getVideoTracks().forEach((track) => {
|
|
5903
5887
|
if (track.enabled === false) {
|
|
@@ -6449,7 +6433,6 @@ const logger = new Logger();
|
|
|
6449
6433
|
class ReconnectManager extends EventEmitter$1 {
|
|
6450
6434
|
constructor(socket) {
|
|
6451
6435
|
super();
|
|
6452
|
-
this.reconnectThresholdInMs = 0;
|
|
6453
6436
|
this._socket = socket;
|
|
6454
6437
|
this._clients = {};
|
|
6455
6438
|
this._signalDisconnectTime = undefined;
|
|
@@ -6475,7 +6458,6 @@ class ReconnectManager extends EventEmitter$1 {
|
|
|
6475
6458
|
_onRoomJoined(payload) {
|
|
6476
6459
|
var _a, _b;
|
|
6477
6460
|
return __awaiter(this, void 0, void 0, function* () {
|
|
6478
|
-
this.reconnectThresholdInMs = (payload.disconnectTimeout || 0) * 0.8 || 0;
|
|
6479
6461
|
if (!((_a = payload.room) === null || _a === void 0 ? void 0 : _a.clients)) {
|
|
6480
6462
|
this.emit(PROTOCOL_RESPONSES.ROOM_JOINED, payload);
|
|
6481
6463
|
return;
|
|
@@ -6729,7 +6711,6 @@ class ServerSocket {
|
|
|
6729
6711
|
}
|
|
6730
6712
|
});
|
|
6731
6713
|
this._socket.on("disconnect", () => {
|
|
6732
|
-
this.disconnectTimestamp = Date.now();
|
|
6733
6714
|
if (this.noopKeepaliveInterval) {
|
|
6734
6715
|
clearInterval(this.noopKeepaliveInterval);
|
|
6735
6716
|
this.noopKeepaliveInterval = null;
|
|
@@ -6813,10 +6794,6 @@ class ServerSocket {
|
|
|
6813
6794
|
var _a;
|
|
6814
6795
|
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.metrics;
|
|
6815
6796
|
}
|
|
6816
|
-
getReconnectThreshold() {
|
|
6817
|
-
var _a;
|
|
6818
|
-
return (_a = this._reconnectManager) === null || _a === void 0 ? void 0 : _a.reconnectThresholdInMs;
|
|
6819
|
-
}
|
|
6820
6797
|
}
|
|
6821
6798
|
|
|
6822
6799
|
const defaultSubdomainPattern = /^(?:([^.]+)[.])?((:?[^.]+[.]){1,}[^.]+)$/;
|