blog: use ExtendableEvent.wait_until()
we need to guarantee the promise will not be cancelled
This commit is contained in:
parent
ffb4c24292
commit
eeb13b44e9
|
@ -316,6 +316,7 @@ dependencies = [
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
"mime_guess",
|
"mime_guess",
|
||||||
|
"pin-project-lite",
|
||||||
"pulldown-cmark",
|
"pulldown-cmark",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
@ -369,6 +370,12 @@ dependencies = [
|
||||||
"sha-1",
|
"sha-1",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pin-project-lite"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro-hack"
|
name = "proc-macro-hack"
|
||||||
version = "0.5.15"
|
version = "0.5.15"
|
||||||
|
|
|
@ -26,6 +26,7 @@ hex = "0.4"
|
||||||
include_dir = "0.5"
|
include_dir = "0.5"
|
||||||
js-sys = "0.3"
|
js-sys = "0.3"
|
||||||
mime_guess = "2.0"
|
mime_guess = "2.0"
|
||||||
|
pin-project-lite = "0.1"
|
||||||
pulldown-cmark = { version = "0.7", default-features = false }
|
pulldown-cmark = { version = "0.7", default-features = false }
|
||||||
serde = { version = "1.0", features = [ "derive" ] }
|
serde = { version = "1.0", features = [ "derive" ] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
|
@ -33,6 +34,7 @@ wasm-bindgen = "0.2"
|
||||||
wasm-bindgen-futures = "0.4"
|
wasm-bindgen-futures = "0.4"
|
||||||
web-sys = { version = "0.3", features = [
|
web-sys = { version = "0.3", features = [
|
||||||
"Crypto",
|
"Crypto",
|
||||||
|
"ExtendableEvent",
|
||||||
"Headers",
|
"Headers",
|
||||||
"ReadableStream",
|
"ReadableStream",
|
||||||
"Request",
|
"Request",
|
||||||
|
|
12
src/blog.rs
12
src/blog.rs
|
@ -10,9 +10,9 @@ use js_sys::{JsString, RegExp};
|
||||||
use pulldown_cmark::*;
|
use pulldown_cmark::*;
|
||||||
use serde::{Serialize, Deserialize};
|
use serde::{Serialize, Deserialize};
|
||||||
use std::vec::Vec;
|
use std::vec::Vec;
|
||||||
use wasm_bindgen::JsCast;
|
use wasm_bindgen::{JsCast, JsValue};
|
||||||
use wasm_bindgen::closure::Closure;
|
use wasm_bindgen::closure::Closure;
|
||||||
use wasm_bindgen_futures::spawn_local;
|
use wasm_bindgen_futures::future_to_promise;
|
||||||
|
|
||||||
// A list of the UUIDs of all published blog posts
|
// A list of the UUIDs of all published blog posts
|
||||||
// This should be SORTED with the newest posts at lower indices (closer to 0)
|
// This should be SORTED with the newest posts at lower indices (closer to 0)
|
||||||
|
@ -230,9 +230,11 @@ impl PostContentCache {
|
||||||
// and once it's written, it's permanent, so we expect the write
|
// and once it's written, it's permanent, so we expect the write
|
||||||
// to succeed as soon as the article is submitted
|
// to succeed as soon as the article is submitted
|
||||||
let url_cache_key = Self::url_to_cache_whitelist_key(url);
|
let url_cache_key = Self::url_to_cache_whitelist_key(url);
|
||||||
spawn_local(async move {
|
crate::EVENT.with(move |ev| {
|
||||||
let _ = store::put_str(&url_cache_key, "Y").await;
|
ev.wait_until(&future_to_promise(async move {
|
||||||
()
|
let _ = store::put_str(&url_cache_key, "Y").await;
|
||||||
|
Ok(JsValue::TRUE)
|
||||||
|
})).unwrap();
|
||||||
});
|
});
|
||||||
// Now we can overwrite the tag URL
|
// Now we can overwrite the tag URL
|
||||||
*url = format!("{}{}", IMG_CACHE_PREFIX, url_encoded).into();
|
*url = format!("{}{}", IMG_CACHE_PREFIX, url_encoded).into();
|
||||||
|
|
11
src/lib.rs
11
src/lib.rs
|
@ -5,6 +5,7 @@ extern crate handlebars;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate lazy_static;
|
extern crate lazy_static;
|
||||||
|
|
||||||
|
mod task;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
mod utils;
|
mod utils;
|
||||||
mod router;
|
mod router;
|
||||||
|
@ -179,8 +180,12 @@ async fn default_route(_req: Request, url: Url) -> MyResult<Response> {
|
||||||
Err(Error::NotFound("This page is not available".into()))
|
Err(Error::NotFound("This page is not available".into()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task_local! {
|
||||||
|
pub static EVENT: ExtendableEvent;
|
||||||
|
}
|
||||||
|
|
||||||
#[wasm_bindgen]
|
#[wasm_bindgen]
|
||||||
pub async fn handle_request_rs(req: Request) -> Response {
|
pub async fn handle_request_rs(ev: ExtendableEvent, req: Request) -> Response {
|
||||||
let url = Url::new(&req.url()).unwrap();
|
let url = Url::new(&req.url()).unwrap();
|
||||||
|
|
||||||
if req.method() == "OPTIONS" {
|
if req.method() == "OPTIONS" {
|
||||||
|
@ -191,7 +196,9 @@ pub async fn handle_request_rs(req: Request) -> Response {
|
||||||
).unwrap();
|
).unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
let result = ROUTER.execute(req, url).await;
|
let result = EVENT.scope(ev, async move {
|
||||||
|
ROUTER.execute(req, url).await
|
||||||
|
}).await;
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
Ok(resp) => resp,
|
Ok(resp) => resp,
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
#[allow(dead_code)]
|
||||||
|
// This module contains some kanged code from Tokio
|
||||||
|
// because we cannot import the entire Tokio
|
||||||
|
mod task_local;
|
||||||
|
pub use task_local::LocalKey;
|
|
@ -0,0 +1,245 @@
|
||||||
|
// Source: <https://github.com/tokio-rs/tokio>
|
||||||
|
// Path: tokio/src/task/task_local.rs
|
||||||
|
// This module implements task-local storage
|
||||||
|
// and fortunately, works independently from
|
||||||
|
// the rest of Tokio
|
||||||
|
use pin_project_lite::pin_project;
|
||||||
|
use std::cell::RefCell;
|
||||||
|
use std::error::Error;
|
||||||
|
use std::future::Future;
|
||||||
|
use std::pin::Pin;
|
||||||
|
use std::task::{Context, Poll};
|
||||||
|
use std::{fmt, thread};
|
||||||
|
|
||||||
|
/// Declares a new task-local key of type [`tokio::task::LocalKey`].
|
||||||
|
///
|
||||||
|
/// # Syntax
|
||||||
|
///
|
||||||
|
/// The macro wraps any number of static declarations and makes them local to the current task.
|
||||||
|
/// Publicity and attributes for each static is preserved. For example:
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # use tokio::task_local;
|
||||||
|
/// task_local! {
|
||||||
|
/// pub static ONE: u32;
|
||||||
|
///
|
||||||
|
/// #[allow(unused)]
|
||||||
|
/// static TWO: f32;
|
||||||
|
/// }
|
||||||
|
/// # fn main() {}
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// See [LocalKey documentation][`tokio::task::LocalKey`] for more
|
||||||
|
/// information.
|
||||||
|
///
|
||||||
|
/// [`tokio::task::LocalKey`]: ../tokio/task/struct.LocalKey.html
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! task_local {
|
||||||
|
// empty (base case for the recursion)
|
||||||
|
() => {};
|
||||||
|
|
||||||
|
($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty; $($rest:tt)*) => {
|
||||||
|
$crate::__task_local_inner!($(#[$attr])* $vis $name, $t);
|
||||||
|
$crate::task_local!($($rest)*);
|
||||||
|
};
|
||||||
|
|
||||||
|
($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty) => {
|
||||||
|
$crate::__task_local_inner!($(#[$attr])* $vis $name, $t);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[doc(hidden)]
|
||||||
|
#[macro_export]
|
||||||
|
macro_rules! __task_local_inner {
|
||||||
|
($(#[$attr:meta])* $vis:vis $name:ident, $t:ty) => {
|
||||||
|
static $name: $crate::task::LocalKey<$t> = {
|
||||||
|
std::thread_local! {
|
||||||
|
static __KEY: std::cell::RefCell<Option<$t>> = std::cell::RefCell::new(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
$crate::task::LocalKey { inner: __KEY }
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A key for task-local data.
|
||||||
|
///
|
||||||
|
/// This type is generated by the `task_local!` macro.
|
||||||
|
///
|
||||||
|
/// Unlike [`std::thread::LocalKey`], `tokio::task::LocalKey` will
|
||||||
|
/// _not_ lazily initialize the value on first access. Instead, the
|
||||||
|
/// value is first initialized when the future containing
|
||||||
|
/// the task-local is first polled by a futures executor, like Tokio.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # async fn dox() {
|
||||||
|
/// tokio::task_local! {
|
||||||
|
/// static NUMBER: u32;
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// NUMBER.scope(1, async move {
|
||||||
|
/// assert_eq!(NUMBER.get(), 1);
|
||||||
|
/// }).await;
|
||||||
|
///
|
||||||
|
/// NUMBER.scope(2, async move {
|
||||||
|
/// assert_eq!(NUMBER.get(), 2);
|
||||||
|
///
|
||||||
|
/// NUMBER.scope(3, async move {
|
||||||
|
/// assert_eq!(NUMBER.get(), 3);
|
||||||
|
/// }).await;
|
||||||
|
/// }).await;
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
/// [`std::thread::LocalKey`]: https://doc.rust-lang.org/std/thread/struct.LocalKey.html
|
||||||
|
pub struct LocalKey<T: 'static> {
|
||||||
|
#[doc(hidden)]
|
||||||
|
pub inner: thread::LocalKey<RefCell<Option<T>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> LocalKey<T> {
|
||||||
|
/// Sets a value `T` as the task-local value for the future `F`.
|
||||||
|
///
|
||||||
|
/// On completion of `scope`, the task-local will be dropped.
|
||||||
|
///
|
||||||
|
/// ### Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # async fn dox() {
|
||||||
|
/// tokio::task_local! {
|
||||||
|
/// static NUMBER: u32;
|
||||||
|
/// }
|
||||||
|
///
|
||||||
|
/// NUMBER.scope(1, async move {
|
||||||
|
/// println!("task local value: {}", NUMBER.get());
|
||||||
|
/// }).await;
|
||||||
|
/// # }
|
||||||
|
/// ```
|
||||||
|
pub async fn scope<F>(&'static self, value: T, f: F) -> F::Output
|
||||||
|
where
|
||||||
|
F: Future,
|
||||||
|
{
|
||||||
|
TaskLocalFuture {
|
||||||
|
local: &self,
|
||||||
|
slot: Some(value),
|
||||||
|
future: f,
|
||||||
|
}
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Accesses the current task-local and runs the provided closure.
|
||||||
|
///
|
||||||
|
/// # Panics
|
||||||
|
///
|
||||||
|
/// This function will panic if not called within the context
|
||||||
|
/// of a future containing a task-local with the corresponding key.
|
||||||
|
pub fn with<F, R>(&'static self, f: F) -> R
|
||||||
|
where
|
||||||
|
F: FnOnce(&T) -> R,
|
||||||
|
{
|
||||||
|
self.try_with(f).expect(
|
||||||
|
"cannot access a Task Local Storage value \
|
||||||
|
without setting it via `LocalKey::set`",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Accesses the current task-local and runs the provided closure.
|
||||||
|
///
|
||||||
|
/// If the task-local with the accociated key is not present, this
|
||||||
|
/// method will return an `AccessError`. For a panicking variant,
|
||||||
|
/// see `with`.
|
||||||
|
pub fn try_with<F, R>(&'static self, f: F) -> Result<R, AccessError>
|
||||||
|
where
|
||||||
|
F: FnOnce(&T) -> R,
|
||||||
|
{
|
||||||
|
self.inner.with(|v| {
|
||||||
|
if let Some(val) = v.borrow().as_ref() {
|
||||||
|
Ok(f(val))
|
||||||
|
} else {
|
||||||
|
Err(AccessError { _private: () })
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: Copy + 'static> LocalKey<T> {
|
||||||
|
/// Returns a copy of the task-local value
|
||||||
|
/// if the task-local value implements `Copy`.
|
||||||
|
pub fn get(&'static self) -> T {
|
||||||
|
self.with(|v| *v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static> fmt::Debug for LocalKey<T> {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
f.pad("LocalKey { .. }")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pin_project! {
|
||||||
|
struct TaskLocalFuture<T: StaticLifetime, F> {
|
||||||
|
local: &'static LocalKey<T>,
|
||||||
|
slot: Option<T>,
|
||||||
|
#[pin]
|
||||||
|
future: F,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T: 'static, F: Future> Future for TaskLocalFuture<T, F> {
|
||||||
|
type Output = F::Output;
|
||||||
|
|
||||||
|
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
|
||||||
|
struct Guard<'a, T: 'static> {
|
||||||
|
local: &'static LocalKey<T>,
|
||||||
|
slot: &'a mut Option<T>,
|
||||||
|
prev: Option<T>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<T> Drop for Guard<'_, T> {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
let value = self.local.inner.with(|c| c.replace(self.prev.take()));
|
||||||
|
*self.slot = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut project = self.project();
|
||||||
|
let val = project.slot.take();
|
||||||
|
|
||||||
|
let prev = project.local.inner.with(|c| c.replace(val));
|
||||||
|
|
||||||
|
let _guard = Guard {
|
||||||
|
prev,
|
||||||
|
slot: &mut project.slot,
|
||||||
|
local: *project.local,
|
||||||
|
};
|
||||||
|
|
||||||
|
project.future.poll(cx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Required to make `pin_project` happy.
|
||||||
|
trait StaticLifetime: 'static {}
|
||||||
|
impl<T: 'static> StaticLifetime for T {}
|
||||||
|
|
||||||
|
/// An error returned by [`LocalKey::try_with`](method@LocalKey::try_with).
|
||||||
|
#[derive(Clone, Copy, Eq, PartialEq)]
|
||||||
|
pub struct AccessError {
|
||||||
|
_private: (),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Debug for AccessError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
f.debug_struct("AccessError").finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for AccessError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
fmt::Display::fmt("task-local value not set", f)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Error for AccessError {}
|
|
@ -1,12 +1,12 @@
|
||||||
addEventListener('fetch', event => {
|
addEventListener('fetch', event => {
|
||||||
event.respondWith(handleRequest(event.request))
|
event.respondWith(handleRequest(event, event.request))
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch and log a request
|
* Fetch and log a request
|
||||||
* @param {Request} request
|
* @param {Request} request
|
||||||
*/
|
*/
|
||||||
async function handleRequest(request) {
|
async function handleRequest(ev, request) {
|
||||||
const rust = await import("./pkg/index");
|
const rust = await import("./pkg/index");
|
||||||
return await rust.handle_request_rs(request);
|
return await rust.handle_request_rs(ev, request);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue