fix(bridge): re-introduce isPackagedElectron flag for java lb

Author: MarkusJx

crates/java-bridge/src/node/helpers/arg_convert.rs

@@ -26,7 +26,7 @@ pub fn call_context_to_java_args<'a>(
     Ok(res)
 }
 
-pub fn call_results_to_args(args: &[JavaCallResult]) -> Vec<JavaArg> {
+pub fn call_results_to_args(args: &'_ [JavaCallResult]) -> Vec<JavaArg<'_>> {
     args.iter()
         .map(|arg| arg.as_arg())
         .collect::<Vec<JavaArg>>()

crates/java-bridge/src/node/java.rs

@@ -38,8 +38,11 @@ pub struct Java {
 impl Java {
     /// Create a new JVM instance.
     /// @param libPath The path to jvm.(dll|so|dylib)
-    /// @param version The JVM version to use.
-    /// @param opts The JVM options to use.
+    /// @param version The JVM version to use
+    /// @param opts The JVM options to use
+    /// @param javaOptions additional options to pass to the jvm
+    /// @param javaLibPath the path to the java library (JavaBridge.jar)
+    /// @param nativeLibPath the path to the native library (java.*.\[dll|so|dylib])
     #[napi(constructor)]
     pub fn new(
         lib_path: Option<String>,

crates/java-bridge/src/node/java_options.rs

@@ -5,7 +5,7 @@
 pub struct JavaOptions {
     /// Additional items to add to the class path. This does allow for wildcard imports
     /// using glob patterns. If a path is unreadable, an error will be thrown.
-    /// This behaviour can be changed by setting `ignore_unreadable_class_path_entries` to true.
+    /// This behavior can be changed by setting `ignore_unreadable_class_path_entries` to true.
     pub classpath: Option<Vec<String>>,
     /// Whether to ignore unreadable class path entries
     pub ignore_unreadable_class_path_entries: Option<bool>,

crates/java-rs/src/java/java_env.rs

@@ -41,7 +41,7 @@ impl<'a> JavaEnv<'a> {
         jni_version_to_string(version)
     }
 
-    pub fn find_class(&self, class_name: &str) -> ResultType<JavaClass> {
+    pub fn find_class(&'_ self, class_name: &str) -> ResultType<JavaClass<'_>> {
         self.0.find_class(class_name, true)
     }
 

crates/java-rs/src/java/java_env_wrapper.rs

@@ -476,7 +476,7 @@ impl<'a> JavaEnvWrapper<'a> {
             .as_ref()
             .ok_or("The jvm was unset".to_string())?
             .lock()
-            .unwrap()
+            .map_err(|_| "Could not lock mutex".to_string())?
             .class_loader()
             .clone()
             .unwrap();
@@ -518,7 +518,7 @@ impl<'a> JavaEnvWrapper<'a> {
             .as_ref()
             .ok_or("The jvm was unset".to_string())?
             .lock()
-            .unwrap()
+            .map_err(|_| "Could not lock mutex".to_string())?
             .class_loader()
             .clone()
             .unwrap();
@@ -1189,10 +1189,10 @@ impl<'a> JavaEnvWrapper<'a> {
     }
 
     pub fn create_object_array(
-        &self,
+        &'_ self,
         class: &'a JavaClass<'a>,
         len: i32,
-    ) -> ResultType<JavaObjectArray> {
+    ) -> ResultType<JavaObjectArray<'_>> {
         let arr = unsafe {
             self.methods.NewObjectArray.unwrap()(self.env, len, class.class(), ptr::null_mut())
         };
@@ -1471,7 +1471,7 @@ impl<'a> JavaEnvWrapper<'a> {
             .as_ref()
             .ok_or("The jvm was unset".to_string())?
             .lock()
-            .unwrap()
+            .map_err(|_| "Could not lock mutex".to_string())?
             .class_loader()
             .as_ref()
             .unwrap()
@@ -1491,7 +1491,7 @@ impl<'a> JavaEnvWrapper<'a> {
             .as_ref()
             .ok_or("The jvm was unset".to_string())?
             .lock()
-            .unwrap()
+            .map_err(|_| "Could not lock mutex".to_string())?
             .set_class_loader(loader);
 
         Ok(())

crates/java-rs/src/java/java_field.rs

@@ -185,7 +185,7 @@ impl<'a> JavaObjectField<'a> {
         Self(field)
     }
 
-    pub fn get(&self, object: &JavaObject<'_>) -> ResultType<Option<JavaObject>> {
+    pub fn get(&'_ self, object: &JavaObject<'_>) -> ResultType<Option<JavaObject<'_>>> {
         self.0.class.env().get_object_field(self, object)
     }
 
@@ -257,7 +257,7 @@ impl<'a> StaticJavaObjectField<'a> {
         Self(field)
     }
 
-    pub fn get(&self) -> ResultType<Option<JavaObject>> {
+    pub fn get(&'_ self) -> ResultType<Option<JavaObject<'_>>> {
         self.0
             .class
             .env()

crates/java-rs/src/java/objects/class.rs

@@ -155,7 +155,7 @@ impl<'a> JavaClass<'a> {
         StaticJavaBooleanMethod::new(method)
     }
 
-    pub fn get_constructor(&self, signature: &str) -> ResultType<JavaConstructor> {
+    pub fn get_constructor(&'_ self, signature: &str) -> ResultType<JavaConstructor<'_>> {
         self.env().get_constructor(self, signature)
     }
 

crates/java-rs/src/java/traits.rs

@@ -33,5 +33,5 @@ pub trait IsInstanceOf {
 }
 
 pub trait GetClass {
-    fn get_class(&self) -> ResultType<JavaClass>;
+    fn get_class(&'_ self) -> ResultType<JavaClass<'_>>;
 }

ts-src/java.ts

@@ -86,12 +86,12 @@ export interface JVMOptions extends JavaOptions {
  * in an altered classpath in your java application/library if your
  * application is using a custom classpath (e.g. Spring Boot).
  *
- * Also, it is not possible to restart the jvm after is has been started
+ * Also, it is not possible to restart the jvm after it has been started
  * once, in order to alter the startup classpath. This is due to some
  * limitations with the destructor feature of the node.js native api,
  * which may not call the destructor in time and having two jvm instances
  * in the same application is not allowed by java. Additionally, destroying
- * the jvm instance may cause *undefined behaviour*, which may or may not
+ * the jvm instance may cause *undefined behavior*, which may or may not
  * cause the application to crash. Let's not do that.
  *
  * @param options the options to use when creating the jvm
@@ -104,7 +104,7 @@ export function ensureJvm(options?: JVMOptions): boolean {
             options?.version,
             options?.opts,
             options,
-            getJavaLibPath(),
+            getJavaLibPath(options?.isPackagedElectron ?? false),
             getNativeLibPath(options?.isPackagedElectron ?? false)
         );
 

ts-src/nativeLib.ts

@@ -91,11 +91,15 @@ export function getNativeLibPath(isPackagedElectron: boolean): string {
     }
 }
 
-export function getJavaLibPath(): string {
+export function getJavaLibPath(isPackagedElectron: boolean): string {
     const lib = path.join(__dirname, 'JavaBridge.jar');
 
     if (fs.existsSync(lib) && fs.statSync(lib).isFile()) {
-        return lib;
+        if (isPackagedElectron) {
+            return lib.replace(APP_ASAR_REGEX, APP_ASAR_UNPACKED);
+        } else {
+            return lib;
+        }
     } else {
         throw new Error('JavaBridge.jar not found');
     }