@livekit/rtc-node 0.12.1 → 0.13.0

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,15 +3,20 @@
   "description": "LiveKit RTC Node",
   "license": "Apache-2.0",
   "author": "LiveKit",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "main": "dist/index.js",
   "require": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     }
   },
   "type": "module",
@@ -41,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.1",
-    "@livekit/rtc-node-darwin-x64": "0.12.1",
-    "@livekit/rtc-node-linux-arm64-gnu": "0.12.1",
-    "@livekit/rtc-node-linux-x64-gnu": "0.12.1",
-    "@livekit/rtc-node-win32-x64-msvc": "0.12.1"
+    "@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);
   }

package/src/e2ee.ts

@@ -1,7 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import { FfiClient } from './ffi_client.js';
 import type {
   E2eeManagerGetFrameCryptorsResponse,
@@ -12,17 +11,17 @@ import type {
   RatchetSharedKeyResponse,
 } from './proto/e2ee_pb.js';
 import {
-  E2eeManagerSetEnabledRequestSchema,
-  E2eeRequestSchema,
+  E2eeManagerSetEnabledRequest,
+  E2eeRequest,
   EncryptionType,
-  FrameCryptorSetEnabledRequestSchema,
-  FrameCryptorSetKeyIndexRequestSchema,
-  GetKeyRequestSchema,
-  GetSharedKeyRequestSchema,
-  RatchetKeyRequestSchema,
-  RatchetSharedKeyRequestSchema,
-  SetKeyRequestSchema,
-  SetSharedKeyRequestSchema,
+  FrameCryptorSetEnabledRequest,
+  FrameCryptorSetKeyIndexRequest,
+  GetKeyRequest,
+  GetSharedKeyRequest,
+  RatchetKeyRequest,
+  RatchetSharedKeyRequest,
+  SetKeyRequest,
+  SetSharedKeyRequest,
 } from './proto/e2ee_pb.js';
 
 const DEFAULT_RATCHET_SALT = new TextEncoder().encode('LKFrameEncryptionKey');
@@ -63,11 +62,11 @@ export class KeyProvider {
   }
 
   setSharedKey(sharedKey: Uint8Array, keyIndex: number) {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'setSharedKey',
-        value: create(SetSharedKeyRequestSchema, {
+        value: new SetSharedKeyRequest({
           keyIndex: keyIndex,
           sharedKey: sharedKey,
         }),
@@ -83,11 +82,11 @@ export class KeyProvider {
   }
 
   exportSharedKey(keyIndex: number): Uint8Array {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'getSharedKey',
-        value: create(GetSharedKeyRequestSchema, {
+        value: new GetSharedKeyRequest({
           keyIndex: keyIndex,
         }),
       },
@@ -100,15 +99,15 @@ export class KeyProvider {
       },
     });
 
-    return (res.message.value as GetSharedKeyResponse).key;
+    return (res.message.value as GetSharedKeyResponse).key!;
   }
 
   ratchetSharedKey(keyIndex: number): Uint8Array {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'ratchetSharedKey',
-        value: create(RatchetSharedKeyRequestSchema, {
+        value: new RatchetSharedKeyRequest({
           keyIndex: keyIndex,
         }),
       },
@@ -121,15 +120,15 @@ export class KeyProvider {
       },
     });
 
-    return (res.message.value as RatchetSharedKeyResponse).newKey;
+    return (res.message.value as RatchetSharedKeyResponse).newKey!;
   }
 
   setKey(participantIdentity: string, keyIndex: number) {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'setKey',
-        value: create(SetKeyRequestSchema, {
+        value: new SetKeyRequest({
           keyIndex: keyIndex,
           participantIdentity: participantIdentity,
         }),
@@ -145,11 +144,11 @@ export class KeyProvider {
   }
 
   exportKey(participantIdentity: string, keyIndex: number): Uint8Array {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'getKey',
-        value: create(GetKeyRequestSchema, {
+        value: new GetKeyRequest({
           keyIndex: keyIndex,
           participantIdentity: participantIdentity,
         }),
@@ -163,15 +162,15 @@ export class KeyProvider {
       },
     });
 
-    return (res.message.value as GetKeyResponse).key;
+    return (res.message.value as GetKeyResponse).key!;
   }
 
   ratchetKey(participantIdentity: string, keyIndex: number): Uint8Array {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'ratchetKey',
-        value: create(RatchetKeyRequestSchema, {
+        value: new RatchetKeyRequest({
           keyIndex: keyIndex,
           participantIdentity: participantIdentity,
         }),
@@ -185,7 +184,7 @@ export class KeyProvider {
       },
     });
 
-    return (res.message.value as RatchetKeyResponse).newKey;
+    return (res.message.value as RatchetKeyResponse).newKey!;
   }
 }
 
@@ -204,11 +203,11 @@ export class FrameCryptor {
 
   setEnabled(enabled: boolean) {
     this.enabled = enabled;
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'cryptorSetEnabled',
-        value: create(FrameCryptorSetEnabledRequestSchema, {
+        value: new FrameCryptorSetEnabledRequest({
           participantIdentity: this.participantIdentity,
           enabled: this.enabled,
         }),
@@ -225,11 +224,11 @@ export class FrameCryptor {
 
   setKeyIndex(keyIndex: number) {
     this.keyIndex = keyIndex;
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'cryptorSetKeyIndex',
-        value: create(FrameCryptorSetKeyIndexRequestSchema, {
+        value: new FrameCryptorSetKeyIndexRequest({
           participantIdentity: this.participantIdentity,
           keyIndex: this.keyIndex,
         }),
@@ -265,11 +264,11 @@ export class E2EEManager {
 
   setEnabled(enabled: boolean) {
     this.enabled = enabled;
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'managerSetEnabled',
-        value: create(E2eeManagerSetEnabledRequestSchema, {
+        value: new E2eeManagerSetEnabledRequest({
           enabled: this.enabled,
         }),
       },
@@ -284,7 +283,7 @@ export class E2EEManager {
   }
 
   frameCryptors(): FrameCryptor[] {
-    const req = create(E2eeRequestSchema, {
+    const req = new E2eeRequest({
       roomHandle: this.roomHandle,
       message: {
         case: 'managerGetFrameCryptors',
@@ -305,9 +304,9 @@ export class E2EEManager {
       (cryptor) =>
         new FrameCryptor(
           this.roomHandle,
-          cryptor.participantIdentity,
-          cryptor.keyIndex,
-          cryptor.enabled,
+          cryptor.participantIdentity!,
+          cryptor.keyIndex!,
+          cryptor.enabled!,
         ),
     );
 

package/src/ffi_client.ts

@@ -1,8 +1,7 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { MessageInitShape } from '@bufbuild/protobuf';
-import { create, fromBinary, toBinary } from '@bufbuild/protobuf';
+import type { PartialMessage } from '@bufbuild/protobuf';
 import type { TypedEventEmitter as TypedEmitter } from '@livekit/typed-emitter';
 import EventEmitter from 'events';
 import {
@@ -13,17 +12,10 @@ import {
   livekitInitialize,
   livekitRetrievePtr,
 } from './napi/native.js';
-import {
-  type FfiEvent,
-  FfiEventSchema,
-  type FfiRequest,
-  FfiRequestSchema,
-  type FfiResponse,
-  FfiResponseSchema,
-} from './proto/ffi_pb.js';
+import { FfiEvent, FfiRequest, FfiResponse } from './proto/ffi_pb.js';
 import { SDK_VERSION } from './version.js';
 
-export { FfiHandle, type FfiEvent, type FfiResponse, type FfiRequest, livekitDispose as dispose };
+export { FfiHandle, type FfiEvent, type FfiResponse, FfiRequest, livekitDispose as dispose };
 
 export type FfiClientCallbacks = {
   ffi_event: (event: FfiEvent) => void;
@@ -49,7 +41,7 @@ export class FfiClient extends (EventEmitter as new () => TypedEmitter<FfiClient
 
     livekitInitialize(
       (event_data: Uint8Array) => {
-        const event = fromBinary(FfiEventSchema, event_data);
+        const event = FfiEvent.fromBinary(event_data);
         this.emit(FfiClientEvent.FfiEvent, event);
       },
       true,
@@ -57,11 +49,11 @@ export class FfiClient extends (EventEmitter as new () => TypedEmitter<FfiClient
     );
   }
 
-  request<T>(req: MessageInitShape<typeof FfiRequestSchema>): T {
-    const request = create(FfiRequestSchema, req);
-    const req_data = toBinary(FfiRequestSchema, request);
+  request<T>(req: PartialMessage<FfiRequest>): T {
+    const request = new FfiRequest(req);
+    const req_data = request.toBinary();
     const res_data = livekitFfiRequest(req_data);
-    return fromBinary(FfiResponseSchema, res_data).message.value as T;
+    return FfiResponse.fromBinary(res_data).message.value as T;
   }
 
   copyBuffer(ptr: bigint, len: number): Uint8Array {

package/src/index.ts

@@ -1,18 +1,6 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import type { MessageInitShape } from '@bufbuild/protobuf';
-import { create } from '@bufbuild/protobuf';
-import type { AudioEncoding, TrackPublishOptionsSchema, VideoEncoding } from './proto/room_pb.js';
-import {
-  AudioEncodingSchema,
-  IceServerSchema,
-  type IceServer as IceServerType,
-  type TrackPublishOptions as TrackPublishOptionsType,
-  VideoEncodingSchema,
-} from './proto/room_pb.js';
-import { TrackSource } from './proto/track_pb.js';
-import { VideoCodec } from './proto/video_frame_pb.js';
 
 export { Room, RoomEvent, ConnectError, type RoomOptions, type RtcConfiguration } from './room.js';
 export { Participant, RemoteParticipant, LocalParticipant } from './participant.js';
@@ -39,20 +27,16 @@ export {
   RemoteTrackPublication,
   LocalTrackPublication,
 } from './track_publication.js';
-export { type Transcription, type TranscriptionSegment } from './transcription.js';
-export {
-  E2EEManager,
-  type E2EEOptions,
-  type KeyProviderOptions,
-  KeyProvider,
-  FrameCryptor,
-} from './e2ee.js';
-
+export type { Transcription, TranscriptionSegment } from './transcription.js';
+export { E2EEManager, KeyProvider, FrameCryptor } from './e2ee.js';
+export type { E2EEOptions, KeyProviderOptions } from './e2ee.js';
 export {
   ConnectionQuality,
+  IceServer,
   IceTransportType,
   DataPacketKind,
   ContinualGatheringPolicy,
+  TrackPublishOptions,
   ConnectionState,
 } from './proto/room_pb.js';
 export { RpcError, type RpcInvocationData, type PerformRpcParams } from './rpc.js';
@@ -62,50 +46,3 @@ export { VideoBufferType, VideoRotation, VideoCodec } from './proto/video_frame_
 export { ParticipantKind } from './proto/participant_pb.js';
 export { dispose } from './ffi_client.js';
 export type { ChatMessage } from './types.js';
-
-// exposing helpers for API compatibility with 1.x version of protobuf-es where these were class instances
-
-type IceServerInit = MessageInitShape<typeof IceServerSchema> & {
-  urls: string[];
-};
-export class IceServer implements IceServerType {
-  $typeName = 'livekit.proto.IceServer' as const;
-  urls: string[];
-  username: string;
-  password: string;
-  constructor(init: IceServerInit) {
-    const { urls, username, password } = init;
-    this.urls = urls;
-    this.username = username ?? '';
-    this.password = password ?? '';
-    create(IceServerSchema, init);
-  }
-}
-
-export class TrackPublishOptions implements TrackPublishOptionsType {
-  $typeName = 'livekit.proto.TrackPublishOptions' as const;
-  videoCodec: VideoCodec;
-  videoEncoding?: VideoEncoding | undefined;
-  audioEncoding?: AudioEncoding | undefined;
-  dtx: boolean;
-  simulcast: boolean;
-  source: TrackSource;
-  stream: string;
-  red: boolean;
-
-  constructor(init: MessageInitShape<typeof TrackPublishOptionsSchema> = {}) {
-    const { videoCodec, videoEncoding, audioEncoding, dtx, simulcast, source, stream, red } = init;
-    this.videoCodec = videoCodec ?? VideoCodec.VP8;
-    if (videoEncoding) {
-      this.videoEncoding = create(VideoEncodingSchema, videoEncoding);
-    }
-    if (audioEncoding) {
-      this.audioEncoding = create(AudioEncodingSchema, audioEncoding);
-    }
-    this.dtx = dtx ?? false;
-    this.simulcast = simulcast ?? false;
-    this.source = source ?? TrackSource.SOURCE_UNKNOWN;
-    this.stream = stream ?? '';
-    this.red = red ?? false;
-  }
-}