Implementing psrpc mapping to proper codes (#538)

Author: alexlivekit

pkg/errors/errors.go

@@ -15,6 +15,9 @@
 package errors
 
 import (
+	"errors"
+
+	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/psrpc"
 )
 
@@ -26,3 +29,14 @@ var (
 func ErrCouldNotParseConfig(err error) psrpc.Error {
 	return psrpc.NewErrorf(psrpc.InvalidArgument, "could not parse config: %v", err)
 }
+
+// If the provided error wraps a livekit.SIPStatus, this will apply the error code mapping to the resulting error
+func ApplySIPStatus(err error) error {
+	var sipStatus *livekit.SIPStatus
+	if !errors.As(err, &sipStatus) {
+		return err
+	}
+	code := sipStatus.GRPCStatus().Code()
+	err = psrpc.NewError(psrpc.ErrorCodeFromGRPC(code), err, sipStatus)
+	return err
+}

pkg/sip/service.go

@@ -39,6 +39,7 @@ import (
 	"github.com/livekit/sipgo"
 
 	"github.com/livekit/sip/pkg/config"
+	siperrors "github.com/livekit/sip/pkg/errors"
 	"github.com/livekit/sip/pkg/stats"
 	"github.com/livekit/sip/version"
 )
@@ -267,7 +268,8 @@ func (s *Service) Start() error {
 }
 
 func (s *Service) CreateSIPParticipant(ctx context.Context, req *rpc.InternalCreateSIPParticipantRequest) (*rpc.InternalCreateSIPParticipantResponse, error) {
-	return s.cli.CreateSIPParticipant(ctx, req)
+	resp, err := s.cli.CreateSIPParticipant(ctx, req)
+	return resp, siperrors.ApplySIPStatus(err)
 }
 
 func (s *Service) CreateSIPParticipantAffinity(ctx context.Context, req *rpc.InternalCreateSIPParticipantRequest) float32 {
@@ -276,6 +278,11 @@ func (s *Service) CreateSIPParticipantAffinity(ctx context.Context, req *rpc.Int
 }
 
 func (s *Service) TransferSIPParticipant(ctx context.Context, req *rpc.InternalTransferSIPParticipantRequest) (*emptypb.Empty, error) {
+	resp, err := s.transferSIPParticipant(ctx, req)
+	return resp, siperrors.ApplySIPStatus(err)
+}
+
+func (s *Service) transferSIPParticipant(ctx context.Context, req *rpc.InternalTransferSIPParticipantRequest) (*emptypb.Empty, error) {
 	s.log.Infow("transferring SIP call", "callID", req.SipCallId, "transferTo", req.TransferTo)
 
 	// Check if provider is internal and config is set before allowing transfer