fix: select correct runtime when calling from different threads and improve error message

Author: edusperoni

test-app/runtime/src/main/cpp/ObjectManager.cpp

@@ -105,14 +105,26 @@ JniLocalRef ObjectManager::GetJavaObjectByJsObject(
   JSInstanceInfo* jsInstanceInfo = GetJSInstanceInfo(object);
 
   if (jsInstanceInfo != nullptr) {
+    auto existingJavaObject = GetJavaObjectByID(jsInstanceInfo->JavaObjectID);
+    if (existingJavaObject == nullptr) {
+      Env env;
+      // provide a clearer exception message
+      if (env.ExceptionCheck()) {
+        env.ExceptionClear();
+        auto className = GetClassName(jsInstanceInfo->ObjectClazz);
+        NativeScriptException exception(
+            "Failed to get Java object by ID. id=" +
+            std::to_string(jsInstanceInfo->JavaObjectID) +
+            ", class=" + className);
+        exception.ReThrowToJava();
+      }
+    }
     if (m_useGlobalRefs) {
-      JniLocalRef javaObject(GetJavaObjectByID(jsInstanceInfo->JavaObjectID),
-                             true);
+      JniLocalRef javaObject(existingJavaObject, true);
       return javaObject;
     } else {
       JEnv env;
-      JniLocalRef javaObject(
-          env.NewLocalRef(GetJavaObjectByID(jsInstanceInfo->JavaObjectID)));
+      JniLocalRef javaObject(env.NewLocalRef(existingJavaObject));
       return javaObject;
     }
   }
@@ -173,6 +185,10 @@ jobject ObjectManager::GetJavaObjectByIDImpl(uint32_t javaObjectID) {
   JEnv env;
   jobject object = env.CallObjectMethod(
       m_javaRuntimeObject, GET_JAVAOBJECT_BY_ID_METHOD_ID, javaObjectID);
+  // Leave as null since it's unhandled
+  if (env.ExceptionCheck()) {
+    return nullptr;
+  }
   return object;
 }
 
@@ -541,6 +557,11 @@ jweak ObjectManager::NewWeakGlobalRefCallback(const int& javaObjectID,
                                               void* state) {
   auto objManager = reinterpret_cast<ObjectManager*>(state);
 
+  auto javaObject = objManager->GetJavaObjectByIDImpl(javaObjectID);
+  // failed to get object, return null weak ref
+  if (javaObject == nullptr) {
+    return nullptr;
+  }
   JniLocalRef obj(objManager->GetJavaObjectByIDImpl(javaObjectID));
 
   JEnv env;

test-app/runtime/src/main/java/com/tns/Runtime.java

@@ -1246,7 +1246,8 @@ public static Object callJSMethodWithDelay(Object javaObject, String methodName,
     public static Object callJSMethod(Object javaObject, String methodName, Class<?> retType, boolean isConstructor, long delay, Object... args) throws NativeScriptException {
         Runtime runtime = Runtime.getCurrentRuntime();
 
-        if (runtime == null) {
+        // if we're not in a runtime or the runtime we're in does not have the object, try to find the right one (this might happen if a worker fires a JS method on an object created in the main thread or another worker)
+        if (runtime == null || runtime.getJavaObjectID(javaObject) == null) {
             runtime = getObjectRuntime(javaObject);
         }