devtools resource's content will be empty if file path resolution fails

Author: petekanev

runtime/src/main/java/com/tns/AndroidJsV8Inspector.java

@@ -140,7 +140,7 @@ private static List<Pair<String, String>> traverseResources(File dir) {
     private static String getMimeType(String url) {
         String type = null;
         String extension = MimeTypeMap.getFileExtensionFromUrl(url);
-        if (extension != null) {
+        if (!extension.isEmpty()) {
             type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
 
             // getMimeType may sometime return incorrect results in the context of NativeScript

runtime/src/main/jni/v8_inspector/src/inspector/utils/v8-page-resources.cpp

@@ -8,6 +8,7 @@
 #include <NativeScriptAssert.h>
 #include <fstream>
 #include <iostream>
+#include <JniLocalRef.h>
 #include "base64.h"
 #include "v8_inspector/src/inspector/utils/v8-page-resources.h"
 #include "JEnv.h"
@@ -40,27 +41,21 @@ std::map<std::string, v8_inspector::utils::PageResource> PageResource::getPageRe
 
     jmethodID getResourcesMethod = env.GetStaticMethodID(inspectorClass, "getPageResources", "()[Landroid/util/Pair;");
     jobject arrayOfPairs = env.CallStaticObjectMethod(inspectorClass, getResourcesMethod);
-    jobjectArray pairs = static_cast<jobjectArray>(arrayOfPairs);
+    tns::JniLocalRef pairs(static_cast<jobjectArray>(arrayOfPairs));
     int arrSize = env.GetArrayLength(pairs);
 
     for (int i = 0; i < arrSize; ++i) {
-        auto pair = env.GetObjectArrayElement(pairs, i);
-        auto pairFilePath = (jstring) env.GetObjectField(pair, pairFirst);
-        auto pairMimeType = (jstring) env.GetObjectField(pair, pairSecond);
+        tns::JniLocalRef pair(env.GetObjectArrayElement(pairs, i));
+        tns::JniLocalRef pairFilePath((jstring) env.GetObjectField(pair, pairFirst));
+        tns::JniLocalRef pairMimeType((jstring) env.GetObjectField(pair, pairSecond));
 
         auto filePath = tns::ArgConverter::jstringToString(pairFilePath);
         auto mimeType = tns::ArgConverter::jstringToString(pairMimeType);
 
         utils::PageResource pageResource(filePath, mimeType);
         result.insert(std::make_pair(filePath, pageResource));
-
-        env.DeleteLocalRef(pairFilePath);
-        env.DeleteLocalRef(pairMimeType);
-        env.DeleteLocalRef(pair);
     }
 
-    env.DeleteLocalRef(pairs);
-
     s_cachedPageResources = result;
 
     return result;

runtime/src/main/jni/v8_inspector/src/inspector/v8-page-agent-impl.cpp

@@ -103,7 +103,7 @@ void V8PageAgentImpl::getResourceContent(ErrorString* errorString, const String&
     auto it = cachedPageResources.find(in_url.utf8());
     if (it == cachedPageResources.end()) {
         *errorString = "Resource not found.";
-
+        *out_content = "";
         return;
     }