merge master branch

Author: Mihail Slavchev

src/jni/JEnv.cpp

@@ -13,8 +13,8 @@ using namespace std;
 
 
 
-JEnv::JEnv(bool detach)
-	: m_detach(detach), m_env(nullptr)
+JEnv::JEnv()
+	: m_env(nullptr)
 {
 	JNIEnv *env = nullptr;
 	jint ret = s_jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
@@ -29,29 +29,12 @@ JEnv::JEnv(bool detach)
 }
 
 JEnv::JEnv(JNIEnv *jniEnv)
-	: m_env(jniEnv), m_detach(false)
+	: m_env(jniEnv)
 {
 }
 
 JEnv::~JEnv()
 {
-	if (m_detach)
-	{
-		pid_t pid = getpid();
-		pid_t tid = gettid();
-
-		if (pid != tid)
-		{
-			JNIEnv *env = nullptr;
-			jint ret = s_jvm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
-
-			if ((ret == JNI_OK) && (env != nullptr))
-			{
-				jint ret = s_jvm->DetachCurrentThread();
-				assert(ret == JNI_OK);
-			}
-		}
-	}
 }
 
 JEnv::operator JNIEnv*() const

src/jni/JEnv.h

@@ -10,7 +10,7 @@ namespace tns
 	class JEnv
 	{
 	public:
-		JEnv(bool detach = false);
+		JEnv();
 
 		JEnv(JNIEnv *jniEnv);
 
@@ -324,7 +324,6 @@ namespace tns
 		void CheckForJavaException();
 
 		JNIEnv *m_env;
-		bool m_detach;
 
 		static JavaVM *s_jvm;
 

src/jni/Module.cpp

@@ -128,21 +128,6 @@ void Module::RequireCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 
 		// cache the required modules by full path, not name only, since there might be some collisions with relative paths and names
 		string modulePath = ArgConverter::jstringToString((jstring) jsModulePath);
-		if(modulePath == ""){
-			// module not found
-			stringstream ss;
-			ss << "Module \"" << moduleName << "\" not found";
-			string exception = ss.str();
-			throw NativeScriptException(exception);
-		}
-		if (modulePath == "EXTERNAL_FILE_ERROR")
-		{
-			// module not found
-			stringstream ss;
-			ss << "Module \"" << moduleName << "\" is located on the external storage. Modules can be private application files ONLY";
-			string exception = ss.str();
-			throw NativeScriptException(exception);
-		}
 
 		auto it = s_loadedModules.find(modulePath);
 

src/jni/NativeScriptException.cpp

@@ -173,13 +173,20 @@ Local<Value> NativeScriptException::WrapJavaException(JEnv& env)
 	{
 		jfieldID fieldID = env.GetFieldID(env.GetObjectClass(exc), "jsValueAddress", "J");
 		jlong addr = env.GetLongField(exc, fieldID);
+
+		jmethodID gmId = env.GetMethodID(env.GetObjectClass(exc), "getMessage", "()Ljava/lang/String;");
+		jobject javaMessage = env.CallObjectMethod(exc, gmId);
+
 		Local<Value> v;
 		if (addr != 0)
 		{
 			auto pv = (Persistent<Value> *) addr;
 			v = Local<Value>::New(isolate, *pv);
 			pv->Reset();
 		}
+		else if(javaMessage != nullptr) {
+			v = GetJavaExceptionFromEnv(exc, env);
+		}
 		else
 		{
 			v = Null(isolate);
@@ -189,25 +196,30 @@ Local<Value> NativeScriptException::WrapJavaException(JEnv& env)
 	}
 	else
 	{
-		auto errMsg = GetExceptionMessage(env, exc);
-		DEBUG_WRITE("Error during java interop errorMessage %s", errMsg.c_str());
+		auto errObj = GetJavaExceptionFromEnv(exc, env);
+		return errObj;
+	}
+}
 
-		auto msg = ConvertToV8String(errMsg);
-		auto errObj = Exception::Error(msg).As<Object>();
+Local<Value> NativeScriptException::GetJavaExceptionFromEnv(const JniLocalRef& exc, JEnv& env) {
+	auto errMsg = GetExceptionMessage(env, exc);
+	DEBUG_WRITE("Error during java interop errorMessage %s", errMsg.c_str());
 
-		jint javaObjectID = objectManager->GetOrCreateObjectId((jobject) exc);
-		auto nativeExceptionObject = objectManager->GetJsObjectByJavaObject(javaObjectID);
+	auto msg = ConvertToV8String(errMsg);
+	auto errObj = Exception::Error(msg).As<Object>();
 
-		if (nativeExceptionObject.IsEmpty())
-		{
-			string className = objectManager->GetClassName((jobject)exc);
-			nativeExceptionObject = objectManager->CreateJSWrapper(javaObjectID, className);
-		}
-
-		errObj->Set(V8StringConstants::GetNativeException(), nativeExceptionObject);
+	jint javaObjectID = objectManager->GetOrCreateObjectId((jobject) exc);
+	auto nativeExceptionObject = objectManager->GetJsObjectByJavaObject(javaObjectID);
 
-		return errObj;
+	if (nativeExceptionObject.IsEmpty())
+	{
+		string className = objectManager->GetClassName((jobject)exc);
+		nativeExceptionObject = objectManager->CreateJSWrapper(javaObjectID, className);
 	}
+
+	errObj->Set(V8StringConstants::GetNativeException(), nativeExceptionObject);
+
+	return errObj;
 }
 
 void NativeScriptException::ThrowExceptionToV8(const string& exceptionMessage)

src/jni/NativeScriptException.h

@@ -34,10 +34,11 @@ namespace tns
 		static string GetExceptionMessage(JEnv& env, jthrowable exception);
 		static Local<Value> WrapJavaException(JEnv& env);
 		static void ThrowExceptionToV8(const string& exceptionMessage);
+		static Local<Value> GetJavaExceptionFromEnv(const JniLocalRef& exc, JEnv& env);
 
 		string GetFullMessage(const TryCatch& tc, bool isExceptionEmpty, bool isMessageEmpty, const string& prependMessage = "");
-		JniLocalRef GetJavaException(const TryCatch& tc, bool isExceptionEmpty, bool isMessageEmpty, const string& prependMessage = "");
 
+		JniLocalRef GetJavaException(const TryCatch& tc, bool isExceptionEmpty, bool isMessageEmpty, const string& prependMessage = "");
 		Local<Value> m_javascriptException;
 		JniLocalRef m_javaException;
 		string m_message;

src/src/com/tns/Module.java

@@ -57,40 +57,17 @@ static String getApplicationFilesPath()
 	@RuntimeCallable
 	private static String resolvePath(String path, String baseDir)
 	{
-		// This method is called my the NativeScriptRuntime.cpp RequireCallback method.
 		// The baseDir is the directory path of the calling module.
 		checkForExternalPath = true;
 		File file = resolvePathHelper(path, baseDir);
 
-		if (file != null && file.exists())
-		{
-			File projectRootDir = new File(RootPackageDir);
-			if (checkForExternalPath && isFileExternal(file, projectRootDir))
-			{
-				if (logger.isEnabled())
-				{
-					logger.write("Module " + path + " is on external path");
-				}
-				return "EXTERNAL_FILE_ERROR";
-			}
-			else
-			{
-				return file.getAbsolutePath();
-			}
-		}
-
-		// empty path will be handled by the NativeScriptRuntime.cpp and a JS error will be thrown
-		if (logger.isEnabled())
-		{
-			logger.write("Module " + path + " not found. required from directory " + baseDir);
-		}
-		return "";
+		return file.getAbsolutePath();
 	}
 
 	private static boolean isFileExternal(File source, File target)
 	{
 		File currentParentDir = source.getParentFile();
-
+		
 		while (currentParentDir != null)
 		{
 			if (currentParentDir.equals(target))
@@ -108,6 +85,7 @@ private static File resolvePathHelper(String path, String baseDir)
 	{
 		File directory = null;
 		File file = null;
+		String possibleException  = null;
 
 		if (baseDir == null || baseDir.isEmpty())
 		{
@@ -119,19 +97,37 @@ private static File resolvePathHelper(String path, String baseDir)
 			// absolute path
 			directory = new File(path);
 			file = getFileWithExtension(path);
+			if(!file.exists()) {
+				possibleException = "Failed to find module with absolute path: \"" + path + "\".";
+			}
 		}
 		else if (path.startsWith("./") || path.startsWith("../") || path.startsWith("~/"))
 		{
 			// same or up directory
 			String resolvedPath = FileSystem.resolveRelativePath(ApplicationFilesPath, path, baseDir);
 			directory = new File(resolvedPath);
 			file = getFileWithExtension(directory.getAbsolutePath());
+			
+			if(!file.exists()) {
+				if(path.startsWith("~/")) {
+					possibleException = "Failed to find module: \"" + path + "\", relative to: " + ModulesFilesPath;
+				}
+				else {
+					String paretnFolderPath = file.getParentFile().getAbsolutePath();
+					if(ApplicationFilesPath.length() <= paretnFolderPath.length()) {
+						possibleException = "Failed to find module: \"" + path + "\", relative to: " + paretnFolderPath.substring(ApplicationFilesPath.length()) + "/";
+					}
+				}
+			}
 		}
 		else
 		{
 			// search for tns_module
 			directory = new File(ApplicationFilesPath + NativeScriptModulesFilesPath, path);
 			file = getFileWithExtension(directory.getPath());
+			if(!file.exists()) {
+				possibleException = "Failed to find module: \"" + path + "\", relative to: " + NativeScriptModulesFilesPath;
+			}
 		}
 
 		if (!file.exists() && directory.exists() && directory.isDirectory())
@@ -161,14 +157,14 @@ else if (path.startsWith("./") || path.startsWith("../") || path.startsWith("~/"
 					}
 					catch (IOException e)
 					{
-						// json read failed
-						file = null;
+						throw new NativeScriptException(e.getMessage());
 					}
 					catch (JSONException e)
 					{
-						file = null;
+						throw new NativeScriptException(e.getMessage());
 					}
 				}
+				
 				if (!found)
 				{
 					// search for index.js
@@ -177,19 +173,29 @@ else if (path.startsWith("./") || path.startsWith("../") || path.startsWith("~/"
 
 				// TODO: search for <folderName>.js ?
 
-				if(file != null) {
-					// cache the main file for later use
-					folderAsModuleCache.put(folderPath, file.getAbsolutePath());
-				}
+				// cache the main file for later use
+				folderAsModuleCache.put(folderPath, file.getAbsolutePath());
 			}
 			else {
 				// do not check whether this path is external for the application - it is already checked
 				checkForExternalPath = false;
 				file = new File(cachedPath);
 			}
 		}
-
-		return file;
+		
+		File projectRootDir = new File(ApplicationFilesPath);
+		if (checkForExternalPath && isFileExternal(file, projectRootDir))
+		{
+			throw new NativeScriptException("Module " + path + " is an external path. You can only load modules inside the application!");
+		}
+		
+		if (file.exists())
+		{
+			return file;
+		}
+		else {
+			throw new NativeScriptException(possibleException);
+		}
 	}
 
 	private static File getFileWithExtension(String path)

test-app/assets/app/mainpage.js

@@ -17,13 +17,13 @@ require("./tests/stringConversionTests");
 require("./tests/testsForTypescript"); 
 require("./tests/testGC");
 require("./tests/testsMemoryManagement");
-require("./tests/testIfAbleToRunExternalFile");
 require("./tests/testFieldGetSet");
 require("./tests/extendedClassesTests");
 require("./tests/extendClassNameTests");
 require("./tests/testJniReferenceLeak");
 require("./tests/testRequireJSON");
 require("./tests/testNativeModules");
+require("./tests/requireExceptionTests");
 
 var MainActivity = {
     onCreate: function (bundle) {