RDKEMW-3106 : Ensure modules path works in all environments #17

Sid2001-maker · 2025-04-08T08:44:06Z

Fetches modules directory path in generic way

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

CLAassistant · 2025-04-08T09:37:20Z

All committers have signed the CLA.

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

vjain008 · 2025-04-10T20:02:21Z

Changes are good and validated with custom build.

mfiess · 2025-04-11T18:48:54Z

include/JavaScriptContextBase.h

@@ -55,6 +55,10 @@ class JavaScriptContextBase:public IJavaScriptContext, public JavaScriptKeyListe
    std::string getUrl();
    virtual void onKeyPress(struct JavaScriptKeyDetails& details);
    virtual void onKeyRelease(struct JavaScriptKeyDetails& details);
+
+ //newly added


Please remove the "newly added" comments - here and in the other places.

madanagopalt · 2025-04-12T06:17:58Z

include/JavaScriptContextBase.h

@@ -55,6 +55,10 @@ class JavaScriptContextBase:public IJavaScriptContext, public JavaScriptKeyListe
    std::string getUrl();
    virtual void onKeyPress(struct JavaScriptKeyDetails& details);
    virtual void onKeyRelease(struct JavaScriptKeyDetails& details);
+
+ //newly added
+    static void setEnvVariable(const char* name, const char* value);


We don't want this method.

madanagopalt · 2025-04-12T06:18:22Z

include/JavaScriptContextBase.h

+
+    //newly added
+    static std::string sModulesPath;
+    std::string getModulesPath();


should this be static method?

madanagopalt · 2025-04-12T06:19:19Z

src/JavaScriptContextBase.cpp

 JavaScriptContextFeatures::JavaScriptContextFeatures(bool embedThunderJS, bool embedWebBridge, bool enableWebSockerServer, ModuleSettings& moduleSettings):mEmbedThunderJS(embedThunderJS), mEmbedWebBridge(embedWebBridge), mEnableWebSockerServer(enableWebSockerServer), mModuleSettings(moduleSettings)
 {
 }

 JavaScriptContextBase::JavaScriptContextBase(JavaScriptContextFeatures& features, std::string url, IJavaScriptEngine* jsEngine): mApplicationUrl(url), mEngine(jsEngine), mEmbedThunderJS(features.mEmbedThunderJS), mEmbedWebBridge(features.mEmbedWebBridge), mEnableWebSockerServer(features.mEnableWebSockerServer), mModuleSettings(features.mModuleSettings)
 {
+//newly added
+    JavaScriptContextBase::setEnvVariable("JSRUNTIME_MODULES_PATH", "");


We don;t want this method. Only we need to read this env variable JSRUNTIME_MODULES_PATH and should take priority than other modules path

madanagopalt · 2025-04-12T06:19:46Z

src/JavaScriptContextBase.cpp

    if (mEmbedThunderJS)
    {
        if (sThunderJSCode.empty())
        {		
-            sThunderJSCode = readFile("modules/thunderJS.js");
+	    std::string ThunderJS= sModulesPath + "thunderJS.js"


Can we keep all append inside readFile method?

madanagopalt

kindly address comments. Also, keep PR heading with ticketnumber:<title>

Reason for change: Removed unwanted comments newly added Test Procedure: build should be successful. Risks: low Priority: P2

madanagopalt

We have some changes to address. I will explain in meeting

madanagopalt · 2025-05-12T09:29:53Z

src/JavaScriptContextBase.cpp

+                    home = PWD; 
+            }
+            sModulesPath = home;
+            if(setenv("JSRUNTIME_MODULES_PATH",home.c_str(),1)==0){


1, Perfrom getenv and use it as sModulesPath if environment is set
2,Else, set module path to pwd+/modules as written
3, Don;t want multiple if else

madanagopalt · 2025-05-12T09:33:36Z

src/JavaScriptContextBase.cpp


 JavaScriptContextFeatures::JavaScriptContextFeatures(bool embedThunderJS, bool embedWebBridge, bool enableWebSockerServer, ModuleSettings& moduleSettings):mEmbedThunderJS(embedThunderJS), mEmbedWebBridge(embedWebBridge), mEnableWebSockerServer(enableWebSockerServer), mModuleSettings(moduleSettings)
 {
 }

 JavaScriptContextBase::JavaScriptContextBase(JavaScriptContextFeatures& features, std::string url, IJavaScriptEngine* jsEngine): mApplicationUrl(url), mEngine(jsEngine), mEmbedThunderJS(features.mEmbedThunderJS), mEmbedWebBridge(features.mEmbedWebBridge), mEnableWebSockerServer(features.mEnableWebSockerServer), mModuleSettings(features.mModuleSettings)
 {
+    getModulesPath();


Rename as populateModulesPath

madanagopalt · 2025-05-12T09:35:43Z

src/JavaScriptContextBase.cpp

@@ -77,6 +82,22 @@ std::string JavaScriptContextBase::readFile(const char *file)
    std::ifstream       src_file(file);
    std::stringstream   src_script;
    src_script << src_file.rdbuf();
+    if(src_script.str().empty())


1, Get one argument to readFile isModule (by default true). Pass it false, when we are calling this api for running local file/application
2, This will avoid read to fail everytime for all modules fist time.
3, Also, if isModule is set, read the file after appending modulespath, else ready directly

madanagopalt

kindly look at comments

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

Reason for change: Removed unwanted comments newly added Test Procedure: build should be successful. Risks: low Priority: P2

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

RDKEMW-3106 : Module Path in generic way

d8faa44

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

Sid2001-maker requested a review from a team as a code owner April 8, 2025 08:44

Sid2001-maker requested review from madanagopalt and removed request for a team April 8, 2025 08:44

Sid2001-maker force-pushed the topic/RDKEMW-3106 branch from 38e64c1 to f890afe Compare April 8, 2025 10:15

RDKEMW-3106 : added new if statement

5e51018

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

Sid2001-maker force-pushed the topic/RDKEMW-3106 branch from f890afe to 5e51018 Compare April 8, 2025 12:49

mfiess requested changes Apr 11, 2025

View reviewed changes

madanagopalt reviewed Apr 12, 2025

View reviewed changes

madanagopalt requested changes Apr 12, 2025

View reviewed changes

Sid2001-maker force-pushed the topic/RDKEMW-3106 branch from 2f4d144 to 0475bf3 Compare April 15, 2025 08:10

Sid2001-maker changed the title ~~Topic/rdkemw 3106~~ RDKEMW-3106 : Ensure modules path works in all environments Apr 15, 2025

RDKEMW-3106 : Module Path in generic way

093e915

Reason for change: Removed unwanted comments newly added Test Procedure: build should be successful. Risks: low Priority: P2

Sid2001-maker force-pushed the topic/RDKEMW-3106 branch from 0475bf3 to 093e915 Compare April 15, 2025 09:23

madanagopalt requested changes Apr 23, 2025

View reviewed changes

madanagopalt reviewed May 12, 2025

View reviewed changes

madanagopalt requested changes May 12, 2025

View reviewed changes

Sid2001-maker and others added 4 commits June 16, 2025 16:18

RDKEMW-3106 : Module Path in generic way

c1941be

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

RDKEMW-3106 : added new if statement

d26bde6

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

RDKEMW-3106 : Module Path in generic way

cca9675

Reason for change: Removed unwanted comments newly added Test Procedure: build should be successful. Risks: low Priority: P2

RDKEMW-3106 : Ensure modules path works in all environments

bb4c05c

Reason for change: Cleaned up the code Test Procedure: build should be successful. Risks: low Priority: P2

Sid2001-maker closed this Jun 16, 2025

Sid2001-maker reopened this Jun 16, 2025

Sid2001-maker closed this Jun 16, 2025

Sid2001-maker deleted the topic/RDKEMW-3106 branch June 16, 2025 11:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

RDKEMW-3106 : Ensure modules path works in all environments #17

RDKEMW-3106 : Ensure modules path works in all environments #17

Uh oh!

Sid2001-maker commented Apr 8, 2025

Uh oh!

CLAassistant commented Apr 8, 2025 •

edited

Loading

Uh oh!

vjain008 commented Apr 10, 2025

Uh oh!

mfiess Apr 11, 2025

Uh oh!

madanagopalt Apr 12, 2025

Uh oh!

madanagopalt Apr 12, 2025

Uh oh!

madanagopalt Apr 12, 2025

Uh oh!

madanagopalt Apr 12, 2025

Uh oh!

madanagopalt left a comment

Uh oh!

madanagopalt left a comment

Uh oh!

madanagopalt May 12, 2025

Uh oh!

madanagopalt May 12, 2025

Uh oh!

madanagopalt May 12, 2025

Uh oh!

madanagopalt left a comment

Uh oh!

Uh oh!

RDKEMW-3106 : Ensure modules path works in all environments #17

RDKEMW-3106 : Ensure modules path works in all environments #17

Uh oh!

Conversation

Sid2001-maker commented Apr 8, 2025

Uh oh!

CLAassistant commented Apr 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vjain008 commented Apr 10, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

madanagopalt left a comment

Choose a reason for hiding this comment

Uh oh!

madanagopalt left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

madanagopalt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

CLAassistant commented Apr 8, 2025 •

edited

Loading