From aeee5df41bc3a81d7e26ec4b433d19206905cf20 Mon Sep 17 00:00:00 2001 From: erhannis Date: Thu, 18 Aug 2022 00:13:23 -0400 Subject: [PATCH 01/21] Made some methods explicitly async, to reduce crashing and help debugging --- packages/quick_blue/lib/quick_blue.dart | 8 ++++---- .../lib/src/method_channel_quick_blue.dart | 20 +++++++++---------- .../quick_blue/lib/src/quick_blue_linux.dart | 18 ++++++++--------- .../src/quick_blue_platform_interface.dart | 6 +++--- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/quick_blue/lib/quick_blue.dart b/packages/quick_blue/lib/quick_blue.dart index 99a7a29..de09df3 100644 --- a/packages/quick_blue/lib/quick_blue.dart +++ b/packages/quick_blue/lib/quick_blue.dart @@ -26,22 +26,22 @@ class QuickBlue { static Future startScan() => _platform.startScan(); - static void stopScan() => _platform.stopScan(); + static Future stopScan() => _platform.stopScan(); static Stream get scanResultStream { return _platform.scanResultStream .map((item) => BlueScanResult.fromMap(item)); } - static void connect(String deviceId) => _platform.connect(deviceId); + static Future connect(String deviceId) => _platform.connect(deviceId); - static void disconnect(String deviceId) => _platform.disconnect(deviceId); + static Future disconnect(String deviceId) => _platform.disconnect(deviceId); static void setConnectionHandler(OnConnectionChanged? onConnectionChanged) { _platform.onConnectionChanged = onConnectionChanged; } - static void discoverServices(String deviceId) => _platform.discoverServices(deviceId); + static Future discoverServices(String deviceId) => _platform.discoverServices(deviceId); static void setServiceHandler(OnServiceDiscovered? onServiceDiscovered) { _platform.onServiceDiscovered = onServiceDiscovered; diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 47064b7..68b3809 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -56,22 +56,22 @@ class MethodChannelQuickBlue extends QuickBluePlatform { Stream get scanResultStream => _scanResultStream; @override - void connect(String deviceId) { - _method.invokeMethod('connect', { + Future connect(String deviceId) async { + await _method.invokeMethod('connect', { 'deviceId': deviceId, }).then((_) => _log('connect invokeMethod success')); } @override - void disconnect(String deviceId) { - _method.invokeMethod('disconnect', { + Future disconnect(String deviceId) async { + await _method.invokeMethod('disconnect', { 'deviceId': deviceId, }).then((_) => _log('disconnect invokeMethod success')); } @override - void discoverServices(String deviceId) { - _method.invokeMethod('discoverServices', { + Future discoverServices(String deviceId) async { + await _method.invokeMethod('discoverServices', { 'deviceId': deviceId, }).then((_) => _log('discoverServices invokeMethod success')); } @@ -102,7 +102,7 @@ class MethodChannelQuickBlue extends QuickBluePlatform { @override Future setNotifiable(String deviceId, String service, String characteristic, BleInputProperty bleInputProperty) async { - _method.invokeMethod('setNotifiable', { + await _method.invokeMethod('setNotifiable', { 'deviceId': deviceId, 'service': service, 'characteristic': characteristic, @@ -112,7 +112,7 @@ class MethodChannelQuickBlue extends QuickBluePlatform { @override Future readValue(String deviceId, String service, String characteristic) async { - _method.invokeMethod('readValue', { + await _method.invokeMethod('readValue', { 'deviceId': deviceId, 'service': service, 'characteristic': characteristic, @@ -121,7 +121,7 @@ class MethodChannelQuickBlue extends QuickBluePlatform { @override Future writeValue(String deviceId, String service, String characteristic, Uint8List value, BleOutputProperty bleOutputProperty) async { - _method.invokeMethod('writeValue', { + await _method.invokeMethod('writeValue', { 'deviceId': deviceId, 'service': service, 'characteristic': characteristic, @@ -140,7 +140,7 @@ class MethodChannelQuickBlue extends QuickBluePlatform { @override Future requestMtu(String deviceId, int expectedMtu) async { - _method.invokeMethod('requestMtu', { + await _method.invokeMethod('requestMtu', { 'deviceId': deviceId, 'expectedMtu': expectedMtu, }).then((_) => _log('requestMtu invokeMethod success')); diff --git a/packages/quick_blue/lib/src/quick_blue_linux.dart b/packages/quick_blue/lib/src/quick_blue_linux.dart index 5952e35..2323ed8 100644 --- a/packages/quick_blue/lib/src/quick_blue_linux.dart +++ b/packages/quick_blue/lib/src/quick_blue_linux.dart @@ -78,7 +78,7 @@ class QuickBlueLinux extends QuickBluePlatform { _log('startScan invoke success'); if (!_activeAdapter!.discovering) { - _activeAdapter!.startDiscovery(); + _activeAdapter!.startDiscovery(); //TODO This is async. Should it be awaited, or should it have error handlers attached? _client.devices.forEach(_onDeviceAdd); } } @@ -117,21 +117,21 @@ class QuickBlueLinux extends QuickBluePlatform { } @override - void connect(String deviceId) { - _findDeviceById(deviceId).connect().then((_) { + Future connect(String deviceId) async { + await _findDeviceById(deviceId).connect().then((_) { onConnectionChanged?.call(deviceId, BlueConnectionState.connected); }); } @override - void disconnect(String deviceId) { - _findDeviceById(deviceId).disconnect().then((_) { + Future disconnect(String deviceId) async { + await _findDeviceById(deviceId).disconnect().then((_) { onConnectionChanged?.call(deviceId, BlueConnectionState.disconnected); }); } @override - void discoverServices(String deviceId) { + Future discoverServices(String deviceId) async { var device = _findDeviceById(deviceId); for (var service in device.gattServices) { @@ -163,7 +163,7 @@ class QuickBlueLinux extends QuickBluePlatform { var c = _getCharacteristic(deviceId, service, characteristic); if (bleInputProperty != BleInputProperty.disabled) { - c.startNotify(); + c.startNotify(); //TODO This is async. Should it be awaited, or should it have error handlers attached? void onPropertiesChanged(properties) { if (properties.contains('Value')) { _log('onCharacteristicPropertiesChanged $characteristic, ${hex.encode(c.value)}'); @@ -172,8 +172,8 @@ class QuickBlueLinux extends QuickBluePlatform { } _characteristicPropertiesSubscriptions[characteristic] ??= c.propertiesChanged.listen(onPropertiesChanged); } else { - c.stopNotify(); - _characteristicPropertiesSubscriptions.remove(characteristic)?.cancel(); + c.stopNotify(); //TODO This is async. Should it be awaited, or should it have error handlers attached? + _characteristicPropertiesSubscriptions.remove(characteristic)?.cancel(); //TODO This is async. Should it be awaited, or should it have error handlers attached? } } diff --git a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart index 65d9940..37fe514 100644 --- a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart +++ b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart @@ -43,13 +43,13 @@ abstract class QuickBluePlatform extends PlatformInterface { Stream get scanResultStream; - void connect(String deviceId); + Future connect(String deviceId); - void disconnect(String deviceId); + Future disconnect(String deviceId); OnConnectionChanged? onConnectionChanged; - void discoverServices(String deviceId); + Future discoverServices(String deviceId); OnServiceDiscovered? onServiceDiscovered; From 514931e67b86a0483756ff50c9f3ee408907c5bf Mon Sep 17 00:00:00 2001 From: erhannis Date: Thu, 18 Aug 2022 00:18:32 -0400 Subject: [PATCH 02/21] Added stack traces to the errors in onMethodCall in QuickBlue in Android, so you can tell where the errors are happening. --- .../com/example/quick_blue/QuickBluePlugin.kt | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index 624c046..a096066 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -73,6 +73,8 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand mainThreadHandler.post { messageChannel.send(message) } } + fun trace() = Arrays.toString(Throwable().stackTrace) + override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) { when (call.method) { "isBluetoothAvailable" -> { @@ -104,7 +106,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand "disconnect" -> { val deviceId = call.argument("deviceId")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) cleanConnection(gatt) result.success(null) //FIXME If `disconnect` is called before BluetoothGatt.STATE_CONNECTED @@ -113,7 +115,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand "discoverServices" -> { val deviceId = call.argument("deviceId")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) gatt.discoverServices() result.success(null) } @@ -123,9 +125,9 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand val characteristic = call.argument("characteristic")!! val bleInputProperty = call.argument("bleInputProperty")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", null) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) gatt.setNotifiable(c, bleInputProperty) result.success(null) } @@ -134,13 +136,13 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand val service = call.argument("service")!! val characteristic = call.argument("characteristic")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", null) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) if (gatt.readCharacteristic(c)) result.success(null) else - result.error("Characteristic unavailable", null, null) + result.error("Characteristic unavailable", null, trace()) } "writeValue" -> { val deviceId = call.argument("deviceId")!! @@ -148,20 +150,20 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand val characteristic = call.argument("characteristic")!! val value = call.argument("value")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", null) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) c.value = value if (gatt.writeCharacteristic(c)) result.success(null) else - result.error("Characteristic unavailable", null, null) + result.error("Characteristic unavailable", null, trace()) } "requestMtu" -> { val deviceId = call.argument("deviceId")!! val expectedMtu = call.argument("expectedMtu")!! val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", null) + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) gatt.requestMtu(expectedMtu) result.success(null) } From 3c816fde13fef7332b6e79a089fe3f7311e70300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Fri, 31 Mar 2023 10:12:01 +0200 Subject: [PATCH 03/21] Update dependencies, fix tests --- packages/quick_blue/pubspec.yaml | 4 ++-- packages/quick_hid/example/test/widget_test.dart | 7 ++++--- packages/quick_hid/pubspec.yaml | 2 +- packages/quick_notify/pubspec.yaml | 2 +- packages/quick_scan/pubspec.yaml | 2 +- packages/quick_usb/pubspec.yaml | 2 +- packages/quick_wlan/pubspec.yaml | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/quick_blue/pubspec.yaml b/packages/quick_blue/pubspec.yaml index 5e1ef52..25754ca 100644 --- a/packages/quick_blue/pubspec.yaml +++ b/packages/quick_blue/pubspec.yaml @@ -13,13 +13,13 @@ dependencies: sdk: flutter logging: ^1.0.2 plugin_platform_interface: ^2.1.2 - bluez: ^0.7.9 + bluez: ^0.8.1 convert: ^3.0.1 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/quick_hid/example/test/widget_test.dart b/packages/quick_hid/example/test/widget_test.dart index d5b3979..68b06dc 100644 --- a/packages/quick_hid/example/test/widget_test.dart +++ b/packages/quick_hid/example/test/widget_test.dart @@ -8,7 +8,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:quick_hid_example/main.dart'; +// ignore: avoid_relative_lib_imports +import '../lib/main.dart'; void main() { testWidgets('Verify Platform version', (WidgetTester tester) async { @@ -18,8 +19,8 @@ void main() { // Verify that platform version is retrieved. expect( find.byWidgetPredicate( - (Widget widget) => widget is Text && - widget.data!.startsWith('Running on:'), + (Widget widget) => + widget is Text && widget.data!.startsWith('Running on:'), ), findsOneWidget, ); diff --git a/packages/quick_hid/pubspec.yaml b/packages/quick_hid/pubspec.yaml index 4a02b4e..afad44f 100644 --- a/packages/quick_hid/pubspec.yaml +++ b/packages/quick_hid/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/quick_notify/pubspec.yaml b/packages/quick_notify/pubspec.yaml index 3964215..7c9da5b 100644 --- a/packages/quick_notify/pubspec.yaml +++ b/packages/quick_notify/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/quick_scan/pubspec.yaml b/packages/quick_scan/pubspec.yaml index 09d02e5..b195e76 100644 --- a/packages/quick_scan/pubspec.yaml +++ b/packages/quick_scan/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/quick_usb/pubspec.yaml b/packages/quick_usb/pubspec.yaml index 76b3890..bdf6c35 100644 --- a/packages/quick_usb/pubspec.yaml +++ b/packages/quick_usb/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/packages/quick_wlan/pubspec.yaml b/packages/quick_wlan/pubspec.yaml index 35aa83c..6dc0962 100644 --- a/packages/quick_wlan/pubspec.yaml +++ b/packages/quick_wlan/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^1.0.0 + flutter_lints: ^2.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 1cc1b4bd1675d8baae353598cd0aead7b325de96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Fri, 31 Mar 2023 13:25:01 +0200 Subject: [PATCH 04/21] [quick_blue]: Add serviceUUID parameter to startScan --- .../quick_blue/darwin/QuickBlueDarwin.swift | 10 +- packages/quick_blue/example/lib/main.dart | 2 +- packages/quick_blue/lib/quick_blue.dart | 36 +- .../lib/src/method_channel_quick_blue.dart | 40 +- .../quick_blue/lib/src/quick_blue_linux.dart | 76 +- .../src/quick_blue_platform_interface.dart | 24 +- .../quick_blue/windows/quick_blue_plugin.cpp | 1100 +++++++++-------- 7 files changed, 733 insertions(+), 555 deletions(-) diff --git a/packages/quick_blue/darwin/QuickBlueDarwin.swift b/packages/quick_blue/darwin/QuickBlueDarwin.swift index 3ff685b..3318736 100644 --- a/packages/quick_blue/darwin/QuickBlueDarwin.swift +++ b/packages/quick_blue/darwin/QuickBlueDarwin.swift @@ -77,7 +77,13 @@ public class QuickBlueDarwin: NSObject, FlutterPlugin { case "isBluetoothAvailable": result(manager.state == .poweredOn) case "startScan": - manager.scanForPeripherals(withServices: nil) + let arguments = call.arguments as! Dictionary + let serviceUUIDs = arguments["serviceUUID"] as? List + if serviceUUIDs != nil && serviceUUIDs.count > 0 { + manager.scanForPeripherals(withServices: serviceUUIDs) + } else { + manager.scanForPeripherals(withServices: nil) + } result(nil) case "stopScan": manager.stopScan() @@ -117,7 +123,7 @@ public class QuickBlueDarwin: NSObject, FlutterPlugin { let deviceId = arguments["deviceId"] as! String let service = arguments["service"] as! String let characteristic = arguments["characteristic"] as! String - let bleInputProperty = arguments["bleInputProperty"] as! String + let bleInputProperty = argume { ElevatedButton( child: const Text('startScan'), onPressed: () { - QuickBlue.startScan(); + QuickBlue.startScan(serviceUUID: ['FF02']); }, ), ElevatedButton( diff --git a/packages/quick_blue/lib/quick_blue.dart b/packages/quick_blue/lib/quick_blue.dart index 99a7a29..c1a1319 100644 --- a/packages/quick_blue/lib/quick_blue.dart +++ b/packages/quick_blue/lib/quick_blue.dart @@ -16,21 +16,22 @@ class QuickBlue { static void setInstance(QuickBluePlatform instance) => _platform = instance; - static void setLogger(QuickLogger logger) => - _platform.setLogger(logger); + static void setLogger(QuickLogger logger) => _platform.setLogger(logger); static Future isBluetoothAvailable() => _platform.isBluetoothAvailable(); - static Stream get availabilityChangeStream => _platform.availabilityChangeStream.map(AvailabilityState.parse); + static Stream get availabilityChangeStream => + _platform.availabilityChangeStream.map(AvailabilityState.parse); - static Future startScan() => _platform.startScan(); + static Future startScan({List? serviceUUID}) => + _platform.startScan(serviceUUID); static void stopScan() => _platform.stopScan(); static Stream get scanResultStream { return _platform.scanResultStream - .map((item) => BlueScanResult.fromMap(item)); + .map((item) => BlueScanResult.fromMap(item)); } static void connect(String deviceId) => _platform.connect(deviceId); @@ -41,27 +42,38 @@ class QuickBlue { _platform.onConnectionChanged = onConnectionChanged; } - static void discoverServices(String deviceId) => _platform.discoverServices(deviceId); + static void discoverServices(String deviceId) => + _platform.discoverServices(deviceId); static void setServiceHandler(OnServiceDiscovered? onServiceDiscovered) { _platform.onServiceDiscovered = onServiceDiscovered; } - static Future setNotifiable(String deviceId, String service, String characteristic, BleInputProperty bleInputProperty) { - return _platform.setNotifiable(deviceId, service, characteristic, bleInputProperty); + static Future setNotifiable(String deviceId, String service, + String characteristic, BleInputProperty bleInputProperty) { + return _platform.setNotifiable( + deviceId, service, characteristic, bleInputProperty); } static void setValueHandler(OnValueChanged? onValueChanged) { _platform.onValueChanged = onValueChanged; } - static Future readValue(String deviceId, String service, String characteristic) { + static Future readValue( + String deviceId, String service, String characteristic) { return _platform.readValue(deviceId, service, characteristic); } - static Future writeValue(String deviceId, String service, String characteristic, Uint8List value, BleOutputProperty bleOutputProperty) { - return _platform.writeValue(deviceId, service, characteristic, value, bleOutputProperty); + static Future writeValue( + String deviceId, + String service, + String characteristic, + Uint8List value, + BleOutputProperty bleOutputProperty) { + return _platform.writeValue( + deviceId, service, characteristic, value, bleOutputProperty); } - static Future requestMtu(String deviceId, int expectedMtu) => _platform.requestMtu(deviceId, expectedMtu); + static Future requestMtu(String deviceId, int expectedMtu) => + _platform.requestMtu(deviceId, expectedMtu); } diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 47064b7..169ebc6 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -9,8 +9,10 @@ import 'quick_blue_platform_interface.dart'; class MethodChannelQuickBlue extends QuickBluePlatform { static const _method = MethodChannel('quick_blue/method'); static const _eventScanResult = EventChannel('quick_blue/event.scanResult'); - static const _eventAvailabilityChange = EventChannel('quick_blue/event.availabilityChange'); - static const _messageConnector = BasicMessageChannel('quick_blue/message.connector', StandardMessageCodec()); + static const _eventAvailabilityChange = + EventChannel('quick_blue/event.availabilityChange'); + static const _messageConnector = BasicMessageChannel( + 'quick_blue/message.connector', StandardMessageCodec()); MethodChannelQuickBlue() { _messageConnector.setMessageHandler(_handleConnectorMessage); @@ -33,14 +35,17 @@ class MethodChannelQuickBlue extends QuickBluePlatform { return result; } - final Stream _availabilityChangeStream = _eventAvailabilityChange.receiveBroadcastStream({'name': 'availabilityChange'}).cast(); + final Stream _availabilityChangeStream = _eventAvailabilityChange + .receiveBroadcastStream({'name': 'availabilityChange'}).cast(); @override Stream get availabilityChangeStream => _availabilityChangeStream; @override - Future startScan() async { - await _method.invokeMethod('startScan'); + Future startScan(List? serviceUUID) async { + await _method.invokeMethod('startScan', { + 'serviceUUID': serviceUUID, + }); _log('startScan invokeMethod success'); } @@ -50,7 +55,8 @@ class MethodChannelQuickBlue extends QuickBluePlatform { _log('stopScan invokeMethod success'); } - final Stream _scanResultStream = _eventScanResult.receiveBroadcastStream({'name': 'scanResult'}); + final Stream _scanResultStream = + _eventScanResult.receiveBroadcastStream({'name': 'scanResult'}); @override Stream get scanResultStream => _scanResultStream; @@ -80,20 +86,23 @@ class MethodChannelQuickBlue extends QuickBluePlatform { _log('_handleConnectorMessage $message', logLevel: Level.ALL); if (message['ConnectionState'] != null) { String deviceId = message['deviceId']; - BlueConnectionState connectionState = BlueConnectionState.parse(message['ConnectionState']); + BlueConnectionState connectionState = + BlueConnectionState.parse(message['ConnectionState']); onConnectionChanged?.call(deviceId, connectionState); } else if (message['ServiceState'] != null) { if (message['ServiceState'] == 'discovered') { String deviceId = message['deviceId']; String service = message['service']; - List characteristics = (message['characteristics'] as List).cast(); + List characteristics = + (message['characteristics'] as List).cast(); onServiceDiscovered?.call(deviceId, service, characteristics); } } else if (message['characteristicValue'] != null) { String deviceId = message['deviceId']; var characteristicValue = message['characteristicValue']; String characteristic = characteristicValue['characteristic']; - Uint8List value = Uint8List.fromList(characteristicValue['value']); // In case of _Uint8ArrayView + Uint8List value = Uint8List.fromList( + characteristicValue['value']); // In case of _Uint8ArrayView onValueChanged?.call(deviceId, characteristic, value); } else if (message['mtuConfig'] != null) { _mtuConfigController.add(message['mtuConfig']); @@ -101,7 +110,8 @@ class MethodChannelQuickBlue extends QuickBluePlatform { } @override - Future setNotifiable(String deviceId, String service, String characteristic, BleInputProperty bleInputProperty) async { + Future setNotifiable(String deviceId, String service, + String characteristic, BleInputProperty bleInputProperty) async { _method.invokeMethod('setNotifiable', { 'deviceId': deviceId, 'service': service, @@ -111,7 +121,8 @@ class MethodChannelQuickBlue extends QuickBluePlatform { } @override - Future readValue(String deviceId, String service, String characteristic) async { + Future readValue( + String deviceId, String service, String characteristic) async { _method.invokeMethod('readValue', { 'deviceId': deviceId, 'service': service, @@ -120,7 +131,12 @@ class MethodChannelQuickBlue extends QuickBluePlatform { } @override - Future writeValue(String deviceId, String service, String characteristic, Uint8List value, BleOutputProperty bleOutputProperty) async { + Future writeValue( + String deviceId, + String service, + String characteristic, + Uint8List value, + BleOutputProperty bleOutputProperty) async { _method.invokeMethod('writeValue', { 'deviceId': deviceId, 'service': service, diff --git a/packages/quick_blue/lib/src/quick_blue_linux.dart b/packages/quick_blue/lib/src/quick_blue_linux.dart index 5952e35..67d12ac 100644 --- a/packages/quick_blue/lib/src/quick_blue_linux.dart +++ b/packages/quick_blue/lib/src/quick_blue_linux.dart @@ -24,13 +24,14 @@ class QuickBlueLinux extends QuickBluePlatform { if (!isInitialized) { await _client.connect(); - _activeAdapter ??= _client.adapters.firstWhereOrNull((adapter) => adapter.powered); + _activeAdapter ??= + _client.adapters.firstWhereOrNull((adapter) => adapter.powered); if (_activeAdapter == null) { - if (_client.adapters.isEmpty) { - throw Exception('Bluetooth adapter unavailable'); - } - await _client.adapters.first.setPowered(true); - _activeAdapter = _client.adapters.first; + if (_client.adapters.isEmpty) { + throw Exception('Bluetooth adapter unavailable'); + } + await _client.adapters.first.setPowered(true); + _activeAdapter = _client.adapters.first; } _client.deviceAdded.listen(_onDeviceAdd); @@ -63,23 +64,29 @@ class QuickBlueLinux extends QuickBluePlatform { } // FIXME Close - final StreamController _availabilityStateController = StreamController.broadcast(); + final StreamController _availabilityStateController = + StreamController.broadcast(); @override - Stream get availabilityChangeStream =>_availabilityStateController.stream.map((state) => state.value); + Stream get availabilityChangeStream => + _availabilityStateController.stream.map((state) => state.value); AvailabilityState get availabilityState { - return _activeAdapter!.powered ? AvailabilityState.poweredOn : AvailabilityState.poweredOff; + return _activeAdapter!.powered + ? AvailabilityState.poweredOn + : AvailabilityState.poweredOff; } @override - Future startScan() async { + Future startScan(List? serviceUUID) async { await _ensureInitialized(); _log('startScan invoke success'); if (!_activeAdapter!.discovering) { _activeAdapter!.startDiscovery(); _client.devices.forEach(_onDeviceAdd); + } else { + _log('startScan not triggered because we are already scanning'); } } @@ -94,7 +101,8 @@ class QuickBlueLinux extends QuickBluePlatform { } // FIXME Close - final StreamController _scanResultController = StreamController.broadcast(); + final StreamController _scanResultController = + StreamController.broadcast(); @override Stream get scanResultStream => _scanResultController.stream; @@ -109,7 +117,8 @@ class QuickBlueLinux extends QuickBluePlatform { } BlueZDevice _findDeviceById(String deviceId) { - var device = _client.devices.firstWhereOrNull((device) => device.address == deviceId); + var device = _client.devices + .firstWhereOrNull((device) => device.address == deviceId); if (device == null) { throw Exception('Unknown deviceId:$deviceId'); } @@ -140,15 +149,20 @@ class QuickBlueLinux extends QuickBluePlatform { _log(" Characteristic ${characteristic.uuid}"); } - var characteristics = service.characteristics.map((e) => e.uuid.toString()).toList(); - onServiceDiscovered?.call(deviceId, service.uuid.toString(), characteristics); + var characteristics = + service.characteristics.map((e) => e.uuid.toString()).toList(); + onServiceDiscovered?.call( + deviceId, service.uuid.toString(), characteristics); } } - BlueZGattCharacteristic _getCharacteristic(String deviceId, String service, String characteristic) { + BlueZGattCharacteristic _getCharacteristic( + String deviceId, String service, String characteristic) { var device = _findDeviceById(deviceId); - var s = device.gattServices.firstWhereOrNull((s) => s.uuid.toString() == service); - var c = s?.characteristics.firstWhereOrNull((c) => c.uuid.toString() == characteristic); + var s = device.gattServices + .firstWhereOrNull((s) => s.uuid.toString() == service); + var c = s?.characteristics + .firstWhereOrNull((c) => c.uuid.toString() == characteristic); if (c == null) { throw Exception('Unknown characteristic:$characteristic'); @@ -156,21 +170,27 @@ class QuickBlueLinux extends QuickBluePlatform { return c; } - final Map>> _characteristicPropertiesSubscriptions = {}; + final Map>> + _characteristicPropertiesSubscriptions = {}; @override - Future setNotifiable(String deviceId, String service, String characteristic, BleInputProperty bleInputProperty) async { + Future setNotifiable(String deviceId, String service, + String characteristic, BleInputProperty bleInputProperty) async { var c = _getCharacteristic(deviceId, service, characteristic); - + if (bleInputProperty != BleInputProperty.disabled) { c.startNotify(); void onPropertiesChanged(properties) { if (properties.contains('Value')) { - _log('onCharacteristicPropertiesChanged $characteristic, ${hex.encode(c.value)}'); - onValueChanged?.call(deviceId, characteristic, Uint8List.fromList(c.value)); + _log( + 'onCharacteristicPropertiesChanged $characteristic, ${hex.encode(c.value)}'); + onValueChanged?.call( + deviceId, characteristic, Uint8List.fromList(c.value)); } } - _characteristicPropertiesSubscriptions[characteristic] ??= c.propertiesChanged.listen(onPropertiesChanged); + + _characteristicPropertiesSubscriptions[characteristic] ??= + c.propertiesChanged.listen(onPropertiesChanged); } else { c.stopNotify(); _characteristicPropertiesSubscriptions.remove(characteristic)?.cancel(); @@ -178,7 +198,8 @@ class QuickBlueLinux extends QuickBluePlatform { } @override - Future readValue(String deviceId, String service, String characteristic) async { + Future readValue( + String deviceId, String service, String characteristic) async { var c = _getCharacteristic(deviceId, service, characteristic); var data = await c.readValue(); @@ -187,7 +208,12 @@ class QuickBlueLinux extends QuickBluePlatform { } @override - Future writeValue(String deviceId, String service, String characteristic, Uint8List value, BleOutputProperty bleOutputProperty) async { + Future writeValue( + String deviceId, + String service, + String characteristic, + Uint8List value, + BleOutputProperty bleOutputProperty) async { var c = _getCharacteristic(deviceId, service, characteristic); if (bleOutputProperty == BleOutputProperty.withResponse) { diff --git a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart index 65d9940..727990d 100644 --- a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart +++ b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart @@ -11,11 +11,14 @@ export 'models.dart'; typedef QuickLogger = Logger; -typedef OnConnectionChanged = void Function(String deviceId, BlueConnectionState state); +typedef OnConnectionChanged = void Function( + String deviceId, BlueConnectionState state); -typedef OnServiceDiscovered = void Function(String deviceId, String serviceId, List characteristicIds); +typedef OnServiceDiscovered = void Function( + String deviceId, String serviceId, List characteristicIds); -typedef OnValueChanged = void Function(String deviceId, String characteristicId, Uint8List value); +typedef OnValueChanged = void Function( + String deviceId, String characteristicId, Uint8List value); abstract class QuickBluePlatform extends PlatformInterface { QuickBluePlatform() : super(token: _token); @@ -37,7 +40,7 @@ abstract class QuickBluePlatform extends PlatformInterface { Stream get availabilityChangeStream; - Future startScan(); + Future startScan(List? serviceUUID); Future stopScan(); @@ -53,13 +56,20 @@ abstract class QuickBluePlatform extends PlatformInterface { OnServiceDiscovered? onServiceDiscovered; - Future setNotifiable(String deviceId, String service, String characteristic, BleInputProperty bleInputProperty); + Future setNotifiable(String deviceId, String service, + String characteristic, BleInputProperty bleInputProperty); OnValueChanged? onValueChanged; - Future readValue(String deviceId, String service, String characteristic); + Future readValue( + String deviceId, String service, String characteristic); - Future writeValue(String deviceId, String service, String characteristic, Uint8List value, BleOutputProperty bleOutputProperty); + Future writeValue( + String deviceId, + String service, + String characteristic, + Uint8List value, + BleOutputProperty bleOutputProperty); Future requestMtu(String deviceId, int expectedMtu); } diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 9ec7456..184b415 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -27,283 +27,342 @@ #define GUID_FORMAT "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" #define GUID_ARG(guid) guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] -namespace { - -using namespace winrt::Windows::Foundation; -using namespace winrt::Windows::Foundation::Collections; -using namespace winrt::Windows::Storage::Streams; -using namespace winrt::Windows::Devices::Radios; -using namespace winrt::Windows::Devices::Bluetooth; -using namespace winrt::Windows::Devices::Bluetooth::Advertisement; -using namespace winrt::Windows::Devices::Bluetooth::GenericAttributeProfile; - -using flutter::EncodableValue; -using flutter::EncodableMap; -using flutter::EncodableList; - -union uint16_t_union { - uint16_t uint16; - byte bytes[sizeof(uint16_t)]; -}; - -std::vector to_bytevc(IBuffer buffer) { - auto reader = DataReader::FromBuffer(buffer); - auto result = std::vector(reader.UnconsumedBufferLength()); - reader.ReadBytes(result); - return result; -} - -IBuffer from_bytevc(std::vector bytes) { - auto writer = DataWriter(); - writer.WriteBytes(bytes); - return writer.DetachBuffer(); -} - -std::string to_hexstring(std::vector bytes) { - auto ss = std::stringstream(); - for (auto b : bytes) - ss << std::setw(2) << std::setfill('0') << std::hex << static_cast(b); - return ss.str(); -} - -std::string to_uuidstr(winrt::guid guid) { - char chars[36 + 1]; - sprintf_s(chars, GUID_FORMAT, GUID_ARG(guid)); - return std::string{ chars }; -} - -struct BluetoothDeviceAgent { - BluetoothLEDevice device; - winrt::event_token connnectionStatusChangedToken; - std::map gattServices; - std::map gattCharacteristics; - std::map valueChangedTokens; - - BluetoothDeviceAgent(BluetoothLEDevice device, winrt::event_token connnectionStatusChangedToken) - : device(device), - connnectionStatusChangedToken(connnectionStatusChangedToken) {} +namespace +{ - ~BluetoothDeviceAgent() { - device = nullptr; + using namespace winrt::Windows::Foundation; + using namespace winrt::Windows::Foundation::Collections; + using namespace winrt::Windows::Storage::Streams; + using namespace winrt::Windows::Devices::Radios; + using namespace winrt::Windows::Devices::Bluetooth; + using namespace winrt::Windows::Devices::Bluetooth::Advertisement; + using namespace winrt::Windows::Devices::Bluetooth::GenericAttributeProfile; + + using flutter::EncodableList; + using flutter::EncodableMap; + using flutter::EncodableValue; + + union uint16_t_union + { + uint16_t uint16; + byte bytes[sizeof(uint16_t)]; + }; + + std::vector to_bytevc(IBuffer buffer) + { + auto reader = DataReader::FromBuffer(buffer); + auto result = std::vector(reader.UnconsumedBufferLength()); + reader.ReadBytes(result); + return result; } - IAsyncOperation GetServiceAsync(std::string service) { - if (gattServices.count(service) == 0) { - auto serviceResult = co_await device.GetGattServicesAsync(); - if (serviceResult.Status() != GattCommunicationStatus::Success) - co_return nullptr; - - for (auto s : serviceResult.Services()) - if (to_uuidstr(s.Uuid()) == service) - gattServices.insert(std::make_pair(service, s)); - } - co_return gattServices.at(service); + IBuffer from_bytevc(std::vector bytes) + { + auto writer = DataWriter(); + writer.WriteBytes(bytes); + return writer.DetachBuffer(); } - IAsyncOperation GetCharacteristicAsync(std::string service, std::string characteristic) { - if (gattCharacteristics.count(characteristic) == 0) { - auto gattService = co_await GetServiceAsync(service); + std::string to_hexstring(std::vector bytes) + { + auto ss = std::stringstream(); + for (auto b : bytes) + ss << std::setw(2) << std::setfill('0') << std::hex << static_cast(b); + return ss.str(); + } - auto characteristicResult = co_await gattService.GetCharacteristicsAsync(); - if (characteristicResult.Status() != GattCommunicationStatus::Success) - co_return nullptr; + std::string to_uuidstr(winrt::guid guid) + { + char chars[36 + 1]; + sprintf_s(chars, GUID_FORMAT, GUID_ARG(guid)); + return std::string{chars}; + } - for (auto c : characteristicResult.Characteristics()) - if (to_uuidstr(c.Uuid()) == characteristic) - gattCharacteristics.insert(std::make_pair(characteristic, c)); + struct BluetoothDeviceAgent + { + BluetoothLEDevice device; + winrt::event_token connnectionStatusChangedToken; + std::map gattServices; + std::map gattCharacteristics; + std::map valueChangedTokens; + + BluetoothDeviceAgent(BluetoothLEDevice device, winrt::event_token connnectionStatusChangedToken) + : device(device), + connnectionStatusChangedToken(connnectionStatusChangedToken) {} + + ~BluetoothDeviceAgent() + { + device = nullptr; } - co_return gattCharacteristics.at(characteristic); - } -}; -class QuickBluePlugin : public flutter::Plugin, public flutter::StreamHandler { - public: - static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar); + IAsyncOperation GetServiceAsync(std::string service) + { + if (gattServices.count(service) == 0) + { + auto serviceResult = co_await device.GetGattServicesAsync(); + if (serviceResult.Status() != GattCommunicationStatus::Success) + co_return nullptr; + + for (auto s : serviceResult.Services()) + if (to_uuidstr(s.Uuid()) == service) + gattServices.insert(std::make_pair(service, s)); + } + co_return gattServices.at(service); + } - QuickBluePlugin(); + IAsyncOperation GetCharacteristicAsync(std::string service, std::string characteristic) + { + if (gattCharacteristics.count(characteristic) == 0) + { + auto gattService = co_await GetServiceAsync(service); - virtual ~QuickBluePlugin(); + auto characteristicResult = co_await gattService.GetCharacteristicsAsync(); + if (characteristicResult.Status() != GattCommunicationStatus::Success) + co_return nullptr; - private: - winrt::fire_and_forget InitializeAsync(); + for (auto c : characteristicResult.Characteristics()) + if (to_uuidstr(c.Uuid()) == characteristic) + gattCharacteristics.insert(std::make_pair(characteristic, c)); + } + co_return gattCharacteristics.at(characteristic); + } + }; + + class QuickBluePlugin : public flutter::Plugin, public flutter::StreamHandler + { + public: + static void RegisterWithRegistrar(flutter::PluginRegistrarWindows *registrar); + + QuickBluePlugin(); + + virtual ~QuickBluePlugin(); + + private: + winrt::fire_and_forget InitializeAsync(); + + // Called when a method is called on this plugin's channel from Dart. + void HandleMethodCall( + const flutter::MethodCall &method_call, + std::unique_ptr> result); + + std::unique_ptr> OnListenInternal( + const EncodableValue *arguments, + std::unique_ptr> &&events) override; + std::unique_ptr> OnCancelInternal( + const EncodableValue *arguments) override; + + std::unique_ptr> message_connector_; + + std::unique_ptr> availability_change_sink_; + std::unique_ptr> scan_result_sink_; + + Radio bluetoothRadio{nullptr}; + void Radio_StateChanged(Radio sender, IInspectable args); + RadioState oldRadioState = RadioState::Unknown; + + BluetoothLEAdvertisementWatcher bluetoothLEWatcher{nullptr}; + winrt::event_token bluetoothLEWatcherReceivedToken; + winrt::fire_and_forget BluetoothLEWatcher_Received(BluetoothLEAdvertisementWatcher sender, BluetoothLEAdvertisementReceivedEventArgs args); + + std::map> connectedDevices{}; + winrt::event_revoker radioStateChangedRevoker; + + winrt::fire_and_forget ConnectAsync(uint64_t bluetoothAddress); + void BluetoothLEDevice_ConnectionStatusChanged(BluetoothLEDevice sender, IInspectable args); + void CleanConnection(uint64_t bluetoothAddress); + winrt::fire_and_forget DiscoverServicesAsync(BluetoothDeviceAgent &bluetoothDeviceAgent); + + winrt::fire_and_forget SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, GattCharacteristic &gattCharacteristic, std::string bleInputProperty); + winrt::fire_and_forget RequestMtuAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, uint64_t expectedMtu); + winrt::fire_and_forget ReadValueAsync(GattCharacteristic &gattCharacteristic); + winrt::fire_and_forget WriteValueAsync(GattCharacteristic &gattCharacteristic, std::vector value, std::string bleOutputProperty); + void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args); + }; + + // static + void QuickBluePlugin::RegisterWithRegistrar( + flutter::PluginRegistrarWindows *registrar) + { + auto method = + std::make_unique>( + registrar->messenger(), "quick_blue/method", + &flutter::StandardMethodCodec::GetInstance()); + auto event_availability_change = + std::make_unique>( + registrar->messenger(), "quick_blue/event.availabilityChange", + &flutter::StandardMethodCodec::GetInstance()); + auto event_scan_result = + std::make_unique>( + registrar->messenger(), "quick_blue/event.scanResult", + &flutter::StandardMethodCodec::GetInstance()); + auto message_connector_ = + std::make_unique>( + registrar->messenger(), "quick_blue/message.connector", + &flutter::StandardMessageCodec::GetInstance()); + + auto plugin = std::make_unique(); + + method->SetMethodCallHandler( + [plugin_pointer = plugin.get()](const auto &call, auto result) + { + plugin_pointer->HandleMethodCall(call, std::move(result)); + }); - // Called when a method is called on this plugin's channel from Dart. - void HandleMethodCall( - const flutter::MethodCall &method_call, - std::unique_ptr> result); - - std::unique_ptr> OnListenInternal( - const EncodableValue* arguments, - std::unique_ptr>&& events) override; - std::unique_ptr> OnCancelInternal( - const EncodableValue* arguments) override; - - std::unique_ptr> message_connector_; - - std::unique_ptr> availability_change_sink_; - std::unique_ptr> scan_result_sink_; - - Radio bluetoothRadio{ nullptr }; - void Radio_StateChanged(Radio sender, IInspectable args); - RadioState oldRadioState = RadioState::Unknown; - - BluetoothLEAdvertisementWatcher bluetoothLEWatcher{ nullptr }; - winrt::event_token bluetoothLEWatcherReceivedToken; - winrt::fire_and_forget BluetoothLEWatcher_Received(BluetoothLEAdvertisementWatcher sender, BluetoothLEAdvertisementReceivedEventArgs args); - - std::map> connectedDevices{}; - winrt::event_revoker radioStateChangedRevoker; - - winrt::fire_and_forget ConnectAsync(uint64_t bluetoothAddress); - void BluetoothLEDevice_ConnectionStatusChanged(BluetoothLEDevice sender, IInspectable args); - void CleanConnection(uint64_t bluetoothAddress); - winrt::fire_and_forget DiscoverServicesAsync(BluetoothDeviceAgent &bluetoothDeviceAgent); - - winrt::fire_and_forget SetNotifiableAsync(BluetoothDeviceAgent& bluetoothDeviceAgent, GattCharacteristic& gattCharacteristic, std::string bleInputProperty); - winrt::fire_and_forget RequestMtuAsync(BluetoothDeviceAgent& bluetoothDeviceAgent, uint64_t expectedMtu); - winrt::fire_and_forget ReadValueAsync(GattCharacteristic& gattCharacteristic); - winrt::fire_and_forget WriteValueAsync(GattCharacteristic& gattCharacteristic, std::vector value, std::string bleOutputProperty); - void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args); -}; - -// static -void QuickBluePlugin::RegisterWithRegistrar( - flutter::PluginRegistrarWindows *registrar) { - auto method = - std::make_unique>( - registrar->messenger(), "quick_blue/method", - &flutter::StandardMethodCodec::GetInstance()); - auto event_availability_change = - std::make_unique>( - registrar->messenger(), "quick_blue/event.availabilityChange", - &flutter::StandardMethodCodec::GetInstance()); - auto event_scan_result = - std::make_unique>( - registrar->messenger(), "quick_blue/event.scanResult", - &flutter::StandardMethodCodec::GetInstance()); - auto message_connector_ = - std::make_unique>( - registrar->messenger(), "quick_blue/message.connector", - &flutter::StandardMessageCodec::GetInstance()); - - auto plugin = std::make_unique(); - - method->SetMethodCallHandler( - [plugin_pointer = plugin.get()](const auto &call, auto result) { - plugin_pointer->HandleMethodCall(call, std::move(result)); - }); + auto availability_handler = std::make_unique< + flutter::StreamHandlerFunctions<>>( + [plugin_pointer = plugin.get()]( + const EncodableValue *arguments, + std::unique_ptr> &&events) + -> std::unique_ptr> + { + return plugin_pointer->OnListen(arguments, std::move(events)); + }, + [plugin_pointer = plugin.get()](const EncodableValue *arguments) + -> std::unique_ptr> + { + return plugin_pointer->OnCancel(arguments); + }); + auto scan_result_handler = std::make_unique< + flutter::StreamHandlerFunctions<>>( + [plugin_pointer = plugin.get()]( + const EncodableValue *arguments, + std::unique_ptr> &&events) + -> std::unique_ptr> + { + return plugin_pointer->OnListen(arguments, std::move(events)); + }, + [plugin_pointer = plugin.get()](const EncodableValue *arguments) + -> std::unique_ptr> + { + return plugin_pointer->OnCancel(arguments); + }); + event_availability_change->SetStreamHandler(std::move(availability_handler)); + event_scan_result->SetStreamHandler(std::move(scan_result_handler)); + plugin->message_connector_ = std::move(message_connector_); - auto availability_handler = std::make_unique< - flutter::StreamHandlerFunctions<>>( - [plugin_pointer = plugin.get()]( - const EncodableValue* arguments, - std::unique_ptr>&& events) - -> std::unique_ptr> { - return plugin_pointer->OnListen(arguments, std::move(events)); - }, - [plugin_pointer = plugin.get()](const EncodableValue* arguments) - -> std::unique_ptr> { - return plugin_pointer->OnCancel(arguments); - }); - auto scan_result_handler = std::make_unique< - flutter::StreamHandlerFunctions<>>( - [plugin_pointer = plugin.get()]( - const EncodableValue* arguments, - std::unique_ptr>&& events) - -> std::unique_ptr> { - return plugin_pointer->OnListen(arguments, std::move(events)); - }, - [plugin_pointer = plugin.get()](const EncodableValue* arguments) - -> std::unique_ptr> { - return plugin_pointer->OnCancel(arguments); - }); - event_availability_change->SetStreamHandler(std::move(availability_handler)); - event_scan_result->SetStreamHandler(std::move(scan_result_handler)); - plugin->message_connector_ = std::move(message_connector_); - - registrar->AddPlugin(std::move(plugin)); -} + registrar->AddPlugin(std::move(plugin)); + } -QuickBluePlugin::QuickBluePlugin() { - InitializeAsync(); -} + QuickBluePlugin::QuickBluePlugin() + { + InitializeAsync(); + } -QuickBluePlugin::~QuickBluePlugin() {} + QuickBluePlugin::~QuickBluePlugin() {} -winrt::fire_and_forget QuickBluePlugin::InitializeAsync() { - auto bluetoothAdapter = co_await BluetoothAdapter::GetDefaultAsync(); - bluetoothRadio = co_await bluetoothAdapter.GetRadioAsync(); - if (bluetoothRadio) { - radioStateChangedRevoker = bluetoothRadio.StateChanged(winrt::auto_revoke, { this, &QuickBluePlugin::Radio_StateChanged }); + winrt::fire_and_forget QuickBluePlugin::InitializeAsync() + { + auto bluetoothAdapter = co_await BluetoothAdapter::GetDefaultAsync(); + bluetoothRadio = co_await bluetoothAdapter.GetRadioAsync(); + if (bluetoothRadio) + { + radioStateChangedRevoker = bluetoothRadio.StateChanged(winrt::auto_revoke, {this, &QuickBluePlugin::Radio_StateChanged}); + } } -} -void QuickBluePlugin::HandleMethodCall( - const flutter::MethodCall &method_call, - std::unique_ptr> result) { - auto method_name = method_call.method_name(); - OutputDebugString((L"HandleMethodCall " + winrt::to_hstring(method_name) + L"\n").c_str()); - if (method_name.compare("isBluetoothAvailable") == 0) { - result->Success(EncodableValue(bluetoothRadio && bluetoothRadio.State() == RadioState::On)); - } else if (method_name.compare("startScan") == 0) { - if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) { - if (!bluetoothLEWatcher) { - bluetoothLEWatcher = BluetoothLEAdvertisementWatcher(); - bluetoothLEWatcherReceivedToken = bluetoothLEWatcher.Received({ this, &QuickBluePlugin::BluetoothLEWatcher_Received }); + void QuickBluePlugin::HandleMethodCall( + const flutter::MethodCall &method_call, + std::unique_ptr> result) + { + auto method_name = method_call.method_name(); + OutputDebugString((L"HandleMethodCall " + winrt::to_hstring(method_name) + L"\n").c_str()); + if (method_name.compare("isBluetoothAvailable") == 0) + { + result->Success(EncodableValue(bluetoothRadio && bluetoothRadio.State() == RadioState::On)); + } + else if (method_name.compare("startScan") == 0) + { + if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) + { + if (!bluetoothLEWatcher) + { + bluetoothLEWatcher = BluetoothLEAdvertisementWatcher(); + bluetoothLEWatcherReceivedToken = bluetoothLEWatcher.Received({this, &QuickBluePlugin::BluetoothLEWatcher_Received}); + } + + // auto args = std::get(*method_call.arguments()); + // auto serviceUUID = std::get(args[EncodableValue("serviceUUID")]); + + // if (serviceUUID.size() > 0) + // { + // auto filter = BluetoothLEAdvertisementFilter(); + // auto advert = BluetoothLEAdvertisement(); + // advert.ServiceUuids(); + // filter.Advertisement(advert); + // bluetoothLEWatcher.AdvertisementFilter(filter); + // } + + bluetoothLEWatcher.Start(); + result->Success(nullptr); + } + else + { + result->Error("IllegalState", "Bluetooth unavailable"); } - bluetoothLEWatcher.Start(); - result->Success(nullptr); - } else { - result->Error("IllegalState", "Bluetooth unavailable"); } - } else if (method_name.compare("stopScan") == 0) { - if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) { - if (bluetoothLEWatcher) { - bluetoothLEWatcher.Stop(); - bluetoothLEWatcher.Received(bluetoothLEWatcherReceivedToken); + else if (method_name.compare("stopScan") == 0) + { + if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) + { + if (bluetoothLEWatcher) + { + bluetoothLEWatcher.Stop(); + bluetoothLEWatcher.Received(bluetoothLEWatcherReceivedToken); + } + bluetoothLEWatcher = nullptr; + result->Success(nullptr); } - bluetoothLEWatcher = nullptr; + else + { + result->Error("IllegalState", "Bluetooth unavailable"); + } + } + else if (method_name.compare("connect") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + ConnectAsync(std::stoull(deviceId)); result->Success(nullptr); - } else { - result->Error("IllegalState", "Bluetooth unavailable"); } - } else if (method_name.compare("connect") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - ConnectAsync(std::stoull(deviceId)); - result->Success(nullptr); - } else if (method_name.compare("disconnect") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - CleanConnection(std::stoull(deviceId)); - // TODO send `disconnected` message - result->Success(nullptr); - } else if (method_name.compare("discoverServices") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - auto it = connectedDevices.find(std::stoull(deviceId)); - if (it == connectedDevices.end()) { - result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); - return; + else if (method_name.compare("disconnect") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + CleanConnection(std::stoull(deviceId)); + // TODO send `disconnected` message + result->Success(nullptr); } - DiscoverServicesAsync(*it->second); - result->Success(nullptr); - } else if (method_name.compare("setNotifiable") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - auto service = std::get(args[EncodableValue("service")]); - auto characteristic = std::get(args[EncodableValue("characteristic")]); - auto bleInputProperty = std::get(args[EncodableValue("bleInputProperty")]); - auto it = connectedDevices.find(std::stoull(deviceId)); - if (it == connectedDevices.end()) { - result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); - return; + else if (method_name.compare("discoverServices") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + auto it = connectedDevices.find(std::stoull(deviceId)); + if (it == connectedDevices.end()) + { + result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + return; + } + DiscoverServicesAsync(*it->second); + result->Success(nullptr); } + else if (method_name.compare("setNotifiable") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + auto service = std::get(args[EncodableValue("service")]); + auto characteristic = std::get(args[EncodableValue("characteristic")]); + auto bleInputProperty = std::get(args[EncodableValue("bleInputProperty")]); + auto it = connectedDevices.find(std::stoull(deviceId)); + if (it == connectedDevices.end()) + { + result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + return; + } - auto bluetoothAgent = *it->second; - auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); - async_c.Completed([&, result_pointer = result.get()] - (IAsyncOperation const& sender, AsyncStatus const args) { + auto bluetoothAgent = *it->second; + auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); + async_c.Completed([&, result_pointer = result.get()](IAsyncOperation const &sender, AsyncStatus const args) + { // FIXME https://github.com/woodemi/quick.flutter/pull/31#issuecomment-1159213902 auto c = sender.GetResults(); if (c == nullptr) { @@ -311,23 +370,25 @@ void QuickBluePlugin::HandleMethodCall( return; } SetNotifiableAsync(bluetoothAgent, c, bleInputProperty); - result_pointer->Success(nullptr); - }); - } else if (method_name.compare("readValue") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - auto service = std::get(args[EncodableValue("service")]); - auto characteristic = std::get(args[EncodableValue("characteristic")]); - auto it = connectedDevices.find(std::stoull(deviceId)); - if (it == connectedDevices.end()) { - result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); - return; + result_pointer->Success(nullptr); }); } + else if (method_name.compare("readValue") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + auto service = std::get(args[EncodableValue("service")]); + auto characteristic = std::get(args[EncodableValue("characteristic")]); + auto it = connectedDevices.find(std::stoull(deviceId)); + if (it == connectedDevices.end()) + { + result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + return; + } - auto bluetoothAgent = *it->second; - auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); - async_c.Completed([&, result_pointer = result.get()] - (IAsyncOperation const& sender, AsyncStatus const args) { + auto bluetoothAgent = *it->second; + auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); + async_c.Completed([&, result_pointer = result.get()](IAsyncOperation const &sender, AsyncStatus const args) + { // FIXME https://github.com/woodemi/quick.flutter/pull/31#issuecomment-1159213902 auto c = sender.GetResults(); if (c == nullptr) { @@ -335,25 +396,27 @@ void QuickBluePlugin::HandleMethodCall( return; } ReadValueAsync(c); - result_pointer->Success(nullptr); - }); - } else if (method_name.compare("writeValue") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - auto service = std::get(args[EncodableValue("service")]); - auto characteristic = std::get(args[EncodableValue("characteristic")]); - auto value = std::get>(args[EncodableValue("value")]); - auto bleOutputProperty = std::get(args[EncodableValue("bleOutputProperty")]); - auto it = connectedDevices.find(std::stoull(deviceId)); - if (it == connectedDevices.end()) { - result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); - return; + result_pointer->Success(nullptr); }); } + else if (method_name.compare("writeValue") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + auto service = std::get(args[EncodableValue("service")]); + auto characteristic = std::get(args[EncodableValue("characteristic")]); + auto value = std::get>(args[EncodableValue("value")]); + auto bleOutputProperty = std::get(args[EncodableValue("bleOutputProperty")]); + auto it = connectedDevices.find(std::stoull(deviceId)); + if (it == connectedDevices.end()) + { + result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + return; + } - auto bluetoothAgent = *it->second; - auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); - async_c.Completed([&, result_pointer = result.get()] - (IAsyncOperation const& sender, AsyncStatus const args) { + auto bluetoothAgent = *it->second; + auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); + async_c.Completed([&, result_pointer = result.get()](IAsyncOperation const &sender, AsyncStatus const args) + { // FIXME https://github.com/woodemi/quick.flutter/pull/31#issuecomment-1159213902 auto c = sender.GetResults(); if (c == nullptr) { @@ -361,262 +424,307 @@ void QuickBluePlugin::HandleMethodCall( return; } WriteValueAsync(c, value, bleOutputProperty); - result_pointer->Success(nullptr); - }); - } else if (method_name.compare("requestMtu") == 0) { - auto args = std::get(*method_call.arguments()); - auto deviceId = std::get(args[EncodableValue("deviceId")]); - auto expectedMtu = std::get(args[EncodableValue("expectedMtu")]); - auto it = connectedDevices.find(std::stoull(deviceId)); - if (it == connectedDevices.end()) { - result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); - return; + result_pointer->Success(nullptr); }); } + else if (method_name.compare("requestMtu") == 0) + { + auto args = std::get(*method_call.arguments()); + auto deviceId = std::get(args[EncodableValue("deviceId")]); + auto expectedMtu = std::get(args[EncodableValue("expectedMtu")]); + auto it = connectedDevices.find(std::stoull(deviceId)); + if (it == connectedDevices.end()) + { + result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + return; + } - RequestMtuAsync(*it->second, expectedMtu); - result->Success(nullptr); - } else { - result->NotImplemented(); + RequestMtuAsync(*it->second, expectedMtu); + result->Success(nullptr); + } + else + { + result->NotImplemented(); + } } -} -std::vector parseManufacturerDataHead(BluetoothLEAdvertisement advertisement) -{ - if (advertisement.ManufacturerData().Size() == 0) - return std::vector(); - - auto manufacturerData = advertisement.ManufacturerData().GetAt(0); - // FIXME Compat with REG_DWORD_BIG_ENDIAN - uint8_t* prefix = uint16_t_union{ manufacturerData.CompanyId() }.bytes; - auto result = std::vector{ prefix, prefix + sizeof(uint16_t_union) }; + std::vector parseManufacturerDataHead(BluetoothLEAdvertisement advertisement) + { + if (advertisement.ManufacturerData().Size() == 0) + return std::vector(); - auto data = to_bytevc(manufacturerData.Data()); - result.insert(result.end(), data.begin(), data.end()); - return result; -} + auto manufacturerData = advertisement.ManufacturerData().GetAt(0); + // FIXME Compat with REG_DWORD_BIG_ENDIAN + uint8_t *prefix = uint16_t_union{manufacturerData.CompanyId()}.bytes; + auto result = std::vector{prefix, prefix + sizeof(uint16_t_union)}; -enum class AvailabilityState : int { - unknown = 0, - resetting = 1, - unsupported = 2, - unauthorized = 3, - poweredOff = 4, - poweredOn = 5, -}; - -void QuickBluePlugin::Radio_StateChanged(Radio radio, IInspectable args) { - auto radioState = !radio ? RadioState::Disabled : radio.State(); - // FIXME https://stackoverflow.com/questions/66099947/bluetooth-radio-statechanged-event-fires-twice/67723902#67723902 - if (oldRadioState == radioState) { - return; + auto data = to_bytevc(manufacturerData.Data()); + result.insert(result.end(), data.begin(), data.end()); + return result; } - oldRadioState = radioState; - - auto state = [=]() -> AvailabilityState { - if (radioState == RadioState::Unknown) { - return AvailabilityState::unknown; - } else if (radioState == RadioState::Off) { - return AvailabilityState::poweredOff; - } else if (radioState == RadioState::On) { - return AvailabilityState::poweredOn; - } else if (radioState == RadioState::Disabled) { - return AvailabilityState::unsupported; - } else { - return AvailabilityState::unknown; + + enum class AvailabilityState : int + { + unknown = 0, + resetting = 1, + unsupported = 2, + unauthorized = 3, + poweredOff = 4, + poweredOn = 5, + }; + + void QuickBluePlugin::Radio_StateChanged(Radio radio, IInspectable args) + { + auto radioState = !radio ? RadioState::Disabled : radio.State(); + // FIXME https://stackoverflow.com/questions/66099947/bluetooth-radio-statechanged-event-fires-twice/67723902#67723902 + if (oldRadioState == radioState) + { + return; } - }(); + oldRadioState = radioState; - if (availability_change_sink_) { - availability_change_sink_->Success(static_cast(state)); - } -} + auto state = [=]() -> AvailabilityState + { + if (radioState == RadioState::Unknown) + { + return AvailabilityState::unknown; + } + else if (radioState == RadioState::Off) + { + return AvailabilityState::poweredOff; + } + else if (radioState == RadioState::On) + { + return AvailabilityState::poweredOn; + } + else if (radioState == RadioState::Disabled) + { + return AvailabilityState::unsupported; + } + else + { + return AvailabilityState::unknown; + } + }(); -winrt::fire_and_forget QuickBluePlugin::BluetoothLEWatcher_Received( - BluetoothLEAdvertisementWatcher sender, - BluetoothLEAdvertisementReceivedEventArgs args) { - auto device = co_await BluetoothLEDevice::FromBluetoothAddressAsync(args.BluetoothAddress()); - auto name = device ? device.Name() : args.Advertisement().LocalName(); - OutputDebugString((L"Received BluetoothAddress:" + winrt::to_hstring(args.BluetoothAddress()) - + L", Name:" + name + L", LocalName:" + args.Advertisement().LocalName() + L"\n").c_str()); - if (scan_result_sink_) { - scan_result_sink_->Success(EncodableMap{ - {"name", winrt::to_string(name)}, - {"deviceId", std::to_string(args.BluetoothAddress())}, - {"manufacturerDataHead", parseManufacturerDataHead(args.Advertisement())}, - {"rssi", args.RawSignalStrengthInDBm()}, - }); + if (availability_change_sink_) + { + availability_change_sink_->Success(static_cast(state)); + } } -} -std::unique_ptr> QuickBluePlugin::OnListenInternal( - const EncodableValue* arguments, std::unique_ptr>&& events) -{ - if (arguments == nullptr) { - return nullptr; - } - auto args = std::get(*arguments); - auto name = std::get(args[EncodableValue("name")]); - if (name.compare("availabilityChange") == 0) { - availability_change_sink_ = std::move(events); - Radio_StateChanged(bluetoothRadio, nullptr); - } else if (name.compare("scanResult") == 0) { - scan_result_sink_ = std::move(events); + winrt::fire_and_forget QuickBluePlugin::BluetoothLEWatcher_Received( + BluetoothLEAdvertisementWatcher sender, + BluetoothLEAdvertisementReceivedEventArgs args) + { + auto device = co_await BluetoothLEDevice::FromBluetoothAddressAsync(args.BluetoothAddress()); + auto name = device ? device.Name() : args.Advertisement().LocalName(); + OutputDebugString((L"Received BluetoothAddress:" + winrt::to_hstring(args.BluetoothAddress()) + L", Name:" + name + L", LocalName:" + args.Advertisement().LocalName() + L"\n").c_str()); + if (scan_result_sink_) + { + scan_result_sink_->Success(EncodableMap{ + {"name", winrt::to_string(name)}, + {"deviceId", std::to_string(args.BluetoothAddress())}, + {"manufacturerDataHead", parseManufacturerDataHead(args.Advertisement())}, + {"rssi", args.RawSignalStrengthInDBm()}, + }); + } } - return nullptr; -} -std::unique_ptr> QuickBluePlugin::OnCancelInternal( - const EncodableValue* arguments) -{ - if (arguments == nullptr) { + std::unique_ptr> QuickBluePlugin::OnListenInternal( + const EncodableValue *arguments, std::unique_ptr> &&events) + { + if (arguments == nullptr) + { + return nullptr; + } + auto args = std::get(*arguments); + auto name = std::get(args[EncodableValue("name")]); + if (name.compare("availabilityChange") == 0) + { + availability_change_sink_ = std::move(events); + Radio_StateChanged(bluetoothRadio, nullptr); + } + else if (name.compare("scanResult") == 0) + { + scan_result_sink_ = std::move(events); + } return nullptr; } - auto args = std::get(*arguments); - auto name = std::get(args[EncodableValue("name")]); - if (name.compare("availabilityChange") == 0) { - availability_change_sink_ = nullptr; - } else if (name.compare("scanResult") == 0) { + + std::unique_ptr> QuickBluePlugin::OnCancelInternal( + const EncodableValue *arguments) + { + if (arguments == nullptr) + { + return nullptr; + } + auto args = std::get(*arguments); + auto name = std::get(args[EncodableValue("name")]); + if (name.compare("availabilityChange") == 0) + { + availability_change_sink_ = nullptr; + } + else if (name.compare("scanResult") == 0) + { scan_result_sink_ = nullptr; + } + return nullptr; } - return nullptr; -} -winrt::fire_and_forget QuickBluePlugin::ConnectAsync(uint64_t bluetoothAddress) { - auto device = co_await BluetoothLEDevice::FromBluetoothAddressAsync(bluetoothAddress); - auto servicesResult = co_await device.GetGattServicesAsync(); - if (servicesResult.Status() != GattCommunicationStatus::Success) { - OutputDebugString((L"GetGattServicesAsync error: " + winrt::to_hstring((int32_t)servicesResult.Status()) + L"\n").c_str()); - message_connector_->Send(EncodableMap{ - {"deviceId", std::to_string(bluetoothAddress)}, - {"ConnectionState", "disconnected"}, - }); - co_return; - } - auto connnectionStatusChangedToken = device.ConnectionStatusChanged({ this, &QuickBluePlugin::BluetoothLEDevice_ConnectionStatusChanged }); - auto deviceAgent = std::make_unique(device, connnectionStatusChangedToken); - auto pair = std::make_pair(bluetoothAddress, std::move(deviceAgent)); - connectedDevices.insert(std::move(pair)); - - message_connector_->Send(EncodableMap{ - {"deviceId", std::to_string(bluetoothAddress)}, - {"ConnectionState", "connected"}, - }); -} + winrt::fire_and_forget QuickBluePlugin::ConnectAsync(uint64_t bluetoothAddress) + { + auto device = co_await BluetoothLEDevice::FromBluetoothAddressAsync(bluetoothAddress); + auto servicesResult = co_await device.GetGattServicesAsync(); + if (servicesResult.Status() != GattCommunicationStatus::Success) + { + OutputDebugString((L"GetGattServicesAsync error: " + winrt::to_hstring((int32_t)servicesResult.Status()) + L"\n").c_str()); + message_connector_->Send(EncodableMap{ + {"deviceId", std::to_string(bluetoothAddress)}, + {"ConnectionState", "disconnected"}, + }); + co_return; + } + auto connnectionStatusChangedToken = device.ConnectionStatusChanged({this, &QuickBluePlugin::BluetoothLEDevice_ConnectionStatusChanged}); + auto deviceAgent = std::make_unique(device, connnectionStatusChangedToken); + auto pair = std::make_pair(bluetoothAddress, std::move(deviceAgent)); + connectedDevices.insert(std::move(pair)); -void QuickBluePlugin::BluetoothLEDevice_ConnectionStatusChanged(BluetoothLEDevice sender, IInspectable args) { - OutputDebugString((L"ConnectionStatusChanged " + winrt::to_hstring((int32_t)sender.ConnectionStatus()) + L"\n").c_str()); - if (sender.ConnectionStatus() == BluetoothConnectionStatus::Disconnected) { - CleanConnection(sender.BluetoothAddress()); message_connector_->Send(EncodableMap{ - {"deviceId", std::to_string(sender.BluetoothAddress())}, - {"ConnectionState", "disconnected"}, + {"deviceId", std::to_string(bluetoothAddress)}, + {"ConnectionState", "connected"}, }); } -} -void QuickBluePlugin::CleanConnection(uint64_t bluetoothAddress) { - auto node = connectedDevices.extract(bluetoothAddress); - if (!node.empty()) { - auto deviceAgent = std::move(node.mapped()); - deviceAgent->device.ConnectionStatusChanged(deviceAgent->connnectionStatusChangedToken); - for (auto& tokenPair : deviceAgent->valueChangedTokens) { - deviceAgent->gattCharacteristics.at(tokenPair.first).ValueChanged(tokenPair.second); + void QuickBluePlugin::BluetoothLEDevice_ConnectionStatusChanged(BluetoothLEDevice sender, IInspectable args) + { + OutputDebugString((L"ConnectionStatusChanged " + winrt::to_hstring((int32_t)sender.ConnectionStatus()) + L"\n").c_str()); + if (sender.ConnectionStatus() == BluetoothConnectionStatus::Disconnected) + { + CleanConnection(sender.BluetoothAddress()); + message_connector_->Send(EncodableMap{ + {"deviceId", std::to_string(sender.BluetoothAddress())}, + {"ConnectionState", "disconnected"}, + }); } } -} -winrt::fire_and_forget QuickBluePlugin::DiscoverServicesAsync(BluetoothDeviceAgent &bluetoothDeviceAgent) { - auto serviceResult = co_await bluetoothDeviceAgent.device.GetGattServicesAsync(); - if (serviceResult.Status() != GattCommunicationStatus::Success) { - message_connector_->Send( - EncodableMap{ - {"deviceId", std::to_string(bluetoothDeviceAgent.device.BluetoothAddress())}, - {"ServiceState", "discovered"} + void QuickBluePlugin::CleanConnection(uint64_t bluetoothAddress) + { + auto node = connectedDevices.extract(bluetoothAddress); + if (!node.empty()) + { + auto deviceAgent = std::move(node.mapped()); + deviceAgent->device.ConnectionStatusChanged(deviceAgent->connnectionStatusChangedToken); + for (auto &tokenPair : deviceAgent->valueChangedTokens) + { + deviceAgent->gattCharacteristics.at(tokenPair.first).ValueChanged(tokenPair.second); } - ); - co_return; + } } - for (auto s : serviceResult.Services()) { - auto characteristicResult = co_await s.GetCharacteristicsAsync(); - auto msg = EncodableMap{ - {"deviceId", std::to_string(bluetoothDeviceAgent.device.BluetoothAddress())}, - {"ServiceState", "discovered"}, - {"service", to_uuidstr(s.Uuid())} - }; - if (characteristicResult.Status() == GattCommunicationStatus::Success) { - EncodableList characteristics; - for (auto c : characteristicResult.Characteristics()) { - characteristics.push_back(to_uuidstr(c.Uuid())); + winrt::fire_and_forget QuickBluePlugin::DiscoverServicesAsync(BluetoothDeviceAgent &bluetoothDeviceAgent) + { + auto serviceResult = co_await bluetoothDeviceAgent.device.GetGattServicesAsync(); + if (serviceResult.Status() != GattCommunicationStatus::Success) + { + message_connector_->Send( + EncodableMap{ + {"deviceId", std::to_string(bluetoothDeviceAgent.device.BluetoothAddress())}, + {"ServiceState", "discovered"}}); + co_return; + } + + for (auto s : serviceResult.Services()) + { + auto characteristicResult = co_await s.GetCharacteristicsAsync(); + auto msg = EncodableMap{ + {"deviceId", std::to_string(bluetoothDeviceAgent.device.BluetoothAddress())}, + {"ServiceState", "discovered"}, + {"service", to_uuidstr(s.Uuid())}}; + if (characteristicResult.Status() == GattCommunicationStatus::Success) + { + EncodableList characteristics; + for (auto c : characteristicResult.Characteristics()) + { + characteristics.push_back(to_uuidstr(c.Uuid())); + } + msg.insert({"characteristics", characteristics}); } - msg.insert({"characteristics", characteristics}); + message_connector_->Send(msg); } - message_connector_->Send(msg); } -} -winrt::fire_and_forget QuickBluePlugin::RequestMtuAsync(BluetoothDeviceAgent& bluetoothDeviceAgent, uint64_t expectedMtu) { - OutputDebugString(L"RequestMtuAsync expectedMtu"); - auto gattSession = co_await GattSession::FromDeviceIdAsync(bluetoothDeviceAgent.device.BluetoothDeviceId()); - message_connector_->Send(EncodableMap{ - {"mtuConfig", (int64_t)gattSession.MaxPduSize()}, - }); -} + winrt::fire_and_forget QuickBluePlugin::RequestMtuAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, uint64_t expectedMtu) + { + OutputDebugString(L"RequestMtuAsync expectedMtu"); + auto gattSession = co_await GattSession::FromDeviceIdAsync(bluetoothDeviceAgent.device.BluetoothDeviceId()); + message_connector_->Send(EncodableMap{ + {"mtuConfig", (int64_t)gattSession.MaxPduSize()}, + }); + } -winrt::fire_and_forget QuickBluePlugin::SetNotifiableAsync(BluetoothDeviceAgent& bluetoothDeviceAgent, GattCharacteristic& gattCharacteristic, std::string bleInputProperty) { - auto descriptorValue = bleInputProperty == "notification" ? GattClientCharacteristicConfigurationDescriptorValue::Notify - : bleInputProperty == "indication" ? GattClientCharacteristicConfigurationDescriptorValue::Indicate - : GattClientCharacteristicConfigurationDescriptorValue::None; - auto writeDescriptorStatus = co_await gattCharacteristic.WriteClientCharacteristicConfigurationDescriptorAsync(descriptorValue); - if (writeDescriptorStatus != GattCommunicationStatus::Success) - OutputDebugString((L"WriteClientCharacteristicConfigurationDescriptorAsync " + winrt::to_hstring((int32_t)writeDescriptorStatus) + L"\n").c_str()); - - auto uuid = to_uuidstr(gattCharacteristic.Uuid()); - if (bleInputProperty != "disabled") { - bluetoothDeviceAgent.valueChangedTokens[uuid] = gattCharacteristic.ValueChanged({ this, &QuickBluePlugin::GattCharacteristic_ValueChanged }); - } else { - gattCharacteristic.ValueChanged(std::exchange(bluetoothDeviceAgent.valueChangedTokens[uuid], {})); + winrt::fire_and_forget QuickBluePlugin::SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, GattCharacteristic &gattCharacteristic, std::string bleInputProperty) + { + auto descriptorValue = bleInputProperty == "notification" ? GattClientCharacteristicConfigurationDescriptorValue::Notify + : bleInputProperty == "indication" ? GattClientCharacteristicConfigurationDescriptorValue::Indicate + : GattClientCharacteristicConfigurationDescriptorValue::None; + auto writeDescriptorStatus = co_await gattCharacteristic.WriteClientCharacteristicConfigurationDescriptorAsync(descriptorValue); + if (writeDescriptorStatus != GattCommunicationStatus::Success) + OutputDebugString((L"WriteClientCharacteristicConfigurationDescriptorAsync " + winrt::to_hstring((int32_t)writeDescriptorStatus) + L"\n").c_str()); + + auto uuid = to_uuidstr(gattCharacteristic.Uuid()); + if (bleInputProperty != "disabled") + { + bluetoothDeviceAgent.valueChangedTokens[uuid] = gattCharacteristic.ValueChanged({this, &QuickBluePlugin::GattCharacteristic_ValueChanged}); + } + else + { + gattCharacteristic.ValueChanged(std::exchange(bluetoothDeviceAgent.valueChangedTokens[uuid], {})); + } } -} -winrt::fire_and_forget QuickBluePlugin::ReadValueAsync(GattCharacteristic& gattCharacteristic) { - auto readValueResult = co_await gattCharacteristic.ReadValueAsync(); - auto uuid = to_uuidstr(gattCharacteristic.Uuid()); - auto bytes = to_bytevc(readValueResult.Value()); - OutputDebugString((L"ReadValueAsync " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(bytes)) + L"\n").c_str()); - message_connector_->Send(EncodableMap{ - {"deviceId", std::to_string(gattCharacteristic.Service().Device().BluetoothAddress())}, - {"characteristicValue", EncodableMap{ - {"characteristic", uuid}, - {"value", bytes}, - }}, - }); -} + winrt::fire_and_forget QuickBluePlugin::ReadValueAsync(GattCharacteristic &gattCharacteristic) + { + auto readValueResult = co_await gattCharacteristic.ReadValueAsync(); + auto uuid = to_uuidstr(gattCharacteristic.Uuid()); + auto bytes = to_bytevc(readValueResult.Value()); + OutputDebugString((L"ReadValueAsync " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(bytes)) + L"\n").c_str()); + message_connector_->Send(EncodableMap{ + {"deviceId", std::to_string(gattCharacteristic.Service().Device().BluetoothAddress())}, + {"characteristicValue", EncodableMap{ + {"characteristic", uuid}, + {"value", bytes}, + }}, + }); + } -winrt::fire_and_forget QuickBluePlugin::WriteValueAsync(GattCharacteristic& gattCharacteristic, std::vector value, std::string bleOutputProperty) { - auto writeOption = bleOutputProperty.compare("withoutResponse") == 0 ? GattWriteOption::WriteWithoutResponse : GattWriteOption::WriteWithResponse; - auto writeValueStatus = co_await gattCharacteristic.WriteValueAsync(from_bytevc(value), writeOption); - auto uuid = to_uuidstr(gattCharacteristic.Uuid()); - OutputDebugString((L"WriteValueAsync " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(value)) + L", " + winrt::to_hstring((int32_t)writeValueStatus) + L"\n").c_str()); -} + winrt::fire_and_forget QuickBluePlugin::WriteValueAsync(GattCharacteristic &gattCharacteristic, std::vector value, std::string bleOutputProperty) + { + auto writeOption = bleOutputProperty.compare("withoutResponse") == 0 ? GattWriteOption::WriteWithoutResponse : GattWriteOption::WriteWithResponse; + auto writeValueStatus = co_await gattCharacteristic.WriteValueAsync(from_bytevc(value), writeOption); + auto uuid = to_uuidstr(gattCharacteristic.Uuid()); + OutputDebugString((L"WriteValueAsync " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(value)) + L", " + winrt::to_hstring((int32_t)writeValueStatus) + L"\n").c_str()); + } -void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args) { - auto uuid = to_uuidstr(sender.Uuid()); - auto bytes = to_bytevc(args.CharacteristicValue()); - OutputDebugString((L"GattCharacteristic_ValueChanged " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(bytes)) + L"\n").c_str()); - message_connector_->Send(EncodableMap{ - {"deviceId", std::to_string(sender.Service().Device().BluetoothAddress())}, - {"characteristicValue", EncodableMap{ - {"characteristic", uuid}, - {"value", bytes}, - }}, - }); -} + void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args) + { + auto uuid = to_uuidstr(sender.Uuid()); + auto bytes = to_bytevc(args.CharacteristicValue()); + OutputDebugString((L"GattCharacteristic_ValueChanged " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(bytes)) + L"\n").c_str()); + message_connector_->Send(EncodableMap{ + {"deviceId", std::to_string(sender.Service().Device().BluetoothAddress())}, + {"characteristicValue", EncodableMap{ + {"characteristic", uuid}, + {"value", bytes}, + }}, + }); + } -} // namespace +} // namespace void QuickBluePluginRegisterWithRegistrar( - FlutterDesktopPluginRegistrarRef registrar) { + FlutterDesktopPluginRegistrarRef registrar) +{ QuickBluePlugin::RegisterWithRegistrar( flutter::PluginRegistrarManager::GetInstance() ->GetRegistrar(registrar)); From 17c355ea6bf5fa0ba2f62e430e6e3811659126d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Fri, 31 Mar 2023 14:45:04 +0200 Subject: [PATCH 05/21] Fix dependencies and unused imports --- .../lib/src/method_channel_quick_blue.dart | 3 ++- packages/quick_blue/pubspec.yaml | 1 + packages/quick_notify/example/analysis_options.yaml | 3 +-- packages/quick_notify/example/lib/main.dart | 13 ++++++++----- packages/quick_usb/lib/src/quick_usb_android.dart | 4 ++-- packages/quick_usb/lib/src/quick_usb_desktop.dart | 10 ++++++---- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 169ebc6..0918f00 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; @@ -106,6 +105,8 @@ class MethodChannelQuickBlue extends QuickBluePlatform { onValueChanged?.call(deviceId, characteristic, value); } else if (message['mtuConfig'] != null) { _mtuConfigController.add(message['mtuConfig']); + } else { + _log('_handleConnectorMessage $message is not implented.'); } } diff --git a/packages/quick_blue/pubspec.yaml b/packages/quick_blue/pubspec.yaml index 25754ca..bef1960 100644 --- a/packages/quick_blue/pubspec.yaml +++ b/packages/quick_blue/pubspec.yaml @@ -15,6 +15,7 @@ dependencies: plugin_platform_interface: ^2.1.2 bluez: ^0.8.1 convert: ^3.0.1 + collection: ^1.17.0 dev_dependencies: flutter_test: diff --git a/packages/quick_notify/example/analysis_options.yaml b/packages/quick_notify/example/analysis_options.yaml index 61b6c4d..53a0830 100644 --- a/packages/quick_notify/example/analysis_options.yaml +++ b/packages/quick_notify/example/analysis_options.yaml @@ -22,8 +22,7 @@ linter: # `// ignore_for_file: name_of_lint` syntax on the line or in the file # producing the lint. rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule + avoid_print: false # Uncomment to disable the `avoid_print` rule # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options diff --git a/packages/quick_notify/example/lib/main.dart b/packages/quick_notify/example/lib/main.dart index debcd8e..0d93eb1 100644 --- a/packages/quick_notify/example/lib/main.dart +++ b/packages/quick_notify/example/lib/main.dart @@ -3,10 +3,12 @@ import 'package:flutter/material.dart'; import 'package:quick_notify/quick_notify.dart'; void main() { - runApp(MyApp()); + runApp(const MyApp()); } class MyApp extends StatefulWidget { + const MyApp({Key? key}) : super(key: key); + @override _MyAppState createState() => _MyAppState(); } @@ -25,23 +27,24 @@ class _MyAppState extends State { mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ ElevatedButton( - child: Text('hasPermission'), + child: const Text('hasPermission'), onPressed: () async { var hasPermission = await QuickNotify.hasPermission(); print('hasPermission $hasPermission'); }, ), ElevatedButton( - child: Text('requestPermission'), + child: const Text('requestPermission'), onPressed: () async { - var requestPermission = await QuickNotify.requestPermission(); + var requestPermission = + await QuickNotify.requestPermission(); print('requestPermission $requestPermission'); }, ), ], ), ElevatedButton( - child: Text('notify'), + child: const Text('notify'), onPressed: () { QuickNotify.notify( title: 'My title', diff --git a/packages/quick_usb/lib/src/quick_usb_android.dart b/packages/quick_usb/lib/src/quick_usb_android.dart index 356b5b1..ec9b112 100644 --- a/packages/quick_usb/lib/src/quick_usb_android.dart +++ b/packages/quick_usb/lib/src/quick_usb_android.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:quick_usb/src/common.dart'; @@ -25,7 +24,8 @@ class QuickUsbAndroid extends QuickUsbPlatform { @override Future> getDeviceList() async { - List> devices = (await _channel.invokeListMethod('getDeviceList'))!; + List> devices = + (await _channel.invokeListMethod('getDeviceList'))!; return devices.map((device) => UsbDevice.fromMap(device)).toList(); } diff --git a/packages/quick_usb/lib/src/quick_usb_desktop.dart b/packages/quick_usb/lib/src/quick_usb_desktop.dart index 82bb636..015ec44 100644 --- a/packages/quick_usb/lib/src/quick_usb_desktop.dart +++ b/packages/quick_usb/lib/src/quick_usb_desktop.dart @@ -1,6 +1,5 @@ import 'dart:ffi'; import 'dart:io'; -import 'dart:typed_data'; import 'package:ffi/ffi.dart' as ffi; import 'package:flutter/foundation.dart'; @@ -32,7 +31,8 @@ class QuickUsbLinux extends _QuickUsbDesktop { // For example/.dart_tool/flutter_build/generated_main.dart static registerWith() { QuickUsbPlatform.instance = QuickUsbLinux(); - _libusb = Libusb(DynamicLibrary.open('${File(Platform.resolvedExecutable).parent.path}/lib/libusb-1.0.23.so')); + _libusb = Libusb(DynamicLibrary.open( + '${File(Platform.resolvedExecutable).parent.path}/lib/libusb-1.0.23.so')); } } @@ -89,7 +89,8 @@ class _QuickUsbDesktop extends QuickUsbPlatform { } @override - Future> getDevicesWithDescription({bool requestPermission = true}) async { + Future> getDevicesWithDescription( + {bool requestPermission = true}) async { var devices = await getDeviceList(); var result = []; for (var device in devices) { @@ -99,7 +100,8 @@ class _QuickUsbDesktop extends QuickUsbPlatform { } @override - Future getDeviceDescription(UsbDevice usbDevice, {bool requestPermission = true}) async { + Future getDeviceDescription(UsbDevice usbDevice, + {bool requestPermission = true}) async { String? manufacturer; String? product; String? serialNumber; From 007de2c819a2377b308dce9318860d95b19f2108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Fri, 31 Mar 2023 14:49:11 +0200 Subject: [PATCH 06/21] Rename serviceUUID -> serviceUUIDs --- packages/quick_blue/darwin/QuickBlueDarwin.swift | 2 +- packages/quick_blue/example/lib/main.dart | 2 +- packages/quick_blue/lib/quick_blue.dart | 4 ++-- packages/quick_blue/lib/src/method_channel_quick_blue.dart | 4 ++-- packages/quick_blue/lib/src/quick_blue_linux.dart | 2 +- .../quick_blue/lib/src/quick_blue_platform_interface.dart | 2 +- packages/quick_blue/windows/quick_blue_plugin.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/quick_blue/darwin/QuickBlueDarwin.swift b/packages/quick_blue/darwin/QuickBlueDarwin.swift index 3318736..00d9b9b 100644 --- a/packages/quick_blue/darwin/QuickBlueDarwin.swift +++ b/packages/quick_blue/darwin/QuickBlueDarwin.swift @@ -78,7 +78,7 @@ public class QuickBlueDarwin: NSObject, FlutterPlugin { result(manager.state == .poweredOn) case "startScan": let arguments = call.arguments as! Dictionary - let serviceUUIDs = arguments["serviceUUID"] as? List + let serviceUUIDs = arguments["serviceUUIDs"] as? List if serviceUUIDs != nil && serviceUUIDs.count > 0 { manager.scanForPeripherals(withServices: serviceUUIDs) } else { diff --git a/packages/quick_blue/example/lib/main.dart b/packages/quick_blue/example/lib/main.dart index ca49ef4..13ea21b 100644 --- a/packages/quick_blue/example/lib/main.dart +++ b/packages/quick_blue/example/lib/main.dart @@ -87,7 +87,7 @@ class _MyAppState extends State { ElevatedButton( child: const Text('startScan'), onPressed: () { - QuickBlue.startScan(serviceUUID: ['FF02']); + QuickBlue.startScan(serviceUUIDs: ['FF02']); }, ), ElevatedButton( diff --git a/packages/quick_blue/lib/quick_blue.dart b/packages/quick_blue/lib/quick_blue.dart index c1a1319..64d9c0a 100644 --- a/packages/quick_blue/lib/quick_blue.dart +++ b/packages/quick_blue/lib/quick_blue.dart @@ -24,8 +24,8 @@ class QuickBlue { static Stream get availabilityChangeStream => _platform.availabilityChangeStream.map(AvailabilityState.parse); - static Future startScan({List? serviceUUID}) => - _platform.startScan(serviceUUID); + static Future startScan({List? serviceUUIDs}) => + _platform.startScan(serviceUUIDs); static void stopScan() => _platform.stopScan(); diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 0918f00..e37a88f 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -41,9 +41,9 @@ class MethodChannelQuickBlue extends QuickBluePlatform { Stream get availabilityChangeStream => _availabilityChangeStream; @override - Future startScan(List? serviceUUID) async { + Future startScan(List? serviceUUIDs) async { await _method.invokeMethod('startScan', { - 'serviceUUID': serviceUUID, + 'serviceUUIDs': serviceUUIDs, }); _log('startScan invokeMethod success'); } diff --git a/packages/quick_blue/lib/src/quick_blue_linux.dart b/packages/quick_blue/lib/src/quick_blue_linux.dart index 67d12ac..d293894 100644 --- a/packages/quick_blue/lib/src/quick_blue_linux.dart +++ b/packages/quick_blue/lib/src/quick_blue_linux.dart @@ -78,7 +78,7 @@ class QuickBlueLinux extends QuickBluePlatform { } @override - Future startScan(List? serviceUUID) async { + Future startScan(List? serviceUUIDs) async { await _ensureInitialized(); _log('startScan invoke success'); diff --git a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart index 727990d..26493c0 100644 --- a/packages/quick_blue/lib/src/quick_blue_platform_interface.dart +++ b/packages/quick_blue/lib/src/quick_blue_platform_interface.dart @@ -40,7 +40,7 @@ abstract class QuickBluePlatform extends PlatformInterface { Stream get availabilityChangeStream; - Future startScan(List? serviceUUID); + Future startScan(List? serviceUUIDs); Future stopScan(); diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 184b415..66a48a6 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -281,9 +281,9 @@ namespace } // auto args = std::get(*method_call.arguments()); - // auto serviceUUID = std::get(args[EncodableValue("serviceUUID")]); + // auto serviceUUIDs = std::get(args[EncodableValue("serviceUUIDs")]); - // if (serviceUUID.size() > 0) + // if (serviceUUIDs.size() > 0) // { // auto filter = BluetoothLEAdvertisementFilter(); // auto advert = BluetoothLEAdvertisement(); From 46f2172739df6de202d2a2fe7dfc49a2eb5a0d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Tue, 6 Jun 2023 15:02:31 +0200 Subject: [PATCH 07/21] Add scanfilter for android --- .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59821 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + packages/quick_blue/android/gradlew | 234 ++++++++++++++++++ packages/quick_blue/android/gradlew.bat | 89 +++++++ .../com/example/quick_blue/QuickBluePlugin.kt | 40 ++- 5 files changed, 366 insertions(+), 2 deletions(-) create mode 100644 packages/quick_blue/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 packages/quick_blue/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 packages/quick_blue/android/gradlew create mode 100644 packages/quick_blue/android/gradlew.bat diff --git a/packages/quick_blue/android/gradle/wrapper/gradle-wrapper.jar b/packages/quick_blue/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..41d9927a4d4fb3f96a785543079b8df6723c946b GIT binary patch literal 59821 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 literal 0 HcmV?d00001 diff --git a/packages/quick_blue/android/gradle/wrapper/gradle-wrapper.properties b/packages/quick_blue/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/packages/quick_blue/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/quick_blue/android/gradlew b/packages/quick_blue/android/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/packages/quick_blue/android/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/quick_blue/android/gradlew.bat b/packages/quick_blue/android/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/packages/quick_blue/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index 624c046..0a5a0e1 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -3,14 +3,17 @@ package com.example.quick_blue import android.annotation.SuppressLint import android.bluetooth.* import android.bluetooth.le.ScanCallback +import android.bluetooth.le.ScanFilter import android.bluetooth.le.ScanResult -import android.content.Context +import android.bluetooth.le.ScanSettings import android.content.BroadcastReceiver +import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.Build import android.os.Handler import android.os.Looper +import android.os.ParcelUuid import android.util.Log import androidx.annotation.NonNull import io.flutter.embedding.engine.plugins.FlutterPlugin @@ -52,6 +55,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand broadcastReceiver, IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED) ) + } override fun onDetachedFromEngine(@NonNull binding: FlutterPlugin.FlutterPluginBinding) { @@ -79,7 +83,24 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand result.success(bluetoothManager.adapter.isEnabled) } "startScan" -> { - bluetoothManager.adapter.bluetoothLeScanner?.startScan(scanCallback) + val serviceUUIDs = call.argument>("serviceUUIDs")!! + if (serviceUUIDs != null && serviceUUIDs.size > 0) { + val filters: ArrayList = ArrayList() + for (serviceUUID in serviceUUIDs) { + val filter = ScanFilter.Builder() + .setServiceUuid(parseToParcelUuid(serviceUUID)) + .build() + filters.add(filter) + } + + val settings = ScanSettings.Builder() + .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY) + .build() + + bluetoothManager.adapter.bluetoothLeScanner?.startScan(filters, settings, scanCallback) + } else { + bluetoothManager.adapter.bluetoothLeScanner?.startScan(scanCallback) + } result.success(null) } "stopScan" -> { @@ -346,4 +367,19 @@ fun BluetoothGatt.setNotifiable(gattCharacteristic: BluetoothGattCharacteristic, } descriptor.value = value setCharacteristicNotification(descriptor.characteristic, enable) && writeDescriptor(descriptor) +} +const val baseBluetoothUuidPostfix = "0000-1000-8000-00805F9B34FB" + +fun parseToParcelUuid(uuid: String): ParcelUuid { + return when (uuid.length) { + 4 -> { + ParcelUuid(UUID.fromString("0000$uuid-$baseBluetoothUuidPostfix")) + } + 8 -> { + ParcelUuid(UUID.fromString("$uuid-$baseBluetoothUuidPostfix")) + } + else -> { + ParcelUuid.fromString(uuid) + } + } } \ No newline at end of file From 4b94583cebeb47bb4517472b6afe468790e615a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Tue, 6 Jun 2023 15:02:44 +0200 Subject: [PATCH 08/21] add scanfilter for windows --- .../quick_blue/windows/quick_blue_plugin.cpp | 72 ++++++++++++++++--- 1 file changed, 61 insertions(+), 11 deletions(-) diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 66a48a6..5a3d7cb 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -71,6 +71,48 @@ namespace return ss.str(); } + union to_guid + { + uint8_t buf[16]; + winrt::guid guid; + }; + + const uint8_t BYTE_ORDER[] = {3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, 12, 13, 14, 15}; + + winrt::guid make_guid(const char *value) + { + to_guid to_guid; + memset(&to_guid, 0, sizeof(to_guid)); + int offset = 0; + for (int i = 0; i < (int)strlen(value); i++) + { + if (value[i] >= '0' && value[i] <= '9') + { + uint8_t digit = value[i] - '0'; + to_guid.buf[BYTE_ORDER[offset / 2]] += offset % 2 == 0 ? digit << 4 : digit; + offset++; + } + else if (value[i] >= 'A' && value[i] <= 'F') + { + uint8_t digit = 10 + value[i] - 'A'; + to_guid.buf[BYTE_ORDER[offset / 2]] += offset % 2 == 0 ? digit << 4 : digit; + offset++; + } + else if (value[i] >= 'a' && value[i] <= 'f') + { + uint8_t digit = 10 + value[i] - 'a'; + to_guid.buf[BYTE_ORDER[offset / 2]] += offset % 2 == 0 ? digit << 4 : digit; + offset++; + } + else + { + // skip char + } + } + + return to_guid.guid; + } + std::string to_uuidstr(winrt::guid guid) { char chars[36 + 1]; @@ -280,17 +322,25 @@ namespace bluetoothLEWatcherReceivedToken = bluetoothLEWatcher.Received({this, &QuickBluePlugin::BluetoothLEWatcher_Received}); } - // auto args = std::get(*method_call.arguments()); - // auto serviceUUIDs = std::get(args[EncodableValue("serviceUUIDs")]); + auto args = std::get(*method_call.arguments()); + auto serviceUUIDs = std::get(args[EncodableValue("serviceUUIDs")]); - // if (serviceUUIDs.size() > 0) - // { - // auto filter = BluetoothLEAdvertisementFilter(); - // auto advert = BluetoothLEAdvertisement(); - // advert.ServiceUuids(); - // filter.Advertisement(advert); - // bluetoothLEWatcher.AdvertisementFilter(filter); - // } + if (serviceUUIDs.size() > 0) + { + auto filter = BluetoothLEAdvertisementFilter(); + auto advert = BluetoothLEAdvertisement(); + for (size_t i = 0; i < serviceUUIDs.size(); i++) + { + std::string tmp = std::get(serviceUUIDs[i]); + + advert.ServiceUuids().Append(make_guid(tmp.c_str())); + } + filter.Advertisement(advert); + bluetoothLEWatcher.AdvertisementFilter(filter); + } + else + { + } bluetoothLEWatcher.Start(); result->Success(nullptr); @@ -728,4 +778,4 @@ void QuickBluePluginRegisterWithRegistrar( QuickBluePlugin::RegisterWithRegistrar( flutter::PluginRegistrarManager::GetInstance() ->GetRegistrar(registrar)); -} +} \ No newline at end of file From efdcbdd0a1b9cb7c9d9970992a1e2fb3408284f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Thu, 8 Jun 2023 23:39:31 +0200 Subject: [PATCH 09/21] Fix serviceUUID filter on windows --- .../quick_blue/windows/quick_blue_plugin.cpp | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 5a3d7cb..15dc342 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -113,6 +113,21 @@ namespace return to_guid.guid; } + std::string LongUUID(std::string str) + { + std::string baseBluetoothUuidPostfix("0000-1000-8000-00805F9B34FB"); + + switch (str.length()) + { + case 4: + return "0000" + str + "-" + baseBluetoothUuidPostfix; + case 8: + return str + "-" + baseBluetoothUuidPostfix; + default: + return str; + } + } + std::string to_uuidstr(winrt::guid guid) { char chars[36 + 1]; @@ -331,9 +346,10 @@ namespace auto advert = BluetoothLEAdvertisement(); for (size_t i = 0; i < serviceUUIDs.size(); i++) { - std::string tmp = std::get(serviceUUIDs[i]); - - advert.ServiceUuids().Append(make_guid(tmp.c_str())); + std::string serviceString = std::get(serviceUUIDs[i]); + auto serviceGuid = make_guid(LongUUID(serviceString).c_str()); + advert.ServiceUuids().Append(serviceGuid); + OutputDebugStringA(to_uuidstr(serviceGuid).c_str()); } filter.Advertisement(advert); bluetoothLEWatcher.AdvertisementFilter(filter); From d0386d0ebae86fcff198f3fd14994f2da753ede0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Fri, 30 Jun 2023 17:14:10 +0200 Subject: [PATCH 10/21] Fix build error: android:usesPermissionFlags not found --- .../android/src/main/AndroidManifest.xml | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/quick_blue/android/src/main/AndroidManifest.xml b/packages/quick_blue/android/src/main/AndroidManifest.xml index 05d674f..da336fa 100644 --- a/packages/quick_blue/android/src/main/AndroidManifest.xml +++ b/packages/quick_blue/android/src/main/AndroidManifest.xml @@ -1,17 +1,19 @@ - - + xmlns:tools="http://schemas.android.com/tools" + package="com.example.quick_blue"> + + - - - - - - - + + + + + + + \ No newline at end of file From 7ce4a23b8ed8a9d0c1d4506609d4eaf679e1dc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Ku=CC=88hner?= Date: Sat, 15 Jul 2023 16:44:03 +0200 Subject: [PATCH 11/21] Fix MacOS and iOS --- .../quick_blue/darwin/QuickBlueDarwin.swift | 473 +++++++++--------- 1 file changed, 239 insertions(+), 234 deletions(-) diff --git a/packages/quick_blue/darwin/QuickBlueDarwin.swift b/packages/quick_blue/darwin/QuickBlueDarwin.swift index 00d9b9b..2fb9782 100644 --- a/packages/quick_blue/darwin/QuickBlueDarwin.swift +++ b/packages/quick_blue/darwin/QuickBlueDarwin.swift @@ -13,275 +13,280 @@ let GATT_HEADER_LENGTH = 3 let GSS_SUFFIX = "0000-1000-8000-00805f9b34fb" extension CBUUID { - public var uuidStr: String { - get { - uuidString.lowercased() + public var uuidStr: String { + get { + uuidString.lowercased() + } } - } } extension CBPeripheral { - // FIXME https://forums.developer.apple.com/thread/84375 - public var uuid: UUID { - get { - value(forKey: "identifier") as! NSUUID as UUID + // FIXME https://forums.developer.apple.com/thread/84375 + public var uuid: UUID { + get { + value(forKey: "identifier") as! NSUUID as UUID + } } - } - public func getCharacteristic(_ characteristic: String, of service: String) -> CBCharacteristic? { - let s = self.services?.first { - $0.uuid.uuidStr == service || "0000\($0.uuid.uuidStr)-\(GSS_SUFFIX)" == service + public func getCharacteristic(_ characteristic: String, of service: String) -> CBCharacteristic? { + let s = self.services?.first { + $0.uuid.uuidStr == service || "0000\($0.uuid.uuidStr)-\(GSS_SUFFIX)" == service + } + let c = s?.characteristics?.first { + $0.uuid.uuidStr == characteristic || "0000\($0.uuid.uuidStr)-\(GSS_SUFFIX)" == characteristic + } + return c } - let c = s?.characteristics?.first { - $0.uuid.uuidStr == characteristic || "0000\($0.uuid.uuidStr)-\(GSS_SUFFIX)" == characteristic - } - return c - } - public func setNotifiable(_ bleInputProperty: String, for characteristic: String, of service: String) { - guard let characteristic = getCharacteristic(characteristic, of: service) else{ - return + public func setNotifiable(_ bleInputProperty: String, for characteristic: String, of service: String) { + guard let characteristic = getCharacteristic(characteristic, of: service) else{ + return + } + setNotifyValue(bleInputProperty != "disabled", for: characteristic) } - setNotifyValue(bleInputProperty != "disabled", for: characteristic) - } } public class QuickBlueDarwin: NSObject, FlutterPlugin { - public static func register(with registrar: FlutterPluginRegistrar) { - #if os(iOS) - let messenger = registrar.messenger() - #elseif os(OSX) - let messenger = registrar.messenger - #endif - let method = FlutterMethodChannel(name: "quick_blue/method", binaryMessenger: messenger) - let eventAvailabilityChange = FlutterEventChannel(name: "quick_blue/event.availabilityChange", binaryMessenger: messenger) - let eventScanResult = FlutterEventChannel(name: "quick_blue/event.scanResult", binaryMessenger: messenger) - let messageConnector = FlutterBasicMessageChannel(name: "quick_blue/message.connector", binaryMessenger: messenger) + public static func register(with registrar: FlutterPluginRegistrar) { +#if os(iOS) + let messenger = registrar.messenger() +#elseif os(OSX) + let messenger = registrar.messenger +#endif + let method = FlutterMethodChannel(name: "quick_blue/method", binaryMessenger: messenger) + let eventAvailabilityChange = FlutterEventChannel(name: "quick_blue/event.availabilityChange", binaryMessenger: messenger) + let eventScanResult = FlutterEventChannel(name: "quick_blue/event.scanResult", binaryMessenger: messenger) + let messageConnector = FlutterBasicMessageChannel(name: "quick_blue/message.connector", binaryMessenger: messenger) - let instance = QuickBlueDarwin() - registrar.addMethodCallDelegate(instance, channel: method) - eventAvailabilityChange.setStreamHandler(instance) - eventScanResult.setStreamHandler(instance) - instance.messageConnector = messageConnector - } + let instance = QuickBlueDarwin() + registrar.addMethodCallDelegate(instance, channel: method) + eventAvailabilityChange.setStreamHandler(instance) + eventScanResult.setStreamHandler(instance) + instance.messageConnector = messageConnector + } - private lazy var manager: CBCentralManager = { CBCentralManager(delegate: self, queue: nil) }() - private var discoveredPeripherals = Dictionary() + private lazy var manager: CBCentralManager = { CBCentralManager(delegate: self, queue: nil) }() + private var discoveredPeripherals = Dictionary() - private var availabilityChangeSink: FlutterEventSink? - private var scanResultSink: FlutterEventSink? - private var messageConnector: FlutterBasicMessageChannel! + private var availabilityChangeSink: FlutterEventSink? + private var scanResultSink: FlutterEventSink? + private var messageConnector: FlutterBasicMessageChannel! - public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { - switch call.method { - case "isBluetoothAvailable": - result(manager.state == .poweredOn) - case "startScan": - let arguments = call.arguments as! Dictionary - let serviceUUIDs = arguments["serviceUUIDs"] as? List - if serviceUUIDs != nil && serviceUUIDs.count > 0 { - manager.scanForPeripherals(withServices: serviceUUIDs) - } else { - manager.scanForPeripherals(withServices: nil) - } - result(nil) - case "stopScan": - manager.stopScan() - result(nil) + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + switch call.method { + case "isBluetoothAvailable": + result(manager.state == .poweredOn) + case "startScan": + let arguments = call.arguments as! Dictionary + let serviceUUIDs = arguments["serviceUUIDs"] as? [String] + if serviceUUIDs != nil && serviceUUIDs!.count > 0 { + let serviceCBUUID = serviceUUIDs!.map({ uuid in + CBUUID(string: uuid) + }) + manager.scanForPeripherals(withServices: serviceCBUUID) + } else { + manager.scanForPeripherals(withServices: nil) + } + result(nil) + case "stopScan": + manager.stopScan() + result(nil) case "connect": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - peripheral.delegate = self - manager.connect(peripheral) - result(nil) - case "disconnect": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - if (peripheral.state != .disconnected) { - manager.cancelPeripheralConnection(peripheral) - } - result(nil) - case "discoverServices": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - peripheral.discoverServices(nil) - result(nil) - case "setNotifiable": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - let service = arguments["service"] as! String - let characteristic = arguments["characteristic"] as! String - let bleInputProperty = argume - let deviceId = arguments["deviceId"] as! String - let service = arguments["service"] as! String - let characteristic = arguments["characteristic"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - guard let c = peripheral.getCharacteristic(characteristic, of: service) else { - result(FlutterError(code: "IllegalArgument", message: "Unknown characteristic:\(characteristic)", details: nil)) - return - } - peripheral.readValue(for: c) - result(nil) - case "writeValue": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - let service = arguments["service"] as! String - let characteristic = arguments["characteristic"] as! String - let value = arguments["value"] as! FlutterStandardTypedData - let bleOutputProperty = arguments["bleOutputProperty"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - let type = bleOutputProperty == "withoutResponse" ? CBCharacteristicWriteType.withoutResponse : CBCharacteristicWriteType.withResponse - guard let c = peripheral.getCharacteristic(characteristic, of: service) else { - result(FlutterError(code: "IllegalArgument", message: "Unknown characteristic:\(characteristic)", details: nil)) - return - } - peripheral.writeValue(value.data, for: c, type: type) - result(nil) - case "requestMtu": - let arguments = call.arguments as! Dictionary - let deviceId = arguments["deviceId"] as! String - guard let peripheral = discoveredPeripherals[deviceId] else { - result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) - return - } - result(nil) - let mtu = peripheral.maximumWriteValueLength(for: .withoutResponse) - print("peripheral.maximumWriteValueLengthForType:CBCharacteristicWriteWithoutResponse \(mtu)") - messageConnector.sendMessage(["mtuConfig": mtu + GATT_HEADER_LENGTH]) - default: - result(FlutterMethodNotImplemented) + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + peripheral.delegate = self + manager.connect(peripheral) + result(nil) + case "disconnect": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + if (peripheral.state != .disconnected) { + manager.cancelPeripheralConnection(peripheral) + } + result(nil) + case "discoverServices": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + peripheral.discoverServices(nil) + result(nil) + case "setNotifiable": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + let service = arguments["service"] as! String + let characteristic = arguments["characteristic"] as! String + let bleInputProperty = arguments["bleInputProperty"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + guard let c = peripheral.getCharacteristic(characteristic, of: service) else { + result(FlutterError(code: "IllegalArgument", message: "Unknown characteristic:\(characteristic)", details: nil)) + return + } + peripheral.setNotifyValue(bleInputProperty != "disabled", for: c) + result(nil) + case "readValue": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + let service = arguments["service"] as! String + let characteristic = arguments["characteristic"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + guard let c = peripheral.getCharacteristic(characteristic, of: service) else { + result(FlutterError(code: "IllegalArgument", message: "Unknown characteristic:\(characteristic)", details: nil)) + return + } + peripheral.readValue(for: c) + result(nil) + case "writeValue": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + let service = arguments["service"] as! String + let characteristic = arguments["characteristic"] as! String + let value = arguments["value"] as! FlutterStandardTypedData + let bleOutputProperty = arguments["bleOutputProperty"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + let type = bleOutputProperty == "withoutResponse" ? CBCharacteristicWriteType.withoutResponse : CBCharacteristicWriteType.withResponse + guard let c = peripheral.getCharacteristic(characteristic, of: service) else { + result(FlutterError(code: "IllegalArgument", message: "Unknown characteristic:\(characteristic)", details: nil)) + return + } + peripheral.writeValue(value.data, for: c, type: type) + result(nil) + case "requestMtu": + let arguments = call.arguments as! Dictionary + let deviceId = arguments["deviceId"] as! String + guard let peripheral = discoveredPeripherals[deviceId] else { + result(FlutterError(code: "IllegalArgument", message: "Unknown deviceId:\(deviceId)", details: nil)) + return + } + result(nil) + let mtu = peripheral.maximumWriteValueLength(for: .withoutResponse) + // print("peripheral.maximumWriteValueLengthForType:CBCharacteristicWriteWithoutResponse \(mtu)") + messageConnector.sendMessage(["mtuConfig": mtu + GATT_HEADER_LENGTH]) + default: + result(FlutterMethodNotImplemented) + } } - } } extension QuickBlueDarwin: CBCentralManagerDelegate { - public func centralManagerDidUpdateState(_ central: CBCentralManager) { - availabilityChangeSink?(central.state.rawValue) - } + public func centralManagerDidUpdateState(_ central: CBCentralManager) { + availabilityChangeSink?(central.state.rawValue) + } - public func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) { - print("centralManager:didDiscoverPeripheral \(peripheral.name ?? "nil") \(peripheral.uuid.uuidString)") - discoveredPeripherals[peripheral.uuid.uuidString] = peripheral + public func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) { + // print("centralManager:didDiscoverPeripheral \(peripheral.name ?? "nil") \(peripheral.uuid.uuidString)") + discoveredPeripherals[peripheral.uuid.uuidString] = peripheral - let manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey] as? Data - scanResultSink?([ - "name": peripheral.name ?? "", - "deviceId": peripheral.uuid.uuidString, - "manufacturerData": FlutterStandardTypedData(bytes: manufacturerData ?? Data()), - "rssi": RSSI, - ]) - } + let manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey] as? Data + scanResultSink?([ + "name": peripheral.name ?? "", + "deviceId": peripheral.uuid.uuidString, + "manufacturerData": FlutterStandardTypedData(bytes: manufacturerData ?? Data()), + "rssi": RSSI, + ]) + } - public func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) { - print("centralManager:didConnect \(peripheral.uuid.uuidString)") - messageConnector.sendMessage([ - "deviceId": peripheral.uuid.uuidString, - "ConnectionState": "connected", - ]) - } - - public func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) { - print("centralManager:didDisconnectPeripheral: \(peripheral.uuid.uuidString) error: \(String(describing: error))") - messageConnector.sendMessage([ - "deviceId": peripheral.uuid.uuidString, - "ConnectionState": "disconnected", - ]) - } + public func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) { + // print("centralManager:didConnect \(peripheral.uuid.uuidString)") + messageConnector.sendMessage([ + "deviceId": peripheral.uuid.uuidString, + "ConnectionState": "connected", + ]) + } + + public func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) { + // print("centralManager:didDisconnectPeripheral: \(peripheral.uuid.uuidString) error: \(String(describing: error))") + messageConnector.sendMessage([ + "deviceId": peripheral.uuid.uuidString, + "ConnectionState": "disconnected", + ]) + } } extension QuickBlueDarwin: FlutterStreamHandler { - open func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? { - guard let args = arguments as? Dictionary, let name = args["name"] as? String else { - return nil + open func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? { + guard let args = arguments as? Dictionary, let name = args["name"] as? String else { + return nil + } + print("QuickBlueDarwin onListenWithArguments: \(name)") + if name == "availabilityChange" { + availabilityChangeSink = events + availabilityChangeSink?(manager.state.rawValue) // Initializes CBCentralManager and returns the current state when hot restarting + } else if name == "scanResult" { + scanResultSink = events + } + return nil } - print("QuickBlueDarwin onListenWithArguments: \(name)") - if name == "availabilityChange" { - availabilityChangeSink = events - availabilityChangeSink?(manager.state.rawValue) // Initializes CBCentralManager and returns the current state when hot restarting - } else if name == "scanResult" { - scanResultSink = events - } - return nil - } - open func onCancel(withArguments arguments: Any?) -> FlutterError? { - guard let args = arguments as? Dictionary, let name = args["name"] as? String else { - return nil - } - print("QuickBlueDarwin onCancelWithArguments: \(name)") - if name == "availabilityChange" { - availabilityChangeSink = nil - } else if name == "scanResult" { - scanResultSink = nil + open func onCancel(withArguments arguments: Any?) -> FlutterError? { + guard let args = arguments as? Dictionary, let name = args["name"] as? String else { + return nil + } + print("QuickBlueDarwin onCancelWithArguments: \(name)") + if name == "availabilityChange" { + availabilityChangeSink = nil + } else if name == "scanResult" { + scanResultSink = nil + } + return nil } - return nil - } } extension QuickBlueDarwin: CBPeripheralDelegate { - public func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) { - print("peripheral: \(peripheral.uuid.uuidString) didDiscoverServices error: \(String(describing: error))") - for service in peripheral.services! { - peripheral.discoverCharacteristics(nil, for: service) + public func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) { + // print("peripheral: \(peripheral.uuid.uuidString) didDiscoverServices error: \(String(describing: error))") + for service in peripheral.services! { + // if service.uuid == CBUUID(string: "FF00") { + peripheral.discoverCharacteristics(nil, for: service) + // } + } } - } - - public func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { - for characteristic in service.characteristics! { - print("peripheral:didDiscoverCharacteristicsForService (\(service.uuid.uuidStr), \(characteristic.uuid.uuidStr)") + + public func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) { + // for characteristic in service.characteristics! { + // print("peripheral:didDiscoverCharacteristicsForService (\(service.uuid.uuidStr), \(characteristic.uuid.uuidStr)") + // } + self.messageConnector.sendMessage([ + "deviceId": peripheral.uuid.uuidString, + "ServiceState": "discovered", + "service": service.uuid.uuidStr, + "characteristics": service.characteristics!.map { $0.uuid.uuidStr } + ]) } - self.messageConnector.sendMessage([ - "deviceId": peripheral.uuid.uuidString, - "ServiceState": "discovered", - "service": service.uuid.uuidStr, - "characteristics": service.characteristics!.map { $0.uuid.uuidStr } - ]) - } - public func peripheral(_ peripheral: CBPeripheral, didWriteValueFor characteristic: CBCharacteristic, error: Error?) { - let data = characteristic.value as NSData? - print("peripheral:didWriteValueForCharacteristic \(characteristic.uuid.uuidStr) \(String(describing: data)) error: \(String(describing: error))") - } + public func peripheral(_ peripheral: CBPeripheral, didWriteValueFor characteristic: CBCharacteristic, error: Error?) { + let data = characteristic.value as NSData? + // print("peripheral:didWriteValueForCharacteristic \(characteristic.uuid.uuidStr) \(String(describing: data)) error: \(String(describing: error))") + } - public func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { - let data = characteristic.value as NSData? - print("peripheral:didUpdateValueForCharacteristic \(characteristic.uuid) \(String(describing: data)) error: \(String(describing: error))") - self.messageConnector.sendMessage([ - "deviceId": peripheral.uuid.uuidString, - "characteristicValue": [ - "characteristic": characteristic.uuid.uuidStr, - "value": FlutterStandardTypedData(bytes: characteristic.value!) - ] - ]) - } + public func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) { + let data = characteristic.value as NSData? + // print("peripheral:didUpdateValueForCharacteristic \(characteristic.uuid) \(String(describing: data)) error: \(String(describing: error))") + self.messageConnector.sendMessage([ + "deviceId": peripheral.uuid.uuidString, + "characteristicValue": [ + "characteristic": characteristic.uuid.uuidStr, + "value": FlutterStandardTypedData(bytes: characteristic.value!) + ] + ]) + } } From 65a0ba103ccf1c3c932b5f34907987dfe38d69c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Sat, 22 Jul 2023 21:49:22 +0200 Subject: [PATCH 12/21] Update gradle version --- packages/quick_blue/.metadata | 36 +++++++++++++++++-- packages/quick_blue/android/build.gradle | 28 +++++++++++---- .../com/example/quick_blue/QuickBluePlugin.kt | 1 - packages/quick_blue/example/.metadata | 24 +++++++++++-- .../quick_blue/example/android/build.gradle | 6 ++-- 5 files changed, 80 insertions(+), 15 deletions(-) diff --git a/packages/quick_blue/.metadata b/packages/quick_blue/.metadata index 8c15ad7..99f5d2e 100644 --- a/packages/quick_blue/.metadata +++ b/packages/quick_blue/.metadata @@ -1,10 +1,42 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 77d935af4db863f6abd0b9c31c7e6df2a13de57b + revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 channel: stable project_type: plugin + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: android + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: ios + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: linux + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: macos + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: windows + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/quick_blue/android/build.gradle b/packages/quick_blue/android/build.gradle index 429b831..575a638 100644 --- a/packages/quick_blue/android/build.gradle +++ b/packages/quick_blue/android/build.gradle @@ -2,19 +2,19 @@ group 'com.example.quick_blue' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -rootProject.allprojects { +allprojects { repositories { google() mavenCentral() @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -38,13 +38,27 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' + test.java.srcDirs += 'src/test/kotlin' } defaultConfig { minSdkVersion 21 } -} -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + dependencies { + testImplementation 'org.jetbrains.kotlin:kotlin-test' + testImplementation 'org.mockito:mockito-core:5.0.0' + } + + testOptions { + unitTests.all { + useJUnitPlatform() + + testLogging { + events "passed", "skipped", "failed", "standardOut", "standardError" + outputs.upToDateWhen {false} + showStandardStreams = true + } + } + } } diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index 13db87f..1d4d3dc 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -233,7 +233,6 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } override fun onScanResult(callbackType: Int, result: ScanResult) { - Log.v(TAG, "onScanResult: $callbackType + $result") scanResultSink?.success(mapOf( "name" to (result.device.name ?: ""), "deviceId" to result.device.address, diff --git a/packages/quick_blue/example/.metadata b/packages/quick_blue/example/.metadata index fd70cab..732ba6d 100644 --- a/packages/quick_blue/example/.metadata +++ b/packages/quick_blue/example/.metadata @@ -1,10 +1,30 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled and should not be manually edited. +# This file should be version controlled. version: - revision: 77d935af4db863f6abd0b9c31c7e6df2a13de57b + revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 channel: stable project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + - platform: android + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/quick_blue/example/android/build.gradle b/packages/quick_blue/example/android/build.gradle index 0cb14a5..f7eb7f6 100644 --- a/packages/quick_blue/example/android/build.gradle +++ b/packages/quick_blue/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.5.30' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } From 8f3e5de00591ac4093e199f70ec58c23ccdb230f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Sat, 22 Jul 2023 22:40:05 +0200 Subject: [PATCH 13/21] Remove log messages --- .../com/example/quick_blue/QuickBluePlugin.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index 1d4d3dc..bee8682 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -229,7 +229,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand private val scanCallback = object : ScanCallback() { override fun onScanFailed(errorCode: Int) { - Log.v(TAG, "onScanFailed: $errorCode") + //Log.v(TAG, "onScanFailed: $errorCode") } override fun onScanResult(callbackType: Int, result: ScanResult) { @@ -242,7 +242,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } override fun onBatchScanResults(results: MutableList?) { - Log.v(TAG, "onBatchScanResults: $results") + //Log.v(TAG, "onBatchScanResults: $results") } } @@ -270,7 +270,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand private val gattCallback = object : BluetoothGattCallback() { override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { - Log.v(TAG, "onConnectionStateChange: device(${gatt.device.address}) status($status), newState($newState)") + //Log.v(TAG, "onConnectionStateChange: device(${gatt.device.address}) status($status), newState($newState)") if (newState == BluetoothGatt.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) { sendMessage(messageConnector, mapOf( "deviceId" to gatt.device.address, @@ -286,15 +286,15 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) { - Log.v(TAG, "onServicesDiscovered ${gatt.device.address} $status") + //Log.v(TAG, "onServicesDiscovered ${gatt.device.address} $status") if (status != BluetoothGatt.GATT_SUCCESS) return gatt.services?.forEach { service -> - Log.v(TAG, "Service " + service.uuid) + //Log.v(TAG, "Service " + service.uuid) service.characteristics.forEach { characteristic -> - Log.v(TAG, " Characteristic ${characteristic.uuid}") + //Log.v(TAG, " Characteristic ${characteristic.uuid}") characteristic.descriptors.forEach { - Log.v(TAG, " Descriptor ${it.uuid}") + //Log.v(TAG, " Descriptor ${it.uuid}") } } @@ -316,7 +316,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } override fun onCharacteristicRead(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) { - Log.v(TAG, "onCharacteristicRead ${characteristic.uuid}, ${characteristic.value.contentToString()}") + //Log.v(TAG, "onCharacteristicRead ${characteristic.uuid}, ${characteristic.value.contentToString()}") sendMessage(messageConnector, mapOf( "deviceId" to gatt.device.address, "characteristicValue" to mapOf( @@ -327,11 +327,11 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } override fun onCharacteristicWrite(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic, status: Int) { - Log.v(TAG, "onCharacteristicWrite ${characteristic.uuid}, ${characteristic.value.contentToString()} $status") + //Log.v(TAG, "onCharacteristicWrite ${characteristic.uuid}, ${characteristic.value.contentToString()} $status") } override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) { - Log.v(TAG, "onCharacteristicChanged ${characteristic.uuid}, ${characteristic.value.contentToString()}") + //Log.v(TAG, "onCharacteristicChanged ${characteristic.uuid}, ${characteristic.value.contentToString()}") sendMessage(messageConnector, mapOf( "deviceId" to gatt.device.address, "characteristicValue" to mapOf( From e3a931f956b7b509dcc51eb7072be0213766a6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Sun, 23 Jul 2023 20:51:49 +0200 Subject: [PATCH 14/21] Fix setNotifiable and writeValue on Windows --- .../quick_blue/windows/quick_blue_plugin.cpp | 46 ++++++------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 15dc342..31d184d 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -229,10 +229,10 @@ namespace void CleanConnection(uint64_t bluetoothAddress); winrt::fire_and_forget DiscoverServicesAsync(BluetoothDeviceAgent &bluetoothDeviceAgent); - winrt::fire_and_forget SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, GattCharacteristic &gattCharacteristic, std::string bleInputProperty); + winrt::fire_and_forget SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, std::string service, std::string characteristic, std::string bleInputProperty); winrt::fire_and_forget RequestMtuAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, uint64_t expectedMtu); winrt::fire_and_forget ReadValueAsync(GattCharacteristic &gattCharacteristic); - winrt::fire_and_forget WriteValueAsync(GattCharacteristic &gattCharacteristic, std::vector value, std::string bleOutputProperty); + winrt::fire_and_forget WriteValueAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, std::string service, std::string characteristic, std::vector value, std::string bleOutputProperty); void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args); }; @@ -425,18 +425,8 @@ namespace return; } - auto bluetoothAgent = *it->second; - auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); - async_c.Completed([&, result_pointer = result.get()](IAsyncOperation const &sender, AsyncStatus const args) - { - // FIXME https://github.com/woodemi/quick.flutter/pull/31#issuecomment-1159213902 - auto c = sender.GetResults(); - if (c == nullptr) { - result_pointer->Error("IllegalArgument", "Unknown characteristic:" + characteristic); - return; - } - SetNotifiableAsync(bluetoothAgent, c, bleInputProperty); - result_pointer->Success(nullptr); }); + SetNotifiableAsync(*it->second, service, characteristic, bleInputProperty); + result->Success(nullptr); } else if (method_name.compare("readValue") == 0) { @@ -479,18 +469,8 @@ namespace return; } - auto bluetoothAgent = *it->second; - auto async_c = bluetoothAgent.GetCharacteristicAsync(service, characteristic); - async_c.Completed([&, result_pointer = result.get()](IAsyncOperation const &sender, AsyncStatus const args) - { - // FIXME https://github.com/woodemi/quick.flutter/pull/31#issuecomment-1159213902 - auto c = sender.GetResults(); - if (c == nullptr) { - result_pointer->Error("IllegalArgument", "Unknown characteristic:" + characteristic); - return; - } - WriteValueAsync(c, value, bleOutputProperty); - result_pointer->Success(nullptr); }); + WriteValueAsync(*it->second, service, characteristic, value, bleOutputProperty); + result->Success(nullptr); } else if (method_name.compare("requestMtu") == 0) { @@ -729,8 +709,9 @@ namespace }); } - winrt::fire_and_forget QuickBluePlugin::SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, GattCharacteristic &gattCharacteristic, std::string bleInputProperty) + winrt::fire_and_forget QuickBluePlugin::SetNotifiableAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, std::string service, std::string characteristic, std::string bleInputProperty) { + auto gattCharacteristic = co_await bluetoothDeviceAgent.GetCharacteristicAsync(service, characteristic); auto descriptorValue = bleInputProperty == "notification" ? GattClientCharacteristicConfigurationDescriptorValue::Notify : bleInputProperty == "indication" ? GattClientCharacteristicConfigurationDescriptorValue::Indicate : GattClientCharacteristicConfigurationDescriptorValue::None; @@ -738,14 +719,13 @@ namespace if (writeDescriptorStatus != GattCommunicationStatus::Success) OutputDebugString((L"WriteClientCharacteristicConfigurationDescriptorAsync " + winrt::to_hstring((int32_t)writeDescriptorStatus) + L"\n").c_str()); - auto uuid = to_uuidstr(gattCharacteristic.Uuid()); if (bleInputProperty != "disabled") { - bluetoothDeviceAgent.valueChangedTokens[uuid] = gattCharacteristic.ValueChanged({this, &QuickBluePlugin::GattCharacteristic_ValueChanged}); + bluetoothDeviceAgent.valueChangedTokens[characteristic] = gattCharacteristic.ValueChanged({this, &QuickBluePlugin::GattCharacteristic_ValueChanged}); } else { - gattCharacteristic.ValueChanged(std::exchange(bluetoothDeviceAgent.valueChangedTokens[uuid], {})); + gattCharacteristic.ValueChanged(std::exchange(bluetoothDeviceAgent.valueChangedTokens[characteristic], {})); } } @@ -764,12 +744,12 @@ namespace }); } - winrt::fire_and_forget QuickBluePlugin::WriteValueAsync(GattCharacteristic &gattCharacteristic, std::vector value, std::string bleOutputProperty) + winrt::fire_and_forget QuickBluePlugin::WriteValueAsync(BluetoothDeviceAgent &bluetoothDeviceAgent, std::string service, std::string characteristic, std::vector value, std::string bleOutputProperty) { + auto gattCharacteristic = co_await bluetoothDeviceAgent.GetCharacteristicAsync(service, characteristic); auto writeOption = bleOutputProperty.compare("withoutResponse") == 0 ? GattWriteOption::WriteWithoutResponse : GattWriteOption::WriteWithResponse; auto writeValueStatus = co_await gattCharacteristic.WriteValueAsync(from_bytevc(value), writeOption); - auto uuid = to_uuidstr(gattCharacteristic.Uuid()); - OutputDebugString((L"WriteValueAsync " + winrt::to_hstring(uuid) + L", " + winrt::to_hstring(to_hexstring(value)) + L", " + winrt::to_hstring((int32_t)writeValueStatus) + L"\n").c_str()); + OutputDebugString((L"WriteValueAsync " + winrt::to_hstring(characteristic) + L", " + winrt::to_hstring(to_hexstring(value)) + L", " + winrt::to_hstring((int32_t)writeValueStatus) + L"\n").c_str()); } void QuickBluePlugin::GattCharacteristic_ValueChanged(GattCharacteristic sender, GattValueChangedEventArgs args) From 8815eb7b88110b3e17693eb2803230a4e231e18a Mon Sep 17 00:00:00 2001 From: erhannis Date: Fri, 28 Jul 2023 12:25:51 -0400 Subject: [PATCH 15/21] Fixes, null check, averted some exceptions, added too many logs --- .../com/example/quick_blue/QuickBluePlugin.kt | 194 +++++++++--------- .../lib/src/method_channel_quick_blue.dart | 2 +- .../quick_blue/windows/quick_blue_plugin.cpp | 64 +++++- 3 files changed, 165 insertions(+), 95 deletions(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index a096066..5174448 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -76,100 +76,108 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand fun trace() = Arrays.toString(Throwable().stackTrace) override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: Result) { - when (call.method) { - "isBluetoothAvailable" -> { - result.success(bluetoothManager.adapter.isEnabled) - } - "startScan" -> { - bluetoothManager.adapter.bluetoothLeScanner?.startScan(scanCallback) - result.success(null) - } - "stopScan" -> { - bluetoothManager.adapter.bluetoothLeScanner?.stopScan(scanCallback) - result.success(null) - } - "connect" -> { - val deviceId = call.argument("deviceId")!! - if (knownGatts.find { it.device.address == deviceId } != null) { - return result.success(null) + try { + when (call.method) { + "isBluetoothAvailable" -> { + result.success(bluetoothManager.adapter.isEnabled) } - val remoteDevice = bluetoothManager.adapter.getRemoteDevice(deviceId) - val gatt = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - remoteDevice.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE) - } else { - remoteDevice.connectGatt(context, false, gattCallback) + "startScan" -> { + bluetoothManager.adapter.bluetoothLeScanner?.startScan(scanCallback) + result.success(null) } - knownGatts.add(gatt) - result.success(null) - // TODO connecting - } - "disconnect" -> { - val deviceId = call.argument("deviceId")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - cleanConnection(gatt) - result.success(null) - //FIXME If `disconnect` is called before BluetoothGatt.STATE_CONNECTED - // there will be no `disconnected` message any more - } - "discoverServices" -> { - val deviceId = call.argument("deviceId")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - gatt.discoverServices() - result.success(null) - } - "setNotifiable" -> { - val deviceId = call.argument("deviceId")!! - val service = call.argument("service")!! - val characteristic = call.argument("characteristic")!! - val bleInputProperty = call.argument("bleInputProperty")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) - gatt.setNotifiable(c, bleInputProperty) - result.success(null) - } - "readValue" -> { - val deviceId = call.argument("deviceId")!! - val service = call.argument("service")!! - val characteristic = call.argument("characteristic")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) - if (gatt.readCharacteristic(c)) + "stopScan" -> { + bluetoothManager.adapter.bluetoothLeScanner?.stopScan(scanCallback) result.success(null) - else - result.error("Characteristic unavailable", null, trace()) - } - "writeValue" -> { - val deviceId = call.argument("deviceId")!! - val service = call.argument("service")!! - val characteristic = call.argument("characteristic")!! - val value = call.argument("value")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - val c = gatt.getCharacteristic(service, characteristic) - ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) - c.value = value - if (gatt.writeCharacteristic(c)) + } + "connect" -> { + val deviceId = call.argument("deviceId")!! + if (knownGatts.find { it.device.address == deviceId } != null) { + return result.success(null) + } + val remoteDevice = bluetoothManager.adapter.getRemoteDevice(deviceId) + val gatt = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + remoteDevice.connectGatt(context, false, gattCallback, BluetoothDevice.TRANSPORT_LE) + } else { + remoteDevice.connectGatt(context, false, gattCallback) + } + knownGatts.add(gatt) result.success(null) - else - result.error("Characteristic unavailable", null, trace()) - } - "requestMtu" -> { - val deviceId = call.argument("deviceId")!! - val expectedMtu = call.argument("expectedMtu")!! - val gatt = knownGatts.find { it.device.address == deviceId } - ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - gatt.requestMtu(expectedMtu) - result.success(null) - } - else -> { - result.notImplemented() + // TODO connecting + } + "disconnect" -> { + val deviceId = call.argument("deviceId")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + cleanConnection(gatt) + result.success(null) + //FIXME If `disconnect` is called before BluetoothGatt.STATE_CONNECTED + // there will be no `disconnected` message any more + } + "discoverServices" -> { + val deviceId = call.argument("deviceId")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + gatt.discoverServices() + result.success(null) + } + "setNotifiable" -> { + val deviceId = call.argument("deviceId")!! + val service = call.argument("service")!! + val characteristic = call.argument("characteristic")!! + val bleInputProperty = call.argument("bleInputProperty")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + val s = gatt.getService(UUID.fromString(service)) + ?: return result.error("IllegalArgument", "Unknown service: $service", trace()) + val c = s.getCharacteristic(UUID.fromString(characteristic)) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) + gatt.setNotifiable(c, bleInputProperty) + result.success(null) + } + "readValue" -> { + val deviceId = call.argument("deviceId")!! + val service = call.argument("service")!! + val characteristic = call.argument("characteristic")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + val c = gatt.getCharacteristic(service, characteristic) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) + if (gatt.readCharacteristic(c)) + result.success(null) + else + result.error("Characteristic unavailable", null, trace()) + } + "writeValue" -> { + val deviceId = call.argument("deviceId")!! + val service = call.argument("service")!! + val characteristic = call.argument("characteristic")!! + val value = call.argument("value")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + val c = gatt.getCharacteristic(service, characteristic) + ?: return result.error("IllegalArgument", "Unknown characteristic: $characteristic", trace()) + c.value = value + if (gatt.writeCharacteristic(c)) { + result.success(null) + } else { + result.error("Characteristic unavailable", null, trace()) + } + } + "requestMtu" -> { + val deviceId = call.argument("deviceId")!! + val expectedMtu = call.argument("expectedMtu")!! + val gatt = knownGatts.find { it.device.address == deviceId } + ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) + gatt.requestMtu(expectedMtu) + result.success(null) + } + else -> { + result.notImplemented() + } } + } catch (e: Throwable) { + e.printStackTrace() + result.error("Error", "Error", trace()) } } @@ -335,7 +343,7 @@ fun Short.toByteArray(byteOrder: ByteOrder = ByteOrder.LITTLE_ENDIAN): ByteArray ByteBuffer.allocate(2 /*Short.SIZE_BYTES*/).order(byteOrder).putShort(this).array() fun BluetoothGatt.getCharacteristic(service: String, characteristic: String): BluetoothGattCharacteristic? = - getService(UUID.fromString(service)).getCharacteristic(UUID.fromString(characteristic)) + getService(UUID.fromString(service))?.getCharacteristic(UUID.fromString(characteristic)) private val DESC__CLIENT_CHAR_CONFIGURATION = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb") @@ -346,6 +354,8 @@ fun BluetoothGatt.setNotifiable(gattCharacteristic: BluetoothGattCharacteristic, "indication" -> BluetoothGattDescriptor.ENABLE_INDICATION_VALUE to true else -> BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE to false } - descriptor.value = value - setCharacteristicNotification(descriptor.characteristic, enable) && writeDescriptor(descriptor) + if (setCharacteristicNotification(gattCharacteristic, enable) && descriptor != null) { + descriptor.value = value + writeDescriptor(descriptor) + } } \ No newline at end of file diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 68b3809..8242cc4 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -86,7 +86,7 @@ class MethodChannelQuickBlue extends QuickBluePlatform { if (message['ServiceState'] == 'discovered') { String deviceId = message['deviceId']; String service = message['service']; - List characteristics = (message['characteristics'] as List).cast(); + List characteristics = ((message['characteristics'] ?? []) as List).cast(); onServiceDiscovered?.call(deviceId, service, characteristics); } } else if (message['characteristicValue'] != null) { diff --git a/packages/quick_blue/windows/quick_blue_plugin.cpp b/packages/quick_blue/windows/quick_blue_plugin.cpp index 9ec7456..849d7a4 100644 --- a/packages/quick_blue/windows/quick_blue_plugin.cpp +++ b/packages/quick_blue/windows/quick_blue_plugin.cpp @@ -24,6 +24,10 @@ #include #include +#include +#include +#include + #define GUID_FORMAT "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx" #define GUID_ARG(guid) guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] @@ -88,15 +92,22 @@ struct BluetoothDeviceAgent { } IAsyncOperation GetServiceAsync(std::string service) { + std::cerr << "--> GetServiceAsync\n"; if (gattServices.count(service) == 0) { auto serviceResult = co_await device.GetGattServicesAsync(); - if (serviceResult.Status() != GattCommunicationStatus::Success) + if (serviceResult.Status() != GattCommunicationStatus::Success) { + std::cerr << "<-E GetServiceAsync\n"; co_return nullptr; + } for (auto s : serviceResult.Services()) - if (to_uuidstr(s.Uuid()) == service) + if (to_uuidstr(s.Uuid()) == service) { + std::wcerr << ((L"gattServices addr: " + std::to_wstring((unsigned long long)&gattServices) + L"\n").c_str()); + std::wcerr << ((L"gattServices size: " + std::to_wstring(gattServices.size()) + L"\n").c_str()); gattServices.insert(std::make_pair(service, s)); + } } + std::cerr << "<-S GetServiceAsync\n"; co_return gattServices.at(service); } @@ -238,14 +249,21 @@ winrt::fire_and_forget QuickBluePlugin::InitializeAsync() { } } +//void dbg(std::wstring s) { +// std::cerr +//} + void QuickBluePlugin::HandleMethodCall( const flutter::MethodCall &method_call, std::unique_ptr> result) { auto method_name = method_call.method_name(); OutputDebugString((L"HandleMethodCall " + winrt::to_hstring(method_name) + L"\n").c_str()); if (method_name.compare("isBluetoothAvailable") == 0) { + std::wcerr << (L"--> isBluetoothAvailable\n"); result->Success(EncodableValue(bluetoothRadio && bluetoothRadio.State() == RadioState::On)); + std::wcerr << (L"<-S isBluetoothAvailable\n"); } else if (method_name.compare("startScan") == 0) { + std::wcerr << (L"--> startScan\n"); if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) { if (!bluetoothLEWatcher) { bluetoothLEWatcher = BluetoothLEAdvertisementWatcher(); @@ -253,10 +271,13 @@ void QuickBluePlugin::HandleMethodCall( } bluetoothLEWatcher.Start(); result->Success(nullptr); + std::wcerr << (L"<-S startScan\n"); } else { result->Error("IllegalState", "Bluetooth unavailable"); + std::wcerr << (L"<-E startScan\n"); } } else if (method_name.compare("stopScan") == 0) { + std::wcerr << (L"--> stopScan\n"); if (bluetoothRadio && bluetoothRadio.State() == RadioState::On) { if (bluetoothLEWatcher) { bluetoothLEWatcher.Stop(); @@ -264,31 +285,49 @@ void QuickBluePlugin::HandleMethodCall( } bluetoothLEWatcher = nullptr; result->Success(nullptr); + std::wcerr << (L"<-S stopScan\n"); } else { result->Error("IllegalState", "Bluetooth unavailable"); + std::wcerr << (L"<-E stopScan\n"); } } else if (method_name.compare("connect") == 0) { + std::wcerr << (L"--> connect\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); + OutputDebugStringW(L"asdf X\n"); + std::cerr << ("asdf 0\n"); + std::wcerr << (L"asdf 0b\n"); + std::wstring wsTmp(deviceId.begin(), deviceId.end()); + std::wcerr << (L"asdf 1\n"); + std::wcerr << ((L"connect bluetoothAddress string: " + wsTmp + L"\n").c_str()); + std::wcerr << ((L"connect bluetoothAddress stoull: " + std::to_wstring(std::stoull(deviceId)) + L"\n").c_str()); + std::wcerr << (L"asdf 2\n"); ConnectAsync(std::stoull(deviceId)); result->Success(nullptr); + std::wcerr << (L"<-S connect\n"); } else if (method_name.compare("disconnect") == 0) { + std::wcerr << (L"--> disconnect\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); CleanConnection(std::stoull(deviceId)); // TODO send `disconnected` message result->Success(nullptr); + std::wcerr << (L"<-S disconnect\n"); } else if (method_name.compare("discoverServices") == 0) { + std::wcerr << (L"--> discoverServices\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); auto it = connectedDevices.find(std::stoull(deviceId)); if (it == connectedDevices.end()) { result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + std::wcerr << (L"<-E discoverServices\n"); return; } DiscoverServicesAsync(*it->second); result->Success(nullptr); + std::wcerr << (L"<-S discoverServices\n"); } else if (method_name.compare("setNotifiable") == 0) { + std::wcerr << (L"--> setNotifiable\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); auto service = std::get(args[EncodableValue("service")]); @@ -297,6 +336,7 @@ void QuickBluePlugin::HandleMethodCall( auto it = connectedDevices.find(std::stoull(deviceId)); if (it == connectedDevices.end()) { result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + std::wcerr << (L"<-E setNotifiable\n"); return; } @@ -308,12 +348,15 @@ void QuickBluePlugin::HandleMethodCall( auto c = sender.GetResults(); if (c == nullptr) { result_pointer->Error("IllegalArgument", "Unknown characteristic:" + characteristic); + std::wcerr << (L"<-E setNotifiable 2\n"); return; } SetNotifiableAsync(bluetoothAgent, c, bleInputProperty); result_pointer->Success(nullptr); + std::wcerr << (L"<-S setNotifiable\n"); }); } else if (method_name.compare("readValue") == 0) { + std::wcerr << (L"--> readValue\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); auto service = std::get(args[EncodableValue("service")]); @@ -321,6 +364,7 @@ void QuickBluePlugin::HandleMethodCall( auto it = connectedDevices.find(std::stoull(deviceId)); if (it == connectedDevices.end()) { result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + std::wcerr << (L"<-E readValue\n"); return; } @@ -332,12 +376,15 @@ void QuickBluePlugin::HandleMethodCall( auto c = sender.GetResults(); if (c == nullptr) { result_pointer->Error("IllegalArgument", "Unknown characteristic:" + characteristic); + std::wcerr << (L"<-E readValue\n"); return; } ReadValueAsync(c); result_pointer->Success(nullptr); + std::wcerr << (L"<-S readValue\n"); }); } else if (method_name.compare("writeValue") == 0) { + std::wcerr << (L"--> writeValue\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); auto service = std::get(args[EncodableValue("service")]); @@ -347,6 +394,7 @@ void QuickBluePlugin::HandleMethodCall( auto it = connectedDevices.find(std::stoull(deviceId)); if (it == connectedDevices.end()) { result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + std::wcerr << (L"<-E writeValue\n"); return; } @@ -358,25 +406,32 @@ void QuickBluePlugin::HandleMethodCall( auto c = sender.GetResults(); if (c == nullptr) { result_pointer->Error("IllegalArgument", "Unknown characteristic:" + characteristic); + std::wcerr << (L"<-E writeValue\n"); return; } WriteValueAsync(c, value, bleOutputProperty); result_pointer->Success(nullptr); + std::wcerr << (L"<-S writeValue\n"); }); } else if (method_name.compare("requestMtu") == 0) { + std::wcerr << (L"--> requestMtu\n"); auto args = std::get(*method_call.arguments()); auto deviceId = std::get(args[EncodableValue("deviceId")]); auto expectedMtu = std::get(args[EncodableValue("expectedMtu")]); auto it = connectedDevices.find(std::stoull(deviceId)); if (it == connectedDevices.end()) { result->Error("IllegalArgument", "Unknown devicesId:" + deviceId); + std::wcerr << (L"<-E requestMtu\n"); return; } RequestMtuAsync(*it->second, expectedMtu); result->Success(nullptr); + std::wcerr << (L"<-S requestMtu\n"); } else { + std::wcerr << (L"--> NotImplemented\n"); result->NotImplemented(); + std::wcerr << (L"<-- NotImplemented\n"); } } @@ -482,7 +537,12 @@ std::unique_ptr> QuickBluePlugin::On } winrt::fire_and_forget QuickBluePlugin::ConnectAsync(uint64_t bluetoothAddress) { + std::wcerr << ((L"ConnectAsync bluetoothAddress: " + std::to_wstring(bluetoothAddress) + L"\n").c_str()); auto device = co_await BluetoothLEDevice::FromBluetoothAddressAsync(bluetoothAddress); + if (!device) { + std::wcerr << ((L"ConnectAsync null device! "+ std::to_wstring(bluetoothAddress) +L"\n").c_str()); + co_return; + } auto servicesResult = co_await device.GetGattServicesAsync(); if (servicesResult.Status() != GattCommunicationStatus::Success) { OutputDebugString((L"GetGattServicesAsync error: " + winrt::to_hstring((int32_t)servicesResult.Status()) + L"\n").c_str()); From b8b6ae306050320d4d9eb3ec43018ee23714ba13 Mon Sep 17 00:00:00 2001 From: erhannis Date: Fri, 28 Jul 2023 21:08:49 -0400 Subject: [PATCH 16/21] Permissions weren't showing up on phones I tested, but logs claim they were needed, so I removed the sdk limits and now it works. --- .../android/src/main/AndroidManifest.xml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/quick_blue/android/src/main/AndroidManifest.xml b/packages/quick_blue/android/src/main/AndroidManifest.xml index da336fa..5c9a8aa 100644 --- a/packages/quick_blue/android/src/main/AndroidManifest.xml +++ b/packages/quick_blue/android/src/main/AndroidManifest.xml @@ -1,19 +1,13 @@ - + - - - + + + - + \ No newline at end of file From 349a3c24535638b6fcfa1f6e7d1eb537e1c4e07d Mon Sep 17 00:00:00 2001 From: erhannis Date: Fri, 28 Jul 2023 21:10:23 -0400 Subject: [PATCH 17/21] Removed null unwrap that crashed; there's a null check immediately after anyway --- .../src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index 8f595fa..337a477 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -86,7 +86,7 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand result.success(bluetoothManager.adapter.isEnabled) } "startScan" -> { - val serviceUUIDs = call.argument>("serviceUUIDs")!! + val serviceUUIDs = call.argument>("serviceUUIDs") if (serviceUUIDs != null && serviceUUIDs.size > 0) { val filters: ArrayList = ArrayList() for (serviceUUID in serviceUUIDs) { From a189716c6bc1f64223d8b7048f4afaad22b06395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Sat, 12 Aug 2023 01:25:33 +0200 Subject: [PATCH 18/21] Fix Android disconnect --- .../src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index bee8682..ecc1818 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -195,8 +195,9 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand } private fun cleanConnection(gatt: BluetoothGatt) { - knownGatts.remove(gatt) + gatt.close() gatt.disconnect() + knownGatts.remove(gatt) } enum class AvailabilityState(val value: Int) { From 96616c665700e60d40eb30128500b8118f9375f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Sat, 12 Aug 2023 01:31:34 +0200 Subject: [PATCH 19/21] Fix android permissions for android level 30 and newer --- .../quick_blue/android/src/main/AndroidManifest.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/quick_blue/android/src/main/AndroidManifest.xml b/packages/quick_blue/android/src/main/AndroidManifest.xml index da336fa..919bc9c 100644 --- a/packages/quick_blue/android/src/main/AndroidManifest.xml +++ b/packages/quick_blue/android/src/main/AndroidManifest.xml @@ -1,9 +1,7 @@ - + @@ -11,9 +9,7 @@ android:maxSdkVersion="30" /> - + - + \ No newline at end of file From 4ae4a534c74b6159453d7836db413ceae748517c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20Ku=CC=88hner?= Date: Tue, 28 Nov 2023 18:18:12 +0100 Subject: [PATCH 20/21] Use bool return from requestMTU --- .../main/kotlin/com/example/quick_blue/QuickBluePlugin.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index ecc1818..a9f2692 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -185,8 +185,11 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand val expectedMtu = call.argument("expectedMtu")!! val gatt = knownGatts.find { it.device.address == deviceId } ?: return result.error("IllegalArgument", "Unknown deviceId: $deviceId", trace()) - gatt.requestMtu(expectedMtu) - result.success(null) + val success = gatt.requestMtu(expectedMtu) + if (success) + result.success(null) + else + result.error("Unable to set MTU", null, trace()) } else -> { result.notImplemented() From a8dced5293006e051188bad1c8438f2d83587d6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Justin=20K=C3=BChner?= Date: Tue, 28 Nov 2023 18:47:16 +0100 Subject: [PATCH 21/21] Handle requestMTU Failures --- .../main/kotlin/com/example/quick_blue/QuickBluePlugin.kt | 4 ++++ .../example/linux/flutter/generated_plugins.cmake | 8 ++++++++ .../example/windows/flutter/generated_plugins.cmake | 8 ++++++++ .../quick_blue/lib/src/method_channel_quick_blue.dart | 8 +++++++- packages/quick_blue/pubspec.yaml | 2 +- 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt index ecc1818..a120d27 100644 --- a/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt +++ b/packages/quick_blue/android/src/main/kotlin/com/example/quick_blue/QuickBluePlugin.kt @@ -313,6 +313,10 @@ class QuickBluePlugin: FlutterPlugin, MethodCallHandler, EventChannel.StreamHand sendMessage(messageConnector, mapOf( "mtuConfig" to mtu )) + } else { + sendMessage(messageConnector, mapOf( + "mtuConfig" to -1 + )) } } diff --git a/packages/quick_blue/example/linux/flutter/generated_plugins.cmake b/packages/quick_blue/example/linux/flutter/generated_plugins.cmake index 51436ae..2e1de87 100644 --- a/packages/quick_blue/example/linux/flutter/generated_plugins.cmake +++ b/packages/quick_blue/example/linux/flutter/generated_plugins.cmake @@ -5,6 +5,9 @@ list(APPEND FLUTTER_PLUGIN_LIST ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/quick_blue/example/windows/flutter/generated_plugins.cmake b/packages/quick_blue/example/windows/flutter/generated_plugins.cmake index 3994668..55a705b 100644 --- a/packages/quick_blue/example/windows/flutter/generated_plugins.cmake +++ b/packages/quick_blue/example/windows/flutter/generated_plugins.cmake @@ -6,6 +6,9 @@ list(APPEND FLUTTER_PLUGIN_LIST quick_blue ) +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + set(PLUGIN_BUNDLED_LIBRARIES) foreach(plugin ${FLUTTER_PLUGIN_LIST}) @@ -14,3 +17,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST}) list(APPEND PLUGIN_BUNDLED_LIBRARIES $) list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/packages/quick_blue/lib/src/method_channel_quick_blue.dart b/packages/quick_blue/lib/src/method_channel_quick_blue.dart index 5b34f8d..ab5d886 100644 --- a/packages/quick_blue/lib/src/method_channel_quick_blue.dart +++ b/packages/quick_blue/lib/src/method_channel_quick_blue.dart @@ -162,6 +162,12 @@ class MethodChannelQuickBlue extends QuickBluePlatform { 'deviceId': deviceId, 'expectedMtu': expectedMtu, }).then((_) => _log('requestMtu invokeMethod success')); - return await _mtuConfigController.stream.first; + int mtu = await _mtuConfigController.stream.first + .timeout(const Duration(milliseconds: 1500)); + if (mtu == -1) { + throw Exception('Unable to set MTU size'); + } else { + return mtu; + } } } diff --git a/packages/quick_blue/pubspec.yaml b/packages/quick_blue/pubspec.yaml index bef1960..e49a6b9 100644 --- a/packages/quick_blue/pubspec.yaml +++ b/packages/quick_blue/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec