Merge pull request #151 from NativeScript/atanasovg/v8-two-byte-string

Marshall Java strings as two-byte V8 strings.

Author: atanasovg

src/jni/Android.mk

@@ -61,7 +61,6 @@ include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CPPFLAGS += -std=c++11
-LOCAL_CPPFLAGS += -fshort-wchar
 LOCAL_MODULE    := NativeScript
 LOCAL_SRC_FILES := com_tns_Platform.cpp com_tns_JsDebugger.cpp com_tns_AssetExtractor.cpp com_tns_NativeScriptActity.cpp \
 					JEnv.cpp DirectBuffer.cpp \

src/jni/ArgConverter.cpp

@@ -45,7 +45,7 @@ void ArgConverter::NativeScriptLongFunctionCallback(const v8::FunctionCallbackIn
 {
 	auto isolate = Isolate::GetCurrent();
 	args.This()->SetHiddenValue(V8StringConstants::GetJavaLong(), Boolean::New(isolate, true));
-	args.This()->SetHiddenValue(ConvertToV8String(V8StringConstants::MARKED_AS_LONG), args[0]);
+	args.This()->SetHiddenValue(V8StringConstants::GetMarkedAsLong(), args[0]);
 	args.This()->Set(V8StringConstants::GetValue(), args[0]);
 
 	args.This()->SetPrototype(Local<NumberObject>::New(Isolate::GetCurrent(), *NAN_NUMBER_OBJECT));
@@ -163,16 +163,11 @@ Local<String> ArgConverter::jstringToV8String(jstring value)
 		return Handle<String>();
 	}
 
-	jsize utfLength;
-	bool readInBuffer = ReadJStringInBuffer(value, utfLength);
-	if(readInBuffer) {
-		return ConvertToV8String(charBuffer, utfLength);
-	}
-
 	JEnv env;
-	const char* chars = env.GetStringUTFChars(value, NULL);
-	auto v8String = ConvertToV8String(chars, utfLength);
-	env.ReleaseStringUTFChars(value, chars);
+	auto chars = env.GetStringChars(value, NULL);
+	auto length = env.GetStringLength(value);
+	auto v8String = ConvertToV8String(chars, length);
+	env.ReleaseStringChars(value, chars);
 
 	return v8String;
 }
@@ -197,13 +192,7 @@ bool ArgConverter::ReadJStringInBuffer(jstring value, jsize& utfLength) {
 
 Handle<String> ArgConverter::jcharToV8String(jchar value)
 {
-	JEnv env;
-
-	JniLocalRef str(env.NewString(&value, 1));
-	jboolean bol = true;
-	const char* resP = env.GetStringUTFChars(str, &bol);
-	auto v8String = ConvertToV8String(resP, 1);
-	env.ReleaseStringUTFChars(str, resP);
+	auto v8String = ConvertToV8String(&value, 1);
 	return v8String;
 }
 

src/jni/JsArgConverter.cpp

@@ -330,24 +330,7 @@ bool JsArgConverter::ConvertJavaScriptBoolean(JEnv& env, const Handle<Value>& js
 
 bool JsArgConverter::ConvertJavaScriptString(JEnv& env, const Handle<Value>& jsValue, int index)
 {
-	Handle<String> argAsString;
-	if (jsValue->IsStringObject())
-	{
-		auto stringObject = Handle<StringObject>::Cast(jsValue);
-		argAsString = stringObject->ValueOf();
-	}
-	else
-	{
-		argAsString = jsValue->ToString();
-	}
-
-	String::Utf8Value stringValue(argAsString);
-//	int strLength = stringValue.length();
-//
-//	JniLocalRef strData(env.NewByteArray(strLength));
-//	env.SetByteArrayRegion(strData, 0, strLength, (jbyte*)*stringValue);
-//	JniLocalRef stringObject(env.NewObject(STRING_CLASS, STRING_CTOR, (jbyteArray)strData, UTF_8_ENCODING));
-	JniLocalRef stringObject(env.NewStringUTF((const char*)*stringValue));
+	JniLocalRef stringObject(ConvertToJavaString(jsValue));
 	SetConvertedObject(env, index, stringObject);
 
 	return true;

src/jni/JsArgToArrayConverter.cpp

@@ -148,24 +148,7 @@ bool JsArgToArrayConverter::ConvertArg(const Handle<Value>& arg, int index)
 	}
 	else if (arg->IsString() || arg->IsStringObject())
 	{
-		Handle<String> argAsString;
-		if (arg->IsStringObject())
-		{
-			auto stringObject = *reinterpret_cast<v8::Handle<StringObject>*>(const_cast<v8::Handle<Value>*>(&arg));
-			argAsString = stringObject->ValueOf();
-		}
-		else
-		{
-			argAsString = arg->ToString();
-		}
-
-		String::Utf8Value stringValue(argAsString);
-//		int strLength = stringValue.length();
-//
-//		JniLocalRef strData(env.NewByteArray(strLength));
-//		env.SetByteArrayRegion((jbyteArray)strData, 0, strLength, (jbyte*)*stringValue);
-//		JniLocalRef stringObject(env.NewObject(STRING_CLASS, STRING_CTOR, (jbyteArray)strData, UTF_8_ENCODING));
-		JniLocalRef stringObject(env.NewStringUTF((const char*)*stringValue));
+		JniLocalRef stringObject(ConvertToJavaString(arg));
 		SetConvertedObject(env, index, stringObject);
 
 		success = true;

src/jni/V8GlobalHelpers.cpp

@@ -1,4 +1,5 @@
 #include "V8GlobalHelpers.h"
+#include "JEnv.h"
 
 using namespace v8;
 using namespace std;
@@ -16,6 +17,30 @@ string tns::ConvertToString(const v8::Handle<String>& s)
 	}
 }
 
+jstring tns::ConvertToJavaString(const Handle<Value>& value)
+{
+	Handle<String> valueAsString;
+	if (value->IsStringObject())
+	{
+		auto stringObject = Handle<StringObject>::Cast(value);
+		valueAsString = stringObject->ValueOf();
+	}
+	else
+	{
+		valueAsString = value->ToString();
+	}
+
+	JEnv env;
+	String::Value stringValue(valueAsString);
+	return env.NewString((const jchar*)*stringValue, valueAsString->Length());
+}
+
+Local<String> tns::ConvertToV8String(const jchar* data, int length)
+{
+	auto isolate = Isolate::GetCurrent();
+	return String::NewFromTwoByte(isolate, (const uint16_t*)data, String::kNormalString, length);
+}
+
 Local<String> tns::ConvertToV8String(const string& s)
 {
 	auto isolate = Isolate::GetCurrent();
@@ -39,4 +64,3 @@ bool tns::V8SetHiddenValue(const Handle<Object>& obj, const string& propName, co
 	auto s = tns::ConvertToV8String(propName);
 	return obj->SetHiddenValue(s, value);
 }
-

src/jni/V8GlobalHelpers.h

@@ -1,13 +1,18 @@
 #ifndef V8GLOBALHELPERS_H_
 #define V8GLOBALHELPERS_H_
 
+#include "jni.h"
 #include "v8.h"
 #include <string>
 
 namespace tns
 {
 	std::string ConvertToString(const v8::Handle<v8::String>& s);
 
+	jstring ConvertToJavaString(const v8::Handle<v8::Value>& jsValue);
+
+	v8::Local<v8::String> ConvertToV8String(const jchar* data, int length);
+
 	v8::Local<v8::String> ConvertToV8String(const std::string& s);
 
 	v8::Local<v8::String> ConvertToV8String(const char *data, int length);

test-app/assets/app/bootstrap.js

@@ -17,6 +17,7 @@ global.__JUnitSaveResults = function (unitTestResults) {
 	var unitTestFileName = 'android_unit_test_results.xml';
 	try {
         var javaFile = new java.io.File(pathToSdcard, unitTestFileName);
+        
         var stream = new java.io.FileOutputStream(javaFile);
         var actualEncoding = 'UTF-8';
         var writer = new java.io.OutputStreamWriter(stream, actualEncoding);

test-app/try_to_find_test_result_file.js

@@ -5,7 +5,7 @@ var sys = require('sys'),
 
 	isTimeToExit = false,
 
-	processTimeout = 700000,
+	processTimeout = 11 * 60 * 1000, // 11 minutes timeout (empirical constant :)) 
 	searchInterval = 10000;