@signalapp/ringrtc 2.25.1 → 2.26.0

package/dist/ringrtc/Service.js

@@ -36,22 +36,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CallLogLevel = exports.CallEndedReason = exports.CallState = exports.RingCancelReason = exports.BandwidthMode = exports.HangupType = exports.OpaqueMessage = exports.HangupMessage = exports.BusyMessage = exports.IceCandidateMessage = exports.AnswerMessage = exports.OfferType = exports.OfferMessage = exports.CallingMessage = exports.GroupCall = exports.VideoRequest = exports.GroupMemberInfo = exports.RemoteDeviceState = exports.LocalDeviceState = exports.HttpMethod = exports.RingUpdate = exports.CallMessageUrgency = exports.GroupCallEndReason = exports.JoinState = exports.ConnectionState = exports.Call = exports.RingRTCType = exports.ReceivedAudioLevel = exports.NetworkRoute = exports.PeekInfo = exports.PeekDeviceInfo = void 0;
-/* tslint:disable max-classes-per-file */
+exports.CallLogLevel = exports.CallEndedReason = exports.CallState = exports.RingCancelReason = exports.BandwidthMode = exports.HangupType = exports.OpaqueMessage = exports.HangupMessage = exports.BusyMessage = exports.IceCandidateMessage = exports.AnswerMessage = exports.OfferType = exports.OfferMessage = exports.CallingMessage = exports.GroupCall = exports.VideoRequest = exports.GroupMemberInfo = exports.RemoteDeviceState = exports.LocalDeviceState = exports.HttpMethod = exports.RingUpdate = exports.CallMessageUrgency = exports.GroupCallEndReason = exports.JoinState = exports.ConnectionState = exports.Call = exports.RingRTCType = exports.ReceivedAudioLevel = exports.NetworkRoute = exports.PeekInfo = exports.PeekDeviceInfo = exports.callIdFromRingId = exports.callIdFromEra = void 0;
+/* eslint-disable max-classes-per-file */
 const os = __importStar(require("os"));
 const process = __importStar(require("process"));
-// tslint:disable-next-line no-var-requires no-require-imports
-const Native = require('../../build/' +
-    os.platform() +
-    '/libringrtc-' +
-    process.arch +
-    '.node');
+// eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-dynamic-require
+const Native = require(`../../build/${os.platform()}/libringrtc-${process.arch}.node`);
+exports.callIdFromEra = Native.callIdFromEra;
+function callIdFromRingId(ringId) {
+    return {
+        low: Number(BigInt.asIntN(32, ringId)),
+        high: Number(BigInt.asIntN(32, ringId >> BigInt(32))),
+        unsigned: true,
+    };
+}
+exports.callIdFromRingId = callIdFromRingId;
 class Config {
     constructor() {
         this.use_new_audio_device_module = false;
     }
 }
-// tslint:disable-next-line no-unnecessary-class
 class NativeCallManager {
     constructor(observer) {
         this.observer = observer;
@@ -61,9 +65,11 @@ class NativeCallManager {
         this.createCallEndpoint(config);
     }
     createCallEndpoint(config) {
+        /* eslint-disable prefer-template */
         const fieldTrialsString = Object.entries(config.field_trials || {})
             .map(([k, v]) => `${k}/${v}`)
             .join('/') + '/';
+        /* eslint-enable prefer-template */
         Object.defineProperty(this, Native.callEndpointPropertyKey, {
             configurable: true,
             get() {
@@ -71,12 +77,13 @@ class NativeCallManager {
                 if (process.platform === 'darwin') {
                     // Preload devices to work around
                     // https://bugs.chromium.org/p/chromium/issues/detail?id=1287628
-                    window.navigator.mediaDevices.enumerateDevices();
+                    void window.navigator.mediaDevices.enumerateDevices();
                 }
                 Object.defineProperty(this, Native.callEndpointPropertyKey, {
                     configurable: true,
                     value: callEndpoint,
                 });
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return callEndpoint;
             },
         });
@@ -242,7 +249,10 @@ class CallInfo {
 class RingRTCType {
     getCallInfoKey(callId) {
         // CallId is u64 so use a string key instead.
-        return callId.high.toString() + callId.low.toString();
+        // Note that the representation is not padded, so we include a separator.
+        // Otherwise {1, 123} and {11, 23} would have the same key.
+        // (We could use Long.toString as well, but it doesn't matter what the key is.)
+        return `${callId.high} ${callId.low}`;
     }
     constructor() {
         // Set by UX
@@ -281,7 +291,7 @@ class RingRTCType {
     }
     // Called by UX
     cancelGroupRing(groupId, ringId, reason) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this.callManager.cancelGroupRing(groupId, ringId.toString(), reason);
         });
     }
@@ -305,7 +315,7 @@ class RingRTCType {
             }
         })
             .catch(e => {
-            this.logError('RingRTC.handleStartCall exception: ' + e.toString());
+            this.logError(`RingRTC.handleStartCall exception: ${e}`);
             call.ignore();
         });
     }
@@ -331,8 +341,7 @@ class RingRTCType {
         }
         const isIncoming = true;
         const call = new Call(this.callManager, remoteUserId, callId, isIncoming, isVideoCall, CallState.Prering);
-        const handleIncomingCall = this.handleIncomingCall;
-        const handleStartCall = this.handleStartCall;
+        const { handleIncomingCall, handleStartCall } = this;
         if (!handleIncomingCall || !handleStartCall) {
             call.ignore();
             return;
@@ -346,25 +355,25 @@ class RingRTCType {
             }
             else {
                 handleStartCall(call)
-                    .then(success => {
-                    if (!success) {
+                    .then(innerSuccess => {
+                    if (!innerSuccess) {
                         this.logWarn('RingRTC.handleStartCall failed for incoming call. Call ignored.');
                         call.ignore();
                     }
                 })
                     .catch(e => {
-                    this.logError('RingRTC.handleStartCall exception: ' + e.toString());
+                    this.logError(`RingRTC.handleStartCall exception: ${e}`);
                     call.ignore();
                 });
             }
         })
             .catch(e => {
-            this.logError('RingRTC.handleIncomingCall exception: ' + e.toString());
+            this.logError(`RingRTC.handleIncomingCall exception: ${e}`);
             call.ignore();
         });
     }
     proceed(callId, settings) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this.callManager.proceed(callId, settings.iceServer.username || '', settings.iceServer.password || '', settings.iceServer.urls, settings.hideIp, settings.bandwidthMode, settings.audioLevelsIntervalMillis || 0);
         });
     }
@@ -378,7 +387,7 @@ class RingRTCType {
     }
     // Called by Rust
     onCallEnded(remoteUserId, callId, reason, ageSec) {
-        let callInfo = this._callInfoByCallId.get(this.getCallInfoKey(callId));
+        const callInfo = this._callInfoByCallId.get(this.getCallInfoKey(callId));
         const { isVideoCall, receivedAtCounter } = callInfo || {
             isVideoCall: false,
             receivedAtCounter: undefined,
@@ -472,7 +481,7 @@ class RingRTCType {
         if (!call) {
             return;
         }
-        if (!!((_a = this._call) === null || _a === void 0 ? void 0 : _a.renderVideoFrame)) {
+        if ((_a = this._call) === null || _a === void 0 ? void 0 : _a.renderVideoFrame) {
             (_b = this._call) === null || _b === void 0 ? void 0 : _b.renderVideoFrame(width, height, buffer);
         }
     }
@@ -522,10 +531,12 @@ class RingRTCType {
         this.sendSignaling(remoteUserId, remoteDeviceId, callId, broadcast, message);
     }
     sendSignaling(remoteUserId, remoteDeviceId, callId, broadcast, message) {
+        /* eslint-disable no-param-reassign */
         message.supportsMultiRing = true;
         if (!broadcast) {
             message.destinationDeviceId = remoteDeviceId;
         }
+        /* eslint-enable no-param-reassign */
         (() => __awaiter(this, void 0, void 0, function* () {
             if (this.handleOutgoingSignaling) {
                 const signalingResult = yield this.handleOutgoingSignaling(remoteUserId, message);
@@ -539,10 +550,10 @@ class RingRTCType {
             else {
                 this.callManager.signalingMessageSendFailed(callId);
             }
-        }))();
+        }))().catch(e => this.logError(e.toString()));
     }
     receivedHttpResponse(requestId, status, body) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this.callManager.receivedHttpResponse(requestId, status, body);
             }
@@ -553,7 +564,7 @@ class RingRTCType {
         });
     }
     httpRequestFailed(requestId, debugInfo) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this.callManager.httpRequestFailed(requestId, debugInfo);
             }
@@ -573,19 +584,18 @@ class RingRTCType {
     // Called by UX
     // Returns a list of user IDs
     peekGroupCall(sfuUrl, membershipProof, groupMembers) {
-        let [requestId, promise] = this._peekRequests.add();
+        const [requestId, promise] = this._peekRequests.add();
         // Response comes back via handlePeekResponse
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this.callManager.peekGroupCall(requestId, sfuUrl, membershipProof, groupMembers);
         });
         return promise;
     }
     // Called by Rust
     requestMembershipProof(clientId) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('requestMembershipProof(): GroupCall not found in map!');
                 return;
             }
@@ -594,10 +604,9 @@ class RingRTCType {
     }
     // Called by Rust
     requestGroupMembers(clientId) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('requestGroupMembers(): GroupCall not found in map!');
                 return;
             }
@@ -606,10 +615,9 @@ class RingRTCType {
     }
     // Called by Rust
     handleConnectionStateChanged(clientId, connectionState) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('handleConnectionStateChanged(): GroupCall not found in map!');
                 return;
             }
@@ -618,10 +626,9 @@ class RingRTCType {
     }
     // Called by Rust
     handleJoinStateChanged(clientId, joinState, demuxId) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('handleJoinStateChanged(): GroupCall not found in map!');
                 return;
             }
@@ -630,8 +637,8 @@ class RingRTCType {
     }
     // Called by Rust
     handleNetworkRouteChanged(clientId, localNetworkAdapterType) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
                 this.logError('handleNetworkRouteChanged(): GroupCall not found in map!');
                 return;
@@ -641,19 +648,18 @@ class RingRTCType {
     }
     // Called by Rust
     handleAudioLevels(clientId, capturedLevel, receivedLevels) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
-            if (!!groupCall) {
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
+            if (groupCall) {
                 groupCall.handleAudioLevels(capturedLevel, receivedLevels);
             }
         });
     }
     // Called by Rust
     handleRemoteDevicesChanged(clientId, remoteDeviceStates) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('handleRemoteDevicesChanged(): GroupCall not found in map!');
                 return;
             }
@@ -662,10 +668,9 @@ class RingRTCType {
     }
     // Called by Rust
     handlePeekChanged(clientId, info) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('handlePeekChanged(): GroupCall not found in map!');
                 return;
             }
@@ -673,19 +678,18 @@ class RingRTCType {
         });
     }
     // Called by Rust
-    handlePeekResponse(request_id, info) {
-        silly_deadlock_protection(() => {
-            if (!this._peekRequests.resolve(request_id, info)) {
-                this.logWarn(`Invalid request ID for handlePeekResponse: ${request_id}`);
+    handlePeekResponse(requestId, info) {
+        sillyDeadlockProtection(() => {
+            if (!this._peekRequests.resolve(requestId, info)) {
+                this.logWarn(`Invalid request ID for handlePeekResponse: ${requestId}`);
             }
         });
     }
     // Called by Rust
     handleEnded(clientId, reason) {
-        silly_deadlock_protection(() => {
-            let groupCall = this._groupCallByClientId.get(clientId);
+        sillyDeadlockProtection(() => {
+            const groupCall = this._groupCallByClientId.get(clientId);
             if (!groupCall) {
-                let error = new Error();
                 this.logError('handleEnded(): GroupCall not found in map!');
                 return;
             }
@@ -695,7 +699,7 @@ class RingRTCType {
     }
     // Called by Rust
     groupCallRingUpdate(groupId, ringIdString, sender, state) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             if (this.handleGroupCallRingUpdate) {
                 const ringId = BigInt(ringIdString);
                 this.handleGroupCallRingUpdate(groupId, ringId, sender, state);
@@ -724,16 +728,16 @@ class RingRTCType {
         this.onLogMessage(CallLogLevel.Info, 'Service.ts', 0, message);
     }
     // Called by MessageReceiver
-    // tslint:disable-next-line cyclomatic-complexity
     handleCallingMessage(remoteUserId, remoteUuid, remoteDeviceId, localDeviceId, messageAgeSec, messageReceivedAtCounter, message, senderIdentityKey, receiverIdentityKey) {
+        var _a, _b, _c, _d, _e;
         if (message.destinationDeviceId &&
             message.destinationDeviceId !== localDeviceId) {
             // Drop the message as it isn't for this device, handleIgnoredCall() is not needed.
             return;
         }
-        if (message.offer && message.offer.callId) {
+        if ((_a = message.offer) === null || _a === void 0 ? void 0 : _a.callId) {
             const callId = message.offer.callId;
-            const opaque = to_buffer(message.offer.opaque);
+            const opaque = toBuffer(message.offer.opaque);
             // opaque is required. sdp is obsolete, but it might still come with opaque.
             if (!opaque) {
                 // TODO: Remove once the proto is updated to only support opaque and require it.
@@ -742,13 +746,13 @@ class RingRTCType {
             }
             const offerType = message.offer.type || OfferType.AudioCall;
             // Save the call details for later when the call is ended.
-            let callInfo = new CallInfo(offerType === OfferType.VideoCall, messageReceivedAtCounter);
+            const callInfo = new CallInfo(offerType === OfferType.VideoCall, messageReceivedAtCounter);
             this._callInfoByCallId.set(this.getCallInfoKey(callId), callInfo);
             this.callManager.receivedOffer(remoteUserId, remoteDeviceId, localDeviceId, messageAgeSec, callId, offerType, opaque, senderIdentityKey, receiverIdentityKey);
         }
-        if (message.answer && message.answer.callId) {
+        if ((_b = message.answer) === null || _b === void 0 ? void 0 : _b.callId) {
             const callId = message.answer.callId;
-            const opaque = to_buffer(message.answer.opaque);
+            const opaque = toBuffer(message.answer.opaque);
             // opaque is required. sdp is obsolete, but it might still come with opaque.
             if (!opaque) {
                 // TODO: Remove once the proto is updated to only support opaque and require it.
@@ -759,11 +763,11 @@ class RingRTCType {
         }
         if (message.iceCandidates && message.iceCandidates.length > 0) {
             // We assume they all have the same .callId
-            let callId = message.iceCandidates[0].callId;
+            const callId = message.iceCandidates[0].callId;
             // We have to copy them to do the .toArrayBuffer() thing.
             const candidates = [];
             for (const candidate of message.iceCandidates) {
-                const copy = to_buffer(candidate.opaque);
+                const copy = toBuffer(candidate.opaque);
                 if (copy) {
                     candidates.push(copy);
                 }
@@ -777,21 +781,25 @@ class RingRTCType {
                 this.logWarn('handleCallingMessage(): No ice candidates in ice message, remote should update');
                 return;
             }
+            if (!callId) {
+                this.logWarn('handleCallingMessage(): No call ID in ice message');
+                return;
+            }
             this.callManager.receivedIceCandidates(remoteUserId, remoteDeviceId, callId, candidates);
         }
-        if (message.hangup && message.hangup.callId) {
+        if ((_c = message.hangup) === null || _c === void 0 ? void 0 : _c.callId) {
             const callId = message.hangup.callId;
             const hangupType = message.hangup.type || HangupType.Normal;
             const hangupDeviceId = message.hangup.deviceId || null;
             this.callManager.receivedHangup(remoteUserId, remoteDeviceId, callId, hangupType, hangupDeviceId);
         }
-        if (message.legacyHangup && message.legacyHangup.callId) {
+        if ((_d = message.legacyHangup) === null || _d === void 0 ? void 0 : _d.callId) {
             const callId = message.legacyHangup.callId;
             const hangupType = message.legacyHangup.type || HangupType.Normal;
             const hangupDeviceId = message.legacyHangup.deviceId || null;
             this.callManager.receivedHangup(remoteUserId, remoteDeviceId, callId, hangupType, hangupDeviceId);
         }
-        if (message.busy && message.busy.callId) {
+        if ((_e = message.busy) === null || _e === void 0 ? void 0 : _e.callId) {
             const callId = message.busy.callId;
             this.callManager.receivedBusy(remoteUserId, remoteDeviceId, callId);
         }
@@ -800,7 +808,7 @@ class RingRTCType {
                 this.logError('handleCallingMessage(): opaque message received without UUID!');
                 return;
             }
-            const data = to_buffer(message.opaque.data);
+            const data = toBuffer(message.opaque.data);
             if (data == undefined) {
                 this.logError('handleCallingMessage(): opaque message received without data!');
                 return;
@@ -840,10 +848,10 @@ class RingRTCType {
         return this._call;
     }
     getCall(callId) {
-        const { call } = this;
+        const call = this.call;
         if (call &&
             call.callId.high === callId.high &&
-            call.callId.low === call.callId.low) {
+            call.callId.low === callId.low) {
             return call;
         }
         return null;
@@ -965,7 +973,7 @@ class Call {
         this._state = state;
         this.enableOrDisableCapturer();
         this.enableOrDisableRenderer();
-        if (!!this.handleStateChanged) {
+        if (this.handleStateChanged) {
             this.handleStateChanged();
         }
     }
@@ -999,7 +1007,7 @@ class Call {
             this._videoRenderer.disable();
         }
         // This assumes we only have one active call.
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this._callManager.hangup();
         });
     }
@@ -1009,7 +1017,7 @@ class Call {
     set outgoingAudioEnabled(enabled) {
         this._outgoingAudioEnabled = enabled;
         // This assumes we only have one active call.
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this._callManager.setOutgoingAudioEnabled(enabled);
         });
     }
@@ -1023,7 +1031,7 @@ class Call {
     set outgoingVideoIsScreenShare(isScreenShare) {
         // This assumes we only have one active call.
         this._outgoingVideoIsScreenShare = isScreenShare;
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this._callManager.setOutgoingVideoIsScreenShare(isScreenShare);
         });
     }
@@ -1079,7 +1087,7 @@ class Call {
         }
     }
     setOutgoingVideoEnabled(enabled) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this._callManager.setOutgoingVideoEnabled(enabled);
             }
@@ -1090,7 +1098,7 @@ class Call {
         });
     }
     updateBandwidthMode(bandwidthMode) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this._callManager.updateBandwidthMode(bandwidthMode);
             }
@@ -1354,7 +1362,7 @@ class GroupCall {
         this._localDeviceState.audioLevel = normalizeAudioLevel(capturedLevel);
         if (this._remoteDeviceStates != undefined) {
             for (const received of receivedLevels) {
-                for (let remoteDeviceState of this._remoteDeviceStates) {
+                for (const remoteDeviceState of this._remoteDeviceStates) {
                     if (remoteDeviceState.demuxId == received.demuxId) {
                         remoteDeviceState.audioLevel = normalizeAudioLevel(received.level);
                     }
@@ -1415,14 +1423,14 @@ class GroupCallVideoFrameSource {
     receiveVideoFrame(buffer, maxWidth, maxHeight) {
         // This assumes we only have one active call.
         const frame = this._callManager.receiveGroupCallVideoFrame(this._groupCall.clientId, this._remoteDemuxId, buffer, maxWidth, maxHeight);
-        if (!!frame) {
+        if (frame) {
             const [width, height] = frame;
             this._groupCall.setRemoteAspectRatio(this._remoteDemuxId, width / height);
         }
         return frame;
     }
 }
-function to_buffer(pbab) {
+function toBuffer(pbab) {
     if (!pbab) {
         return pbab;
     }
@@ -1516,12 +1524,12 @@ var CallLogLevel;
     CallLogLevel[CallLogLevel["Debug"] = 4] = "Debug";
     CallLogLevel[CallLogLevel["Trace"] = 5] = "Trace";
 })(CallLogLevel = exports.CallLogLevel || (exports.CallLogLevel = {}));
-function silly_deadlock_protection(f) {
-    // tslint:disable no-floating-promises
-    (() => __awaiter(this, void 0, void 0, function* () {
+function sillyDeadlockProtection(f) {
+    void (() => __awaiter(this, void 0, void 0, function* () {
         // This is a silly way of preventing a deadlock.
-        // tslint:disable-next-line await-promise
+        // eslint-disable-next-line @typescript-eslint/await-thenable
         yield 0;
         f();
     }))();
 }
+//# sourceMappingURL=Service.js.map

package/dist/ringrtc/VideoSupport.d.ts

@@ -46,7 +46,7 @@ export declare class GumVideoCapturer {
     enableCaptureAndSend(sender: VideoFrameSender, options?: GumVideoCaptureOptions): void;
     disable(): void;
     setPreferredDevice(deviceId: string): Promise<void>;
-    enumerateDevices(): Promise<MediaDeviceInfo[]>;
+    enumerateDevices(): Promise<Array<MediaDeviceInfo>>;
     private getUserMedia;
     private startCapturing;
     private stopCapturing;

package/dist/ringrtc/VideoSupport.js

@@ -22,6 +22,7 @@ var VideoPixelFormatEnum;
     VideoPixelFormatEnum[VideoPixelFormatEnum["Nv12"] = 1] = "Nv12";
     VideoPixelFormatEnum[VideoPixelFormatEnum["Rgba"] = 2] = "Rgba";
 })(VideoPixelFormatEnum = exports.VideoPixelFormatEnum || (exports.VideoPixelFormatEnum = {}));
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function videoPixelFormatFromEnum(format) {
     switch (format) {
         case VideoPixelFormatEnum.I420: {
@@ -82,11 +83,11 @@ class GumVideoCapturer {
         this.updateLocalPreviewIntervalId = setInterval(this.updateLocalPreviewSourceObject.bind(this), 1000);
     }
     enableCapture() {
-        // tslint:disable no-floating-promises
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.startCapturing(this.defaultCaptureOptions);
     }
     enableCaptureAndSend(sender, options) {
-        // tslint:disable no-floating-promises
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         this.startCapturing(options !== null && options !== void 0 ? options : this.defaultCaptureOptions);
         this.startSending(sender);
     }
@@ -98,13 +99,14 @@ class GumVideoCapturer {
         }
         this.updateLocalPreviewIntervalId = undefined;
     }
+    // eslint-disable-next-line @typescript-eslint/require-await
     setPreferredDevice(deviceId) {
         return __awaiter(this, void 0, void 0, function* () {
             this.preferredDeviceId = deviceId;
             if (this.captureOptions) {
-                const captureOptions = this.captureOptions;
-                const sender = this.sender;
+                const { captureOptions, sender } = this;
                 this.disable();
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 this.startCapturing(captureOptions);
                 if (sender) {
                     this.startSending(sender);
@@ -122,7 +124,7 @@ class GumVideoCapturer {
     getUserMedia(options) {
         var _a;
         // TODO: Figure out a better way to make typescript accept "mandatory".
-        let constraints = {
+        const constraints = {
             audio: false,
             video: {
                 deviceId: (_a = options.preferredDeviceId) !== null && _a !== void 0 ? _a : this.preferredDeviceId,
@@ -203,7 +205,7 @@ class GumVideoCapturer {
         }
         index_1.RingRTC.logInfo('stopCapturing()');
         this.captureOptions = undefined;
-        if (!!this.mediaStream) {
+        if (this.mediaStream) {
             for (const track of this.mediaStream.getVideoTracks()) {
                 // Make the light turn off faster
                 track.stop();
@@ -216,7 +218,7 @@ class GumVideoCapturer {
         if (this.sender === sender) {
             return;
         }
-        if (!!this.sender) {
+        if (this.sender) {
             // If we're replacing an existing sender, make sure we stop the
             // current setInterval loop before starting another one.
             this.stopSending();
@@ -233,7 +235,7 @@ class GumVideoCapturer {
         }
         if (track.readyState === 'ended') {
             this.stopCapturing();
-            index_1.RingRTC.logError(`spawnSender(): Video track ended before spawning sender`);
+            index_1.RingRTC.logError('spawnSender(): Video track ended before spawning sender');
             return;
         }
         const reader = new MediaStreamTrackProcessor({
@@ -241,10 +243,11 @@ class GumVideoCapturer {
         }).readable.getReader();
         const buffer = Buffer.alloc(exports.MAX_VIDEO_CAPTURE_BUFFER_SIZE);
         this.spawnedSenderRunning = true;
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
         (() => __awaiter(this, void 0, void 0, function* () {
             var _a;
             try {
-                while (sender === this.sender && mediaStream == this.mediaStream) {
+                while (mediaStream == this.mediaStream) {
                     const { done, value: frame } = yield reader.read();
                     if (done) {
                         break;
@@ -258,7 +261,10 @@ class GumVideoCapturer {
                             index_1.RingRTC.logWarn(`Unsupported video frame format: ${frame.format}`);
                             break;
                         }
-                        frame.copyTo(buffer);
+                        yield frame.copyTo(buffer);
+                        if (sender !== this.sender) {
+                            break;
+                        }
                         sender.sendVideoFrame(frame.codedWidth, frame.codedHeight, format, buffer);
                     }
                     catch (e) {
@@ -295,7 +301,7 @@ class GumVideoCapturer {
         if (localPreview.srcObject === mediaStream) {
             return;
         }
-        if (mediaStream) {
+        if (mediaStream && this.captureOptions) {
             localPreview.srcObject = mediaStream;
             if (localPreview.width === 0) {
                 localPreview.width = this.captureOptions.maxWidth;
@@ -327,7 +333,7 @@ class CanvasVideoRenderer {
         if (this.source === source) {
             return;
         }
-        if (!!this.source) {
+        if (this.source) {
             // If we're replacing an existing source, make sure we stop the
             // current rAF loop before starting another one.
             if (this.rafId) {
@@ -420,3 +426,4 @@ class CanvasVideoRenderer {
     }
 }
 exports.CanvasVideoRenderer = CanvasVideoRenderer;
+//# sourceMappingURL=VideoSupport.js.map