@signalapp/ringrtc 2.25.0 → 2.25.2

package/dist/index.d.ts

@@ -1,4 +1,4 @@
+import { RingRTCType } from './ringrtc/Service';
 export { AudioDevice, BandwidthMode, Call, CallEndedReason, CallId, CallLogLevel, CallMessageUrgency, CallSettings, CallState, CallingMessage, ConnectionState, DeviceId, GroupCall, GroupCallEndReason, GroupCallObserver, GroupMemberInfo, HangupMessage, HangupType, HttpMethod, JoinState, LocalDeviceState, OfferType, OpaqueMessage, PeekInfo, RemoteDeviceState, RingCancelReason, RingRTCType, RingUpdate, UserId, VideoCapturer, VideoRenderer, VideoRequest, } from './ringrtc/Service';
 export { CanvasVideoRenderer, GumVideoCapturer, VideoFrameSource, MAX_VIDEO_CAPTURE_AREA, MAX_VIDEO_CAPTURE_BUFFER_SIZE, MAX_VIDEO_CAPTURE_HEIGHT, MAX_VIDEO_CAPTURE_WIDTH, } from './ringrtc/VideoSupport';
-import { RingRTCType } from './ringrtc/Service';
 export declare const RingRTC: RingRTCType;

package/dist/index.js

@@ -5,31 +5,32 @@
 //
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RingRTC = exports.MAX_VIDEO_CAPTURE_WIDTH = exports.MAX_VIDEO_CAPTURE_HEIGHT = exports.MAX_VIDEO_CAPTURE_BUFFER_SIZE = exports.MAX_VIDEO_CAPTURE_AREA = exports.GumVideoCapturer = exports.CanvasVideoRenderer = exports.VideoRequest = exports.RingUpdate = exports.RingRTCType = exports.RingCancelReason = exports.RemoteDeviceState = exports.PeekInfo = exports.OpaqueMessage = exports.OfferType = exports.LocalDeviceState = exports.JoinState = exports.HttpMethod = exports.HangupType = exports.HangupMessage = exports.GroupMemberInfo = exports.GroupCallEndReason = exports.GroupCall = exports.ConnectionState = exports.CallingMessage = exports.CallState = exports.CallMessageUrgency = exports.CallLogLevel = exports.CallEndedReason = exports.Call = exports.BandwidthMode = void 0;
-var Service_1 = require("./ringrtc/Service");
-Object.defineProperty(exports, "BandwidthMode", { enumerable: true, get: function () { return Service_1.BandwidthMode; } });
-Object.defineProperty(exports, "Call", { enumerable: true, get: function () { return Service_1.Call; } });
-Object.defineProperty(exports, "CallEndedReason", { enumerable: true, get: function () { return Service_1.CallEndedReason; } });
-Object.defineProperty(exports, "CallLogLevel", { enumerable: true, get: function () { return Service_1.CallLogLevel; } });
-Object.defineProperty(exports, "CallMessageUrgency", { enumerable: true, get: function () { return Service_1.CallMessageUrgency; } });
-Object.defineProperty(exports, "CallState", { enumerable: true, get: function () { return Service_1.CallState; } });
-Object.defineProperty(exports, "CallingMessage", { enumerable: true, get: function () { return Service_1.CallingMessage; } });
-Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return Service_1.ConnectionState; } });
-Object.defineProperty(exports, "GroupCall", { enumerable: true, get: function () { return Service_1.GroupCall; } });
-Object.defineProperty(exports, "GroupCallEndReason", { enumerable: true, get: function () { return Service_1.GroupCallEndReason; } });
-Object.defineProperty(exports, "GroupMemberInfo", { enumerable: true, get: function () { return Service_1.GroupMemberInfo; } });
-Object.defineProperty(exports, "HangupMessage", { enumerable: true, get: function () { return Service_1.HangupMessage; } });
-Object.defineProperty(exports, "HangupType", { enumerable: true, get: function () { return Service_1.HangupType; } });
-Object.defineProperty(exports, "HttpMethod", { enumerable: true, get: function () { return Service_1.HttpMethod; } });
-Object.defineProperty(exports, "JoinState", { enumerable: true, get: function () { return Service_1.JoinState; } });
-Object.defineProperty(exports, "LocalDeviceState", { enumerable: true, get: function () { return Service_1.LocalDeviceState; } });
-Object.defineProperty(exports, "OfferType", { enumerable: true, get: function () { return Service_1.OfferType; } });
-Object.defineProperty(exports, "OpaqueMessage", { enumerable: true, get: function () { return Service_1.OpaqueMessage; } });
-Object.defineProperty(exports, "PeekInfo", { enumerable: true, get: function () { return Service_1.PeekInfo; } });
-Object.defineProperty(exports, "RemoteDeviceState", { enumerable: true, get: function () { return Service_1.RemoteDeviceState; } });
-Object.defineProperty(exports, "RingCancelReason", { enumerable: true, get: function () { return Service_1.RingCancelReason; } });
-Object.defineProperty(exports, "RingRTCType", { enumerable: true, get: function () { return Service_1.RingRTCType; } });
-Object.defineProperty(exports, "RingUpdate", { enumerable: true, get: function () { return Service_1.RingUpdate; } });
-Object.defineProperty(exports, "VideoRequest", { enumerable: true, get: function () { return Service_1.VideoRequest; } });
+const Service_1 = require("./ringrtc/Service");
+var Service_2 = require("./ringrtc/Service");
+Object.defineProperty(exports, "BandwidthMode", { enumerable: true, get: function () { return Service_2.BandwidthMode; } });
+Object.defineProperty(exports, "Call", { enumerable: true, get: function () { return Service_2.Call; } });
+Object.defineProperty(exports, "CallEndedReason", { enumerable: true, get: function () { return Service_2.CallEndedReason; } });
+Object.defineProperty(exports, "CallLogLevel", { enumerable: true, get: function () { return Service_2.CallLogLevel; } });
+Object.defineProperty(exports, "CallMessageUrgency", { enumerable: true, get: function () { return Service_2.CallMessageUrgency; } });
+Object.defineProperty(exports, "CallState", { enumerable: true, get: function () { return Service_2.CallState; } });
+Object.defineProperty(exports, "CallingMessage", { enumerable: true, get: function () { return Service_2.CallingMessage; } });
+Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return Service_2.ConnectionState; } });
+Object.defineProperty(exports, "GroupCall", { enumerable: true, get: function () { return Service_2.GroupCall; } });
+Object.defineProperty(exports, "GroupCallEndReason", { enumerable: true, get: function () { return Service_2.GroupCallEndReason; } });
+Object.defineProperty(exports, "GroupMemberInfo", { enumerable: true, get: function () { return Service_2.GroupMemberInfo; } });
+Object.defineProperty(exports, "HangupMessage", { enumerable: true, get: function () { return Service_2.HangupMessage; } });
+Object.defineProperty(exports, "HangupType", { enumerable: true, get: function () { return Service_2.HangupType; } });
+Object.defineProperty(exports, "HttpMethod", { enumerable: true, get: function () { return Service_2.HttpMethod; } });
+Object.defineProperty(exports, "JoinState", { enumerable: true, get: function () { return Service_2.JoinState; } });
+Object.defineProperty(exports, "LocalDeviceState", { enumerable: true, get: function () { return Service_2.LocalDeviceState; } });
+Object.defineProperty(exports, "OfferType", { enumerable: true, get: function () { return Service_2.OfferType; } });
+Object.defineProperty(exports, "OpaqueMessage", { enumerable: true, get: function () { return Service_2.OpaqueMessage; } });
+Object.defineProperty(exports, "PeekInfo", { enumerable: true, get: function () { return Service_2.PeekInfo; } });
+Object.defineProperty(exports, "RemoteDeviceState", { enumerable: true, get: function () { return Service_2.RemoteDeviceState; } });
+Object.defineProperty(exports, "RingCancelReason", { enumerable: true, get: function () { return Service_2.RingCancelReason; } });
+Object.defineProperty(exports, "RingRTCType", { enumerable: true, get: function () { return Service_2.RingRTCType; } });
+Object.defineProperty(exports, "RingUpdate", { enumerable: true, get: function () { return Service_2.RingUpdate; } });
+Object.defineProperty(exports, "VideoRequest", { enumerable: true, get: function () { return Service_2.VideoRequest; } });
 var VideoSupport_1 = require("./ringrtc/VideoSupport");
 Object.defineProperty(exports, "CanvasVideoRenderer", { enumerable: true, get: function () { return VideoSupport_1.CanvasVideoRenderer; } });
 Object.defineProperty(exports, "GumVideoCapturer", { enumerable: true, get: function () { return VideoSupport_1.GumVideoCapturer; } });
@@ -37,5 +38,4 @@ Object.defineProperty(exports, "MAX_VIDEO_CAPTURE_AREA", { enumerable: true, get
 Object.defineProperty(exports, "MAX_VIDEO_CAPTURE_BUFFER_SIZE", { enumerable: true, get: function () { return VideoSupport_1.MAX_VIDEO_CAPTURE_BUFFER_SIZE; } });
 Object.defineProperty(exports, "MAX_VIDEO_CAPTURE_HEIGHT", { enumerable: true, get: function () { return VideoSupport_1.MAX_VIDEO_CAPTURE_HEIGHT; } });
 Object.defineProperty(exports, "MAX_VIDEO_CAPTURE_WIDTH", { enumerable: true, get: function () { return VideoSupport_1.MAX_VIDEO_CAPTURE_WIDTH; } });
-const Service_2 = require("./ringrtc/Service");
-exports.RingRTC = new Service_2.RingRTCType();
+exports.RingRTC = new Service_1.RingRTCType();

package/dist/ringrtc/Service.d.ts

@@ -4,8 +4,8 @@ declare class Config {
     use_new_audio_device_module: boolean;
     field_trials: Record<string, string> | undefined;
 }
-declare type GroupId = Buffer;
-declare type GroupCallUserId = Buffer;
+type GroupId = Buffer;
+type GroupCallUserId = Buffer;
 export declare class PeekDeviceInfo {
     demuxId: number;
     userId?: GroupCallUserId;
@@ -36,8 +36,8 @@ export declare class NetworkRoute {
     localAdapterType: NetworkAdapterType;
     constructor();
 }
-export declare type RawAudioLevel = number;
-export declare type NormalizedAudioLevel = number;
+export type RawAudioLevel = number;
+export type NormalizedAudioLevel = number;
 export declare class ReceivedAudioLevel {
     demuxId: number;
     level: RawAudioLevel;
@@ -94,7 +94,7 @@ export declare class RingRTCType {
     handleAudioLevels(clientId: GroupCallClientId, capturedLevel: RawAudioLevel, receivedLevels: Array<ReceivedAudioLevel>): void;
     handleRemoteDevicesChanged(clientId: GroupCallClientId, remoteDeviceStates: Array<RemoteDeviceState>): void;
     handlePeekChanged(clientId: GroupCallClientId, info: PeekInfo): void;
-    handlePeekResponse(request_id: number, info: PeekInfo): void;
+    handlePeekResponse(requestId: number, info: PeekInfo): void;
     handleEnded(clientId: GroupCallClientId, reason: GroupCallEndReason): void;
     groupCallRingUpdate(groupId: GroupId, ringIdString: string, sender: GroupCallUserId, state: RingUpdate): void;
     onLogMessage(level: number, fileName: string, line: number, message: string): void;
@@ -118,9 +118,9 @@ export declare class RingRTCType {
     setOutgoingVideoIsScreenShare(callId: CallId, isScreenShare: boolean): void;
     setVideoCapturer(callId: CallId, capturer: VideoCapturer | null): void;
     setVideoRenderer(callId: CallId, renderer: VideoRenderer | null): void;
-    getAudioInputs(): AudioDevice[];
+    getAudioInputs(): Array<AudioDevice>;
     setAudioInput(index: number): void;
-    getAudioOutputs(): AudioDevice[];
+    getAudioOutputs(): Array<AudioDevice>;
     setAudioOutput(index: number): void;
 }
 export interface CallSettings {
@@ -200,7 +200,7 @@ export declare class Call {
     updateBandwidthMode(bandwidthMode: BandwidthMode): void;
     private enableOrDisableRenderer;
 }
-export declare type GroupCallClientId = number;
+export type GroupCallClientId = number;
 export declare enum ConnectionState {
     NotConnected = 0,
     Connecting = 1,
@@ -342,12 +342,12 @@ declare class GroupCallVideoFrameSource {
     constructor(callManager: CallManager, groupCall: GroupCall, remoteDemuxId: number);
     receiveVideoFrame(buffer: Buffer, maxWidth: number, maxHeight: number): [number, number] | undefined;
 }
-declare type ProtobufBuffer = Buffer | {
+type ProtobufBuffer = Buffer | {
     toArrayBuffer: () => ArrayBuffer;
 };
-export declare type UserId = string;
-export declare type DeviceId = number;
-export declare type CallId = any;
+export type UserId = string;
+export type DeviceId = number;
+export type CallId = any;
 export declare class CallingMessage {
     offer?: OfferMessage;
     answer?: AnswerMessage;
@@ -449,10 +449,10 @@ export interface CallManager {
     setGroupMembers(clientId: GroupCallClientId, members: Array<GroupMemberInfo>): void;
     setMembershipProof(clientId: GroupCallClientId, proof: Buffer): void;
     receiveGroupCallVideoFrame(clientId: GroupCallClientId, remoteDemuxId: number, buffer: Buffer, maxWidth: number, maxHeight: number): [number, number] | undefined;
-    peekGroupCall(requestId: number, sfu_url: string, membership_proof: Buffer, group_members: Array<GroupMemberInfo>): Promise<PeekInfo>;
-    getAudioInputs(): AudioDevice[];
+    peekGroupCall(requestId: number, sfu_url: string, membership_proof: Buffer, group_members: Array<GroupMemberInfo>): void;
+    getAudioInputs(): Array<AudioDevice>;
     setAudioInput(index: number): void;
-    getAudioOutputs(): AudioDevice[];
+    getAudioOutputs(): Array<AudioDevice>;
     setAudioOutput(index: number): void;
 }
 export interface CallManagerCallbacks {
@@ -478,7 +478,7 @@ export interface CallManagerCallbacks {
     handleJoinStateChanged(clientId: GroupCallClientId, joinState: JoinState, demuxId: number | undefined): void;
     handleRemoteDevicesChanged(clientId: GroupCallClientId, remoteDeviceStates: Array<RemoteDeviceState>): void;
     handlePeekChanged(clientId: GroupCallClientId, info: PeekInfo): void;
-    handlePeekResponse(request_id: number, info: PeekInfo): void;
+    handlePeekResponse(requestId: number, info: PeekInfo): void;
     handleEnded(clientId: GroupCallClientId, reason: GroupCallEndReason): void;
     onLogMessage(level: number, fileName: string, line: number, message: string): void;
 }

package/dist/ringrtc/Service.js

@@ -5,7 +5,11 @@
 //
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,21 +37,16 @@ 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 */
+/* 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`);
 class Config {
     constructor() {
         this.use_new_audio_device_module = false;
     }
 }
-// tslint:disable-next-line no-unnecessary-class
 class NativeCallManager {
     constructor(observer) {
         this.observer = observer;
@@ -57,17 +56,25 @@ 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() {
                 const callEndpoint = Native.createCallEndpoint(this, config.use_new_audio_device_module, fieldTrialsString);
+                if (process.platform === 'darwin') {
+                    // Preload devices to work around
+                    // https://bugs.chromium.org/p/chromium/issues/detail?id=1287628
+                    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;
             },
         });
@@ -231,6 +238,10 @@ class CallInfo {
     }
 }
 class RingRTCType {
+    getCallInfoKey(callId) {
+        // CallId is u64 so use a string key instead.
+        return `${callId.high}${callId.low}`;
+    }
     constructor() {
         // Set by UX
         this.handleOutgoingSignaling = null;
@@ -248,10 +259,6 @@ class RingRTCType {
         this._peekRequests = new Requests();
         this._callInfoByCallId = new Map();
     }
-    getCallInfoKey(callId) {
-        // CallId is u64 so use a string key instead.
-        return callId.high.toString() + callId.low.toString();
-    }
     setConfig(config) {
         this.callManager.setConfig(config);
     }
@@ -272,7 +279,7 @@ class RingRTCType {
     }
     // Called by UX
     cancelGroupRing(groupId, ringId, reason) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this.callManager.cancelGroupRing(groupId, ringId.toString(), reason);
         });
     }
@@ -296,7 +303,7 @@ class RingRTCType {
             }
         })
             .catch(e => {
-            this.logError('RingRTC.handleStartCall exception: ' + e.toString());
+            this.logError(`RingRTC.handleStartCall exception: ${e}`);
             call.ignore();
         });
     }
@@ -322,8 +329,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;
@@ -337,25 +343,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);
         });
     }
@@ -369,7 +375,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,
@@ -463,7 +469,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);
         }
     }
@@ -513,10 +519,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);
@@ -530,10 +538,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);
             }
@@ -544,7 +552,7 @@ class RingRTCType {
         });
     }
     httpRequestFailed(requestId, debugInfo) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this.callManager.httpRequestFailed(requestId, debugInfo);
             }
@@ -564,19 +572,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;
             }
@@ -585,10 +592,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;
             }
@@ -597,10 +603,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;
             }
@@ -609,10 +614,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;
             }
@@ -621,8 +625,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;
@@ -632,19 +636,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;
             }
@@ -653,10 +656,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;
             }
@@ -664,19 +666,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;
             }
@@ -686,7 +687,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);
@@ -715,16 +716,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.
@@ -733,13 +734,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.
@@ -750,11 +751,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);
                 }
@@ -770,19 +771,19 @@ class RingRTCType {
             }
             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);
         }
@@ -791,7 +792,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;
@@ -831,10 +832,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;
@@ -956,7 +957,7 @@ class Call {
         this._state = state;
         this.enableOrDisableCapturer();
         this.enableOrDisableRenderer();
-        if (!!this.handleStateChanged) {
+        if (this.handleStateChanged) {
             this.handleStateChanged();
         }
     }
@@ -990,7 +991,7 @@ class Call {
             this._videoRenderer.disable();
         }
         // This assumes we only have one active call.
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             this._callManager.hangup();
         });
     }
@@ -1000,7 +1001,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);
         });
     }
@@ -1014,7 +1015,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);
         });
     }
@@ -1070,7 +1071,7 @@ class Call {
         }
     }
     setOutgoingVideoEnabled(enabled) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this._callManager.setOutgoingVideoEnabled(enabled);
             }
@@ -1081,7 +1082,7 @@ class Call {
         });
     }
     updateBandwidthMode(bandwidthMode) {
-        silly_deadlock_protection(() => {
+        sillyDeadlockProtection(() => {
             try {
                 this._callManager.updateBandwidthMode(bandwidthMode);
             }
@@ -1227,6 +1228,9 @@ class VideoRequest {
 }
 exports.VideoRequest = VideoRequest;
 class GroupCall {
+    get clientId() {
+        return this._clientId;
+    }
     // Called by UI via RingRTC object
     constructor(callManager, groupId, sfuUrl, hkdfExtraInfo, audioLevelsIntervalMillis, observer) {
         this._callManager = callManager;
@@ -1234,9 +1238,6 @@ class GroupCall {
         this._localDeviceState = new LocalDeviceState();
         this._clientId = this._callManager.createGroupCallClient(groupId, sfuUrl, hkdfExtraInfo, audioLevelsIntervalMillis || 0);
     }
-    get clientId() {
-        return this._clientId;
-    }
     // Called by UI
     connect() {
         this._callManager.connect(this._clientId);
@@ -1345,7 +1346,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);
                     }
@@ -1406,14 +1407,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;
     }
@@ -1507,11 +1508,10 @@ 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();
     }))();

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) {

package/dist/test/CallingClass.js

@@ -17,12 +17,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallingClass = void 0;
+/* eslint-disable no-console, @typescript-eslint/require-await, @typescript-eslint/no-unused-vars */
 const Service_1 = require("../ringrtc/Service");
 const index_1 = require("../index");
 const long_1 = __importDefault(require("long"));
 const Utils_1 = require("./Utils");
 // This class mimics the Desktop Client CallingClass in ts/services/calling.ts to facilitate testing
 class CallingClass {
+    set delayIncomingCallSettingsRequest(value) {
+        this._delayIncomingCallSettingsRequest = value;
+    }
+    set delayOutgoingCallSettingsRequest(value) {
+        this._delayIncomingCallSettingsRequest = value;
+    }
     constructor(name, id) {
         this._name = name;
         this._id = id;
@@ -30,22 +37,16 @@ class CallingClass {
         this._delayIncomingCallSettingsRequest = 0;
         this._delayOutgoingCallSettingsRequest = 0;
     }
-    set delayIncomingCallSettingsRequest(value) {
-        this._delayIncomingCallSettingsRequest = value;
-    }
-    set delayOutgoingCallSettingsRequest(value) {
-        this._delayIncomingCallSettingsRequest = value;
-    }
     setupCallCallbacks(call) {
         // eslint-disable-next-line no-param-reassign
-        call.handleStateChanged = () => __awaiter(this, void 0, void 0, function* () {
+        call.handleStateChanged = () => {
             (0, Utils_1.log)('handleCallStateChanged');
             (0, Utils_1.log)(`call.state === ${call.state}`);
             if (call.state === Service_1.CallState.Ended) {
                 (0, Utils_1.log)(`call.endedReason === ${call.endedReason}`);
                 this._call = undefined;
             }
-        });
+        };
         // eslint-disable-next-line no-param-reassign
         call.handleRemoteVideoEnabled = () => {
             (0, Utils_1.log)('handleRemoteVideoEnabled');
@@ -59,7 +60,7 @@ class CallingClass {
     // Callbacks
     handleOutgoingSignaling(remoteUserId, message, urgency) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleOutgoingSignaling remoteUserId: ' + remoteUserId);
+            (0, Utils_1.log)(`handleOutgoingSignaling remoteUserId: ${remoteUserId}`);
             return true;
         });
     }
@@ -79,65 +80,49 @@ class CallingClass {
         });
     }
     handleAutoEndedIncomingCallRequest(callId, remoteUserId, reason, ageInSeconds, wasVideoCall, receivedAtCounter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleAutoEndedIncomingCallRequest');
-        });
+        (0, Utils_1.log)('handleAutoEndedIncomingCallRequest');
     }
     handleLogMessage(level, fileName, line, message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            switch (level) {
-                case Service_1.CallLogLevel.Info:
-                    // FgGray
-                    console.log(`\x1b[90m${fileName}:${line} ${message}\x1b[0m`);
-                    break;
-                case Service_1.CallLogLevel.Warn:
-                    // FgYellow
-                    console.warn(`\x1b[33m${fileName}:${line} ${message}\x1b[0m`);
-                    break;
-                case Service_1.CallLogLevel.Error:
-                    // FgRed
-                    console.error(`\x1b[31m${fileName}:${line} ${message}\x1b[0m`);
-                    break;
-                default:
-                    break;
-            }
-        });
+        switch (level) {
+            case Service_1.CallLogLevel.Info:
+                // FgGray
+                console.log(`\x1b[90m${fileName}:${line} ${message}\x1b[0m`);
+                break;
+            case Service_1.CallLogLevel.Warn:
+                // FgYellow
+                console.warn(`\x1b[33m${fileName}:${line} ${message}\x1b[0m`);
+                break;
+            case Service_1.CallLogLevel.Error:
+                // FgRed
+                console.error(`\x1b[31m${fileName}:${line} ${message}\x1b[0m`);
+                break;
+            default:
+                break;
+        }
     }
     handleSendHttpRequest(requestId, url, method, headers, body) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleSendHttpRequest');
-        });
+        (0, Utils_1.log)('handleSendHttpRequest');
     }
     handleSendCallMessage(recipient, data, urgency) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleSendCallMessage');
-            return true;
-        });
+        (0, Utils_1.log)('handleSendCallMessage');
+        return true;
     }
     handleSendCallMessageToGroup(groupIdBytes, data, urgency) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleSendCallMessageToGroup');
-        });
+        (0, Utils_1.log)('handleSendCallMessageToGroup');
     }
     handleGroupCallRingUpdate(groupIdBytes, ringId, ringerBytes, update) {
-        return __awaiter(this, void 0, void 0, function* () {
-            (0, Utils_1.log)('handleGroupCallRingUpdate');
-        });
+        (0, Utils_1.log)('handleGroupCallRingUpdate');
     }
     ////////////////////////////////////////////////////////////////////////////////
     // Support
     getCallSettings(isIncoming) {
         return __awaiter(this, void 0, void 0, function* () {
             if (isIncoming) {
-                (0, Utils_1.log)('getCallSettings delayed by ' +
-                    this._delayIncomingCallSettingsRequest.toString() +
-                    'ms');
+                (0, Utils_1.log)(`getCallSettings delayed by ${this._delayIncomingCallSettingsRequest}ms`);
                 yield (0, Utils_1.sleep)(this._delayIncomingCallSettingsRequest);
             }
             else {
-                (0, Utils_1.log)('getCallSettings delayed by ' +
-                    this._delayOutgoingCallSettingsRequest.toString() +
-                    'ms');
+                (0, Utils_1.log)(`getCallSettings delayed by ${this._delayOutgoingCallSettingsRequest}ms`);
                 yield (0, Utils_1.sleep)(this._delayOutgoingCallSettingsRequest);
             }
             return {
@@ -179,7 +164,7 @@ class CallingClass {
                 return;
             }
             const call = index_1.RingRTC.startOutgoingCall(remoteUserId, false, this._localDeviceId);
-            (0, Utils_1.log)('Outgoing callId ' + long_1.default.fromValue(call.callId).toString());
+            (0, Utils_1.log)(`Outgoing callId ${long_1.default.fromValue(call.callId)}`);
             index_1.RingRTC.setOutgoingAudio(call.callId, true);
             this._call = call;
             this.setupCallCallbacks(call);

package/dist/test/RingRTC-test.js

@@ -16,6 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 const chai_1 = require("chai");
 const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
 const crypto_1 = require("crypto");
@@ -64,9 +65,11 @@ describe('RingRTC', () => {
         const age = 60 * 60;
         try {
             const { reason, ageSec: reportedAge } = yield new Promise((resolve, _reject) => {
+                /* eslint-disable @typescript-eslint/no-shadow */
                 index_1.RingRTC.handleAutoEndedIncomingCallRequest = (_callId, _remoteUserId, reason, ageSec) => {
                     resolve({ reason, ageSec });
                 };
+                /* eslint-enable @typescript-eslint/no-shadow */
                 index_1.RingRTC.handleCallingMessage('remote', null, 4, 2, age, 1, offer, Buffer.from([]), Buffer.from([]));
             });
             chai_1.assert.equal(reason, index_1.CallEndedReason.ReceivedOfferExpired);
@@ -87,9 +90,11 @@ describe('RingRTC', () => {
         };
         try {
             const { reason, ageSec: reportedAge } = yield new Promise((resolve, _reject) => {
+                /* eslint-disable @typescript-eslint/no-shadow */
                 index_1.RingRTC.handleAutoEndedIncomingCallRequest = (_callId, _remoteUserId, reason, ageSec) => {
                     resolve({ reason, ageSec });
                 };
+                /* eslint-enable @typescript-eslint/no-shadow */
                 index_1.RingRTC.handleCallingMessage('remote', null, 4, 2, 10, 2, offer, Buffer.from([]), Buffer.from([]));
             });
             chai_1.assert.equal(reason, index_1.CallEndedReason.Declined); // because we didn't set handleIncomingCall.
@@ -108,7 +113,7 @@ describe('RingRTC', () => {
         chai_1.assert.isNotNull(index_1.RingRTC, "RingRTC didn't initialize!");
     });
     it('can establish outgoing call', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         yield calling.startOutgoingDirectCall(user2_id);
@@ -125,7 +130,7 @@ describe('RingRTC', () => {
         yield (0, Utils_1.sleep)(100);
     }));
     it('can establish incoming call', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         // Generate incoming calling message
@@ -146,25 +151,25 @@ describe('RingRTC', () => {
         chai_1.assert.equal(index_1.CallState.Ended, index_1.RingRTC.call.state);
     }));
     it('outgoing call wins glare when incoming call id is lower', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         yield runGlareScenario(calling, true, 0, 0);
     }));
     it('outgoing call wins glare when incoming call id is lower even when outgoing call settings are delayed', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         yield runGlareScenario(calling, true, 0, 1000);
     }));
     it('outgoing call loses glare when incoming call id is higher even when outgoing call settings are delayed', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         yield runGlareScenario(calling, false, 0, 1000);
     }));
     it('outgoing call loses glare when incoming call id is higher', () => __awaiter(void 0, void 0, void 0, function* () {
-        let calling = new CallingClass_1.CallingClass(user1_name, user1_id);
+        const calling = new CallingClass_1.CallingClass(user1_name, user1_id);
         calling.initialize();
         initializeSpies();
         yield runGlareScenario(calling, false, 0, 0);
@@ -176,12 +181,12 @@ describe('RingRTC', () => {
             const outgoingCallLatch = (0, Utils_1.countDownLatch)(1);
             calling
                 .startOutgoingDirectCall(user2_id)
-                .then(result => {
+                .then(_result => {
                 (0, Utils_1.log)('Outgoing call succeeded as expected');
                 outgoingCallLatch.countDown();
             })
                 .catch(e => {
-                chai_1.assert.fail('Outgoing call should not have failed');
+                chai_1.assert.fail(`Outgoing call should not have failed: ${e}`);
             });
             yield outgoingCallLatch.finished;
             const outgoingCallId = long_1.default.fromValue(index_1.RingRTC.call.callId);

package/dist/test/Utils.d.ts

@@ -1,7 +1,7 @@
 export declare function countDownLatch(count: number): {
     countDown: () => void;
-    finished: Promise<unknown>;
+    finished: Promise<void>;
 };
 export declare function log(line: string): void;
-export declare let sleep: (timeout: number) => Promise<void>;
+export declare function sleep(timeout: number): Promise<void>;
 export declare function uuidToBytes(uuid: string): Uint8Array;

package/dist/test/Utils.js

@@ -5,6 +5,7 @@
 //
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uuidToBytes = exports.sleep = exports.log = exports.countDownLatch = void 0;
+/* eslint-disable no-console */
 const lodash_1 = require("lodash");
 const chai_1 = require("chai");
 function countDownLatch(count) {
@@ -32,7 +33,7 @@ function log(line) {
     console.log(`\x1b[43m${line}\x1b[0m`);
 }
 exports.log = log;
-let sleep = (timeout) => {
+function sleep(timeout) {
     return new Promise(resolve => {
         setTimeout(() => {
             // BgBlue
@@ -40,7 +41,7 @@ let sleep = (timeout) => {
             resolve();
         }, timeout);
     });
-};
+}
 exports.sleep = sleep;
 function uuidToBytes(uuid) {
     if (uuid.length !== 36) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/ringrtc",
-  "version": "2.25.0",
+  "version": "2.25.2",
   "description": "Signal Messenger voice and video calling library.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -11,16 +11,16 @@
   "scripts": {
     "build": "tsc",
     "clean": "rimraf dist",
-    "test": "electron-mocha --recursive dist/test --timeout 10000",
+    "test": "electron-mocha --renderer --recursive dist/test --timeout 10000",
     "eslint": "eslint --cache .",
     "lint": "yarn format --list-different && yarn eslint",
-    "format": "prettier --write \"*.{css,js,json,md,scss,ts,tsx}\" \"./**/*.{css,js,json,md,scss,ts,tsx}\"",
+    "format": "prettier --write .",
     "install": "node scripts/fetch-prebuild.js",
     "prepublishOnly": "node scripts/prepublish.js"
   },
   "config": {
     "prebuildUrl": "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${npm_package_version}.tar.gz",
-    "prebuildChecksum": "99767cde606a663ef881deaa1d3dec8976e2c52981d808c5c95397e773810f22"
+    "prebuildChecksum": "b953fd21380c7025b5004bd0db99274737be1aeec1c76133f08568adcfd5adaf"
   },
   "author": "",
   "license": "AGPL-3.0-only",
@@ -28,33 +28,31 @@
     "tar": "^6.1.0"
   },
   "devDependencies": {
-    "@types/chai": "4.2.18",
-    "@types/chai-as-promised": "^7.1.3",
-    "@types/dom-mediacapture-transform": "0.1.2",
-    "@types/long": "4.0.1",
-    "@types/mocha": "5.2.7",
-    "@types/node": "14.14.37",
-    "@types/offscreencanvas": "^2019.6.4",
-    "@types/react": "16.8.5",
+    "@types/chai": "4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/dom-mediacapture-transform": "0.1.4",
+    "@types/long": "5.0.0",
+    "@types/mocha": "10.0.1",
+    "@types/node": "18.14.0",
+    "@types/offscreencanvas": "^2019.7.0",
     "@types/sinon-chai": "^3.2.9",
-    "chai": "4.3.5",
+    "chai": "4.3.7",
     "chai-as-promised": "^7.1.1",
-    "electron": "15.3.2",
+    "electron": "22.2.0",
     "electron-mocha": "11.0.2",
-    "eslint": "7.32.0",
-    "eslint-config-airbnb-typescript-prettier": "4.2.0",
-    "eslint-config-prettier": "6.15.0",
-    "eslint-plugin-import": "2.25.4",
-    "eslint-plugin-mocha": "9.0.0",
+    "eslint": "8.34.0",
+    "eslint-config-airbnb-typescript-prettier": "5.0.0",
+    "eslint-config-prettier": "8.6.0",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-mocha": "10.1.0",
     "eslint-plugin-more": "1.0.5",
-    "eslint-plugin-react": "7.28.0",
-    "long": "4.0.0",
-    "mocha": "9.2.0",
-    "prettier": "^2.5.1",
-    "rimraf": "3.0.2",
+    "long": "5.2.1",
+    "mocha": "10.2.0",
+    "prettier": "^2.8.4",
+    "rimraf": "4.1.2",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "4.5.2",
-    "yarn-audit-fix": "^9.2.2"
+    "typescript": "4.9.3",
+    "yarn-audit-fix": "^9.3.9"
   }
 }