A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
refactor(voice-engine): keep file-local types private
Hampus0c265ef48c3b
diff --git a/packages/voice_engine_v2/src/bridge/ffi_assertions.ts b/packages/voice_engine_v2/src/bridge/ffi_assertions.tsindex a757f82c2..5273a9959 100644--- a/packages/voice_engine_v2/src/bridge/ffi_assertions.ts+++ b/packages/voice_engine_v2/src/bridge/ffi_assertions.ts@@ -1,8 +1,8 @@// SPDX-License-Identifier: AGPL-3.0-or-later-export const VOICE_ENGINE_V2_AUDIO_FRAME_BYTES_MAX = 1 << 20;-export const VOICE_ENGINE_V2_VIDEO_FRAME_BYTES_MAX = 64 << 20;-export const VOICE_ENGINE_V2_VIDEO_DIMENSION_MAX = 16384;+const VOICE_ENGINE_V2_AUDIO_FRAME_BYTES_MAX = 1 << 20;+const VOICE_ENGINE_V2_VIDEO_FRAME_BYTES_MAX = 64 << 20;+const VOICE_ENGINE_V2_VIDEO_DIMENSION_MAX = 16384;const VOICE_ENGINE_V2_AUDIO_SAMPLE_RATES_HZ = [16000, 32000, 48000] as const;const VOICE_ENGINE_V2_AUDIO_CHANNELS_VALID = [1, 2] as const;@@ -20,7 +20,7 @@ interface VoiceEngineV2VideoFrameInvariants {timestampNs: number;}-export class VoiceEngineV2FfiAssertError extends Error {+class VoiceEngineV2FfiAssertError extends Error {readonly code:| 'audioFrameBytesOutOfRange'| 'audioSampleRateInvalid'diff --git a/packages/voice_engine_v2/src/core/reducers/_zeroCopy.ts b/packages/voice_engine_v2/src/core/reducers/_zeroCopy.tsindex 2aa7291a3..8966512c6 100644--- a/packages/voice_engine_v2/src/core/reducers/_zeroCopy.ts+++ b/packages/voice_engine_v2/src/core/reducers/_zeroCopy.ts@@ -9,14 +9,18 @@ export function nativeZeroCopyRequiredError(): VoiceEngineV2Error {assert.equal(typeof resource, 'string', 'nativeZeroCopyRequiredError resource must be a string');assert.ok(resource.length > 0, 'nativeZeroCopyRequiredError resource must not be empty');- const label =- resource === 'capture'- ? 'Native Electron capture'- : resource === 'frame'- ? 'Native Electron capture frames'- : resource === 'frameSink'- ? 'Native Electron frame sinks'- : 'Native hardware encoder usage';+ let label = 'Native hardware encoder usage';+ switch (resource) {+ case 'capture':+ label = 'Native Electron capture';+ break;+ case 'frame':+ label = 'Native Electron capture frames';+ break;+ case 'frameSink':+ label = 'Native Electron frame sinks';+ break;+ }return implementationError(`${label} require zero-copy transport`, 'zeroCopyScreenTransport');}@@ -25,12 +29,15 @@ export function unavailableZeroCopyTransportError(): VoiceEngineV2Error {assert.equal(typeof resource, 'string', 'unavailableZeroCopyTransportError resource must be a string');assert.ok(resource.length > 0, 'unavailableZeroCopyTransportError resource must not be empty');- const label =- resource === 'capture'- ? 'native Electron capture'- : resource === 'frameSink'- ? 'native Electron frame sinks'- : 'native hardware encoders';+ let label = 'native hardware encoders';+ switch (resource) {+ case 'capture':+ label = 'native Electron capture';+ break;+ case 'frameSink':+ label = 'native Electron frame sinks';+ break;+ }return {code: 'unsupportedCapability',capability: 'zeroCopyScreenTransport',diff --git a/packages/voice_engine_v2/src/core/selectors.ts b/packages/voice_engine_v2/src/core/selectors.tsindex a66c04fdb..6a272f93d 100644--- a/packages/voice_engine_v2/src/core/selectors.ts+++ b/packages/voice_engine_v2/src/core/selectors.ts@@ -38,7 +38,7 @@ export interface VoiceEngineV2DeviceProjection {selectedCamera: VoiceEngineV2CameraDevice | null;}-export interface VoiceEngineV2StatsPresentationNetworkSummary extends VoiceEngineV2StatsNetworkSummary {+interface VoiceEngineV2StatsPresentationNetworkSummary extends VoiceEngineV2StatsNetworkSummary {droppedVideoFrameCallbacks?: number;}@@ -54,7 +54,7 @@ export function selectVoiceEngineV2E2eeProjection(snapshot: VoiceEngineV2Snapsho};}-export function selectVoiceEngineV2ConnectionProjection(snapshot: VoiceEngineV2Snapshot): VoiceEngineV2ConnectionModel {+function selectVoiceEngineV2ConnectionProjection(snapshot: VoiceEngineV2Snapshot): VoiceEngineV2ConnectionModel {const status = snapshot.connection.status;return {status,@@ -74,7 +74,7 @@ export function selectVoiceEngineV2ConnectionProjection(snapshot: VoiceEngineV2S};}-export function selectVoiceEngineV2MediaProjection(snapshot: VoiceEngineV2Snapshot): VoiceEngineV2MediaModel {+function selectVoiceEngineV2MediaProjection(snapshot: VoiceEngineV2Snapshot): VoiceEngineV2MediaModel {return {microphone: snapshot.microphone.status,camera: snapshot.camera.status,@@ -115,7 +115,7 @@ export function selectVoiceEngineV2DeviceProjection(snapshot: VoiceEngineV2Snaps};}-export function selectVoiceEngineV2StatsSummary(stats: VoiceEngineV2Stats | null): VoiceEngineV2StatsSummary | null {+function selectVoiceEngineV2StatsSummary(stats: VoiceEngineV2Stats | null): VoiceEngineV2StatsSummary | null {return stats ? summarizeVoiceEngineV2Stats(stats) : null;}diff --git a/packages/voice_engine_v2/src/core/state.ts b/packages/voice_engine_v2/src/core/state.tsindex e9822343a..cb47f352c 100644--- a/packages/voice_engine_v2/src/core/state.ts+++ b/packages/voice_engine_v2/src/core/state.ts@@ -36,9 +36,7 @@ import type {} from '@fluxer/voice_engine_v2/src/protocol/types';import type {SourceLifecycleState} from '@fluxer/voice_engine_v2/src/source_isolation/SourceLifecycleState';-export type {SourceLifecycleState} from '@fluxer/voice_engine_v2/src/source_isolation/SourceLifecycleState';--export interface VoiceEngineV2ConnectionState {+interface VoiceEngineV2ConnectionState {status: VoiceEngineV2ConnectionStatus;active: VoiceEngineV2ConnectOptions | null;desired: VoiceEngineV2ConnectOptions | null;@@ -55,25 +53,25 @@ export interface VoiceEngineV2LocalMediaState<Options> {failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2MicrophoneState extends VoiceEngineV2LocalMediaState<VoiceEngineV2MicrophoneOptions> {+interface VoiceEngineV2MicrophoneState extends VoiceEngineV2LocalMediaState<VoiceEngineV2MicrophoneOptions> {enabled: boolean;localSpeakingOverride: boolean | null;setEnabledOperationId: VoiceEngineV2OperationId | null;}-export interface VoiceEngineV2OutputDeviceState {+interface VoiceEngineV2OutputDeviceState {desiredDeviceId: string | null;activeDeviceId: string | null;operationId: VoiceEngineV2OperationId | null;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2RoomState {+interface VoiceEngineV2RoomState {participants: Record<string, VoiceEngineV2Participant>;tracks: Record<string, VoiceEngineV2Track>;}-export interface VoiceEngineV2InboundVideoState {+interface VoiceEngineV2InboundVideoState {tracks: Record<string, VoiceEngineV2InboundVideoTrack>;droppedFrameCount: number;}@@ -86,45 +84,45 @@ export interface VoiceEngineV2GatewayState {failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2LiveKitState extends VoiceEngineV2LiveKitRoomState {+interface VoiceEngineV2LiveKitState extends VoiceEngineV2LiveKitRoomState {failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2PermissionState {+interface VoiceEngineV2PermissionState {results: Record<string, VoiceEngineV2PermissionResult>;operationIds: Record<string, VoiceEngineV2OperationId>;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2DeviceState {+interface VoiceEngineV2DeviceState {inventory: VoiceEngineV2DeviceInventory;operationId: VoiceEngineV2OperationId | null;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2E2eeLifecycleState extends VoiceEngineV2E2eeState {+interface VoiceEngineV2E2eeLifecycleState extends VoiceEngineV2E2eeState {operationId: VoiceEngineV2OperationId | null;}-export interface VoiceEngineV2NativeCaptureState {+interface VoiceEngineV2NativeCaptureState {captures: Record<string, VoiceEngineV2NativeCaptureOptions>;operationIds: Record<string, VoiceEngineV2OperationId>;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2NativeAudioTapState {+interface VoiceEngineV2NativeAudioTapState {taps: Record<string, VoiceEngineV2NativeAudioTapOptions>;operationIds: Record<string, VoiceEngineV2OperationId>;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2NativeFrameSinkState {+interface VoiceEngineV2NativeFrameSinkState {sinks: Record<string, VoiceEngineV2NativeFrameSinkOptions>;operationIds: Record<string, VoiceEngineV2OperationId>;failure: VoiceEngineV2Error | null;}-export interface VoiceEngineV2LifecycleState {+interface VoiceEngineV2LifecycleState {tearingDown: boolean;reason: VoiceEngineV2LifecycleReason | null;operationId: VoiceEngineV2OperationId | null;diff --git a/packages/voice_engine_v2/src/implementations/VoiceEngineV2HostPortImplementation.ts b/packages/voice_engine_v2/src/implementations/VoiceEngineV2HostPortImplementation.tsindex cb5d9ebc3..e12bb9008 100644--- a/packages/voice_engine_v2/src/implementations/VoiceEngineV2HostPortImplementation.ts+++ b/packages/voice_engine_v2/src/implementations/VoiceEngineV2HostPortImplementation.ts@@ -52,7 +52,7 @@ export class VoiceEngineV2HostPortImplementation extends VoiceEngineV2Implementa}}-export class VoiceEngineV2HostPortDriver implements VoiceEngineV2Driver {+class VoiceEngineV2HostPortDriver implements VoiceEngineV2Driver {constructor(private readonly ports: VoiceEngineV2HostPorts) {}subscribe(listener: VoiceEngineV2ExternalEventListener): () => void {diff --git a/packages/voice_engine_v2/src/implementations/VoiceEngineV2ImplementationBase.ts b/packages/voice_engine_v2/src/implementations/VoiceEngineV2ImplementationBase.tsindex 3799922f3..49e19ce91 100644--- a/packages/voice_engine_v2/src/implementations/VoiceEngineV2ImplementationBase.ts+++ b/packages/voice_engine_v2/src/implementations/VoiceEngineV2ImplementationBase.ts@@ -27,14 +27,14 @@ import type {VoiceEngineV2Stats,} from '@fluxer/voice_engine_v2/src/protocol/types';-export interface VoiceEngineV2CommandSuccess {+interface VoiceEngineV2CommandSuccess {ok: true;stats?: VoiceEngineV2Stats;permissionResult?: VoiceEngineV2PermissionResult;deviceInventory?: VoiceEngineV2DeviceInventory;}-export interface VoiceEngineV2CommandFailure {+interface VoiceEngineV2CommandFailure {ok: false;error: VoiceEngineV2Error;}@@ -93,7 +93,7 @@ export interface VoiceEngineV2Driver {subscribe?(listener: VoiceEngineV2ExternalEventListener): () => void;}-export type VoiceEngineV2CommandOfType<Type extends VoiceEngineV2Command['type']> = Extract<+type VoiceEngineV2CommandOfType<Type extends VoiceEngineV2Command['type']> = Extract<VoiceEngineV2Command,{type: Type}>;diff --git a/packages/voice_engine_v2/src/policies/cameraShare.ts b/packages/voice_engine_v2/src/policies/cameraShare.tsindex e4d8e130f..accb32f87 100644--- a/packages/voice_engine_v2/src/policies/cameraShare.ts+++ b/packages/voice_engine_v2/src/policies/cameraShare.ts@@ -6,9 +6,9 @@ import type {VoiceEngineV2Error,} from '@fluxer/voice_engine_v2/src/protocol/types';-export type VoiceEngineV2CameraEncodingPlanAction = 'noop' | 'updateEncoding' | 'republish' | 'reject';+type VoiceEngineV2CameraEncodingPlanAction = 'noop' | 'updateEncoding' | 'republish' | 'reject';-export type VoiceEngineV2CameraEncodingPlanReason =+type VoiceEngineV2CameraEncodingPlanReason =| 'unchanged'| 'effectsOrEncodingChanged'| 'deviceChanged'@@ -46,7 +46,7 @@ function invalidCameraEncodingPlan(};}-export function applyVoiceEngineV2CameraEncodingOptions(+function applyVoiceEngineV2CameraEncodingOptions(current: VoiceEngineV2CameraOptions,update: VoiceEngineV2CameraEncodingOptions,): VoiceEngineV2CameraOptions {diff --git a/packages/voice_engine_v2/src/policies/hardwareEncoderCapabilities.ts b/packages/voice_engine_v2/src/policies/hardwareEncoderCapabilities.tsindex d2797796d..a3dca1072 100644--- a/packages/voice_engine_v2/src/policies/hardwareEncoderCapabilities.ts+++ b/packages/voice_engine_v2/src/policies/hardwareEncoderCapabilities.ts@@ -50,7 +50,7 @@ export function normalizeVoiceEngineV2HardwareEncoderCapabilities(};}-export function hasVoiceEngineV2ZeroCopyNativeInput(+function hasVoiceEngineV2ZeroCopyNativeInput(capabilities: VoiceEngineV2HardwareEncoderCapabilities | null | undefined,): boolean {return (diff --git a/packages/voice_engine_v2/src/policies/microphoneFailureAction.ts b/packages/voice_engine_v2/src/policies/microphoneFailureAction.tsindex 8a05dd5da..9506deb1a 100644--- a/packages/voice_engine_v2/src/policies/microphoneFailureAction.ts+++ b/packages/voice_engine_v2/src/policies/microphoneFailureAction.ts@@ -2,7 +2,7 @@export type VoiceEngineV2MicrophoneOperationFailureAction = 'none' | 'defer' | 'mute' | 'crash';-export interface VoiceEngineV2OperationFailureLike {+interface VoiceEngineV2OperationFailureLike {ok: false;error: {code: string;diff --git a/packages/voice_engine_v2/src/policies/screenShare.ts b/packages/voice_engine_v2/src/policies/screenShare.tsindex 412f18049..f6797eb04 100644--- a/packages/voice_engine_v2/src/policies/screenShare.ts+++ b/packages/voice_engine_v2/src/policies/screenShare.ts@@ -6,9 +6,9 @@ import type {VoiceEngineV2ScreenOptions,} from '@fluxer/voice_engine_v2/src/protocol/types';-export type VoiceEngineV2ScreenEncodingPlanAction = 'noop' | 'updateEncoding' | 'republish' | 'reject';+type VoiceEngineV2ScreenEncodingPlanAction = 'noop' | 'updateEncoding' | 'republish' | 'reject';-export type VoiceEngineV2ScreenEncodingPlanReason =+type VoiceEngineV2ScreenEncodingPlanReason =| 'unchanged'| 'dimensionsOrBitrateChanged'| 'codecChanged'@@ -48,7 +48,7 @@ function invalidScreenEncodingPlan(};}-export function applyVoiceEngineV2ScreenEncodingOptions(+function applyVoiceEngineV2ScreenEncodingOptions(current: VoiceEngineV2ScreenOptions,update: VoiceEngineV2ScreenEncodingOptions,): VoiceEngineV2ScreenOptions {diff --git a/packages/voice_engine_v2/src/policies/voiceStats.ts b/packages/voice_engine_v2/src/policies/voiceStats.tsindex 358326b87..1ee53a8dd 100644--- a/packages/voice_engine_v2/src/policies/voiceStats.ts+++ b/packages/voice_engine_v2/src/policies/voiceStats.ts@@ -28,7 +28,7 @@ export interface VoiceEngineV2StatsNetworkSummary {rttMs: number | null;}-export interface VoiceEngineV2StatsTrackSummary {+interface VoiceEngineV2StatsTrackSummary {direction: 'send' | 'recv';kind: 'audio' | 'video' | 'unknown';trackIdentifier: string;@@ -70,7 +70,7 @@ export interface VoiceEngineV2StatsSummary {remoteScreenShareAudio: VoiceEngineV2StatsTrackSummary | null;}-export interface VoiceEngineV2StatsTrackRoleCandidate {+interface VoiceEngineV2StatsTrackRoleCandidate {direction: 'send' | 'recv';kind: 'audio' | 'video' | 'unknown';rid?: string;@@ -78,7 +78,7 @@ export interface VoiceEngineV2StatsTrackRoleCandidate {bitrateKbps: number;}-export interface VoiceEngineV2StatsTrackPublicationIds {+interface VoiceEngineV2StatsTrackPublicationIds {localCameraTrackId: string | null;localMicrophoneTrackId: string | null;localScreenShareTrackId: string | null;@@ -109,7 +109,7 @@ interface IndexedVoiceEngineV2StatsTrack {track: VoiceEngineV2StatsTrackRoleCandidate;}-export function asVoiceEngineV2StatsTrackSource(source: unknown): VoiceEngineV2StatsTrackSource {+function asVoiceEngineV2StatsTrackSource(source: unknown): VoiceEngineV2StatsTrackSource {switch (source) {case VoiceEngineV2StatsTrackSource.Microphone:return VoiceEngineV2StatsTrackSource.Microphone;@@ -259,7 +259,7 @@ function mergeOutboundTrackGroup(tracks: ReadonlyArray<VoiceEngineV2OutboundStatreturn merged;}-export function coalesceVoiceEngineV2OutboundStats(+function coalesceVoiceEngineV2OutboundStats(tracks: ReadonlyArray<VoiceEngineV2OutboundStats>,): Array<VoiceEngineV2OutboundStats> {const grouped = new Map<string, Array<VoiceEngineV2OutboundStats>>();diff --git a/packages/voice_engine_v2/src/protocol/events.ts b/packages/voice_engine_v2/src/protocol/events.tsindex 68713eef0..92d298428 100644--- a/packages/voice_engine_v2/src/protocol/events.ts+++ b/packages/voice_engine_v2/src/protocol/events.ts@@ -44,7 +44,7 @@ import type {SourceLifecycleState,} from '@fluxer/voice_engine_v2/src/source_isolation/SourceLifecycleState';-export type VoiceEngineV2SourceLifecycleTransitionKind = SourceLifecycleState['kind'];+type VoiceEngineV2SourceLifecycleTransitionKind = SourceLifecycleState['kind'];export interface VoiceEngineV2SourceLifecycleTransitionedEvent {type: 'sourceLifecycle.transitioned';diff --git a/packages/voice_engine_v2/src/protocol/types.ts b/packages/voice_engine_v2/src/protocol/types.tsindex 9775a687f..0c0034d5b 100644--- a/packages/voice_engine_v2/src/protocol/types.ts+++ b/packages/voice_engine_v2/src/protocol/types.ts@@ -28,11 +28,11 @@ export type VoiceEngineV2TrackSource = 'microphone' | 'camera' | 'screen' | 'screxport type VoiceEngineV2TrackKind = 'audio' | 'video';-export type VoiceEngineV2RemoteTrackQuality = 'low' | 'medium' | 'high';+type VoiceEngineV2RemoteTrackQuality = 'low' | 'medium' | 'high';export type VoiceEngineV2VideoCodec = '' | 'vp8' | 'vp9' | 'h264' | 'h265' | 'av1';-export type VoiceEngineV2ScreenPacing = 'sender' | 'source';+type VoiceEngineV2ScreenPacing = 'sender' | 'source';type VoiceEngineV2CameraBackgroundMode = 'none' | 'non' | 'blur' | 'custom';type VoiceEngineV2CameraBackgroundCustomMediaKind = 'static' | 'animated' | 'video';@@ -152,12 +152,7 @@ export interface VoiceEngineV2GatewayDesiredVoiceState {selfStream: boolean;}-export type VoiceEngineV2LiveKitConnectionState =- | 'disconnected'- | 'connecting'- | 'connected'- | 'reconnecting'- | 'failed';+type VoiceEngineV2LiveKitConnectionState = 'disconnected' | 'connecting' | 'connected' | 'reconnecting' | 'failed';export interface VoiceEngineV2LiveKitRoomState {connectionState: VoiceEngineV2LiveKitConnectionState;@@ -235,9 +230,9 @@ export interface VoiceEngineV2ScreenAudioOptions {tapId?: string;}-export type VoiceEngineV2NativeCaptureKind = 'screen' | 'window' | 'game' | 'camera';+type VoiceEngineV2NativeCaptureKind = 'screen' | 'window' | 'game' | 'camera';-export interface VoiceEngineV2NativeCaptureSource {+interface VoiceEngineV2NativeCaptureSource {id: string;kind: VoiceEngineV2NativeCaptureKind;title: string;@@ -347,7 +342,7 @@ export type VoiceEngineV2PermissionName =| 'notifications'| string;-export type VoiceEngineV2PermissionStatus = 'unknown' | 'prompt' | 'granted' | 'denied' | 'restricted' | 'unsupported';+type VoiceEngineV2PermissionStatus = 'unknown' | 'prompt' | 'granted' | 'denied' | 'restricted' | 'unsupported';export interface VoiceEngineV2PermissionResult {name: VoiceEngineV2PermissionName;@@ -388,7 +383,7 @@ export interface VoiceEngineV2AudioControlsPatch {outputVolume?: number;}-export type VoiceEngineV2E2eeStatus = 'disabled' | 'pendingKey' | 'enabled' | 'failed';+type VoiceEngineV2E2eeStatus = 'disabled' | 'pendingKey' | 'enabled' | 'failed';export interface VoiceEngineV2E2eeState {status: VoiceEngineV2E2eeStatus;@@ -463,7 +458,7 @@ export interface VoiceEngineV2InboundStats {sourceHeight?: number;}-export type VoiceEngineV2VideoAccelerationStatus = 'hardware' | 'software' | 'unknown';+type VoiceEngineV2VideoAccelerationStatus = 'hardware' | 'software' | 'unknown';export interface VoiceEngineV2PerTrackStats {direction: 'send' | 'recv';@@ -594,7 +589,7 @@ export interface VoiceEngineV2LatencyDataPoint {latency: number;}-export interface VoiceEngineV2SendStats {+interface VoiceEngineV2SendStats {outgoingVideoQueueDepth: number;outgoingVideoQueueCapacity: number;outgoingVideoMaxQueueDepth: number;@@ -629,7 +624,7 @@ export interface VoiceEngineV2Stats {send?: VoiceEngineV2SendStats | null;}-export type VoiceEngineV2DiagnosticLevel = 'debug' | 'info' | 'warn' | 'error';+type VoiceEngineV2DiagnosticLevel = 'debug' | 'info' | 'warn' | 'error';export interface VoiceEngineV2DiagnosticEntry {id: string;diff --git a/packages/voice_engine_v2/src/runtime/eventLogRing.ts b/packages/voice_engine_v2/src/runtime/eventLogRing.tsindex a7d563833..34dd8974f 100644--- a/packages/voice_engine_v2/src/runtime/eventLogRing.ts+++ b/packages/voice_engine_v2/src/runtime/eventLogRing.ts@@ -17,7 +17,7 @@ export interface VoiceEngineV2EventLogSpillSink {write(entry: VoiceEngineV2EventLogEntry): Promise<void>;}-export const VOICE_ENGINE_V2_MEMORY_EVENT_LOG_SPILL_SINK_CAP = 8192;+const VOICE_ENGINE_V2_MEMORY_EVENT_LOG_SPILL_SINK_CAP = 8192;export interface VoiceEngineV2MemoryEventLogSpillSink extends VoiceEngineV2EventLogSpillSink {readonly entries: ReadonlyArray<VoiceEngineV2EventLogEntry>;