livekit-server-sdk 2.14.0 → 2.14.2

package/src/RoomServiceClient.ts

@@ -22,6 +22,7 @@ import {
   UpdateRoomMetadataRequest,
   UpdateSubscriptionsRequest,
 } from '@livekit/protocol';
+import type { ClientOptions } from './ClientOptions.js';
 import { ServiceBase } from './ServiceBase.js';
 import type { Rpc } from './TwirpRPC.js';
 import { TwirpRpc, livekitPackage } from './TwirpRPC.js';
@@ -120,10 +121,14 @@ export class RoomServiceClient extends ServiceBase {
    * @param host - hostname including protocol. i.e. 'https://<project>.livekit.cloud'
    * @param apiKey - API Key, can be set in env var LIVEKIT_API_KEY
    * @param secret - API Secret, can be set in env var LIVEKIT_API_SECRET
+   * @param options - client options
    */
-  constructor(host: string, apiKey?: string, secret?: string) {
+  constructor(host: string, apiKey?: string, secret?: string, options?: ClientOptions) {
     super(apiKey, secret);
-    this.rpc = new TwirpRpc(host, livekitPackage);
+    const rpcOptions = options?.requestTimeout
+      ? { requestTimeout: options.requestTimeout }
+      : undefined;
+    this.rpc = new TwirpRpc(host, livekitPackage, rpcOptions);
   }
 
   /**

package/src/SipClient.ts

@@ -29,6 +29,8 @@ import {
   SIPDispatchRuleIndividual,
   SIPDispatchRuleInfo,
   SIPInboundTrunkInfo,
+  SIPMediaEncryption,
+  SIPOutboundConfig,
   SIPOutboundTrunkInfo,
   SIPParticipantInfo,
   SIPTransport,
@@ -38,6 +40,7 @@ import {
   UpdateSIPInboundTrunkRequest,
   UpdateSIPOutboundTrunkRequest,
 } from '@livekit/protocol';
+import type { ClientOptions } from './ClientOptions.js';
 import { ServiceBase } from './ServiceBase.js';
 import type { Rpc } from './TwirpRPC.js';
 import { TwirpRpc, livekitPackage } from './TwirpRPC.js';
@@ -77,6 +80,7 @@ export interface CreateSipInboundTrunkOptions {
   // Map SIP response headers from INVITE to sip.h.* participant attributes automatically.
   includeHeaders?: SIPHeaderOptions;
   krispEnabled?: boolean;
+  mediaEncryption?: SIPMediaEncryption;
 }
 export interface CreateSipOutboundTrunkOptions {
   metadata?: string;
@@ -92,6 +96,7 @@ export interface CreateSipOutboundTrunkOptions {
   headersToAttributes?: { [key: string]: string };
   // Map SIP response headers from INVITE to sip.h.* participant attributes automatically.
   includeHeaders?: SIPHeaderOptions;
+  mediaEncryption?: SIPMediaEncryption;
 }
 
 export interface SipDispatchRuleDirect {
@@ -187,6 +192,7 @@ export interface SipInboundTrunkUpdateOptions {
   authPassword?: string;
   name?: string;
   metadata?: string;
+  mediaEncryption?: SIPMediaEncryption;
 }
 
 export interface SipOutboundTrunkUpdateOptions {
@@ -198,6 +204,7 @@ export interface SipOutboundTrunkUpdateOptions {
   destinationCountry?: string;
   name?: string;
   metadata?: string;
+  mediaEncryption?: SIPMediaEncryption;
 }
 
 export interface TransferSipParticipantOptions {
@@ -215,10 +222,14 @@ export class SipClient extends ServiceBase {
    * @param host - hostname including protocol. i.e. 'https://<project>.livekit.cloud'
    * @param apiKey - API Key, can be set in env var LIVEKIT_API_KEY
    * @param secret - API Secret, can be set in env var LIVEKIT_API_SECRET
+   * @param options - client options
    */
-  constructor(host: string, apiKey?: string, secret?: string) {
+  constructor(host: string, apiKey?: string, secret?: string, options?: ClientOptions) {
     super(apiKey, secret);
-    this.rpc = new TwirpRpc(host, livekitPackage);
+    const rpcOptions = options?.requestTimeout
+      ? { requestTimeout: options.requestTimeout }
+      : undefined;
+    this.rpc = new TwirpRpc(host, livekitPackage, rpcOptions);
   }
 
   /**
@@ -300,6 +311,7 @@ export class SipClient extends ServiceBase {
         headersToAttributes: opts.headersToAttributes,
         includeHeaders: opts.includeHeaders,
         krispEnabled: opts.krispEnabled,
+        mediaEncryption: opts.mediaEncryption,
       }),
     }).toJson();
 
@@ -346,6 +358,7 @@ export class SipClient extends ServiceBase {
         headersToAttributes: opts.headersToAttributes,
         includeHeaders: opts.includeHeaders,
         destinationCountry: opts.destinationCountry,
+        mediaEncryption: opts.mediaEncryption,
       }),
     }).toJson();
 
@@ -698,6 +711,7 @@ export class SipClient extends ServiceBase {
    * @param number - number to dial
    * @param roomName - room to attach the call to
    * @param opts - CreateSipParticipantOptions
+   * @param outboundTrunkConfig - Optional outbound trunk configuration for sip participant.
    * @returns Created SIP participant
    */
   async createSipParticipant(
@@ -705,6 +719,7 @@ export class SipClient extends ServiceBase {
     number: string,
     roomName: string,
     opts?: CreateSipParticipantOptions,
+    outboundTrunkConfig?: SIPOutboundConfig,
   ): Promise<SIPParticipantInfo> {
     if (opts === undefined) {
       opts = {};
@@ -716,6 +731,7 @@ export class SipClient extends ServiceBase {
 
     const req = new CreateSIPParticipantRequest({
       sipTrunkId: sipTrunkId,
+      trunk: outboundTrunkConfig,
       sipCallTo: number,
       sipNumber: opts.fromNumber,
       roomName: roomName,

package/src/TwirpRPC.ts

@@ -5,7 +5,15 @@ import type { JsonValue } from '@bufbuild/protobuf';
 
 // twirp RPC adapter for client implementation
 
+type Options = {
+  /** Prefix for the RPC requests */
+  prefix?: string;
+  /** Timeout for fetch requests, in seconds. Must be within the valid range for abort signal timeouts. */
+  requestTimeout?: number;
+};
+
 const defaultPrefix = '/twirp';
+const defaultTimeoutSeconds = 60;
 
 export const livekitPackage = 'livekit';
 export interface Rpc {
@@ -48,13 +56,16 @@ export class TwirpRpc {
 
   prefix: string;
 
-  constructor(host: string, pkg: string, prefix?: string) {
+  requestTimeout: number;
+
+  constructor(host: string, pkg: string, options?: Options) {
     if (host.startsWith('ws')) {
       host = host.replace('ws', 'http');
     }
     this.host = host;
     this.pkg = pkg;
-    this.prefix = prefix || defaultPrefix;
+    this.requestTimeout = options?.requestTimeout ?? defaultTimeoutSeconds;
+    this.prefix = options?.prefix || defaultPrefix;
   }
 
   async request(
@@ -62,7 +73,7 @@ export class TwirpRpc {
     method: string,
     data: any, // eslint-disable-line @typescript-eslint/no-explicit-any
     headers: any, // eslint-disable-line @typescript-eslint/no-explicit-any
-    timeout = 60,
+    timeout = this.requestTimeout,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<any> {
     const path = `${this.prefix}/${this.pkg}.${service}/${method}`;

package/src/grants.test.ts

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { TrackSource } from '@livekit/protocol';
 import { describe, expect, it } from 'vitest';
-import type { ClaimGrants, VideoGrant } from './grants.js';
+import type { ClaimGrants, ObservabilityGrant, VideoGrant } from './grants.js';
 import { claimsToJwtPayload } from './grants.js';
 
 describe('ClaimGrants are parsed correctly', () => {
@@ -28,4 +28,16 @@ describe('ClaimGrants are parsed correctly', () => {
       'screen_share_audio',
     ]);
   });
+
+  it('parses ObservabilityGrant correctly', () => {
+    const grant: ObservabilityGrant = {
+      write: true,
+    };
+
+    const claim: ClaimGrants = { observability: grant };
+
+    const jwtPayload = claimsToJwtPayload(claim);
+    expect(jwtPayload.observability).toBeTypeOf('object');
+    expect((jwtPayload.observability as ObservabilityGrant)?.write).toBe(true);
+  });
 });

package/src/grants.ts

@@ -108,12 +108,18 @@ export interface InferenceGrant {
   perform?: boolean;
 }
 
+export interface ObservabilityGrant {
+  /** write grants to publish observability data */
+  write?: boolean;
+}
+
 /** @internal */
 export interface ClaimGrants extends JWTPayload {
   name?: string;
   video?: VideoGrant;
   sip?: SIPGrant;
   inference?: InferenceGrant;
+  observability?: ObservabilityGrant;
   kind?: string;
   metadata?: string;
   attributes?: Record<string, string>;

package/src/index.ts

@@ -4,6 +4,7 @@
 
 export {
   AliOSSUpload,
+  AgentDispatch,
   AudioCodec,
   AutoParticipantEgress,
   AutoTrackEgress,
@@ -36,11 +37,18 @@ export {
   Room,
   RoomAgentDispatch,
   RoomCompositeEgressRequest,
+  RoomConfiguration,
   RoomEgress,
   S3Upload,
+  SIPDispatchRule,
   SIPDispatchRuleInfo,
+  SIPDispatchRuleDirect,
+  SIPDispatchRuleIndividual,
   SIPParticipantInfo,
+  SIPOutboundTrunkInfo,
+  SIPInboundTrunkInfo,
   SIPTrunkInfo,
+  SIPCallStatus,
   SegmentedFileOutput,
   SegmentedFileProtocol,
   StreamOutput,
@@ -61,4 +69,5 @@ export * from './grants.js';
 export * from './IngressClient.js';
 export * from './RoomServiceClient.js';
 export * from './SipClient.js';
+export { TwirpError } from './TwirpRPC.js';
 export * from './WebhookReceiver.js';