Merge remote-tracking branch 'origin/main' into benjamin/sip_call_error

protobufs/livekit_sip.proto

@@ -416,7 +416,9 @@ message CreateSIPParticipantRequest {
   // Max call duration.
   google.protobuf.Duration max_call_duration = 12;
 
-  // NEXT ID: 14
+  // Enable voice isolation for the callee.
+  bool enable_krisp = 14;
+  // NEXT ID: 15
 }
 
 message SIPParticipantInfo {
@@ -430,7 +432,7 @@ message TransferSIPParticipantRequest {
   string participant_identity = 1;
   string room_name = 2;
   string transfer_to = 3;
-  
+
   // Optionally play dialtone to the SIP participant as an audible indicator of being transferred
   bool play_dialtone = 4;
 }

protobufs/rpc/io.proto

@@ -21,6 +21,7 @@ option go_package = "github.com/livekit/protocol/rpc";
 import "livekit_egress.proto";
 import "livekit_ingress.proto";
 import "livekit_sip.proto";
+import "rpc/sip.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/duration.proto";
 
@@ -185,11 +186,6 @@ message UpdateSIPCallStateRequest {
    // NEXT ID: 2
 }
 
-enum SIPFeature {
-  NONE = 0;
-  KRISP_ENABLED = 1;
-}
-
 enum SIPDispatchResult {
   LEGACY_ACCEPT_OR_PIN = 0; // check request_pin field
   ACCEPT = 1;

protobufs/rpc/sip.proto

@@ -82,12 +82,14 @@ message InternalCreateSIPParticipantRequest {
   map<string, string> headers = 21;
   map<string, string> headers_to_attributes = 22;
 
+  repeated SIPFeature enabled_features = 25;
+
   // Max time for the callee to answer the call.
   google.protobuf.Duration ringing_timeout = 23;
   // Max call duration.
   google.protobuf.Duration max_call_duration = 24;
 
-  // NEXT ID: 25
+  // NEXT ID: 26
 }
 
 message InternalCreateSIPParticipantResponse {
@@ -99,7 +101,12 @@ message InternalCreateSIPParticipantResponse {
 message InternalTransferSIPParticipantRequest {
   string sip_call_id = 1;
   string transfer_to = 2;
- 
+
   // Optionally play dialtone to the SIP participant as an audible indicator of being transferred
   bool play_dialtone = 3;
 }
+
+enum SIPFeature {
+  NONE = 0;
+  KRISP_ENABLED = 1;
+}

rpc/sip.go

@@ -45,6 +45,12 @@ func NewCreateSIPParticipantRequest(
 		attrs[livekit.AttrSIPPhoneNumber] = req.SipCallTo
 		attrs[livekit.AttrSIPTrunkNumber] = outboundNumber
 	}
+
+	var features []SIPFeature
+	if req.EnableKrisp {
+		features = append(features, SIPFeature_KRISP_ENABLED)
+	}
+
 	return &InternalCreateSIPParticipantRequest{
 		ProjectId:             projectID,
 		SipCallId:             callID,
@@ -67,6 +73,7 @@ func NewCreateSIPParticipantRequest(
 		PlayDialtone:          req.PlayRingtone || req.PlayDialtone,
 		Headers:               trunk.Headers,
 		HeadersToAttributes:   trunk.HeadersToAttributes,
+		EnabledFeatures:       features,
 		RingingTimeout:        req.RingingTimeout,
 		MaxCallDuration:       req.MaxCallDuration,
 	}, nil

utils/guid/id.go

@@ -30,10 +30,7 @@ import (
 	"github.com/livekit/protocol/utils/must"
 )
 
-const (
-	Size            = 12
-	guidScratchSize = Size + 10
-)
+const Size = 12
 
 const (
 	RoomPrefix            = "RM_"
@@ -57,7 +54,7 @@ const (
 
 var guidGeneratorPool = sync.Pool{
 	New: func() any {
-		return must.Get(newGenerator(guidScratchSize))
+		return must.Get(newGenerator())
 	},
 }
 
@@ -96,19 +93,17 @@ func newB57Index() [256]byte {
 }
 
 type guidGenerator struct {
-	scratch []byte
-	rng     *mrand.ChaCha8
+	rng *mrand.ChaCha8
 }
 
-func newGenerator(scratchSize int) (*guidGenerator, error) {
+func newGenerator() (*guidGenerator, error) {
 	var seed [32]byte
 	if _, err := rand.Read(seed[:]); err != nil {
 		return nil, err
 	}
 
 	return &guidGenerator{
-		scratch: make([]byte, scratchSize),
-		rng:     mrand.NewChaCha8(seed),
+		rng: mrand.NewChaCha8(seed),
 	}, nil
 }
 
@@ -130,10 +125,10 @@ func (g *guidGenerator) readIDChars(b []byte) {
 }
 
 func (g *guidGenerator) New(prefix string) string {
-	s := append(g.scratch[:0], make([]byte, len(prefix)+Size)...)
-	copy(s, prefix)
-	g.readIDChars(s[len(prefix):])
-	return string(s)
+	b := make([]byte, len(prefix)+Size)
+	copy(b, prefix)
+	g.readIDChars(b[len(prefix):])
+	return unsafe.String(unsafe.SliceData(b), len(b))
 }
 
 func guidPrefix[T livekit.Guid]() string {

utils/proto.go

@@ -19,3 +19,11 @@ import "google.golang.org/protobuf/proto"
 func CloneProto[T proto.Message](m T) T {
 	return proto.Clone(m).(T)
 }
+
+func CloneProtoSlice[T proto.Message](ms []T) []T {
+	cs := make([]T, len(ms))
+	for i := range ms {
+		cs[i] = CloneProto(ms[i])
+	}
+	return cs
+}