From f2048783ff2e8a6d735f13438015c805b40f5127 Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Mon, 23 Jan 2023 15:24:50 +0100 Subject: [PATCH 1/6] feat(w2cCallMe): Add header to call session --- lib/src/rtc_session.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/src/rtc_session.dart b/lib/src/rtc_session.dart index dd021c64..f895ddac 100644 --- a/lib/src/rtc_session.dart +++ b/lib/src/rtc_session.dart @@ -122,6 +122,7 @@ class RTCSession extends EventManager implements Owner { // Session info. String? _direction; + String? _w2cCallMe; NameAddrHeader? _local_identity; NameAddrHeader? _remote_identity; DateTime? _start_time; @@ -173,6 +174,8 @@ class RTCSession extends EventManager implements Owner { String? get direction => _direction; + String? get w2cCallMe => _w2cCallMe; + NameAddrHeader? get local_identity => _local_identity; NameAddrHeader? get remote_identity => _remote_identity; @@ -342,6 +345,7 @@ class RTCSession extends EventManager implements Owner { [Function(RTCSession)? initCallback]) { logger.d('init_incoming()'); + _w2cCallMe = request.getHeader('X-w2c-call-me'); int? expires; String? contentType = request.getHeader('Content-Type'); From f5b7b8e8cb30a38ce9aa9b129600e88ac3ac77d6 Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Mon, 30 Jan 2023 15:54:42 +0100 Subject: [PATCH 2/6] fix(session): Rename callMe to c2cID --- lib/src/rtc_session.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/rtc_session.dart b/lib/src/rtc_session.dart index f895ddac..98907132 100644 --- a/lib/src/rtc_session.dart +++ b/lib/src/rtc_session.dart @@ -345,7 +345,7 @@ class RTCSession extends EventManager implements Owner { [Function(RTCSession)? initCallback]) { logger.d('init_incoming()'); - _w2cCallMe = request.getHeader('X-w2c-call-me'); + _w2cCallMe = request.getHeader('X-w2c-c2c-id'); int? expires; String? contentType = request.getHeader('Content-Type'); From 7cf2817494ba6b2e05a668dcca5917be402c961a Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Mon, 30 Jan 2023 16:06:44 +0100 Subject: [PATCH 3/6] fix(session): Rename callMe to c2cID --- lib/src/rtc_session.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/rtc_session.dart b/lib/src/rtc_session.dart index 98907132..0ce77b68 100644 --- a/lib/src/rtc_session.dart +++ b/lib/src/rtc_session.dart @@ -122,7 +122,7 @@ class RTCSession extends EventManager implements Owner { // Session info. String? _direction; - String? _w2cCallMe; + String? _w2cC2CId; NameAddrHeader? _local_identity; NameAddrHeader? _remote_identity; DateTime? _start_time; @@ -174,7 +174,7 @@ class RTCSession extends EventManager implements Owner { String? get direction => _direction; - String? get w2cCallMe => _w2cCallMe; + String? get w2cC2CId => _w2cC2CId; NameAddrHeader? get local_identity => _local_identity; @@ -345,7 +345,7 @@ class RTCSession extends EventManager implements Owner { [Function(RTCSession)? initCallback]) { logger.d('init_incoming()'); - _w2cCallMe = request.getHeader('X-w2c-c2c-id'); + _w2cC2CId = request.getHeader('X-w2c-c2c-id'); int? expires; String? contentType = request.getHeader('Content-Type'); From d2b40b9e4cbe5463cd30b5668ad20503d52ea276 Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Fri, 17 Feb 2023 15:04:19 +0100 Subject: [PATCH 4/6] feat(callMe): Rename c2c-id to call-me --- lib/src/rtc_session.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/rtc_session.dart b/lib/src/rtc_session.dart index 0ce77b68..c08974f3 100644 --- a/lib/src/rtc_session.dart +++ b/lib/src/rtc_session.dart @@ -345,7 +345,7 @@ class RTCSession extends EventManager implements Owner { [Function(RTCSession)? initCallback]) { logger.d('init_incoming()'); - _w2cC2CId = request.getHeader('X-w2c-c2c-id'); + _w2cC2CId = request.getHeader('X-w2c-call-me'); int? expires; String? contentType = request.getHeader('Content-Type'); From eba38d1092a0b5bf050ef01caa35e5d9e17a9797 Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Tue, 21 Feb 2023 09:56:03 +0100 Subject: [PATCH 5/6] feat(sip): Add toJson debug for session --- lib/src/sip_ua_helper.dart | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/src/sip_ua_helper.dart b/lib/src/sip_ua_helper.dart index cc554d09..85bc6a8c 100644 --- a/lib/src/sip_ua_helper.dart +++ b/lib/src/sip_ua_helper.dart @@ -569,6 +569,34 @@ class Call { return peerHasMediaLine; } + Map toJson() { + var isMuted = _session.isMuted(); + var isOnHold = _session.isOnHold(); + return { + 'id': id + , 'sessionId': _session.id + , 'sessionStatus': _session.status + , 'sessionTerminatedCode': _session.TerminatedCode + , 'sessionContact': _session.contact + , 'sessionDirection': _session.direction + , 'sessionW2cC2CId': _session.w2cC2CId ?? '' + , 'sessionLocalIdentity': local_identity + , 'sessionRemoteIdentity': remote_identity + , 'sessionRemoteDisplayName': remote_display_name + , 'sessionRemoteHasAudio': remote_has_audio + , 'sessionRemoteHasVideo': remote_has_video + , 'sessionStartTime': _session.start_time.toString() + , 'sessionEndTime': _session.end_time.toString() + , 'sessionIsInProgress': _session.isInProgress() + , 'sessionIsEstablished': _session.isEstablished() + , 'sessionIsEnded': _session.isEnded() + , 'sessionIsAudioMuted': isMuted['audio'] + , 'sessionIsVideoMuted': isMuted['video'] + , 'sessionIsLocalOnHold': isOnHold['local'] + , 'sessionIsRemoteOnHold': isOnHold['remote'] + }; + } + Future>? getStats([MediaStreamTrack? track]) { return peerConnection?.getStats(track); } From 8abcea5d89aa91727b35771a064a7fca3bae98a4 Mon Sep 17 00:00:00 2001 From: LeoTayot Date: Tue, 21 Feb 2023 15:21:33 +0100 Subject: [PATCH 6/6] fix(toJson): Delete useless field --- lib/src/sip_ua_helper.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/src/sip_ua_helper.dart b/lib/src/sip_ua_helper.dart index 85bc6a8c..a7e35070 100644 --- a/lib/src/sip_ua_helper.dart +++ b/lib/src/sip_ua_helper.dart @@ -576,7 +576,6 @@ class Call { 'id': id , 'sessionId': _session.id , 'sessionStatus': _session.status - , 'sessionTerminatedCode': _session.TerminatedCode , 'sessionContact': _session.contact , 'sessionDirection': _session.direction , 'sessionW2cC2CId': _session.w2cC2CId ?? ''