refactor: call back refactor

Author: hui19

dart_native/android/src/main/java/com/dartnative/dart_native/CallbackInvocationHandler.java

@@ -12,27 +12,33 @@
 public class CallbackInvocationHandler implements InvocationHandler {
     private static final String TAG = "CallbackHandler";
 
-    private static HashMap<Class<?>, String> sTypeConvert = new HashMap<Class<?>, String>() {{
-        put(int.class, "I");
-        put(float.class, "F");
-        put(double.class, "D");
-        put(boolean.class, "Z");
-        put(String.class, "Ljava/lang/String;");
+    private static final HashMap<String, String> sBasicTypeConvert = new HashMap<String, String>() {{
+        put("int", "java.lang.Integer");
+        put("float", "java.lang.Float");
+        put("double", "java.lang.Double");
+        put("boolean", "java.lang.Boolean");
+        put("byte", "java.lang.Byte");
+        put("short", "java.lang.Short");
+        put("long", "java.lang.Long");
+        put("char", "java.lang.Character");
     }};
 
     @Override
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         Log.d(TAG, "invoke method: " + method.getName());
-        Class<?>[] paramTypes = method.getParameterTypes();
-        String[] params = new String[paramTypes.length];
-        for (int i = 0; i < paramTypes.length; i++) {
-            params[i] = sTypeConvert.get(paramTypes[i]);
+        int argumentLength = args == null ? 0 : args.length;
+        String[] paramsType = new String[argumentLength];
+        for (int i = 0; i < argumentLength; i++) {
+            paramsType[i] = args[i] != null ? args[i].getClass().getName() : null;
         }
+
         String funName = method.getName();
-        String returnType = sTypeConvert.get(method.getReturnType());
-        long dartObjectAddr = CallbackManager.getInstance().getRegisterDartAddr(proxy);
-        return hookCallback(dartObjectAddr, funName, paramTypes.length, params, args, returnType);
+        String returnType = method.getReturnType().getName();
+        returnType = sBasicTypeConvert.get(returnType) == null ? returnType : sBasicTypeConvert.get(returnType);
+        long dartObjectAddress = CallbackManager.getInstance().getRegisterDartAddr(proxy);
+
+        return hookCallback(dartObjectAddress, funName, argumentLength, paramsType, args, returnType);
     }
 
-    static native Object hookCallback(long dartObjectAddr, String funName, int argCount, String[] argTypes, Object[] args, String returnType);
+    static native Object hookCallback(long dartObjectAddress, String funName, int argCount, String[] argTypes, Object[] args, String returnType);
 }

dart_native/android/src/main/jni/dart_native.cpp

@@ -3,6 +3,7 @@
 #include <string>
 #include <regex>
 #include <dart_api_dl.h>
+#include <semaphore.h>
 #include "dn_type_convert.h"
 #include "dn_log.h"
 #include "dn_method_call.h"
@@ -13,10 +14,10 @@ extern "C"
 {
 
   static JavaVM *gJvm = nullptr;
-  /// todo release
   static jobject gClassLoader;
   static jmethodID gFindClassMethod;
   static pthread_key_t detachKey = 0;
+
   /// for invoke result compare
   static jclass gStrCls;
 
@@ -88,11 +89,6 @@ extern "C"
     return JNI_VERSION_1_6;
   }
 
-  JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
-  {
-      DNDebug("JNI_OnUnload");
-  }
-
   jclass _findClass(JNIEnv *env, const char *name)
   {
     jclass nativeClass = nullptr;
@@ -207,7 +203,7 @@ extern "C"
           {
             /// mark the last pointer as string
             /// dart will check this pointer
-            dataTypes[argumentCount] = (char *) "java/lang/String";
+            dataTypes[argumentCount] = (char *) "java.lang.String";
             nativeInvokeResult = convertToDartUtf16(env, (jstring)obj);
           }
           else
@@ -327,4 +323,118 @@ extern "C"
     work();
     delete work_ptr;
   }
+
+  /// notify dart run callback function
+  bool NotifyDart(Dart_Port send_port, const Work *work)
+  {
+    const auto work_addr = reinterpret_cast<intptr_t>(work);
+
+    Dart_CObject dart_object;
+    dart_object.type = Dart_CObject_kInt64;
+    dart_object.value.as_int64 = work_addr;
+
+    const bool result = Dart_PostCObject_DL(send_port, &dart_object);
+    if (!result)
+    {
+      DNDebug("Native callback to Dart failed! Invalid port or isolate died");
+    }
+    return result;
+  }
+
+  JNIEXPORT jobject JNICALL Java_com_dartnative_dart_1native_CallbackInvocationHandler_hookCallback(JNIEnv *env,
+                                                                                                    jclass clazz,
+                                                                                                    jlong dartObjectAddress,
+                                                                                                    jstring functionName,
+                                                                                                    jint argumentCount,
+                                                                                                    jobjectArray argumentTypes,
+                                                                                                    jobjectArray argumentsArray,
+                                                                                                    jstring returnTypeStr)
+  {
+    Dart_Port port = getCallbackDartPort(dartObjectAddress);
+    if (port == 0)
+    {
+      DNError("not register this dart port!");
+      return nullptr;
+    }
+
+    char *funName = (char *)env->GetStringUTFChars(functionName, 0);
+    char **dataTypes = new char *[argumentCount + 1];
+    void **arguments = new void *[argumentCount + 1];
+
+    /// store argument to pointer
+    for (int i = 0; i < argumentCount; ++i)
+    {
+      auto argTypeString = (jstring)env->GetObjectArrayElement(argumentTypes, i);
+      auto argument = env->GetObjectArrayElement(argumentsArray, i);
+      dataTypes[i] = (char *)env->GetStringUTFChars(argTypeString, 0);
+
+      if (strcmp(dataTypes[i], "java.lang.String") == 0)
+      {
+        arguments[i] = (jstring) argument == nullptr ? reinterpret_cast<uint16_t *>((char *)"")
+                                                    : convertToDartUtf16(env, (jstring)argument);
+      }
+      else
+      {
+        jclass objCls = env->GetObjectClass(argument);
+        jobject gObj = env->NewGlobalRef(argument);
+        objectGlobalCache[gObj] = static_cast<jclass>(env->NewGlobalRef(objCls));
+        arguments[i] = gObj;
+
+        env->DeleteLocalRef(objCls);
+      }
+
+      env->DeleteLocalRef(argTypeString);
+      env->DeleteLocalRef(argument);
+    }
+
+    /// when return void, jstring which from native is null.
+    char *returnType = returnTypeStr == nullptr ? nullptr
+                                                : (char *)env->GetStringUTFChars(returnTypeStr, 0);
+    /// the last pointer is return type
+    dataTypes[argumentCount] = returnType;
+
+    sem_t sem;
+    bool isSemInitSuccess = sem_init(&sem, 0, 0) == 0;
+
+    const Work work = [dartObjectAddress, dataTypes, arguments, argumentCount, funName, &sem, isSemInitSuccess]() {
+      NativeMethodCallback methodCallback = getCallbackMethod(dartObjectAddress, funName);
+      void *target = getDartObject(dartObjectAddress);
+      if (methodCallback != nullptr && target != nullptr)
+      {
+        methodCallback(target, funName, arguments, dataTypes, argumentCount);
+      }
+      if (isSemInitSuccess)
+      {
+        sem_post(&sem);
+      }
+    };
+
+    const Work *work_ptr = new Work(work);
+    /// check run result
+    bool notifyResult = NotifyDart(port, work_ptr);
+    jobject callbackResult = nullptr;
+    if (isSemInitSuccess)
+    {
+      if (notifyResult)
+      {
+        sem_wait(&sem);
+        if (strcmp(returnType, "Ljava/lang/String;") == 0)
+        {
+          callbackResult = convertToJavaUtf16(env, (char *)arguments[argumentCount], nullptr, 0);
+        }
+        else
+        {
+          callbackResult = (jobject) arguments[argumentCount];
+        }
+      }
+      sem_destroy(&sem);
+    }
+
+    env->ReleaseStringUTFChars(returnTypeStr, returnType);
+    env->ReleaseStringUTFChars(functionName, funName);
+    delete[] arguments;
+    delete[] dataTypes;
+
+    return callbackResult;
+  }
 }

dart_native/android/src/main/jni/dn_callback.cpp

@@ -2,11 +2,9 @@
 // Created by Hui on 6/1/21.
 //
 #include <string>
-#include <semaphore.h>
-#include <dart_native_api.h>
-#include <dart_api_dl.h>
 #include "dn_callback.h"
 #include "dn_log.h"
+#include "dn_type_convert.h"
 
 static std::map<jlong, void *> targetCache;
 static std::map<jlong, int64_t> dartPortCache;
@@ -84,151 +82,3 @@ NativeMethodCallback getCallbackMethod(jlong dartObjectAddress, char *functionNa
   return methodsMap[functionName];
 }
 
-bool NotifyDart(Dart_Port send_port, const Work *work)
-{
-  const auto work_addr = reinterpret_cast<intptr_t>(work);
-
-  Dart_CObject dart_object;
-  dart_object.type = Dart_CObject_kInt64;
-  dart_object.value.as_int64 = work_addr;
-
-  const bool result = Dart_PostCObject_DL(send_port, &dart_object);
-  if (!result)
-  {
-    DNDebug("Native callback to Dart failed! Invalid port or isolate died");
-  }
-  return result;
-}
-
-extern "C" JNIEXPORT jobject JNICALL Java_com_dartnative_dart_1native_CallbackInvocationHandler_hookCallback(JNIEnv *env,
-                                                                                                  jclass clazz,
-                                                                                                  jlong dartObjectAddress,
-                                                                                                  jstring functionName,
-                                                                                                  jint argumentCount,
-                                                                                                  jobjectArray argumentTypes,
-                                                                                                  jobjectArray argumentsArray,
-                                                                                                  jstring returnTypeStr)
-{
-  Dart_Port port = getCallbackDartPort(dartObjectAddress);
-  if (port == 0)
-  {
-    DNDebug("not register dart port!");
-    return nullptr;
-  }
-
-  char *funName = (char *)env->GetStringUTFChars(functionName, 0);
-  char **argTypes = new char *[argumentCount + 1];
-  void **arguments = new void *[argumentCount];
-  for (int i = 0; i < argumentCount; ++i)
-  {
-    jstring argTypeString = (jstring)env->GetObjectArrayElement(argumentTypes, i);
-    jobject argument = env->GetObjectArrayElement(argumentsArray, i);
-
-    argTypes[i] = (char *)env->GetStringUTFChars(argTypeString, 0);
-    env->DeleteLocalRef(argTypeString);
-    //todo optimization
-    if (strcmp(argTypes[i], "I") == 0)
-    {
-      jclass cls = env->FindClass("java/lang/Integer");
-      if (env->IsInstanceOf(argument, cls) == JNI_TRUE)
-      {
-        jmethodID integerToInt = env->GetMethodID(cls, "intValue", "()I");
-        jint result = env->CallIntMethod(argument, integerToInt);
-        arguments[i] = (void *)result;
-      }
-      env->DeleteLocalRef(cls);
-    }
-    else if (strcmp(argTypes[i], "F") == 0)
-    {
-      jclass cls = env->FindClass("java/lang/Float");
-      if (env->IsInstanceOf(argument, cls) == JNI_TRUE)
-      {
-        jmethodID toJfloat = env->GetMethodID(cls, "floatValue", "()F");
-        jfloat result = env->CallFloatMethod(argument, toJfloat);
-        float templeFloat = (float)result;
-        memcpy(&arguments[i], &templeFloat, sizeof(float));
-      }
-      env->DeleteLocalRef(cls);
-    }
-    else if (strcmp(argTypes[i], "D") == 0)
-    {
-      jclass cls = env->FindClass("java/lang/Double");
-      if (env->IsInstanceOf(argument, cls) == JNI_TRUE)
-      {
-        jmethodID toJfloat = env->GetMethodID(cls, "doubleValue", "()D");
-        jdouble result = env->CallDoubleMethod(argument, toJfloat);
-        double templeDouble = (double)result;
-        memcpy(&arguments[i], &templeDouble, sizeof(double));
-      }
-      env->DeleteLocalRef(cls);
-    }
-    else if (strcmp(argTypes[i], "Ljava/lang/String;") == 0)
-    {
-      jstring argString = (jstring)argument;
-      arguments[i] = argString == nullptr ? (char *)""
-                                          : (char *)env->GetStringUTFChars(argString, 0);
-      env->DeleteLocalRef(argString);
-    }
-  }
-
-  /// when return void, jstring which from native is null.
-  char *returnType = returnTypeStr == nullptr ? nullptr
-                                            : (char *)env->GetStringUTFChars(returnTypeStr, 0);
-
-  argTypes[argumentCount] = returnType;
-
-  sem_t sem;
-  bool isSemInitSuccess = sem_init(&sem, 0, 0) == 0;
-
-  const Work work = [dartObjectAddress, argTypes, arguments, argumentCount, funName, &sem, isSemInitSuccess]() {
-    NativeMethodCallback methodCallback = getCallbackMethod(dartObjectAddress, funName);
-    void *target = getDartObject(dartObjectAddress);
-    if (methodCallback != nullptr && target != nullptr)
-    {
-      methodCallback(target, funName, arguments, argTypes, argumentCount);
-    }
-    if (isSemInitSuccess)
-    {
-      sem_post(&sem);
-    }
-  };
-
-  const Work *work_ptr = new Work(work);
-  /// error
-  bool notifyResult = NotifyDart(port, work_ptr);
-
-  jobject callbackResult = nullptr;
-  if (isSemInitSuccess)
-  {
-    DNDebug("wait work execute");
-    sem_wait(&sem);
-    //todo optimization
-    if (returnType == nullptr)
-    {
-      DNDebug("void");
-    }
-    else if (strcmp(returnType, "Ljava/lang/String;") == 0)
-    {
-      callbackResult = env->NewStringUTF(arguments[0] == nullptr ? (char *)""
-                                                                 : (char *)arguments[0]);
-    }
-    else if (strcmp(returnType, "Z") == 0)
-    {
-      jclass booleanClass = env->FindClass("java/lang/Boolean");
-      jmethodID methodID = env->GetMethodID(booleanClass, "<init>", "(Z)V");
-      callbackResult = env->NewObject(booleanClass,
-                                      methodID,
-                                      notifyResult ? static_cast<jboolean>(*((int *)arguments))
-                                                   : JNI_FALSE);
-      env->DeleteLocalRef(booleanClass);
-    }
-    sem_destroy(&sem);
-  }
-
-  free(returnType);
-  free(funName);
-  free(arguments);
-  free(argTypes);
-
-  return callbackResult;
-}

dart_native/example/lib/android/delegate_stub.dart

@@ -30,7 +30,8 @@ class DelegateStub extends JObject with SampleDelegate {
   }
 
   @override
-  callbackComplex(int i, double d, String s) {
+  bool callbackComplex(int i, double d, String s) {
     print("callbackComplex from native $i $d $s");
+    return true;
   }
 }