RDKEMW-13657: Plugin Feature fails on Xione-UK

src/JavaScriptContextBase.cpp

@@ -154,13 +154,26 @@ void JavaScriptContextBase::populateModulesPath()
     if(getenv("JSRUNTIME_MODULES_PATH"))
     {
         std::cout<<"JSRUNTIME_MODULES_PATH variable is set"<<std::endl;
-        sModulesPath = std::string(getenv("JSRUNTIME_MODULES_PATH"));
-        return;
+	const char* envModulesPath = getenv("JSRUNTIME_MODULES_PATH");
+        if(envModulesPath)
+        {
+            sModulesPath = envModulesPath;
+            if (! sModulesPath.empty() && sModulesPath.back() != '/')
+            {
+                sModulesPath += '/';
+            }
+        }
     }
     else{
             char* cwd = getcwd(nullptr,0);
             std::string PWD=cwd;
-            sModulesPath=PWD+"/modules/";
+	    free(cwd);
+            //Required for Plugin
+            if(PWD == "/")
+            {
+                PWD="/home/root";
+            }
+            sModulesPath=PWD+"/modules/"; 
     }
     std::cout<<"Modules Path:"<<sModulesPath<<std::endl;
     return;

src/NativeJSLogger.cpp

@@ -86,14 +86,14 @@ void NativeJSLogger::log(LogLevel level, const char* format, ...)
 
         vethanlog(ethanLogLevel, "JsRuntime", nullptr, -1, newFormat, args);
     }
-#else
-
-    const char* levelStr = logLevelNames[level];
-    char buffer[512];
-    vsnprintf(buffer, sizeof(buffer), format, args);
-    printf("\n[%s] JsRuntime Thread-%d: %s\n", levelStr, threadId, buffer);
-
-#endif //USE_ETHANLOG    
 
+    else
+#endif //USE_ETHANLOG
+    {
+        const char* levelStr = logLevelNames[level];
+        char buffer[512];
+        vsnprintf(buffer, sizeof(buffer), format, args);
+        printf("\n[%s] JsRuntime Thread-%d: %s\n", levelStr, threadId, buffer);
+    }
     va_end(args);
-}
+ }

src/NativeJSRenderer.cpp

@@ -359,7 +359,7 @@ void NativeJSRenderer::runApplicationInternal(ApplicationRequest& appRequest)
 			}
 			JavaScriptContext* context = (JavaScriptContext*)mContextMap[id].context;
 			context->setUrl(mContextMap[id].url);
-			if(context->getModuleSettings().enableJSDOM)
+			if(context->getModuleSettings().enableMiniJSDOM)
 			{
 				std::stringstream window;
             	    		window<<"window.location = {\"href\":\"" << url << "\"};";
@@ -378,7 +378,7 @@ void NativeJSRenderer::runApplicationInternal(ApplicationRequest& appRequest)
 			NativeJSLogger::log(INFO, "About to launch local app\n");
 			JavaScriptContext* context = (JavaScriptContext*)mContextMap[id].context;
                        context->setUrl(mContextMap[id].url);
-			if(context->getModuleSettings().enableJSDOM)
+			if(context->getModuleSettings().enableMiniJSDOM)
             		{
 			    std::stringstream window;
                 	    window<<"window.location = {\"href\":\"file:/" << url << "\"};";

src/jsc/JavaScriptContext.cpp

@@ -139,16 +139,16 @@ void JavaScriptContext::loadAAMPJSBindingsLib()
     if (nullptr == gAAMPJSBindings->PlayerLibHandle)
     {
         static const char *aampJSBindingsLib = "libaampjsbindings.so";
-	// This is required for NativeJS Plugin 
-	#if 0
-	static const char *jscLib = "libJavaScriptCore.so";
-	jscLibHandle = dlopen(jscLib, RTLD_NOW | RTLD_GLOBAL);
-	if (!jscLibHandle)
+	if(!getenv("ETHAN_LOGGING_PIPE"))
 	{
-	    std::cout<<"dlopen error for jsc library " << dlerror() << std::endl;
+		// This is required for NativeJS Plugin 
+		static const char *jscLib = "libJavaScriptCore.so";
+		jscLibHandle = dlopen(jscLib, RTLD_NOW | RTLD_GLOBAL);
+		if (!jscLibHandle)
+	    {
+	        std::cout<<"dlopen error for jsc library " << dlerror() << std::endl;
+	    }
 	}
-	#endif
-
 	void *aampJSBindingsLibHandle = dlopen(aampJSBindingsLib, RTLD_NOW | RTLD_GLOBAL);
         if (aampJSBindingsLibHandle)
         {
@@ -174,7 +174,8 @@ void JavaScriptContext::unloadAAMPJSBindingsLib()
     if (nullptr != gAAMPJSBindings->PlayerLibHandle)
     {
         dlclose(gAAMPJSBindings->PlayerLibHandle);
-	//dlclose(jscLibHandle);
+	 if(!getenv("ETHAN_LOGGING_PIPE"))
+            dlclose(jscLibHandle);
 
     }
 }