More conversion from string uri to the URI class

Author: Mikael Wills

example/lib/main.dart

@@ -14,7 +14,7 @@ import 'src/dialpad.dart';
 import 'src/register.dart';
 
 void main() {
- // Logger.level = Level.warning;
+ Logger.level = Level.warning;
  if (WebRTC.platformIsDesktop) {
  debugDefaultTargetPlatformOverride = TargetPlatform.fuchsia;
  }

example/lib/src/register.dart

@@ -1,6 +1,7 @@
 import 'package:dart_sip_ua_example/src/user_state/sip_user.dart';
 import 'package:dart_sip_ua_example/src/user_state/sip_user_cubit.dart';
 import 'package:flutter/material.dart';
+import 'package:logger/logger.dart';
 import 'package:provider/provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sip_ua/sip_ua.dart';
@@ -36,6 +37,7 @@ class _MyRegisterWidget extends State<RegisterWidget>
  SIPUAHelper? get helper => widget._helper;
 
  late SipUserCubit currentUser;
+ final Logger _logger = Logger();
 
  @override
  void initState() {
@@ -72,7 +74,7 @@ class _MyRegisterWidget extends State<RegisterWidget>
  _wsUriController.text =
  _preferences.getString('ws_uri') ?? 'wss://tryit.jssip.net:10443';
  _sipUriController.text =
- _preferences.getString('sip_uri') ?? 'hello_flutter@tryit.jssip.net';
+ _preferences.getString('sip_uri') ?? 'sip:hello_flutter@tryit.jssip.net';
  _displayNameController.text =
  _preferences.getString('display_name') ?? 'Flutter SIP UA';
  _passwordController.text = _preferences.getString('password') ?? '';
@@ -126,22 +128,25 @@ class _MyRegisterWidget extends State<RegisterWidget>
 
  _saveSettings();
 
- print('Selected Transport: $_selectedTransport');
- print('WS Extra Headers: $_wsExtraHeaders');
- print('Port: ${_portController.text}');
- print('Display Name: ${_displayNameController.text}');
- print('Password: ${_passwordController.text}');
- print('Auth User: ${_authorizationUserController.text}');
- print("Sip URI: ${_sipUriController.text}");
+ try {
+  String inputUri = _sipUriController.text;
+  if (!RegExp(r'^sip:').hasMatch(inputUri)) {
+  inputUri = 'sip:$inputUri';
+  }
+  URI sipUri = URI.parse(inputUri);
+  sipUri.port ??= int.parse(_portController.text);
 
- currentUser.register(SipUser(
- selectedTransport: _selectedTransport,
- wsExtraHeaders: _wsExtraHeaders,
- sipUri: _sipUriController.text,
- port: _portController.text,
- displayName: _displayNameController.text,
- password: _passwordController.text,
- authUser: _authorizationUserController.text));
+ currentUser.register(SipUser(
+ selectedTransport: _selectedTransport,
+ wsExtraHeaders: _wsExtraHeaders,
+ sipUri: sipUri,
+ port: _portController.text,
+ displayName: _displayNameController.text,
+ password: _passwordController.text,
+ authUser: _authorizationUserController.text));
+ } catch (e) {
+ _logger.w("Your sip URI format is incorrect: $e");
+ }
  }
 
  @override

example/lib/src/user_state/sip_user.dart

@@ -4,7 +4,7 @@ class SipUser {
  final String port;
  final String displayName;
  final String? wsUrl;
- final String? sipUri;
+ final URI sipUri;
  final String password;
  final String authUser;
  final TransportType selectedTransport;
@@ -18,7 +18,7 @@ class SipUser {
  required this.selectedTransport,
  this.wsExtraHeaders,
  this.wsUrl,
- this.sipUri,
+  required this.sipUri,
  });
 
  @override

example/lib/src/user_state/sip_user_cubit.dart

@@ -6,25 +6,22 @@ class SipUserCubit extends Cubit<SipUser?> {
  final SIPUAHelper sipHelper;
  SipUserCubit({required this.sipHelper}) : super(null);
 
-
  void register(SipUser user) {
- UaSettings settings = UaSettings();
- settings.port = user.port;
+ UaSettings settings = UaSettings(
+ uri: user.sipUri,
+ transportType: user.selectedTransport,
+ webSocketUrl: user.wsUrl,
+ authorizationUser: user.authUser,
+ password: user.password,
+ displayName: user.displayName,
+ userAgent: 'Dart SIP Client v1.0.0',
+ dtmfMode: DtmfMode.RFC2833,
+ contact_uri: user.sipUri,
+ );
  settings.webSocketSettings.extraHeaders = user.wsExtraHeaders ?? {};
  settings.webSocketSettings.allowBadCertificate = true;
  //settings.webSocketSettings.userAgent = 'Dart/2.8 (dart:io) for OpenSIPS.';
- settings.tcpSocketSettings.allowBadCertificate = true;
- settings.transportType = user.selectedTransport;
- settings.uri = user.sipUri;
- settings.webSocketUrl = user.wsUrl;
- settings.host = user.sipUri?.split('@')[1];
- settings.authorizationUser = user.authUser;
- settings.password = user.password;
- settings.displayName = user.displayName;
- settings.userAgent = 'Dart SIP Client v1.0.0';
- settings.dtmfMode = DtmfMode.RFC2833;
- settings.contact_uri = 'sip:${user.sipUri}';
-
+ 
  emit(user);
  sipHelper.start(settings);
  }

lib/src/config.dart

@@ -96,21 +96,20 @@ class Checks {
  dst!.sockets = copy;
  },
  'uri': (Settings src, Settings? dst) {
- dynamic uri = src.uri;
  if (src.uri == null && dst!.uri == null) {
  throw Exceptions.ConfigurationError('uri', null);
  }
- if (!uri.contains(RegExp(r'^sip:', caseSensitive: false))) {
- uri = '${DartSIP_C.SIP}:$uri';
+ URI uri = src.uri!;
+ if (uri.host == null) {
+ throw Exceptions.ConfigurationError('uri.host', null);
  }
- dynamic parsed = URI.parse(uri);
- if (parsed == null) {
- throw Exceptions.ConfigurationError('uri', parsed);
- } else if (parsed.user == null) {
- throw Exceptions.ConfigurationError('uri', parsed);
- } else {
- dst!.uri = parsed;
+ if (uri.port == null) {
+ throw Exceptions.ConfigurationError('uri.port', null);
+ }
+ if (uri.scheme == null) {
+ throw Exceptions.ConfigurationError('uri.scheme', null);
  }
+ dst!.uri = src.uri;
  },
  'transport_type': (Settings src, Settings? dst) {
  dynamic transportType = src.transportType;

lib/src/sip_ua_helper.dart

@@ -151,9 +151,7 @@ class SIPUAHelper extends EventManager {
  _settings.sockets = <SIPUASocketInterface>[];
 
  if (uaSettings.transportType == TransportType.TCP) {
- SIPUATcpSocket socket = SIPUATcpSocket(
- uaSettings.host ?? '0.0.0.0', uaSettings.port ?? '5060',
- messageDelay: 1);
+ SIPUATcpSocket socket = SIPUATcpSocket(uaSettings.uri, messageDelay: 1);
  _settings.sockets!.add(socket);
  }
 
@@ -166,7 +164,7 @@ class SIPUAHelper extends EventManager {
  }
 
  _settings.transportType = uaSettings.transportType!;
- _settings.uri = uaSettings.uri != null ? URI.parse(uaSettings.uri!) : null;
+ _settings.uri = uaSettings.uri;
  _settings.sip_message_delay = uaSettings.sip_message_delay;
  _settings.realm = uaSettings.realm;
  _settings.password = uaSettings.password;
@@ -186,9 +184,7 @@ class SIPUAHelper extends EventManager {
  uaSettings.sessionTimersRefreshMethod;
  _settings.instance_id = uaSettings.instanceId;
  _settings.registrar_server = uaSettings.registrarServer;
- _settings.contact_uri = uaSettings.contact_uri != null
- ? URI.parse(uaSettings.contact_uri!)
- : null;
+ _settings.contact_uri = uaSettings.contact_uri;
  _settings.connection_recovery_max_interval =
  uaSettings.connectionRecoveryMaxInterval;
  _settings.connection_recovery_min_interval =
@@ -853,6 +849,50 @@ extension _IceTransportPolicyEncoding on IceTransportPolicy {
 }
 
 class UaSettings {
+ UaSettings({
+ required this.uri,
+ this.register,
+ this.register_expires,
+ this.userAgent,
+ this.webSocketUrl,
+ this.realm,
+ this.authorizationUser,
+ this.password,
+ this.ha1,
+ this.displayName,
+ this.instanceId,
+ this.registrarServer,
+ this.contact_uri,
+ this.transportType,
+ this.dtmfMode = DtmfMode.INFO,
+ this.sessionTimers = true,
+ this.iceGatheringTimeout = 500,
+ this.connectionRecoveryMaxInterval = 30,
+ this.connectionRecoveryMinInterval = 2,
+ this.terminateOnMediaPortZero = false,
+ this.sip_message_delay = 0,
+ this.iceServers = const <Map<String, String>>[
+ <String, String>{'urls': 'stun:stun.l.google.com:19302'},
+ ],
+ this.iceTransportPolicy,
+ this.sessionTimersRefreshMethod = DartSIP_C.SipMethod.UPDATE,
+ }) {
+ _validateUri(uri);
+ }
+ // Validate the URI (host, port, scheme) without assigning it
+ static void _validateUri(URI uri) {
+ if (uri.host == null || uri.host.isEmpty) {
+ throw ArgumentError('Invalid URI: Missing host');
+ }
+ if (uri.port == null) {
+ throw ArgumentError('Invalid URI: Missing port');
+ }
+ if (uri.scheme == null || uri.scheme.isEmpty) {
+ print('URI: Missing scheme, adding sip');
+ uri.scheme = DartSIP_C.SIP;
+ }
+ }
+
  WebSocketSettings webSocketSettings = WebSocketSettings();
  TcpSocketSettings tcpSocketSettings = TcpSocketSettings();
 
@@ -867,10 +907,8 @@ class UaSettings {
  RegisterParams registerParams = RegisterParams();
 
  /// `User Agent` field for sip message.
+ final URI uri;
  String? userAgent;
- String? host;
- String? port;
- String? uri;
  String? webSocketUrl;
  String? realm;
  String? authorizationUser;
@@ -879,7 +917,7 @@ class UaSettings {
  String? displayName;
  String? instanceId;
  String? registrarServer;
- String? contact_uri;
+ URI? contact_uri;
 
  TransportType? transportType;
 

lib/src/transports/tcp_socket.dart

@@ -5,19 +5,18 @@ import 'socket_interface.dart';
 import 'tcp_socket_impl.dart';
 
 class SIPUATcpSocket extends SIPUASocketInterface {
- SIPUATcpSocket(String host, String port,
+ SIPUATcpSocket(URI uri,
  {required int messageDelay,
  TcpSocketSettings? tcpSocketSettings,
  int? weight})
  : _messageDelay = messageDelay {
- logger.d('new() [host:$host:$port]');
+ logger.d('new() [host:${uri.host}:${uri.port}]');
  String transport_scheme = 'tcp';
  _weight = weight;
- _host = host;
- _port = port;
-
- _sip_uri = 'sip:$host:$port;transport=$transport_scheme';
- logger.d('TCPC SIP URI: $_sip_uri');
+ _host = uri.host;
+ _port = uri.port.toString();
+ _sip_uri = uri.toString();
+ logger.d('TCP SIP URI: $sip_uri');
  _via_transport = transport_scheme.toUpperCase();
  _tcpSocketSettings = tcpSocketSettings ?? TcpSocketSettings();
  }
@@ -37,6 +36,9 @@ class SIPUATcpSocket extends SIPUASocketInterface {
  int? status;
  late TcpSocketSettings _tcpSocketSettings;
 
+ @override
+ String? get sip_uri => _sip_uri;
+
  @override
  String get via_transport => _via_transport;
 
@@ -48,9 +50,6 @@ class SIPUATcpSocket extends SIPUASocketInterface {
  @override
  int? get weight => _weight;
 
- @override
- String? get sip_uri => _sip_uri;
-
  String? get host => _host;
 
  String? get port => _port;

lib/src/uri.dart

@@ -38,14 +38,13 @@ class URI {
  }
  }
  /**
- * Parse the given string and returns a DartSIP.URI instance or null if
- * it is an invalid URI.
+ * Parse the given string, if incorrect will tell you whats wrong
  */
  static dynamic parse(String uri) {
  try {
  return Grammar.parse(uri, 'SIP_URI');
- } catch (_) {
- return null;
+ } catch (e) {
+ throw FormatException('Uri did not parse: $e');
  }
  }