Merge branch 'master' of https://github.com/cloudwebrtc/dart-sip-ua

Author: cloudwebrtc

example/lib/src/callscreen.dart

@@ -541,4 +541,9 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
             padding: EdgeInsets.fromLTRB(0.0, 0.0, 0.0, 24.0),
             child: Container(width: 320, child: _buildActionButtons())));
   }
+
+  @override
+  void onNewMessage(SIPMessageRequest msg) {
+    // NO OP
+  }
 }

example/lib/src/dialpad.dart

@@ -18,9 +18,12 @@ class _MyDialPadWidget extends State<DialPadWidget>
   TextEditingController _textController;
   SharedPreferences _preferences;
 
+  String receivedMsg;
+
   @override
   initState() {
     super.initState();
+    receivedMsg = "";
     _bindEventListeners();
     _loadSettings();
   }
@@ -30,6 +33,7 @@ class _MyDialPadWidget extends State<DialPadWidget>
     _dest = _preferences.getString('dest') ?? 'sip:[email protected]';
     _textController = TextEditingController(text: _dest);
     _textController.text = _dest;
+    
     this.setState(() {});
   }
 
@@ -247,6 +251,14 @@ class _MyDialPadWidget extends State<DialPadWidget>
                       style: TextStyle(fontSize: 14, color: Colors.black54),
                     )),
                   ),
+                  Padding(
+                    padding: const EdgeInsets.all(6.0),
+                    child: Center(
+                        child: Text(
+                      'Received Message: ${receivedMsg}',
+                      style: TextStyle(fontSize: 14, color: Colors.black54),
+                    )),
+                  ),
                   Container(
                       child: Column(
                     crossAxisAlignment: CrossAxisAlignment.center,
@@ -270,4 +282,13 @@ class _MyDialPadWidget extends State<DialPadWidget>
       Navigator.pushNamed(context, '/callscreen', arguments: call);
     }
   }
+
+  @override
+  void onNewMessage(SIPMessageRequest msg) {
+     //Save the incoming message to DB
+    String msgBody = msg.request.body as String;
+    setState(() {
+      receivedMsg = msgBody;
+    });
+  }
 }

example/lib/src/register.dart

@@ -301,4 +301,9 @@ class _MyRegisterWidget extends State<RegisterWidget>
 
   @override
   void transportStateChanged(TransportState state) {}
+
+  @override
+  void onNewMessage(SIPMessageRequest msg) {
+    // NO OP
+  }
 }

lib/src/event_manager/event_manager.dart

@@ -3,12 +3,14 @@ import 'call_events.dart';
 import 'refer_events.dart';
 import 'register_events.dart';
 import 'transport_events.dart';
+import 'message_events.dart';
 
 export 'events.dart';
 export 'call_events.dart';
 export 'refer_events.dart';
 export 'register_events.dart';
 export 'transport_events.dart';
+export 'message_events.dart';
 
 import '../logger.dart';
 

lib/src/event_manager/internal_events.dart

@@ -24,13 +24,6 @@ class EventTransactionDestroyed extends EventType {
   EventTransactionDestroyed({this.transaction});
 }
 
-class EventNewMessage extends EventType {
-  dynamic request;
-  String originator;
-  Message message;
-  EventNewMessage({this.message, this.originator, this.request});
-}
-
 class EventSipEvent extends EventType {
   IncomingRequest request;
   EventSipEvent({this.request});

lib/src/event_manager/message_events.dart

@@ -0,0 +1,9 @@
+import '../message.dart';
+import 'events.dart';
+
+class EventNewMessage extends EventType {
+  dynamic request;
+  String originator;
+  Message message;
+  EventNewMessage({this.message, this.originator, this.request});
+}

lib/src/message.dart

@@ -55,8 +55,8 @@ class Message extends EventManager {
     }
 
     // Check target validity.
-    target = this._ua.normalizeTarget(target);
-    if (target == null) {
+    var normalized = this._ua.normalizeTarget(target);
+    if (normalized == null) {
       throw new Exceptions.TypeError('Invalid target: ${originalTarget}');
     }
 
@@ -71,7 +71,7 @@ class Message extends EventManager {
     extraHeaders.add('Content-Type: $contentType');
 
     this._request = new SIPMessage.OutgoingRequest(
-        SipMethod.MESSAGE, target, this._ua, null, extraHeaders);
+      SipMethod.MESSAGE, normalized, this._ua, null, extraHeaders);
     if (body != null) {
       this._request.body = body;
     }

lib/src/parser.dart

@@ -1,3 +1,4 @@
+import 'dart:convert' show utf8;
 import '../sip_ua.dart';
 import 'grammar.dart';
 import 'sip_message.dart';
@@ -86,7 +87,11 @@ IncomingMessage parseMessage(String data, UA ua) {
     if (contentLength is String) {
       contentLength = int.tryParse(contentLength) ?? 0;
     }
-    message.body = data.substring(bodyStart, bodyStart + contentLength);
+        if(contentLength > 0) {
+      var encoded = utf8.encode(data);
+      List<int> content = encoded.sublist(bodyStart, bodyStart + contentLength);
+      message.body = utf8.decode(content);
+    }
   } else {
     message.body = data.substring(bodyStart);
   }

lib/src/sip_message.dart

@@ -1,3 +1,4 @@
+import 'dart:convert' show utf8;
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
 
 import '../sip_ua.dart';
@@ -269,7 +270,10 @@ class OutgoingRequest {
     msg += 'User-Agent: ${userAgent}\r\n';
 
     if (this.body != null) {
-      var length = this.body.length;
+      logger.debug("Outgoing Message: " + this.body);
+      //Here we should calculate the real content length for UTF8
+      var encoded = utf8.encode(this.body);
+      var length = encoded.length;
       msg += 'Content-Length: ${length}\r\n\r\n';
       msg += this.body;
     } else {

lib/src/sip_ua_helper.dart

@@ -80,7 +80,7 @@ class SIPUAHelper extends EventManager {
     return false;
   }
 
-  Call findCall (String id){
+  Call findCall(String id) {
     return _calls[id];
   }
 
@@ -155,18 +155,29 @@ class SIPUAHelper extends EventManager {
               .addAllEventHandlers(_options()['eventHandlers'] as EventManager);
         }
         _calls[event.id] =
-              Call(event.id, session, CallStateEnum.CALL_INITIATION);
+            Call(event.id, session, CallStateEnum.CALL_INITIATION);
         _notifyCallStateListeners(
             event, CallState(CallStateEnum.CALL_INITIATION));
       });
 
+      this._ua.on(EventNewMessage(), (EventNewMessage event) {
+        logger.debug('newMessage => ' + event.toString());
+        //Only notify incoming message to listener
+        if (event.message.direction == 'incoming') {
+          SIPMessageRequest message = new SIPMessageRequest(
+              event.message, event.originator, event.request);
+          _notifyNewMessageListeners(message);
+        }
+      });
+
       _ua.start();
     } catch (event, s) {
       logger.error(event.toString(), null, s);
     }
   }
-  
-  Map<String, Object> buildCallOptions([bool voiceonly = false]) => _options(voiceonly);
+
+  Map<String, Object> buildCallOptions([bool voiceonly = false]) =>
+      _options(voiceonly);
 
   Map<String, Object> _options([bool voiceonly = false]) {
     // Register callbacks to desired call events
@@ -249,19 +260,7 @@ class SIPUAHelper extends EventManager {
 
     var _defaultOptions = {
       'eventHandlers': eventHandlers,
-      'pcConfig': {
-        'iceServers': [
-          {'url': 'stun:stun.l.google.com:19302'},
-          /*
-           * turn server configuration example.
-            {
-              'url': 'turn:123.45.67.89:3478',
-              'username': 'change_to_real_user',
-              'credential': 'change_to_real_secret'
-            },
-          */
-        ]
-      },
+      'pcConfig': {'iceServers': _uaSettings.iceServers},
       'mediaConstraints': {
         'audio': true,
         'video': voiceonly
@@ -343,6 +342,12 @@ class SIPUAHelper extends EventManager {
       listener.callStateChanged(call, state);
     });
   }
+
+  void _notifyNewMessageListeners(SIPMessageRequest msg) {
+    _sipUaHelperListeners.forEach((listener) {
+      listener.onNewMessage(msg);
+    });
+  }
 }
 
 enum CallStateEnum {
@@ -490,10 +495,19 @@ class TransportState {
   TransportState(this.state, {this.cause});
 }
 
+class SIPMessageRequest {
+  dynamic request;
+  String originator;
+  Message message;
+  SIPMessageRequest(this.message, this.originator, this.request);
+}
+
 abstract class SipUaHelperListener {
   void transportStateChanged(TransportState state);
   void registrationStateChanged(RegistrationState state);
   void callStateChanged(Call call, CallState state);
+  //For SIP new messaga coming
+  void onNewMessage(SIPMessageRequest msg);
 }
 
 class UaSettings {
@@ -505,4 +519,14 @@ class UaSettings {
   String authorizationUser;
   String password;
   String displayName;
+
+  List<Map<String, String>> iceServers = [
+    {'url': 'stun:stun.l.google.com:19302'},
+// turn server configuration example.
+//    {
+//      'url': 'turn:123.45.67.89:3478',
+//      'username': 'change_to_real_user',
+//      'credential': 'change_to_real_secret'
+//    },
+  ];
 }