Update timeout callkit, stringee call model

taipv-stringee · taipv-stringee · commit b684cc307f21 · 2024-05-30T10:26:15.000+07:00
diff --git a/call_sample/lib/stringee_wrapper/call/stringee_call_model.dart b/call_sample/lib/stringee_wrapper/call/stringee_call_model.dart
@@ -64,6 +64,8 @@ class StringeeCallModel extends ChangeNotifier {
   Timer? _timer;
   bool _startedTimer = false;
 
+  Timer? _callTimeOutTimer;
+
   /// call time
   String _time = '00:00';
   String get time => _time;
@@ -85,6 +87,9 @@ class StringeeCallModel extends ChangeNotifier {
     _isClickedAnswer = value;
   }
 
+  // flag to check media state is connected
+  bool _mediaStateDidConnected = false;
+
   /// check to end call by reject or hangup
   bool get isShouldReject => isIncomingCall && !_isClickedAnswer;
 
@@ -104,6 +109,14 @@ class StringeeCallModel extends ChangeNotifier {
     // if (!isIncomingCall) {
     //   makeCall();
     // }
+
+    // start time out
+    _callTimeOutTimer =
+        Timer(Duration(seconds: StringeeWrapper().callTimeout), () {
+      if (!_mediaStateDidConnected) {
+        _endCall();
+      }
+    });
   }
 
   _handleStringeeCallEvent(Map<dynamic, dynamic> event) async {
@@ -203,6 +216,10 @@ class StringeeCallModel extends ChangeNotifier {
 
   void _handleMediaStateChangeEvent(StringeeMediaState state) {
     _mediaState = state;
+    if (state == StringeeMediaState.connected) {
+      _mediaStateDidConnected = true;
+      _callTimeOutTimer?.cancel();
+    }
     notifyListeners();
   }
 
diff --git a/call_sample/lib/stringee_wrapper/push_manager/call_kit_model.dart b/call_sample/lib/stringee_wrapper/push_manager/call_kit_model.dart
@@ -0,0 +1,51 @@
+import 'dart:async';
+
+import '../call/stringee_call_model.dart';
+import 'callkeep_manager.dart';
+
+class CallKitModel {
+  // call uuid handled by callkit
+  String? uuid;
+  // call id of the stringee call
+  String? callId;
+  // serial of the stringee call
+  int? serial;
+  // stringee call model
+  StringeeCallModel? callModel;
+
+  final int timeout;
+
+  /// [CallKitModel] constructor
+  /// all params do not required
+  /// if have [uuid] and do not have [callModel], start timeout to end call
+  CallKitModel({
+    this.uuid,
+    this.callId,
+    this.serial,
+    this.timeout = 8,
+    this.callModel,
+  }) {
+    _count = timeout;
+
+    if (callModel == null && uuid != null) {
+      _startCountTimeout();
+    }
+  }
+
+  Timer? _timer;
+  int _count = 0;
+  int get count => _count;
+
+  _startCountTimeout() {
+    _timer?.cancel();
+    _timer = Timer(Duration(seconds: timeout), () {
+      if (uuid != null) {
+        CallkeepManager().callkeep.endCall(uuid!);
+      }
+    });
+  }
+
+  stopCountTimeout() {
+    _timer?.cancel();
+  }
+}
diff --git a/call_sample/lib/stringee_wrapper/push_manager/callkeep_manager.dart b/call_sample/lib/stringee_wrapper/push_manager/callkeep_manager.dart
@@ -1,25 +1,13 @@
+import 'dart:async';
+
 import 'package:call_sample/stringee_wrapper/call/stringee_call_manager.dart';
 import 'package:call_sample/stringee_wrapper/common/result.dart';
 import 'package:callkeep/callkeep.dart';
 import 'package:flutter/foundation.dart';
 import 'package:uuid/uuid.dart';
 
 import '../call/stringee_call_model.dart';
-
-class CallKitModel {
-  // call uuid handled by callkit
-  String? uuid;
-  // call id of the stringee call
-  String? callId;
-  // serial of the stringee call
-  int? serial;
-
-  CallKitModel({
-    this.uuid,
-    this.callId,
-    this.serial,
-  });
-}
+import 'call_kit_model.dart';
 
 class CallkeepManager {
   static final CallkeepManager _instance = CallkeepManager._internal();
@@ -36,11 +24,12 @@ class CallkeepManager {
   bool get isActiveAudio => _isActiveAudio;
 
   // current call uuid handled by callkit
+  // to handle multi call change to list if needed
   CallKitModel _currentCallKit = CallKitModel();
 
   /// list of handled call uuids (handled by callkit) but not found in stringee calls
   /// end/answer call in callkit but not have stringee call to handle
-  // final List<CallKitModel> _handledCallUuids = [];
+  final List<CallKitModel> _handledCallUuids = [];
 
   String _pushToken = '';
   String get pushToken => _pushToken;
@@ -61,6 +50,7 @@ class CallkeepManager {
       uuid: uuid,
       callId: stringeeCallModel.call.callId,
       serial: stringeeCallModel.call.serial,
+      callModel: stringeeCallModel,
     );
     debugPrint(
         'reportOutgoingCallIfNeeded uuid: $uuid ${stringeeCallModel.call.to} ${stringeeCallModel.call.toAlias}');
@@ -79,6 +69,7 @@ class CallkeepManager {
         uuid: uuid,
         callId: stringeeCallModel.call.callId,
         serial: stringeeCallModel.call.serial,
+        callModel: stringeeCallModel,
       );
       await callkeep.displayIncomingCall(
         uuid,
@@ -93,6 +84,17 @@ class CallkeepManager {
       // call already handled from pushkit
       // set current uuid to call model
       stringeeCallModel.setUuid(_currentCallKit.uuid!);
+      _currentCallKit.callModel = stringeeCallModel;
+      _currentCallKit.stopCountTimeout();
+
+      // check if call have answer in callkit before if needed
+      if (_handledCallUuids
+          .where((element) => element.uuid == _currentCallKit.uuid)
+          .isNotEmpty) {
+        StringeeCallManager().answerStringeeCall(stringeeCallModel);
+        _handledCallUuids
+            .removeWhere((element) => element.uuid == _currentCallKit.uuid);
+      }
     } else {
       // TODO: - incoming all different current call from pushkit
     }
@@ -295,6 +297,9 @@ class CallkeepManager {
       StringeeCallManager().answerStringeeCall(call);
     } else {
       /// store uuid to handle later
+      if (_currentCallKit.uuid != null) {
+        _handledCallUuids.add(_currentCallKit);
+      }
     }
   }
 }
diff --git a/call_sample/lib/stringee_wrapper/stringee_wrapper.dart b/call_sample/lib/stringee_wrapper/stringee_wrapper.dart
@@ -41,6 +41,8 @@ class StringeeWrapper {
 
   StringeeListener? get stringeeListener => _stringeeListener;
 
+  // timeout for call
+  int callTimeout = 60;
   bool _isEnablePush = false;
   bool get isEnablePush => _isEnablePush;
   bool get connected => _stringeeClient.hasConnected;
