Revert "Enable strict type checking and use proto2 ffi syntax (#303)"

This reverts commit f204721.

packages/livekit-rtc/generate_proto.sh

@@ -11,8 +11,8 @@ FFI_PROTOCOL=./rust-sdks/livekit-ffi/protocol
 FFI_OUT_NODE=./src/proto
 
 # ffi
-PATH=$PATH:$(pwd)/node_modules/.bin \
-  protoc \
+
+protoc \
     -I=$FFI_PROTOCOL \
     --es_out $FFI_OUT_NODE \
     --es_opt target=ts \

packages/livekit-rtc/package.json

@@ -33,12 +33,11 @@
     }
   },
   "dependencies": {
-    "@bufbuild/protobuf": "^2.2.0",
+    "@bufbuild/protobuf": "^1.4.2",
     "@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",

packages/livekit-rtc/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;
@@ -31,10 +30,10 @@ export class AudioFrame {
 
   /** @internal */
   static fromOwnedInfo(owned: OwnedAudioFrameBuffer): AudioFrame {
-    const info = owned.info!;
+    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();
+    new FfiHandle(owned.handle.id).dispose();
     return new AudioFrame(
       new Int16Array(data.buffer),
       info.sampleRate,
@@ -45,7 +44,7 @@ export class AudioFrame {
 
   /** @internal */
   protoInfo(): AudioFrameBufferInfo {
-    return create(AudioFrameBufferInfoSchema, {
+    return new AudioFrameBufferInfo({
       dataPtr: FfiClient.instance.retrievePtr(new Uint8Array(this.data.buffer)),
       sampleRate: this.sampleRate,
       numChannels: this.channels,
@@ -64,9 +63,10 @@ export class AudioFrame {
  * @param buffer - a single AudioFrame or list thereof
  */
 export const combineAudioFrames = (buffer: AudioFrame | AudioFrame[]): AudioFrame => {
-  if (!Array.isArray(buffer)) {
+  if (!buffer['length']) {
     return buffer as AudioFrame;
   }
+  buffer = buffer as AudioFrame[];
 
   if (buffer.length === 0) {
     throw new Error('buffer is empty');

packages/livekit-rtc/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,11 @@ export class AudioResampler {
       },
     });
 
-    if (res.message.case !== 'resampler') {
-      throw new Error(res.message.value ?? 'Unknown Error');
+    if (res.error) {
+      throw new Error(res.error);
     }
 
-    this.#ffiHandle = new FfiHandle(res.message.value.handle!.id);
+    this.#ffiHandle = new FfiHandle(res.resampler.handle.id);
   }
 
   /**
@@ -95,7 +94,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,
@@ -135,7 +134,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,
     });
 

packages/livekit-rtc/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,
@@ -60,8 +59,8 @@ export class AudioSource {
       },
     });
 
-    this.info = res.source!.info!;
-    this.ffiHandle = new FfiHandle(res.source!.handle!.id);
+    this.info = res.source.info;
+    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(),
     });

packages/livekit-rtc/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,
@@ -45,8 +44,8 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
       },
     });
 
-    this.info = res.stream!.info!;
-    this.ffiHandle = new FfiHandle(res.stream!.handle!.id);
+    this.info = res.stream.info;
+    this.ffiHandle = new FfiHandle(res.stream.handle.id);
 
     FfiClient.instance.on(FfiClientEvent.FfiEvent, this.onEvent);
   }
@@ -62,7 +61,7 @@ export class AudioStream implements AsyncIterableIterator<AudioFrame> {
     const streamEvent = ev.message.value.message;
     switch (streamEvent.case) {
       case 'frameReceived':
-        const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame!);
+        const frame = AudioFrame.fromOwnedInfo(streamEvent.value.frame);
         if (this.queueResolve) {
           this.queueResolve({ done: false, value: frame });
         } else {