Commit 201ba8c

Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people. Reviewed By: yungsters Differential Revision: D8961622 fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c

2 files changed

Lines changed: 33 additions & 7 deletions

File tree

‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
std::unique_ptr<const JSBigString> startupScript,
100101
std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
[bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
[this,
104+
bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
(JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
executor->setBundleRegistry(std::move(bundleRegistry));
109111
}
110-
executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
} catch (...) {
116+
m_applicationScriptHasFailure = true;
117+
throw;
118+
}
112119
});
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
}
122-
m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
} catch (...) {
133+
m_applicationScriptHasFailure = true;
134+
throw;
135+
}
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
systraceCookie);
137149
#endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
(JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
}
157+
141158
#ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
systraceCookie);
163180
#endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
(JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
}
167188
#ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,

‎ReactCommon/cxxreact/NativeToJsBridge.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
std::unique_ptr<JSExecutor> m_executor;
9595
std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
#ifdef WITH_FBSYSTRACE
98103
std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
#endif

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Commit 201ba8c
Browse files
fkgozalifacebook-github-bot
fkgozali
authored and
facebook-github-bot
committed
Catch JS bundle load failure and prevent calls to JS after that
Summary: There are cases where JS bundle fails to be evaluated, which throws an exception already, but then there were pending calls into JS which would fail in a weird way. This prevents those calls (because it's mostly meaningless at that point). For now, those extra calls will still throw an exception, but with a specific message so that it doesn't confuse people.
Reviewed By: yungsters
Differential Revision: D8961622
fbshipit-source-id: 3f67fb63fdfa9fc5b249de0096e893b07956776a
1 parent c36e8b3 commit 201ba8c
2 files changed
Lines changed: 33 additions & 7 deletions
File tree
‎ReactCommon/cxxreact/NativeToJsBridge.cpp‎
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include<folly/json.h>
99
#include<folly/Memory.h>
1010
#include<folly/MoveWrapper.h>
11+
#include<glog/logging.h>
1112

1213
#include"Instance.h"
1314
#include"JSBigString.h"
@@ -99,16 +100,22 @@ void NativeToJsBridge::loadApplication(
99100
 std::unique_ptr<const JSBigString> startupScript,
100101
 std::string startupScriptSourceURL) {
101102
runOnExecutorQueue(
102-
 [bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103+
 [this,
104+
 bundleRegistryWrap=folly::makeMoveWrapper(std::move(bundleRegistry)),
103105
 startupScript=folly::makeMoveWrapper(std::move(startupScript)),
104106
 startupScriptSourceURL=std::move(startupScriptSourceURL)]
105107
 (JSExecutor* executor) mutable {
106108
auto bundleRegistry = bundleRegistryWrap.move();
107109
if (bundleRegistry) {
108110
 executor->setBundleRegistry(std::move(bundleRegistry));
109111
 }
110-
 executor->loadApplicationScript(std::move(*startupScript),
111-
std::move(startupScriptSourceURL));
112+
try {
113+
 executor->loadApplicationScript(std::move(*startupScript),
114+
std::move(startupScriptSourceURL));
115+
 } catch (...) {
116+
 m_applicationScriptHasFailure = true;
117+
throw;
118+
 }
112119
 });
113120
}
114121

@@ -119,8 +126,13 @@ void NativeToJsBridge::loadApplicationSync(
119126
if (bundleRegistry) {
120127
 m_executor->setBundleRegistry(std::move(bundleRegistry));
121128
 }
122-
 m_executor->loadApplicationScript(std::move(startupScript),
123-
std::move(startupScriptSourceURL));
129+
try {
130+
 m_executor->loadApplicationScript(std::move(startupScript),
131+
std::move(startupScriptSourceURL));
132+
 } catch (...) {
133+
 m_applicationScriptHasFailure = true;
134+
throw;
135+
 }
124136
}
125137

126138
voidNativeToJsBridge::callFunction(
@@ -136,8 +148,13 @@ void NativeToJsBridge::callFunction(
136148
 systraceCookie);
137149
 #endif
138150

139-
runOnExecutorQueue([module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
151+
runOnExecutorQueue([this, module = std::move(module), method = std::move(method), arguments = std::move(arguments), systraceCookie]
140152
 (JSExecutor* executor) {
153+
if (m_applicationScriptHasFailure) {
154+
LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " << module.c_str() << "." << method.c_str() << "()";
155+
throwstd::runtime_error("Attempting to call JS function on a bad application bundle: " + module + "." + method + "()");
156+
 }
157+
141158
 #ifdef WITH_FBSYSTRACE
142159
FbSystraceAsyncFlow::end(
143160
TRACE_TAG_REACT_CXX_BRIDGE,
@@ -162,8 +179,12 @@ void NativeToJsBridge::invokeCallback(double callbackId, folly::dynamic&& argume
162179
 systraceCookie);
163180
 #endif
164181

165-
runOnExecutorQueue([callbackId, arguments = std::move(arguments), systraceCookie]
182+
runOnExecutorQueue([this, callbackId, arguments = std::move(arguments), systraceCookie]
166183
 (JSExecutor* executor) {
184+
if (m_applicationScriptHasFailure) {
185+
LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " << callbackId;
186+
throwstd::runtime_error("Attempting to invoke JS callback on a bad application bundle.");
187+
 }
167188
 #ifdef WITH_FBSYSTRACE
168189
FbSystraceAsyncFlow::end(
169190
TRACE_TAG_REACT_CXX_BRIDGE,
‎ReactCommon/cxxreact/NativeToJsBridge.h‎
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ class NativeToJsBridge {
9494
 std::unique_ptr<JSExecutor> m_executor;
9595
 std::shared_ptr<MessageQueueThread> m_executorMessageQueueThread;
9696

97+
// Keep track of whether the JS bundle containing the application logic causes
98+
// exception when evaluated initially. If so, more calls to JS will very
99+
// likely fail as well, so this flag can help prevent them.
100+
bool m_applicationScriptHasFailure = false;
101+
97102
 #ifdef WITH_FBSYSTRACE
98103
 std::atomic_uint_least32_t m_systraceCookie = ATOMIC_VAR_INIT();
99104
 #endif
0 commit comments
Comments
 (0)