Merge branch 'master' of github.com:NativeScript/android-runtime

Author: Nathanael Anderson

test-app/app/src/main/assets/app/mainpage.js

@@ -21,6 +21,7 @@ shared.runWeakRefTests();
 shared.runRuntimeTests();
 shared.runWorkerTests();
 require("./tests/testWebAssembly");
+require("./tests/testMultithreadedJavascript");
 require("./tests/testInterfaceDefaultMethods");
 require("./tests/testInterfaceStaticMethods");
 require("./tests/testMetadata");

test-app/app/src/main/assets/app/tests/testMultithreadedJavascript.js

@@ -0,0 +1,18 @@
+describe("Test multithreaded javascript ", () => {
+    it("Should execute callbacks on specified native thread", done => {
+        const currentThreadId = java.lang.Thread.currentThread().getId();
+        new java.lang.Thread(new java.lang.Runnable({
+            run() {
+                const threadId = java.lang.Thread.currentThread().getId();
+                expect(threadId).not.toEqual(currentThreadId);
+
+                const mainHandler = new android.os.Handler(android.os.Looper.getMainLooper());
+                // done() must called on the main thread to ensure that jasmine tests
+                // continue executing there
+                mainHandler.post(new java.lang.Runnable({
+                    run: done
+                }));
+            }
+        })).start();
+    });
+});

test-app/app/src/main/java/com/tns/RuntimeHelper.java

@@ -74,6 +74,7 @@ public static Runtime initRuntime(Context context) {
 
             Logger logger = new LogcatLogger(context);
 
+            Runtime.nativeLibraryLoaded = true;
             Runtime runtime = null;
             boolean showErrorIntent = hasErrorIntent(context);
             if (!showErrorIntent) {

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

@@ -13,9 +13,9 @@ using namespace v8;
 using namespace std;
 using namespace tns;
 
-void ArgConverter::Init(Isolate* isolate) {
+void ArgConverter::Init(Local<Context> context) {
+    Isolate* isolate = context->GetIsolate();
     auto cache = GetTypeLongCache(isolate);
-    auto context = isolate->GetCurrentContext();
 
     auto ft = FunctionTemplate::New(isolate, ArgConverter::NativeScriptLongFunctionCallback);
     ft->SetClassName(V8StringConstants::GetLongNumber(isolate));
@@ -93,10 +93,11 @@ jstring ArgConverter::ObjectToString(jobject object) {
     return (jstring) object;
 }
 
-Local<Array> ArgConverter::ConvertJavaArgsToJsArgs(Isolate* isolate, jobjectArray args) {
+Local<Array> ArgConverter::ConvertJavaArgsToJsArgs(Local<Context> context, jobjectArray args) {
     JEnv env;
 
     int argc = env.GetArrayLength(args) / 3;
+    auto isolate = context->GetIsolate();
     Local<Array> arr(Array::New(isolate, argc));
 
     auto runtime = Runtime::GetRuntime(isolate);
@@ -155,7 +156,6 @@ Local<Array> ArgConverter::ConvertJavaArgsToJsArgs(Isolate* isolate, jobjectArra
             break;
         }
 
-        auto context = isolate->GetCurrentContext();
         arr->Set(context, i, jsArg);
     }
 

test-app/runtime/src/main/cpp/ArgConverter.h

@@ -17,9 +17,9 @@ namespace tns {
 
 class ArgConverter {
     public:
-        static void Init(v8::Isolate* isolate);
+        static void Init(v8::Local<v8::Context> context);
 
-        static v8::Local<v8::Array> ConvertJavaArgsToJsArgs(v8::Isolate* isolate, jobjectArray args);
+        static v8::Local<v8::Array> ConvertJavaArgsToJsArgs(v8::Local<v8::Context> context, jobjectArray args);
 
         static v8::Local<v8::Value> ConvertFromJavaLong(v8::Isolate* isolate, jlong value);
 

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

@@ -12,14 +12,13 @@ ArrayBufferHelper::ArrayBufferHelper()
           m_remainingMethodID(nullptr), m_getMethodID(nullptr) {
 }
 
-void ArrayBufferHelper::CreateConvertFunctions(Isolate* isolate, const Local<Object>& global, ObjectManager* objectManager) {
+void ArrayBufferHelper::CreateConvertFunctions(Local<Context> context, const Local<Object>& global, ObjectManager* objectManager) {
     m_objectManager = objectManager;
+    Isolate* isolate = context->GetIsolate();
     auto extData = External::New(isolate, this);
-    auto context = isolate->GetCurrentContext();
     auto fromFunc = FunctionTemplate::New(isolate, CreateFromCallbackStatic, extData)->GetFunction(context).ToLocalChecked();
-    auto ctx = isolate->GetCurrentContext();
     auto arrBufferCtorFunc = global->Get(context, ArgConverter::ConvertToV8String(isolate, "ArrayBuffer")).ToLocalChecked().As<Function>();
-    arrBufferCtorFunc->Set(ctx, ArgConverter::ConvertToV8String(isolate, "from"), fromFunc);
+    arrBufferCtorFunc->Set(context, ArgConverter::ConvertToV8String(isolate, "from"), fromFunc);
 }
 
 void ArrayBufferHelper::CreateFromCallbackStatic(const FunctionCallbackInfo<Value>& info) {

test-app/runtime/src/main/cpp/ArrayBufferHelper.h

@@ -9,7 +9,7 @@ namespace tns {
         public:
             ArrayBufferHelper();
 
-            void CreateConvertFunctions(v8::Isolate* isolate, const v8::Local<v8::Object>& global, ObjectManager* objectManager);
+            void CreateConvertFunctions(v8::Local<v8::Context> context, const v8::Local<v8::Object>& global, ObjectManager* objectManager);
 
         private:
 

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

@@ -9,9 +9,10 @@ using namespace v8;
 using namespace std;
 using namespace tns;
 
-Local<Value> ArrayElementAccessor::GetArrayElement(Isolate* isolate, const Local<Object>& array, uint32_t index, const string& arraySignature) {
+Local<Value> ArrayElementAccessor::GetArrayElement(Local<Context> context, const Local<Object>& array, uint32_t index, const string& arraySignature) {
     JEnv env;
 
+    Isolate* isolate = context->GetIsolate();
     EscapableHandleScope handleScope(isolate);
     auto runtime = Runtime::GetRuntime(isolate);
     auto objectManager = runtime->GetObjectManager();
@@ -79,13 +80,13 @@ Local<Value> ArrayElementAccessor::GetArrayElement(Isolate* isolate, const Local
     return handleScope.Escape(value);
 }
 
-void ArrayElementAccessor::SetArrayElement(Isolate* isolate, const Local<Object>& array, uint32_t index, const string& arraySignature, Local<Value>& value) {
+void ArrayElementAccessor::SetArrayElement(Local<Context> context, const Local<Object>& array, uint32_t index, const string& arraySignature, Local<Value>& value) {
     JEnv env;
 
+    Isolate* isolate = context->GetIsolate();
     HandleScope handleScope(isolate);
     auto runtime = Runtime::GetRuntime(isolate);
     auto objectManager = runtime->GetObjectManager();
-    auto context = isolate->GetCurrentContext();
 
     tns::JniLocalRef arr = objectManager->GetJavaObjectByJsObject(array);
 
@@ -140,7 +141,7 @@ void ArrayElementAccessor::SetArrayElement(Isolate* isolate, const Local<Object>
         if (isReferenceType) {
             auto object = value.As<Object>();
 
-            JsArgToArrayConverter argConverter(isolate, value, false, (int) Type::Null);
+            JsArgToArrayConverter argConverter(context, value, false, (int) Type::Null);
             if (argConverter.IsValid()) {
                 jobjectArray objArr = static_cast<jobjectArray>(arr);
                 jobject objectElementValue = argConverter.GetConvertedArg();

test-app/runtime/src/main/cpp/ArrayElementAccessor.h

@@ -9,9 +9,9 @@
 namespace tns {
 class ArrayElementAccessor {
     public:
-        v8::Local<v8::Value> GetArrayElement(v8::Isolate* isolate, const v8::Local<v8::Object>& array, uint32_t index, const std::string& arraySignature);
+        v8::Local<v8::Value> GetArrayElement(v8::Local<v8::Context> context, const v8::Local<v8::Object>& array, uint32_t index, const std::string& arraySignature);
 
-        void SetArrayElement(v8::Isolate* isolate, const v8::Local<v8::Object>& array, uint32_t index, const std::string& arraySignature, v8::Local<v8::Value>& value);
+        void SetArrayElement(v8::Local<v8::Context> context, const v8::Local<v8::Object>& array, uint32_t index, const std::string& arraySignature, v8::Local<v8::Value>& value);
 
     private:
         v8::Local<v8::Value> ConvertToJsValue(v8::Isolate* isolate, ObjectManager* objectManager, JEnv& env, const std::string& elementSignature, const void* value);

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

@@ -171,15 +171,15 @@ string CallbackHandlers::ResolveClassName(Isolate* isolate, jclass& clazz) {
     return className;
 }
 
-Local<Value> CallbackHandlers::GetArrayElement(Isolate* isolate, const Local<Object>& array,
+Local<Value> CallbackHandlers::GetArrayElement(Local<Context> context, const Local<Object>& array,
         uint32_t index, const string& arraySignature) {
-    return arrayElementAccessor.GetArrayElement(isolate, array, index, arraySignature);
+    return arrayElementAccessor.GetArrayElement(context, array, index, arraySignature);
 }
 
-void CallbackHandlers::SetArrayElement(Isolate* isolate, const Local<Object>& array, uint32_t index,
+void CallbackHandlers::SetArrayElement(Local<Context> context, const Local<Object>& array, uint32_t index,
                                        const string& arraySignature, Local<Value>& value) {
 
-    arrayElementAccessor.SetArrayElement(isolate, array, index, arraySignature, value);
+    arrayElementAccessor.SetArrayElement(context, array, index, arraySignature, value);
 }
 
 Local<Value> CallbackHandlers::GetJavaField(Isolate* isolate, const Local<Object>& caller,
@@ -568,7 +568,7 @@ CallbackHandlers::GetImplementedInterfaces(JEnv& env, const Local<Object>& imple
 
     vector<jstring> interfacesToImplement;
     auto isolate = implementationObject->GetIsolate();
-    auto context = isolate->GetCurrentContext();
+    auto context = implementationObject->CreationContext();
     auto propNames = implementationObject->GetOwnPropertyNames(context).ToLocalChecked();
     for (int i = 0; i < propNames->Length(); i++) {
         auto name = propNames->Get(context, i).ToLocalChecked().As<String>();
@@ -582,7 +582,6 @@ CallbackHandlers::GetImplementedInterfaces(JEnv& env, const Local<Object>& imple
             if (arrNameC == "interfaces") {
                 auto interfacesArr = prop->ToObject(context).ToLocalChecked();
 
-                auto context = isolate->GetCurrentContext();
                 int length = interfacesArr->Get(
                                  context,
                                  v8::String::NewFromUtf8(isolate, "length").ToLocalChecked()).ToLocalChecked()->ToObject(context).ToLocalChecked()->Uint32Value(
@@ -628,7 +627,7 @@ CallbackHandlers::GetMethodOverrides(JEnv& env, const Local<Object>& implementat
 
     vector<jstring> methodNames;
     auto isolate = implementationObject->GetIsolate();
-    auto context = isolate->GetCurrentContext();
+    auto context = implementationObject->CreationContext();
     auto propNames = implementationObject->GetOwnPropertyNames(context).ToLocalChecked();
     for (int i = 0; i < propNames->Length(); i++) {
         auto name = propNames->Get(context, i).ToLocalChecked().As<String>();
@@ -833,7 +832,7 @@ Local<Value> CallbackHandlers::CallJSMethod(Isolate* isolate, JNIEnv* _env,
     JEnv env(_env);
     Local<Value> result;
 
-    auto context = isolate->GetCurrentContext();
+    auto context = Runtime::GetRuntime(isolate)->GetContext();
     auto method = jsObject->Get(context, ArgConverter::ConvertToV8String(isolate, methodName)).ToLocalChecked();
 
     if (method.IsEmpty() || method->IsUndefined()) {
@@ -848,16 +847,14 @@ Local<Value> CallbackHandlers::CallJSMethod(Isolate* isolate, JNIEnv* _env,
         EscapableHandleScope handleScope(isolate);
 
         auto jsMethod = method.As<Function>();
-        auto jsArgs = ArgConverter::ConvertJavaArgsToJsArgs(isolate, args);
+        auto jsArgs = ArgConverter::ConvertJavaArgsToJsArgs(context, args);
         int argc = jsArgs->Length();
 
         std::vector<Local<Value>> arguments(argc);
         for (int i = 0; i < argc; i++) {
             arguments[i] = jsArgs->Get(context, i).ToLocalChecked();
         }
 
-        auto context = isolate->GetCurrentContext();
-
         TryCatch tc(isolate);
         Local<Value> jsResult;
         {
@@ -1160,12 +1157,11 @@ CallbackHandlers::WorkerObjectOnMessageCallback(Isolate* isolate, jint workerId,
 
         if (!isEmpty && isFunction) {
             auto msgString = ArgConverter::jstringToV8String(isolate, message).As<String>();
-            auto context = isolate->GetCurrentContext();
             Local<Value> msg;
             JSON::Parse(context, msgString).ToLocal(&msg);
 
             auto obj = Object::New(isolate);
-            obj->DefineOwnProperty(isolate->GetCurrentContext(),
+            obj->DefineOwnProperty(context,
                                    ArgConverter::ConvertToV8String(isolate, "data"), msg,
                                    PropertyAttribute::ReadOnly);
             Local<Value> args1[] = {obj};
@@ -1430,8 +1426,6 @@ CallbackHandlers::CallWorkerObjectOnErrorHandle(Isolate* isolate, jint workerId,
 
             auto func = callback.As<Function>();
 
-            auto context = isolate->GetCurrentContext();
-
             // Handle exceptions thrown in onmessage with the worker.onerror handler, if present
             Local<Value> result;
             func->Call(context, Undefined(isolate), 1, args1).ToLocal(&result);
@@ -1490,9 +1484,6 @@ void CallbackHandlers::ClearWorkerPersistent(int workerId) {
 }
 
 void CallbackHandlers::TerminateWorkerThread(Isolate* isolate) {
-    auto context = isolate->GetCurrentContext();
-    context->Exit();
-
     isolate->TerminateExecution();
 }