Merge branch 'master' into null-safety

Author: cloudwebrtc

.github/workflows/dart.yml

@@ -1,10 +1,11 @@
-name: Flutter CI
+
+name: Build
 
 on:
  push:
- branches:
-  - dev
-  - master
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
 
 jobs:
  test:
@@ -13,17 +14,16 @@ jobs:
  strategy:
  matrix:
  os: [ubuntu-latest]
-# os: [ubuntu-latest, windows-latest, macos-latest]
+
  steps:
  - uses: actions/checkout@v2
  - uses: actions/setup-java@v1
  with:
  java-version: '12.x'
  - uses: subosito/flutter-action@v1
  with:
- flutter-version: '1.7.8+hotfix.4'
+ flutter-version: '2.2.3'
  channel: 'stable'
- - run: cd example && ./scripts/project_tools.sh create
  - run: flutter packages get
-# - run: flutter test
- - run: cd example && flutter build apk
+ - run: flutter format lib/ test/ --set-exit-if-changed
+ - run: flutter pub run import_sorter:main --no-comments --exit-if-changed

.github/workflows/publish.yaml

@@ -0,0 +1,21 @@
+name: Publish plugin
+
+on:
+ release:
+ types: [published]
+
+jobs:
+ publish:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v1
+ - name: Publish
+ uses: sakebook/actions-flutter-pub-publisher@v1.3.1
+ with:
+ credential: ${{ secrets.CREDENTIAL_JSON }}
+ flutter_package: true
+ skip_test: true
+ dry_run: false

CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
 --------------------------------------------
+[0.3.9] - 2021.09.27
+
+* Upgrade flutter-webrtc to 0.6.8
+
+[0.3.8] - 2021.09.26
+
+* Fix ice delay.
+* Don't run ready if session has been terminated (#226)
+* Support IceRestart when IceStateDisconnected (#218)
+* Add options to the hangup (#224)
+* Adaptive when answering audio or video calls.
+
+[0.3.7] - 2021.08.24
+
+* Fix the issue that unified-plan's onTrack does not call back AudioTrack.
+* Export PeerConnection for call.
+
+[0.3.6] - 2021.08.24
+
+* Support custom MediaStream for call/answer.
+* Fix the exception caused by speaker operation in web mode.
+* bump dependencies (#216)
+* Fix the parameters with double quotes in the Authentication header,
+ and the unknown parameters are saved to auth_params.
+* updated crypto and uuid versions (#188)
+* Update dependency sdp_transform to ^0.3.0
+* Fixed mute audio for unified-plan
+* Add remote_has_audio/video method for Call.
+* Configuring via_transport.
+
 [0.3.5] - 2021.02.03
 
 * Upgrade flutter-webrtc to 0.5.8.

README.md

@@ -1,4 +1,7 @@
 # dart-sip-ua
+
+[![Financial Contributors on Open Collective](https://opencollective.com/flutter-webrtc/all/badge.svg?label=financial+contributors)](https://opencollective.com/flutter-webrtc) [![pub package](https://img.shields.io/pub/v/sip_ua.svg)](https://pub.dartlang.org/packages/sip_ua) [![slack](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=brightgreen)](https://join.slack.com/t/flutterwebrtc/shared_invite/zt-q83o7y1s-FExGLWEvtkPKM8ku_F8cEQ)
+ 
 A dart-lang version of the SIP UA stack, ported from [JsSIP](https://github.com/versatica/JsSIP).
 
 ## Overview

example/lib/src/callscreen.dart

@@ -1,4 +1,6 @@
 import 'dart:async';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 
@@ -151,11 +153,20 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
  @override
  void registrationStateChanged(RegistrationState state) {}
 
+ void _cleanUp() {
+ _localStream?.getTracks()?.forEach((track) {
+ track.stop();
+ });
+ _localStream.dispose();
+ _localStream = null;
+ }
+
  void _backToDialPad() {
  _timer.cancel();
  Timer(Duration(seconds: 2), () {
  Navigator.of(context).pop();
  });
+ _cleanUp();
  }
 
  void _handelStreams(CallState event) async {
@@ -164,7 +175,9 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
  if (_localRenderer != null) {
  _localRenderer.srcObject = stream;
  }
- event.stream?.getAudioTracks()?.first?.enableSpeakerphone(false);
+ if (!kIsWeb && !WebRTC.platformIsDesktop) {
+ event.stream?.getAudioTracks()?.first?.enableSpeakerphone(false);
+ }
  _localStream = stream;
  }
  if (event.originator == 'remote') {
@@ -196,8 +209,28 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
  _timer.cancel();
  }
 
- void _handleAccept() {
- call.answer(helper.buildCallOptions());
+ void _handleAccept() async {
+ bool remote_has_video = call.remote_has_video;
+ final mediaConstraints = <String, dynamic>{
+ 'audio': true,
+ 'video': remote_has_video
+ };
+ MediaStream mediaStream;
+
+ if (kIsWeb && remote_has_video) {
+ mediaStream =
+ await navigator.mediaDevices.getDisplayMedia(mediaConstraints);
+ mediaConstraints['video'] = false;
+ MediaStream userStream =
+ await navigator.mediaDevices.getUserMedia(mediaConstraints);
+ mediaStream.addTrack(userStream.getAudioTracks()[0], addToNative: true);
+ } else {
+ mediaConstraints['video'] = remote_has_video;
+ mediaStream = await navigator.mediaDevices.getUserMedia(mediaConstraints);
+ }
+
+ call.answer(helper.buildCallOptions(!remote_has_video),
+ mediaStream: mediaStream);
  }
 
  void _switchCamera() {
@@ -283,7 +316,9 @@ class _MyCallScreenWidget extends State<CallScreenWidget>
  void _toggleSpeaker() {
  if (_localStream != null) {
  _speakerOn = !_speakerOn;
- _localStream.getAudioTracks()[0].enableSpeakerphone(_speakerOn);
+ if (!kIsWeb) {
+ _localStream.getAudioTracks()[0].enableSpeakerphone(_speakerOn);
+ }
  }
  }
 

example/lib/src/dialpad.dart

@@ -1,6 +1,8 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:sip_ua/sip_ua.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_webrtc/flutter_webrtc.dart';
 
 import 'widgets/action_button.dart';
 
@@ -41,7 +43,8 @@ class _MyDialPadWidget extends State<DialPadWidget>
  helper.addSipUaHelperListener(this);
  }
 
- Widget _handleCall(BuildContext context, [bool voiceonly = false]) {
+ Future<Widget> _handleCall(BuildContext context,
+ [bool voiceonly = false]) async {
  var dest = _textController.text;
  if (dest == null || dest.isEmpty) {
  showDialog<Null>(
@@ -64,7 +67,24 @@ class _MyDialPadWidget extends State<DialPadWidget>
  );
  return null;
  }
- helper.call(dest, voiceonly);
+
+ final mediaConstraints = <String, dynamic>{'audio': true, 'video': true};
+
+ MediaStream mediaStream;
+
+ if (kIsWeb && !voiceonly) {
+ mediaStream =
+ await navigator.mediaDevices.getDisplayMedia(mediaConstraints);
+ mediaConstraints['video'] = false;
+ MediaStream userStream =
+ await navigator.mediaDevices.getUserMedia(mediaConstraints);
+ mediaStream.addTrack(userStream.getAudioTracks()[0], addToNative: true);
+ } else {
+ mediaConstraints['video'] = !voiceonly;
+ mediaStream = await navigator.mediaDevices.getUserMedia(mediaConstraints);
+ }
+
+ helper.call(dest, voiceonly: voiceonly, mediaStream: mediaStream);
  _preferences.setString('dest', dest);
  return null;
  }

lib/src/config.dart

@@ -1,7 +1,6 @@
 import 'package:sip_ua/sip_ua.dart';
-
-import 'constants.dart';
 import 'constants.dart' as DartSIP_C;
+import 'constants.dart';
 import 'exceptions.dart' as Exceptions;
 import 'grammar.dart';
 import 'logger.dart';

lib/src/data.dart

@@ -33,7 +33,7 @@ class ParsedData {
  List<String> qop = <String>[];
  String protocol;
  String realm;
- Map<String, dynamic> auth_params =  <String, dynamic>{};
+ Map<String, dynamic> auth_params = <String, dynamic>{};
  int cause;
  int expires;
  String refresher;

lib/src/grammar.peg

@@ -897,19 +897,20 @@ Proxy_Authenticate <- proxy_authenticate: challenge
 challenge <- (("Digest"i LWS digest_cln (COMMA digest_cln)*)
  / other_challenge) {return data;}
 
-other_challenge <- auth_scheme LWS auth_param (COMMA auth_param)*
+other_challenge <- auth_scheme LWS auth_param (COMMA auth_param)*
+ {return data;}
 
 auth_scheme <- token
 
-auth_param <- key: auth_param_name EQUAL value: ( token / quoted_string ) {
- print(key + ' => ' + value);
- if(data.auth_params == null) data.auth_params = [];
+auth_param <- key: auth_param_name EQUAL value: ( token / quoted_string_clean ) {
+ // print('other_auth_param: ' + key + ' => ' + value);
+ if(data.auth_params == null) data.auth_params = {};
  data.auth_params[key] = value;
  }
 
 auth_param_name <- token
 
-digest_cln <- realm / domain / nonce / opaque / stale / algorithm / qop_options
+digest_cln <- realm / domain / nonce / opaque / stale / algorithm / qop_options / auth_param
 
 realm <- "realm"i EQUAL realm_value
 
@@ -931,7 +932,7 @@ stale <- "stale"i EQUAL stale: token {
  data.stale = stale.toLowerCase() == 'true';
  return stale;}
 
-algorithm <- "algorithm"i EQUAL algorithm: ( "MD5"i / "MD5-sess"i / token ) {
+algorithm <- "algorithm"i EQUAL algorithm: ( "MD5"i / "MD5"i / "MD5-sess"i / token / quoted_string_clean) {
  data.algorithm=algorithm.toUpperCase(); return data.algorithm;}
 
 qop_options <- "qop"i EQUAL LDQUOT (qop_value ("," qop_value)*) RDQUOT