eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-27 01:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Support --local-script-source for module scripts (#41445)

Browse Source 
The `substitute_with_local_script` logic has been refactored into a
standalone function to allow reuse in `script_module.rs` when a module
script's source is fetched and decoded.

Testing: Verified manually by running Servo with a local HTTP server and
a module script, confirming that the local file correctly replaces the
remote one when the `--local-script-source` flag is provided.

Fixes: #41433

Signed-off-by: WaterWhisperer <waterwhisperer24@qq.com>
This commit is contained in:
WaterWhisperer
2025-12-21 20:30:22 +08:00
committed by GitHub
parent b0734b7f2d
commit a45186675a
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
components/script/dom/html/htmlscriptelement.rs
View File

@@ -415,7 +415,9 @@ impl FetchResponseListener for ClassicContext {
let elem = self.elem.root();
let global = elem.global();
elem.substitute_with_local_script(&mut source_text, final_url.clone());
if let Some(window) = global.downcast::<Window>() {
substitute_with_local_script(window, &mut source_text, final_url.clone());
}
// Step 5.6. Let mutedErrors be true if response was CORS-cross-origin, and false otherwise.
let muted_errors = self.response_was_cors_cross_origin;
@@ -967,33 +969,6 @@ impl HTMLScriptElement {
}
}
fn substitute_with_local_script(&self, script: &mut Cow<'_, str>, url: ServoUrl) {
if self
.parser_document
.window()
.local_script_source()
.is_none()
{
return;
}
let mut path = PathBuf::from(
self.parser_document
.window()
.local_script_source()
.clone()
.unwrap(),
);
path = path.join(&url[url::Position::BeforeHost..]);
debug!("Attempting to read script stored at: {:?}", path);
match read_to_string(path.clone()) {
Ok(local_script) => {
debug!("Found script stored at: {:?}", path);
*script = Cow::Owned(local_script);
},
Err(why) => warn!("Could not restore script from file {:?}", why),
}
}
/// <https://html.spec.whatwg.org/multipage/#execute-the-script-element>
pub(crate) fn execute(&self, result: ScriptResult, can_gc: CanGc) {
// Step 1. Let document be el's node document.
@@ -1500,6 +1475,26 @@ impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement {
}
}
pub(crate) fn substitute_with_local_script(
window: &Window,
script: &mut Cow<'_, str>,
url: ServoUrl,
) {
if window.local_script_source().is_none() {
return;
}
let mut path = PathBuf::from(window.local_script_source().clone().unwrap());
path = path.join(&url[url::Position::BeforeHost..]);
debug!("Attempting to read script stored at: {:?}", path);
match read_to_string(path.clone()) {
Ok(local_script) => {
debug!("Found script stored at: {:?}", path);
*script = Cow::Owned(local_script);
},
Err(why) => warn!("Could not restore script from file {:?}", why),
}
}
#[derive(Clone, Copy)]
enum ExternalScriptKind {
Deferred,