Merge branch 'master' into prod

Author: cybex-dev

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.4
+
+* Add `strictMode` to `CKConfiguration`
+* Fix(web): Instance duplication on getting singleton in web implementation. 
+* update docs
+
 ## 0.0.3+1
 
 * BREAKING CHANGE: Use `WebCallKitWeb` instead of `WebCallKit`.

README.md

@@ -123,6 +123,8 @@ The following described scenarios are valid DisconnectResponses for specific cal
 | disconnecting | local, remote, unknown, error,                           |
 | disconnected  | local, remote, unknown, error,                           |
 
+if `strictMode` is enabled, the following valid `DisconnectResponse`s will be considered, else it will be rejected (and potentially thrown) in a future update.
+
 #### Notification Integration
 
 t.b.c.

lib/src/managers/calls/call_manager.dart

@@ -125,8 +125,12 @@ class CallManager {
           tag: tag);
       return;
     }
+    final c = call.copyWith(
+      state: CKCallState.disconnected,
+    );
+    _calls[uuid] = c;
 
-    final event = DisconnectCallEvent.reason(call, response: response);
+    final event = DisconnectCallEvent.reason(c, response: response);
     _addEvent(event);
   }
 

lib/src/models/config/ck_configuration.dart

@@ -11,7 +11,9 @@ class CKConfiguration {
   final Set<CKCallAttributes> attributes;
   final CKTimer timer;
   final bool notifyOnCallEnd;
+  final bool notifyOnMissedCall;
   final Map<CKCallAction, String> icons;
+  final bool strictMode;
   // final bool repostOnClick;
 
   const CKConfiguration({
@@ -20,13 +22,15 @@ class CKConfiguration {
     this.attributes = const {},
     this.timer = const CKTimer(),
     this.notifyOnCallEnd = true,
+    this.notifyOnMissedCall = true,
     this.icons = const {},
+    this.strictMode = true,
     // this.repostOnClick = true,
   });
 
   @override
   String toString() {
     // return 'CKConfiguration{sounds: $sounds, capabilities: $capabilities, attributes: $attributes, timer: $timer, notifyOnCallEnd: $notifyOnCallEnd, repostOnClick: $repostOnClick}';
-    return 'CKConfiguration{sounds: $sounds, capabilities: $capabilities, attributes: $attributes, timer: $timer, notifyOnCallEnd: $notifyOnCallEnd, icons: $icons}';
+    return 'CKConfiguration{sounds: $sounds, capabilities: $capabilities, attributes: $attributes, timer: $timer, notifyOnCallEnd: $notifyOnCallEnd, icons: $icons, strictMode: $strictMode, notifyOnMissedCall: $notifyOnMissedCall}';
   }
 }

lib/web_callkit_web.dart

@@ -41,7 +41,7 @@ class WebCallkitWeb extends WebCallkitPlatform {
   static WebCallkitWeb get instance => _instance;
 
   static void registerWith(Registrar registrar) {
-    WebCallkitPlatform.instance = WebCallkitWeb._internal();
+    WebCallkitPlatform.instance = _instance;
   }
 
   final Map<String, CallTimer> _timers = {};
@@ -222,10 +222,14 @@ class WebCallkitWeb extends WebCallkitPlatform {
       printDebug("Call with uuid: $uuid not found.", tag: tag);
       return;
     }
-    final validResponses = validCallStateDisconnectResponses[call.state] ?? CKDisconnectResponse.values;
-    if (!validResponses.contains(response)) {
-      printWarning("Invalid response for call state: ${call.state}", tag: tag);
-      return;
+    if (_configuration.strictMode) {
+      final validResponses = validCallStateDisconnectResponses[call.state] ?? CKDisconnectResponse.values;
+      if (!validResponses.contains(response)) {
+        printWarning("Invalid response for call state: ${call.state}", tag: tag);
+        return;
+      }
+    } else {
+      printDebug("Strict mode disabled. Ignoring valid disconnect call state check.", tag: tag);
     }
     _callManager.removeCall(uuid, response: response);
   }
@@ -602,6 +606,17 @@ class WebCallkitWeb extends WebCallkitPlatform {
         if (event is DisconnectCallEvent) {
           _onDisconnectListener?.call(event.uuid, event.response, CKActionSource.api);
         }
+        bool isMissedCall = event is DisconnectCallEvent ? event.response == CKDisconnectResponse.missed : false;
+        if(_configuration.notifyOnCallEnd && !isMissedCall) {
+          final notification = _notificationManager.getNotification(event.uuid);
+          final n = _generateNotification(call: call, capabilities: call.capabilities, metadata: notification?.metadata, requireInteraction: false);
+          await _notificationManager.add(n, flags: {});
+        }
+        if(_configuration.notifyOnMissedCall && isMissedCall) {
+          final notification = _notificationManager.getNotification(event.uuid);
+          final n = _generateNotification(call: call, capabilities: call.capabilities, metadata: notification?.metadata, description: "Missed Call", requireInteraction: false);
+          await _notificationManager.add(n, flags: {});
+        }
         _stopCallTimer(id);
         break;
     }
@@ -708,9 +723,11 @@ class WebCallkitWeb extends WebCallkitPlatform {
     //ignore: unused_element
     Duration? offset,
     bool? silent,
+    String? description,
+    bool? requireInteraction,
   }) {
     final title = _getTitle(call);
-    final body = _getDescription(call);
+    final body = description ?? _getDescription(call);
     final actions = _getActions(call);
     final icon = _getIcon(call);
 
@@ -722,7 +739,7 @@ class WebCallkitWeb extends WebCallkitPlatform {
       actions: actions,
       icon: icon,
       silent: silent,
-      requireInteraction: true,
+      requireInteraction: requireInteraction ?? true,
       renotify: true,
       data: call.data,
       timestamp: currentTime.millisecondsSinceEpoch,

pubspec.yaml

@@ -31,6 +31,7 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^3.0.0
   test: ^1.25.2
+  matcher: ^0.12.17
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

test/web_callkit_method_channel_test.dart

@@ -5,6 +5,7 @@ import 'package:web_callkit/src/core/enums/ck_call_state.dart';
 import 'package:web_callkit/src/core/enums/ck_call_type.dart';
 import 'package:web_callkit/src/method_channel/web_callkit_method_channel.dart';
 import 'package:web_callkit/src/models/call/ck_call.dart';
+import 'package:matcher/matcher.dart' as matcher;
 
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
@@ -34,11 +35,11 @@ void main() {
       final call = CKCall.init(uuid: id, localizedName: name);
       expect(call.uuid, id, reason: 'Call uuid should be $id');
       expect(call.localizedName, name, reason: 'Call name should be $name');
-      expect(call.dateStarted, isNotNull,
+      expect(call.dateStarted, matcher.isNotNull,
           reason: 'Call dateStarted should not be null');
-      expect(call.dateUpdated, isNotNull,
+      expect(call.dateUpdated, matcher.isNotNull,
           reason: 'Call dateUpdated should not be null');
-      expect(call.attributes, isNotNull,
+      expect(call.attributes, matcher.isNotNull,
           reason: 'Call attributes should not be null');
       expect(call.callType, CKCallType.audio,
           reason: 'Call callType should be audio');
@@ -71,7 +72,7 @@ void main() {
       final dateStarted = call.dateStarted;
       final copyWith = call.copyWith(dateStarted: DateTime.now());
       final newDateStarted = copyWith.dateStarted;
-      expect(dateStarted, isNot(newDateStarted),
+      expect(dateStarted, matcher.isNot(newDateStarted),
           reason: 'Call dateStarted should not be equal to new dateStarted');
     });
 
@@ -151,7 +152,7 @@ void main() {
         await platform
             .updateCallAttributes('123', attributes: {CKCallAttributes.hold});
         final call = platform.getCall('123');
-        expect(call, isNull, reason: 'Call should be null');
+        expect(call, matcher.isNull, reason: 'Call should be null');
       });
 
       test('updateCallAttributes: perform hold toggle', () async {
@@ -166,7 +167,7 @@ void main() {
         await platform.updateCallAttributes(id, attributes: {});
         final notholding = platform.getCall(id);
 
-        expect(call, isNotNull, reason: 'Call should not be null');
+        expect(call, matcher.isNotNull, reason: 'Call should not be null');
         expect(call!.isHolding, false, reason: 'Call should not be holding');
         expect(holding!.isHolding, true, reason: 'Call should be holding');
         expect(notholding!.isHolding, true,
@@ -180,7 +181,7 @@ void main() {
       test('updateCallStatus: does not exist', () async {
         await platform.updateCallStatus('123', callStatus: CKCallState.active);
         final call = platform.getCall('123');
-        expect(call, isNull, reason: 'Call should be null');
+        expect(call, matcher.isNull, reason: 'Call should be null');
       });
 
       test('updateCallStatus: ringing to active to ended', () async {
@@ -194,16 +195,16 @@ void main() {
         await platform.updateCallStatus(id, callStatus: CKCallState.disconnected);
         final disconnected = platform.getCall(id);
 
-        expect(call, isNotNull, reason: 'Call should not be null');
+        expect(call, matcher.isNotNull, reason: 'Call should not be null');
         expect(call!.uuid, '123', reason: 'Call uuid should be "123"');
         expect(call.localizedName, "handle",
             reason: 'Call handle should be "handle"');
 
-        expect(active, isNotNull, reason: 'Call active should not be null');
+        expect(active, matcher.isNotNull, reason: 'Call active should not be null');
         expect(active!.state, CKCallState.active,
             reason: 'Call state should be active');
 
-        expect(disconnected, isNotNull,
+        expect(disconnected, matcher.isNotNull,
             reason: 'Call disconnected should not be null');
         expect(disconnected!.state, CKCallState.disconnected,
             reason: 'Call state should be disconnected');