Skip to content

First part of work for #4498. Separate folder for each CEF cache/cookie instance #4499

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

First part of work for #4498. Separate folder for each CEF cache/cookie instance #4499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
356b682
First part of work for #4498. This change forces each CEF instance to…
callumlinden Aug 7, 2025
1bbad3f
This commit introduces CEF 139 which works now that each media instan…
callumlinden Aug 12, 2025
454f93e
A ??) sequence was mis-interpreted by the pre-commit hooks as a trigr…
callumlinden Aug 12, 2025
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
148 changes: 74 additions & 74 deletions autobuild.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,6 @@
</map>
<key>boost</key>
<map>
<key>copyright</key>
<string>(see individual source files)</string>
<key>description</key>
<string>Boost C++ Libraries</string>
<key>license</key>
<string>boost 1.0</string>
<key>license_file</key>
<string>LICENSES/boost.txt</string>
<key>name</key>
<string>boost</string>
<key>platforms</key>
<map>
<key>darwin64</key>
Expand Down Expand Up @@ -154,8 +144,18 @@
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>boost 1.0</string>
<key>license_file</key>
<string>LICENSES/boost.txt</string>
<key>copyright</key>
<string>(see individual source files)</string>
<key>version</key>
<string>1.86</string>
<key>name</key>
<string>boost</string>
<key>description</key>
<string>Boost C++ Libraries</string>
</map>
<key>bugsplat</key>
<map>
Expand Down Expand Up @@ -205,14 +205,6 @@
</map>
<key>colladadom</key>
<map>
<key>copyright</key>
<string>Copyright 2006 Sony Computer Entertainment Inc.</string>
<key>license</key>
<string>SCEA</string>
<key>license_file</key>
<string>LICENSES/collada.txt</string>
<key>name</key>
<string>colladadom</string>
<key>platforms</key>
<map>
<key>darwin64</key>
Expand Down Expand Up @@ -258,8 +250,16 @@
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>SCEA</string>
<key>license_file</key>
<string>LICENSES/collada.txt</string>
<key>copyright</key>
<string>Copyright 2006 Sony Computer Entertainment Inc.</string>
<key>version</key>
<string>2.3.0-r8</string>
<key>name</key>
<string>colladadom</string>
</map>
<key>cubemaptoequirectangular</key>
<map>
Expand Down Expand Up @@ -441,28 +441,18 @@
</map>
<key>dullahan</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2017, Linden Research, Inc.</string>
<key>description</key>
<string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
<key>license</key>
<string>MPL</string>
<key>license_file</key>
<string>LICENSES/LICENSE.txt</string>
<key>name</key>
<string>dullahan</string>
<key>platforms</key>
<map>
<key>darwin64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>7fde76e3f0e62d0e0593b6157f4d740ecef2429d</string>
<string>8f3672e548c140a48296669b65cb4ce9a54154e2</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/dullahan/releases/download/v1.14.0-r3/dullahan-1.14.0.202408091638_118.4.1_g3dd6078_chromium-118.0.5993.54-darwin64-10322607516.tar.zst</string>
<string>https://github.com/secondlife/dullahan/releases/download/v1.16.0-CEF_139.0.17/dullahan-1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31-darwin64-16896111303.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -486,18 +476,28 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4124c79d8b0e319877ffa4c12581d5c1318b4d93</string>
<string>ec077eb13edf0b69324d73b49bb434e69e67d2d0</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/dullahan/releases/download/v1.14.0-r3/dullahan-1.14.0.202408091639_118.4.1_g3dd6078_chromium-118.0.5993.54-windows64-10322607516.tar.zst</string>
<string>https://github.com/secondlife/dullahan/releases/download/v1.16.0-CEF_139.0.17/dullahan-1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31-windows64-16896111303.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>MPL</string>
<key>license_file</key>
<string>LICENSES/LICENSE.txt</string>
<key>copyright</key>
<string>Copyright (c) 2017, Linden Research, Inc.</string>
<key>version</key>
<string>1.14.0.202408091639_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
<string>1.16.0.202508120105_139.0.17_g6c347eb_chromium-139.0.7258.31</string>
<key>name</key>
<string>dullahan</string>
<key>description</key>
<string>A headless browser SDK that uses the Chromium Embedded Framework (CEF). It is designed to make it easier to write applications that render modern web content directly to a memory buffer, inject synthesized mouse and keyboard events as well as interact with web based features like JavaScript or cookies.</string>
</map>
<key>emoji_shortcodes</key>
<map>
Expand Down Expand Up @@ -625,16 +625,6 @@
</map>
<key>freetype</key>
<map>
<key>copyright</key>
<string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
<key>description</key>
<string>Font rendering library</string>
<key>license</key>
<string>FreeType</string>
<key>license_file</key>
<string>LICENSES/freetype.txt</string>
<key>name</key>
<string>freetype</string>
<key>platforms</key>
<map>
<key>darwin64</key>
Expand Down Expand Up @@ -680,8 +670,18 @@
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>FreeType</string>
<key>license_file</key>
<string>LICENSES/freetype.txt</string>
<key>copyright</key>
<string>Copyright 2006, 2007, 2008, 2009, 2010 by David Turner, Robert Wilhelm, and Werner Lemberg.</string>
<key>version</key>
<string>2.13.3-cb2e120</string>
<key>name</key>
<string>freetype</string>
<key>description</key>
<string>Font rendering library</string>
</map>
<key>glext</key>
<map>
Expand Down Expand Up @@ -1395,15 +1395,6 @@
</map>
<key>llca</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
</string>
<key>license</key>
<string>mit</string>
<key>license_file</key>
<string>LICENSES/ca-license.txt</string>
<key>name</key>
<string>llca</string>
<key>platforms</key>
<map>
<key>common</key>
Expand All @@ -1421,8 +1412,17 @@
<string>common</string>
</map>
</map>
<key>license</key>
<string>mit</string>
<key>license_file</key>
<string>LICENSES/ca-license.txt</string>
<key>copyright</key>
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
</string>
<key>version</key>
<string>202407221423.0</string>
<key>name</key>
<string>llca</string>
</map>
<key>llphysicsextensions_source</key>
<map>
Expand Down Expand Up @@ -2620,14 +2620,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map>
<key>vlc-bin</key>
<map>
<key>copyright</key>
<string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
<key>license</key>
<string>GPL2</string>
<key>license_file</key>
<string>LICENSES/vlc.txt</string>
<key>name</key>
<string>vlc-bin</string>
<key>platforms</key>
<map>
<key>darwin64</key>
Expand Down Expand Up @@ -2659,8 +2651,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>windows64</string>
</map>
</map>
<key>license</key>
<string>GPL2</string>
<key>license_file</key>
<string>LICENSES/vlc.txt</string>
<key>copyright</key>
<string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
<key>version</key>
<string>3.0.21.10218721728</string>
<key>name</key>
<string>vlc-bin</string>
</map>
<key>vulkan_gltf</key>
<map>
Expand Down Expand Up @@ -2858,16 +2858,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</map>
<key>tinyexr</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2014 - 2021, Syoyo Fujita and many contributors.</string>
<key>description</key>
<string>tinyexr import library</string>
<key>license</key>
<string>3-clause BSD</string>
<key>license_file</key>
<string>LICENSES/tinyexr_license.txt</string>
<key>name</key>
<string>tinyexr</string>
<key>platforms</key>
<map>
<key>common</key>
Expand All @@ -2885,16 +2875,26 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>common</string>
</map>
</map>
<key>source_type</key>
<string>git</string>
<key>license</key>
<string>3-clause BSD</string>
<key>license_file</key>
<string>LICENSES/tinyexr_license.txt</string>
<key>copyright</key>
<string>Copyright (c) 2014 - 2021, Syoyo Fujita and many contributors.</string>
<key>version</key>
<string>1.0.9-5e8947c</string>
<key>name</key>
<string>tinyexr</string>
<key>vcs_branch</key>
<string>dependabot/github_actions/secondlife/action-autobuild-4</string>
<key>vcs_revision</key>
<string>4dc4d1d90d82a22843e2adf5130f9ecb5ee5769e</string>
<key>vcs_url</key>
<string>https://github.com/secondlife/3p-tinyexr</string>
<key>version</key>
<string>1.0.9-5e8947c</string>
<key>description</key>
<string>tinyexr import library</string>
<key>source_type</key>
<string>git</string>
</map>
<key>discord_sdk</key>
<map>
Expand Down
61 changes: 46 additions & 15 deletions indra/media_plugins/cef/media_plugin_cef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
#include "volume_catcher.h"
#include "media_plugin_base.h"

// _getpid()/getpid()
#if LL_WINDOWS
#include <process.h>
#else
#include <unistd.h>
#endif

#include "dullahan.h"

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -64,7 +71,7 @@ class MediaPluginCEF :
void onLoadStartCallback();
void onRequestExitCallback();
void onLoadEndCallback(int httpStatusCode, std::string url);
void onLoadError(int status, const std::string error_text);
void onLoadError(int status, const std::string error_text, const std::string error_url);
void onAddressChangeCallback(std::string url);
void onOpenPopupCallback(std::string url, std::string target);
bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password);
Expand Down Expand Up @@ -242,15 +249,17 @@ void MediaPluginCEF::onLoadStartCallback()

/////////////////////////////////////////////////////////////////////////////////
//
void MediaPluginCEF::onLoadError(int status, const std::string error_text)
void MediaPluginCEF::onLoadError(int status, const std::string error_text, const std::string error_url)
{
std::stringstream msg;

msg << "<b>Loading error!</b>";
msg << "<b>Loading error</b>";
msg << "<p>";
msg << "Message: " << error_text;
msg << "<br>";
msg << "Code: " << status;
msg << "Error message: " << error_text;
msg << "<p>";
msg << "Error URL: <tt>" << error_url << "</tt>";
msg << "<p>";
msg << "Error code: " << status;

mCEFLib->showBrowserMessage(msg.str());
}
Expand Down Expand Up @@ -607,7 +616,12 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
mCEFLib->setOnTooltipCallback(std::bind(&MediaPluginCEF::onTooltipCallback, this, std::placeholders::_1));
mCEFLib->setOnLoadStartCallback(std::bind(&MediaPluginCEF::onLoadStartCallback, this));
mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1, std::placeholders::_2));
mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2));

// CEF 139 seems to have introduced a loading failure at the login page (only?) I haven't seen it on
// any other page and it only happens about 1 in 8 times. Without this handler for the error page
// (red box, error message/code/url) the page load recovers after display a brief built in error.
// Not ideal but better than stopping altgoether. Will restore this once I discover the error.
//mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1));
mCEFLib->setOnOpenPopupCallback(std::bind(&MediaPluginCEF::onOpenPopupCallback, this, std::placeholders::_1, std::placeholders::_2));
mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
Expand Down Expand Up @@ -729,17 +743,34 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
std::string user_data_path_cache = message_in.getValue("cache_path");
std::string subfolder = message_in.getValue("username");

mRootCachePath = user_data_path_cache + "cef_cache";
if (!subfolder.empty())
{
std::string delim;
// media plugin doesn't have access to gDirUtilp
std::string path_separator;
#if LL_WINDOWS
// media plugin doesn't have access to gDirUtilp
delim = "\\";
path_separator = "\\";
#else
delim = "/";
path_separator = "/";
#endif
mCachePath = mRootCachePath + delim + subfolder;

mRootCachePath = user_data_path_cache + "cef_cache";

// Issue #4498 Introduce an additional sub-folder underneath the main cache
// folder so that each CEF media instance gets its own (as per the CEF API
// official position). These folders will be removed at startup by Viewer code
// so that their non-trivial size does not exhaust available disk space. This
// begs the question - why turn on the cache at all? There are 2 reasons - firstly
// some of the instances will benefit from per Viewer session caching and will
// use the injected SL cookie and secondly, it's not clear how having no cache
// interacts with the multiple simultaneous paradigm we use.
mRootCachePath += path_separator;
# if LL_WINDOWS
mRootCachePath += std::to_string(_getpid());
# else
mRootCachePath += std::to_string(getpid());
# endif

if (!subfolder.empty())
{
mCachePath = mRootCachePath + path_separator + subfolder;
}
else
{
Expand Down
Loading
Loading