@livekit/rtc-node 0.12.2 → 0.13.1

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');
@@ -31,9 +30,9 @@ const DEFAULT_FAILURE_TOLERANCE = -1;
 
 export interface KeyProviderOptions {
   sharedKey?: Uint8Array;
-  ratchetSalt: Uint8Array;
-  ratchetWindowSize: number;
-  failureTolerance: number;
+  ratchetSalt?: Uint8Array;
+  ratchetWindowSize?: number;
+  failureTolerance?: number;
 }
 
 export const defaultKeyProviderOptions: KeyProviderOptions = {
@@ -44,7 +43,7 @@ export const defaultKeyProviderOptions: KeyProviderOptions = {
 
 export interface E2EEOptions {
   keyProviderOptions: KeyProviderOptions;
-  encryptionType: EncryptionType;
+  encryptionType?: EncryptionType;
 }
 
 export const defaultE2EEOptions: E2EEOptions = {
@@ -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,
         }),
@@ -248,7 +247,7 @@ export class FrameCryptor {
 export class E2EEManager {
   private roomHandle = BigInt(0);
   private options: E2EEOptions;
-  private keyProvider?: KeyProvider;
+  private keyProvider: KeyProvider;
 
   enabled: boolean;
 
@@ -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;
-  }
-}

package/src/napi/native.d.ts

@@ -3,15 +3,15 @@
 
 /* auto-generated by NAPI-RS */
 
-export declare function livekitInitialize(
+export function livekitInitialize(
   callback: (data: Uint8Array) => void,
   captureLogs: boolean,
   sdkVersion: string,
 ): void;
-export declare function livekitFfiRequest(data: Uint8Array): Uint8Array;
-export declare function livekitRetrievePtr(handle: Uint8Array): bigint;
-export declare function livekitCopyBuffer(ptr: bigint, len: number): Uint8Array;
-export declare function livekitDispose(): Promise<void>;
+export function livekitFfiRequest(data: Uint8Array): Uint8Array;
+export function livekitRetrievePtr(handle: Uint8Array): bigint;
+export function livekitCopyBuffer(ptr: bigint, len: number): Uint8Array;
+export function livekitDispose(): Promise<void>;
 export declare class FfiHandle {
   constructor(handle: bigint);
   dispose(): void;