updated source files to compile on electron 7

gnudles · joeferner · commit 9ecc5a4a0527 · 2020-01-08T11:40:49.000-05:00
diff --git a/src/java.cpp b/src/java.cpp
@@ -203,7 +203,7 @@ v8::Local<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
         classPath << ":";
       #endif
     }
-    v8::Local<v8::Value> arrayItemValue = classPathArrayTemp->Get(i);
+    v8::Local<v8::Value> arrayItemValue = classPathArrayTemp->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
     if(!arrayItemValue->IsString()) {
       return Nan::TypeError("Classpath must only contain strings");
     }
@@ -231,7 +231,7 @@ v8::Local<v8::Value> Java::createJVM(JavaVM** jvm, JNIEnv** env) {
   //printf("classPath: %s\n", classPath.str().c_str());
   vmOptions[0].optionString = strdup(classPath.str().c_str());
   for(uint32_t i=0; i<optionsArrayTemp->Length(); i++) {
-    v8::Local<v8::Value> arrayItemValue = optionsArrayTemp->Get(i);
+    v8::Local<v8::Value> arrayItemValue = optionsArrayTemp->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
     if(!arrayItemValue->IsString()) {
       delete[] vmOptions;
       return Nan::TypeError("options must only contain strings");
@@ -769,7 +769,7 @@ NAN_METHOD(Java::newArray) {
   if(strcmp(className.c_str(), "byte") == 0) {
     results = env->NewByteArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass byteClazz = env->FindClass("java/lang/Byte");
       jmethodID byte_byteValue = env->GetMethodID(byteClazz, "byteValue", "()B");
@@ -783,7 +783,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "char") == 0) {
     results = env->NewCharArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass stringClazz = env->FindClass("java/lang/String");
       jmethodID string_charAt = env->GetMethodID(stringClazz, "charAt", "(I)C");
@@ -797,7 +797,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "short") == 0) {
     results = env->NewShortArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass shortClazz = env->FindClass("java/lang/Short");
       jmethodID short_shortValue = env->GetMethodID(shortClazz, "shortValue", "()S");
@@ -811,7 +811,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "double") == 0) {
     results = env->NewDoubleArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass doubleClazz = env->FindClass("java/lang/Double");
       jmethodID double_doubleValue = env->GetMethodID(doubleClazz, "doubleValue", "()D");
@@ -825,7 +825,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "int") == 0) {
     results = env->NewIntArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass integerClazz = env->FindClass("java/lang/Integer");
       jmethodID integer_intValue = env->GetMethodID(integerClazz, "intValue", "()I");
@@ -839,7 +839,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "float") == 0) {
     results = env->NewFloatArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass floatClazz = env->FindClass("java/lang/Float");
       jmethodID float_floatValue = env->GetMethodID(floatClazz, "floatValue", "()F");
@@ -853,7 +853,7 @@ NAN_METHOD(Java::newArray) {
   else if(strcmp(className.c_str(), "boolean") == 0) {
     results = env->NewBooleanArray(arrayObj->Length());
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       jclass booleanClazz = env->FindClass("java/lang/Boolean");
       jmethodID boolean_booleanValue = env->GetMethodID(booleanClazz, "booleanValue", "()Z");
@@ -877,7 +877,7 @@ NAN_METHOD(Java::newArray) {
     results = env->NewObjectArray(arrayObj->Length(), clazz, NULL);
 
     for(uint32_t i=0; i<arrayObj->Length(); i++) {
-      v8::Local<v8::Value> item = arrayObj->Get(i);
+      v8::Local<v8::Value> item = arrayObj->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
       jobject val = v8ToJava(env, item);
       env->SetObjectArrayElement((jobjectArray)results, i, val);
       if(env->ExceptionOccurred()) {
@@ -1251,7 +1251,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
   jobject javaResult;
 
   v8::Local<v8::Object> dynamicProxyDataFunctions = Nan::New(dynamicProxyData->functions);
-  v8::Local<v8::Value> fnObj = dynamicProxyDataFunctions->Get(Nan::New<v8::String>(dynamicProxyData->methodName.c_str()).ToLocalChecked());
+  v8::Local<v8::Value> fnObj = dynamicProxyDataFunctions->Get(Nan::GetCurrentContext(), Nan::New<v8::String>(dynamicProxyData->methodName.c_str()).ToLocalChecked()).ToLocalChecked();
   if(fnObj->IsUndefined() || fnObj->IsNull()) {
     dynamicProxyData->throwableClass = "java/lang/NoSuchMethodError";
     dynamicProxyData->throwableMessage = "Could not find js function " + dynamicProxyData->methodName;
@@ -1275,7 +1275,7 @@ void EIO_AfterCallJs(uv_work_t* req) {
   }
   argv = new v8::Local<v8::Value>[argc];
   for(i=0; i<argc; i++) {
-    argv[i] = v8Args->Get(i);
+    argv[i] = v8Args->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
   }
 
   Nan::TryCatch tryCatch;
diff --git a/src/javaObject.cpp b/src/javaObject.cpp
@@ -29,8 +29,8 @@
 
   v8::Local<v8::Function> promisify;
   if(java->DoPromise()) {
-    v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::New<v8::String>("asyncOptions").ToLocalChecked()).As<v8::Object>();
-    v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::New<v8::String>("promisify").ToLocalChecked());
+    v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("asyncOptions").ToLocalChecked()).ToLocalChecked().As<v8::Object>();
+    v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("promisify").ToLocalChecked()).ToLocalChecked();
     promisify = promisifyValue.As<v8::Function>();
   }
 
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -275,7 +275,7 @@ static std::string getArrayElementType(v8::Local<v8::Array> array, uint32_t arra
   }
 
   for(uint32_t i=0; i<arraySize; i++) {
-    v8::Local<v8::Value> arg = array->Get(i);
+    v8::Local<v8::Value> arg = array->Get(Nan::GetCurrentContext(), i).ToLocalChecked();
     if (arg->IsArray()) {
       return kObject; // We can exit as soon as we know java/lang/Object is required.
     }
@@ -332,7 +332,7 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {
     jclass objectClazz = env->FindClass(arrayType.c_str());
     jobjectArray result = env->NewObjectArray(arraySize, objectClazz, NULL);
     for(uint32_t i=0; i<arraySize; i++) {
-      jobject val = v8ToJava(env, array->Get(i));
+      jobject val = v8ToJava(env, array->Get(Nan::GetCurrentContext(), i).ToLocalChecked());
       env->SetObjectArrayElement(result, i, val);
     }
     return result;
@@ -405,7 +405,7 @@ void checkJavaException(JNIEnv* env) {
 }
 
 jobject v8ToJava_javaLong(JNIEnv* env, v8::Local<v8::Object> obj) {
-  jobject longValue = v8ToJava(env, obj->Get(Nan::New<v8::String>("longValue").ToLocalChecked()));
+  jobject longValue = v8ToJava(env, obj->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked()).ToLocalChecked());
   jclass longClazz = env->FindClass("java/lang/Long");
   jmethodID long_constructor = env->GetMethodID(longClazz, "<init>", "(Ljava/lang/String;)V");
   jobject jobj = env->NewObject(longClazz, long_constructor, longValue);
@@ -452,7 +452,7 @@ v8::Local<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, jthrowable ex, c
     msg << "\n" << javaExceptionToString(env, ex);
 
     v8::Local<v8::Value> v8ex = v8::Exception::Error(Nan::New<v8::String>(msg.str().c_str()).ToLocalChecked());
-    ((v8::Object*)*v8ex)->Set(Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));
+    ((v8::Object*)*v8ex)->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));
     return v8ex;
   }
 
@@ -639,7 +639,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra
       jlong* elems = env->GetLongArrayElements((jlongArray)objArray, 0);
       for(jsize i=0; i<arraySize; i++) {
         jobject obj = longToJavaLongObj(env, elems[i]);
-        result->Set(i, JavaObject::New(java, obj));
+        result->Set(Nan::GetCurrentContext(), i, JavaObject::New(java, obj));
       }
       env->ReleaseLongArrayElements((jlongArray)objArray, elems, 0);
     }
@@ -649,7 +649,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra
     for(jsize i=0; i<arraySize; i++) {
         jobject obj = env->GetObjectArrayElement(objArray, i);
         v8::Local<v8::Value> item = javaToV8(java, env, obj);
-        result->Set(i, item);
+        result->Set(Nan::GetCurrentContext(), i, item);
     }
     break;
   }
@@ -712,7 +712,7 @@ v8::Local<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj, DynamicProxy
         std::string strValue = javaObjectToString(env, obj);
         v8::Local<v8::Value> v8Result = Nan::New<v8::NumberObject>((double)result);
         v8::NumberObject* v8ResultNumberObject = v8::NumberObject::Cast(*v8Result);
-        v8ResultNumberObject->Set(Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());
+        v8ResultNumberObject->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());
         SetHiddenValue(v8ResultNumberObject, Nan::New<v8::String>(V8_HIDDEN_MARKER_JAVA_LONG).ToLocalChecked(), Nan::New<v8::Boolean>(true));
         return v8Result;
       }

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@`
`29`	`29`
`30`	`30`	`v8::Local<v8::Function> promisify;`
`31`	`31`	`if(java->DoPromise()) {`
`32`		`- v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::New<v8::String>("asyncOptions").ToLocalChecked()).As<v8::Object>();`
`33`		`- v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::New<v8::String>("promisify").ToLocalChecked());`
	`32`	`+ v8::Local<v8::Object> asyncOptions = java->handle()->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("asyncOptions").ToLocalChecked()).ToLocalChecked().As<v8::Object>();`
	`33`	`+ v8::Local<v8::Value> promisifyValue = asyncOptions->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("promisify").ToLocalChecked()).ToLocalChecked();`
`34`	`34`	`promisify = promisifyValue.As<v8::Function>();`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static std::string getArrayElementType(v8::Local<v8::Array> array, uint32_t arra`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`for(uint32_t i=0; i<arraySize; i++) {`
`278`		`- v8::Local<v8::Value> arg = array->Get(i);`
	`278`	`+ v8::Local<v8::Value> arg = array->Get(Nan::GetCurrentContext(), i).ToLocalChecked();`
`279`	`279`	`if (arg->IsArray()) {`
`280`	`280`	`return kObject; // We can exit as soon as we know java/lang/Object is required.`
`281`	`281`	`}`
`@@ -332,7 +332,7 @@ jobject v8ToJava(JNIEnv* env, v8::Local<v8::Value> arg) {`
`332`	`332`	`jclass objectClazz = env->FindClass(arrayType.c_str());`
`333`	`333`	`jobjectArray result = env->NewObjectArray(arraySize, objectClazz, NULL);`
`334`	`334`	`for(uint32_t i=0; i<arraySize; i++) {`
`335`		`- jobject val = v8ToJava(env, array->Get(i));`
	`335`	`+ jobject val = v8ToJava(env, array->Get(Nan::GetCurrentContext(), i).ToLocalChecked());`
`336`	`336`	`env->SetObjectArrayElement(result, i, val);`
`337`	`337`	`}`
`338`	`338`	`return result;`
`@@ -405,7 +405,7 @@ void checkJavaException(JNIEnv* env) {`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`jobject v8ToJava_javaLong(JNIEnv* env, v8::Local<v8::Object> obj) {`
`408`		`- jobject longValue = v8ToJava(env, obj->Get(Nan::New<v8::String>("longValue").ToLocalChecked()));`
	`408`	`+ jobject longValue = v8ToJava(env, obj->Get(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked()).ToLocalChecked());`
`409`	`409`	`jclass longClazz = env->FindClass("java/lang/Long");`
`410`	`410`	`jmethodID long_constructor = env->GetMethodID(longClazz, "<init>", "(Ljava/lang/String;)V");`
`411`	`411`	`jobject jobj = env->NewObject(longClazz, long_constructor, longValue);`
`@@ -452,7 +452,7 @@ v8::Local<v8::Value> javaExceptionToV8(Java* java, JNIEnv* env, jthrowable ex, c`
`452`	`452`	`msg << "\n" << javaExceptionToString(env, ex);`
`453`	`453`
`454`	`454`	`v8::Local<v8::Value> v8ex = v8::Exception::Error(Nan::New<v8::String>(msg.str().c_str()).ToLocalChecked());`
`455`		`- ((v8::Object)v8ex)->Set(Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));`
	`455`	`+ ((v8::Object)v8ex)->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("cause").ToLocalChecked(), javaToV8(java, env, ex));`
`456`	`456`	`return v8ex;`
`457`	`457`	`}`
`458`	`458`
`@@ -639,7 +639,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra`
`639`	`639`	`jlong* elems = env->GetLongArrayElements((jlongArray)objArray, 0);`
`640`	`640`	`for(jsize i=0; i<arraySize; i++) {`
`641`	`641`	`jobject obj = longToJavaLongObj(env, elems[i]);`
`642`		`- result->Set(i, JavaObject::New(java, obj));`
	`642`	`+ result->Set(Nan::GetCurrentContext(), i, JavaObject::New(java, obj));`
`643`	`643`	`}`
`644`	`644`	`env->ReleaseLongArrayElements((jlongArray)objArray, elems, 0);`
`645`	`645`	`}`
`@@ -649,7 +649,7 @@ v8::Local<v8::Value> javaArrayToV8(Java* java, JNIEnv* env, jobjectArray objArra`
`649`	`649`	`for(jsize i=0; i<arraySize; i++) {`
`650`	`650`	`jobject obj = env->GetObjectArrayElement(objArray, i);`
`651`	`651`	`v8::Local<v8::Value> item = javaToV8(java, env, obj);`
`652`		`- result->Set(i, item);`
	`652`	`+ result->Set(Nan::GetCurrentContext(), i, item);`
`653`	`653`	`}`
`654`	`654`	`break;`
`655`	`655`	`}`
`@@ -712,7 +712,7 @@ v8::Local<v8::Value> javaToV8(Java* java, JNIEnv* env, jobject obj, DynamicProxy`
`712`	`712`	`std::string strValue = javaObjectToString(env, obj);`
`713`	`713`	`v8::Local<v8::Value> v8Result = Nan::New<v8::NumberObject>((double)result);`
`714`	`714`	`v8::NumberObject* v8ResultNumberObject = v8::NumberObject::Cast(*v8Result);`
`715`		`- v8ResultNumberObject->Set(Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());`
	`715`	`+ v8ResultNumberObject->Set(Nan::GetCurrentContext(), Nan::New<v8::String>("longValue").ToLocalChecked(), Nan::New<v8::String>(strValue.c_str()).ToLocalChecked());`
`716`	`716`	`SetHiddenValue(v8ResultNumberObject, Nan::New<v8::String>(V8_HIDDEN_MARKER_JAVA_LONG).ToLocalChecked(), Nan::New<v8::Boolean>(true));`
`717`	`717`	`return v8Result;`
`718`	`718`	`}`