Skip to content

RDK-59629 : UserAgent string need to be aligned with browser for diff… #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vjain008 merged 1 commit into from
Oct 22, 2025
Merged

RDK-59629 : UserAgent string need to be aligned with browser for diff… #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions include/NativeJSRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ namespace JsRuntime {

struct ApplicationRequest
{
ApplicationRequest(uint32_t id, RequestType requestType, std::string url="", bool enableHttp=false, bool enableXHR=false, bool enableWebSocket=false, bool enableWebSocketEnhanced=false, bool enableFetch=false, bool enableJSDOM=false, bool enableWindow=false, bool enablePlayer=false): mId(id), mRequestType(requestType), mUrl(url), mEnableHttp(enableHttp), mEnableXHR(enableXHR), mEnableWebSocket(enableWebSocket), mEnableWebSocketEnhanced(enableWebSocketEnhanced), mEnableFetch(enableFetch), mEnableJSDOM(enableJSDOM), mEnableWindow(enableWindow), mEnablePlayer(enablePlayer)
ApplicationRequest(uint32_t id, RequestType requestType, std::string url="", bool enableHttp=false, bool enableXHR=false, bool enableWebSocket=false, bool enableWebSocketEnhanced=false, bool enableFetch=false, bool enableJSDOM=false, bool enableWindow=false, bool enablePlayer=false, std::string userAgent=""): mId(id), mRequestType(requestType), mUrl(url), mEnableHttp(enableHttp), mEnableXHR(enableXHR), mEnableWebSocket(enableWebSocket), mEnableWebSocketEnhanced(enableWebSocketEnhanced), mEnableFetch(enableFetch), mEnableJSDOM(enableJSDOM), mEnableWindow(enableWindow), mEnablePlayer(enablePlayer), mUserAgent(userAgent)
{
}
uint32_t mId;
Expand All @@ -106,6 +106,8 @@ namespace JsRuntime {
bool mEnableJSDOM;
bool mEnableWindow;
bool mEnablePlayer;
std::string mUserAgent;

};
struct ApplicationData{
std::string url;
Expand All @@ -123,10 +125,11 @@ namespace JsRuntime {
void setEnvForConsoleMode(ModuleSettings& moduleSettings);
bool runApplication(uint32_t id, std::string url);
bool runJavaScript(uint32_t id, std::string code);
uint32_t createApplication(ModuleSettings& moduleSettings) ;
uint32_t createApplication(ModuleSettings& moduleSettings, std::string userAgent) ;
bool terminateApplication(uint32_t id);
std::list<ApplicationDetails> getApplications();
void setExternalApplicationHandler(std::shared_ptr<IExternalApplicationHandler> handler);
std::string getBaseUserAgent();
private:
bool downloadFile(std::string& url, MemoryStruct& chunk);
void processDevConsoleRequests();
Expand All @@ -151,5 +154,6 @@ namespace JsRuntime {
std::map<uint32_t, ApplicationData> mContextMap;
std::vector<ApplicationRequest> gPendingRequests;
std::shared_ptr<IExternalApplicationHandler> mExternalApplicationHandler;
std::string mBaseUserAgent;
};
};
4 changes: 2 additions & 2 deletions src/JSRuntimeServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void JSRuntimeServer::onMessage(websocketpp::connection_hdl hdl, message_ptr msg
std::string options = jParams.getString("moduleSettings", error);
ModuleSettings moduleSettings;
moduleSettings.fromString(options);
uint32_t id = mRenderer->createApplication(moduleSettings);
uint32_t id = mRenderer->createApplication(moduleSettings, mRenderer->getBaseUserAgent());
mRenderer->runApplication(id, url);
std::ostringstream oss;
oss<< "ID : " << id;
Expand All @@ -237,7 +237,7 @@ void JSRuntimeServer::onMessage(websocketpp::connection_hdl hdl, message_ptr msg
}
ModuleSettings moduleSettings;
moduleSettings.fromString(options);
uint32_t id = mRenderer->createApplication(moduleSettings);
uint32_t id = mRenderer->createApplication(moduleSettings,mRenderer->getBaseUserAgent());
std::ostringstream oss;
oss<< "ID : " << id;
result = oss.str();
Expand Down
23 changes: 19 additions & 4 deletions src/NativeJSRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ NativeJSRenderer::NativeJSRenderer(std::string waylandDisplay): mEngine(nullptr)
}

const char* levelFromEnv = getenv("NATIVEJS_LOG_LEVEL");

//setting the base userAgent value
mBaseUserAgent = "Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15 ";

// checking for ethan log env
#ifdef USE_ETHANLOG
NativeJSLogger::isEthanLogEnabled();
Expand Down Expand Up @@ -214,12 +218,12 @@ uint32_t NativeJSRenderer::createApplicationIdentifier()
return ret;
}

uint32_t NativeJSRenderer::createApplication(ModuleSettings& moduleSettings)
uint32_t NativeJSRenderer::createApplication(ModuleSettings& moduleSettings, std::string userAgent)
{
uint32_t id=0;
mUserMutex.lock();
id = createApplicationIdentifier();
ApplicationRequest request(id, CREATE, "", moduleSettings.enableHttp, moduleSettings.enableXHR, moduleSettings.enableWebSocket, moduleSettings.enableWebSocketEnhanced, moduleSettings.enableFetch, moduleSettings.enableJSDOM, moduleSettings.enableWindow, moduleSettings.enablePlayer);
ApplicationRequest request(id, CREATE, "", moduleSettings.enableHttp, moduleSettings.enableXHR, moduleSettings.enableWebSocket, moduleSettings.enableWebSocketEnhanced, moduleSettings.enableFetch, moduleSettings.enableJSDOM, moduleSettings.enableWindow, moduleSettings.enablePlayer, userAgent);
gPendingRequests.push_back(request);
mUserMutex.unlock();
return id;
Expand Down Expand Up @@ -289,15 +293,20 @@ void NativeJSRenderer::createApplicationInternal(ApplicationRequest& appRequest)
settings.enableWindow = appRequest.mEnableWindow;
settings.enablePlayer = appRequest.mEnablePlayer;
uint32_t id= appRequest.mId;

std::string userAgent = appRequest.mUserAgent;
JavaScriptContextFeatures features(mEmbedThunderJS, mEmbedRdkWebBridge, mEnableWebSocketServer, settings);
JavaScriptContext* context = new JavaScriptContext(features, "" , mEngine);
if(NULL == context)
{
NativeJSLogger::log(DEBUG, "Context not created for ID: %d\n", id);
return ;
}
NativeJSLogger::log(DEBUG, "Context created for ID: %d\n", id);

std::stringstream uagent;
uagent << "window.navigator.userAgent = \"" << userAgent << "\";";
context->runScript(uagent.str().c_str(),true, userAgent, nullptr, true);

NativeJSLogger::log(DEBUG, "Context created for ID: %d\n", id);
if (mExternalApplicationHandler) {
context->setExternalApplicationHandler(mExternalApplicationHandler);
}
Expand Down Expand Up @@ -619,3 +628,9 @@ void NativeJSRenderer::setExternalApplicationHandler(std::shared_ptr<IExternalAp
{
mExternalApplicationHandler = handler;
}

std::string NativeJSRenderer::getBaseUserAgent()
{
return mBaseUserAgent;
}

2 changes: 1 addition & 1 deletion src/jsruntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int main(int argc, char* argv[])

applicationThreads.emplace_back([renderer, url, &moduleSettings]() {
NativeJSLogger::log(INFO, "Application URL is %s\n", (url.size() ? url.c_str() : "empty"));
uint32_t id = renderer->createApplication(moduleSettings);
uint32_t id = renderer->createApplication(moduleSettings,renderer->getBaseUserAgent());
renderer->runApplication(id, url);
//renderer->runJavaScript(id,url);
#if defined(NATIVEJS_DEVELOPER_MODE)
Expand Down