Add flutter_engine_context and flutter_jni_context packages.

.github/workflows/check_and_lint.yml

@@ -10,18 +10,21 @@ jobs:
 
   Flutter:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./core/dart
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v1
         with:
-          channel: 'master'
-      - run: flutter pub get
-      - run: flutter format --output=none --set-exit-if-changed .
-      - run: flutter analyze
-      - run: flutter test
+          channel: "master"
+      - name: Install Melos
+        run: flutter pub global activate melos
+      - name: Melos Boostrap
+        run: melos bootstrap
+      - name: Flutter Format
+        run: melos exec -c 1 flutter format . --output=none --set-exit-if-changed
+      - name: Flutter Analyze
+        run: melos exec -c 1 flutter analyze
+      - name: Futter Test
+        run: melos exec -c 1 flutter test
 
   Rustfmt:
     runs-on: ubuntu-latest
@@ -51,6 +54,9 @@ jobs:
       - name: Install GTK
         if: (matrix.os == 'ubuntu-latest')
         run: sudo apt-get update && sudo apt-get install libgtk-3-dev
+      - name: Update rust
+        if: (matrix.os == 'ubuntu-latest')
+        run: rustup update
       - uses: actions/checkout@v2
       - name: Install clippy
         run: rustup component add clippy

.gitignore

@@ -8,3 +8,9 @@ Cargo.lock
 pubspec.lock
 .flutter-plugins
 .flutter-plugins-dependencies
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug",
+            "program": "${workspaceFolder}/<your program>",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

.vscode/settings.json

@@ -1,9 +1,17 @@
 {
+    // "rust-analyzer.cargo.target": "aarch64-apple-ios",
+    "rust-analyzer.cargo.target": "aarch64-linux-android",
     "rust-analyzer.runnableEnv": {
         "RUST_TEST_THREADS": 1,
     },
-    "rust-analyzer.cargo.allFeatures": false,
+    // "rust-analyzer.checkOnSave.allTargets": false,
+    "rust-analyzer.checkOnSave.command": "clippy",
+    "rust-analyzer.checkOnSave.allTargets": false,
+    // "rust-analyzer.cargo.unsetTest": [
+    //     "nativeshell_core",
+    // ],
     "rust-analyzer.cargo.features": [
-        "mock"
-    ]
-}
+        // "mock"
+    ],
+    "dart.runPubGetOnPubspecChanges": "never"
+}

0001-Fix-panic-in-finalizer.patch

@@ -0,0 +1,35 @@
+From 1505b454ce65d94b5fff83d6be437fd446a1bbfe Mon Sep 17 00:00:00 2001
+From: Matej Knopp <matej.knopp@gmail.com>
+Date: Sun, 17 Jul 2022 23:01:00 +0100
+Subject: [PATCH 1/2] Fix panic in finalizer
+
+---
+ core/rust/src/finalizable_handle.rs | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/core/rust/src/finalizable_handle.rs b/core/rust/src/finalizable_handle.rs
+index 3e796c8..007b471 100644
+--- a/core/rust/src/finalizable_handle.rs
++++ b/core/rust/src/finalizable_handle.rs
+@@ -244,12 +244,12 @@ pub(crate) mod finalizable_handle_native {
+             state.objects.remove(&handle)
+         };
+         if let Some(mut object_state) = object_state {
+-            let mut finalizer = object_state
+-                .finalizer
+-                .take()
+-                .expect("Finalizer executed more than once");
+-            let finalizer = finalizer.take().unwrap();
+-            finalizer();
++            let finalizer = object_state.finalizer.take();
++            // Finalizer may have been removed in FinalizableHandle::drop
++            if let Some(mut finalizer) = finalizer {
++                let finalizer = finalizer.take().unwrap();
++                finalizer();
++            }
+         }
+     }
+
+-- 
+2.32.1 (Apple Git-133)
+

0002-Make-clippy-happy.patch

@@ -0,0 +1,25 @@
+From 1ee31acf95ae38e4b1db99a819ee991970b24d77 Mon Sep 17 00:00:00 2001
+From: Matej Knopp <matej.knopp@gmail.com>
+Date: Sun, 17 Jul 2022 23:05:34 +0100
+Subject: [PATCH 2/2] Make clippy happy
+
+---
+ core/rust/src/platform/darwin/run_loop.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/rust/src/platform/darwin/run_loop.rs b/core/rust/src/platform/darwin/run_loop.rs
+index 93f9c51..a9dcd1d 100644
+--- a/core/rust/src/platform/darwin/run_loop.rs
++++ b/core/rust/src/platform/darwin/run_loop.rs
+@@ -330,7 +330,7 @@ impl PlatformRunLoop {
+             ];
+
+             // To stop event loop immediately, we need to post event.
+-            let () = msg_send![app, postEvent: dummy_event atStart: YES];
++            let _: () = msg_send![app, postEvent: dummy_event atStart: YES];
+         }
+     }
+
+-- 
+2.32.1 (Apple Git-133)
+

Cargo.toml

@@ -1,6 +1,11 @@
 [workspace]
 
 members = [
-    "core/rust",
     "core/rust_derive",
+    "core/rust",
+    "engine_context/rust",
+    "jni_context",
 ]
+
+[patch.crates-io]
+nativeshell_jni_context = { path = "jni_context" }

core/rust/src/message_channel/codec.rs

@@ -154,7 +154,7 @@ impl<'a> Reader<'a> {
         } else {
             let v = &self.buf[self.pos..self.pos + len];
             self.pos += len;
-            String::from_utf8_lossy(v).to_owned().to_string()
+            String::from_utf8_lossy(v).into()
         }
     }
     fn align_to(&mut self, align: usize) {

engine_context/dart/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.0
+
+* Initial release.

engine_context/dart/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2022 Matej Knopp and the contributors
+
+MIT LICENSE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

engine_context/dart/README.md

@@ -0,0 +1,28 @@
+# flutter_engine_context
+
+Flutter plugin that provides access to Flutter engine components (like view or texture registrar) from native code.
+
+## Example
+
+Dart code:
+```dart
+    final handle = await FlutterEngineContext.instance.getEngineHandle();
+    // pass the handle native code (i.e. through FFI).
+    nativeMethod(handle);
+```
+
+Rust code:
+```rust
+    let context = FlutterEngineContext::new();
+    let flutter_view = context.get_flutter_view(handle);
+    let texture_registry = contet.get_texture_registry(handle);
+```
+
+Rust code for Android:
+```rust
+    let context = FlutterEngineContext::new(&jni_env, class_loader);
+    let flutter_view = context.get_flutter_view(handle);
+    let texture_registry = contet.get_texture_registry(handle);
+```
+
+On Android the `FlutterEngineContext` needs to be initialized with JNI environment and class loader used to load Flutter plugin (or application code).

engine_context/dart/analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

engine_context/dart/android/.gitignore

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
+.cxx

engine_context/dart/android/build.gradle

@@ -0,0 +1,35 @@
+group 'dev.nativeshell.flutter_engine_context'
+version '1.0'
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.2.0'
+    }
+}
+
+rootProject.allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 31
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion 16
+    }
+}

engine_context/dart/android/settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'flutter_engine_context'

engine_context/dart/android/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.example.engine_context">
+</manifest>