@livekit/rtc-node 0.13.24 → 0.13.25

package/dist/video_source.js

@@ -1,10 +1,10 @@
-import { FfiClient, FfiHandle } from "./ffi_client.js";
 import {
   CaptureVideoFrameRequest,
   NewVideoSourceRequest,
   VideoRotation,
   VideoSourceType
-} from "./proto/video_frame_pb.js";
+} from "@livekit/rtc-ffi-bindings";
+import { FfiClient, FfiHandle } from "./ffi_client.js";
 class VideoSource {
   constructor(width, height) {
     /** @internal */

package/dist/video_source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/video_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { FfiClient, FfiHandle } from './ffi_client.js';\nimport type {\n  CaptureVideoFrameResponse,\n  NewVideoSourceResponse,\n  VideoSourceInfo,\n} from './proto/video_frame_pb.js';\nimport {\n  CaptureVideoFrameRequest,\n  NewVideoSourceRequest,\n  VideoRotation,\n  VideoSourceType,\n} from './proto/video_frame_pb.js';\nimport type { VideoFrame } from './video_frame.js';\n\nexport class VideoSource {\n  /** @internal */\n  info?: VideoSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  closed = false;\n\n  width: number;\n  height: number;\n\n  constructor(width: number, height: number) {\n    this.width = width;\n    this.height = height;\n\n    const req = new NewVideoSourceRequest({\n      type: VideoSourceType.VIDEO_SOURCE_NATIVE,\n      resolution: {\n        width: width,\n        height: height,\n      },\n    });\n\n    const res = FfiClient.instance.request<NewVideoSourceResponse>({\n      message: {\n        case: 'newVideoSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source?.info;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  captureFrame(\n    frame: VideoFrame,\n    timestampUs = BigInt(0),\n    rotation = VideoRotation.VIDEO_ROTATION_0,\n  ) {\n    if (this.closed) {\n      throw new Error('VideoSource is closed');\n    }\n    const req = new CaptureVideoFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n      rotation,\n      timestampUs,\n    });\n\n    FfiClient.instance.request<CaptureVideoFrameResponse>({\n      message: { case: 'captureVideoFrame', value: req },\n    });\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":"AAGA,SAAS,WAAW,iBAAiB;AAMrC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGA,MAAM,YAAY;AAAA,EAWvB,YAAY,OAAe,QAAgB;AAL3C;AAAA,kBAAS;AAvBX;AA6BI,SAAK,QAAQ;AACb,SAAK,SAAS;AAEd,UAAM,MAAM,IAAI,sBAAsB;AAAA,MACpC,MAAM,gBAAgB;AAAA,MACtB,YAAY;AAAA,QACV;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,QAAO,SAAI,WAAJ,mBAAY;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AAAA,EACxD;AAAA,EAEA,aACE,OACA,cAAc,OAAO,CAAC,GACtB,WAAW,cAAc,kBACzB;AACA,QAAI,KAAK,QAAQ;AACf,YAAM,IAAI,MAAM,uBAAuB;AAAA,IACzC;AACA,UAAM,MAAM,IAAI,yBAAyB;AAAA,MACvC,cAAc,KAAK,UAAU;AAAA,MAC7B,QAAQ,MAAM,UAAU;AAAA,MACxB;AAAA,MACA;AAAA,IACF,CAAC;AAED,cAAU,SAAS,QAAmC;AAAA,MACpD,SAAS,EAAE,MAAM,qBAAqB,OAAO,IAAI;AAAA,IACnD,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,QAAQ;AACZ,SAAK,UAAU,QAAQ;AACvB,SAAK,SAAS;AAAA,EAChB;AACF;","names":[]}
+{"version":3,"sources":["../src/video_source.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type {\n  CaptureVideoFrameResponse,\n  NewVideoSourceResponse,\n  VideoSourceInfo,\n} from '@livekit/rtc-ffi-bindings';\nimport {\n  CaptureVideoFrameRequest,\n  NewVideoSourceRequest,\n  VideoRotation,\n  VideoSourceType,\n} from '@livekit/rtc-ffi-bindings';\nimport { FfiClient, FfiHandle } from './ffi_client.js';\nimport type { VideoFrame } from './video_frame.js';\n\nexport class VideoSource {\n  /** @internal */\n  info?: VideoSourceInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  closed = false;\n\n  width: number;\n  height: number;\n\n  constructor(width: number, height: number) {\n    this.width = width;\n    this.height = height;\n\n    const req = new NewVideoSourceRequest({\n      type: VideoSourceType.VIDEO_SOURCE_NATIVE,\n      resolution: {\n        width: width,\n        height: height,\n      },\n    });\n\n    const res = FfiClient.instance.request<NewVideoSourceResponse>({\n      message: {\n        case: 'newVideoSource',\n        value: req,\n      },\n    });\n\n    this.info = res.source?.info;\n    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);\n  }\n\n  captureFrame(\n    frame: VideoFrame,\n    timestampUs = BigInt(0),\n    rotation = VideoRotation.VIDEO_ROTATION_0,\n  ) {\n    if (this.closed) {\n      throw new Error('VideoSource is closed');\n    }\n    const req = new CaptureVideoFrameRequest({\n      sourceHandle: this.ffiHandle.handle,\n      buffer: frame.protoInfo(),\n      rotation,\n      timestampUs,\n    });\n\n    FfiClient.instance.request<CaptureVideoFrameResponse>({\n      message: { case: 'captureVideoFrame', value: req },\n    });\n  }\n\n  async close() {\n    this.ffiHandle.dispose();\n    this.closed = true;\n  }\n}\n"],"mappings":"AAQA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,WAAW,iBAAiB;AAG9B,MAAM,YAAY;AAAA,EAWvB,YAAY,OAAe,QAAgB;AAL3C;AAAA,kBAAS;AAvBX;AA6BI,SAAK,QAAQ;AACb,SAAK,SAAS;AAEd,UAAM,MAAM,IAAI,sBAAsB;AAAA,MACpC,MAAM,gBAAgB;AAAA,MACtB,YAAY;AAAA,QACV;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,QAAO,SAAI,WAAJ,mBAAY;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AAAA,EACxD;AAAA,EAEA,aACE,OACA,cAAc,OAAO,CAAC,GACtB,WAAW,cAAc,kBACzB;AACA,QAAI,KAAK,QAAQ;AACf,YAAM,IAAI,MAAM,uBAAuB;AAAA,IACzC;AACA,UAAM,MAAM,IAAI,yBAAyB;AAAA,MACvC,cAAc,KAAK,UAAU;AAAA,MAC7B,QAAQ,MAAM,UAAU;AAAA,MACxB;AAAA,MACA;AAAA,IACF,CAAC;AAED,cAAU,SAAS,QAAmC;AAAA,MACpD,SAAS,EAAE,MAAM,qBAAqB,OAAO,IAAI;AAAA,IACnD,CAAC;AAAA,EACH;AAAA,EAEA,MAAM,QAAQ;AACZ,SAAK,UAAU,QAAQ;AACvB,SAAK,SAAS;AAAA,EAChB;AACF;","names":[]}

package/dist/video_stream.cjs

@@ -21,11 +21,12 @@ __export(video_stream_exports, {
   VideoStream: () => VideoStream
 });
 module.exports = __toCommonJS(video_stream_exports);
+var import_rtc_ffi_bindings = require("@livekit/rtc-ffi-bindings");
 var import_ffi_client = require("./ffi_client.cjs");
-var import_video_frame_pb = require("./proto/video_frame_pb.cjs");
 var import_video_frame = require("./video_frame.cjs");
 class VideoStreamSource {
   constructor(track) {
+    this.disposed = false;
     this.onEvent = (ev) => {
       if (!this.controller) {
         throw new Error("Stream controller not initialized");
@@ -50,11 +51,15 @@ class VideoStreamSource {
         case "eos":
           import_ffi_client.FfiClient.instance.off(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
           this.controller.close();
+          if (!this.disposed) {
+            this.disposed = true;
+            this.ffiHandle.dispose();
+          }
           break;
       }
     };
-    const req = new import_video_frame_pb.NewVideoStreamRequest({
-      type: import_video_frame_pb.VideoStreamType.VIDEO_STREAM_NATIVE,
+    const req = new import_rtc_ffi_bindings.NewVideoStreamRequest({
+      type: import_rtc_ffi_bindings.VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle
     });
     const res = import_ffi_client.FfiClient.instance.request({
@@ -71,7 +76,10 @@ class VideoStreamSource {
   }
   cancel() {
     import_ffi_client.FfiClient.instance.off(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
-    this.ffiHandle.dispose();
+    if (!this.disposed) {
+      this.disposed = true;
+      this.ffiHandle.dispose();
+    }
   }
 }
 class VideoStream extends ReadableStream {

package/dist/video_stream.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/video_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { UnderlyingSource } from 'node:stream/web';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { NewVideoStreamResponse, VideoRotation } from './proto/video_frame_pb.js';\nimport { NewVideoStreamRequest, VideoStreamType } from './proto/video_frame_pb.js';\nimport type { Track } from './track.js';\nimport { VideoFrame } from './video_frame.js';\n\nexport type VideoFrameEvent = {\n  frame: VideoFrame;\n  timestampUs: bigint;\n  rotation: VideoRotation;\n};\n\nclass VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {\n  private controller?: ReadableStreamDefaultController<VideoFrameEvent>;\n  private ffiHandle: FfiHandle;\n\n  constructor(track: Track) {\n    const req = new NewVideoStreamRequest({\n      type: VideoStreamType.VIDEO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n    });\n\n    const res = FfiClient.instance.request<NewVideoStreamResponse>({\n      message: {\n        case: 'newVideoStream',\n        value: req,\n      },\n    });\n\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (!this.controller) {\n      throw new Error('Stream controller not initialized');\n    }\n\n    if (\n      ev.message.case != 'videoStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const rotation = streamEvent.value.rotation;\n        const timestampUs = streamEvent.value.timestampUs;\n        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);\n        const value = { rotation, timestampUs, frame };\n        const videoFrameEvent = {\n          frame: value.frame,\n          timestampUs: value.timestampUs!,\n          rotation: value.rotation!,\n        };\n        this.controller.enqueue(videoFrameEvent);\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        this.controller.close();\n        break;\n    }\n  };\n\n  start(controller: ReadableStreamDefaultController<VideoFrameEvent>) {\n    this.controller = controller;\n  }\n\n  cancel() {\n    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n    this.ffiHandle.dispose();\n  }\n}\n\nexport class VideoStream extends ReadableStream<VideoFrameEvent> {\n  constructor(track: Track) {\n    super(new VideoStreamSource(track));\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,wBAAqD;AAErD,4BAAuD;AAEvD,yBAA2B;AAQ3B,MAAM,kBAA+D;AAAA,EAInE,YAAY,OAAc;AAiB1B,SAAQ,UAAU,CAAC,OAAiB;AAClC,UAAI,CAAC,KAAK,YAAY;AACpB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,WAAW,YAAY,MAAM;AACnC,gBAAM,cAAc,YAAY,MAAM;AACtC,gBAAM,QAAQ,8BAAW,cAAc,YAAY,MAAM,MAAO;AAChE,gBAAM,QAAQ,EAAE,UAAU,aAAa,MAAM;AAC7C,gBAAM,kBAAkB;AAAA,YACtB,OAAO,MAAM;AAAA,YACb,aAAa,MAAM;AAAA,YACnB,UAAU,MAAM;AAAA,UAClB;AACA,eAAK,WAAW,QAAQ,eAAe;AACvC;AAAA,QACF,KAAK;AACH,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,eAAK,WAAW,MAAM;AACtB;AAAA,MACJ;AAAA,IACF;AA/CE,UAAM,MAAM,IAAI,4CAAsB;AAAA,MACpC,MAAM,sCAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,IAChC,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAG;AACtD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EAmCA,MAAM,YAA8D;AAClE,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,SAAS;AACP,gCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,SAAK,UAAU,QAAQ;AAAA,EACzB;AACF;AAEO,MAAM,oBAAoB,eAAgC;AAAA,EAC/D,YAAY,OAAc;AACxB,UAAM,IAAI,kBAAkB,KAAK,CAAC;AAAA,EACpC;AACF;","names":[]}
+{"version":3,"sources":["../src/video_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { NewVideoStreamResponse, VideoRotation } from '@livekit/rtc-ffi-bindings';\nimport { NewVideoStreamRequest, VideoStreamType } from '@livekit/rtc-ffi-bindings';\nimport type { UnderlyingSource } from 'node:stream/web';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { Track } from './track.js';\nimport { VideoFrame } from './video_frame.js';\n\nexport type VideoFrameEvent = {\n  frame: VideoFrame;\n  timestampUs: bigint;\n  rotation: VideoRotation;\n};\n\nclass VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {\n  private controller?: ReadableStreamDefaultController<VideoFrameEvent>;\n  private ffiHandle: FfiHandle;\n  private disposed = false;\n\n  constructor(track: Track) {\n    const req = new NewVideoStreamRequest({\n      type: VideoStreamType.VIDEO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n    });\n\n    const res = FfiClient.instance.request<NewVideoStreamResponse>({\n      message: {\n        case: 'newVideoStream',\n        value: req,\n      },\n    });\n\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (!this.controller) {\n      throw new Error('Stream controller not initialized');\n    }\n\n    if (\n      ev.message.case != 'videoStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const rotation = streamEvent.value.rotation;\n        const timestampUs = streamEvent.value.timestampUs;\n        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);\n        const value = { rotation, timestampUs, frame };\n        const videoFrameEvent = {\n          frame: value.frame,\n          timestampUs: value.timestampUs!,\n          rotation: value.rotation!,\n        };\n        this.controller.enqueue(videoFrameEvent);\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        this.controller.close();\n        // Dispose the native handle so the FD is released on stream end,\n        // not just when cancel() is called explicitly by the consumer.\n        // Guard against double-dispose if cancel() is called after EOS\n        // while buffered frames are still in the ReadableStream queue.\n        if (!this.disposed) {\n          this.disposed = true;\n          this.ffiHandle.dispose();\n        }\n        break;\n    }\n  };\n\n  start(controller: ReadableStreamDefaultController<VideoFrameEvent>) {\n    this.controller = controller;\n  }\n\n  cancel() {\n    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n    if (!this.disposed) {\n      this.disposed = true;\n      this.ffiHandle.dispose();\n    }\n  }\n}\n\nexport class VideoStream extends ReadableStream<VideoFrameEvent> {\n  constructor(track: Track) {\n    super(new VideoStreamSource(track));\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIA,8BAAuD;AAGvD,wBAAqD;AAErD,yBAA2B;AAQ3B,MAAM,kBAA+D;AAAA,EAKnE,YAAY,OAAc;AAF1B,SAAQ,WAAW;AAmBnB,SAAQ,UAAU,CAAC,OAAiB;AAClC,UAAI,CAAC,KAAK,YAAY;AACpB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,WAAW,YAAY,MAAM;AACnC,gBAAM,cAAc,YAAY,MAAM;AACtC,gBAAM,QAAQ,8BAAW,cAAc,YAAY,MAAM,MAAO;AAChE,gBAAM,QAAQ,EAAE,UAAU,aAAa,MAAM;AAC7C,gBAAM,kBAAkB;AAAA,YACtB,OAAO,MAAM;AAAA,YACb,aAAa,MAAM;AAAA,YACnB,UAAU,MAAM;AAAA,UAClB;AACA,eAAK,WAAW,QAAQ,eAAe;AACvC;AAAA,QACF,KAAK;AACH,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,eAAK,WAAW,MAAM;AAKtB,cAAI,CAAC,KAAK,UAAU;AAClB,iBAAK,WAAW;AAChB,iBAAK,UAAU,QAAQ;AAAA,UACzB;AACA;AAAA,MACJ;AAAA,IACF;AAvDE,UAAM,MAAM,IAAI,8CAAsB;AAAA,MACpC,MAAM,wCAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,IAChC,CAAC;AAED,UAAM,MAAM,4BAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAG;AACtD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA2CA,MAAM,YAA8D;AAClE,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,SAAS;AACP,gCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,WAAW;AAChB,WAAK,UAAU,QAAQ;AAAA,IACzB;AAAA,EACF;AACF;AAEO,MAAM,oBAAoB,eAAgC;AAAA,EAC/D,YAAY,OAAc;AACxB,UAAM,IAAI,kBAAkB,KAAK,CAAC;AAAA,EACpC;AACF;","names":[]}

package/dist/video_stream.d.cts

@@ -1,23 +1,10 @@
-import { VideoRotation } from './proto/video_frame_pb.cjs';
+import { VideoRotation } from '@livekit/rtc-ffi-bindings';
 import { Track } from './track.cjs';
 import { VideoFrame } from './video_frame.cjs';
-import '@bufbuild/protobuf';
-import './proto/track_pb.cjs';
-import './proto/stats_pb.cjs';
-import './proto/e2ee_pb.cjs';
-import './proto/handle_pb.cjs';
 import './audio_source.cjs';
 import './audio_frame.cjs';
-import './proto/audio_frame_pb.cjs';
-import './napi/native.d.cjs';
 import './ffi_client.cjs';
 import '@livekit/typed-emitter';
-import './proto/ffi_pb.cjs';
-import './proto/room_pb.cjs';
-import './proto/participant_pb.cjs';
-import './proto/data_stream_pb.cjs';
-import './proto/rpc_pb.cjs';
-import './proto/track_publication_pb.cjs';
 import './video_source.cjs';
 
 type VideoFrameEvent = {

package/dist/video_stream.d.ts

@@ -1,23 +1,10 @@
-import { VideoRotation } from './proto/video_frame_pb.js';
+import { VideoRotation } from '@livekit/rtc-ffi-bindings';
 import { Track } from './track.js';
 import { VideoFrame } from './video_frame.js';
-import '@bufbuild/protobuf';
-import './proto/track_pb.js';
-import './proto/stats_pb.js';
-import './proto/e2ee_pb.js';
-import './proto/handle_pb.js';
 import './audio_source.js';
 import './audio_frame.js';
-import './proto/audio_frame_pb.js';
-import './napi/native.d.js';
 import './ffi_client.js';
 import '@livekit/typed-emitter';
-import './proto/ffi_pb.js';
-import './proto/room_pb.js';
-import './proto/participant_pb.js';
-import './proto/data_stream_pb.js';
-import './proto/rpc_pb.js';
-import './proto/track_publication_pb.js';
 import './video_source.js';
 
 type VideoFrameEvent = {

package/dist/video_stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video_stream.d.ts","sourceRoot":"","sources":["../src/video_stream.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAA0B,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAEvF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AAkEF,qBAAa,WAAY,SAAQ,cAAc,CAAC,eAAe,CAAC;gBAClD,KAAK,EAAE,KAAK;CAGzB"}
+{"version":3,"file":"video_stream.d.ts","sourceRoot":"","sources":["../src/video_stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAA0B,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAKvF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,UAAU,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC;AA8EF,qBAAa,WAAY,SAAQ,cAAc,CAAC,eAAe,CAAC;gBAClD,KAAK,EAAE,KAAK;CAGzB"}

package/dist/video_stream.js

@@ -1,8 +1,9 @@
+import { NewVideoStreamRequest, VideoStreamType } from "@livekit/rtc-ffi-bindings";
 import { FfiClient, FfiClientEvent, FfiHandle } from "./ffi_client.js";
-import { NewVideoStreamRequest, VideoStreamType } from "./proto/video_frame_pb.js";
 import { VideoFrame } from "./video_frame.js";
 class VideoStreamSource {
   constructor(track) {
+    this.disposed = false;
     this.onEvent = (ev) => {
       if (!this.controller) {
         throw new Error("Stream controller not initialized");
@@ -27,6 +28,10 @@ class VideoStreamSource {
         case "eos":
           FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
           this.controller.close();
+          if (!this.disposed) {
+            this.disposed = true;
+            this.ffiHandle.dispose();
+          }
           break;
       }
     };
@@ -48,7 +53,10 @@ class VideoStreamSource {
   }
   cancel() {
     FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
-    this.ffiHandle.dispose();
+    if (!this.disposed) {
+      this.disposed = true;
+      this.ffiHandle.dispose();
+    }
   }
 }
 class VideoStream extends ReadableStream {

package/dist/video_stream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/video_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { UnderlyingSource } from 'node:stream/web';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { NewVideoStreamResponse, VideoRotation } from './proto/video_frame_pb.js';\nimport { NewVideoStreamRequest, VideoStreamType } from './proto/video_frame_pb.js';\nimport type { Track } from './track.js';\nimport { VideoFrame } from './video_frame.js';\n\nexport type VideoFrameEvent = {\n  frame: VideoFrame;\n  timestampUs: bigint;\n  rotation: VideoRotation;\n};\n\nclass VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {\n  private controller?: ReadableStreamDefaultController<VideoFrameEvent>;\n  private ffiHandle: FfiHandle;\n\n  constructor(track: Track) {\n    const req = new NewVideoStreamRequest({\n      type: VideoStreamType.VIDEO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n    });\n\n    const res = FfiClient.instance.request<NewVideoStreamResponse>({\n      message: {\n        case: 'newVideoStream',\n        value: req,\n      },\n    });\n\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (!this.controller) {\n      throw new Error('Stream controller not initialized');\n    }\n\n    if (\n      ev.message.case != 'videoStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const rotation = streamEvent.value.rotation;\n        const timestampUs = streamEvent.value.timestampUs;\n        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);\n        const value = { rotation, timestampUs, frame };\n        const videoFrameEvent = {\n          frame: value.frame,\n          timestampUs: value.timestampUs!,\n          rotation: value.rotation!,\n        };\n        this.controller.enqueue(videoFrameEvent);\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        this.controller.close();\n        break;\n    }\n  };\n\n  start(controller: ReadableStreamDefaultController<VideoFrameEvent>) {\n    this.controller = controller;\n  }\n\n  cancel() {\n    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n    this.ffiHandle.dispose();\n  }\n}\n\nexport class VideoStream extends ReadableStream<VideoFrameEvent> {\n  constructor(track: Track) {\n    super(new VideoStreamSource(track));\n  }\n}\n"],"mappings":"AAKA,SAAS,WAAW,gBAAgB,iBAAiB;AAErD,SAAS,uBAAuB,uBAAuB;AAEvD,SAAS,kBAAkB;AAQ3B,MAAM,kBAA+D;AAAA,EAInE,YAAY,OAAc;AAiB1B,SAAQ,UAAU,CAAC,OAAiB;AAClC,UAAI,CAAC,KAAK,YAAY;AACpB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,WAAW,YAAY,MAAM;AACnC,gBAAM,cAAc,YAAY,MAAM;AACtC,gBAAM,QAAQ,WAAW,cAAc,YAAY,MAAM,MAAO;AAChE,gBAAM,QAAQ,EAAE,UAAU,aAAa,MAAM;AAC7C,gBAAM,kBAAkB;AAAA,YACtB,OAAO,MAAM;AAAA,YACb,aAAa,MAAM;AAAA,YACnB,UAAU,MAAM;AAAA,UAClB;AACA,eAAK,WAAW,QAAQ,eAAe;AACvC;AAAA,QACF,KAAK;AACH,oBAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D,eAAK,WAAW,MAAM;AACtB;AAAA,MACJ;AAAA,IACF;AA/CE,UAAM,MAAM,IAAI,sBAAsB;AAAA,MACpC,MAAM,gBAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,IAChC,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AACtD,cAAU,SAAS,GAAG,eAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EAmCA,MAAM,YAA8D;AAClE,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,SAAS;AACP,cAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D,SAAK,UAAU,QAAQ;AAAA,EACzB;AACF;AAEO,MAAM,oBAAoB,eAAgC;AAAA,EAC/D,YAAY,OAAc;AACxB,UAAM,IAAI,kBAAkB,KAAK,CAAC;AAAA,EACpC;AACF;","names":[]}
+{"version":3,"sources":["../src/video_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport type { NewVideoStreamResponse, VideoRotation } from '@livekit/rtc-ffi-bindings';\nimport { NewVideoStreamRequest, VideoStreamType } from '@livekit/rtc-ffi-bindings';\nimport type { UnderlyingSource } from 'node:stream/web';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type { Track } from './track.js';\nimport { VideoFrame } from './video_frame.js';\n\nexport type VideoFrameEvent = {\n  frame: VideoFrame;\n  timestampUs: bigint;\n  rotation: VideoRotation;\n};\n\nclass VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {\n  private controller?: ReadableStreamDefaultController<VideoFrameEvent>;\n  private ffiHandle: FfiHandle;\n  private disposed = false;\n\n  constructor(track: Track) {\n    const req = new NewVideoStreamRequest({\n      type: VideoStreamType.VIDEO_STREAM_NATIVE,\n      trackHandle: track.ffi_handle.handle,\n    });\n\n    const res = FfiClient.instance.request<NewVideoStreamResponse>({\n      message: {\n        case: 'newVideoStream',\n        value: req,\n      },\n    });\n\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\n    if (!this.controller) {\n      throw new Error('Stream controller not initialized');\n    }\n\n    if (\n      ev.message.case != 'videoStreamEvent' ||\n      ev.message.value.streamHandle != this.ffiHandle.handle\n    ) {\n      return;\n    }\n\n    const streamEvent = ev.message.value.message;\n    switch (streamEvent.case) {\n      case 'frameReceived':\n        const rotation = streamEvent.value.rotation;\n        const timestampUs = streamEvent.value.timestampUs;\n        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);\n        const value = { rotation, timestampUs, frame };\n        const videoFrameEvent = {\n          frame: value.frame,\n          timestampUs: value.timestampUs!,\n          rotation: value.rotation!,\n        };\n        this.controller.enqueue(videoFrameEvent);\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        this.controller.close();\n        // Dispose the native handle so the FD is released on stream end,\n        // not just when cancel() is called explicitly by the consumer.\n        // Guard against double-dispose if cancel() is called after EOS\n        // while buffered frames are still in the ReadableStream queue.\n        if (!this.disposed) {\n          this.disposed = true;\n          this.ffiHandle.dispose();\n        }\n        break;\n    }\n  };\n\n  start(controller: ReadableStreamDefaultController<VideoFrameEvent>) {\n    this.controller = controller;\n  }\n\n  cancel() {\n    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n    if (!this.disposed) {\n      this.disposed = true;\n      this.ffiHandle.dispose();\n    }\n  }\n}\n\nexport class VideoStream extends ReadableStream<VideoFrameEvent> {\n  constructor(track: Track) {\n    super(new VideoStreamSource(track));\n  }\n}\n"],"mappings":"AAIA,SAAS,uBAAuB,uBAAuB;AAGvD,SAAS,WAAW,gBAAgB,iBAAiB;AAErD,SAAS,kBAAkB;AAQ3B,MAAM,kBAA+D;AAAA,EAKnE,YAAY,OAAc;AAF1B,SAAQ,WAAW;AAmBnB,SAAQ,UAAU,CAAC,OAAiB;AAClC,UAAI,CAAC,KAAK,YAAY;AACpB,cAAM,IAAI,MAAM,mCAAmC;AAAA,MACrD;AAEA,UACE,GAAG,QAAQ,QAAQ,sBACnB,GAAG,QAAQ,MAAM,gBAAgB,KAAK,UAAU,QAChD;AACA;AAAA,MACF;AAEA,YAAM,cAAc,GAAG,QAAQ,MAAM;AACrC,cAAQ,YAAY,MAAM;AAAA,QACxB,KAAK;AACH,gBAAM,WAAW,YAAY,MAAM;AACnC,gBAAM,cAAc,YAAY,MAAM;AACtC,gBAAM,QAAQ,WAAW,cAAc,YAAY,MAAM,MAAO;AAChE,gBAAM,QAAQ,EAAE,UAAU,aAAa,MAAM;AAC7C,gBAAM,kBAAkB;AAAA,YACtB,OAAO,MAAM;AAAA,YACb,aAAa,MAAM;AAAA,YACnB,UAAU,MAAM;AAAA,UAClB;AACA,eAAK,WAAW,QAAQ,eAAe;AACvC;AAAA,QACF,KAAK;AACH,oBAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D,eAAK,WAAW,MAAM;AAKtB,cAAI,CAAC,KAAK,UAAU;AAClB,iBAAK,WAAW;AAChB,iBAAK,UAAU,QAAQ;AAAA,UACzB;AACA;AAAA,MACJ;AAAA,IACF;AAvDE,UAAM,MAAM,IAAI,sBAAsB;AAAA,MACpC,MAAM,gBAAgB;AAAA,MACtB,aAAa,MAAM,WAAW;AAAA,IAChC,CAAC;AAED,UAAM,MAAM,UAAU,SAAS,QAAgC;AAAA,MAC7D,SAAS;AAAA,QACP,MAAM;AAAA,QACN,OAAO;AAAA,MACT;AAAA,IACF,CAAC;AAED,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AACtD,cAAU,SAAS,GAAG,eAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA2CA,MAAM,YAA8D;AAClE,SAAK,aAAa;AAAA,EACpB;AAAA,EAEA,SAAS;AACP,cAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D,QAAI,CAAC,KAAK,UAAU;AAClB,WAAK,WAAW;AAChB,WAAK,UAAU,QAAQ;AAAA,IACzB;AAAA,EACF;AACF;AAEO,MAAM,oBAAoB,eAAgC;AAAA,EAC/D,YAAY,OAAc;AACxB,UAAM,IAAI,kBAAkB,KAAK,CAAC;AAAA,EACpC;AACF;","names":[]}

package/package.json

@@ -3,7 +3,7 @@
   "description": "LiveKit RTC Node",
   "license": "Apache-2.0",
   "author": "LiveKit",
-  "version": "0.13.24",
+  "version": "0.13.25",
   "main": "dist/index.js",
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
@@ -27,62 +27,32 @@
   },
   "files": [
     "dist",
-    "src",
-    "build.rs",
-    "Cargo.toml",
-    "Cargo.lock"
+    "src"
   ],
-  "napi": {
-    "name": "rtc-node",
-    "triples": {
-      "defaults": false,
-      "additional": [
-        "aarch64-apple-darwin",
-        "x86_64-apple-darwin",
-        "aarch64-unknown-linux-gnu",
-        "x86_64-unknown-linux-gnu",
-        "x86_64-pc-windows-msvc"
-      ]
-    }
-  },
   "dependencies": {
-    "@bufbuild/protobuf": "^1.10.1",
     "@datastructures-js/deque": "1.0.8",
     "@livekit/mutex": "^1.0.0",
     "@livekit/typed-emitter": "^3.0.0",
+    "@livekit/rtc-ffi-bindings": "0.12.52-patch.0",
     "pino": "^9.0.0",
     "pino-pretty": "^13.0.0"
   },
   "devDependencies": {
-    "@bufbuild/protoc-gen-es": "^1.10.1",
-    "@napi-rs/cli": "^2.18.0",
+    "@bufbuild/protobuf": "^1.10.1",
     "@types/node": "^22.13.10",
     "vitest": "^3.0.0",
     "prettier": "^3.0.3",
     "tsup": "^8.3.5",
     "typescript": "5.8.2",
-    "livekit-server-sdk": "2.15.0"
-  },
-  "optionalDependencies": {
-    "@livekit/rtc-node-darwin-x64": "0.13.24",
-    "@livekit/rtc-node-darwin-arm64": "0.13.24",
-    "@livekit/rtc-node-linux-x64-gnu": "0.13.24",
-    "@livekit/rtc-node-linux-arm64-gnu": "0.13.24",
-    "@livekit/rtc-node-win32-x64-msvc": "0.13.24"
+    "livekit-server-sdk": "2.15.1"
   },
   "engines": {
     "node": ">= 18"
   },
   "scripts": {
     "prebuild": "node -p \"'export const SDK_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
-    "build:ts": "pnpm prebuild && tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\" && cp -r src/napi dist/ && cp -r src/napi/* dist/",
-    "build": "pnpm build:ts && napi build --platform --release --dts native.d.ts --js native.cjs --pipe \"prettier -w\" src/napi",
-    "artifacts": "pnpm build:ts && napi artifacts",
-    "build:debug": "napi build --platform",
+    "build": "pnpm prebuild && tsup --onSuccess \"tsc --declaration --emitDeclarationOnly\"",
     "lint": "eslint -f unix \"src/**/*.ts\" --ignore-pattern \"src/proto/*\"",
-    "test": "vitest run",
-    "test:e2e": "vitest run src/tests/e2e.test.ts",
-    "universal": "napi universal",
-    "version": "napi version"
+    "test": "vitest run src"
   }
 }

package/src/audio_filter.ts

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import type { LoadAudioFilterPluginResponse } from '@livekit/rtc-ffi-bindings';
+import { LoadAudioFilterPluginRequest } from '@livekit/rtc-ffi-bindings';
 import { FfiClient } from './ffi_client.js';
-import type { LoadAudioFilterPluginResponse } from './proto/audio_frame_pb.js';
-import { LoadAudioFilterPluginRequest } from './proto/audio_frame_pb.js';
 
 export class AudioFilter {
   constructor(moduleId: string, path: string, dependencies: string[] = []) {

package/src/audio_frame.ts

@@ -1,9 +1,9 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import type { OwnedAudioFrameBuffer } from '@livekit/rtc-ffi-bindings';
+import { AudioFrameBufferInfo } from '@livekit/rtc-ffi-bindings';
 import { FfiClient, FfiHandle } from './ffi_client.js';
-import type { OwnedAudioFrameBuffer } from './proto/audio_frame_pb.js';
-import { AudioFrameBufferInfo } from './proto/audio_frame_pb.js';
 
 export class AudioFrame {
   data: Int16Array;
@@ -32,9 +32,14 @@ export class AudioFrame {
     this._userdata = userdata;
   }
 
-  static create(sampleRate: number, channels: number, samplesPerChannel: number): AudioFrame {
+  static create(
+    sampleRate: number,
+    channels: number,
+    samplesPerChannel: number,
+    userdata?: Record<string, unknown>,
+  ): AudioFrame {
     const data = new Int16Array(channels * samplesPerChannel);
-    return new AudioFrame(data, sampleRate, channels, samplesPerChannel);
+    return new AudioFrame(data, sampleRate, channels, samplesPerChannel, userdata);
   }
 
   /** @internal */
@@ -103,5 +108,12 @@ export const combineAudioFrames = (buffer: AudioFrame | AudioFrame[]): AudioFram
   }
 
   const data = new Int16Array(buffer.map((x) => [...x.data]).flat());
-  return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel);
+
+  // Merge userdata from all frames
+  const mergedUserdata: Record<string, unknown> = {};
+  for (const frame of buffer) {
+    Object.assign(mergedUserdata, frame.userdata);
+  }
+
+  return new AudioFrame(data, sampleRate, channels, totalSamplesPerChannel, mergedUserdata);
 };

package/src/audio_mixer.ts

@@ -239,7 +239,7 @@ export class AudioMixer {
 
       for (const result of results) {
         if (result.status !== 'fulfilled') {
-          log.warn('AudioMixer: Stream contribution failed:', result.reason);
+          log.warn({ reason: result.reason }, 'AudioMixer: Stream contribution failed');
           continue;
         }
 

package/src/audio_resampler.ts

@@ -1,20 +1,20 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { AudioFrame } from './audio_frame.js';
-import { FfiClient, FfiHandle } from './ffi_client.js';
 import type {
   FlushSoxResamplerResponse,
   NewSoxResamplerResponse,
   PushSoxResamplerResponse,
-} from './proto/audio_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   FlushSoxResamplerRequest,
   NewSoxResamplerRequest,
   PushSoxResamplerRequest,
   SoxQualityRecipe,
   SoxResamplerDataType,
-} from './proto/audio_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { AudioFrame } from './audio_frame.js';
+import { FfiClient, FfiHandle } from './ffi_client.js';
 
 /**
  * Resampler quality. Higher quality settings result in better audio quality but require more
@@ -97,6 +97,14 @@ export class AudioResampler {
     return this.#channels;
   }
 
+  /**
+   * Releases the underlying native resampler handle. Must be called when
+   * the resampler is no longer needed to avoid leaking the FD.
+   */
+  close() {
+    this.#ffiHandle.dispose();
+  }
+
   /**
    * Push audio data into the resampler and retrieve any available resampled data.
    *
@@ -131,12 +139,14 @@ export class AudioResampler {
     }
 
     const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size!);
+
     return [
       new AudioFrame(
         new Int16Array(outputData.buffer),
         this.#outputRate,
         this.#channels,
         Math.trunc(outputData.length / this.#channels / 2),
+        data.userdata,
       ),
     ];
   }

package/src/audio_source.ts

@@ -1,22 +1,22 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { AudioFrame } from './audio_frame.js';
-import { FfiClient } from './ffi_client.js';
-import { FfiHandle } from './napi/native.js';
 import type {
   AudioSourceInfo,
   CaptureAudioFrameCallback,
   CaptureAudioFrameResponse,
   ClearAudioBufferResponse,
   NewAudioSourceResponse,
-} from './proto/audio_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   AudioSourceType,
   CaptureAudioFrameRequest,
   ClearAudioBufferRequest,
+  FfiHandle,
   NewAudioSourceRequest,
-} from './proto/audio_frame_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import type { AudioFrame } from './audio_frame.js';
+import { FfiClient } from './ffi_client.js';
 
 export class AudioSource {
   /** @internal */
@@ -145,6 +145,14 @@ export class AudioSource {
   }
 
   async close() {
+    // Clear any pending playout timeout so its callback doesn't fire after
+    // the handle is disposed, which would reference freed native state.
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+      this.timeout = undefined;
+    }
+    // Resolve any pending waitForPlayout() promise so callers don't hang.
+    this.release();
     this.ffiHandle.dispose();
     this.closed = true;
   }

package/src/audio_stream.ts

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import type { NewAudioStreamResponse } from '@livekit/rtc-ffi-bindings';
+import { AudioStreamType, NewAudioStreamRequest } from '@livekit/rtc-ffi-bindings';
 import type { UnderlyingSource } from 'node:stream/web';
 import { AudioFrame } from './audio_frame.js';
 import type { FfiEvent } from './ffi_client.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
-import { FrameProcessor } from './frame_processor.js';
+import { type FrameProcessor, isFrameProcessor } from './frame_processor.js';
 import { log } from './log.js';
-import type { NewAudioStreamResponse } from './proto/audio_frame_pb.js';
-import { AudioStreamType, NewAudioStreamRequest } from './proto/audio_frame_pb.js';
 import type { Track } from './track.js';
 
 export interface AudioStreamOptions {
@@ -27,6 +27,7 @@ export interface NoiseCancellationOptions {
 class AudioStreamSource implements UnderlyingSource<AudioFrame> {
   private controller?: ReadableStreamDefaultController<AudioFrame>;
   private ffiHandle: FfiHandle;
+  private disposed = false;
   private sampleRate: number;
   private numChannels: number;
   private legacyNcOptions?: NoiseCancellationOptions;
@@ -41,7 +42,7 @@ class AudioStreamSource implements UnderlyingSource<AudioFrame> {
     if (sampleRateOrOptions !== undefined && typeof sampleRateOrOptions !== 'number') {
       this.sampleRate = sampleRateOrOptions.sampleRate ?? 48000;
       this.numChannels = sampleRateOrOptions.numChannels ?? 1;
-      if (sampleRateOrOptions.noiseCancellation instanceof FrameProcessor) {
+      if (isFrameProcessor(sampleRateOrOptions.noiseCancellation)) {
         this.frameProcessor = sampleRateOrOptions.noiseCancellation;
       } else {
         this.legacyNcOptions = sampleRateOrOptions.noiseCancellation;
@@ -106,7 +107,15 @@ class AudioStreamSource implements UnderlyingSource<AudioFrame> {
       case 'eos':
         FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
         this.controller.close();
-        this.frameProcessor?.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();
+          this.frameProcessor?.close();
+        }
         break;
     }
   };
@@ -117,7 +126,13 @@ class AudioStreamSource implements UnderlyingSource<AudioFrame> {
 
   cancel() {
     FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
-    this.ffiHandle.dispose();
+    if (!this.disposed) {
+      this.disposed = true;
+      this.ffiHandle.dispose();
+      // Also close the frame processor on cancel for symmetry with the EOS path,
+      // so resources are released regardless of how the stream ends.
+      this.frameProcessor?.close();
+    }
   }
 }
 

package/src/data_streams/stream_reader.ts

@@ -1,8 +1,8 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import type { DataStream_Chunk } from '@livekit/rtc-ffi-bindings';
 import { log } from '../log.js';
-import type { DataStream_Chunk } from '../proto/room_pb.js';
 import { bigIntToNumber } from '../utils.js';
 import type { BaseStreamInfo, ByteStreamInfo, TextStreamInfo } from './types.js';
 
@@ -53,12 +53,18 @@ export class ByteStreamReader extends BaseStreamReader<ByteStreamInfo> {
         try {
           const { done, value } = await reader.read();
           if (done) {
+            // Release the lock when the stream is exhausted so the
+            // underlying ReadableStream can be garbage-collected.
+            reader.releaseLock();
             return { done: true, value: undefined as unknown };
           } else {
             this.handleChunkReceived(value);
             return { done: false, value: value.content! };
           }
         } catch (error: unknown) {
+          // Release the lock on error so it doesn't stay held when the
+          // consumer never calls return() (e.g. breaking out of for-await).
+          reader.releaseLock();
           log.error('error processing stream update: %s', error);
           return { done: true, value: undefined as unknown };
         }
@@ -121,12 +127,18 @@ export class TextStreamReader extends BaseStreamReader<TextStreamInfo> {
   [Symbol.asyncIterator]() {
     const reader = this.reader.getReader();
     const decoder = new TextDecoder();
+    const receivedChunks = this.receivedChunks;
 
     return {
       next: async (): Promise<IteratorResult<string>> => {
         try {
           const { done, value } = await reader.read();
           if (done) {
+            // Release the lock when the stream is exhausted so the
+            // underlying ReadableStream can be garbage-collected.
+            reader.releaseLock();
+            // Clear received chunks so the buffered data can be GC'd.
+            receivedChunks.clear();
             return { done: true, value: undefined };
           } else {
             this.handleChunkReceived(value);
@@ -136,6 +148,10 @@ export class TextStreamReader extends BaseStreamReader<TextStreamInfo> {
             };
           }
         } catch (error: unknown) {
+          // Release the lock on error so it doesn't stay held when the
+          // consumer never calls return() (e.g. breaking out of for-await).
+          reader.releaseLock();
+          receivedChunks.clear();
           log.error('error processing stream update: %s', error);
           return { done: true, value: undefined };
         }
@@ -143,6 +159,8 @@ export class TextStreamReader extends BaseStreamReader<TextStreamInfo> {
 
       return(): IteratorResult<string> {
         reader.releaseLock();
+        // Clear received chunks so the buffered data can be GC'd.
+        receivedChunks.clear();
         return { done: true, value: undefined };
       },
     };

package/src/data_streams/types.ts

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { DataStream_Chunk, DataStream_Header } from '../proto/room_pb.js';
+import type { DataStream_Chunk, DataStream_Header } from '@livekit/rtc-ffi-bindings';
 import type { ByteStreamReader, TextStreamReader } from './stream_reader.js';
 
 export interface StreamController<T extends DataStream_Chunk> {

package/src/e2ee.ts

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { FfiClient } from './ffi_client.js';
 import type {
   E2eeManagerGetFrameCryptorsResponse,
   E2eeResponse,
@@ -9,7 +8,7 @@ import type {
   GetSharedKeyResponse,
   RatchetKeyResponse,
   RatchetSharedKeyResponse,
-} from './proto/e2ee_pb.js';
+} from '@livekit/rtc-ffi-bindings';
 import {
   E2eeManagerSetEnabledRequest,
   E2eeRequest,
@@ -22,7 +21,8 @@ import {
   RatchetSharedKeyRequest,
   SetKeyRequest,
   SetSharedKeyRequest,
-} from './proto/e2ee_pb.js';
+} from '@livekit/rtc-ffi-bindings';
+import { FfiClient } from './ffi_client.js';
 
 const DEFAULT_RATCHET_SALT = new TextEncoder().encode('LKFrameEncryptionKey');
 const DEFAULT_RATCHET_WINDOW_SIZE = 16;