diff --git a/CHANGELOG.md b/CHANGELOG.md index 710b5c4..4937ae3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## 2.0.1 +1. Bug fixes and improvements + ## 2.0.0 1. Unified framework for network_tools and network_tools_flutter diff --git a/example/pubspec.lock b/example/pubspec.lock index c8b74e7..ab4319a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -265,7 +265,7 @@ packages: path: ".." relative: true source: path - version: "1.0.5" + version: "2.0.0" path: dependency: transitive description: diff --git a/lib/src/configure_flutter.dart b/lib/src/configure_flutter.dart index 801514c..46ed3ee 100644 --- a/lib/src/configure_flutter.dart +++ b/lib/src/configure_flutter.dart @@ -1,11 +1,12 @@ import 'package:logging/logging.dart'; -import 'package:network_tools/network_tools.dart' as pacakges_page; -// ignore: implementation_imports -import 'package:network_tools/src/network_tools_utils.dart'; +import 'package:network_tools/network_tools.dart' as packages_page; // ignore: implementation_imports import 'package:network_tools/src/services/arp_service.dart'; // ignore: implementation_imports import 'package:network_tools/src/services/impls/arp_service_sembast_impl.dart'; +// ignore: implementation_imports +import 'package:network_tools/src/services/impls/mdns_scanner_service_impl.dart'; +import 'package:network_tools_flutter/src/network_tools_flutter_util.dart'; import 'package:network_tools_flutter/src/services_impls/host_scanner_service_flutter_impl.dart'; import 'package:network_tools_flutter/src/services_impls/port_scanner_service_flutter_impl.dart'; @@ -13,13 +14,13 @@ Future configureNetworkToolsFlutter( String dbDirectory, { bool enableDebugging = false, }) async { - pacakges_page.enableDebugging = enableDebugging; - pacakges_page.dbDirectory = dbDirectory; + packages_page.enableDebugging = enableDebugging; + packages_page.dbDirectory = dbDirectory; - if (pacakges_page.enableDebugging) { + if (packages_page.enableDebugging) { Logger.root.level = Level.FINE; Logger.root.onRecord.listen((record) { - if (record.loggerName == log.name) { + if (record.loggerName == logger.name) { // ignore: avoid_print print( '${record.time.toLocal()}: ${record.level.name}: ${record.loggerName}: ${record.message}', @@ -28,12 +29,15 @@ Future configureNetworkToolsFlutter( }); } - /// Setting dart native classes implementations + // Setting dart native classes implementations ARPServiceSembastImpl(); + MdnsScannerServiceImpl(); + + // Setting flutter classes implementation HostScannerServiceFlutterImpl(); PortScannerServiceFlutterImpl(); final arpService = await ARPService.instance.open(); await arpService.buildTable(); - await pacakges_page.VendorTable.createVendorTableMap(); + await packages_page.VendorTable.createVendorTableMap(); } diff --git a/lib/src/network_tools_flutter_util.dart b/lib/src/network_tools_flutter_util.dart new file mode 100644 index 0000000..eddfdb9 --- /dev/null +++ b/lib/src/network_tools_flutter_util.dart @@ -0,0 +1,3 @@ +import 'package:logging/logging.dart'; + +final logger = Logger("network_tools_flutter"); diff --git a/lib/src/services_impls/host_scanner_service_flutter_impl.dart b/lib/src/services_impls/host_scanner_service_flutter_impl.dart index 8ff263f..a0b7096 100644 --- a/lib/src/services_impls/host_scanner_service_flutter_impl.dart +++ b/lib/src/services_impls/host_scanner_service_flutter_impl.dart @@ -95,7 +95,8 @@ class HostScannerServiceFlutterImpl extends HostScannerServiceImpl { final bool resultsInAddressAscendingOrder = message[4] == "true"; final String dbDirectory = message[5]; final bool enableDebugging = message[6] == "true"; - final List hostIds = message[7] + final String joinedIds = message[7]; + final List hostIds = joinedIds .split(',') .where((e) => e.isNotEmpty) .map(int.parse) diff --git a/pubspec.yaml b/pubspec.yaml index 054edc5..7d1fd90 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: network_tools_flutter description: Extended features of network_tools package for flutter framework supporting iOS and Android -version: 2.0.0 +version: 2.0.1 issue_tracker: https://github.com/osociety/network_tools_flutter/issues repository: https://github.com/osociety/network_tools_flutter diff --git a/test/host_scan_flutter_test.dart b/test/host_scan_flutter_test.dart index 6d4461a..2aee2e7 100644 --- a/test/host_scan_flutter_test.dart +++ b/test/host_scan_flutter_test.dart @@ -1,6 +1,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:network_tools_flutter/network_tools_flutter.dart'; import 'package:network_tools_flutter/src/fake_http_overrides.dart'; +import 'package:network_tools_flutter/src/network_tools_flutter_util.dart'; import 'package:universal_io/io.dart'; void main() { @@ -29,9 +30,9 @@ void main() { // Better to restrict to scan from hostId - 1 to hostId + 1 to prevent GHA timeouts firstHostId = hostId <= 1 ? hostId : hostId - 1; lastHostId = hostId >= 254 ? hostId : hostId + 1; - // log.fine( - // 'Fetched own host as $myOwnHost and interface address as $interfaceIp', - // ); + logger.fine( + 'Fetched own host as $myOwnHost and interface address as $interfaceIp', + ); } });