Skip to content

Commit df7593a

Browse files
guybedfordguybedford
authored
wasm-bindgen@0.2.122 and unwind safety updates (#999)
1 parent 3d0903a commit df7593a

43 files changed

Lines changed: 183 additions & 170 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[submodule "wasm-bindgen"]
22
path = wasm-bindgen
33
url = https://github.com/wasm-bindgen/wasm-bindgen
4-
[submodule "wasm-streams"]
5-
path = wasm-streams
6-
url = https://github.com/guybedford/wasm-streams
74
[submodule "ts-gen"]
85
path = ts-gen
96
url = https://github.com/wasm-bindgen/ts-gen
7+
[submodule "gloo"]
8+
path = gloo
9+
url = https://github.com/guybedford/gloo
10+
branch = fix-gloo-timers-unwind-safety

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ exclude = [
1414
"examples/axum",
1515
"templates/*",
1616
"wasm-bindgen",
17+
"wasm-streams",
18+
"gloo",
1719
"generated",
1820
]
1921
resolver = "2"
@@ -27,7 +29,7 @@ chrono = { version = "0.4.41", default-features = false, features = [
2729
futures-channel = "0.3.31"
2830
futures-util = { version = "0.3.31", default-features = false }
2931
http = "1.3"
30-
js-sys = { version = "0.3.98" }
32+
js-sys = { version = "0.3.99" }
3133
serde = { version = "1.0.164", features = ["derive"] }
3234
strum = { version = "0.27", features = ["derive"] }
3335
serde_json = "1.0.140"
@@ -36,14 +38,14 @@ syn = "2.0.17"
3638
trybuild = "1.0"
3739
proc-macro2 = "1.0.60"
3840
quote = "1.0.28"
39-
wasm-bindgen = { version = "0.2.121" }
40-
wasm-bindgen-cli-support = { version = "0.2.121" }
41-
wasm-bindgen-futures = { version = "0.4.71" }
42-
wasm-bindgen-macro-support = { version = "0.2.121" }
43-
wasm-bindgen-shared = { version = "0.2.121" }
44-
wasm-bindgen-test = { version = "0.3.71" }
45-
wasm-streams = { version = "0.5.0" }
46-
web-sys = { version = "0.3.98", features = [
41+
wasm-bindgen = { version = "0.2.122" }
42+
wasm-bindgen-cli-support = { version = "0.2.122" }
43+
wasm-bindgen-futures = { version = "0.4.72" }
44+
wasm-bindgen-macro-support = { version = "0.2.122" }
45+
wasm-bindgen-shared = { version = "0.2.122" }
46+
wasm-bindgen-test = { version = "0.3.72" }
47+
wasm-streams = { version = "0.6.0" }
48+
web-sys = { version = "0.3.99", features = [
4749
"AbortController",
4850
"AbortSignal",
4951
"BinaryType",
@@ -105,11 +107,11 @@ opt-level = "z"
105107
# These are local patches we use to test against local wasm bindgen
106108
# We always align on the exact stable wasm bindgen version for releases
107109
[patch.crates-io]
108-
js-sys = { version = "0.3.98", path = './wasm-bindgen/crates/js-sys' }
109-
wasm-bindgen = { version = "0.2.121", path = './wasm-bindgen' }
110-
wasm-bindgen-cli-support = { version = "0.2.121", path = "./wasm-bindgen/crates/cli-support" }
111-
wasm-bindgen-futures = { version = "0.4.71", path = './wasm-bindgen/crates/futures' }
112-
wasm-bindgen-macro-support = { version = "0.2.121", path = "./wasm-bindgen/crates/macro-support" }
113-
wasm-bindgen-shared = { version = "0.2.121", path = "./wasm-bindgen/crates/shared" }
114-
wasm-bindgen-test = { version = "0.3.71", path = "./wasm-bindgen/crates/test" }
115-
web-sys = { version = "0.3.98", path = './wasm-bindgen/crates/web-sys' }
110+
js-sys = { version = "0.3.99", path = './wasm-bindgen/crates/js-sys' }
111+
wasm-bindgen = { version = "0.2.122", path = './wasm-bindgen' }
112+
wasm-bindgen-cli-support = { version = "0.2.122", path = "./wasm-bindgen/crates/cli-support" }
113+
wasm-bindgen-futures = { version = "0.4.72", path = './wasm-bindgen/crates/futures' }
114+
wasm-bindgen-macro-support = { version = "0.2.122", path = "./wasm-bindgen/crates/macro-support" }
115+
wasm-bindgen-shared = { version = "0.2.122", path = "./wasm-bindgen/crates/shared" }
116+
wasm-bindgen-test = { version = "0.3.72", path = "./wasm-bindgen/crates/test" }
117+
web-sys = { version = "0.3.99", path = './wasm-bindgen/crates/web-sys' }

‎chompfile.toml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ deps = ['install:ts-gen']
66
# `Env` / `ExecutionContext` are project-specific re-exports that ts-gen
77
# can't infer; everything else (`ReadableStream`, `Headers`, `Event`, …)
88
# resolves through ts-gen's built-in web_sys defaults.
9+
#
10+
# `--export cloudflare:email` lifts the module's declarations to global
11+
# scope so consumers see `worker::EmailMessage` directly (rather than
12+
# `worker::bindings::email::email::EmailMessage`). The file `--export`
13+
# is required alongside because once any `--export` is specified the
14+
# implicit "every input is its own export" default is disabled.
915
run = '''ts-gen --input types/email.d.ts --output worker/src/bindings/email.rs \
1016
--errors-as-error \
17+
--export types/email.d.ts \
18+
--export cloudflare:email \
1119
--external "Env=crate::Env" \
1220
--external "ExecutionContext=crate::Context"'''
1321

‎examples/rpc-client/src/calculator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl Calculator for CalculatorService {
2828
async fn add(&self, a: u32, b: u32) -> ::worker::Result<u32> {
2929
let promise = self.0.add(a, b)?;
3030
let fut = ::worker::send::SendFuture::new(
31-
::worker::wasm_bindgen_futures::JsFuture::from(promise),
31+
::worker::js_sys::futures::JsFuture::from(promise),
3232
);
3333
let output = fut.await?;
3434
Ok(::serde_wasm_bindgen::from_value(output)?)

‎gloo‎

Submodule gloo added at d73276e

‎test/src/container.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use std::time::Duration;
88

99
use futures_util::StreamExt;
1010
use wasm_bindgen::{throw_str, UnwrapThrowExt};
11-
use wasm_bindgen_futures::spawn_local;
1211
use worker::*;
1312

1413
use crate::SomeSharedData;
@@ -29,7 +28,7 @@ impl DurableObject for EchoContainer {
2928
}
3029
let ready = Arc::new(AtomicBool::new(false));
3130
let ready_clone = Arc::clone(&ready);
32-
spawn_local(async move {
31+
js_sys::futures::spawn_local(async move {
3332
for _ in 0..10 {
3433
match container
3534
.get_tcp_port(8080)
@@ -112,7 +111,7 @@ pub async fn handle_container(
112111
None => return Response::error("Expected websocket response", 500),
113112
};
114113
ws.accept()?;
115-
spawn_local(redir_websocket(ws, server));
114+
js_sys::futures::spawn_local(redir_websocket(ws, server));
116115
Response::from_websocket(client)
117116
}
118117
_ => Response::error("Container method not allowed", 405),

‎test/src/counter.rs‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
1-
use std::cell::RefCell;
1+
use std::cell::Cell;
2+
use std::panic::AssertUnwindSafe;
23
use tokio_stream::{StreamExt, StreamMap};
34
use worker::{
4-
durable_object, wasm_bindgen, wasm_bindgen_futures, DurableObject, Env, Error, Method, Request,
5-
Response, ResponseBuilder, Result, State, WebSocket, WebSocketIncomingMessage, WebSocketPair,
5+
durable_object, js_sys, wasm_bindgen, DurableObject, Env, Error, Method, Request, Response,
6+
ResponseBuilder, Result, State, WebSocket, WebSocketIncomingMessage, WebSocketPair,
67
WebsocketEvent,
78
};
89

910
use crate::SomeSharedData;
1011

1112
#[durable_object]
1213
pub struct Counter {
13-
count: RefCell<usize>,
14-
unstored_count: RefCell<usize>,
14+
count: AssertUnwindSafe<Cell<usize>>,
15+
unstored_count: AssertUnwindSafe<Cell<usize>>,
1516
state: State,
16-
initialized: RefCell<bool>,
17+
initialized: AssertUnwindSafe<Cell<bool>>,
1718
env: Env,
1819
}
1920

2021
impl DurableObject for Counter {
2122
fn new(state: State, env: Env) -> Self {
2223
Self {
23-
count: RefCell::new(0),
24-
unstored_count: RefCell::new(0),
25-
initialized: RefCell::new(false),
24+
count: AssertUnwindSafe(Cell::new(0)),
25+
unstored_count: AssertUnwindSafe(Cell::new(0)),
26+
initialized: AssertUnwindSafe(Cell::new(false)),
2627
state,
2728
env,
2829
}
2930
}
3031

3132
async fn fetch(&self, req: Request) -> Result<Response> {
32-
if !*self.initialized.borrow() {
33-
*self.initialized.borrow_mut() = true;
34-
*self.count.borrow_mut() = self.state.storage().get("count").await?.unwrap_or(0);
33+
if !self.initialized.get() {
34+
self.initialized.set(true);
35+
self.count
36+
.set(self.state.storage().get("count").await?.unwrap_or(0));
3537
}
3638

3739
if req.path().eq("/ws") {
@@ -49,15 +51,15 @@ impl DurableObject for Counter {
4951
.empty());
5052
}
5153

52-
*self.unstored_count.borrow_mut() += 1;
53-
*self.count.borrow_mut() += 10;
54-
let count = *self.count.borrow();
54+
self.unstored_count.set(self.unstored_count.get() + 1);
55+
self.count.set(self.count.get() + 10);
56+
let count = self.count.get();
5557
self.state.storage().put("count", count).await?;
5658

5759
Response::ok(format!(
5860
"[durable_object]: self.count: {}, self.unstored_count: {}, secret value: {}",
59-
self.count.borrow(),
60-
self.unstored_count.borrow(),
61+
self.count.get(),
62+
self.unstored_count.get(),
6163
self.env.secret("SOME_SECRET")?
6264
))
6365
}
@@ -134,7 +136,7 @@ pub async fn handle_websocket(req: Request, env: Env, _data: SomeSharedData) ->
134136
let do_ws = res.websocket().expect("server did not accept websocket");
135137
do_ws.accept()?;
136138

137-
wasm_bindgen_futures::spawn_local(async move {
139+
js_sys::futures::spawn_local(async move {
138140
let event_stream = server.events().expect("could not open stream");
139141
let do_event_stream = do_ws.events().expect("could not open stream");
140142

0 commit comments

Comments
 (0)