@livekit/rtc-node 0.12.2 → 0.13.0

package/dist/video_source.js

@@ -1,16 +1,16 @@
-import { create } from "@bufbuild/protobuf";
 import { FfiClient, FfiHandle } from "./ffi_client.js";
 import {
-  CaptureVideoFrameRequestSchema,
-  NewVideoSourceRequestSchema,
+  CaptureVideoFrameRequest,
+  NewVideoSourceRequest,
   VideoRotation,
   VideoSourceType
 } from "./proto/video_frame_pb.js";
 class VideoSource {
   constructor(width, height) {
+    var _a;
     this.width = width;
     this.height = height;
-    const req = create(NewVideoSourceRequestSchema, {
+    const req = new NewVideoSourceRequest({
       type: VideoSourceType.VIDEO_SOURCE_NATIVE,
       resolution: {
         width,
@@ -23,11 +23,11 @@ class VideoSource {
         value: req
       }
     });
-    this.info = res.source.info;
+    this.info = (_a = res.source) == null ? void 0 : _a.info;
     this.ffiHandle = new FfiHandle(res.source.handle.id);
   }
   captureFrame(frame, timestampUs = BigInt(0), rotation = VideoRotation.VIDEO_ROTATION_0) {
-    const req = create(CaptureVideoFrameRequestSchema, {
+    const req = new CaptureVideoFrameRequest({
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo(),
       rotation,
@@ -37,6 +37,9 @@ class VideoSource {
       message: { case: "captureVideoFrame", value: req }
     });
   }
+  async close() {
+    this.ffiHandle.dispose();
+  }
 }
 export {
   VideoSource

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 { create } from '@bufbuild/protobuf';\nimport { FfiClient, FfiHandle } from './ffi_client.js';\nimport type {\n  CaptureVideoFrameResponse,\n  NewVideoSourceResponse,\n  VideoSourceInfo,\n} from './proto/video_frame_pb.js';\nimport {\n  CaptureVideoFrameRequestSchema,\n  NewVideoSourceRequestSchema,\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\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 = create(NewVideoSourceRequestSchema, {\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    const req = create(CaptureVideoFrameRequestSchema, {\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"],"mappings":"AAGA,SAAS,cAAc;AACvB,SAAS,WAAW,iBAAiB;AAMrC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGA,MAAM,YAAY;AAAA,EASvB,YAAY,OAAe,QAAgB;AACzC,SAAK,QAAQ;AACb,SAAK,SAAS;AAEd,UAAM,MAAM,OAAO,6BAA6B;AAAA,MAC9C,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,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAE;AAAA,EACvD;AAAA,EAEA,aACE,OACA,cAAc,OAAO,CAAC,GACtB,WAAW,cAAc,kBACzB;AACA,UAAM,MAAM,OAAO,gCAAgC;AAAA,MACjD,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;AACF;","names":[]}
+{"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\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    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  }\n}\n"],"mappings":"AAGA,SAAS,WAAW,iBAAiB;AAMrC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAGA,MAAM,YAAY;AAAA,EASvB,YAAY,OAAe,QAAgB;AA1B7C;AA2BI,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,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;AAAA,EACzB;AACF;","names":[]}

package/dist/video_stream.cjs

@@ -21,7 +21,6 @@ __export(video_stream_exports, {
   VideoStream: () => VideoStream
 });
 module.exports = __toCommonJS(video_stream_exports);
-var import_protobuf = require("@bufbuild/protobuf");
 var import_mutex = require("@livekit/mutex");
 var import_ffi_client = require("./ffi_client.cjs");
 var import_video_frame_pb = require("./proto/video_frame_pb.cjs");
@@ -46,9 +45,20 @@ class VideoStream {
           const frame = import_video_frame.VideoFrame.fromOwnedInfo(streamEvent.value.buffer);
           const value = { rotation, timestampUs, frame };
           if (this.queueResolve) {
-            this.queueResolve({ done: false, value });
+            this.queueResolve({
+              done: false,
+              value: {
+                frame: value.frame,
+                timestampUs: value.timestampUs,
+                rotation: value.rotation
+              }
+            });
           } else {
-            this.eventQueue.push(value);
+            this.eventQueue.push({
+              frame: value.frame,
+              timestampUs: value.timestampUs,
+              rotation: value.rotation
+            });
           }
           break;
         case "eos":
@@ -56,8 +66,9 @@ class VideoStream {
           break;
       }
     };
+    var _a;
     this.track = track;
-    const req = (0, import_protobuf.create)(import_video_frame_pb.NewVideoStreamRequestSchema, {
+    const req = new import_video_frame_pb.NewVideoStreamRequest({
       type: import_video_frame_pb.VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle
     });
@@ -67,7 +78,7 @@ class VideoStream {
         value: req
       }
     });
-    this.info = res.stream.info;
+    this.info = (_a = res.stream) == null ? void 0 : _a.info;
     this.ffiHandle = new import_ffi_client.FfiHandle(res.stream.handle.id);
     import_ffi_client.FfiClient.instance.on(import_ffi_client.FfiClientEvent.FfiEvent, this.onEvent);
   }

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 { create } from '@bufbuild/protobuf';\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 { NewVideoStreamRequestSchema, 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 = create(NewVideoStreamRequestSchema, {\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({ done: false, value });\n        } else {\n          this.eventQueue.push(value);\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":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,sBAAuB;AACvB,mBAAsB;AAEtB,wBAAqD;AAMrD,4BAA6D;AAE7D,yBAA2B;AAQpB,MAAM,YAA8D;AAAA,EAczE,YAAY,OAAc;AAR1B;AAAA,sBAAyC,CAAC;AAE1C;AAAA,wBAA0E;AAE1E;AAAA,iBAAQ,IAAI,mBAAM;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,8BAAW,cAAc,YAAY,MAAM,MAAO;AAChE,gBAAM,QAAQ,EAAE,UAAU,aAAa,MAAM;AAC7C,cAAI,KAAK,cAAc;AACrB,iBAAK,aAAa,EAAE,MAAM,OAAO,MAAM,CAAC;AAAA,UAC1C,OAAO;AACL,iBAAK,WAAW,KAAK,KAAK;AAAA,UAC5B;AACA;AAAA,QACF,KAAK;AACH,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D;AAAA,MACJ;AAAA,IACF;AA7CE,SAAK,QAAQ;AAEb,UAAM,UAAM,wBAAO,mDAA6B;AAAA,MAC9C,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,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAE;AAErD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA6BA,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 { 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        } 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":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAAsB;AAEtB,wBAAqD;AAMrD,4BAAuD;AAEvD,yBAA2B;AAQpB,MAAM,YAA8D;AAAA,EAczE,YAAY,OAAc;AAR1B;AAAA,sBAAyC,CAAC;AAE1C;AAAA,wBAA0E;AAE1E;AAAA,iBAAQ,IAAI,mBAAM;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,8BAAW,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;AAAA,UACH,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,sCAAU,SAAS,IAAI,iCAAe,UAAU,KAAK,OAAO;AAC5D;AAAA,MACJ;AAAA,IACF;AA5FF;AAoCI,SAAK,QAAQ;AAEb,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,QAAO,SAAI,WAAJ,mBAAY;AACxB,SAAK,YAAY,IAAI,4BAAU,IAAI,OAAQ,OAAQ,EAAG;AAEtD,gCAAU,SAAS,GAAG,iCAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EAwCA,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":[]}

package/dist/video_stream.d.cts

@@ -3,12 +3,11 @@ import { FfiHandle } from './napi/native.d.cjs';
 import { VideoRotation, VideoStreamInfo } from './proto/video_frame_pb.cjs';
 import { Track } from './track.cjs';
 import { VideoFrame } from './video_frame.cjs';
-import '@bufbuild/protobuf/codegenv1';
-import './proto/handle_pb.cjs';
 import '@bufbuild/protobuf';
 import './proto/track_pb.cjs';
-import './proto/e2ee_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';
@@ -21,7 +20,7 @@ type VideoFrameEvent = {
 };
 declare class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
     /** @internal */
-    info: VideoStreamInfo;
+    info?: VideoStreamInfo;
     /** @internal */
     ffiHandle: FfiHandle;
     /** @internal */

package/dist/video_stream.d.ts

@@ -3,12 +3,11 @@ import { FfiHandle } from './napi/native.d.js';
 import { VideoRotation, VideoStreamInfo } from './proto/video_frame_pb.js';
 import { Track } from './track.js';
 import { VideoFrame } from './video_frame.js';
-import '@bufbuild/protobuf/codegenv1';
-import './proto/handle_pb.js';
 import '@bufbuild/protobuf';
 import './proto/track_pb.js';
-import './proto/e2ee_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';
@@ -21,7 +20,7 @@ type VideoFrameEvent = {
 };
 declare class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
     /** @internal */
-    info: VideoStreamInfo;
+    info?: VideoStreamInfo;
     /** @internal */
     ffiHandle: FfiHandle;
     /** @internal */

package/dist/video_stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"video_stream.d.ts","sourceRoot":"","sources":["../src/video_stream.ts"],"names":[],"mappings":"AAIA,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,EAAE,eAAe,CAAC;IACtB,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,CAyBb;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,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,CAoCb;IAEI,IAAI,IAAI,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;IAkBtD,KAAK;IAKL,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,WAAW;CAGtC"}

package/dist/video_stream.js

@@ -1,7 +1,6 @@
-import { create } from "@bufbuild/protobuf";
 import { Mutex } from "@livekit/mutex";
 import { FfiClient, FfiClientEvent, FfiHandle } from "./ffi_client.js";
-import { NewVideoStreamRequestSchema, VideoStreamType } from "./proto/video_frame_pb.js";
+import { NewVideoStreamRequest, VideoStreamType } from "./proto/video_frame_pb.js";
 import { VideoFrame } from "./video_frame.js";
 class VideoStream {
   constructor(track) {
@@ -23,9 +22,20 @@ class VideoStream {
           const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer);
           const value = { rotation, timestampUs, frame };
           if (this.queueResolve) {
-            this.queueResolve({ done: false, value });
+            this.queueResolve({
+              done: false,
+              value: {
+                frame: value.frame,
+                timestampUs: value.timestampUs,
+                rotation: value.rotation
+              }
+            });
           } else {
-            this.eventQueue.push(value);
+            this.eventQueue.push({
+              frame: value.frame,
+              timestampUs: value.timestampUs,
+              rotation: value.rotation
+            });
           }
           break;
         case "eos":
@@ -33,8 +43,9 @@ class VideoStream {
           break;
       }
     };
+    var _a;
     this.track = track;
-    const req = create(NewVideoStreamRequestSchema, {
+    const req = new NewVideoStreamRequest({
       type: VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle
     });
@@ -44,7 +55,7 @@ class VideoStream {
         value: req
       }
     });
-    this.info = res.stream.info;
+    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);
   }

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 { create } from '@bufbuild/protobuf';\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 { NewVideoStreamRequestSchema, 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 = create(NewVideoStreamRequestSchema, {\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({ done: false, value });\n        } else {\n          this.eventQueue.push(value);\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,cAAc;AACvB,SAAS,aAAa;AAEtB,SAAS,WAAW,gBAAgB,iBAAiB;AAMrD,SAAS,6BAA6B,uBAAuB;AAE7D,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,EAAE,MAAM,OAAO,MAAM,CAAC;AAAA,UAC1C,OAAO;AACL,iBAAK,WAAW,KAAK,KAAK;AAAA,UAC5B;AACA;AAAA,QACF,KAAK;AACH,oBAAU,SAAS,IAAI,eAAe,UAAU,KAAK,OAAO;AAC5D;AAAA,MACJ;AAAA,IACF;AA7CE,SAAK,QAAQ;AAEb,UAAM,MAAM,OAAO,6BAA6B;AAAA,MAC9C,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,OAAO,IAAI,OAAQ;AACxB,SAAK,YAAY,IAAI,UAAU,IAAI,OAAQ,OAAQ,EAAE;AAErD,cAAU,SAAS,GAAG,eAAe,UAAU,KAAK,OAAO;AAAA,EAC7D;AAAA,EA6BA,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 { 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        } 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;AAAA,UACH,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;AA5FF;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,EAwCA,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":[]}

package/package.json

@@ -3,7 +3,7 @@
   "description": "LiveKit RTC Node",
   "license": "Apache-2.0",
   "author": "LiveKit",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "main": "dist/index.js",
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
@@ -46,24 +46,24 @@
     }
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.0",
+    "@bufbuild/protobuf": "^1.10.0",
     "@livekit/mutex": "^1.0.0",
     "@livekit/typed-emitter": "^3.0.0"
   },
   "devDependencies": {
-    "@bufbuild/protoc-gen-es": "^2.2.0",
     "@napi-rs/cli": "^2.18.0",
     "@types/node": "^20.9.2",
     "prettier": "^3.0.3",
     "tsup": "^8.3.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "@bufbuild/protoc-gen-es": "^1.10.0"
   },
   "optionalDependencies": {
-    "@livekit/rtc-node-darwin-arm64": "0.12.2",
-    "@livekit/rtc-node-darwin-x64": "0.12.2",
-    "@livekit/rtc-node-linux-arm64-gnu": "0.12.2",
-    "@livekit/rtc-node-linux-x64-gnu": "0.12.2",
-    "@livekit/rtc-node-win32-x64-msvc": "0.12.2"
+    "@livekit/rtc-node-darwin-arm64": "0.13.0",
+    "@livekit/rtc-node-darwin-x64": "0.13.0",
+    "@livekit/rtc-node-linux-arm64-gnu": "0.13.0",
+    "@livekit/rtc-node-linux-x64-gnu": "0.13.0",
+    "@livekit/rtc-node-win32-x64-msvc": "0.13.0"
   },
   "engines": {
     "node": ">= 18"

package/src/audio_frame.ts

@@ -1,10 +1,9 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import { FfiClient, FfiHandle } from './ffi_client.js';
 import type { OwnedAudioFrameBuffer } from './proto/audio_frame_pb.js';
-import { type AudioFrameBufferInfo, AudioFrameBufferInfoSchema } from './proto/audio_frame_pb.js';
+import { AudioFrameBufferInfo } from './proto/audio_frame_pb.js';
 
 export class AudioFrame {
   data: Int16Array;
@@ -32,20 +31,20 @@ export class AudioFrame {
   /** @internal */
   static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame {
     const info = owned.info!;
-    const len = info.numChannels * info.samplesPerChannel * 2; // c_int16
-    const data = FfiClient.instance.copyBuffer(info.dataPtr, len);
-    new FfiHandle(owned.handle!.id).dispose();
+    const len = info.numChannels! * info.samplesPerChannel! * 2; // c_int16
+    const data = FfiClient.instance.copyBuffer(info.dataPtr!, len);
+    new FfiHandle(owned.handle!.id!).dispose();
     return new AudioFrame(
       new Int16Array(data.buffer),
-      info.sampleRate,
-      info.numChannels,
-      info.samplesPerChannel,
+      info.sampleRate!,
+      info.numChannels!,
+      info.samplesPerChannel!,
     );
   }
 
   /** @internal */
   protoInfo(): AudioFrameBufferInfo {
-    return create(AudioFrameBufferInfoSchema, {
+    return new AudioFrameBufferInfo({
       dataPtr: FfiClient.instance.retrievePtr(new Uint8Array(this.data.buffer)),
       sampleRate: this.sampleRate,
       numChannels: this.channels,
@@ -65,8 +64,9 @@ export class AudioFrame {
  */
 export const combineAudioFrames = (buffer: AudioFrame | AudioFrame[]): AudioFrame => {
   if (!Array.isArray(buffer)) {
-    return buffer as AudioFrame;
+    return buffer;
   }
+  buffer = buffer as AudioFrame[];
 
   if (buffer.length === 0) {
     throw new Error('buffer is empty');

package/src/audio_resampler.ts

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import { AudioFrame } from './audio_frame.js';
 import { FfiClient, FfiHandle } from './ffi_client.js';
 import type {
@@ -10,9 +9,9 @@ import type {
   PushSoxResamplerResponse,
 } from './proto/audio_frame_pb.js';
 import {
-  FlushSoxResamplerRequestSchema,
-  NewSoxResamplerRequestSchema,
-  PushSoxResamplerRequestSchema,
+  FlushSoxResamplerRequest,
+  NewSoxResamplerRequest,
+  PushSoxResamplerRequest,
   SoxQualityRecipe,
   SoxResamplerDataType,
 } from './proto/audio_frame_pb.js';
@@ -59,7 +58,7 @@ export class AudioResampler {
     this.#outputRate = outputRate;
     this.#channels = channels;
 
-    const req = create(NewSoxResamplerRequestSchema, {
+    const req = new NewSoxResamplerRequest({
       inputRate,
       outputRate,
       numChannels: channels,
@@ -76,11 +75,14 @@ export class AudioResampler {
       },
     });
 
-    if (res.message.case !== 'resampler') {
-      throw new Error(res.message.value ?? 'Unknown Error');
+    switch (res.message.case) {
+      case 'resampler':
+        this.#ffiHandle = new FfiHandle(res.message.value.handle!.id!);
+        break;
+      case 'error':
+      default:
+        throw new Error(res.message.value);
     }
-
-    this.#ffiHandle = new FfiHandle(res.message.value.handle!.id);
   }
 
   /**
@@ -95,7 +97,7 @@ export class AudioResampler {
    * be empty if no output data is available yet.
    */
   push(data: AudioFrame): AudioFrame[] {
-    const req = create(PushSoxResamplerRequestSchema, {
+    const req = new PushSoxResamplerRequest({
       resamplerHandle: this.#ffiHandle.handle,
       dataPtr: data.protoInfo().dataPtr,
       size: data.data.byteLength,
@@ -116,7 +118,7 @@ export class AudioResampler {
       return [];
     }
 
-    const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size);
+    const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size!);
     return [
       new AudioFrame(
         new Int16Array(outputData.buffer),
@@ -135,7 +137,7 @@ export class AudioResampler {
    * internal buffers are processed and all resampled data is output.
    */
   flush(): AudioFrame[] {
-    const req = create(FlushSoxResamplerRequestSchema, {
+    const req = new FlushSoxResamplerRequest({
       resamplerHandle: this.#ffiHandle.handle,
     });
 
@@ -154,7 +156,7 @@ export class AudioResampler {
       return [];
     }
 
-    const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size);
+    const outputData = FfiClient.instance.copyBuffer(res.outputPtr, res.size!);
     return [
       new AudioFrame(
         new Int16Array(outputData.buffer),

package/src/audio_source.ts

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import type { AudioFrame } from './audio_frame.js';
 import { FfiClient } from './ffi_client.js';
 import { FfiHandle } from './napi/native.js';
@@ -14,9 +13,9 @@ import type {
 } from './proto/audio_frame_pb.js';
 import {
   AudioSourceType,
-  CaptureAudioFrameRequestSchema,
-  ClearAudioBufferRequestSchema,
-  NewAudioSourceRequestSchema,
+  CaptureAudioFrameRequest,
+  ClearAudioBufferRequest,
+  NewAudioSourceRequest,
 } from './proto/audio_frame_pb.js';
 
 export class AudioSource {
@@ -46,7 +45,7 @@ export class AudioSource {
     this.lastCapture = 0;
     this.currentQueueSize = 0;
 
-    const req = create(NewAudioSourceRequestSchema, {
+    const req = new NewAudioSourceRequest({
       type: AudioSourceType.AUDIO_SOURCE_NATIVE,
       sampleRate: sampleRate,
       numChannels: numChannels,
@@ -61,7 +60,7 @@ export class AudioSource {
     });
 
     this.info = res.source!.info!;
-    this.ffiHandle = new FfiHandle(res.source!.handle!.id);
+    this.ffiHandle = new FfiHandle(res.source!.handle!.id!);
   }
 
   get queuedDuration(): number {
@@ -72,7 +71,7 @@ export class AudioSource {
   }
 
   clearQueue() {
-    const req = create(ClearAudioBufferRequestSchema, {
+    const req = new ClearAudioBufferRequest({
       sourceHandle: this.ffiHandle.handle,
     });
 
@@ -117,7 +116,7 @@ export class AudioSource {
     // (e.g. using wait_for_playout for very small chunks)
     this.timeout = setTimeout(this.release, this.currentQueueSize - 50);
 
-    const req = create(CaptureAudioFrameRequestSchema, {
+    const req = new CaptureAudioFrameRequest({
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo(),
     });
@@ -134,4 +133,8 @@ export class AudioSource {
       throw new Error(cb.error);
     }
   }
+
+  async close() {
+    this.ffiHandle.dispose();
+  }
 }

package/src/audio_stream.ts

@@ -1,13 +1,12 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import { Mutex } from '@livekit/mutex';
 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 { AudioStreamType, NewAudioStreamRequestSchema } from './proto/audio_frame_pb.js';
+import { AudioStreamType, NewAudioStreamRequest } from './proto/audio_frame_pb.js';
 import type { Track } from './track.js';
 
 export class AudioStream implements AsyncIterableIterator<AudioFrame> {
@@ -31,7 +30,7 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
     this.sampleRate = sampleRate;
     this.numChannels = numChannels;
 
-    const req = create(NewAudioStreamRequestSchema, {
+    const req = new NewAudioStreamRequest({
       type: AudioStreamType.AUDIO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
       sampleRate: sampleRate,
@@ -46,7 +45,7 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
     });
 
     this.info = res.stream!.info!;
-    this.ffiHandle = new FfiHandle(res.stream!.handle!.id);
+    this.ffiHandle = new FfiHandle(res.stream!.handle!.id!);
 
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }