refactor: move to packages/localsend_isolates

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
         working-directory: app
         run: flutter pub get
       - name: Dependencies (cargokit - rust_builder)
-        working-directory: app/rust_builder/cargokit/build_tool
+        working-directory: packages/localsend_isolates/rust_builder/cargokit/build_tool
         run: flutter pub get
       - name: Remove gen directory (app)
         working-directory: app
@@ -49,7 +49,7 @@ jobs:
         working-directory: app
         run: flutter pub get
       - name: Dependencies (cargokit - rust_builder)
-        working-directory: app/rust_builder/cargokit/build_tool
+        working-directory: packages/localsend_isolates/rust_builder/cargokit/build_tool
         run: flutter pub get
       - name: Analyze (app)
         working-directory: app

.github/workflows/release.yml

@@ -69,7 +69,7 @@ jobs:
           override: ${{ env.RUST_VERSION }}
 
       - name: Check rust-toolchain.toml
-        working-directory: ${{ env.APK_BUILD_DIR }}/app
+        working-directory: ${{ env.APK_BUILD_DIR }}/packages/localsend_isolates
         run: rustup show
 
       - name: Dependencies
@@ -113,7 +113,7 @@ jobs:
           override: ${{ env.RUST_VERSION }}
 
       - name: Check rust-toolchain.toml
-        working-directory: app
+        working-directory: packages/localsend_isolates
         run: rustup show
 
       - name: Dependencies
@@ -192,7 +192,7 @@ jobs:
           override: ${{ env.RUST_VERSION }}
 
       - name: Check rust-toolchain.toml
-        working-directory: app
+        working-directory: packages/localsend_isolates
         run: rustup show
 
       - name: Enable dart_distributor
@@ -292,7 +292,7 @@ jobs:
           override: ${{ env.RUST_VERSION }}
 
       - name: Check rust-toolchain.toml
-        working-directory: app
+        working-directory: packages/localsend_isolates
         run: rustup show
 
       - name: Dependencies

app/lib/config/init.dart

@@ -10,12 +10,6 @@ import 'package:flutter/widgets.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
 import 'package:localsend_app/config/refena.dart';
 import 'package:localsend_app/config/theme.dart';
-import 'package:localsend_app/isolate/api_route_builder.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/dto/multicast_dto.dart';
-import 'package:localsend_app/isolate/util/logger.dart';
 import 'package:localsend_app/pages/home_page.dart';
 import 'package:localsend_app/pages/home_page_controller.dart';
 import 'package:localsend_app/provider/animation_provider.dart';
@@ -32,8 +26,6 @@ import 'package:localsend_app/provider/selection/selected_sending_files_provider
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/provider/tv_provider.dart';
 import 'package:localsend_app/provider/window_dimensions_provider.dart';
-import 'package:localsend_app/rust/api/logging.dart' as rust_logging;
-import 'package:localsend_app/rust/frb_generated.dart';
 import 'package:localsend_app/util/i18n.dart';
 import 'package:localsend_app/util/native/autostart_helper.dart';
 import 'package:localsend_app/util/native/cache_helper.dart';
@@ -45,6 +37,14 @@ import 'package:localsend_app/util/native/platform_check.dart';
 import 'package:localsend_app/util/native/tray_helper.dart';
 import 'package:localsend_app/util/ui/dynamic_colors.dart';
 import 'package:localsend_app/util/ui/snackbar.dart';
+import 'package:localsend_isolates/api_route_builder.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/dto/multicast_dto.dart';
+import 'package:localsend_isolates/rust/api/logging.dart' as rust_logging;
+import 'package:localsend_isolates/rust/frb_generated.dart';
+import 'package:localsend_isolates/util/logger.dart';
 import 'package:logging/logging.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:share_handler/share_handler.dart';

app/lib/isolate/isolate.dart

@@ -1,20 +0,0 @@
-export 'package:localsend_app/isolate/src/isolate/child/server_isolate.dart'
-    show
-        HttpServerEvent,
-        HttpServerFileUploadEvent,
-        HttpServerFileUploadResultEvent,
-        HttpServerPrepareUploadEvent,
-        HttpServerRegisterEvent,
-        HttpServerSessionEndEvent;
-export 'package:localsend_app/isolate/src/isolate/child/sync_provider.dart';
-export 'package:localsend_app/isolate/src/isolate/child/upload_isolate.dart'
-    show
-        HttpUploadEvent,
-        HttpUploadFile,
-        HttpUploadFileFailedEvent,
-        HttpUploadFileFinishedEvent,
-        HttpUploadFileProgressEvent,
-        HttpUploadFileStartedEvent;
-export 'package:localsend_app/isolate/src/isolate/parent/actions.dart';
-export 'package:localsend_app/isolate/src/isolate/parent/actions_sync.dart';
-export 'package:localsend_app/isolate/src/isolate/parent/parent_isolate_provider.dart';

app/lib/main.dart

@@ -4,7 +4,6 @@ import 'package:localsend_app/config/init.dart';
 import 'package:localsend_app/config/init_error.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/isolate.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/pages/home_page.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
@@ -14,6 +13,7 @@ import 'package:localsend_app/widget/watcher/life_cycle_watcher.dart';
 import 'package:localsend_app/widget/watcher/shortcut_watcher.dart';
 import 'package:localsend_app/widget/watcher/tray_watcher.dart';
 import 'package:localsend_app/widget/watcher/window_watcher.dart';
+import 'package:localsend_isolates/isolate.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/model/cross_file.dart

@@ -1,7 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 part 'cross_file.mapper.dart';

app/lib/model/persistence/receive_history_entry.dart

@@ -1,7 +1,7 @@
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:intl/intl.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 
 part 'receive_history_entry.mapper.dart';
 

app/lib/model/state/nearby_devices_state.dart

@@ -1,5 +1,5 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 part 'nearby_devices_state.mapper.dart';
 

app/lib/model/state/send/send_session_state.dart

@@ -1,8 +1,8 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/state/send/sending_file.dart';
 import 'package:localsend_app/model/state/server/receive_session_state.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 
 part 'send_session_state.mapper.dart';
 

app/lib/model/state/send/sending_file.dart

@@ -1,8 +1,8 @@
 import 'dart:typed_data';
 
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/file_status.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/file_status.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 part 'sending_file.mapper.dart';

app/lib/model/state/send/web/web_send_file.dart

@@ -1,5 +1,5 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 part 'web_send_file.mapper.dart';

app/lib/model/state/server/receive_session_state.dart

@@ -1,10 +1,10 @@
 import 'dart:async';
 
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/state/server/receiving_file.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/file_type.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 
 part 'receive_session_state.mapper.dart';
 

app/lib/model/state/server/receiving_file.dart

@@ -1,6 +1,6 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/file_status.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/file_status.dart';
 
 part 'receiving_file.mapper.dart';
 

app/lib/model/state/settings_state.dart

@@ -1,9 +1,9 @@
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/model/send_mode.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 part 'settings_state.mapper.dart';
 

app/lib/pages/apk_picker_page.dart

@@ -1,7 +1,6 @@
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/provider/apk_provider.dart';
 import 'package:localsend_app/provider/selection/selected_sending_files_provider.dart';
 import 'package:localsend_app/util/file_size_helper.dart';
@@ -10,6 +9,7 @@ import 'package:localsend_app/util/ui/nav_bar_padding.dart';
 import 'package:localsend_app/widget/file_thumbnail.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
 import 'package:localsend_app/widget/sliver/sliver_pinned_header.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/progress_page.dart

@@ -6,9 +6,6 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/file_status.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/state/server/receive_session_state.dart';
 import 'package:localsend_app/provider/network/send_provider.dart';
 import 'package:localsend_app/provider/network/server/server_provider.dart';
@@ -26,6 +23,9 @@ import 'package:localsend_app/widget/custom_progress_bar.dart';
 import 'package:localsend_app/widget/dialogs/cancel_session_dialog.dart';
 import 'package:localsend_app/widget/dialogs/error_dialog.dart';
 import 'package:localsend_app/widget/file_thumbnail.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/file_status.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';

app/lib/pages/receive_history_page.dart

@@ -3,8 +3,6 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/persistence/receive_history_entry.dart';
 import 'package:localsend_app/pages/receive_page.dart';
 import 'package:localsend_app/provider/receive_history_provider.dart';
@@ -19,6 +17,8 @@ import 'package:localsend_app/widget/dialogs/file_info_dialog.dart';
 import 'package:localsend_app/widget/dialogs/history_clear_dialog.dart';
 import 'package:localsend_app/widget/file_thumbnail.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:path/path.dart' as path;
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';

app/lib/pages/receive_page.dart

@@ -4,9 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/pages/receive_options_page.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
@@ -20,6 +17,9 @@ import 'package:localsend_app/util/native/taskbar_helper.dart';
 import 'package:localsend_app/util/ui/snackbar.dart';
 import 'package:localsend_app/widget/device_bage.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 import 'package:url_launcher/url_launcher.dart';

app/lib/pages/selected_files_page.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/provider/selection/selected_sending_files_provider.dart';
 import 'package:localsend_app/util/file_size_helper.dart';
 import 'package:localsend_app/util/native/open_file.dart';
@@ -11,6 +10,7 @@ import 'package:localsend_app/widget/custom_basic_appbar.dart';
 import 'package:localsend_app/widget/dialogs/message_input_dialog.dart';
 import 'package:localsend_app/widget/file_thumbnail.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/send_page.dart

@@ -3,8 +3,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/network/send_provider.dart';
@@ -16,6 +14,8 @@ import 'package:localsend_app/widget/custom_basic_appbar.dart';
 import 'package:localsend_app/widget/dialogs/error_dialog.dart';
 import 'package:localsend_app/widget/list_tile/device_list_tile.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/settings/network_interfaces_page.dart

@@ -3,12 +3,12 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:local_hero/local_hero.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/util/network_interfaces.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/widget/custom_basic_appbar.dart';
 import 'package:localsend_app/widget/dialogs/text_field_tv.dart';
 import 'package:localsend_app/widget/labeled_checkbox.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/util/network_interfaces.dart';
 import 'package:moform/moform.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 

app/lib/pages/tabs/receive_tab_vm.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/model/state/server/server_state.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
 import 'package:localsend_app/provider/network/server/server_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/widget/dialogs/quick_save_from_favorites_notice.dart';
 import 'package:localsend_app/widget/dialogs/quick_save_notice.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 /// Whether the advanced network info is shown

app/lib/pages/tabs/send_tab.dart

@@ -3,8 +3,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/send_mode.dart';
 import 'package:localsend_app/pages/selected_files_page.dart';
 import 'package:localsend_app/pages/tabs/send_tab_vm.dart';
@@ -32,6 +30,8 @@ import 'package:localsend_app/widget/responsive_builder.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
 import 'package:localsend_app/widget/responsive_wrap_view.dart';
 import 'package:localsend_app/widget/rotating_widget.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/tabs/send_tab_vm.dart

@@ -1,7 +1,5 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/model/send_mode.dart';
@@ -21,6 +19,8 @@ import 'package:localsend_app/widget/dialogs/favorite_delete_dialog.dart';
 import 'package:localsend_app/widget/dialogs/favorite_dialog.dart';
 import 'package:localsend_app/widget/dialogs/favorite_edit_dialog.dart';
 import 'package:localsend_app/widget/dialogs/no_files_dialog.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/tabs/settings_tab.dart

@@ -6,8 +6,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/pages/about/about_page.dart';
 import 'package:localsend_app/pages/changelog_page.dart';
@@ -32,6 +30,8 @@ import 'package:localsend_app/widget/dialogs/text_field_with_actions.dart';
 import 'package:localsend_app/widget/labeled_checkbox.dart';
 import 'package:localsend_app/widget/local_send_logo.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 import 'package:url_launcher/url_launcher.dart';

app/lib/pages/tabs/settings_tab_controller.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/device_info_result.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/pages/language_page.dart';
 import 'package:localsend_app/pages/tabs/settings_tab_vm.dart';
@@ -14,6 +11,9 @@ import 'package:localsend_app/util/native/autostart_helper.dart';
 import 'package:localsend_app/util/native/context_menu_helper.dart';
 import 'package:localsend_app/util/ui/dynamic_colors.dart';
 import 'package:localsend_app/util/ui/snackbar.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/device_info_result.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/pages/tabs/settings_tab_vm.dart

@@ -1,9 +1,9 @@
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/device_info_result.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/model/state/server/server_state.dart';
 import 'package:localsend_app/model/state/settings_state.dart';
+import 'package:localsend_isolates/model/device_info_result.dart';
 
 part 'settings_tab_vm.mapper.dart';
 

app/lib/pages/web_send_page.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
 import 'package:localsend_app/provider/network/server/server_provider.dart';
@@ -14,6 +13,7 @@ import 'package:localsend_app/widget/dialogs/pin_dialog.dart';
 import 'package:localsend_app/widget/dialogs/qr_dialog.dart';
 import 'package:localsend_app/widget/dialogs/zoom_dialog.dart';
 import 'package:localsend_app/widget/responsive_list_view.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/provider/device_info_provider.dart

@@ -1,12 +1,12 @@
 import 'package:collection/collection.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/device_info_result.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
 import 'package:localsend_app/provider/network/server/server_provider.dart';
 import 'package:localsend_app/provider/security_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/device_info_result.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 final deviceRawInfoProvider = Provider<DeviceInfoResult>((ref) {

app/lib/provider/http_provider.dart

@@ -1,5 +1,5 @@
 import 'package:localsend_app/provider/security_provider.dart';
-import 'package:localsend_app/rust/api/http.dart';
+import 'package:localsend_isolates/rust/api/http.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 class HttpClientCollection {

app/lib/provider/last_devices.provider.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 /// This provider stores the last devices that the user sent a file to.

app/lib/provider/local_ip_provider.dart

@@ -3,10 +3,10 @@ import 'dart:async';
 import 'package:collection/collection.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/foundation.dart';
-import 'package:localsend_app/isolate/util/network_interfaces.dart';
 import 'package:localsend_app/model/state/network_state.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/util/native/platform_check.dart';
+import 'package:localsend_isolates/util/network_interfaces.dart';
 import 'package:logging/logging.dart';
 import 'package:network_info_plus/network_info_plus.dart' as plugin;
 import 'package:refena_flutter/refena_flutter.dart';

app/lib/provider/network/nearby_devices_provider.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/model/state/nearby_devices_state.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/logging/discovery_logs_provider.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 /// This provider is responsible for:

app/lib/provider/network/scan_facade.dart

@@ -1,12 +1,12 @@
 import 'dart:async';
 
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/pages/home_page.dart';
 import 'package:localsend_app/pages/home_page_controller.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
 import 'package:localsend_app/provider/network/nearby_devices_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 /// Scans the network via multicast first,

app/lib/provider/network/send_provider.dart

@@ -2,13 +2,6 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/file_status.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/model/send_mode.dart';
 import 'package:localsend_app/model/state/send/send_session_state.dart';
@@ -21,10 +14,17 @@ import 'package:localsend_app/provider/http_provider.dart';
 import 'package:localsend_app/provider/progress_provider.dart';
 import 'package:localsend_app/provider/selection/selected_sending_files_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
-import 'package:localsend_app/rust/api/http.dart' as rust_http;
-import 'package:localsend_app/rust/api/model.dart' as rust_model;
-import 'package:localsend_app/util/rust.dart';
 import 'package:localsend_app/widget/dialogs/pin_dialog.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/file_status.dart';
+import 'package:localsend_isolates/model/file_type.dart';
+import 'package:localsend_isolates/model/session_status.dart';
+import 'package:localsend_isolates/rust/api/http.dart' as rust_http;
+import 'package:localsend_isolates/rust/api/model.dart' as rust_model;
+import 'package:localsend_isolates/util/rust.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:logging/logging.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';

app/lib/provider/network/server/controller/receive_controller.dart

@@ -6,17 +6,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/api_route_builder.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/dto/info_dto.dart';
-import 'package:localsend_app/isolate/model/dto/info_register_dto.dart';
-import 'package:localsend_app/isolate/model/dto/prepare_upload_request_dto.dart';
-import 'package:localsend_app/isolate/model/dto/prepare_upload_response_dto.dart';
-import 'package:localsend_app/isolate/model/dto/register_dto.dart';
-import 'package:localsend_app/isolate/model/file_status.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/model/state/send/send_session_state.dart';
 import 'package:localsend_app/model/state/server/receive_session_state.dart';
 import 'package:localsend_app/model/state/server/receiving_file.dart';
@@ -42,9 +31,20 @@ import 'package:localsend_app/util/native/directories.dart';
 import 'package:localsend_app/util/native/file_saver.dart';
 import 'package:localsend_app/util/native/platform_check.dart';
 import 'package:localsend_app/util/native/tray_helper.dart';
-import 'package:localsend_app/util/rust.dart';
 import 'package:localsend_app/util/simple_server.dart';
 import 'package:localsend_app/widget/dialogs/open_file_dialog.dart';
+import 'package:localsend_isolates/api_route_builder.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/dto/info_dto.dart';
+import 'package:localsend_isolates/model/dto/info_register_dto.dart';
+import 'package:localsend_isolates/model/dto/prepare_upload_request_dto.dart';
+import 'package:localsend_isolates/model/dto/prepare_upload_response_dto.dart';
+import 'package:localsend_isolates/model/dto/register_dto.dart';
+import 'package:localsend_isolates/model/file_status.dart';
+import 'package:localsend_isolates/model/file_type.dart';
+import 'package:localsend_isolates/model/session_status.dart';
+import 'package:localsend_isolates/util/rust.dart';
 import 'package:logging/logging.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:refena_flutter/refena_flutter.dart';

app/lib/provider/network/server/controller/send_controller.dart

@@ -4,13 +4,6 @@ import 'dart:io';
 
 import 'package:localsend_app/gen/assets.gen.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/api_route_builder.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/dto/info_dto.dart';
-import 'package:localsend_app/isolate/model/dto/receive_request_response_dto.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
-import 'package:localsend_app/isolate/util/stream.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/model/state/send/web/web_send_file.dart';
 import 'package:localsend_app/model/state/send/web/web_send_session.dart';
@@ -20,6 +13,13 @@ import 'package:localsend_app/provider/network/server/controller/common.dart';
 import 'package:localsend_app/provider/network/server/server_utils.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/util/simple_server.dart';
+import 'package:localsend_isolates/api_route_builder.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/dto/info_dto.dart';
+import 'package:localsend_isolates/model/dto/receive_request_response_dto.dart';
+import 'package:localsend_isolates/model/file_type.dart';
+import 'package:localsend_isolates/util/stream.dart';
 import 'package:uri_content/uri_content.dart';
 import 'package:uuid/uuid.dart';
 

app/lib/provider/network/server/server_provider.dart

@@ -1,9 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/dto/multicast_dto.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/model/state/server/server_state.dart';
 import 'package:localsend_app/provider/network/server/controller/receive_controller.dart';
@@ -13,6 +10,9 @@ import 'package:localsend_app/provider/security_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
 import 'package:localsend_app/util/alias_generator.dart';
 import 'package:localsend_app/util/simple_server.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/dto/multicast_dto.dart';
 import 'package:logging/logging.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 

app/lib/provider/network/webrtc/signaling_provider.dart

@@ -2,8 +2,6 @@ import 'dart:async';
 
 import 'package:dart_mappable/dart_mappable.dart';
 import 'package:flutter/foundation.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/network/nearby_devices_provider.dart';
@@ -11,9 +9,11 @@ import 'package:localsend_app/provider/network/webrtc/webrtc_receiver.dart';
 import 'package:localsend_app/provider/persistence_provider.dart';
 import 'package:localsend_app/provider/security_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
-import 'package:localsend_app/rust/api/crypto.dart' as crypto;
-import 'package:localsend_app/rust/api/model.dart' as rust;
-import 'package:localsend_app/rust/api/webrtc.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/rust/api/crypto.dart' as crypto;
+import 'package:localsend_isolates/rust/api/model.dart' as rust;
+import 'package:localsend_isolates/rust/api/webrtc.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 part 'signaling_provider.mapper.dart';

app/lib/provider/network/webrtc/webrtc_receiver.dart

@@ -1,14 +1,14 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart' as dart_model;
-import 'package:localsend_app/isolate/model/session_status.dart';
-import 'package:localsend_app/isolate/model/stored_security_context.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/model/state/server/receive_session_state.dart';
 import 'package:localsend_app/model/state/settings_state.dart';
 import 'package:localsend_app/pages/receive_page.dart';
 import 'package:localsend_app/provider/network/webrtc/signaling_provider.dart';
-import 'package:localsend_app/rust/api/model.dart';
-import 'package:localsend_app/rust/api/webrtc.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart' as dart_model;
+import 'package:localsend_isolates/model/session_status.dart';
+import 'package:localsend_isolates/model/stored_security_context.dart';
+import 'package:localsend_isolates/rust/api/model.dart';
+import 'package:localsend_isolates/rust/api/webrtc.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/provider/persistence_provider.dart

@@ -5,9 +5,6 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/stored_security_context.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/model/persistence/receive_history_entry.dart';
@@ -21,6 +18,9 @@ import 'package:localsend_app/util/security_helper.dart';
 import 'package:localsend_app/util/shared_preferences/shared_preferences_file.dart';
 import 'package:localsend_app/util/shared_preferences/shared_preferences_portable.dart';
 import 'package:localsend_app/util/ui/animations_status.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/stored_security_context.dart';
 import 'package:logging/logging.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';

app/lib/provider/receive_history_provider.dart

@@ -1,6 +1,6 @@
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/model/persistence/receive_history_entry.dart';
 import 'package:localsend_app/provider/persistence_provider.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 const _maxHistoryEntries = 30;

app/lib/provider/security_provider.dart

@@ -1,7 +1,7 @@
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/stored_security_context.dart';
 import 'package:localsend_app/provider/persistence_provider.dart';
 import 'package:localsend_app/util/security_helper.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/stored_security_context.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 /// This provider manages the [StoredSecurityContext].

app/lib/provider/selection/selected_receiving_files_provider.dart

@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
 import 'package:localsend_app/util/file_path_helper.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:uuid/uuid.dart';
 

app/lib/provider/selection/selected_sending_files_provider.dart

@@ -2,7 +2,6 @@ import 'dart:convert' show jsonDecode, utf8;
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/util/file_path_helper.dart';
 import 'package:localsend_app/util/native/cache_helper.dart';
@@ -10,6 +9,7 @@ import 'package:localsend_app/util/native/channel/android_channel.dart' as andro
 import 'package:localsend_app/util/native/content_uri_helper.dart';
 import 'package:localsend_app/util/native/cross_file_converters.dart';
 import 'package:localsend_app/util/send_ignore.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:refena_flutter/refena_flutter.dart';

app/lib/provider/settings_provider.dart

@@ -1,12 +1,12 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/isolate.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/color_mode.dart';
 import 'package:localsend_app/model/send_mode.dart';
 import 'package:localsend_app/model/state/settings_state.dart';
 import 'package:localsend_app/provider/persistence_provider.dart';
+import 'package:localsend_isolates/isolate.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 final _listEq = const ListEquality().equals;

app/lib/util/device_type_ext.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 extension DeviceTypeExt on DeviceType {
   IconData get icon {

app/lib/util/favorites.dart

@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 extension FavoriteDevicesExt on Iterable<FavoriteDevice> {
   /// Returns the favorite device with the given [device] or null if not found.

app/lib/util/file_path_helper.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 
 /// Matches myFile (123) -> "myFile", " (123)"
 final _fileNumberRegex = RegExp(r'^(.*)(?:(\s\(\d+\)))$');

app/lib/util/file_type_ext.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 
 extension FileTypeExt on FileType {
   IconData get icon {

app/lib/util/native/cache_helper.dart

@@ -5,9 +5,9 @@ import 'dart:isolate';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/services.dart';
-import 'package:localsend_app/isolate/util/logger.dart';
 import 'package:localsend_app/util/file_path_helper.dart';
 import 'package:localsend_app/util/native/platform_check.dart';
+import 'package:localsend_isolates/util/logger.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path_provider_foundation/path_provider_foundation.dart';

app/lib/util/native/channel/android_channel.dart

@@ -44,20 +44,6 @@ Future<bool> getSystemAnimationsStatusAndroid() async {
   return await _methodChannel.invokeMethod('isAnimationsEnabled') ?? true;
 }
 
-/// Opens [uri] for reading and returns an owned Linux file descriptor.
-///
-/// The descriptor stays open after this call and must be closed by the native
-/// consumer it is passed to.
-Future<int> getFileDescriptorAndroid({required String uri}) async {
-  final fileDescriptor = await _methodChannel.invokeMethod<int>('getFileDescriptor', {
-    'uri': uri,
-  });
-  if (fileDescriptor == null) {
-    throw StateError('Android returned no file descriptor for $uri');
-  }
-  return fileDescriptor;
-}
-
 Future<void> createDirectory({
   required String documentUri,
   required String directoryName,

app/lib/util/native/cross_file_converters.dart

@@ -3,10 +3,10 @@ import 'dart:io';
 import 'package:device_apps/device_apps.dart';
 import 'package:flutter/foundation.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/util/file_path_helper.dart';
 import 'package:localsend_app/util/native/channel/android_channel.dart' as android_channel;
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:share_handler/share_handler.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 

app/lib/util/native/device_info_helper.dart

@@ -1,7 +1,7 @@
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/device_info_result.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/device_info_result.dart';
 // ignore: implementation_imports
 import 'package:slang/src/builder/model/enums.dart';
 // ignore: implementation_imports

app/lib/util/native/file_picker.dart

@@ -6,8 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/pages/apk_picker_page.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
@@ -23,6 +21,8 @@ import 'package:localsend_app/util/ui/asset_picker_translated_text_delegate.dart
 import 'package:localsend_app/widget/dialogs/loading_dialog.dart';
 import 'package:localsend_app/widget/dialogs/message_input_dialog.dart';
 import 'package:localsend_app/widget/dialogs/no_permission_dialog.dart';
+import 'package:localsend_isolates/model/file_type.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 import 'package:logging/logging.dart';
 import 'package:pasteboard/pasteboard.dart';
 import 'package:permission_handler/permission_handler.dart';

app/lib/util/native/open_file.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/util/native/channel/android_channel.dart' as android_channel;
 import 'package:localsend_app/util/native/platform_check.dart';
 import 'package:localsend_app/widget/dialogs/cannot_open_file_dialog.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:open_filex/open_filex.dart';
 import 'package:permission_handler/permission_handler.dart';
 

app/lib/util/native/taskbar_helper.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/session_status.dart';
 import 'package:localsend_app/util/native/macos_channel.dart';
 import 'package:localsend_app/util/native/platform_check.dart';
+import 'package:localsend_isolates/model/session_status.dart';
 import 'package:windows_taskbar/windows_taskbar.dart';
 
 enum TaskbarIcon { regular, error, success }

app/lib/util/security_helper.dart

@@ -3,8 +3,8 @@ import 'dart:typed_data';
 
 import 'package:basic_utils/basic_utils.dart';
 import 'package:convert/convert.dart';
-import 'package:localsend_app/isolate/model/stored_security_context.dart';
-import 'package:localsend_app/rust/api/crypto.dart' as rust;
+import 'package:localsend_isolates/model/stored_security_context.dart';
+import 'package:localsend_isolates/rust/api/crypto.dart' as rust;
 
 /// Generates a random [SecurityContextResult].
 StoredSecurityContext generateSecurityContext([AsymmetricKeyPair? keyPair]) {

app/lib/widget/animated_opacity_cross_fade.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 
 /// The same as AnimatedCrossFade but with an opacity animation
 class AnimatedOpacityCrossFade extends StatefulWidget {

app/lib/widget/animations/initial_fade_transition.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 
 class InitialFadeTransition extends StatefulWidget {
   final Widget child;

app/lib/widget/animations/initial_slide_transition.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 
 class InitialSlideTransition extends StatefulWidget {
   final Widget child;

app/lib/widget/dialogs/address_input_dialog.dart

@@ -5,15 +5,15 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
 import 'package:localsend_app/provider/http_provider.dart';
 import 'package:localsend_app/provider/last_devices.provider.dart';
 import 'package:localsend_app/provider/local_ip_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
-import 'package:localsend_app/rust/api/model.dart';
-import 'package:localsend_app/util/rust.dart';
 import 'package:localsend_app/widget/dialogs/error_dialog.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/rust/api/model.dart';
+import 'package:localsend_isolates/util/rust.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/widget/dialogs/favorite_dialog.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/http_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
-import 'package:localsend_app/rust/api/model.dart';
-import 'package:localsend_app/util/rust.dart';
 import 'package:localsend_app/widget/dialogs/error_dialog.dart';
 import 'package:localsend_app/widget/dialogs/favorite_edit_dialog.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/rust/api/model.dart';
+import 'package:localsend_isolates/util/rust.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/widget/dialogs/favorite_edit_dialog.dart

@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:localsend_app/config/theme.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/model/persistence/favorite_device.dart';
 import 'package:localsend_app/provider/device_info_provider.dart';
 import 'package:localsend_app/provider/favorites_provider.dart';
 import 'package:localsend_app/provider/http_provider.dart';
 import 'package:localsend_app/provider/settings_provider.dart';
-import 'package:localsend_app/rust/api/model.dart';
-import 'package:localsend_app/util/rust.dart';
 import 'package:localsend_app/widget/dialogs/error_dialog.dart';
 import 'package:localsend_app/widget/dialogs/favorite_delete_dialog.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/rust/api/model.dart';
+import 'package:localsend_isolates/util/rust.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:routerino/routerino.dart';
 

app/lib/widget/dialogs/open_file_dialog.dart

@@ -4,10 +4,10 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:localsend_app/gen/strings.g.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/util/native/channel/android_channel.dart' as android_channel;
 import 'package:localsend_app/util/native/open_file.dart';
 import 'package:localsend_app/util/native/open_folder.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:path/path.dart' as path;
 import 'package:routerino/routerino.dart';
 

app/lib/widget/file_thumbnail.dart

@@ -3,9 +3,9 @@ import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/model/cross_file.dart';
 import 'package:localsend_app/util/file_type_ext.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:uri_content/uri_content.dart';
 import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 

app/lib/widget/list_tile/device_list_tile.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/util/device_type_ext.dart';
 import 'package:localsend_app/widget/custom_progress_bar.dart';
 import 'package:localsend_app/widget/device_bage.dart';
 import 'package:localsend_app/widget/list_tile/custom_list_tile.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 class DeviceListTile extends StatelessWidget {
   final Device device;

app/lib/widget/list_tile/device_placeholder_list_tile.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/provider/animation_provider.dart';
 import 'package:localsend_app/util/device_type_ext.dart';
 import 'package:localsend_app/widget/device_bage.dart';
 import 'package:localsend_app/widget/list_tile/custom_list_tile.dart';
 import 'package:localsend_app/widget/opacity_slideshow.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 
 class DevicePlaceholderListTile extends StatelessWidget {

app/lib/widget/opacity_slideshow.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 
 /// A slideshow of widgets using [AnimatedOpacity] as transition.
 class OpacitySlideshow extends StatefulWidget {

app/lib/widget/rotating_widget.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:localsend_app/isolate/util/sleep.dart';
+import 'package:localsend_isolates/util/sleep.dart';
 
 class RotatingWidget extends StatefulWidget {
   final Duration duration;

app/pubspec.lock

@@ -565,7 +565,7 @@ packages:
     source: hosted
     version: "2.0.35"
   flutter_rust_bridge:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: flutter_rust_bridge
       sha256: e87d6b9ee934dcd24a128ccb2bd91905d2d5fe5c06245d6a8f5477d4907a437a
@@ -910,6 +910,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  localsend_isolates:
+    dependency: "direct main"
+    description:
+      path: "../packages/localsend_isolates"
+      relative: true
+    source: path
+    version: "0.0.1"
   logging:
     dependency: "direct main"
     description:
@@ -1401,9 +1408,9 @@ packages:
     source: hosted
     version: "0.8.1"
   rust_lib_localsend_app:
-    dependency: "direct main"
+    dependency: transitive
     description:
-      path: rust_builder
+      path: "../packages/localsend_isolates/rust_builder"
       relative: true
     source: path
     version: "0.0.1"
@@ -1757,7 +1764,7 @@ packages:
     source: hosted
     version: "1.4.0"
   typed_isolates:
-    dependency: "direct main"
+    dependency: transitive
     description:
       path: "../packages/typed_isolates"
       relative: true

app/pubspec.yaml

@@ -28,7 +28,6 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_markdown: 0.7.7+1
-  flutter_rust_bridge: 2.12.0
   freezed_annotation: 3.1.0
   gal: 2.3.2
   glob: 2.1.3
@@ -38,6 +37,8 @@ dependencies:
   intl: ^0.20.2 # allow newer versions, so it can compile with newer Flutter versions
   legalize: 1.2.2
   local_hero: 0.3.0
+  localsend_isolates:
+    path: ../packages/localsend_isolates
   logging: 1.3.0
   # https://github.com/NightFeather0615/macos_dock_progress/issues/1
   # macos_dock_progress: 1.1.0
@@ -57,8 +58,6 @@ dependencies:
   refena_flutter: 3.2.1
   refena_inspector_client: 2.1.1
   routerino: 0.8.1
-  rust_lib_localsend_app:
-    path: rust_builder
   saf_stream: 2.0.0
   screen_retriever: 0.2.2
   share_handler: 0.0.22
@@ -68,8 +67,6 @@ dependencies:
   slang_flutter: 4.18.0
   system_settings_2: 3.0.2
   tray_manager: 0.5.3
-  typed_isolates:
-    path: ../packages/typed_isolates
   uri_content: 3.1.1
   url_launcher: 6.3.2
   uuid: 4.5.3

app/test/mocks.mocks.dart

@@ -7,8 +7,8 @@ import 'dart:async' as _i4;
 
 import 'package:flutter/material.dart' as _i8;
 import 'package:localsend_app/gen/strings.g.dart' as _i10;
-import 'package:localsend_app/isolate/model/device.dart' as _i12;
-import 'package:localsend_app/isolate/model/stored_security_context.dart' as _i2;
+import 'package:localsend_isolates/model/device.dart' as _i12;
+import 'package:localsend_isolates/model/stored_security_context.dart' as _i2;
 import 'package:localsend_app/model/persistence/color_mode.dart' as _i9;
 import 'package:localsend_app/model/persistence/favorite_device.dart' as _i6;
 import 'package:localsend_app/model/persistence/receive_history_entry.dart' as _i5;

app/test/unit/model/device_test.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:test/test.dart';
 
 void main() {

app/test/unit/model/dto/prepare_upload_request_dto_test.dart

@@ -1,11 +1,11 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/dto/info_register_dto.dart';
-import 'package:localsend_app/isolate/model/dto/multicast_dto.dart';
-import 'package:localsend_app/isolate/model/dto/prepare_upload_request_dto.dart';
-import 'package:localsend_app/isolate/model/dto/prepare_upload_response_dto.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/dto/info_register_dto.dart';
+import 'package:localsend_isolates/model/dto/multicast_dto.dart';
+import 'package:localsend_isolates/model/dto/prepare_upload_request_dto.dart';
+import 'package:localsend_isolates/model/dto/prepare_upload_response_dto.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:test/test.dart';
 
 void main() {

app/test/unit/provider/last_devices_provider_test.dart

@@ -1,5 +1,5 @@
-import 'package:localsend_app/isolate/model/device.dart';
 import 'package:localsend_app/provider/last_devices.provider.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:test/test.dart';
 

app/test/unit/provider/receive_history_provider_test.dart

@@ -1,7 +1,7 @@
 import 'package:intl/date_symbol_data_local.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
 import 'package:localsend_app/model/persistence/receive_history_entry.dart';
 import 'package:localsend_app/provider/receive_history_provider.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:mockito/mockito.dart';
 import 'package:refena_flutter/refena_flutter.dart';
 import 'package:test/test.dart';

app/test/unit/util/api_route_builder_test.dart

@@ -1,5 +1,5 @@
-import 'package:localsend_app/isolate/api_route_builder.dart';
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/api_route_builder.dart';
+import 'package:localsend_isolates/model/device.dart';
 import 'package:test/test.dart';
 
 void main() {

app/test/unit/util/network_interfaces_test.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/util/network_interfaces.dart';
+import 'package:localsend_isolates/util/network_interfaces.dart';
 import 'package:test/test.dart';
 
 void main() {

app/test/unit/util/task_runner_test.dart

@@ -1,5 +1,5 @@
-import 'package:localsend_app/isolate/util/sleep.dart';
-import 'package:localsend_app/isolate/util/task_runner.dart';
+import 'package:localsend_isolates/util/sleep.dart';
+import 'package:localsend_isolates/util/task_runner.dart';
 import 'package:test/test.dart';
 
 void main() {

packages/localsend_isolates/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies

packages/localsend_isolates/analysis_options.yaml

@@ -0,0 +1,21 @@
+include: package:flutter_lints/flutter.yaml
+
+analyzer:
+  exclude:
+    - lib/**.g.dart
+    - lib/**.freezed.dart
+
+formatter:
+  trailing_commas: preserve
+  page_width: 150
+
+linter:
+  rules:
+    use_key_in_widget_constructors: false
+
+    prefer_single_quotes: true
+    sort_pub_dependencies: true
+    always_use_package_imports: true
+    directives_ordering: true
+    unawaited_futures: true
+    discarded_futures: true

packages/localsend_isolates/build.yaml

@@ -0,0 +1,10 @@
+targets:
+  $default:
+    builders:
+      dart_mappable_builder:
+        options:
+          renameMethods:
+            fromJson: deserialize
+            toJson: serialize
+            fromMap: fromJson
+            toMap: toJson

packages/localsend_isolates/lib/api_route_builder.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 const _basePath = '/api/localsend';
 

packages/localsend_isolates/lib/isolate.dart

@@ -0,0 +1,20 @@
+export 'package:localsend_isolates/src/isolate/child/server_isolate.dart'
+    show
+        HttpServerEvent,
+        HttpServerFileUploadEvent,
+        HttpServerFileUploadResultEvent,
+        HttpServerPrepareUploadEvent,
+        HttpServerRegisterEvent,
+        HttpServerSessionEndEvent;
+export 'package:localsend_isolates/src/isolate/child/sync_provider.dart';
+export 'package:localsend_isolates/src/isolate/child/upload_isolate.dart'
+    show
+        HttpUploadEvent,
+        HttpUploadFile,
+        HttpUploadFileFailedEvent,
+        HttpUploadFileFinishedEvent,
+        HttpUploadFileProgressEvent,
+        HttpUploadFileStartedEvent;
+export 'package:localsend_isolates/src/isolate/parent/actions.dart';
+export 'package:localsend_isolates/src/isolate/parent/actions_sync.dart';
+export 'package:localsend_isolates/src/isolate/parent/parent_isolate_provider.dart';

packages/localsend_isolates/lib/model/device_info_result.dart

@@ -1,4 +1,4 @@
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 class DeviceInfoResult {
   final DeviceType deviceType;

packages/localsend_isolates/lib/model/dto/file_dto.dart

@@ -1,6 +1,6 @@
 import 'package:collection/collection.dart';
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/file_type.dart';
+import 'package:localsend_isolates/model/file_type.dart';
 import 'package:mime/mime.dart';
 
 part 'file_dto.mapper.dart';

packages/localsend_isolates/lib/model/dto/info_dto.dart

@@ -1,6 +1,6 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 part 'info_dto.mapper.dart';
 

packages/localsend_isolates/lib/model/dto/info_register_dto.dart

@@ -1,7 +1,7 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
-import 'package:localsend_app/isolate/model/dto/multicast_dto.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
+import 'package:localsend_isolates/model/dto/multicast_dto.dart';
 
 part 'info_register_dto.mapper.dart';
 

packages/localsend_isolates/lib/model/dto/multicast_dto.dart

@@ -1,6 +1,6 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/constants.dart';
-import 'package:localsend_app/isolate/model/device.dart';
+import 'package:localsend_isolates/constants.dart';
+import 'package:localsend_isolates/model/device.dart';
 
 part 'multicast_dto.mapper.dart';
 

packages/localsend_isolates/lib/model/dto/prepare_upload_request_dto.dart

@@ -1,6 +1,6 @@
 import 'package:dart_mappable/dart_mappable.dart';
-import 'package:localsend_app/isolate/model/dto/file_dto.dart';
-import 'package:localsend_app/isolate/model/dto/info_register_dto.dart';
+import 'package:localsend_isolates/model/dto/file_dto.dart';
+import 'package:localsend_isolates/model/dto/info_register_dto.dart';
 
 part 'prepare_upload_request_dto.mapper.dart';