Using the language package

Author: nishadmusthafa

go.mod

@@ -6,7 +6,6 @@ require (
 	buf.build/go/protoyaml v0.6.0
 	github.com/benbjohnson/clock v1.3.5
 	github.com/dennwc/iters v1.1.0
-	github.com/flaticols/countrycodes v0.0.2
 	github.com/frostbyte73/core v0.1.1
 	github.com/fsnotify/fsnotify v1.9.0
 	github.com/gammazero/deque v1.1.0
@@ -40,6 +39,7 @@ require (
 	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
 	golang.org/x/mod v0.25.0
 	golang.org/x/sys v0.34.0
+	golang.org/x/text v0.27.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250721164621-a45f3dfb1074
 	google.golang.org/grpc v1.74.2
 	google.golang.org/protobuf v1.36.6
@@ -88,7 +88,6 @@ require (
 	golang.org/x/crypto v0.40.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
 	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
 	golang.org/x/tools v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
 )

go.sum

@@ -47,8 +47,6 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/flaticols/countrycodes v0.0.2 h1:vedxSqHwG3r7lwUK2bfGFWkVcFv7QuSCKFMkywI/rIE=
-github.com/flaticols/countrycodes v0.0.2/go.mod h1:HCwEez5Z+nf062EOWMPqEh1uLb5QdZSTQmTrq4avBOA=
 github.com/frostbyte73/core v0.1.1 h1:ChhJOR7bAKOCPbA+lqDLE2cGKlCG5JXsDvvQr4YaJIA=
 github.com/frostbyte73/core v0.1.1/go.mod h1:mhfOtR+xWAvwXiwor7jnqPMnu4fxbv1F2MwZ0BEpzZo=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=

livekit/sip.go

@@ -11,8 +11,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/flaticols/countrycodes"
 	"github.com/livekit/protocol/utils/xtwirp"
+	"golang.org/x/text/language"
 )
 
 var (
@@ -687,25 +687,45 @@ func (p *CreateSIPParticipantRequest) Validate() error {
 	}
 
 	// Validate destination if provided
-	if p.Destination != nil {
-		if err := p.Destination.Validate(); err != nil {
-			return err
-		}
-	}
+	p.Destination.Validate()
 
 	return nil
 }
 
 func (d *Destination) Validate() error {
+	if d == nil {
+		return nil
+	}
+
 	// Rule 1: If city is specified, country must be specified
-	if d.City != "" && d.Country == "" {
-		return errors.New("if city is specified, country must also be specified")
+	if d.City != "" && d.Country == "" && d.Region == "" {
+		return errors.New("if city is specified, country or region must also be specified")
 	}
 
-	// Rule 2: If country is specified, it must be a valid ISO 3166-1 alpha-2 code
+	// Rule 2: If country is specified, it must be a valid ISO 3166-1 alpha-2 code (2-letter only)
 	if d.Country != "" {
-		if !countrycodes.IsValidAlpha2(d.Country) {
-			return errors.New("country must be a valid ISO 3166-1 alpha-2 code (e.g., 'US', 'IN', 'UK')")
+		// First check: must be exactly 2 characters
+		if len(d.Country) != 2 {
+			return errors.New("country must be a valid ISO 3166-1 alpha-2 code (2-letter like 'US', 'IN', 'UK')")
+		}
+
+		// Use golang.org/x/text/language to validate 2-letter country codes
+		region, err := language.ParseRegion(d.Country)
+		if err != nil {
+			return errors.New("country must be a valid ISO 3166-1 alpha-2 code (2-letter like 'US', 'IN', 'UK')")
+		}
+
+		// Check if the parsed region is actually a valid country
+		// This is the most direct way to validate - region.IsCountry() returns true
+		// only for actual valid countries, false for invalid codes like "XX"
+		if !region.IsCountry() {
+			return errors.New("country must be a valid ISO 3166-1 alpha-2 code (2-letter like 'US', 'IN', 'UK')")
+		}
+
+		// Additional check: ensure the parsed region matches our input
+		// This prevents 3-letter codes like "USA" from being converted to "US"
+		if region.String() != d.Country {
+			return errors.New("country must be a valid ISO 3166-1 alpha-2 code (2-letter like 'US', 'IN', 'UK')")
 		}
 	}
 

livekit/sip_test.go

@@ -704,3 +704,93 @@ func TestDispatchRuleUpdate(t *testing.T) {
 	require.True(t, r2 != out)
 	require.True(t, proto.Equal(r2, out))
 }
+
+func TestDestinationValidation(t *testing.T) {
+	tests := []struct {
+		name        string
+		destination *Destination
+		expectError bool
+		errorMsg    string
+	}{
+		{
+			name:        "nil destination should pass",
+			destination: nil,
+			expectError: false,
+		},
+		{
+			name:        "empty destination should pass",
+			destination: &Destination{},
+			expectError: false,
+		},
+		{
+			name: "valid country only",
+			destination: &Destination{
+				Country: "US",
+			},
+			expectError: false,
+		},
+		{
+			name: "valid country and city",
+			destination: &Destination{
+				Country: "US",
+				City:    "New York",
+			},
+			expectError: false,
+		},
+		{
+			name: "valid country and region",
+			destination: &Destination{
+				Country: "US",
+				Region:  "us-east-1",
+			},
+			expectError: false,
+		},
+		{
+			name: "city without country or region should fail",
+			destination: &Destination{
+				City: "New York",
+			},
+			expectError: true,
+			errorMsg:    "if city is specified, country or region must also be specified",
+		},
+		{
+			name: "invalid country code - 3 letters",
+			destination: &Destination{
+				Country: "USA",
+			},
+			expectError: true,
+			errorMsg:    "country must be a valid ISO 3166-1 alpha-2 code",
+		},
+		{
+			name: "invalid country code - 1 letter",
+			destination: &Destination{
+				Country: "U",
+			},
+			expectError: true,
+			errorMsg:    "country must be a valid ISO 3166-1 alpha-2 code",
+		},
+		{
+			name: "invalid country code - XX (should fail with IsCountry check)",
+			destination: &Destination{
+				Country: "XX",
+			},
+			expectError: true,
+			errorMsg:    "country must be a valid ISO 3166-1 alpha-2 code",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			err := tt.destination.Validate()
+
+			if tt.expectError {
+				require.Error(t, err)
+				if tt.errorMsg != "" {
+					require.Contains(t, err.Error(), tt.errorMsg)
+				}
+			} else {
+				require.NoError(t, err)
+			}
+		})
+	}
+}