Fix: armeabi-v7a, x86, x86_64.

Author: burningtnt

src/lib.rs

@@ -20,18 +20,14 @@ macro_rules! logging {
 }
 
 macro_rules! try_jvm {
-    ($env:expr, |$jenv:ident| $codes:block) => {{
-        let mut $jenv = unsafe { JNIEnv::from_raw($env) }.unwrap();
-
+    ($($tokens:tt)*) => {{
         match std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
-            #[allow(unused_variables)]
-            let $jenv = &mut $jenv;
-            $codes
+            $($tokens)*
         })) {
             Ok(val) => val,
             Err(e) => {
-                let _ = $jenv.exception_clear();
-                $jenv.throw(("java/lang/RuntimeException", format!("Terracotta panics: {:?}", e))).unwrap();
+                let _ = jenv.exception_clear();
+                jenv.throw(("java/lang/RuntimeException", format!("Terracotta panics: {:?}", e))).unwrap();
                 unsafe { std::mem::zeroed() }
             }
         }
@@ -43,8 +39,11 @@ use crate::once_cell::OnceCell;
 use chrono::{FixedOffset, TimeZone, Utc};
 use jni::objects::JClass;
 use jni::signature::{Primitive, ReturnType};
-use jni::sys::{jclass, jlong, jshort, jsize, jstring, jvalue, JavaVM};
-use jni::{objects::JString, sys::{jboolean, jint, JNI_FALSE, JNI_TRUE}, JNIEnv};
+use jni::{
+    objects::JString,
+    sys::{jclass, jlong, jshort, jsize, jstring, jvalue, jboolean, jint, JNI_FALSE, JNI_TRUE},
+    JNIEnv, JavaVM
+};
 use libc::{c_char, c_int};
 use std::fs::File;
 use std::io::Write;
@@ -55,6 +54,8 @@ use std::time::Duration;
 use std::{
     env, ffi::CString, net::{IpAddr, Ipv4Addr, Ipv6Addr}, sync::{Arc, Mutex}, thread,
 };
+use std::ffi::c_void;
+use jni::sys::JNI_VERSION_1_8;
 
 pub mod controller;
 mod easytier;
@@ -65,8 +66,6 @@ mod mc;
 mod ports;
 mod once_cell;
 
-type JNIRawEnv = *mut jni::sys::JNIEnv;
-
 lazy_static::lazy_static! {
     static ref ADDRESSES: Vec<IpAddr> = {
         let mut addresses: Vec<IpAddr> = vec![];
@@ -103,17 +102,23 @@ static MACHINE_ID_FILE: OnceCell<std::path::PathBuf> = OnceCell::new();
 static LOGGING_FD: Mutex<Option<std::fs::File>> = Mutex::new(None);
 static VPN_SERVICE_CFG: Mutex<Option<crate::easytier::EasyTierTunRequest>> = Mutex::new(None);
 
-// FIXME: Third-party crate 'jni-sys' leaves a dynamic link to JNI_GetCreatedJavaVMs,
-// which doesn't exist on Android, so A dummy JNI_GetCreatedJavaVMs is declared as a workaround.
+// FIXME: Third-party crate 'jni-sys' leaves a dynamic link to JNI_GetCreatedJavaVMs which doesn't exist on Android.
+//        A dummy JNI_GetCreatedJavaVMs is declared as a workaround to prevent fatal errors while linking.
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn JNI_GetCreatedJavaVMs(_: *mut *mut JavaVM, _: jsize, _: *mut jsize) -> jint {
+extern "system" fn JNI_GetCreatedJavaVMs(_: *mut c_void, _: jsize, _: *mut c_void) -> jint {
     unreachable!();
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_start0(env: JNIRawEnv, clazz: jclass, dir: jstring, logging_fd: jint) -> jint {
+extern "system" fn JNI_OnLoad(vm: JavaVM, _: *mut c_void) -> jint {
+    JNI_VERSION_1_8
+}
+
+#[unsafe(no_mangle)]
+#[allow(non_snake_case)]
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_start0(jenv: &JNIEnv, clazz: jclass, dir: jstring, logging_fd: jint) -> jint {
     std::panic::set_backtrace_style(std::panic::BacktraceStyle::Full);
     std::panic::update_hook(|prev, info| {
         let data = Arc::new(Mutex::new(Vec::<u8>::new()));
@@ -143,7 +148,6 @@ extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_start0(en
         env!("CARGO_CFG_TARGET_ENV"),
     );
 
-    let jenv = unsafe { JNIEnv::from_raw(env) }.unwrap();
     let jvm = jenv.get_java_vm().unwrap();
     let clazz = jenv.new_global_ref(unsafe { JClass::from_raw(clazz) }).unwrap();
 
@@ -226,34 +230,34 @@ fn logging_android(line: String) {
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_getState0(env: JNIRawEnv, _: jclass) -> jstring {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_getState0(jenv: &JNIEnv, _: jclass) -> jstring {
+    try_jvm! {
         jenv.new_string(serde_json::to_string(&controller::get_state()).unwrap()).unwrap().into_raw()
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setWaiting0(env: JNIRawEnv, _: jclass) {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setWaiting0(jenv: &JNIEnv, _: jclass) {
+    try_jvm! {
         controller::set_waiting()
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setScanning0(env: JNIRawEnv, _: jclass, room: jstring, player: jstring) {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setScanning0(jenv: &JNIEnv, _: jclass, room: jstring, player: jstring) {
+    try_jvm! {
         let room = parse_jstring(jenv, room);
         let player = parse_jstring(jenv, player);
         controller::set_scanning(room, player);
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setGuesting0(env: JNIRawEnv, _: jclass, room: jstring, player: jstring) -> jboolean {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setGuesting0(jenv: &JNIEnv, _: jclass, room: jstring, player: jstring) -> jboolean {
+    try_jvm! {
         let room = parse_jstring(jenv, room).expect("'room' must not be NULL.");
         let player = parse_jstring(jenv, player);
 
@@ -262,13 +266,13 @@ extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_setGuesti
         } else {
             JNI_FALSE
         }
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_verifyRoomCode0(env: JNIRawEnv, _: jclass, room: jstring) -> jint {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_verifyRoomCode0(jenv: &JNIEnv, _: jclass, room: jstring) -> jint {
+    try_jvm! {
         let room = parse_jstring(jenv, room).expect("'room' must not be NULL.");
 
         match Room::from(&room) {
@@ -279,23 +283,23 @@ extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_verifyRoo
             },
             None => -1
         }
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_getMetadata0(env: JNIRawEnv, _: jclass) -> jstring {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_getMetadata0(jenv: &JNIEnv, _: jclass) -> jstring {
+    try_jvm! {
         jenv.new_string(format!(
             "{}\0{}\0{}", env!("TERRACOTTA_VERSION"), timestamp::compile_time!() as i64, env!("TERRACOTTA_ET_VERSION")
         )).unwrap().into_raw()
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_prepareExportLogs0(env: JNIRawEnv, _: jclass) -> jlong {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_prepareExportLogs0(jenv: &JNIEnv, _: jclass) -> jlong {
+    try_jvm! {
         let mut logging = LOGGING_FD.lock().unwrap();
 
         if let Some(file) = logging.as_mut() {
@@ -305,33 +309,33 @@ extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_prepareEx
         } else {
             0
         }
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_finishExportLogs0(env: JNIRawEnv, _: jclass, ptr: jlong) {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_finishExportLogs0(jenv: &JNIEnv, _: jclass, ptr: jlong) {
+    try_jvm! {
         unsafe {
             let _ = Box::from_raw(ptr as *mut MutexGuard<Option<File>>);
         }
-    })
+    }
 }
 
 #[unsafe(no_mangle)]
 #[allow(non_snake_case)]
-extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_panic0(env: JNIRawEnv, _: jclass) {
-    try_jvm!(env, |jenv| {
+extern "system" fn Java_net_burningtnt_terracotta_TerracottaAndroidAPI_panic0(jenv: &JNIEnv, _: jclass) {
+    try_jvm! {
         panic!("User triggered panic manually.");
-    })
+    }
 }
 
 pub(crate) fn on_vpnservice_change(request: crate::easytier::EasyTierTunRequest) {
     let mut guard = VPN_SERVICE_CFG.lock().unwrap();
     *guard = Some(request);
 }
 
-fn parse_jstring(env: &JNIEnv<'static>, value: jstring) -> Option<String> {
+fn parse_jstring(env: &JNIEnv, value: jstring) -> Option<String> {
     if value.is_null() {
         None
     } else {