@livekit/rtc-node 0.10.4 → 0.11.1

package/src/video_frame.ts

@@ -1,11 +1,18 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { FfiClient, FfiRequest } from './ffi_client.js';
-import type { OwnedVideoBuffer, VideoConvertResponse } from './proto/video_frame_pb.js';
-import {
+import { create } from '@bufbuild/protobuf';
+import { FfiClient } from './ffi_client.js';
+import { FfiRequestSchema } from './proto/ffi_pb.js';
+import type {
+  OwnedVideoBuffer,
   VideoBufferInfo,
   VideoBufferInfo_ComponentInfo,
+  VideoConvertResponse,
+} from './proto/video_frame_pb.js';
+import {
+  VideoBufferInfoSchema,
+  VideoBufferInfo_ComponentInfoSchema,
   VideoBufferType,
 } from './proto/video_frame_pb.js';
 
@@ -29,7 +36,7 @@ export class VideoFrame {
 
   /** @internal */
   protoInfo(): VideoBufferInfo {
-    const info = new VideoBufferInfo({
+    const info = create(VideoBufferInfoSchema, {
       width: this.width,
       height: this.height,
       type: this.type,
@@ -55,7 +62,7 @@ export class VideoFrame {
 
   /** @internal */
   static fromOwnedInfo(owned: OwnedVideoBuffer): VideoFrame {
-    const info = owned.info;
+    const info = owned.info!;
     return new VideoFrame(
       FfiClient.instance.copyBuffer(
         info.dataPtr,
@@ -76,7 +83,7 @@ export class VideoFrame {
   }
 
   convert(dstType: VideoBufferType, flipY = false): VideoFrame {
-    const req = new FfiRequest({
+    const req = create(FfiRequestSchema, {
       message: {
         case: 'videoConvert',
         value: {
@@ -87,11 +94,11 @@ export class VideoFrame {
       },
     });
     const resp = FfiClient.instance.request<VideoConvertResponse>(req);
-    if (resp.error) {
-      throw resp.error;
+    if (resp.message.case !== 'buffer') {
+      throw new Error(resp.message.value ?? 'Unknown Error');
     }
 
-    return VideoFrame.fromOwnedInfo(resp.buffer);
+    return VideoFrame.fromOwnedInfo(resp.message.value);
   }
 }
 
@@ -130,13 +137,17 @@ const getPlaneInfos = (
   const chromaHeight = Math.trunc((height + 1) / 2);
   switch (type) {
     case VideoBufferType.I420: {
-      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
-      const u = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+        dataPtr,
+        stride: width,
+        size: width * height,
+      });
+      const u = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const v = new VideoBufferInfo_ComponentInfo({
+      const v = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: u.dataPtr + BigInt(u.size),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
@@ -144,18 +155,22 @@ const getPlaneInfos = (
       return [y, u, v];
     }
     case VideoBufferType.I420A: {
-      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
-      const u = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+        dataPtr,
+        stride: width,
+        size: width * height,
+      });
+      const u = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const v = new VideoBufferInfo_ComponentInfo({
+      const v = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: u.dataPtr + BigInt(u.size),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const a = new VideoBufferInfo_ComponentInfo({
+      const a = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: v.dataPtr + BigInt(v.size),
         stride: width,
         size: width * height,
@@ -163,13 +178,17 @@ const getPlaneInfos = (
       return [y, u, v, a];
     }
     case VideoBufferType.I422: {
-      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
-      const u = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+        dataPtr,
+        stride: width,
+        size: width * height,
+      });
+      const u = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: chromaWidth,
         size: chromaWidth * height,
       });
-      const v = new VideoBufferInfo_ComponentInfo({
+      const v = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: u.dataPtr + BigInt(u.size),
         stride: chromaWidth,
         size: chromaWidth * height,
@@ -177,13 +196,17 @@ const getPlaneInfos = (
       return [y, u, v];
     }
     case VideoBufferType.I444: {
-      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
-      const u = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+        dataPtr,
+        stride: width,
+        size: width * height,
+      });
+      const u = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: width,
         size: width * height,
       });
-      const v = new VideoBufferInfo_ComponentInfo({
+      const v = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: u.dataPtr + BigInt(u.size),
         stride: width,
         size: width * height,
@@ -191,17 +214,17 @@ const getPlaneInfos = (
       return [y, u, v];
     }
     case VideoBufferType.I010: {
-      const y = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr,
         stride: width * 2,
         size: width * height * 2,
       });
-      const u = new VideoBufferInfo_ComponentInfo({
+      const u = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,
       });
-      const v = new VideoBufferInfo_ComponentInfo({
+      const v = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: u.dataPtr + BigInt(u.size),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,
@@ -209,8 +232,12 @@ const getPlaneInfos = (
       return [y, u, v];
     }
     case VideoBufferType.NV12: {
-      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
-      const uv = new VideoBufferInfo_ComponentInfo({
+      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+        dataPtr,
+        stride: width,
+        size: width * height,
+      });
+      const uv = create(VideoBufferInfo_ComponentInfoSchema, {
         dataPtr: y.dataPtr + BigInt(y.size),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,

package/src/video_source.ts

@@ -1,6 +1,7 @@
 // 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 {
   CaptureVideoFrameResponse,
@@ -8,8 +9,8 @@ import type {
   VideoSourceInfo,
 } from './proto/video_frame_pb.js';
 import {
-  CaptureVideoFrameRequest,
-  NewVideoSourceRequest,
+  CaptureVideoFrameRequestSchema,
+  NewVideoSourceRequestSchema,
   VideoRotation,
   VideoSourceType,
 } from './proto/video_frame_pb.js';
@@ -28,7 +29,7 @@ export class VideoSource {
     this.width = width;
     this.height = height;
 
-    const req = new NewVideoSourceRequest({
+    const req = create(NewVideoSourceRequestSchema, {
       type: VideoSourceType.VIDEO_SOURCE_NATIVE,
       resolution: {
         width: width,
@@ -43,12 +44,12 @@ export class VideoSource {
       },
     });
 
-    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);
   }
 
   captureFrame(frame: VideoFrame, timestampUs = 0n, rotation = VideoRotation.VIDEO_ROTATION_0) {
-    const req = new CaptureVideoFrameRequest({
+    const req = create(CaptureVideoFrameRequestSchema, {
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo(),
       rotation,

package/src/video_stream.ts

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
+import { create } from '@bufbuild/protobuf';
+import { Mutex } from '@livekit/mutex';
 import type { FfiEvent } from './ffi_client.js';
 import { FfiClient, FfiClientEvent, FfiHandle } from './ffi_client.js';
 import type {
@@ -8,9 +10,8 @@ import type {
   VideoRotation,
   VideoStreamInfo,
 } from './proto/video_frame_pb.js';
-import { NewVideoStreamRequest, VideoStreamType } from './proto/video_frame_pb.js';
+import { NewVideoStreamRequestSchema, VideoStreamType } from './proto/video_frame_pb.js';
 import type { Track } from './track.js';
-import { Mutex } from './utils.js';
 import { VideoFrame } from './video_frame.js';
 
 export type VideoFrameEvent = {
@@ -36,7 +37,7 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
   constructor(track: Track) {
     this.track = track;
 
-    const req = new NewVideoStreamRequest({
+    const req = create(NewVideoStreamRequestSchema, {
       type: VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
     });
@@ -48,8 +49,8 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
       },
     });
 
-    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);
   }
@@ -67,7 +68,7 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
       case 'frameReceived':
         const rotation = streamEvent.value.rotation;
         const timestampUs = streamEvent.value.timestampUs;
-        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer);
+        const frame = VideoFrame.fromOwnedInfo(streamEvent.value.buffer!);
         const value = { rotation, timestampUs, frame };
         if (this.queueResolve) {
           this.queueResolve({ done: false, value });

package/dist/utils.d.ts

@@ -1,7 +0,0 @@
-export declare class Mutex {
-    #private;
-    constructor(limit?: number);
-    isLocked(): boolean;
-    lock(): Promise<() => void>;
-}
-//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,qBAAa,KAAK;;gBAKJ,KAAK,SAAI;IAMrB,QAAQ,IAAI,OAAO;IAIb,IAAI,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;CAyBlC"}

package/dist/utils.js

@@ -1,48 +0,0 @@
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Mutex_locking, _Mutex_locks, _Mutex_limit;
-// SPDX-FileCopyrightText: 2024 LiveKit, Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-export class Mutex {
-    constructor(limit = 1) {
-        _Mutex_locking.set(this, void 0);
-        _Mutex_locks.set(this, void 0);
-        _Mutex_limit.set(this, void 0);
-        __classPrivateFieldSet(this, _Mutex_locking, Promise.resolve(), "f");
-        __classPrivateFieldSet(this, _Mutex_locks, 0, "f");
-        __classPrivateFieldSet(this, _Mutex_limit, limit, "f");
-    }
-    isLocked() {
-        return __classPrivateFieldGet(this, _Mutex_locks, "f") >= __classPrivateFieldGet(this, _Mutex_limit, "f");
-    }
-    async lock() {
-        if (__classPrivateFieldGet(this, _Mutex_locks, "f") >= __classPrivateFieldGet(this, _Mutex_limit, "f")) {
-            await __classPrivateFieldGet(this, _Mutex_locking, "f");
-        }
-        __classPrivateFieldSet(this, _Mutex_locks, __classPrivateFieldGet(this, _Mutex_locks, "f") + 1, "f");
-        let unlock;
-        let unlocked = false;
-        const willLock = new Promise((resolve) => (unlock = () => {
-            if (unlocked) {
-                throw new Error('This unlock method has already been called');
-            }
-            unlocked = true;
-            __classPrivateFieldSet(this, _Mutex_locks, __classPrivateFieldGet(this, _Mutex_locks, "f") - 1, "f");
-            resolve();
-        }));
-        __classPrivateFieldSet(this, _Mutex_locking, __classPrivateFieldGet(this, _Mutex_locking, "f").then(() => willLock), "f");
-        return unlock;
-    }
-}
-_Mutex_locking = new WeakMap(), _Mutex_locks = new WeakMap(), _Mutex_limit = new WeakMap();
-//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6C;AAC7C,EAAE;AACF,sCAAsC;AACtC,MAAM,OAAO,KAAK;IAKhB,YAAY,KAAK,GAAG,CAAC;QAJrB,iCAAwB;QACxB,+BAAe;QACf,+BAAe;QAGb,uBAAA,IAAI,kBAAY,OAAO,CAAC,OAAO,EAAE,MAAA,CAAC;QAClC,uBAAA,IAAI,gBAAU,CAAC,MAAA,CAAC;QAChB,uBAAA,IAAI,gBAAU,KAAK,MAAA,CAAC;IACtB,CAAC;IAED,QAAQ;QACN,OAAO,uBAAA,IAAI,oBAAO,IAAI,uBAAA,IAAI,oBAAO,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,uBAAA,IAAI,oBAAO,IAAI,uBAAA,IAAI,oBAAO,EAAE,CAAC;YAC/B,MAAM,uBAAA,IAAI,sBAAS,CAAC;QACtB,CAAC;QAED,6FAAe,CAAC,MAAA,CAAC;QAEjB,IAAI,MAAkB,CAAC;QACvB,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,MAAM,QAAQ,GAAG,IAAI,OAAO,CAC1B,CAAC,OAAO,EAAE,EAAE,CACV,CAAC,MAAM,GAAG,GAAG,EAAE;YACb,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAChE,CAAC;YACD,QAAQ,GAAG,IAAI,CAAC;YAChB,6FAAe,CAAC,MAAA,CAAC;YACjB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CACL,CAAC;QAEF,uBAAA,IAAI,kBAAY,uBAAA,IAAI,sBAAS,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAA,CAAC;QACnD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/src/utils.test.ts

@@ -1,47 +0,0 @@
-// SPDX-FileCopyrightText: 2024 LiveKit, Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-import { describe, expect, it } from 'vitest';
-import { Mutex } from './utils';
-
-describe('Mutex', () => {
-  it('should not be locked initially', () => {
-    const mutex = new Mutex();
-    expect(mutex.isLocked()).toBe(false);
-  });
-
-  it('should lock and unlock correctly', async () => {
-    const mutex = new Mutex();
-    const unlock = await mutex.lock();
-    expect(mutex.isLocked()).toBe(true);
-    unlock();
-    expect(mutex.isLocked()).toBe(false);
-  });
-
-  it('should handle multiple locks', async () => {
-    const mutex = new Mutex(2);
-    const unlock1 = await mutex.lock();
-    const unlock2 = await mutex.lock();
-    expect(mutex.isLocked()).toBe(true);
-    unlock1();
-    expect(mutex.isLocked()).toBe(false);
-    const unlock3 = await mutex.lock();
-    expect(mutex.isLocked()).toBe(true);
-    unlock2();
-    expect(mutex.isLocked()).toBe(false);
-    unlock3();
-    expect(mutex.isLocked()).toBe(false);
-  });
-
-  it('should throw an error when unlocking the same lock twice', async () => {
-    const mutex = new Mutex(2);
-    const unlock1 = await mutex.lock();
-    const unlock2 = await mutex.lock();
-    expect(mutex.isLocked()).toBe(true);
-    unlock1();
-    expect(mutex.isLocked()).toBe(false);
-    expect(() => unlock1()).toThrow('This unlock method has already been called');
-    unlock2();
-    expect(mutex.isLocked()).toBe(false);
-  });
-});

package/src/utils.ts

@@ -1,44 +0,0 @@
-// SPDX-FileCopyrightText: 2024 LiveKit, Inc.
-//
-// SPDX-License-Identifier: Apache-2.0
-export class Mutex {
-  #locking: Promise<void>;
-  #locks: number;
-  #limit: number;
-
-  constructor(limit = 1) {
-    this.#locking = Promise.resolve();
-    this.#locks = 0;
-    this.#limit = limit;
-  }
-
-  isLocked(): boolean {
-    return this.#locks >= this.#limit;
-  }
-
-  async lock(): Promise<() => void> {
-    if (this.#locks >= this.#limit) {
-      await this.#locking;
-    }
-
-    this.#locks += 1;
-
-    let unlock: () => void;
-    let unlocked = false;
-
-    const willLock = new Promise<void>(
-      (resolve) =>
-        (unlock = () => {
-          if (unlocked) {
-            throw new Error('This unlock method has already been called');
-          }
-          unlocked = true;
-          this.#locks -= 1;
-          resolve();
-        }),
-    );
-
-    this.#locking = this.#locking.then(() => willLock);
-    return unlock;
-  }
-}