Merge pull request #80 from osociety/dev

Dev -> Main

Author: git-elliot

.github/workflows/flutter.yml

@@ -6,6 +6,8 @@
 name: Flutter
 
 on:
+  push:
+    branches: ["main", "dev"]
   pull_request:
     branches: ["main", "dev"]
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 3.0.4
+* Improve test coverage and fix analysis warnings.
+* Fix CI triggers for coverage tracking.
+
 ## 3.0.3
 Upgrade to latest network_tools
 

example/ios/Runner/Info.plist

@@ -43,6 +43,13 @@
 	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_http._tcp</string>
+		<string>_services._dns-sd._udp</string>
+	</array>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>Required to discover local network devices</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 </dict>

example/lib/pages/mdns_search/mdns_scanner_page.dart

@@ -23,8 +23,8 @@ class _MdnsScannerPageState extends State<MdnsScannerPage> {
     if (netInt == null) {
       return;
     }
-    List<ActiveHost> hosts = await MdnsScannerService.instance
-        .searchMdnsDevices(forceUseOfSavedSrvRecordList: true);
+    List<ActiveHost> hosts =
+        await MdnsScannerService.instance.searchMdnsDevices();
 
     setState(() {
       if (activeHosts == null) {

lib/src/configure_flutter.dart

@@ -1,24 +1,63 @@
 import 'package:dart_ping_ios/dart_ping_ios.dart';
+import 'package:get_it/get_it.dart';
 import 'package:logging/logging.dart';
 import 'package:network_tools/network_tools.dart' as packages_page;
 // ignore: implementation_imports
+import 'package:network_tools/src/database/database_service.dart';
+// ignore: implementation_imports
+import 'package:network_tools/src/database/drift_database.dart';
+// ignore: implementation_imports
+import 'package:network_tools/src/repository/repository.dart';
+// ignore: implementation_imports
 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/mdns_scanner_service_flutter_impl.dart';
 import 'package:network_tools_flutter/src/services_impls/port_scanner_service_flutter_impl.dart';
 import 'package:universal_io/io.dart';
 
+bool _isConfigured = false;
+Future<void>? _configureFuture;
+
 /// Configures the network tools for Flutter.
 ///
 /// [dbDirectory] is the directory for the database.
 /// [enableDebugging] enables verbose logging if set to true.
 ///
 /// This function sets up implementations for ARP, host, port, and mDNS scanning services,
 /// initializes the ARP table, and registers DartPing for iOS if needed.
-Future configureNetworkToolsFlutter(
+Future<void> configureNetworkToolsFlutter(
   String dbDirectory, {
   bool enableDebugging = false,
   bool rebuildData = false,
+}) async {
+  if (_isConfigured && !rebuildData) {
+    return;
+  }
+
+  if (_configureFuture != null) {
+    await _configureFuture;
+    if (_isConfigured && !rebuildData) {
+      return;
+    }
+  }
+
+  _configureFuture = _doConfigureNetworkToolsFlutter(
+    dbDirectory,
+    enableDebugging: enableDebugging,
+    rebuildData: rebuildData,
+  );
+  try {
+    await _configureFuture;
+    _isConfigured = true;
+  } finally {
+    _configureFuture = null;
+  }
+}
+
+Future<void> _doConfigureNetworkToolsFlutter(
+  String dbDirectory, {
+  required bool enableDebugging,
+  required bool rebuildData,
 }) async {
   packages_page.enableDebugging = enableDebugging;
   packages_page.dbDirectory = dbDirectory;
@@ -40,7 +79,15 @@ Future configureNetworkToolsFlutter(
   PortScannerServiceFlutterImpl();
   MdnsScannerServiceFlutterImpl();
 
-  await packages_page.initializeNetworkTools(rebuildData);
+  if (GetIt.instance.isRegistered<DatabaseService<AppDatabase>>()) {
+    if (rebuildData) {
+      await GetIt.instance<Repository<packages_page.ARPData>>().clear();
+    }
+    await GetIt.instance<Repository<packages_page.ARPData>>().build();
+    await GetIt.instance<Repository<packages_page.Vendor>>().build();
+  } else {
+    await packages_page.initializeNetworkTools(rebuildData);
+  }
 
   // Register dart ping for main isolate
   if (Platform.isIOS) {

lib/src/services_impls/host_scanner_service_flutter_impl.dart

@@ -69,12 +69,20 @@ class HostScannerServiceFlutterImpl extends HostScannerServiceImpl {
             enableDebugging.toString(),
             hostIds.join(','),
           ]);
-        } else if (message is List<String>) {
+        } else if (message is List<dynamic> &&
+            message.length == 2 &&
+            message[0] is String) {
           progressCallback
               ?.call((i - firstHostId) * 100 / (lastValidSubnet - firstHostId));
+          final pingDataJson = message[1];
           final activeHostFound = ActiveHost.fromSendableActiveHost(
-              sendableActiveHost: SendableActiveHost(message[0],
-                  pingData: PingData.fromJson(message[1])));
+            sendableActiveHost: SendableActiveHost(
+              message[0] as String,
+              pingData: pingDataJson == null
+                  ? null
+                  : PingResponse.fromJson(pingDataJson as String),
+            ),
+          );
           await activeHostFound.resolveInfo();
           yield activeHostFound;
         } else if (message is String && message == 'Done') {
@@ -126,8 +134,10 @@ class HostScannerServiceFlutterImpl extends HostScannerServiceImpl {
 
       await for (final SendableActiveHost activeHostFound
           in hostsDiscoveredInNetwork) {
-        sendPort.send(
-            [activeHostFound.address, activeHostFound.pingData!.toJson()]);
+        sendPort.send(<String?>[
+          activeHostFound.address,
+          activeHostFound.pingData?.toJson(),
+        ]);
       }
       sendPort.send('Done');
     }