feat: Upgrade all dependencies, refactor flutter rust bridge

4o3F · Feb 25, 2024 · bb4423a · bb4423a
1 parent cf14a90
commit bb4423a
Show file tree

Hide file tree

Showing 34 changed files with 1,432 additions and 1,950 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 .idea/
 build/
 .dart_tool/
-rust_builder
+rust_builder
+logs
diff --git a/flutter_rust_bridge.yaml b/flutter_rust_bridge.yaml
@@ -1,2 +1,2 @@
-rust_input: rust/src/api/**/*.rs
-dart_output: lib/src/rust
+rust_input: rust/src/**/api.rs
+dart_output: lib/native
diff --git a/integration_test/simple_test.dart b/integration_test/simple_test.dart
@@ -1,11 +1,10 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:ascent/main.dart';
-import 'package:ascent/src/rust/frb_generated.dart';
+import 'package:ascent/native/frb_generated.dart';
 import 'package:integration_test/integration_test.dart';
 
 void main() {
-  if (kIsWeb) IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
   setUpAll(() async => await RustLib.init());
   testWidgets('Can call rust function', (WidgetTester tester) async {
     await tester.pumpWidget(const MyApp());

diff --git a/lib/ffi.dart b/lib/ffi.dart
diff --git a/lib/foreground/connect.dart b/lib/foreground/connect.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
+import 'dart:isolate';
 
-import 'package:ascent/ffi.dart';
+import 'package:ascent/native/api.dart' as api;
 import 'package:ascent/global_state.dart';
 import 'package:ascent/pages/connect/logic.dart';
 import 'package:bruno/bruno.dart';
@@ -83,8 +84,8 @@ class ConnectTaskHandler extends TaskHandler {
     api
         .doConnect(port: port, dataFolder: GlobalState.dataDir.path)
         .catchError((error) {
-      if (error is FrbAnyhowException) {
-        errorMessage = error.anyhow;
+      if (error is AnyhowException) {
+        errorMessage = error.message;
       } else {
         errorMessage = error.toString();
       }

diff --git a/lib/foreground/pair.dart b/lib/foreground/pair.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:ascent/ffi.dart';
+import 'package:ascent/native/api.dart' as api;
 import 'package:ascent/global_state.dart';
 import 'package:bruno/bruno.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -91,8 +91,8 @@ class PairTaskHandler extends TaskHandler {
     api
         .doPair(port: port, code: code, dataFolder: GlobalState.dataDir.path)
         .catchError((error) {
-      if (error is FrbAnyhowException) {
-        errorMessage = error.anyhow;
+      if (error is AnyhowException) {
+        errorMessage = error.message;
       } else {
         errorMessage = error.toString();
       }

diff --git a/lib/foreground/root_connect.dart b/lib/foreground/root_connect.dart
@@ -1,3 +1,5 @@
+import 'dart:isolate';
+
 import 'package:ascent/global_state.dart';
 import 'package:ascent/pages/connect/logic.dart';
 import 'package:bruno/bruno.dart';