@livekit/rtc-node 0.13.11 → 0.13.13

package/dist/video_stream.d.cts

@@ -1,6 +1,5 @@
-import { Mutex } from '@livekit/mutex';
-import { FfiHandle } from './napi/native.d.cjs';
-import { VideoRotation, VideoStreamInfo } from './proto/video_frame_pb.cjs';
+import { ReadableStream } from 'node:stream/web';
+import { VideoRotation } from './proto/video_frame_pb.cjs';
 import { Track } from './track.cjs';
 import { VideoFrame } from './video_frame.cjs';
 import '@bufbuild/protobuf';
@@ -11,6 +10,7 @@ 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 './video_source.cjs';
 
 type VideoFrameEvent = {
@@ -18,23 +18,8 @@ type VideoFrameEvent = {
     timestampUs: bigint;
     rotation: VideoRotation;
 };
-declare class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
-    /** @internal */
-    info?: VideoStreamInfo;
-    /** @internal */
-    ffiHandle: FfiHandle;
-    /** @internal */
-    eventQueue: (VideoFrameEvent | null)[];
-    /** @internal */
-    queueResolve: ((value: IteratorResult<VideoFrameEvent>) => void) | null;
-    /** @internal */
-    mutex: Mutex;
-    track: Track;
+declare class VideoStream extends ReadableStream<VideoFrameEvent> {
     constructor(track: Track);
-    private onEvent;
-    next(): Promise<IteratorResult<VideoFrameEvent>>;
-    close(): void;
-    [Symbol.asyncIterator](): VideoStream;
 }
 
 export { type VideoFrameEvent, VideoStream };

package/dist/video_stream.d.ts

@@ -1,6 +1,5 @@
-import { Mutex } from '@livekit/mutex';
-import { FfiHandle } from './napi/native.d.js';
-import { VideoRotation, VideoStreamInfo } from './proto/video_frame_pb.js';
+import { ReadableStream } from 'node:stream/web';
+import { VideoRotation } from './proto/video_frame_pb.js';
 import { Track } from './track.js';
 import { VideoFrame } from './video_frame.js';
 import '@bufbuild/protobuf';
@@ -11,6 +10,7 @@ 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 './video_source.js';
 
 type VideoFrameEvent = {
@@ -18,23 +18,8 @@ type VideoFrameEvent = {
     timestampUs: bigint;
     rotation: VideoRotation;
 };
-declare class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
-    /** @internal */
-    info?: VideoStreamInfo;
-    /** @internal */
-    ffiHandle: FfiHandle;
-    /** @internal */
-    eventQueue: (VideoFrameEvent | null)[];
-    /** @internal */
-    queueResolve: ((value: IteratorResult<VideoFrameEvent>) => void) | null;
-    /** @internal */
-    mutex: Mutex;
-    track: Track;
+declare class VideoStream extends ReadableStream<VideoFrameEvent> {
     constructor(track: Track);
-    private onEvent;
-    next(): Promise<IteratorResult<VideoFrameEvent>>;
-    close(): void;
-    [Symbol.asyncIterator](): VideoStream;
 }
 
 export { type VideoFrameEvent, VideoStream };

package/dist/video_stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video_stream.d.ts","sourceRoot":"","sources":["../src/video_stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAA6B,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAEV,aAAa,EACb,eAAe,EAChB,MAAM,2BAA2B,CAAC;AAEnC,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;AAEF,qBAAa,WAAY,YAAW,qBAAqB,CAAC,eAAe,CAAC;IACxE,gBAAgB;IAChB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,gBAAgB;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB;IAChB,UAAU,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC,EAAE,CAAM;IAC5C,gBAAgB;IAChB,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,cAAc,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,CAAQ;IAC/E,gBAAgB;IAChB,KAAK,QAAe;IAEpB,KAAK,EAAE,KAAK,CAAC;gBAED,KAAK,EAAE,KAAK;IAqBxB,OAAO,CAAC,OAAO,CAqCb;IAEI,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAkBtD,KAAK;IAKL,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW;CAGtC"}
+{"version":3,"file":"video_stream.d.ts","sourceRoot":"","sources":["../src/video_stream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAyB,MAAM,iBAAiB,CAAC;AAGxE,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"}

package/dist/video_stream.js

@@ -1,16 +1,13 @@
-import { Mutex } from "@livekit/mutex";
+import { ReadableStream } from "node:stream/web";
 import { FfiClient, FfiClientEvent, FfiHandle } from "./ffi_client.js";
 import { NewVideoStreamRequest, VideoStreamType } from "./proto/video_frame_pb.js";
 import { VideoFrame } from "./video_frame.js";
-class VideoStream {
+class VideoStreamSource {
   constructor(track) {
-    /** @internal */
-    this.eventQueue = [];
-    /** @internal */
-    this.queueResolve = null;
-    /** @internal */
-    this.mutex = new Mutex();
     this.onEvent = (ev) => {
+      if (!this.controller) {
+        throw new Error("Stream controller not initialized");
+      }
       if (ev.message.case != "videoStreamEvent" || ev.message.value.streamHandle != this.ffiHandle.handle) {
         return;
       }
@@ -21,31 +18,19 @@ class VideoStream {
           const timestampUs = streamEvent.value.timestampUs;
           const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer);
           const value = { rotation, timestampUs, frame };
-          if (this.queueResolve) {
-            this.queueResolve({
-              done: false,
-              value: {
-                frame: value.frame,
-                timestampUs: value.timestampUs,
-                rotation: value.rotation
-              }
-            });
-            this.queueResolve = null;
-          } else {
-            this.eventQueue.push({
-              frame: value.frame,
-              timestampUs: value.timestampUs,
-              rotation: value.rotation
-            });
-          }
+          const videoFrameEvent = {
+            frame: value.frame,
+            timestampUs: value.timestampUs,
+            rotation: value.rotation
+          };
+          this.controller.enqueue(videoFrameEvent);
           break;
         case "eos":
           FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
+          this.controller.close();
           break;
       }
     };
-    var _a;
-    this.track = track;
     const req = new NewVideoStreamRequest({
       type: VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle
@@ -56,33 +41,20 @@ class VideoStream {
         value: req
       }
     });
-    this.info = (_a = res.stream) == null ? void 0 : _a.info;
     this.ffiHandle = new FfiHandle(res.stream.handle.id);
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }
-  async next() {
-    const unlock = await this.mutex.lock();
-    if (this.eventQueue.length > 0) {
-      unlock();
-      const value = this.eventQueue.shift();
-      if (value) {
-        return { done: false, value };
-      } else {
-        return { done: true, value: void 0 };
-      }
-    }
-    const promise = new Promise(
-      (resolve) => this.queueResolve = resolve
-    );
-    unlock();
-    return promise;
+  start(controller) {
+    this.controller = controller;
   }
-  close() {
-    this.eventQueue.push(null);
+  cancel() {
+    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
     this.ffiHandle.dispose();
   }
-  [Symbol.asyncIterator]() {
-    return this;
+}
+class VideoStream extends ReadableStream {
+  constructor(track) {
+    super(new VideoStreamSource(track));
   }
 }
 export {

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 { Mutex } from '@livekit/mutex';\nimport type { FfiEvent } from './ffi_client.js';\nimport { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';\nimport type {\n  NewVideoStreamResponse,\n  VideoRotation,\n  VideoStreamInfo,\n} 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\nexport class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {\n  /** @internal */\n  info?: VideoStreamInfo;\n  /** @internal */\n  ffiHandle: FfiHandle;\n  /** @internal */\n  eventQueue: (VideoFrameEvent | null)[] = [];\n  /** @internal */\n  queueResolve: ((value: IteratorResult<VideoFrameEvent>) => void) | null = null;\n  /** @internal */\n  mutex = new Mutex();\n\n  track: Track;\n\n  constructor(track: Track) {\n    this.track = track;\n\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.info = res.stream?.info;\n    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);\n\n    FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);\n  }\n\n  private onEvent = (ev: FfiEvent) => {\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        if (this.queueResolve) {\n          this.queueResolve({\n            done: false,\n            value: {\n              frame: value.frame,\n              timestampUs: value.timestampUs!,\n              rotation: value.rotation!,\n            },\n          });\n          this.queueResolve = null;\n        } else {\n          this.eventQueue.push({\n            frame: value.frame,\n            timestampUs: value.timestampUs!,\n            rotation: value.rotation!,\n          });\n        }\n        break;\n      case 'eos':\n        FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);\n        break;\n    }\n  };\n\n  async next(): Promise<IteratorResult<VideoFrameEvent>> {\n    const unlock = await this.mutex.lock();\n    if (this.eventQueue.length > 0) {\n      unlock();\n      const value = this.eventQueue.shift();\n      if (value) {\n        return { done: false, value };\n      } else {\n        return { done: true, value: undefined };\n      }\n    }\n    const promise = new Promise<IteratorResult<VideoFrameEvent>>(\n      (resolve) => (this.queueResolve = resolve),\n    );\n    unlock();\n    return promise;\n  }\n\n  close() {\n    this.eventQueue.push(null);\n    this.ffiHandle.dispose();\n  }\n\n  [Symbol.asyncIterator](): VideoStream {\n    return this;\n  }\n}\n"],"mappings":"AAGA,SAAS,aAAa;AAEtB,SAAS,WAAW,gBAAgB,iBAAiB;AAMrD,SAAS,uBAAuB,uBAAuB;AAEvD,SAAS,kBAAkB;AAQpB,MAAM,YAA8D;AAAA,EAczE,YAAY,OAAc;AAR1B;AAAA,sBAAyC,CAAC;AAE1C;AAAA,wBAA0E;AAE1E;AAAA,iBAAQ,IAAI,MAAM;AAyBlB,SAAQ,UAAU,CAAC,OAAiB;AAClC,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,cAAI,KAAK,cAAc;AACrB,iBAAK,aAAa;AAAA,cAChB,MAAM;AAAA,cACN,OAAO;AAAA,gBACL,OAAO,MAAM;AAAA,gBACb,aAAa,MAAM;AAAA,gBACnB,UAAU,MAAM;AAAA,cAClB;AAAA,YACF,CAAC;AACD,iBAAK,eAAe;AAAA,UACtB,OAAO;AACL,iBAAK,WAAW,KAAK;AAAA,cACnB,OAAO,MAAM;AAAA,cACb,aAAa,MAAM;AAAA,cACnB,UAAU,MAAM;AAAA,YAClB,CAAC;AAAA,UACH;AACA;AAAA,QACF,KAAK;AACH,oBAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D;AAAA,MACJ;AAAA,IACF;AA7FF;AAoCI,SAAK,QAAQ;AAEb,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,QAAO,SAAI,WAAJ,mBAAY;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAG;AAEtD,cAAU,SAAS,GAAG,eAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EAyCA,MAAM,OAAiD;AACrD,UAAM,SAAS,MAAM,KAAK,MAAM,KAAK;AACrC,QAAI,KAAK,WAAW,SAAS,GAAG;AAC9B,aAAO;AACP,YAAM,QAAQ,KAAK,WAAW,MAAM;AACpC,UAAI,OAAO;AACT,eAAO,EAAE,MAAM,OAAO,MAAM;AAAA,MAC9B,OAAO;AACL,eAAO,EAAE,MAAM,MAAM,OAAO,OAAU;AAAA,MACxC;AAAA,IACF;AACA,UAAM,UAAU,IAAI;AAAA,MAClB,CAAC,YAAa,KAAK,eAAe;AAAA,IACpC;AACA,WAAO;AACP,WAAO;AAAA,EACT;AAAA,EAEA,QAAQ;AACN,SAAK,WAAW,KAAK,IAAI;AACzB,SAAK,UAAU,QAAQ;AAAA,EACzB;AAAA,EAEA,CAAC,OAAO,aAAa,IAAiB;AACpC,WAAO;AAAA,EACT;AACF;","names":[]}
+{"version":3,"sources":["../src/video_stream.ts"],"sourcesContent":["// SPDX-FileCopyrightText: 2024 LiveKit, Inc.\n//\n// SPDX-License-Identifier: Apache-2.0\nimport { ReadableStream, 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":"AAGA,SAAS,sBAA6C;AAEtD,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":[]}

package/package.json

@@ -3,7 +3,7 @@
   "description": "LiveKit RTC Node",
   "license": "Apache-2.0",
   "author": "LiveKit",
-  "version": "0.13.11",
+  "version": "0.13.13",
   "main": "dist/index.js",
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
@@ -61,11 +61,11 @@
     "@bufbuild/protoc-gen-es": "^1.10.0"
   },
   "optionalDependencies": {
-    "@livekit/rtc-node-darwin-arm64": "0.13.11",
-    "@livekit/rtc-node-darwin-x64": "0.13.11",
-    "@livekit/rtc-node-linux-arm64-gnu": "0.13.11",
-    "@livekit/rtc-node-linux-x64-gnu": "0.13.11",
-    "@livekit/rtc-node-win32-x64-msvc": "0.13.11"
+    "@livekit/rtc-node-darwin-arm64": "0.13.13",
+    "@livekit/rtc-node-darwin-x64": "0.13.13",
+    "@livekit/rtc-node-linux-arm64-gnu": "0.13.13",
+    "@livekit/rtc-node-linux-x64-gnu": "0.13.13",
+    "@livekit/rtc-node-win32-x64-msvc": "0.13.13"
   },
   "engines": {
     "node": ">= 18"

package/src/audio_filter.ts

@@ -2,10 +2,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 import { FfiClient } from './ffi_client.js';
-import {
-  LoadAudioFilterPluginRequest,
-  LoadAudioFilterPluginResponse,
-} from './proto/audio_frame_pb.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_source.ts

@@ -99,6 +99,7 @@ export class AudioSource {
       this.lastCapture = 0;
       this.currentQueueSize = 0;
       this.promise = this.newPromise();
+      this.timeout = undefined;
     });
   }
 
@@ -106,6 +107,11 @@ export class AudioSource {
     if (this.closed) {
       throw new Error('AudioSource is closed');
     }
+
+    if (frame.samplesPerChannel === 0) {
+      return;
+    }
+
     const now = Number(process.hrtime.bigint() / BigInt(1000000));
     const elapsed = this.lastCapture === 0 ? 0 : now - this.lastCapture;
     const frameDurationMs = (frame.samplesPerChannel / frame.sampleRate) * 1000;
@@ -117,9 +123,7 @@ export class AudioSource {
       clearTimeout(this.timeout);
     }
 
-    // remove 50ms to account for processing time
-    // (e.g. using wait_for_playout for very small chunks)
-    this.timeout = setTimeout(this.release, this.currentQueueSize - 50);
+    this.timeout = setTimeout(this.release, this.currentQueueSize);
 
     const req = new CaptureAudioFrameRequest({
       sourceHandle: this.ffiHandle.handle,

package/src/audio_stream.ts

@@ -1,11 +1,11 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Mutex } from '@livekit/mutex';
+import { ReadableStream, 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 type { AudioStreamInfo, NewAudioStreamResponse } from './proto/audio_frame_pb.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';
 
@@ -20,34 +20,18 @@ export interface NoiseCancellationOptions {
   options: Record<string, any>;
 }
 
-export class AudioStream implements AsyncIterableIterator<AudioFrame> {
-  /** @internal */
-  info: AudioStreamInfo;
-  /** @internal */
-  ffiHandle: FfiHandle;
-  /** @internal */
-  eventQueue: (AudioFrame | null)[] = [];
-  /** @internal */
-  queueResolve: ((value: IteratorResult<AudioFrame>) => void) | null = null;
-  /** @internal */
-  mutex = new Mutex();
-
-  track: Track;
-  sampleRate: number;
-  numChannels: number;
-  ncOptions?: NoiseCancellationOptions;
-
-  constructor(track: Track);
-  constructor(track: Track, sampleRate: number);
-  constructor(track: Track, sampleRate: number, numChannels: number);
-  constructor(track: Track, options: AudioStreamOptions);
+class AudioStreamSource implements UnderlyingSource<AudioFrame> {
+  private controller?: ReadableStreamDefaultController<AudioFrame>;
+  private ffiHandle: FfiHandle;
+  private sampleRate: number;
+  private numChannels: number;
+  private ncOptions?: NoiseCancellationOptions;
 
   constructor(
     track: Track,
     sampleRateOrOptions?: number | AudioStreamOptions,
     numChannels?: number,
   ) {
-    this.track = track;
     if (sampleRateOrOptions !== undefined && typeof sampleRateOrOptions !== 'number') {
       this.sampleRate = sampleRateOrOptions.sampleRate ?? 48000;
       this.numChannels = sampleRateOrOptions.numChannels ?? 1;
@@ -77,13 +61,16 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
       },
     });
 
-    this.info = res.stream!.info!;
     this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);
 
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }
 
   private onEvent = (ev: FfiEvent) => {
+    if (!this.controller) {
+      throw new Error('Stream controller not initialized');
+    }
+
     if (
       ev.message.case != 'audioStreamEvent' ||
       ev.message.value.streamHandle != this.ffiHandle.handle
@@ -95,43 +82,35 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
     switch (streamEvent.case) {
       case 'frameReceived':
         const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame!);
-        if (this.queueResolve) {
-          this.queueResolve({ done: false, value: frame });
-          this.queueResolve = null;
-        } else {
-          this.eventQueue.push(frame);
-        }
+        this.controller.enqueue(frame);
         break;
       case 'eos':
         FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
+        this.controller.close();
         break;
     }
   };
 
-  async next(): Promise<IteratorResult<AudioFrame>> {
-    const unlock = await this.mutex.lock();
-    if (this.eventQueue.length > 0) {
-      unlock();
-      const value = this.eventQueue.shift();
-      if (value) {
-        return { done: false, value };
-      } else {
-        return { done: true, value: undefined };
-      }
-    }
-    const promise = new Promise<IteratorResult<AudioFrame>>(
-      (resolve) => (this.queueResolve = resolve),
-    );
-    unlock();
-    return promise;
+  start(controller: ReadableStreamDefaultController<AudioFrame>) {
+    this.controller = controller;
   }
 
-  close() {
-    this.eventQueue.push(null);
+  cancel() {
+    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
     this.ffiHandle.dispose();
   }
+}
 
-  [Symbol.asyncIterator](): AudioStream {
-    return this;
+export class AudioStream extends ReadableStream<AudioFrame> {
+  constructor(track: Track);
+  constructor(track: Track, sampleRate: number);
+  constructor(track: Track, sampleRate: number, numChannels: number);
+  constructor(track: Track, options: AudioStreamOptions);
+  constructor(
+    track: Track,
+    sampleRateOrOptions?: number | AudioStreamOptions,
+    numChannels?: number,
+  ) {
+    super(new AudioStreamSource(track, sampleRateOrOptions, numChannels));
   }
 }

package/src/room.ts

@@ -148,6 +148,8 @@ export class Room extends (EventEmitter as new () => TypedEmitter<RoomCallbacks>
       return ev.message.case == 'connect' && ev.message.value.asyncId == res.asyncId;
     });
 
+    log.debug('Connect callback received');
+
     switch (cb.message.case) {
       case 'result':
         this.ffiHandle = new FfiHandle(cb.message.value.room!.handle!.id!);

package/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "0.13.11";
+export const SDK_VERSION = "0.13.13";

package/src/video_stream.ts

@@ -1,14 +1,10 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { Mutex } from '@livekit/mutex';
+import { ReadableStream, 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,
-  VideoStreamInfo,
-} from './proto/video_frame_pb.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';
@@ -19,23 +15,11 @@ export type VideoFrameEvent = {
   rotation: VideoRotation;
 };
 
-export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
-  /** @internal */
-  info?: VideoStreamInfo;
-  /** @internal */
-  ffiHandle: FfiHandle;
-  /** @internal */
-  eventQueue: (VideoFrameEvent | null)[] = [];
-  /** @internal */
-  queueResolve: ((value: IteratorResult<VideoFrameEvent>) => void) | null = null;
-  /** @internal */
-  mutex = new Mutex();
-
-  track: Track;
+class VideoStreamSource implements UnderlyingSource<VideoFrameEvent> {
+  private controller?: ReadableStreamDefaultController<VideoFrameEvent>;
+  private ffiHandle: FfiHandle;
 
   constructor(track: Track) {
-    this.track = track;
-
     const req = new NewVideoStreamRequest({
       type: VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
@@ -48,13 +32,15 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
       },
     });
 
-    this.info = res.stream?.info;
     this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);
-
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }
 
   private onEvent = (ev: FfiEvent) => {
+    if (!this.controller) {
+      throw new Error('Stream controller not initialized');
+    }
+
     if (
       ev.message.case != 'videoStreamEvent' ||
       ev.message.value.streamHandle != this.ffiHandle.handle
@@ -69,54 +55,32 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
         const timestampUs = streamEvent.value.timestampUs;
         const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);
         const value = { rotation, timestampUs, frame };
-        if (this.queueResolve) {
-          this.queueResolve({
-            done: false,
-            value: {
-              frame: value.frame,
-              timestampUs: value.timestampUs!,
-              rotation: value.rotation!,
-            },
-          });
-          this.queueResolve = null;
-        } else {
-          this.eventQueue.push({
-            frame: value.frame,
-            timestampUs: value.timestampUs!,
-            rotation: value.rotation!,
-          });
-        }
+        const videoFrameEvent = {
+          frame: value.frame,
+          timestampUs: value.timestampUs!,
+          rotation: value.rotation!,
+        };
+        this.controller.enqueue(videoFrameEvent);
         break;
       case 'eos':
         FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
+        this.controller.close();
         break;
     }
   };
 
-  async next(): Promise<IteratorResult<VideoFrameEvent>> {
-    const unlock = await this.mutex.lock();
-    if (this.eventQueue.length > 0) {
-      unlock();
-      const value = this.eventQueue.shift();
-      if (value) {
-        return { done: false, value };
-      } else {
-        return { done: true, value: undefined };
-      }
-    }
-    const promise = new Promise<IteratorResult<VideoFrameEvent>>(
-      (resolve) => (this.queueResolve = resolve),
-    );
-    unlock();
-    return promise;
+  start(controller: ReadableStreamDefaultController<VideoFrameEvent>) {
+    this.controller = controller;
   }
 
-  close() {
-    this.eventQueue.push(null);
+  cancel() {
+    FfiClient.instance.off(FfiClientEvent.FfiEvent, this.onEvent);
     this.ffiHandle.dispose();
   }
+}
 
-  [Symbol.asyncIterator](): VideoStream {
-    return this;
+export class VideoStream extends ReadableStream<VideoFrameEvent> {
+  constructor(track: Track) {
+    super(new VideoStreamSource(track));
   }
 }