Skip to content

refactor: Move core providers, services, and platform utilities #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AustinChangLinksys merged 2 commits into from
Jan 6, 2026
Merged

refactor: Move core providers, services, and platform utilities #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ca0d0
[Refactor] Move platform utilities to lib/core/utils/
HankYuLinksys Jan 5, 2026
9148656
[Refactor] Move core providers and services to lib/core/data/
HankYuLinksys Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/core/cloud/linksys_cloud_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import 'package:privacy_gui/core/cloud/model/cloud_communication_method.dart';
import 'package:privacy_gui/core/cloud/model/cloud_network_model.dart';
import 'package:privacy_gui/core/cloud/model/cloud_session_model.dart';
import 'package:privacy_gui/providers/connectivity/_connectivity.dart';
import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart'
if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart';
import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart'
if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart';

final cloudRepositoryProvider = Provider((ref) => LinksysCloudRepository(
httpClient: LinksysHttpClient(getHost: () {
Expand Down
8 changes: 4 additions & 4 deletions lib/core/cloud/linksys_device_cloud_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import 'package:privacy_gui/core/cloud/linksys_requests/cloud2_service.dart';
import 'package:privacy_gui/core/cloud/linksys_requests/guardians_remote_assistance_service.dart';
import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart';
import 'package:privacy_gui/core/http/linksys_http_client.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';
import 'package:privacy_gui/core/utils/devices.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:privacy_gui/providers/connectivity/connectivity_info.dart';
import 'package:privacy_gui/providers/connectivity/connectivity_provider.dart';
import 'package:privacy_gui/core/jnap/providers/ip_getter/get_local_ip.dart'
if (dart.library.io) 'package:privacy_gui/core/jnap/providers/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'package:privacy_gui/core/jnap/providers/ip_getter/web_get_local_ip.dart';
import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart'
if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart';

final deviceCloudServiceProvider = Provider((ref) => DeviceCloudService(
httpClient: LinksysHttpClient(getHost: () {
Expand Down
4 changes: 2 additions & 2 deletions lib/core/cloud/providers/geolocation/geolocation_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/cloud/linksys_device_cloud_service.dart';
import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:privacy_gui/providers/app_settings/app_settings_provider.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/core/cloud/providers/remote_assistance/remote_client_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/cloud/linksys_device_cloud_service.dart';
import 'package:privacy_gui/core/cloud/model/guardians_remote_assistance.dart';
import 'package:privacy_gui/core/cloud/providers/remote_assistance/remote_client_state.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/utils/logger.dart';

final remoteClientProvider =
Expand Down
6 changes: 3 additions & 3 deletions ...providers/dashboard_manager_provider.dart → ...providers/dashboard_manager_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/constants/_constants.dart';
import 'package:privacy_gui/core/jnap/models/device_info.dart';
import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/services/dashboard_manager_service.dart';
import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/services/dashboard_manager_service.dart';
import 'package:privacy_gui/core/utils/bench_mark.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:shared_preferences/shared_preferences.dart';
Expand Down
0 ...ap/providers/dashboard_manager_state.dart → ...ta/providers/dashboard_manager_state.dart
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ap/providers/device_manager_provider.dart → ...ta/providers/device_manager_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/services/device_manager_service.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/services/device_manager_service.dart';
import 'package:privacy_gui/core/utils/devices.dart';
import 'package:privacy_gui/core/utils/icon_device_category.dart';

Expand Down
0 .../jnap/providers/device_manager_state.dart → .../data/providers/device_manager_state.dart
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...p/providers/firmware_update_provider.dart → ...a/providers/firmware_update_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import 'package:collection/collection.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/jnap/actions/better_action.dart';
import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart';
import 'package:privacy_gui/core/jnap/providers/firmware_update_state.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/firmware_update_state.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/services/firmware_update_service.dart';
import 'package:privacy_gui/core/data/services/firmware_update_service.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:privacy_gui/page/firmware_update/models/firmware_update_ui_model.dart';

Expand Down
0 ...jnap/providers/firmware_update_state.dart → ...data/providers/firmware_update_state.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...p/providers/node_wan_status_provider.dart → ...viders/node_internet_status_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/jnap/actions/better_action.dart';
import 'package:privacy_gui/core/jnap/models/wan_status.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/utils/logger.dart';

Expand Down
4 changes: 2 additions & 2 deletions ...core/jnap/providers/polling_provider.dart → ...core/data/providers/polling_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import 'package:privacy_gui/constants/build_config.dart';
import 'package:privacy_gui/core/cache/linksys_cache_manager.dart';
import 'package:privacy_gui/core/jnap/actions/better_action.dart';
import 'package:privacy_gui/core/jnap/actions/jnap_service_supported.dart';
import 'package:privacy_gui/core/jnap/providers/node_light_settings_provider.dart';
import 'package:privacy_gui/page/nodes/providers/node_light_settings_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/services/polling_service.dart';
import 'package:privacy_gui/core/data/services/polling_service.dart';
import 'package:privacy_gui/core/utils/bench_mark.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:privacy_gui/page/health_check/providers/health_check_provider.dart';
Expand Down
4 changes: 2 additions & 2 deletions .../jnap/providers/side_effect_provider.dart → .../data/providers/side_effect_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// dependency.
//
// 3. Design Rationale
// Located in `lib/core/jnap/providers/`, this component is explicitly part
// Located in `lib/core/data/providers/`, this component is explicitly part
// of the JNAP infrastructure, not a feature provider in `lib/page/`.
// Its responsibility is to handle JNAP operation side effects, which
// inherently belongs to the Data Layer.
Expand All @@ -27,7 +27,7 @@
import 'package:equatable/equatable.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/errors/service_error.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:shared_preferences/shared_preferences.dart';

import 'package:privacy_gui/constants/_constants.dart';
Expand Down
4 changes: 2 additions & 2 deletions ...p/services/dashboard_manager_service.dart → ...a/services/dashboard_manager_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'package:privacy_gui/core/jnap/models/device_info.dart';
import 'package:privacy_gui/core/jnap/models/guest_radio_settings.dart';
import 'package:privacy_gui/core/jnap/models/radio_info.dart';
import 'package:privacy_gui/core/jnap/models/soft_sku_settings.dart';
import 'package:privacy_gui/core/jnap/providers/dashboard_manager_state.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/dashboard_manager_state.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';

Expand Down
4 changes: 2 additions & 2 deletions ...jnap/services/device_manager_service.dart → ...data/services/device_manager_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import 'package:privacy_gui/core/jnap/models/node_wireless_connection.dart';
import 'package:privacy_gui/core/jnap/models/radio_info.dart';
import 'package:privacy_gui/core/jnap/models/wan_status.dart';
import 'package:privacy_gui/core/jnap/models/wirless_connection.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';
import 'package:privacy_gui/core/utils/devices.dart';
Expand Down
4 changes: 2 additions & 2 deletions ...nap/services/firmware_update_service.dart → ...ata/services/firmware_update_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import 'package:privacy_gui/core/jnap/command/base_command.dart';
import 'package:privacy_gui/core/jnap/models/firmware_update_settings.dart';
import 'package:privacy_gui/core/jnap/models/firmware_update_status.dart';
import 'package:privacy_gui/core/jnap/models/firmware_update_status_nodes.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/device_manager_provider.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';
import 'package:privacy_gui/core/utils/bench_mark.dart';
Expand Down
0 lib/core/jnap/services/polling_service.dart → lib/core/data/services/polling_service.dart
View file
Open in desktop
File renamed without changes.
166 changes: 0 additions & 166 deletions lib/core/jnap/providers/mocks/mock_firmware_update_provider.dart
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions lib/core/jnap/router_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:privacy_gui/core/cache/utility.dart';
import 'package:privacy_gui/core/jnap/providers/dashboard_manager_provider.dart';
import 'package:privacy_gui/core/data/providers/dashboard_manager_provider.dart';
import 'package:privacy_gui/providers/auth/_auth.dart';
import 'package:privacy_gui/providers/auth/auth_provider.dart';
import 'package:privacy_gui/providers/connectivity/_connectivity.dart';
Expand All @@ -23,13 +23,13 @@ import 'package:privacy_gui/core/jnap/jnap_command_queue.dart';
import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/spec/jnap_spec.dart';
import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/data/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/utils/logger.dart';
import 'package:privacy_gui/utils.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'providers/ip_getter/get_local_ip.dart'
if (dart.library.io) 'providers/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'providers/ip_getter/web_get_local_ip.dart';
import 'package:privacy_gui/core/utils/ip_getter/get_local_ip.dart'
if (dart.library.io) 'package:privacy_gui/core/utils/ip_getter/mobile_get_local_ip.dart'
if (dart.library.html) 'package:privacy_gui/core/utils/ip_getter/web_get_local_ip.dart';

enum CommandType {
remote,
Expand Down
2 changes: 1 addition & 1 deletion lib/core/usp/usp_mapper_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:privacy_gui/core/jnap/actions/better_action.dart';
import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart';
import 'package:privacy_gui/core/jnap/command/base_command.dart';
import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/data/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';
import 'package:usp_client_core/usp_client_core.dart';
Expand Down
0 ...p/providers/assign_ip/base_assign_ip.dart → lib/core/utils/assign_ip/base_assign_ip.dart
View file
Open in desktop
File renamed without changes.
0 ...ap/providers/assign_ip/web_assign_ip.dart → lib/core/utils/assign_ip/web_assign_ip.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/core/utils/devices.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:collection/collection.dart';
import 'package:privacy_gui/core/jnap/models/device.dart';
import 'package:privacy_gui/core/jnap/providers/device_manager_state.dart';
import 'package:privacy_gui/core/data/providers/device_manager_state.dart';

/// An extension on [RawDevice] providing utility methods for accessing device information.
extension DeviceUtil on RawDevice {
Expand Down
0 ...nap/providers/ip_getter/get_local_ip.dart → lib/core/utils/ip_getter/get_local_ip.dart
View file
Open in desktop
File renamed without changes.
0 ...viders/ip_getter/mobile_get_local_ip.dart → .../utils/ip_getter/mobile_get_local_ip.dart
View file
Open in desktop
File renamed without changes.
0 ...providers/ip_getter/web_get_local_ip.dart → ...ore/utils/ip_getter/web_get_local_ip.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/demo/jnap/demo_router_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
library;

import 'package:flutter/foundation.dart';
import 'package:privacy_gui/core/data/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/jnap/actions/better_action.dart';
import 'package:privacy_gui/core/jnap/actions/jnap_transaction.dart';
import 'package:privacy_gui/core/jnap/command/base_command.dart';
import 'package:privacy_gui/core/jnap/providers/side_effect_provider.dart';
import 'package:privacy_gui/core/jnap/result/jnap_result.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';
import 'package:privacy_gui/demo/jnap/jnap_mock_registry.dart';
Expand Down
2 changes: 1 addition & 1 deletion lib/demo/providers/demo_overrides.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_provide
import 'package:privacy_gui/core/cloud/providers/geolocation/geolocation_state.dart';
import 'package:privacy_gui/core/jnap/models/auto_configuration_settings.dart';
import 'package:privacy_gui/demo/jnap/demo_router_repository.dart';
import 'package:privacy_gui/core/jnap/providers/polling_provider.dart';
import 'package:privacy_gui/core/data/providers/polling_provider.dart';
import 'package:privacy_gui/core/jnap/router_repository.dart';
import 'package:privacy_gui/page/instant_setup/providers/pnp_provider.dart';
import 'package:privacy_gui/providers/auth/auth_provider.dart';
Expand Down
Loading