@livekit/rtc-node 0.12.2 → 0.13.0

package/src/track_publication.ts

@@ -1,12 +1,11 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
 import { FfiClient } from './ffi_client.js';
 import { FfiHandle } from './napi/native.js';
 import type { EncryptionType } from './proto/e2ee_pb.js';
 import type { SetSubscribedResponse } from './proto/room_pb.js';
-import { SetSubscribedRequestSchema } from './proto/room_pb.js';
+import { SetSubscribedRequest } from './proto/room_pb.js';
 import type {
   OwnedTrackPublication,
   TrackKind,
@@ -20,52 +19,52 @@ export abstract class TrackPublication {
   ffiHandle: FfiHandle;
 
   /** @internal */
-  info: TrackPublicationInfo;
+  info?: TrackPublicationInfo;
   track?: Track;
 
   constructor(ownedInfo: OwnedTrackPublication) {
-    this.info = ownedInfo.info!;
-    this.ffiHandle = new FfiHandle(ownedInfo!.handle!.id);
+    this.info = ownedInfo.info;
+    this.ffiHandle = new FfiHandle(ownedInfo.handle!.id!);
   }
 
-  get sid(): string {
-    return this.info.sid;
+  get sid(): string | undefined {
+    return this.info?.sid;
   }
 
-  get name(): string {
-    return this.info.name;
+  get name(): string | undefined {
+    return this.info?.name;
   }
 
-  get kind(): TrackKind {
-    return this.info.kind;
+  get kind(): TrackKind | undefined {
+    return this.info?.kind;
   }
 
-  get source(): TrackSource {
-    return this.info.source;
+  get source(): TrackSource | undefined {
+    return this.info?.source;
   }
 
-  get simulcasted(): boolean {
-    return this.info.simulcasted;
+  get simulcasted(): boolean | undefined {
+    return this.info?.simulcasted;
   }
 
-  get width(): number {
-    return this.info.width;
+  get width(): number | undefined {
+    return this.info?.width;
   }
 
-  get height(): number {
-    return this.info.height;
+  get height(): number | undefined {
+    return this.info?.height;
   }
 
-  get mimeType(): string {
-    return this.info.mimeType;
+  get mimeType(): string | undefined {
+    return this.info?.mimeType;
   }
 
-  get muted(): boolean {
-    return this.info.muted;
+  get muted(): boolean | undefined {
+    return this.info?.muted;
   }
 
-  get encryptionType(): EncryptionType {
-    return this.info.encryptionType;
+  get encryptionType(): EncryptionType | undefined {
+    return this.info?.encryptionType;
   }
 }
 
@@ -101,7 +100,7 @@ export class RemoteTrackPublication extends TrackPublication {
   }
 
   setSubscribed(subscribed: boolean) {
-    const req = create(SetSubscribedRequestSchema, {
+    const req = new SetSubscribedRequest({
       subscribe: subscribed,
       publicationHandle: this.ffiHandle.handle,
     });

package/src/version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "0.12.2";
+export const SDK_VERSION = "0.13.0";

package/src/video_frame.ts

@@ -1,18 +1,11 @@
 // SPDX-FileCopyrightText: 2024 LiveKit, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
-import { create } from '@bufbuild/protobuf';
-import { FfiClient } from './ffi_client.js';
-import { FfiRequestSchema } from './proto/ffi_pb.js';
-import type {
-  OwnedVideoBuffer,
+import { FfiClient, FfiRequest } from './ffi_client.js';
+import type { OwnedVideoBuffer, VideoConvertResponse } from './proto/video_frame_pb.js';
+import {
   VideoBufferInfo,
   VideoBufferInfo_ComponentInfo,
-  VideoConvertResponse,
-} from './proto/video_frame_pb.js';
-import {
-  VideoBufferInfoSchema,
-  VideoBufferInfo_ComponentInfoSchema,
   VideoBufferType,
 } from './proto/video_frame_pb.js';
 
@@ -36,7 +29,7 @@ export class VideoFrame {
 
   /** @internal */
   protoInfo(): VideoBufferInfo {
-    const info = create(VideoBufferInfoSchema, {
+    const info = new VideoBufferInfo({
       width: this.width,
       height: this.height,
       type: this.type,
@@ -65,12 +58,12 @@ export class VideoFrame {
     const info = owned.info!;
     return new VideoFrame(
       FfiClient.instance.copyBuffer(
-        info.dataPtr,
-        getPlaneLength(info.type, info.width, info.height),
+        info.dataPtr!,
+        getPlaneLength(info.type!, info.width!, info.height!),
       ),
-      info.width,
-      info.height,
-      info.type,
+      info.width!,
+      info.height!,
+      info.type!,
     );
   }
 
@@ -79,11 +72,11 @@ export class VideoFrame {
     if (planeNth >= planeInfos.length) return;
 
     const planeInfo = planeInfos[planeNth]!;
-    return FfiClient.instance.copyBuffer(planeInfo.dataPtr, planeInfo.size);
+    return FfiClient.instance.copyBuffer(planeInfo.dataPtr!, planeInfo.size!);
   }
 
   convert(dstType: VideoBufferType, flipY = false): VideoFrame {
-    const req = create(FfiRequestSchema, {
+    const req = new FfiRequest({
       message: {
         case: 'videoConvert',
         value: {
@@ -94,11 +87,14 @@ export class VideoFrame {
       },
     });
     const resp = FfiClient.instance.request<VideoConvertResponse>(req);
-    if (resp.message.case !== 'buffer') {
-      throw new Error(resp.message.value ?? 'Unknown Error');
-    }
 
-    return VideoFrame.fromOwnedInfo(resp.message.value);
+    switch (resp.message.case) {
+      case 'buffer':
+        return VideoFrame.fromOwnedInfo(resp.message.value);
+      case 'error':
+      default:
+        throw resp.message.value;
+    }
   }
 }
 
@@ -137,108 +133,88 @@ const getPlaneInfos = (
   const chromaHeight = Math.trunc((height + 1) / 2);
   switch (type) {
     case VideoBufferType.I420: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr,
-        stride: width,
-        size: width * height,
-      });
-      const u = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
+      const u = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const v = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: u.dataPtr + BigInt(u.size),
+      const v = new VideoBufferInfo_ComponentInfo({
+        dataPtr: u.dataPtr! + BigInt(u.size!),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
       return [y, u, v];
     }
     case VideoBufferType.I420A: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr,
-        stride: width,
-        size: width * height,
-      });
-      const u = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
+      const u = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const v = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: u.dataPtr + BigInt(u.size),
+      const v = new VideoBufferInfo_ComponentInfo({
+        dataPtr: u.dataPtr! + BigInt(u.size!),
         stride: chromaWidth,
         size: chromaWidth * chromaHeight,
       });
-      const a = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: v.dataPtr + BigInt(v.size),
+      const a = new VideoBufferInfo_ComponentInfo({
+        dataPtr: v.dataPtr! + BigInt(v.size!),
         stride: width,
         size: width * height,
       });
       return [y, u, v, a];
     }
     case VideoBufferType.I422: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr,
-        stride: width,
-        size: width * height,
-      });
-      const u = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
+      const u = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: chromaWidth,
         size: chromaWidth * height,
       });
-      const v = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: u.dataPtr + BigInt(u.size),
+      const v = new VideoBufferInfo_ComponentInfo({
+        dataPtr: u.dataPtr! + BigInt(u.size!),
         stride: chromaWidth,
         size: chromaWidth * height,
       });
       return [y, u, v];
     }
     case VideoBufferType.I444: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr,
-        stride: width,
-        size: width * height,
-      });
-      const u = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
+      const u = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: width,
         size: width * height,
       });
-      const v = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: u.dataPtr + BigInt(u.size),
+      const v = new VideoBufferInfo_ComponentInfo({
+        dataPtr: u.dataPtr! + BigInt(u.size!),
         stride: width,
         size: width * height,
       });
       return [y, u, v];
     }
     case VideoBufferType.I010: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
+      const y = new VideoBufferInfo_ComponentInfo({
         dataPtr,
         stride: width * 2,
         size: width * height * 2,
       });
-      const u = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const u = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,
       });
-      const v = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: u.dataPtr + BigInt(u.size),
+      const v = new VideoBufferInfo_ComponentInfo({
+        dataPtr: u.dataPtr! + BigInt(u.size!),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,
       });
       return [y, u, v];
     }
     case VideoBufferType.NV12: {
-      const y = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr,
-        stride: width,
-        size: width * height,
-      });
-      const uv = create(VideoBufferInfo_ComponentInfoSchema, {
-        dataPtr: y.dataPtr + BigInt(y.size),
+      const y = new VideoBufferInfo_ComponentInfo({ dataPtr, stride: width, size: width * height });
+      const uv = new VideoBufferInfo_ComponentInfo({
+        dataPtr: y.dataPtr! + BigInt(y.size!),
         stride: chromaWidth * 2,
         size: chromaWidth * chromaHeight * 2,
       });

package/src/video_source.ts

@@ -1,7 +1,6 @@
 // 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,
@@ -9,8 +8,8 @@ import type {
   VideoSourceInfo,
 } from './proto/video_frame_pb.js';
 import {
-  CaptureVideoFrameRequestSchema,
-  NewVideoSourceRequestSchema,
+  CaptureVideoFrameRequest,
+  NewVideoSourceRequest,
   VideoRotation,
   VideoSourceType,
 } from './proto/video_frame_pb.js';
@@ -18,7 +17,7 @@ import type { VideoFrame } from './video_frame.js';
 
 export class VideoSource {
   /** @internal */
-  info: VideoSourceInfo;
+  info?: VideoSourceInfo;
   /** @internal */
   ffiHandle: FfiHandle;
 
@@ -29,7 +28,7 @@ export class VideoSource {
     this.width = width;
     this.height = height;
 
-    const req = create(NewVideoSourceRequestSchema, {
+    const req = new NewVideoSourceRequest({
       type: VideoSourceType.VIDEO_SOURCE_NATIVE,
       resolution: {
         width: width,
@@ -44,8 +43,8 @@ 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(
@@ -53,7 +52,7 @@ export class VideoSource {
     timestampUs = BigInt(0),
     rotation = VideoRotation.VIDEO_ROTATION_0,
   ) {
-    const req = create(CaptureVideoFrameRequestSchema, {
+    const req = new CaptureVideoFrameRequest({
       sourceHandle: this.ffiHandle.handle,
       buffer: frame.protoInfo(),
       rotation,
@@ -64,4 +63,8 @@ export class VideoSource {
       message: { case: 'captureVideoFrame', value: req },
     });
   }
+
+  async close() {
+    this.ffiHandle.dispose();
+  }
 }

package/src/video_stream.ts

@@ -1,7 +1,6 @@
 // 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';
@@ -10,7 +9,7 @@ import type {
   VideoRotation,
   VideoStreamInfo,
 } from './proto/video_frame_pb.js';
-import { NewVideoStreamRequestSchema, VideoStreamType } from './proto/video_frame_pb.js';
+import { NewVideoStreamRequest, VideoStreamType } from './proto/video_frame_pb.js';
 import type { Track } from './track.js';
 import { VideoFrame } from './video_frame.js';
 
@@ -22,7 +21,7 @@ export type VideoFrameEvent = {
 
 export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
   /** @internal */
-  info: VideoStreamInfo;
+  info?: VideoStreamInfo;
   /** @internal */
   ffiHandle: FfiHandle;
   /** @internal */
@@ -37,7 +36,7 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
   constructor(track: Track) {
     this.track = track;
 
-    const req = create(NewVideoStreamRequestSchema, {
+    const req = new NewVideoStreamRequest({
       type: VideoStreamType.VIDEO_STREAM_NATIVE,
       trackHandle: track.ffi_handle.handle,
     });
@@ -49,8 +48,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);
   }
@@ -71,9 +70,20 @@ export class VideoStream implements AsyncIterableIterator<VideoFrameEvent> {
         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':