mercuryworkshop-mirror/scramjet
1
0
Fork 0
mirror of https://github.com/MercuryWorkshop/scramjet.git synced 2025-05-14 15:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove servo code from wasm rewriter

Browse source
This commit is contained in:
Toshit Chawda 2024-12-13 23:02:27 -08:00
parent 6c437d528f
commit 509b10337a
No known key found for this signature in database
GPG key ID: 91480ED99E2B3D9D
12 changed files with 39 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rewriter/wasm/src/error.rs
View file

@ -7,8 +7,6 @@ use wasm_bindgen::{JsError, JsValue};
pub enum RewriterError {
#[error("JS: {0}")]
Js(String),
#[error("URL parse error: {0}")]
Url(#[from] url::ParseError),
#[error("str fromutf8 error: {0}")]
Str(#[from] std::str::Utf8Error),
#[error("Rewriter: {0}")]

37
rewriter/wasm/src/lib.rs
View file

@ -1,14 +1,14 @@
pub mod error;
use std::{str::FromStr, sync::Arc, time::Duration};
use std::{sync::Arc, time::Duration};
use error::{Result, RewriterError};
use instant::Instant;
use js_sys::{Function, Object, Reflect};
use oxc::diagnostics::NamedSource;
use rewriter::{cfg::Config, rewrite, RewriteResult};
use url::Url;
use wasm_bindgen::prelude::*;
use web_sys::Url;
#[wasm_bindgen(typescript_custom_section)]
const REWRITER_OUTPUT: &'static str = r#"
@ -39,12 +39,16 @@ extern "C" {
fn error(s: &str);
}
fn create_encode_function(encode: JsValue) -> Result<impl Fn(String) -> String + Clone> {
fn create_encode_function(
encode: JsValue,
base: String,
) -> Result<impl Fn(String) -> String + Clone> {
let encode = encode.dyn_into::<Function>()?;
Ok(move |str: String| {
let url = Url::new_with_base(&str, &base).unwrap().to_string();
encode
.call1(&JsValue::NULL, &str.into())
.call1(&JsValue::NULL, &url.into())
.unwrap()
.as_string()
.unwrap()
@ -74,25 +78,20 @@ fn get_flag(scramjet: &Object, url: &str, flag: &str) -> Result<bool> {
let fenabled = get_obj(scramjet, "flagEnabled")?
.dyn_into::<Function>()
.map_err(|_| RewriterError::not_fn("scramjet.flagEnabled"))?;
let ret = fenabled.call2(
&JsValue::NULL,
&flag.into(),
&web_sys::Url::new(url)?.into(),
)?;
let ret = fenabled.call2(&JsValue::NULL, &flag.into(), &Url::new(url)?.into())?;
ret.as_bool()
.ok_or_else(|| RewriterError::not_bool("scramjet.flagEnabled return value"))
}
fn get_config(scramjet: &Object, url: &str) -> Result<Config<impl Fn(String) -> String + Clone>> {
fn get_config(scramjet: &Object, url: String) -> Result<Config<impl Fn(String) -> String + Clone>> {
let codec = &get_obj(scramjet, "codec")?;
let config = &get_obj(scramjet, "config")?;
let globals = &get_obj(config, "globals")?;
Ok(Config {
prefix: get_str(config, "prefix")?,
encoder: create_encode_function(get_obj(codec, "encode")?)?,
base: Url::from_str(url)?,
base: url.clone(),
sourcetag: scramtag(),
wrapfn: get_str(globals, "wrapfn")?,
@ -103,10 +102,12 @@ fn get_config(scramjet: &Object, url: &str) -> Result<Config<impl Fn(String) ->
setrealmfn: get_str(globals, "setrealmfn")?,
pushsourcemapfn: get_str(globals, "pushsourcemapfn")?,
do_sourcemaps: get_flag(scramjet, url, "sourcemaps")?,
capture_errors: get_flag(scramjet, url, "captureErrors")?,
scramitize: get_flag(scramjet, url, "scramitize")?,
strict_rewrites: get_flag(scramjet, url, "strictRewrites")?,
do_sourcemaps: get_flag(scramjet, &url, "sourcemaps")?,
capture_errors: get_flag(scramjet, &url, "captureErrors")?,
scramitize: get_flag(scramjet, &url, "scramitize")?,
strict_rewrites: get_flag(scramjet, &url, "strictRewrites")?,
urlrewriter: create_encode_function(get_obj(codec, "encode")?, url)?,
})
}
@ -142,7 +143,7 @@ fn create_rewriter_output(
#[wasm_bindgen]
pub fn rewrite_js(
js: String,
url: &str,
url: String,
script_url: String,
scramjet: &Object,
) -> Result<JsRewriterOutput> {
@ -156,7 +157,7 @@ pub fn rewrite_js(
#[wasm_bindgen]
pub fn rewrite_js_from_arraybuffer(
js: Vec<u8>,
url: &str,
url: String,
script_url: String,
scramjet: &Object,
) -> Result<JsRewriterOutput> {