@livekit/rtc-node 0.13.24 → 0.13.25

package/src/ffi_client.ts

@@ -1,18 +1,20 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { PartialMessage } from '@bufbuild/protobuf';
-import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
-import EventEmitter from 'events';
 import {
+  FfiEvent,
   FfiHandle,
+  FfiRequest,
+  FfiResponse,
+  type PartialMessage,
   livekitCopyBuffer,
   livekitDispose,
   livekitFfiRequest,
   livekitInitialize,
   livekitRetrievePtr,
-} from './napi/native.js';
-import { FfiEvent, FfiRequest, FfiResponse } from './proto/ffi_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
+import EventEmitter from 'events';
 import { SDK_VERSION } from './version.js';
 
 export { FfiHandle, type FfiEvent, type FfiResponse, FfiRequest, livekitDispose as dispose };

package/src/frame_processor.ts

@@ -15,7 +15,28 @@ export type FrameProcessorCredentials = {
   url: string;
 };
 
+export const FrameProcessorSymbol = Symbol.for('lk.frame-processor');
+
+export function isFrameProcessor<
+  T extends FrameProcessor<AudioFrame> | FrameProcessor<VideoFrame> | unknown,
+>(
+  maybeProcessor: unknown,
+): maybeProcessor is T extends FrameProcessor<AudioFrame>
+  ? FrameProcessor<AudioFrame>
+  : T extends FrameProcessor<VideoFrame>
+    ? FrameProcessor<VideoFrame>
+    : FrameProcessor<AudioFrame> | FrameProcessor<VideoFrame> {
+  return (
+    maybeProcessor !== null &&
+    typeof maybeProcessor === 'object' &&
+    'symbol' in maybeProcessor &&
+    maybeProcessor.symbol === FrameProcessorSymbol
+  );
+}
+
 export abstract class FrameProcessor<Frame extends VideoFrame | AudioFrame> {
+  readonly symbol = FrameProcessorSymbol;
+
   abstract isEnabled(): boolean;
   abstract setEnabled(enabled: boolean): void;
 

package/src/index.ts

@@ -14,8 +14,8 @@ export { E2EEManager, FrameCryptor, KeyProvider } from './e2ee.js';
 export type { E2EEOptions, KeyProviderOptions } from './e2ee.js';
 export { dispose } from './ffi_client.js';
 export { LocalParticipant, Participant, RemoteParticipant } from './participant.js';
-export { EncryptionState, EncryptionType } from './proto/e2ee_pb.js';
-export { DisconnectReason, ParticipantKind } from './proto/participant_pb.js';
+export { EncryptionState, EncryptionType } from '@livekit/rtc-ffi-bindings';
+export { DisconnectReason, ParticipantKind } from '@livekit/rtc-ffi-bindings';
 export {
   ConnectionQuality,
   ConnectionState,
@@ -24,9 +24,9 @@ export {
   IceServer,
   IceTransportType,
   TrackPublishOptions,
-} from './proto/room_pb.js';
-export { StreamState, TrackKind, TrackSource } from './proto/track_pb.js';
-export { VideoBufferType, VideoCodec, VideoRotation } from './proto/video_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+export { StreamState, TrackKind, TrackSource } from '@livekit/rtc-ffi-bindings';
+export { VideoBufferType, VideoCodec, VideoRotation } from '@livekit/rtc-ffi-bindings';
 export { ConnectError, Room, RoomEvent, type RoomOptions, type RtcConfiguration } from './room.js';
 export { RpcError, type PerformRpcParams, type RpcInvocationData } from './rpc.js';
 export {
@@ -54,4 +54,5 @@ export {
   FrameProcessor,
   type FrameProcessorStreamInfo,
   type FrameProcessorCredentials,
+  isFrameProcessor,
 } from './frame_processor.js';

package/src/participant.ts

@@ -2,23 +2,12 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { Mutex } from '@livekit/mutex';
-import type { PathLike } from 'node:fs';
-import { open, stat } from 'node:fs/promises';
-import {
-  type ByteStreamInfo,
-  type ByteStreamOptions,
-  ByteStreamWriter,
-  type TextStreamInfo,
-  TextStreamWriter,
-} from './data_streams/index.js';
-import { FfiClient, FfiHandle } from './ffi_client.js';
-import { log } from './log.js';
 import {
   DisconnectReason,
   type OwnedParticipant,
   type ParticipantInfo,
   ParticipantKind,
-} from './proto/participant_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   ChatMessage as ChatMessageModel,
   DataStream_ByteHeader,
@@ -66,20 +55,31 @@ import {
   type UnpublishTrackCallback,
   UnpublishTrackRequest,
   type UnpublishTrackResponse,
-} from './proto/room_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import type {
   PerformRpcCallback,
   PerformRpcResponse,
   RegisterRpcMethodResponse,
   RpcMethodInvocationResponseResponse,
   UnregisterRpcMethodResponse,
-} from './proto/rpc_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   PerformRpcRequest,
   RegisterRpcMethodRequest,
   RpcMethodInvocationResponseRequest,
   UnregisterRpcMethodRequest,
-} from './proto/rpc_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import type { PathLike } from 'node:fs';
+import { open, stat } from 'node:fs/promises';
+import {
+  type ByteStreamInfo,
+  type ByteStreamOptions,
+  ByteStreamWriter,
+  type TextStreamInfo,
+  TextStreamWriter,
+} from './data_streams/index.js';
+import { FfiClient, FfiHandle } from './ffi_client.js';
+import { log } from './log.js';
 import { type PerformRpcParams, RpcError, type RpcInvocationData } from './rpc.js';
 import type { LocalTrack } from './track.js';
 import type { RemoteTrackPublication, TrackPublication } from './track_publication.js';
@@ -336,7 +336,7 @@ export class LocalParticipant extends Participant {
         await sendTrailer(trailerReq);
       },
       abort(err) {
-        log.error('Sink error:', err);
+        log.error(err, 'Sink Error');
       },
     });
 
@@ -451,7 +451,7 @@ export class LocalParticipant extends Participant {
         await sendTrailer(trailerReq);
       },
       abort(err) {
-        log.error('Sink error:', err);
+        log.error(err, 'Sink error');
       },
     });
 

package/src/room.ts

@@ -2,6 +2,27 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { Mutex } from '@livekit/mutex';
+import { EncryptionState, type EncryptionType } from '@livekit/rtc-ffi-bindings';
+import type { FfiEvent } from '@livekit/rtc-ffi-bindings';
+import type { DisconnectReason, OwnedParticipant } from '@livekit/rtc-ffi-bindings';
+import type { DataStream_Trailer, DisconnectCallback } from '@livekit/rtc-ffi-bindings';
+import {
+  type ConnectCallback,
+  ConnectRequest,
+  type ConnectResponse,
+  type ConnectionQuality,
+  ConnectionState,
+  ContinualGatheringPolicy,
+  type DataPacketKind,
+  type DataStream_Chunk,
+  type DataStream_Header,
+  type DisconnectResponse,
+  RoomOptions as FfiRoomOptions,
+  type IceServer,
+  IceTransportType,
+  type RoomInfo,
+} from '@livekit/rtc-ffi-bindings';
+import { TrackKind } from '@livekit/rtc-ffi-bindings';
 import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import EventEmitter from 'events';
 import { ByteStreamReader, TextStreamReader } from './data_streams/stream_reader.js';
@@ -18,27 +39,6 @@ import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
 import { log } from './log.js';
 import type { Participant } from './participant.js';
 import { LocalParticipant, RemoteParticipant } from './participant.js';
-import { EncryptionState, type EncryptionType } from './proto/e2ee_pb.js';
-import type { FfiEvent } from './proto/ffi_pb.js';
-import type { DisconnectReason, OwnedParticipant } from './proto/participant_pb.js';
-import type { DataStream_Trailer, DisconnectCallback } from './proto/room_pb.js';
-import {
-  type ConnectCallback,
-  ConnectRequest,
-  type ConnectResponse,
-  type ConnectionQuality,
-  ConnectionState,
-  ContinualGatheringPolicy,
-  type DataPacketKind,
-  type DataStream_Chunk,
-  type DataStream_Header,
-  type DisconnectResponse,
-  RoomOptions as FfiRoomOptions,
-  type IceServer,
-  IceTransportType,
-  type RoomInfo,
-} from './proto/room_pb.js';
-import { TrackKind } from './proto/track_pb.js';
 import type { LocalTrack, RemoteTrack } from './track.js';
 import { RemoteAudioTrack, RemoteVideoTrack } from './track.js';
 import type { LocalTrackPublication, TrackPublication } from './track_publication.js';
@@ -792,7 +792,7 @@ export class Room extends (EventEmitter as new () => TypedEmitter<RoomCallbacks>
     const textBuffer = this.textStreamControllers.get(streamId);
     if (textBuffer) {
       textBuffer.controller.close();
-      this.byteStreamControllers.delete(streamId);
+      this.textStreamControllers.delete(streamId);
     }
   }
 }

package/src/rpc.ts

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { RpcError as RpcError_Proto } from './proto/rpc_pb.js';
+import type { RpcError as RpcError_Proto } from '@livekit/rtc-ffi-bindings';
 
 /** Parameters for initiating an RPC call */
 export interface PerformRpcParams {

package/src/tests/e2e.test.ts

@@ -4,7 +4,7 @@
 import { AccessToken } from 'livekit-server-sdk';
 import { randomUUID } from 'node:crypto';
 import { setTimeout as delay } from 'node:timers/promises';
-import { afterAll, describe, expect, it } from 'vitest';
+import { afterAll, describe, expect, it as itRaw } from 'vitest';
 import {
   AudioFrame,
   AudioSource,
@@ -20,6 +20,9 @@ import {
   dispose,
 } from '../index.js';
 
+// use concurrent testing if available on the runner (currently not supported by bun's api)
+const it = typeof itRaw.concurrent === 'function' ? itRaw.concurrent : itRaw;
+
 const hasE2EEnv =
   !!process.env.LIVEKIT_URL && !!process.env.LIVEKIT_API_KEY && !!process.env.LIVEKIT_API_SECRET;
 const describeE2E = hasE2EEnv ? describe : describe.skip;
@@ -202,7 +205,7 @@ describeE2E('livekit-rtc e2e', () => {
     await dispose();
   });
 
-  it.concurrent(
+  it(
     'connects to a room',
     async () => {
       const { roomName, rooms } = await connectTestRooms(1);
@@ -225,7 +228,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs,
   );
 
-  it.concurrent(
+  it(
     'connects multiple participants to the same room',
     async () => {
       const { roomName, rooms } = await connectTestRooms(2);
@@ -241,7 +244,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs,
   );
 
-  it.concurrent(
+  it(
     'emits participantDisconnected when a participant leaves',
     async () => {
       const { rooms } = await connectTestRooms(2);
@@ -267,7 +270,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs,
   );
 
-  it.concurrent(
+  it(
     'transfers audio between two participants (sine detection)',
     async () => {
       const cases = [
@@ -367,7 +370,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs * 2,
   );
 
-  it.concurrent(
+  it(
     'publishes and receives reliable data packets',
     async () => {
       const { rooms } = await connectTestRooms(2);
@@ -407,7 +410,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs,
   );
 
-  it.concurrent(
+  it(
     'sends and receives text and byte streams',
     async () => {
       const { rooms } = await connectTestRooms(2);
@@ -469,7 +472,7 @@ describeE2E('livekit-rtc e2e', () => {
     testTimeoutMs,
   );
 
-  it.concurrent(
+  it(
     'invokes RPC methods and returns structured errors',
     async () => {
       const { rooms } = await connectTestRooms(2);

package/src/track.ts

@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { AudioSource } from './audio_source.js';
-import { FfiClient, FfiHandle } from './ffi_client.js';
 import type {
   CreateAudioTrackResponse,
   CreateVideoTrackResponse,
@@ -10,8 +8,10 @@ import type {
   StreamState,
   TrackInfo,
   TrackKind,
-} from './proto/track_pb.js';
-import { CreateAudioTrackRequest, CreateVideoTrackRequest } from './proto/track_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { CreateAudioTrackRequest, CreateVideoTrackRequest } from '@livekit/rtc-ffi-bindings';
+import type { AudioSource } from './audio_source.js';
+import { FfiClient, FfiHandle } from './ffi_client.js';
 import type { VideoSource } from './video_source.js';
 
 export abstract class Track {

package/src/track_publication.ts

@@ -1,17 +1,17 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { FfiClient } from './ffi_client.js';
-import { FfiHandle } from './napi/native.js';
-import type { EncryptionType } from './proto/e2ee_pb.js';
-import type { SetSubscribedResponse } from './proto/room_pb.js';
-import { SetSubscribedRequest } from './proto/room_pb.js';
+import type { EncryptionType } from '@livekit/rtc-ffi-bindings';
+import type { SetSubscribedResponse } from '@livekit/rtc-ffi-bindings';
+import { SetSubscribedRequest } from '@livekit/rtc-ffi-bindings';
 import type {
   OwnedTrackPublication,
   TrackKind,
   TrackPublicationInfo,
   TrackSource,
-} from './proto/track_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { FfiHandle } from '@livekit/rtc-ffi-bindings';
+import { FfiClient } from './ffi_client.js';
 import type { Track } from './track.js';
 
 export abstract class TrackPublication {

package/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "0.13.24";
+export const SDK_VERSION = "0.13.25";

package/src/video_frame.ts

@@ -1,13 +1,13 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { FfiClient, FfiHandle, FfiRequest } from './ffi_client.js';
-import type { OwnedVideoBuffer, VideoConvertResponse } from './proto/video_frame_pb.js';
+import type { OwnedVideoBuffer, VideoConvertResponse } from '@livekit/rtc-ffi-bindings';
 import {
   VideoBufferInfo,
   VideoBufferInfo_ComponentInfo,
   VideoBufferType,
-} from './proto/video_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { FfiClient, FfiHandle, FfiRequest } from './ffi_client.js';
 
 export class VideoFrame {
   data: Uint8Array;

package/src/video_source.ts

@@ -1,18 +1,18 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { FfiClient, FfiHandle } from './ffi_client.js';
 import type {
   CaptureVideoFrameResponse,
   NewVideoSourceResponse,
   VideoSourceInfo,
-} from './proto/video_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   CaptureVideoFrameRequest,
   NewVideoSourceRequest,
   VideoRotation,
   VideoSourceType,
-} from './proto/video_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { FfiClient, FfiHandle } from './ffi_client.js';
 import type { VideoFrame } from './video_frame.js';
 
 export class VideoSource {

package/src/video_stream.ts

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import type { NewVideoStreamResponse, VideoRotation } from '@livekit/rtc-ffi-bindings';
+import { NewVideoStreamRequest, VideoStreamType } from '@livekit/rtc-ffi-bindings';
 import type { UnderlyingSource } from 'node:stream/web';
 import type { FfiEvent } from './ffi_client.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
-import type { NewVideoStreamResponse, VideoRotation } from './proto/video_frame_pb.js';
-import { NewVideoStreamRequest, VideoStreamType } from './proto/video_frame_pb.js';
 import type { Track } from './track.js';
 import { VideoFrame } from './video_frame.js';
 
@@ -18,6 +18,7 @@ export type VideoFrameEvent = {
 class VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {
   private controller?: ReadableStreamDefaultController<VideoFrameEvent>;
   private ffiHandle: FfiHandle;
+  private disposed = false;
 
   constructor(track: Track) {
     const req = new NewVideoStreamRequest({
@@ -65,6 +66,14 @@ class VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {
       case 'eos':
         FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
         this.controller.close();
+        // Dispose the native handle so the FD is released on stream end,
+        // not just when cancel() is called explicitly by the consumer.
+        // Guard against double-dispose if cancel() is called after EOS
+        // while buffered frames are still in the ReadableStream queue.
+        if (!this.disposed) {
+          this.disposed = true;
+          this.ffiHandle.dispose();
+        }
         break;
     }
   };
@@ -75,7 +84,10 @@ class VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {
 
   cancel() {
     FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
-    this.ffiHandle.dispose();
+    if (!this.disposed) {
+      this.disposed = true;
+      this.ffiHandle.dispose();
+    }
   }
 }
 

package/Cargo.toml

@@ -1,25 +0,0 @@
-[package]
-edition = "2021"
-name = "rtc-node"
-version = "0.0.1"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-napi = { version = "2.12.2", default-features = false, features = [
-    "async",
-    "napi6",
-] }
-napi-derive = "2.12.2"
-livekit-ffi = { path = "./rust-sdks/livekit-ffi" }
-prost = "0.14"
-prost-types = "0.14"
-log = "0.4.20"
-tokio = { version = "1.37.0", features = ["full"] }
-
-[build-dependencies]
-napi-build = "2.0.1"
-
-[profile.release]
-lto = true

package/build.rs

@@ -1,9 +0,0 @@
-// SPDX-FileCopyrightText: 2024 LiveKit, Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-
-extern crate napi_build;
-
-fn main() {
-    napi_build::setup();
-}