@signalapp/ringrtc 2.50.4 → 2.51.0

package/dist/ringrtc/Service.js

@@ -7,8 +7,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CallLogLevel = exports.CallEndedReason = exports.CallState = exports.RingCancelReason = exports.DataMode = exports.HangupType = exports.OpaqueMessage = exports.HangupMessage = exports.BusyMessage = exports.IceCandidateMessage = exports.AnswerMessage = exports.OfferType = exports.OfferMessage = exports.CallingMessage = exports.GroupCall = exports.GroupCallKind = exports.VideoRequest = exports.GroupMemberInfo = exports.RemoteDeviceState = exports.LocalDeviceState = exports.HttpMethod = exports.RingUpdate = exports.CallMessageUrgency = exports.SpeechEvent = exports.GroupCallEndReason = exports.JoinState = exports.ConnectionState = exports.Call = exports.RingRTCType = exports.ReceivedAudioLevel = exports.NetworkRoute = exports.PeekStatusCodes = exports.callIdFromEra = void 0;
+exports.CallLogLevel = exports.CallEndedReason = exports.CallState = exports.RingCancelReason = exports.DataMode = exports.HangupType = exports.OpaqueMessage = exports.HangupMessage = exports.BusyMessage = exports.IceCandidateMessage = exports.AnswerMessage = exports.OfferType = exports.OfferMessage = exports.CallingMessage = exports.GroupCall = exports.GroupCallKind = exports.VideoRequest = exports.GroupMemberInfo = exports.RemoteDeviceState = exports.LocalDeviceState = exports.HttpMethod = exports.RingUpdate = exports.CallMessageUrgency = exports.SpeechEvent = exports.GroupCallEndReason = exports.JoinState = exports.ConnectionState = exports.Call = exports.VideoPixelFormatEnum = exports.RingRTCType = exports.ReceivedAudioLevel = exports.NetworkRoute = exports.PeekStatusCodes = exports.callIdFromEra = void 0;
 exports.callIdFromRingId = callIdFromRingId;
+exports.videoPixelFormatToEnum = videoPixelFormatToEnum;
+/* eslint-disable max-classes-per-file */
 const CallLinks_1 = require("./CallLinks");
 const Native_1 = __importDefault(require("./Native"));
 const INVALID_CLIENT_ID = 0;
@@ -287,7 +289,6 @@ class RingRTCType {
         const isIncoming = false;
         const call = new Call(this.callManager, remoteUserId, callId, isIncoming, isVideoCall, CallState.Prering);
         this._call = call;
-        call.outgoingVideoEnabled = isVideoCall;
         return call;
     }
     // Called by UX
@@ -1111,14 +1112,12 @@ class RingRTCType {
         }
         return null;
     }
-    accept(callId, asVideoCall) {
+    accept(callId) {
         const call = this.getCall(callId);
         if (!call) {
             return;
         }
         call.accept();
-        call.outgoingAudioEnabled = true;
-        call.outgoingVideoEnabled = asVideoCall;
     }
     decline(callId) {
         const call = this.getCall(callId);
@@ -1141,41 +1140,6 @@ class RingRTCType {
         }
         call.hangup();
     }
-    setOutgoingAudio(callId, enabled) {
-        const call = this.getCall(callId);
-        if (!call) {
-            return;
-        }
-        call.outgoingAudioEnabled = enabled;
-    }
-    setOutgoingVideo(callId, enabled) {
-        const call = this.getCall(callId);
-        if (!call) {
-            return;
-        }
-        call.outgoingVideoEnabled = enabled;
-    }
-    setOutgoingVideoIsScreenShare(callId, isScreenShare) {
-        const call = this.getCall(callId);
-        if (!call) {
-            return;
-        }
-        call.outgoingVideoIsScreenShare = isScreenShare;
-    }
-    setVideoCapturer(callId, capturer) {
-        const call = this.getCall(callId);
-        if (!call) {
-            return;
-        }
-        call.videoCapturer = capturer;
-    }
-    setVideoRenderer(callId, renderer) {
-        const call = this.getCall(callId);
-        if (!call) {
-            return;
-        }
-        call.videoRenderer = renderer;
-    }
     getAudioInputs() {
         return this.callManager.getAudioInputs();
     }
@@ -1190,8 +1154,30 @@ class RingRTCType {
     }
 }
 exports.RingRTCType = RingRTCType;
+// Given a weird name to not conflict with WebCodec's VideoPixelFormat
+var VideoPixelFormatEnum;
+(function (VideoPixelFormatEnum) {
+    VideoPixelFormatEnum[VideoPixelFormatEnum["I420"] = 0] = "I420";
+    VideoPixelFormatEnum[VideoPixelFormatEnum["Nv12"] = 1] = "Nv12";
+    VideoPixelFormatEnum[VideoPixelFormatEnum["Rgba"] = 2] = "Rgba";
+})(VideoPixelFormatEnum || (exports.VideoPixelFormatEnum = VideoPixelFormatEnum = {}));
+function videoPixelFormatToEnum(format) {
+    switch (format) {
+        case 'I420': {
+            return VideoPixelFormatEnum.I420;
+        }
+        case 'NV12': {
+            return VideoPixelFormatEnum.Nv12;
+        }
+        case 'RGBA': {
+            return VideoPixelFormatEnum.Rgba;
+        }
+    }
+}
 class Call {
     constructor(callManager, remoteUserId, callId, isIncoming, isVideoCall, state) {
+        // Media state flags.
+        this._mediaSessionStarted = false;
         this._outgoingAudioEnabled = false;
         this._outgoingVideoEnabled = false;
         this._outgoingVideoIsScreenShare = false;
@@ -1201,8 +1187,6 @@ class Call {
         this.remoteAudioLevel = 0;
         this.remoteSharingScreen = false;
         this.networkRoute = new NetworkRoute();
-        this._videoCapturer = null;
-        this._videoRenderer = null;
         this._callManager = callManager;
         this._remoteUserId = remoteUserId;
         this.callId = callId;
@@ -1228,11 +1212,39 @@ class Call {
         }
         this._state = state;
         if (state === CallState.Accepted) {
-            // Make sure the status gets sent.
-            this.outgoingAudioEnabled = this._outgoingAudioEnabled;
+            // We might have been in the reconnecting state and already started media.
+            if (!this._mediaSessionStarted) {
+                sillyDeadlockProtection(() => {
+                    if (this._outgoingAudioEnabled) {
+                        this._callManager.setOutgoingAudioEnabled(true);
+                    }
+                    if (this._outgoingVideoIsScreenShare) {
+                        this._callManager.setOutgoingVideoIsScreenShare(true);
+                        this._callManager.setOutgoingVideoEnabled(true);
+                    }
+                    else if (this._outgoingVideoEnabled) {
+                        this._callManager.setOutgoingVideoEnabled(true);
+                    }
+                });
+                this._mediaSessionStarted = true;
+            }
+        }
+        else if (state === CallState.Ended) {
+            if (this._mediaSessionStarted) {
+                sillyDeadlockProtection(() => {
+                    if (this._outgoingAudioEnabled) {
+                        this._callManager.setOutgoingAudioEnabled(false);
+                    }
+                    if (this._outgoingVideoEnabled) {
+                        this._callManager.setOutgoingVideoEnabled(false);
+                    }
+                });
+                this._outgoingAudioEnabled = false;
+                this._outgoingVideoEnabled = false;
+                this._outgoingVideoIsScreenShare = false;
+                this._mediaSessionStarted = false;
+            }
         }
-        this.enableOrDisableCapturer();
-        this.enableOrDisableRenderer();
         if (this.handleStateChanged) {
             this.handleStateChanged();
         }
@@ -1240,14 +1252,6 @@ class Call {
     setCallEnded() {
         this._state = CallState.Ended;
     }
-    set videoCapturer(capturer) {
-        this._videoCapturer = capturer;
-        this.enableOrDisableCapturer();
-    }
-    set videoRenderer(renderer) {
-        this._videoRenderer = renderer;
-        this.enableOrDisableRenderer();
-    }
     accept() {
         this._callManager.accept(this.callId);
     }
@@ -1258,43 +1262,10 @@ class Call {
         this._callManager.ignore(this.callId);
     }
     hangup() {
-        // This is a little faster than waiting for the
-        // change in call state to come back.
-        if (this._videoCapturer) {
-            this._videoCapturer.disable();
-        }
-        if (this._videoRenderer) {
-            this._videoRenderer.disable();
-        }
-        // This assumes we only have one active call.
         sillyDeadlockProtection(() => {
             this._callManager.hangup();
         });
     }
-    get outgoingAudioEnabled() {
-        return this._outgoingAudioEnabled;
-    }
-    set outgoingAudioEnabled(enabled) {
-        this._outgoingAudioEnabled = enabled;
-        // This assumes we only have one active call.
-        sillyDeadlockProtection(() => {
-            this._callManager.setOutgoingAudioEnabled(enabled);
-        });
-    }
-    get outgoingVideoEnabled() {
-        return this._outgoingVideoEnabled;
-    }
-    set outgoingVideoEnabled(enabled) {
-        this._outgoingVideoEnabled = enabled;
-        this.enableOrDisableCapturer();
-    }
-    set outgoingVideoIsScreenShare(isScreenShare) {
-        // This assumes we only have one active call.
-        this._outgoingVideoIsScreenShare = isScreenShare;
-        sillyDeadlockProtection(() => {
-            this._callManager.setOutgoingVideoIsScreenShare(isScreenShare);
-        });
-    }
     get remoteAudioEnabled() {
         return this._remoteAudioEnabled;
     }
@@ -1306,63 +1277,51 @@ class Call {
     }
     set remoteVideoEnabled(enabled) {
         this._remoteVideoEnabled = enabled;
-        this.enableOrDisableRenderer();
+    }
+    setOutgoingAudioMuted(muted) {
+        const enabled = !muted;
+        if (this._mediaSessionStarted && this._outgoingAudioEnabled !== enabled) {
+            this._outgoingAudioEnabled = enabled;
+            sillyDeadlockProtection(() => {
+                this._callManager.setOutgoingAudioEnabled(enabled);
+            });
+        }
+        else {
+            this._outgoingAudioEnabled = enabled;
+        }
+    }
+    setOutgoingVideoMuted(muted) {
+        const enabled = !muted;
+        if (this._mediaSessionStarted && this._outgoingVideoEnabled !== enabled) {
+            this._outgoingVideoEnabled = enabled;
+            sillyDeadlockProtection(() => {
+                this._callManager.setOutgoingVideoEnabled(enabled);
+            });
+        }
+        else {
+            this._outgoingVideoEnabled = enabled;
+        }
+    }
+    setOutgoingVideoIsScreenShare(isScreenShare) {
+        if (this._mediaSessionStarted &&
+            this._outgoingVideoIsScreenShare !== isScreenShare) {
+            this._outgoingVideoIsScreenShare = isScreenShare;
+            sillyDeadlockProtection(() => {
+                this._callManager.setOutgoingVideoIsScreenShare(isScreenShare);
+            });
+        }
+        else {
+            this._outgoingVideoIsScreenShare = isScreenShare;
+        }
     }
     // With this method, a Call is a VideoFrameSender
     sendVideoFrame(width, height, format, buffer) {
-        // This assumes we only have one active call.
         this._callManager.sendVideoFrame(width, height, format, buffer);
     }
     // With this method, a Call is a VideoFrameSource
     receiveVideoFrame(buffer, maxWidth, maxHeight) {
-        // This assumes we only have one active call.
         return this._callManager.receiveVideoFrame(buffer, maxWidth, maxHeight);
     }
-    enableOrDisableCapturer() {
-        if (!this._videoCapturer) {
-            return;
-        }
-        if (!this.outgoingVideoEnabled) {
-            this._videoCapturer.disable();
-            if (this.state === CallState.Accepted) {
-                this.setOutgoingVideoEnabled(false);
-            }
-            return;
-        }
-        switch (this.state) {
-            case CallState.Prering:
-            case CallState.Ringing:
-                this._videoCapturer.enableCapture();
-                break;
-            case CallState.Accepted:
-                this._videoCapturer.enableCaptureAndSend(this);
-                this.setOutgoingVideoEnabled(true);
-                if (this._outgoingVideoIsScreenShare) {
-                    // Make sure the status gets sent.
-                    this.outgoingVideoIsScreenShare = true;
-                }
-                break;
-            case CallState.Reconnecting:
-                this._videoCapturer.enableCaptureAndSend(this);
-                // Don't send status until we're reconnected.
-                break;
-            case CallState.Ended:
-                this._videoCapturer.disable();
-                break;
-            default:
-        }
-    }
-    setOutgoingVideoEnabled(enabled) {
-        sillyDeadlockProtection(() => {
-            try {
-                this._callManager.setOutgoingVideoEnabled(enabled);
-            }
-            catch {
-                // We may not have an active connection any more.
-                // In which case it doesn't matter
-            }
-        });
-    }
     updateDataMode(dataMode) {
         sillyDeadlockProtection(() => {
             try {
@@ -1374,29 +1333,6 @@ class Call {
             }
         });
     }
-    enableOrDisableRenderer() {
-        if (!this._videoRenderer) {
-            return;
-        }
-        if (!this.remoteVideoEnabled) {
-            this._videoRenderer.disable();
-            return;
-        }
-        switch (this.state) {
-            case CallState.Prering:
-            case CallState.Ringing:
-                this._videoRenderer.disable();
-                break;
-            case CallState.Accepted:
-            case CallState.Reconnecting:
-                this._videoRenderer.enable(this);
-                break;
-            case CallState.Ended:
-                this._videoRenderer.disable();
-                break;
-            default:
-        }
-    }
 }
 exports.Call = Call;
 // Represents the connection state to a media server for a group call.
@@ -1722,7 +1658,6 @@ class GroupCall {
     }
     // With this, a GroupCall is a VideoFrameSender
     sendVideoFrame(width, height, format, buffer) {
-        // This assumes we only have one active call.
         this._callManager.sendVideoFrame(width, height, format, buffer);
     }
     // With this, a GroupCall can provide a VideoFrameSource for each remote device.
@@ -1745,7 +1680,6 @@ class GroupCall {
     }
 }
 exports.GroupCall = GroupCall;
-// Implements VideoSource for use in CanvasVideoRenderer
 class GroupCallVideoFrameSource {
     constructor(callManager, groupCall, remoteDemuxId // Uint32
     ) {
@@ -1754,7 +1688,6 @@ class GroupCallVideoFrameSource {
         this._remoteDemuxId = remoteDemuxId;
     }
     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) {
             const [width, height] = frame;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/ringrtc",
-  "version": "2.50.4",
+  "version": "2.51.0",
   "description": "Signal Messenger voice and video calling library.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "config": {
     "prebuildUrl": "https://build-artifacts.signal.org/libraries/ringrtc-desktop-build-v${npm_package_version}.tar.gz",
-    "prebuildChecksum": "31d1bedee2ff4ebc42fdcb92d16b936392c8d5a4e3ebaf3d2f4a53b75c617a36"
+    "prebuildChecksum": "77621836d3b47b8a4a5ba81941b9bdf1f27e9b70187ca2b00e8e467d0292f137"
   },
   "author": "",
   "license": "AGPL-3.0-only",
@@ -36,11 +36,9 @@
   "devDependencies": {
     "@types/chai": "4.3.16",
     "@types/chai-as-promised": "^7.1.4",
-    "@types/dom-mediacapture-transform": "0.1.10",
     "@types/lodash": "^4.14.106",
     "@types/mocha": "10.0.9",
     "@types/node": "20.17.6",
-    "@types/offscreencanvas": "^2019.7.3",
     "@types/sinon-chai": "^3.2.12",
     "chai": "4.4.1",
     "chai-as-promised": "^7.1.1",

package/dist/ringrtc/VideoSupport.d.ts

@@ -1,77 +0,0 @@
-interface Ref<T> {
-    readonly current: T | null;
-}
-export declare enum VideoPixelFormatEnum {
-    I420 = 0,
-    Nv12 = 1,
-    Rgba = 2
-}
-export interface VideoFrameSource {
-    /**
-     * Copies the latest frame into `buffer`.
-     *
-     * Note that `maxWidth` and `maxHeight` specify maximum dimensions,
-     * but allow for rotation, i.e. a maximum of 1920x1080 will also allow
-     * portrait-mode 1080x1920.
-     *
-     * Returns a `[width, height]` pair for the resulting frame,
-     * or `undefined` if there's no new frame ready to be displayed.
-     */
-    receiveVideoFrame(buffer: Buffer, maxWidth: number, maxHeight: number): [number, number] | undefined;
-}
-interface VideoFrameSender {
-    sendVideoFrame(width: number, height: number, format: VideoPixelFormatEnum, buffer: Buffer): void;
-}
-export declare class GumVideoCaptureOptions {
-    maxWidth: number;
-    maxHeight: number;
-    maxFramerate: number;
-    preferredDeviceId?: string;
-    screenShareSourceId?: string;
-    mediaStream?: MediaStream;
-    onEnded?: () => void;
-}
-export declare class GumVideoCapturer {
-    private defaultCaptureOptions;
-    private localPreview?;
-    private captureOptions?;
-    private sender?;
-    private mediaStream?;
-    private spawnedSenderRunning;
-    private preferredDeviceId?;
-    private updateLocalPreviewIntervalId?;
-    constructor(defaultCaptureOptions: GumVideoCaptureOptions);
-    capturing(): boolean;
-    setLocalPreview(localPreview: Ref<HTMLVideoElement> | undefined): void;
-    enableCapture(options?: GumVideoCaptureOptions): Promise<void>;
-    enableCaptureAndSend(sender?: VideoFrameSender, options?: GumVideoCaptureOptions): Promise<void>;
-    disable(): void;
-    setPreferredDevice(deviceId: string): Promise<void>;
-    enumerateDevices(): Promise<Array<MediaDeviceInfo>>;
-    private getUserMedia;
-    private startCapturing;
-    private stopCapturing;
-    private startSending;
-    private spawnSender;
-    private stopSending;
-    private updateLocalPreviewSourceObject;
-}
-export declare const MAX_VIDEO_CAPTURE_WIDTH: number;
-export declare const MAX_VIDEO_CAPTURE_HEIGHT: number;
-export declare const MAX_VIDEO_CAPTURE_AREA: number;
-export declare const MAX_VIDEO_CAPTURE_BUFFER_SIZE: number;
-export declare class CanvasVideoRenderer {
-    private canvas?;
-    private buffer;
-    private imageData?;
-    private source?;
-    private rafId?;
-    constructor();
-    setCanvas(canvas: Ref<HTMLCanvasElement> | undefined): void;
-    enable(source: VideoFrameSource): void;
-    disable(): void;
-    private requestAnimationFrameCallback;
-    private renderBlack;
-    private renderVideoFrame;
-}
-export {};