Skip to content

Commit b6c168f

Browse files
Stranger6667Stranger6667
committed
chore: Better network error message on WASM
1 parent 33240f7 commit b6c168f

7 files changed

Lines changed: 64 additions & 36 deletions

File tree

‎bindings/javascript/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ napi = { version = "2.14.1", default-features = false, features = ["napi4"] }
2020
napi-derive = "2.14.4"
2121

2222
[target.'cfg(target_arch = "wasm32")'.dependencies]
23+
attohttpc = { version = "0.24", default-features = false }
2324
wasm-bindgen = "0.2.87"
2425
serde-wasm-bindgen = "0.6"
2526
getrandom = { version = "0.2", features = ["js"] }

‎bindings/javascript/__test__/wasm.spec.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,15 @@ test("invalid style", (t) => {
7474
);
7575
t.is(error, "Invalid @ rule: wrong");
7676
});
77+
78+
test("unsupported network operation", (t) => {
79+
const error = t.throws(
80+
() => {
81+
inline(
82+
"<html><head><link href='http://127.0.0.1:5000/external.css' rel='stylesheet' type='text/css'></head><body></body></html>",
83+
);
84+
},
85+
{ any: true },
86+
);
87+
t.is(error, "Loading remote stylesheets is not supported on WASM");
88+
});

‎bindings/javascript/src/errors.rs‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,25 @@ impl From<InlineError> for napi::Error {
3737
#[cfg(target_arch = "wasm32")]
3838
impl From<InlineError> for JsValue {
3939
fn from(error: InlineError) -> Self {
40-
if let css_inline::InlineError::ParseError(e) = error.0 {
41-
JsValue::from_str(&e)
42-
} else {
43-
JsValue::from_str(error.0.to_string().as_str())
40+
if let css_inline::InlineError::IO(error) = &error.0 {
41+
panic!("{}", error);
42+
}
43+
match &error.0 {
44+
css_inline::InlineError::ParseError(e) => JsValue::from_str(e),
45+
css_inline::InlineError::Network {
46+
error: network_error,
47+
..
48+
} => {
49+
if let attohttpc::ErrorKind::Io(io_error) = network_error.kind() {
50+
if io_error.kind() == std::io::ErrorKind::Unsupported {
51+
return JsValue::from_str(
52+
"Loading remote stylesheets is not supported on WASM",
53+
);
54+
}
55+
}
56+
JsValue::from_str(error.0.to_string().as_str())
57+
}
58+
_ => JsValue::from_str(error.0.to_string().as_str()),
4459
}
4560
}
4661
}

‎bindings/javascript/wasm/index.js‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ heap.push(void 0, null, true, false);
3333
function getObject(idx) {
3434
return heap[idx];
3535
}
36-
var heap_next = heap.length;
37-
function dropObject(idx) {
38-
if (idx < 132)
39-
return;
40-
heap[idx] = heap_next;
41-
heap_next = idx;
42-
}
43-
function takeObject(idx) {
44-
const ret = getObject(idx);
45-
dropObject(idx);
46-
return ret;
47-
}
4836
var WASM_VECTOR_LEN = 0;
4937
var cachedUint8Memory0 = null;
5038
function getUint8Memory0() {
@@ -116,6 +104,7 @@ function getStringFromWasm0(ptr, len) {
116104
ptr = ptr >>> 0;
117105
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
118106
}
107+
var heap_next = heap.length;
119108
function addHeapObject(obj) {
120109
if (heap_next === heap.length)
121110
heap.push(heap.length + 1);
@@ -124,6 +113,17 @@ function addHeapObject(obj) {
124113
heap[idx] = obj;
125114
return idx;
126115
}
116+
function dropObject(idx) {
117+
if (idx < 132)
118+
return;
119+
heap[idx] = heap_next;
120+
heap_next = idx;
121+
}
122+
function takeObject(idx) {
123+
const ret = getObject(idx);
124+
dropObject(idx);
125+
return ret;
126+
}
127127
var cachedFloat64Memory0 = null;
128128
function getFloat64Memory0() {
129129
if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
@@ -261,9 +261,6 @@ function __wbg_get_imports() {
261261
const ret = getObject(arg0) === void 0;
262262
return ret;
263263
};
264-
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
265-
takeObject(arg0);
266-
};
267264
imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
268265
const obj = getObject(arg1);
269266
const ret = typeof obj === "string" ? obj : void 0;
@@ -306,6 +303,9 @@ function __wbg_get_imports() {
306303
const ret = +getObject(arg0);
307304
return ret;
308305
};
306+
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
307+
takeObject(arg0);
308+
};
309309
imports.wbg.__wbg_length_1d25fa9e4ac21ce7 = function(arg0) {
310310
const ret = getObject(arg0).length;
311311
return ret;

‎bindings/javascript/wasm/index.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindings/javascript/wasm/index.mjs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@ heap.push(void 0, null, true, false);
55
function getObject(idx) {
66
return heap[idx];
77
}
8-
var heap_next = heap.length;
9-
function dropObject(idx) {
10-
if (idx < 132)
11-
return;
12-
heap[idx] = heap_next;
13-
heap_next = idx;
14-
}
15-
function takeObject(idx) {
16-
const ret = getObject(idx);
17-
dropObject(idx);
18-
return ret;
19-
}
208
var WASM_VECTOR_LEN = 0;
219
var cachedUint8Memory0 = null;
2210
function getUint8Memory0() {
@@ -88,6 +76,7 @@ function getStringFromWasm0(ptr, len) {
8876
ptr = ptr >>> 0;
8977
return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
9078
}
79+
var heap_next = heap.length;
9180
function addHeapObject(obj) {
9281
if (heap_next === heap.length)
9382
heap.push(heap.length + 1);
@@ -96,6 +85,17 @@ function addHeapObject(obj) {
9685
heap[idx] = obj;
9786
return idx;
9887
}
88+
function dropObject(idx) {
89+
if (idx < 132)
90+
return;
91+
heap[idx] = heap_next;
92+
heap_next = idx;
93+
}
94+
function takeObject(idx) {
95+
const ret = getObject(idx);
96+
dropObject(idx);
97+
return ret;
98+
}
9999
var cachedFloat64Memory0 = null;
100100
function getFloat64Memory0() {
101101
if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
@@ -233,9 +233,6 @@ function __wbg_get_imports() {
233233
const ret = getObject(arg0) === void 0;
234234
return ret;
235235
};
236-
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
237-
takeObject(arg0);
238-
};
239236
imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
240237
const obj = getObject(arg1);
241238
const ret = typeof obj === "string" ? obj : void 0;
@@ -278,6 +275,9 @@ function __wbg_get_imports() {
278275
const ret = +getObject(arg0);
279276
return ret;
280277
};
278+
imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
279+
takeObject(arg0);
280+
};
281281
imports.wbg.__wbg_length_1d25fa9e4ac21ce7 = function(arg0) {
282282
const ret = getObject(arg0).length;
283283
return ret;

‎bindings/javascript/wasm/index_bg.wasm‎

371 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)