Merge pull request #323 from guyluz11/dev

Moving pacakges out to pub.dev

.gitignore

@@ -90,4 +90,7 @@ saved_cast_state.json
 lib/infrastructure/core/constant_credentials.dart
 
 # Web related
-lib/generated_plugin_registrant.dart
+lib/generated_plugin_registrant.dart
+
+# Network tools
+network_tools_db/*

analysis_options.yaml

@@ -32,6 +32,3 @@ linter:
     avoid_classes_with_only_static_members: false
 
     sort_constructors_first: true
-
-    # Good packages document everything
-    public_member_api_docs: true

bin/cbj_hub.dart

@@ -6,9 +6,11 @@ import 'package:cbj_hub/infrastructure/shared_variables.dart';
 import 'package:cbj_hub/infrastructure/system_commands/device_pin_manager.dart';
 import 'package:cbj_hub/injection.dart';
 import 'package:cbj_hub/utils.dart';
+import 'package:network_tools/network_tools.dart';
 
 Future<void> main(List<String> arguments) async {
   // arguments[0] is the location of the project
+  configureNetworkTools('network_tools_db');
   configureInjection(Env.prod);
 
   try {
@@ -26,7 +28,7 @@ Future<void> main(List<String> arguments) async {
 
   await getIt<ILocalDbRepository>().initializeDb();
 
-  logger.v('');
+  logger.t('');
 
   await BootUp.setup();
 }

lib/domain/generic_devices/abstract_device/device_entity_abstract.dart

@@ -178,7 +178,8 @@ class DeviceEntityNotAbstract extends DeviceEntityAbstract {
           entityOriginalName:
               EntityOriginalName('Entity original name is empty'),
           deviceOriginalName: DeviceOriginalName(
-              'Device original name that entity is exists on is empty'),
+            'Device original name that entity is exists on is empty',
+          ),
           entityTypes: EntityType(EntityTypes.light.toString()),
           senderDeviceModel: DeviceSenderDeviceModel('a'),
           senderDeviceOs: DeviceSenderDeviceOs('b'),
@@ -194,7 +195,8 @@ class DeviceEntityNotAbstract extends DeviceEntityAbstract {
           entityKey: EntityKey('entityKey is empty'),
           requestTimeStamp: RequestTimeStamp('requestTimeStamp is empty'),
           lastResponseFromDeviceTimeStamp: LastResponseFromDeviceTimeStamp(
-              'lastResponseFromDeviceTimeStamp is empty'),
+            'lastResponseFromDeviceTimeStamp is empty',
+          ),
           deviceCbjUniqueId: CoreUniqueId(),
         );
 

lib/domain/generic_devices/generic_dimmable_light_device/generic_dimmable_light_value_objects.dart

@@ -24,7 +24,7 @@ class GenericDimmableLightSwitchState extends ValueObjectCore<String> {
 class GenericDimmableLightBrightness extends ValueObjectCore<String> {
   factory GenericDimmableLightBrightness(String? input) {
     assert(input != null);
-    String tempInput = input!;
+    final String tempInput = input!;
 
     return GenericDimmableLightBrightness._(
       validateGenericDimmableLightNotEmpty(tempInput),

lib/infrastructure/app_communication/app_communication_repository.dart

@@ -51,7 +51,7 @@ class AppCommunicationRepository extends IAppCommunicationRepository {
   late int hubPort;
 
   Future startLocalServer() async {
-    final server = Server([HubAppServer()]);
+    final server = Server.create(services: [HubAppServer()]);
     await server.serve(port: hubPort);
     logger.i('Hub Server listening for apps clients on port ${server.port}...');
   }
@@ -217,7 +217,7 @@ class AppCommunicationRepository extends IAppCommunicationRepository {
       }
     }).onError((error) {
       if (error is GrpcError && error.code == 1) {
-        logger.v('Client have disconnected');
+        logger.t('Client have disconnected');
       } else if (error is GrpcError && error.code == 14) {
         final String errorMessage = error.message!;
 

lib/infrastructure/app_communication/hub_app_server.dart

@@ -26,7 +26,7 @@ class HubAppServer extends CbjHubServiceBase {
     Stream<ClientStatusRequests> request,
   ) async* {
     try {
-      logger.v('Got new Client');
+      logger.t('Got new Client');
 
       getIt<IAppCommunicationRepository>().getFromApp(
         request: request,

lib/infrastructure/bindings/binding_repository.dart

@@ -5,9 +5,9 @@ import 'package:cbj_hub/domain/binding/value_objects_routine_cbj.dart';
 import 'package:cbj_hub/domain/local_db/i_local_db_repository.dart';
 import 'package:cbj_hub/domain/local_db/local_db_failures.dart';
 import 'package:cbj_hub/domain/mqtt_server/i_mqtt_server_repository.dart';
-import 'package:cbj_hub/domain/node_red/i_node_red_repository.dart';
 import 'package:cbj_hub/domain/rooms/i_saved_rooms_repo.dart';
 import 'package:cbj_hub/domain/saved_devices/i_saved_devices_repo.dart';
+import 'package:cbj_hub/infrastructure/node_red/node_red_repository.dart';
 import 'package:cbj_hub/injection.dart';
 import 'package:dartz/dartz.dart';
 import 'package:injectable/injectable.dart';
@@ -64,7 +64,7 @@ class BindingCbjRepository implements IBindingCbjRepository {
       await getIt<ISavedDevicesRepo>().saveAndActivateSmartDevicesToDb();
       getIt<ISavedRoomsRepo>()
           .addBindingToRoomDiscoveredIfNotExist(tempBindingCbj);
-      final String bindingNodeRedFlowId = await getIt<INodeRedRepository>()
+      final String bindingNodeRedFlowId = await getIt<NodeRedRepository>()
           .createNewNodeRedBinding(tempBindingCbj);
       if (bindingNodeRedFlowId.isNotEmpty) {
         tempBindingCbj = tempBindingCbj.copyWith(

lib/infrastructure/devices/cbj_devices/cbj_devices_connector_conjector.dart

@@ -54,7 +54,7 @@ class CbjDevicesConnectorConjector
 
       companyDevices.addEntries([deviceAsEntry]);
 
-      logger.v(
+      logger.t(
         'New Cbj Smart Device name:${entityAsDevice.cbjEntityName.getOrCrash()}',
       );
     }

lib/infrastructure/devices/cbj_devices/cbj_smart_device/cbj_smart_device_entity.dart

@@ -37,11 +37,13 @@ class CbjSmartComputerEntity extends GenericSmartComputerDE {
     required super.smartComputerSuspendState,
   }) : super(
           deviceVendor: DeviceVendor(
-              VendorsAndServices.cyBearJinniAppSmartEntity.toString()),
+            VendorsAndServices.cyBearJinniAppSmartEntity.toString(),
+          ),
         );
 
   factory CbjSmartComputerEntity.fromGeneric(
-      GenericSmartComputerDE genericDevice) {
+    GenericSmartComputerDE genericDevice,
+  ) {
     return CbjSmartComputerEntity(
       uniqueId: genericDevice.uniqueId,
       entityUniqueId: genericDevice.entityUniqueId,

lib/infrastructure/devices/cbj_devices/cbj_smart_device_api/cbj_smart_device_api_object.dart

@@ -60,7 +60,7 @@ class CbjDevicesApiObject {
     if (sDeviceType == CbjDevicesDevicesTypes.cbjDevicesRunner ||
         sDeviceType == CbjDevicesDevicesTypes.cbjDevicesRunnerMini) {
       if (!isCbjDevicesMessageNew(data, hexSeparatedLetters)) {
-        logger.v('Not new cbjDevices device!');
+        logger.t('Not new cbjDevices device!');
       }
 
       final CbjDevicesDeviceDirection cbjDevicesDeviceDirection =
@@ -79,7 +79,7 @@ class CbjDevicesApiObject {
     }
 
     if (!isCbjDevicesMessage(data, hexSeparatedLetters)) {
-      logger.v('Not old cbjDevices device!');
+      logger.t('Not old cbjDevices device!');
     }
 
     final CbjDevicesDeviceState cbjDevicesDeviceState =
@@ -216,7 +216,7 @@ class CbjDevicesApiObject {
   Future<void> stopBlinds() async {
     if (deviceType != CbjDevicesDevicesTypes.cbjDevicesRunner &&
         deviceType != CbjDevicesDevicesTypes.cbjDevicesRunnerMini) {
-      logger.v('Stop blinds support only for blinds');
+      logger.t('Stop blinds support only for blinds');
       return;
     }
 
@@ -242,7 +242,7 @@ class CbjDevicesApiObject {
   Future<void> setPosition({int pos = 0}) async {
     if (deviceType != CbjDevicesDevicesTypes.cbjDevicesRunner &&
         deviceType != CbjDevicesDevicesTypes.cbjDevicesRunnerMini) {
-      logger.v('Set position support only blinds');
+      logger.t('Set position support only blinds');
       return;
     }
 

lib/infrastructure/devices/companies_connector_conjector.dart

@@ -21,7 +21,6 @@ import 'package:cbj_hub/infrastructure/devices/lifx/lifx_connector_conjector.dar
 import 'package:cbj_hub/infrastructure/devices/philips_hue/philips_hue_connector_conjector.dart';
 import 'package:cbj_hub/infrastructure/devices/shelly/shelly_connector_conjector.dart';
 import 'package:cbj_hub/infrastructure/devices/sonoff_diy/sonoff_diy_connector_conjector.dart';
-import 'package:cbj_hub/infrastructure/devices/switcher/switcher_api/switcher_discover.dart';
 import 'package:cbj_hub/infrastructure/devices/switcher/switcher_connector_conjector.dart';
 import 'package:cbj_hub/infrastructure/devices/tasmota/tasmota_ip/tasmota_ip_connector_conjector.dart';
 import 'package:cbj_hub/infrastructure/devices/tuya_smart/tuya_smart_connector_conjector.dart';
@@ -35,6 +34,7 @@ import 'package:cbj_hub/injection.dart';
 import 'package:cbj_hub/utils.dart';
 import 'package:internet_connection_checker/internet_connection_checker.dart';
 import 'package:network_tools/network_tools.dart';
+import 'package:switcher_dart/switcher_dart.dart';
 
 class CompaniesConnectorConjector {
   static void updateAllDevicesReposWithDeviceChanges(
@@ -260,7 +260,7 @@ class CompaniesConnectorConjector {
         port: mdnsPort,
       );
     } else {
-      logger.v(
+      logger.t(
         'mDNS service type ${hostMdnsInfo.mdnsServiceType} is not supported\n IP: ${activeHost.address}, Port: ${hostMdnsInfo.mdnsPort}, ServiceType: ${hostMdnsInfo.mdnsServiceType}, MdnsName: ${hostMdnsInfo.getOnlyTheStartOfMdnsName()}',
       );
     }