feat: migrate to 443 port for relays

Author: ice-hades

lib/app/features/ion_connect/providers/mixins/relay_create_mixin.dart

@@ -3,6 +3,7 @@
 import 'dart:async';
 import 'dart:io' hide WebSocket;
 
+import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:ion/app/exceptions/exceptions.dart';
 import 'package:ion/app/features/core/providers/internet_connection_checker_provider.r.dart';
@@ -46,9 +47,8 @@ mixin RelayCreateMixin {
 
       lastConnectionState = connectionState;
 
-      final usedDomain = proxyDomains.firstWhere(
+      final usedDomain = proxyDomains.firstWhereOrNull(
         (d) => connectUri.host.endsWith(d),
-        orElse: () => '',
       );
 
       final hasInternetConnection = ref.read(hasInternetConnectionProvider);
@@ -62,7 +62,7 @@ mixin RelayCreateMixin {
         // If we connected directly (no proxy domain), clear any previously saved preference.
         ref
             .read(relayProxyDomainPreferenceProvider(url).notifier)
-            .persistPreferredProxyDomain(usedDomain.isEmpty ? null : usedDomain);
+            .persistPreferredProxyDomain(usedDomain);
 
         await ref.read(relayReachabilityProvider.notifier).clear(url);
         return relay;

lib/app/features/ion_connect/providers/relays/relay_proxy_domains_provider.r.dart

@@ -28,15 +28,17 @@ List<String> relaysProxyDomains(Ref ref) {
 /// Candidates are returned in the following order:
 /// 1) Preferred proxy URI (if saved for this logical relay)
 /// 2) The original logical relay URI (direct IP)
-/// 3) Remaining proxy URIs built as `wss://<sha256(ip)[0:16]>.443`
+/// 3) Remaining proxy URIs built as `wss://<sha256(ip)[0:16]>.domain:443`
 @riverpod
 List<Uri> relayConnectUris(Ref ref, String logicalRelayUrl) {
   final logicalUri = Uri.parse(logicalRelayUrl);
+  final normalizedLogicalUri =
+      (logicalUri.hasPort && logicalUri.port == 4443) ? logicalUri.replace(port: 443) : logicalUri;
   final ip = logicalUri.host;
 
   // If we can't extract an IP/host, fall back to the original URI only.
   if (ip.isEmpty) {
-    return <Uri>[logicalUri];
+    return <Uri>[normalizedLogicalUri];
   }
 
   final domains = ref.read(relaysProxyDomainsProvider);
@@ -47,9 +49,9 @@ List<Uri> relayConnectUris(Ref ref, String logicalRelayUrl) {
   final normalizedIp = hashHex.substring(0, 16);
 
   Uri proxyUriForDomain(String domain) => Uri(
-        scheme: logicalUri.scheme.isNotEmpty ? logicalUri.scheme : 'wss',
+        scheme: normalizedLogicalUri.scheme.isNotEmpty ? normalizedLogicalUri.scheme : 'wss',
         host: '$normalizedIp.$domain',
-        port: 443,
+        port: normalizedLogicalUri.hasPort ? normalizedLogicalUri.port : null,
       );
 
   final candidates = <Uri>[];
@@ -60,7 +62,7 @@ List<Uri> relayConnectUris(Ref ref, String logicalRelayUrl) {
   }
 
   // Then try direct IP.
-  candidates.add(logicalUri);
+  candidates.add(normalizedLogicalUri);
 
   // Then try the rest of proxy domains.
   for (final domain in domains) {

lib/app/features/user/providers/relays/user_relays_manager.r.dart

@@ -238,13 +238,35 @@ class UserRelaysManager extends _$UserRelaysManager {
   }
 }
 
+String normalizeRelayUrl(String raw) {
+  final trimmed = raw.trim();
+  if (trimmed.isEmpty) return trimmed;
+
+  try {
+    final uri = Uri.parse(trimmed);
+
+    // Migration: old relays used :4443, new standard is :443.
+    if (uri.hasPort && uri.port == 4443) {
+      return uri.replace(port: 443).toString();
+    }
+
+    return uri.toString();
+  } catch (_) {
+    // If parsing fails, keep the original string.
+    return trimmed;
+  }
+}
+
 @riverpod
 Future<UserRelaysEntity?> currentUserRelays(Ref ref) async {
   final identityConnectRelays = await ref.watch(currentUserIdentityConnectRelaysProvider.future);
   if (identityConnectRelays == null) {
     return null;
   }
-  final updatedUserRelays = UserRelaysData(list: identityConnectRelays);
+
+  final updatedUserRelays = UserRelaysData(
+    list: identityConnectRelays.map((r) => r.copyWith(url: normalizeRelayUrl(r.url))).toList(),
+  );
   final userRelaysEvent =
       await ref.read(ionConnectNotifierProvider.notifier).sign(updatedUserRelays);
 
@@ -254,7 +276,7 @@ Future<UserRelaysEntity?> currentUserRelays(Ref ref) async {
 extension IonConnectRelayInfoToUserRelay on IonConnectRelayInfo {
   UserRelay toUserRelay() {
     return UserRelay(
-      url: url,
+      url: normalizeRelayUrl(url),
       write: type == null || type == IonConnectRelayType.write,
       read: type == null || type == IonConnectRelayType.read,
     );

packages/ion_identity_client/lib/src/users/available_ion_connect_relays/data_sources/available_ion_connect_relays_data_source.dart

@@ -7,6 +7,18 @@ import 'package:ion_identity_client/src/core/storage/token_storage.dart';
 import 'package:ion_identity_client/src/core/types/request_headers.dart';
 import 'package:ion_identity_client/src/users/available_ion_connect_relays/models/available_ion_connect_relays_response.f.dart';
 
+String normalizeRelayUrlNo443(String raw) {
+  final uri = Uri.tryParse(raw.trim());
+  if (uri == null) return raw.trim();
+
+  // Only strip explicit :443 for secure websockets.
+  if (uri.scheme == 'wss' && uri.hasPort && uri.port == 443) {
+    return uri.replace(port: 0).toString(); // port:0 removes the explicit port
+  }
+
+  return uri.toString();
+}
+
 class AvailableIONConnectRelaysDataSource {
   AvailableIONConnectRelaysDataSource(
     this._networkClient,
@@ -33,7 +45,7 @@ class AvailableIONConnectRelaysDataSource {
       headers: RequestHeaders.getTokenHeader(
         token: token.token,
       ),
-      queryParams: {'ion-connect-relay': relayUrl},
+      queryParams: {'ion-connect-relay': normalizeRelayUrlNo443(relayUrl)},
       decoder: (result, _) =>
           parseJsonObject(result, fromJson: AvailableIONConnectRelaysResponse.fromJson),
     );